wip

Author: duncanmcclean

src/GraphQL/Queries/AssetsQuery.php

@@ -7,6 +7,7 @@
 use GraphQL\Type\Definition\Type;
 use Statamic\Facades\Asset;
 use Statamic\Facades\GraphQL;
+use Statamic\Query\OrderBy;
 use Statamic\GraphQL\Middleware\AuthorizeFilters;
 use Statamic\GraphQL\Middleware\AuthorizeSubResources;
 use Statamic\GraphQL\Middleware\ResolvePage;
@@ -69,7 +70,9 @@ private function sortQuery($query, $sorts)
                 [$sort, $order] = explode(' ', $sort);
             }
 
-            $query->orderBy($sort, $order);
+            if ($sort = OrderBy::column($sort)) {
+                $query->orderBy($sort, $order);
+            }
         }
     }
 

src/GraphQL/Queries/EntriesQuery.php

@@ -8,6 +8,7 @@
 use GraphQL\Type\Definition\Type;
 use Statamic\Facades\Entry;
 use Statamic\Facades\GraphQL;
+use Statamic\Query\OrderBy;
 use Statamic\GraphQL\Middleware\AuthorizeFilters;
 use Statamic\GraphQL\Middleware\AuthorizeQueryScopes;
 use Statamic\GraphQL\Middleware\AuthorizeSubResources;
@@ -96,7 +97,9 @@ private function sortQuery($query, $sorts)
                 [$sort, $order] = explode(' ', $sort);
             }
 
-            $query->orderBy($sort, $order);
+            if ($sort = OrderBy::column($sort)) {
+                $query->orderBy($sort, $order);
+            }
         }
     }
 

src/GraphQL/Queries/TermsQuery.php

@@ -6,6 +6,7 @@
 use Facades\Statamic\API\ResourceAuthorizer;
 use GraphQL\Type\Definition\Type;
 use Statamic\Facades\GraphQL;
+use Statamic\Query\OrderBy;
 use Statamic\Facades\Term;
 use Statamic\GraphQL\Middleware\AuthorizeFilters;
 use Statamic\GraphQL\Middleware\AuthorizeSubResources;
@@ -76,7 +77,9 @@ private function sortQuery($query, $sorts)
                 [$sort, $order] = explode(' ', $sort);
             }
 
-            $query->orderBy($sort, $order);
+            if ($sort = OrderBy::column($sort)) {
+                $query->orderBy($sort, $order);
+            }
         }
     }
 

src/GraphQL/Queries/UsersQuery.php

@@ -5,6 +5,7 @@
 use Facades\Statamic\API\FilterAuthorizer;
 use GraphQL\Type\Definition\Type;
 use Statamic\Facades\GraphQL;
+use Statamic\Query\OrderBy;
 use Statamic\Facades\User;
 use Statamic\GraphQL\Middleware\AuthorizeFilters;
 use Statamic\GraphQL\Middleware\ResolvePage;
@@ -65,7 +66,9 @@ private function sortQuery($query, $sorts)
                 [$sort, $order] = explode(' ', $sort);
             }
 
-            $query->orderBy($sort, $order);
+            if ($sort = OrderBy::column($sort)) {
+                $query->orderBy($sort, $order);
+            }
         }
     }