[core] GraphQL: Don't include sorting for reference fields

sanity-io · Feb 27, 2020 · 65309f9 · 65309f9
1 parent 26264f6
commit 65309f9
Show file tree

Hide file tree

Showing 2 changed files with 26 additions and 24 deletions.
diff --git a/packages/@sanity/core/src/actions/graphql/v2/generateTypeQueries.js b/packages/@sanity/core/src/actions/graphql/v2/generateTypeQueries.js
@@ -9,12 +9,14 @@ function pluralizeTypeName(name) {
   return words.join('')
 }
 
-function generateTypeQueries(types) {
+function generateTypeQueries(types, filters, sortings) {
   const queries = []
   const queryable = types.filter(
     type => type.type === 'Object' && type.interfaces && type.interfaces.includes('Document')
   )
 
+  const isSortable = type => sortings.some(sorting => sorting.name === `${type.name}Sorting`)
+
   // Single ID-based result lookup queries
   queryable.forEach(type => {
     queries.push({
@@ -54,7 +56,7 @@ function generateTypeQueries(types) {
           type: `${type.name}Filter`,
           isFieldFilter: true
         },
-        {
+        isSortable(type) && {
           name: 'sort',
           type: {
             kind: 'List',
@@ -77,7 +79,7 @@ function generateTypeQueries(types) {
           description: 'Offset at which to start returning documents from',
           isFieldFilter: false
         }
-      ]
+      ].filter(Boolean)
     })
   })
 

diff --git a/packages/@sanity/core/src/actions/graphql/v2/generateTypeSortings.js b/packages/@sanity/core/src/actions/graphql/v2/generateTypeSortings.js
@@ -40,41 +40,41 @@ function generateTypeSortings(types) {
     type => type.type === 'Object' && type.interfaces && type.interfaces.includes('Document')
   )
 
+  const hasFields = type => type.fields.length > 0
+
   const objectTypeSortings = createObjectTypeSortings(objectTypes)
   const documentTypeSortings = createDocumentTypeSortings(documentTypes)
+  const allSortings = [].concat(objectTypeSortings, documentTypeSortings).filter(hasFields)
 
-  return objectTypeSortings.concat(documentTypeSortings).concat(builtInSortingEnum)
+  return allSortings.concat(builtInSortingEnum)
 }
 
 function createObjectTypeSortings(objectTypes) {
-  return objectTypes.map(objectType => {
-    return {
-      name: `${objectType.name}Sorting`,
-      kind: 'InputObject',
-      fields: objectType.fields
-        .filter(field => field.type !== 'JSON' && field.kind !== 'List')
-        .map(field => ({
-          fieldName: field.fieldName,
-          type: builtInTypes.includes(field.type) ? builtInSortingEnum.name : `${field.type}Sorting`
-        }))
-    }
-  })
+  return objectTypes.map(objectType => ({
+    name: `${objectType.name}Sorting`,
+    kind: 'InputObject',
+    fields: objectType.fields
+      .filter(field => field.type !== 'JSON' && field.kind !== 'List')
+      .filter(field => !field.isReference)
+      .map(field => ({
+        fieldName: field.fieldName,
+        type: builtInTypes.includes(field.type) ? builtInSortingEnum.name : `${field.type}Sorting`
+      }))
+  }))
 }
 
 function createDocumentTypeSortings(documentTypes) {
-  return documentTypes.map(documentType => {
-    const fields = documentType.fields
+  return documentTypes.map(documentType => ({
+    name: `${documentType.name}Sorting`,
+    kind: 'InputObject',
+    fields: documentType.fields
       .filter(field => field.type !== 'JSON' && field.kind !== 'List')
+      .filter(field => !field.isReference)
       .map(field => ({
         fieldName: field.fieldName,
         type: builtInTypes.includes(field.type) ? builtInSortingEnum.name : `${field.type}Sorting`
       }))
-    return {
-      name: `${documentType.name}Sorting`,
-      kind: 'InputObject',
-      fields
-    }
-  })
+  }))
 }
 
 module.exports = generateTypeSortings