From 18d99a875a10d1fa0d5d98db73902c56bdadf526 Mon Sep 17 00:00:00 2001
From: Sam Milledge <sam@sammilledge.com>
Date: Tue, 19 Oct 2021 02:39:01 +1000
Subject: [PATCH] Fix settings page freeze when custom fields have a sort value
 (#8876)

---
 app/src/composables/use-form-fields/use-form-fields.ts | 8 +-------
 1 file changed, 1 insertion(+), 7 deletions(-)

diff --git a/app/src/composables/use-form-fields/use-form-fields.ts b/app/src/composables/use-form-fields/use-form-fields.ts
index 8ee63e0622..2a347d085a 100644
--- a/app/src/composables/use-form-fields/use-form-fields.ts
+++ b/app/src/composables/use-form-fields/use-form-fields.ts
@@ -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);