Separate code pathways for IS_COMMAND_MENU_ITEM_ENABLED flag (#18542)

packages/twenty-front/src/modules/command-menu-item/contexts/CommandMenuContextProvider.tsx

@@ -1,13 +1,9 @@
 import { type CommandMenuContextType } from '@/command-menu-item/contexts/CommandMenuContext';
-import { CommandMenuContextProviderDefault } from '@/command-menu-item/contexts/CommandMenuContextProviderDefault';
-import { CommandMenuContextProviderWorkflowObjects } from '@/command-menu-item/contexts/CommandMenuContextProviderWorkflowObjects';
-import { contextStoreCurrentObjectMetadataItemIdComponentState } from '@/context-store/states/contextStoreCurrentObjectMetadataItemIdComponentState';
-import { objectMetadataItemsState } from '@/object-metadata/states/objectMetadataItemsState';
-import { CoreObjectNameSingular } from 'twenty-shared/types';
+import { CommandMenuContextProviderLegacy } from '@/command-menu-item/contexts/CommandMenuContextProviderLegacy';
+import { CommandMenuContextProviderServerItems } from '@/command-menu-item/server-items/contexts/CommandMenuContextProviderServerItems';
 import { type ObjectMetadataItem } from '@/object-metadata/types/ObjectMetadataItem';
-import { useAtomComponentStateValue } from '@/ui/utilities/state/jotai/hooks/useAtomComponentStateValue';
-import { useAtomStateValue } from '@/ui/utilities/state/jotai/hooks/useAtomStateValue';
-import { isDefined } from 'twenty-shared/utils';
+import { useIsFeatureEnabled } from '@/workspace/hooks/useIsFeatureEnabled';
+import { FeatureFlagKey } from '~/generated-metadata/graphql';
 
 export const CommandMenuContextProvider = ({
   children,
@@ -19,51 +15,30 @@ export const CommandMenuContextProvider = ({
   children: React.ReactNode;
   objectMetadataItemOverride?: ObjectMetadataItem;
 }) => {
-  const contextStoreCurrentObjectMetadataItemId = useAtomComponentStateValue(
-    contextStoreCurrentObjectMetadataItemIdComponentState,
+  const isCommandMenuItemEnabled = useIsFeatureEnabled(
+    FeatureFlagKey.IS_COMMAND_MENU_ITEM_ENABLED,
   );
 
-  const objectMetadataItems = useAtomStateValue(objectMetadataItemsState);
-
-  const objectMetadataItem =
-    objectMetadataItemOverride ??
-    objectMetadataItems.find(
-      (objectMetadataItem) =>
-        objectMetadataItem.id === contextStoreCurrentObjectMetadataItemId,
-    );
-
-  if (!isDefined(objectMetadataItem)) {
-    return null;
-  }
-
-  const isWorkflowObject =
-    objectMetadataItem?.nameSingular === CoreObjectNameSingular.Workflow;
-
-  if (!isDefined(objectMetadataItem)) {
-    return null;
-  }
-
-  if (isWorkflowObject) {
+  if (isCommandMenuItemEnabled) {
     return (
-      <CommandMenuContextProviderWorkflowObjects
+      <CommandMenuContextProviderServerItems
         isInSidePanel={isInSidePanel}
         displayType={displayType}
         containerType={containerType}
-        objectMetadataItem={objectMetadataItem}
       >
         {children}
-      </CommandMenuContextProviderWorkflowObjects>
+      </CommandMenuContextProviderServerItems>
     );
   }
 
   return (
-    <CommandMenuContextProviderDefault
+    <CommandMenuContextProviderLegacy
       isInSidePanel={isInSidePanel}
       displayType={displayType}
       containerType={containerType}
-      objectMetadataItem={objectMetadataItem}
+      objectMetadataItemOverride={objectMetadataItemOverride}
     >
       {children}
-    </CommandMenuContextProviderDefault>
+    </CommandMenuContextProviderLegacy>
   );
 };

packages/twenty-front/src/modules/command-menu-item/contexts/CommandMenuContextProviderDefault.tsx

@@ -2,8 +2,6 @@ import {
   CommandMenuContext,
   type CommandMenuContextType,
 } from '@/command-menu-item/contexts/CommandMenuContext';
-import { useCommandMenuContextApi } from '@/command-menu-item/hooks/useCommandMenuContextApi';
-import { useCommandMenuItemFrontComponentCommands } from '@/command-menu-item/hooks/useCommandMenuItemFrontComponentCommands';
 import { useRegisteredCommandMenuItems } from '@/command-menu-item/hooks/useRegisteredCommandMenuItems';
 import { useShouldCommandMenuItemBeRegisteredParams } from '@/command-menu-item/hooks/useShouldCommandMenuItemBeRegisteredParams';
 import { useRunWorkflowRecordAgnosticCommands } from '@/command-menu-item/record-agnostic/workflow/hooks/useRunWorkflowRecordAgnosticCommands';
@@ -11,8 +9,6 @@ import { useRunWorkflowRecordCommands } from '@/command-menu-item/record/workflo
 import { contextStoreTargetedRecordsRuleComponentState } from '@/context-store/states/contextStoreTargetedRecordsRuleComponentState';
 import { type ObjectMetadataItem } from '@/object-metadata/types/ObjectMetadataItem';
 import { useAtomComponentStateValue } from '@/ui/utilities/state/jotai/hooks/useAtomComponentStateValue';
-import { useIsFeatureEnabled } from '@/workspace/hooks/useIsFeatureEnabled';
-import { FeatureFlagKey } from '~/generated-metadata/graphql';
 
 export const CommandMenuContextProviderDefault = ({
   objectMetadataItem,
@@ -27,14 +23,10 @@ export const CommandMenuContextProviderDefault = ({
   containerType: CommandMenuContextType['containerType'];
   children: React.ReactNode;
 }) => {
-  const params = useShouldCommandMenuItemBeRegisteredParams({
+  const shouldBeRegisteredParams = useShouldCommandMenuItemBeRegisteredParams({
     objectMetadataItem,
   });
 
-  const shouldBeRegisteredParams = {
-    ...params,
-  };
-
   const commandMenuItems = useRegisteredCommandMenuItems(
     shouldBeRegisteredParams,
   );
@@ -55,28 +47,17 @@ export const CommandMenuContextProviderDefault = ({
   const runWorkflowRecordAgnosticCommands =
     useRunWorkflowRecordAgnosticCommands();
 
-  const commandMenuContextApi = useCommandMenuContextApi();
-
-  const commandMenuItemFrontComponentActions =
-    useCommandMenuItemFrontComponentCommands(commandMenuContextApi);
-
-  const isCommandMenuItemEnabled = useIsFeatureEnabled(
-    FeatureFlagKey.IS_COMMAND_MENU_ITEM_ENABLED,
-  );
-
   return (
     <CommandMenuContext.Provider
       value={{
         isInSidePanel,
         displayType,
         containerType,
-        commandMenuItems: isCommandMenuItemEnabled
-          ? commandMenuItemFrontComponentActions
-          : [
-              ...commandMenuItems,
-              ...runWorkflowRecordCommands,
-              ...runWorkflowRecordAgnosticCommands,
-            ],
+        commandMenuItems: [
+          ...commandMenuItems,
+          ...runWorkflowRecordCommands,
+          ...runWorkflowRecordAgnosticCommands,
+        ],
       }}
     >
       {children}

packages/twenty-front/src/modules/command-menu-item/contexts/CommandMenuContextProviderLegacy.tsx

@@ -0,0 +1,65 @@
+import { type CommandMenuContextType } from '@/command-menu-item/contexts/CommandMenuContext';
+import { CommandMenuContextProviderDefault } from '@/command-menu-item/contexts/CommandMenuContextProviderDefault';
+import { CommandMenuContextProviderWorkflowObjects } from '@/command-menu-item/contexts/CommandMenuContextProviderWorkflowObjects';
+import { contextStoreCurrentObjectMetadataItemIdComponentState } from '@/context-store/states/contextStoreCurrentObjectMetadataItemIdComponentState';
+import { objectMetadataItemsState } from '@/object-metadata/states/objectMetadataItemsState';
+import { CoreObjectNameSingular } from 'twenty-shared/types';
+import { type ObjectMetadataItem } from '@/object-metadata/types/ObjectMetadataItem';
+import { useAtomComponentStateValue } from '@/ui/utilities/state/jotai/hooks/useAtomComponentStateValue';
+import { useAtomStateValue } from '@/ui/utilities/state/jotai/hooks/useAtomStateValue';
+import { isDefined } from 'twenty-shared/utils';
+
+export const CommandMenuContextProviderLegacy = ({
+  children,
+  isInSidePanel,
+  displayType,
+  containerType,
+  objectMetadataItemOverride,
+}: Omit<CommandMenuContextType, 'commandMenuItems'> & {
+  children: React.ReactNode;
+  objectMetadataItemOverride?: ObjectMetadataItem;
+}) => {
+  const contextStoreCurrentObjectMetadataItemId = useAtomComponentStateValue(
+    contextStoreCurrentObjectMetadataItemIdComponentState,
+  );
+
+  const objectMetadataItems = useAtomStateValue(objectMetadataItemsState);
+
+  const objectMetadataItem =
+    objectMetadataItemOverride ??
+    objectMetadataItems.find(
+      (objectMetadataItem) =>
+        objectMetadataItem.id === contextStoreCurrentObjectMetadataItemId,
+    );
+
+  if (!isDefined(objectMetadataItem)) {
+    return null;
+  }
+
+  const isWorkflowObject =
+    objectMetadataItem.nameSingular === CoreObjectNameSingular.Workflow;
+
+  if (isWorkflowObject) {
+    return (
+      <CommandMenuContextProviderWorkflowObjects
+        isInSidePanel={isInSidePanel}
+        displayType={displayType}
+        containerType={containerType}
+        objectMetadataItem={objectMetadataItem}
+      >
+        {children}
+      </CommandMenuContextProviderWorkflowObjects>
+    );
+  }
+
+  return (
+    <CommandMenuContextProviderDefault
+      isInSidePanel={isInSidePanel}
+      displayType={displayType}
+      containerType={containerType}
+      objectMetadataItem={objectMetadataItem}
+    >
+      {children}
+    </CommandMenuContextProviderDefault>
+  );
+};

packages/twenty-front/src/modules/command-menu-item/contexts/CommandMenuContextProviderWorkflowObjects.tsx

@@ -2,8 +2,6 @@ import {
   CommandMenuContext,
   type CommandMenuContextType,
 } from '@/command-menu-item/contexts/CommandMenuContext';
-import { useCommandMenuContextApi } from '@/command-menu-item/hooks/useCommandMenuContextApi';
-import { useCommandMenuItemFrontComponentCommands } from '@/command-menu-item/hooks/useCommandMenuItemFrontComponentCommands';
 import { useRegisteredCommandMenuItems } from '@/command-menu-item/hooks/useRegisteredCommandMenuItems';
 import { useShouldCommandMenuItemBeRegisteredParams } from '@/command-menu-item/hooks/useShouldCommandMenuItemBeRegisteredParams';
 import { useRunWorkflowRecordAgnosticCommands } from '@/command-menu-item/record-agnostic/workflow/hooks/useRunWorkflowRecordAgnosticCommands';
@@ -14,9 +12,7 @@ import { useAtomComponentStateValue } from '@/ui/utilities/state/jotai/hooks/use
 import { useAtomFamilyStateValue } from '@/ui/utilities/state/jotai/hooks/useAtomFamilyStateValue';
 import { useWorkflowWithCurrentVersion } from '@/workflow/hooks/useWorkflowWithCurrentVersion';
 import { type WorkflowWithCurrentVersion } from '@/workflow/types/Workflow';
-import { useIsFeatureEnabled } from '@/workspace/hooks/useIsFeatureEnabled';
 import { isDefined } from 'twenty-shared/utils';
-import { FeatureFlagKey } from '~/generated-metadata/graphql';
 
 type CommandMenuContextProviderWorkflowObjectsProps = {
   objectMetadataItem: ObjectMetadataItem;
@@ -55,42 +51,16 @@ const CommandMenuContextProviderWorkflowObjectsContent = ({
   const runWorkflowRecordAgnosticCommands =
     useRunWorkflowRecordAgnosticCommands();
 
-  const commandMenuContextApi = useCommandMenuContextApi();
-
-  const enrichedSelectedRecords = isDefined(workflowWithCurrentVersion)
-    ? commandMenuContextApi.selectedRecords.map((record) =>
-        record.id === workflowWithCurrentVersion.id
-          ? {
-              ...record,
-              currentVersion: workflowWithCurrentVersion.currentVersion,
-              versions: workflowWithCurrentVersion.versions,
-              statuses: workflowWithCurrentVersion.statuses,
-            }
-          : record,
-      )
-    : commandMenuContextApi.selectedRecords;
-
-  const enrichedCommandMenuContextApi = {
-    ...commandMenuContextApi,
-    selectedRecords: enrichedSelectedRecords,
-  };
-
-  const commandMenuItemFrontComponentActions =
-    useCommandMenuItemFrontComponentCommands(enrichedCommandMenuContextApi);
-
-  const isCommandMenuItemEnabled = useIsFeatureEnabled(
-    FeatureFlagKey.IS_COMMAND_MENU_ITEM_ENABLED,
-  );
-
   return (
     <CommandMenuContext.Provider
       value={{
         isInSidePanel,
         displayType,
         containerType,
-        commandMenuItems: isCommandMenuItemEnabled
-          ? commandMenuItemFrontComponentActions
-          : [...commandMenuItems, ...runWorkflowRecordAgnosticCommands],
+        commandMenuItems: [
+          ...commandMenuItems,
+          ...runWorkflowRecordAgnosticCommands,
+        ],
       }}
     >
       {children}
@@ -123,24 +93,16 @@ const CommandMenuContextProviderWorkflowObjectsWithoutWorkflow = ({
   const runWorkflowRecordAgnosticCommands =
     useRunWorkflowRecordAgnosticCommands();
 
-  const commandMenuContextApi = useCommandMenuContextApi();
-
-  const commandMenuItemFrontComponentActions =
-    useCommandMenuItemFrontComponentCommands(commandMenuContextApi);
-
-  const isCommandMenuItemEnabled = useIsFeatureEnabled(
-    FeatureFlagKey.IS_COMMAND_MENU_ITEM_ENABLED,
-  );
-
   return (
     <CommandMenuContext.Provider
       value={{
         isInSidePanel,
         displayType,
         containerType,
-        commandMenuItems: isCommandMenuItemEnabled
-          ? commandMenuItemFrontComponentActions
-          : [...commandMenuItems, ...runWorkflowRecordAgnosticCommands],
+        commandMenuItems: [
+          ...commandMenuItems,
+          ...runWorkflowRecordAgnosticCommands,
+        ],
       }}
     >
       {children}