github/directus
1
0
Fork 0
mirror of https://github.com/directus/directus.git synced 2026-02-01 14:44:59 -05:00
Code Issues Packages Projects Releases Wiki Activity

Fix settings page freeze when custom fields have a sort value (#8876)

Browse Source
This commit is contained in:
Sam Milledge
2021-10-19 02:39:01 +10:00
committed by GitHub
parent 15aecbe438
commit 18d99a875a
1 changed files with 1 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
app/src/composables/use-form-fields/use-form-fields.ts
View File

@@ -9,8 +9,6 @@ import { translate } from '@/utils/translate-object-values';
export default function useFormFields(fields: Ref<Field[]>): { formFields: ComputedRef<Field[]> } {
const { interfaces } = getInterfaces();
const systemFieldsCount = computed(() => fields.value.filter((field) => field.meta?.system === true).length);
const formFields = computed(() => {
let formFields = clone(fields.value);
@@ -42,10 +40,6 @@ export default function useFormFields(fields: Ref<Field[]>): { formFields: Compu
}
}
if (field.meta?.sort && field.meta?.system !== true) {
field.meta.sort = Number(field.meta.sort) + Number(systemFieldsCount.value);
}
return field;
});
@@ -54,7 +48,7 @@ export default function useFormFields(fields: Ref<Field[]>): { formFields: Compu
return systemFake === false;
});
formFields = orderBy(formFields, ['meta.sort', 'meta.id']);
formFields = orderBy(formFields, [(field) => !!field.meta?.system, 'meta.sort', 'meta.id'], ['desc', 'asc', 'asc']);
formFields = translate(formFields);