Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix unorderable fields looking orderable in the Admin UI #6619

Merged
merged 1 commit into from
Sep 21, 2021
Merged

Fix unorderable fields looking orderable in the Admin UI #6619

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 6 additions & 0 deletions packages/keystone/src/admin-ui/system/getAdminMetaSchema.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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({
Expand All @@ -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({
Expand Down