Apply versioning only to reading state, and not to nested queries any…

…more
silverstripe · Feb 15, 2021 · 821494e · 821494e
1 parent b6cab40
commit 821494e
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 2 deletions.
diff --git a/src/GraphQL/Plugins/VersionedRead.php b/src/GraphQL/Plugins/VersionedRead.php
@@ -40,6 +40,13 @@ public function apply(ModelQuery $query, Schema $schema, array $config = []): vo
             return;
         }
 
+        // The versioned argument only affects global reading state. Should not
+        // apply to nested queries.
+        $rootQuery = $schema->getQueryType()->getFieldByName($query->getName());
+        if (!$rootQuery) {
+            return;
+        }
+
         $query->addResolverAfterware([VersionedResolver::class, 'resolveVersionedRead']);
         $query->addArg('versioning', 'VersionedInputType');
     }

diff --git a/src/GraphQL/Resolvers/VersionedResolver.php b/src/GraphQL/Resolvers/VersionedResolver.php
@@ -101,8 +101,10 @@ public static function resolveVersionedRead(DataList $list, array $args, array $
             return $list;
         }
 
-        return Injector::inst()->get(VersionFilters::class)
-            ->applyToList($list, $args['versioning']);
+        Injector::inst()->get(VersionFilters::class)
+            ->applyToReadingState($args['versioning']);
+
+        return $list;
     }
 
     /**