[core] GraphQL: Handle text and email types as strings

sanity-io · Feb 27, 2020 · e4a3183 · e4a3183
1 parent 6c5181a
commit e4a3183
Show file tree

Hide file tree

Showing 2 changed files with 28 additions and 14 deletions.
diff --git a/packages/@sanity/core/src/actions/graphql/v2/generateTypeFilters.js b/packages/@sanity/core/src/actions/graphql/v2/generateTypeFilters.js
@@ -7,6 +7,11 @@ const createBooleanFilters = require('./filters/booleanFilters')
 const createDatetimeFilters = require('./filters/datetimeFilters')
 const createDateFilters = require('./filters/dateFilters')
 
+const typeAliases = {
+  Text: 'String',
+  Email: 'String'
+}
+
 const filterCreators = {
   ID: createIdFilters,
   String: createStringFilters,
@@ -48,25 +53,14 @@ function createObjectTypeFilters(objectTypes) {
     return {
       name: `${objectType.name}Filter`,
       kind: 'InputObject',
-      fields: objectType.fields
-        .filter(field => field.type !== 'JSON' && field.kind !== 'List')
-        .map(field => ({
-          fieldName: field.fieldName,
-          type: `${field.type}Filter`
-        }))
+      fields: createFieldFilters(objectType)
     }
   })
 }
 
 function createDocumentTypeFilters(documentTypes) {
   return documentTypes.map(documentType => {
-    const fields = documentType.fields
-      .filter(field => field.type !== 'JSON' && field.kind !== 'List')
-      .map(field => ({
-        fieldName: field.fieldName,
-        type: `${field.type}Filter`
-      }))
-      .concat(getDocumentFilters())
+    const fields = createFieldFilters(documentType).concat(getDocumentFilters())
     return {
       name: `${documentType.name}Filter`,
       kind: 'InputObject',
@@ -75,6 +69,15 @@ function createDocumentTypeFilters(documentTypes) {
   })
 }
 
+function createFieldFilters(objectType) {
+  return objectType.fields
+    .filter(field => field.type !== 'JSON' && field.kind !== 'List')
+    .map(field => ({
+      fieldName: field.fieldName,
+      type: `${typeAliases[field.type] || field.type}Filter`
+    }))
+}
+
 function getDocumentFilters() {
   return [
     {

diff --git a/packages/@sanity/core/src/actions/graphql/v2/generateTypeSortings.js b/packages/@sanity/core/src/actions/graphql/v2/generateTypeSortings.js
@@ -1,4 +1,15 @@
-const builtInTypes = ['ID', 'String', 'Url', 'Float', 'Integer', 'Boolean', 'Datetime', 'Date']
+const builtInTypes = [
+  'Boolean',
+  'Date',
+  'Datetime',
+  'Email',
+  'Float',
+  'ID',
+  'Integer',
+  'String',
+  'Text',
+  'Url'
+]
 
 const builtInSortingEnum = {
   name: 'SortOrder',