fix: keep fields order again

equinor · Mar 11, 2024 · 6f48b21 · 6f48b21
1 parent 7a7fba9
commit 6f48b21
Showing 1 changed file with 6 additions and 2 deletions.
diff --git a/packages/dm-core-plugins/src/form/components/AttributeList.tsx b/packages/dm-core-plugins/src/form/components/AttributeList.tsx
@@ -18,8 +18,12 @@ export const AttributeList = (props: {
 
   const hideByDefaultFields: string[] = ['type', '_meta_']
   const filteredAttributes =
-    Array.isArray(config.fields) && config.fields.length > 0
-      ? attributes.filter((attr) => config.fields.includes(attr.name))
+    Array.isArray(config.fields) && config.fields.length
+      ? config.fields
+          .map((field) =>
+            attributes?.find((attribute) => attribute.name === field)
+          )
+          .filter((attribute): attribute is TAttribute => !!attribute)
       : attributes.filter((attr) => !hideByDefaultFields.includes(attr.name))
 
   return (