followup #12033 (#12150)

follow up #12033

in #12033, SettingsDataModelFieldRelationForm I changed the the use of
objectMetadataItems to activeObjectMetadataItems, which filtered out
system objects. The naming was one factor for this confusion
Renaming it everywhere to specify that they don't include system objects

---------

Co-authored-by: Charles Bochet <charles@twenty.com>

packages/twenty-front/src/modules/object-metadata/components/NavigationDrawerOpenedSection.tsx

@@ -10,10 +10,10 @@ import { useLingui } from '@lingui/react/macro';
 export const NavigationDrawerOpenedSection = () => {
   const { t } = useLingui();
 
-  const { activeObjectMetadataItems } = useFilteredObjectMetadataItems();
-  const filteredActiveObjectMetadataItems = activeObjectMetadataItems.filter(
-    (item) => !item.isRemote,
-  );
+  const { activeNonSystemObjectMetadataItems } =
+    useFilteredObjectMetadataItems();
+  const filteredActiveNonSystemObjectMetadataItems =
+    activeNonSystemObjectMetadataItems.filter((item) => !item.isRemote);
 
   const loading = useIsPrefetchLoading();
 
@@ -28,7 +28,7 @@ export const NavigationDrawerOpenedSection = () => {
     return;
   }
 
-  const objectMetadataItem = filteredActiveObjectMetadataItems.find(
+  const objectMetadataItem = filteredActiveNonSystemObjectMetadataItems.find(
     (item) =>
       item.namePlural === currentObjectNamePlural ||
       item.nameSingular === currentObjectNameSingular,

packages/twenty-front/src/modules/object-metadata/components/RemoteNavigationDrawerSection.tsx

@@ -10,10 +10,10 @@ import { isDefined } from 'twenty-shared/utils';
 export const RemoteNavigationDrawerSection = () => {
   const currentUser = useRecoilValue(currentUserState);
 
-  const { activeObjectMetadataItems } = useFilteredObjectMetadataItems();
-  const filteredActiveObjectMetadataItems = activeObjectMetadataItems.filter(
-    (item) => item.isRemote,
-  );
+  const { activeNonSystemObjectMetadataItems } =
+    useFilteredObjectMetadataItems();
+  const filteredActiveNonSystemObjectMetadataItems =
+    activeNonSystemObjectMetadataItems.filter((item) => item.isRemote);
   const loading = useIsPrefetchLoading();
 
   if (loading && isDefined(currentUser)) {
@@ -23,7 +23,7 @@ export const RemoteNavigationDrawerSection = () => {
   return (
     <NavigationDrawerSectionForObjectMetadataItems
       sectionTitle={'Remote'}
-      objectMetadataItems={filteredActiveObjectMetadataItems}
+      objectMetadataItems={filteredActiveNonSystemObjectMetadataItems}
       isRemote={true}
     />
   );

packages/twenty-front/src/modules/object-metadata/hooks/useFilteredObjectMetadataItems.ts

@@ -22,7 +22,7 @@ export const useFilteredObjectMetadataItems = () => {
     [isWorkflowEnabled],
   );
 
-  const activeObjectMetadataItems = useMemo(
+  const activeNonSystemObjectMetadataItems = useMemo(
     () =>
       objectMetadataItems.filter(
         ({ isActive, isSystem, nameSingular }) =>
@@ -31,8 +31,17 @@ export const useFilteredObjectMetadataItems = () => {
     [isWorkflowToBeFiltered, objectMetadataItems],
   );
 
-  const alphaSortedActiveObjectMetadataItems = activeObjectMetadataItems.sort(
-    (a, b) => {
+  const activeObjectMetadataItems = useMemo(
+    () =>
+      objectMetadataItems.filter(
+        ({ isActive, nameSingular }) =>
+          isActive && !isWorkflowToBeFiltered(nameSingular),
+      ),
+    [isWorkflowToBeFiltered, objectMetadataItems],
+  );
+
+  const alphaSortedActiveNonSystemObjectMetadataItems =
+    activeNonSystemObjectMetadataItems.sort((a, b) => {
       if (a.nameSingular < b.nameSingular) {
         return -1;
       }
@@ -40,15 +49,14 @@ export const useFilteredObjectMetadataItems = () => {
         return 1;
       }
       return 0;
-    },
-  );
+    });
 
-  const inactiveObjectMetadataItems = objectMetadataItems.filter(
+  const inactiveNonSystemObjectMetadataItems = objectMetadataItems.filter(
     ({ isActive, isSystem }) => !isActive && !isSystem,
   );
 
   const findActiveObjectMetadataItemByNamePlural = (namePlural: string) =>
-    activeObjectMetadataItems.find(
+    activeNonSystemObjectMetadataItems.find(
       (activeObjectMetadataItem) =>
         activeObjectMetadataItem.namePlural === namePlural,
     );
@@ -64,12 +72,13 @@ export const useFilteredObjectMetadataItems = () => {
     );
 
   return {
+    activeNonSystemObjectMetadataItems,
     activeObjectMetadataItems,
     findObjectMetadataItemById,
     findObjectMetadataItemByNamePlural,
     findActiveObjectMetadataItemByNamePlural,
-    inactiveObjectMetadataItems,
+    inactiveNonSystemObjectMetadataItems,
     objectMetadataItems,
-    alphaSortedActiveObjectMetadataItems,
+    alphaSortedActiveNonSystemObjectMetadataItems,
   };
 };

packages/twenty-front/src/modules/object-metadata/hooks/useNonSystemActiveObjectMetadataItems.ts

@@ -1,20 +0,0 @@
-import { objectMetadataItemsState } from '@/object-metadata/states/objectMetadataItemsState';
-import { useMemo } from 'react';
-import { useRecoilValue } from 'recoil';
-
-export const useNonSystemActiveObjectMetadataItems = () => {
-  const objectMetadataItems = useRecoilValue(objectMetadataItemsState);
-
-  const nonSystemActiveObjectMetadataItems = useMemo(
-    () =>
-      objectMetadataItems.filter(
-        (objectMetadataItem) =>
-          !objectMetadataItem.isSystem && objectMetadataItem.isActive,
-      ),
-    [objectMetadataItems],
-  );
-
-  return {
-    nonSystemActiveObjectMetadataItems,
-  };
-};