Fix unorderable fields looking orderable in the Admin UI (#6619)

keystonejs · Sep 21, 2021 · 7a7f3f6 · 7a7f3f6
1 parent 581e130
commit 7a7f3f6
Showing 1 changed file with 6 additions and 0 deletions.
diff --git a/packages/keystone/src/admin-ui/system/getAdminMetaSchema.ts b/packages/keystone/src/admin-ui/system/getAdminMetaSchema.ts
@@ -56,6 +56,9 @@ export function getAdminMetaSchema({
               'KeystoneAdminUIFieldMeta.isOrderable cannot be resolved during the build process'
             );
           }
+          if (!lists[rootVal.listKey].fields[rootVal.path].input?.orderBy) {
+            return false;
+          }
           const isOrderable = lists[rootVal.listKey].fields[rootVal.path].graphql.isEnabled.orderBy;
           if (typeof isOrderable === 'function') {
             return isOrderable({
@@ -76,6 +79,9 @@ export function getAdminMetaSchema({
               'KeystoneAdminUIFieldMeta.isOrderable cannot be resolved during the build process'
             );
           }
+          if (!lists[rootVal.listKey].fields[rootVal.path].input?.where) {
+            return false;
+          }
           const isFilterable = lists[rootVal.listKey].fields[rootVal.path].graphql.isEnabled.filter;
           if (typeof isFilterable === 'function') {
             return isFilterable({