Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix Craft 5.6+ compatibility #161

Merged
merged 2 commits into from
Feb 4, 2025
Merged

Fix Craft 5.6+ compatibility #161

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
77520e7
Only overwrite query resolvers
brandonkelly Jan 31, 2025
35252ae
Fixed PHP error
brandonkelly Feb 3, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
92 changes: 17 additions & 75 deletions src/services/RestrictionService.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -98,85 +98,27 @@ function(ModelEvent $event) {
*/
public function registerGqlQueries(RegisterGqlQueriesEvent $event)
{
$event->queries['entries'] = [
'type' => Type::listOf(EntryInterface::getType()),
'args' => EntryArguments::getArguments(),
'resolve' => EntryResolver::class . '::resolve',
'description' => 'This query is used to query for entries.',
'complexity' => GqlHelper::relatedArgumentComplexity(),
$resolvers = [
'entries' => EntryResolver::class . '::resolve',
'entry' => EntryResolver::class . '::resolveOne',
'entryCount' => EntryResolver::class . '::resolveCount',
'assets' => AssetResolver::class . '::resolve',
'asset' => AssetResolver::class . '::resolveOne',
'assetCount' => AssetResolver::class . '::resolveCount',
'globalSets' => GlobalSetResolver::class . '::resolve',
'globalSet' => GlobalSetResolver::class . '::resolveOne',
];

$event->queries['entry'] = [
'type' => EntryInterface::getType(),
'args' => EntryArguments::getArguments(),
'resolve' => EntryResolver::class . '::resolveOne',
'description' => 'This query is used to query for a single entry.',
'complexity' => GqlHelper::relatedArgumentComplexity(),
];

$event->queries['entryCount'] = [
'type' => Type::nonNull(Type::int()),
'args' => EntryArguments::getArguments(),
'resolve' => EntryResolver::class . '::resolveCount',
'description' => 'This query is used to return the number of entries.',
'complexity' => GqlHelper::relatedArgumentComplexity(),
];

$event->queries['assets'] = [
'type' => Type::listOf(AssetInterface::getType()),
'args' => AssetArguments::getArguments(),
'resolve' => AssetResolver::class . '::resolve',
'description' => 'This query is used to query for assets.',
'complexity' => GqlHelper::relatedArgumentComplexity(),
];

$event->queries['asset'] = [
'type' => AssetInterface::getType(),
'args' => AssetArguments::getArguments(),
'resolve' => AssetResolver::class . '::resolveOne',
'description' => 'This query is used to query for a single asset.',
'complexity' => GqlHelper::relatedArgumentComplexity(),
];

$event->queries['assetCount'] = [
'type' => Type::nonNull(Type::int()),
'args' => AssetArguments::getArguments(),
'resolve' => AssetResolver::class . '::resolveCount',
'description' => 'This query is used to return the number of assets.',
'complexity' => GqlHelper::relatedArgumentComplexity(),
];

$event->queries['globalSets'] = [
'type' => Type::listOf(GlobalSetInterface::getType()),
'args' => GlobalSetArguments::getArguments(),
'resolve' => GlobalSetResolver::class . '::resolve',
'description' => 'This query is used to query for global sets.',
'complexity' => GqlHelper::relatedArgumentComplexity(),
];

$event->queries['globalSet'] = [
'type' => GlobalSetInterface::getType(),
'args' => GlobalSetArguments::getArguments(),
'resolve' => GlobalSetResolver::class . '::resolveOne',
'description' => 'This query is used to query for a single global set.',
'complexity' => GqlHelper::relatedArgumentComplexity(),
];

$sections = (new Entries())->getAllSections();
$scope = $this->getSchema()->scope;
foreach (Craft::$app->getEntries()->getAllSections() as $section) {
// "Entries" was added in Craft 5.6.5
$resolvers[$section->handle] = EntryResolver::class . '::resolve';
$resolvers["{$section->handle}Entries"] = EntryResolver::class . '::resolve';
}

foreach ($sections as $section) {
if (!in_array("sections.{$section->uid}:read", $scope)) {
continue;
foreach ($resolvers as $name => $resolver) {
if (isset($event->queries[$name])) {
$event->queries[$name]['resolver'] = $resolver;
}

$event->queries["{$section->handle}Entries"] = [
'type' => Type::listOf(EntryInterface::getType()),
'args' => EntryArguments::getArguments(),
'resolve' => EntryResolver::class . '::resolve',
'description' => 'This query is used to query for entries.',
'complexity' => GqlHelper::relatedArgumentComplexity(),
];
}
}

Expand Down