Fixed inconsistent workspace order in different browers (#3217)

twentyhq · Jan 3, 2024 · 751dfe7 · 751dfe7
1 parent 67fca68
commit 751dfe7
Showing 1 changed file with 9 additions and 9 deletions.
diff --git a/packages/twenty-front/src/modules/object-metadata/components/ObjectMetadataNavItems.tsx b/packages/twenty-front/src/modules/object-metadata/components/ObjectMetadataNavItems.tsx
@@ -17,16 +17,16 @@ export const ObjectMetadataNavItems = () => {
           .filter((item) =>
             ['person', 'company', 'opportunity'].includes(item.nameSingular),
           )
-          .sort((objectMetadataItemA, _) => {
-            if (objectMetadataItemA.nameSingular === 'person') {
-              return -1;
-            }
-
-            if (objectMetadataItemA.nameSingular === 'opportunity') {
-              return 1;
+          .sort((objectMetadataItemA, objectMetadataItemB) => {
+            const order = ['person', 'company', 'opportunity'];
+            const indexA = order.indexOf(objectMetadataItemA.nameSingular);
+            const indexB = order.indexOf(objectMetadataItemB.nameSingular);
+            if (indexA === -1 || indexB === -1) {
+              return objectMetadataItemA.nameSingular.localeCompare(
+                objectMetadataItemB.nameSingular,
+              );
             }
-
-            return 0;
+            return indexA - indexB;
           }),
         ...activeObjectMetadataItems
           .filter(