improve command menu actions ordering

packages/twenty-front/src/modules/action-menu/actions/global-actions/workflow-run-actions/components/WorkflowRunActionEffect.tsx

@@ -1,4 +1,8 @@
 import { useActionMenuEntries } from '@/action-menu/hooks/useActionMenuEntries';
+import {
+  ActionMenuEntryScope,
+  ActionMenuEntryType,
+} from '@/action-menu/types/ActionMenuEntry';
 import { SnackBarVariant } from '@/ui/feedback/snack-bar-manager/components/SnackBar';
 import { useSnackBar } from '@/ui/feedback/snack-bar-manager/hooks/useSnackBar';
 import { useAllActiveWorkflowVersions } from '@/workflow/hooks/useAllActiveWorkflowVersions';
@@ -28,9 +32,9 @@ export const WorkflowRunActionEffect = () => {
       activeWorkflowVersion,
     ] of activeWorkflowVersions.entries()) {
       addActionMenuEntry({
-        type: 'workflow-run',
+        type: ActionMenuEntryType.WorkflowRun,
         key: `workflow-run-${activeWorkflowVersion.id}`,
-        scope: 'global',
+        scope: ActionMenuEntryScope.Global,
         label: capitalize(activeWorkflowVersion.workflow.name),
         position: index,
         Icon: IconSettingsAutomation,

packages/twenty-front/src/modules/action-menu/actions/record-actions/components/DeleteRecordsActionEffect.tsx

@@ -1,5 +1,9 @@
 import { ActionMenuContext } from '@/action-menu/contexts/ActionMenuContext';
 import { useActionMenuEntries } from '@/action-menu/hooks/useActionMenuEntries';
+import {
+  ActionMenuEntryScope,
+  ActionMenuEntryType,
+} from '@/action-menu/types/ActionMenuEntry';
 import { contextStoreFiltersComponentState } from '@/context-store/states/contextStoreFiltersComponentState';
 import { contextStoreNumberOfSelectedRecordsComponentState } from '@/context-store/states/contextStoreNumberOfSelectedRecordsComponentState';
 import { contextStoreTargetedRecordsRuleComponentState } from '@/context-store/states/contextStoreTargetedRecordsRuleComponentState';
@@ -105,8 +109,8 @@ export const DeleteRecordsActionEffect = ({
   useEffect(() => {
     if (canDelete) {
       addActionMenuEntry({
-        type: 'standard',
+        type: ActionMenuEntryType.Standard,
-        scope: 'record-selection',
+        scope: ActionMenuEntryScope.RecordSelection,
         key: 'delete',
         label: 'Delete',
         position,

packages/twenty-front/src/modules/action-menu/actions/record-actions/components/ExportRecordsActionEffect.tsx

@@ -4,6 +4,10 @@ import { ObjectMetadataItem } from '@/object-metadata/types/ObjectMetadataItem';
 import { useRecoilComponentValueV2 } from '@/ui/utilities/state/component-state/hooks/useRecoilComponentValueV2';
 import { IconDatabaseExport } from 'twenty-ui';
 
+import {
+  ActionMenuEntryScope,
+  ActionMenuEntryType,
+} from '@/action-menu/types/ActionMenuEntry';
 import {
   displayedExportProgress,
   useExportRecords,
@@ -31,8 +35,11 @@ export const ExportRecordsActionEffect = ({
 
   useEffect(() => {
     addActionMenuEntry({
-      type: 'standard',
+      type: ActionMenuEntryType.Standard,
-      scope: 'record-selection',
+      scope:
+        contextStoreNumberOfSelectedRecords > 0
+          ? ActionMenuEntryScope.RecordSelection
+          : ActionMenuEntryScope.Global,
       key: 'export',
       position,
       label: displayedExportProgress(

packages/twenty-front/src/modules/action-menu/actions/record-actions/components/ManageFavoritesActionEffect.tsx

@@ -1,4 +1,8 @@
 import { useActionMenuEntries } from '@/action-menu/hooks/useActionMenuEntries';
+import {
+  ActionMenuEntryScope,
+  ActionMenuEntryType,
+} from '@/action-menu/types/ActionMenuEntry';
 import { contextStoreTargetedRecordsRuleComponentState } from '@/context-store/states/contextStoreTargetedRecordsRuleComponentState';
 import { useCreateFavorite } from '@/favorites/hooks/useCreateFavorite';
 import { useDeleteFavorite } from '@/favorites/hooks/useDeleteFavorite';
@@ -50,8 +54,8 @@ export const ManageFavoritesActionEffect = ({
     }
 
     addActionMenuEntry({
-      type: 'standard',
+      type: ActionMenuEntryType.Standard,
-      scope: 'record-selection',
+      scope: ActionMenuEntryScope.RecordSelection,
       key: 'manage-favorites',
       label: isFavorite ? 'Remove from favorites' : 'Add to favorites',
       position,

packages/twenty-front/src/modules/action-menu/actions/record-actions/workflow-run-record-actions/components/WorkflowRunRecordActionEffect.tsx

@@ -1,4 +1,8 @@
 import { useActionMenuEntries } from '@/action-menu/hooks/useActionMenuEntries';
+import {
+  ActionMenuEntryScope,
+  ActionMenuEntryType,
+} from '@/action-menu/types/ActionMenuEntry';
 import { contextStoreTargetedRecordsRuleComponentState } from '@/context-store/states/contextStoreTargetedRecordsRuleComponentState';
 import { ObjectMetadataItem } from '@/object-metadata/types/ObjectMetadataItem';
 import { recordStoreFamilyState } from '@/object-record/record-store/states/recordStoreFamilyState';
@@ -55,9 +59,9 @@ export const WorkflowRunRecordActionEffect = ({
       activeWorkflowVersion,
     ] of activeWorkflowVersions.entries()) {
       addActionMenuEntry({
-        type: 'workflow-run',
+        type: ActionMenuEntryType.WorkflowRun,
         key: `workflow-run-${activeWorkflowVersion.id}`,
-        scope: 'record-selection',
+        scope: ActionMenuEntryScope.RecordSelection,
         label: capitalize(activeWorkflowVersion.workflow.name),
         position: index,
         Icon: IconSettingsAutomation,

packages/twenty-front/src/modules/action-menu/components/RightDrawerActionMenuDropdown.tsx

@@ -1,5 +1,6 @@
 import { actionMenuEntriesComponentSelector } from '@/action-menu/states/actionMenuEntriesComponentSelector';
 import { ActionMenuComponentInstanceContext } from '@/action-menu/states/contexts/ActionMenuComponentInstanceContext';
+import { ActionMenuEntryScope } from '@/action-menu/types/ActionMenuEntry';
 import { RightDrawerActionMenuDropdownHotkeyScope } from '@/action-menu/types/RightDrawerActionMenuDropdownHotkeyScope';
 import { getRightDrawerActionMenuDropdownIdFromActionMenuId } from '@/action-menu/utils/getRightDrawerActionMenuDropdownIdFromActionMenuId';
 import { Dropdown } from '@/ui/layout/dropdown/components/Dropdown';
@@ -67,7 +68,8 @@ export const RightDrawerActionMenuDropdown = () => {
         <DropdownMenuItemsContainer>
           {actionMenuEntries
             .filter(
-              (actionMenuEntry) => actionMenuEntry.scope === 'record-selection',
+              (actionMenuEntry) =>
+                actionMenuEntry.scope === ActionMenuEntryScope.RecordSelection,
             )
             .map((actionMenuEntry, index) => (
               <MenuItem

packages/twenty-front/src/modules/action-menu/components/__stories__/RecordIndexActionMenuBar.stories.tsx

@@ -5,7 +5,11 @@ import { RecoilRoot } from 'recoil';
 import { RecordIndexActionMenuBar } from '@/action-menu/components/RecordIndexActionMenuBar';
 import { actionMenuEntriesComponentState } from '@/action-menu/states/actionMenuEntriesComponentState';
 import { ActionMenuComponentInstanceContext } from '@/action-menu/states/contexts/ActionMenuComponentInstanceContext';
-import { ActionMenuEntry } from '@/action-menu/types/ActionMenuEntry';
+import {
+  ActionMenuEntry,
+  ActionMenuEntryScope,
+  ActionMenuEntryType,
+} from '@/action-menu/types/ActionMenuEntry';
 import { getActionBarIdFromActionMenuId } from '@/action-menu/utils/getActionBarIdFromActionMenuId';
 import { ContextStoreComponentInstanceContext } from '@/context-store/states/contexts/ContextStoreComponentInstanceContext';
 import { contextStoreNumberOfSelectedRecordsComponentState } from '@/context-store/states/contextStoreNumberOfSelectedRecordsComponentState';
@@ -48,8 +52,8 @@ const meta: Meta<typeof RecordIndexActionMenuBar> = {
 
             map.set('delete', {
               isPinned: true,
-              scope: 'record-selection',
+              scope: ActionMenuEntryScope.RecordSelection,
-              type: 'standard',
+              type: ActionMenuEntryType.Standard,
               key: 'delete',
               label: 'Delete',
               position: 0,

packages/twenty-front/src/modules/action-menu/components/__stories__/RecordIndexActionMenuBarEntry.stories.tsx

@@ -1,4 +1,8 @@
 import { RecordIndexActionMenuBarEntry } from '@/action-menu/components/RecordIndexActionMenuBarEntry';
+import {
+  ActionMenuEntryScope,
+  ActionMenuEntryType,
+} from '@/action-menu/types/ActionMenuEntry';
 import { expect, jest } from '@storybook/jest';
 import { Meta, StoryObj } from '@storybook/react';
 import { userEvent, within } from '@storybook/testing-library';
@@ -21,8 +25,8 @@ const markAsDoneMock = jest.fn();
 export const Default: Story = {
   args: {
     entry: {
-      type: 'standard',
+      type: ActionMenuEntryType.Standard,
-      scope: 'record-selection',
+      scope: ActionMenuEntryScope.RecordSelection,
       key: 'delete',
       label: 'Delete',
       position: 0,
@@ -35,8 +39,8 @@ export const Default: Story = {
 export const WithDangerAccent: Story = {
   args: {
     entry: {
-      type: 'standard',
+      type: ActionMenuEntryType.Standard,
-      scope: 'record-selection',
+      scope: ActionMenuEntryScope.RecordSelection,
       key: 'delete',
       label: 'Delete',
       position: 0,
@@ -50,8 +54,8 @@ export const WithDangerAccent: Story = {
 export const WithInteraction: Story = {
   args: {
     entry: {
-      type: 'standard',
+      type: ActionMenuEntryType.Standard,
-      scope: 'record-selection',
+      scope: ActionMenuEntryScope.RecordSelection,
       key: 'markAsDone',
       label: 'Mark as done',
       position: 0,

packages/twenty-front/src/modules/action-menu/components/__stories__/RecordIndexActionMenuDropdown.stories.tsx

@@ -7,7 +7,11 @@ import { RecordIndexActionMenuDropdown } from '@/action-menu/components/RecordIn
 import { actionMenuEntriesComponentState } from '@/action-menu/states/actionMenuEntriesComponentState';
 import { ActionMenuComponentInstanceContext } from '@/action-menu/states/contexts/ActionMenuComponentInstanceContext';
 import { recordIndexActionMenuDropdownPositionComponentState } from '@/action-menu/states/recordIndexActionMenuDropdownPositionComponentState';
-import { ActionMenuEntry } from '@/action-menu/types/ActionMenuEntry';
+import {
+  ActionMenuEntry,
+  ActionMenuEntryScope,
+  ActionMenuEntryType,
+} from '@/action-menu/types/ActionMenuEntry';
 import { isDropdownOpenComponentState } from '@/ui/layout/dropdown/states/isDropdownOpenComponentState';
 import { extractComponentState } from '@/ui/utilities/state/component-state/utils/extractComponentState';
 import { IconCheckbox, IconHeart, IconTrash } from 'twenty-ui';
@@ -41,8 +45,8 @@ const meta: Meta<typeof RecordIndexActionMenuDropdown> = {
           );
 
           map.set('delete', {
-            type: 'standard',
+            type: ActionMenuEntryType.Standard,
-            scope: 'record-selection',
+            scope: ActionMenuEntryScope.RecordSelection,
             key: 'delete',
             label: 'Delete',
             position: 0,
@@ -51,8 +55,8 @@ const meta: Meta<typeof RecordIndexActionMenuDropdown> = {
           });
 
           map.set('markAsDone', {
-            type: 'standard',
+            type: ActionMenuEntryType.Standard,
-            scope: 'record-selection',
+            scope: ActionMenuEntryScope.RecordSelection,
             key: 'markAsDone',
             label: 'Mark as done',
             position: 1,
@@ -61,8 +65,8 @@ const meta: Meta<typeof RecordIndexActionMenuDropdown> = {
           });
 
           map.set('addToFavorites', {
-            type: 'standard',
+            type: ActionMenuEntryType.Standard,
-            scope: 'record-selection',
+            scope: ActionMenuEntryScope.RecordSelection,
             key: 'addToFavorites',
             label: 'Add to favorites',
             position: 2,

packages/twenty-front/src/modules/action-menu/components/__stories__/RecordShowActionMenuBar.stories.tsx

@@ -5,7 +5,11 @@ import { RecoilRoot } from 'recoil';
 import { RightDrawerActionMenuDropdown } from '@/action-menu/components/RightDrawerActionMenuDropdown';
 import { actionMenuEntriesComponentState } from '@/action-menu/states/actionMenuEntriesComponentState';
 import { ActionMenuComponentInstanceContext } from '@/action-menu/states/contexts/ActionMenuComponentInstanceContext';
-import { ActionMenuEntry } from '@/action-menu/types/ActionMenuEntry';
+import {
+  ActionMenuEntry,
+  ActionMenuEntryScope,
+  ActionMenuEntryType,
+} from '@/action-menu/types/ActionMenuEntry';
 import { contextStoreNumberOfSelectedRecordsComponentState } from '@/context-store/states/contextStoreNumberOfSelectedRecordsComponentState';
 import { contextStoreTargetedRecordsRuleComponentState } from '@/context-store/states/contextStoreTargetedRecordsRuleComponentState';
 import { userEvent, waitFor, within } from '@storybook/test';
@@ -54,8 +58,8 @@ const meta: Meta<typeof RightDrawerActionMenuDropdown> = {
           );
 
           map.set('addToFavorites', {
-            type: 'standard',
+            type: ActionMenuEntryType.Standard,
-            scope: 'record-selection',
+            scope: ActionMenuEntryScope.RecordSelection,
             key: 'addToFavorites',
             label: 'Add to favorites',
             position: 0,
@@ -64,8 +68,8 @@ const meta: Meta<typeof RightDrawerActionMenuDropdown> = {
           });
 
           map.set('export', {
-            type: 'standard',
+            type: ActionMenuEntryType.Standard,
-            scope: 'record-selection',
+            scope: ActionMenuEntryScope.RecordSelection,
             key: 'export',
             label: 'Export',
             position: 1,
@@ -74,8 +78,8 @@ const meta: Meta<typeof RightDrawerActionMenuDropdown> = {
           });
 
           map.set('delete', {
-            type: 'standard',
+            type: ActionMenuEntryType.Standard,
-            scope: 'record-selection',
+            scope: ActionMenuEntryScope.RecordSelection,
             key: 'delete',
             label: 'Delete',
             position: 2,

packages/twenty-front/src/modules/action-menu/types/ActionMenuEntry.ts

@@ -1,9 +1,19 @@
 import { MouseEvent, ReactNode } from 'react';
 import { IconComponent, MenuItemAccent } from 'twenty-ui';
 
+export enum ActionMenuEntryType {
+  Standard = 'Standard',
+  WorkflowRun = 'WorkflowRun',
+}
+
+export enum ActionMenuEntryScope {
+  Global = 'Global',
+  RecordSelection = 'RecordSelection',
+}
+
 export type ActionMenuEntry = {
-  type: 'standard' | 'workflow-run';
+  type: ActionMenuEntryType;
-  scope: 'global' | 'record-selection';
+  scope: ActionMenuEntryScope;
   key: string;
   label: string;
   position: number;

packages/twenty-front/src/modules/command-menu/components/CommandMenu.tsx

@@ -12,7 +12,11 @@ import { useCommandMenu } from '@/command-menu/hooks/useCommandMenu';
 import { commandMenuCommandsState } from '@/command-menu/states/commandMenuCommandsState';
 import { commandMenuSearchState } from '@/command-menu/states/commandMenuSearchState';
 import { isCommandMenuOpenedState } from '@/command-menu/states/isCommandMenuOpenedState';
-import { Command, CommandType } from '@/command-menu/types/Command';
+import {
+  Command,
+  CommandScope,
+  CommandType,
+} from '@/command-menu/types/Command';
 import { Company } from '@/companies/types/Company';
 import { contextStoreNumberOfSelectedRecordsComponentState } from '@/context-store/states/contextStoreNumberOfSelectedRecordsComponentState';
 import { contextStoreTargetedRecordsRuleComponentState } from '@/context-store/states/contextStoreTargetedRecordsRuleComponentState';
@@ -363,20 +367,45 @@ export const CommandMenu = () => {
         : true) && cmd.type === CommandType.Create,
   );
 
-  const matchingStandardActionCommands = commandMenuCommands.filter(
+  const matchingStandardActionRecordSelectionCommands =
+    commandMenuCommands.filter(
       (cmd) =>
         (deferredCommandMenuSearch.length > 0
           ? checkInShortcuts(cmd, deferredCommandMenuSearch) ||
             checkInLabels(cmd, deferredCommandMenuSearch)
-        : true) && cmd.type === CommandType.StandardAction,
+          : true) &&
+        cmd.type === CommandType.StandardAction &&
+        cmd.scope === CommandScope.RecordSelection,
     );
 
-  const matchingWorkflowRunCommands = commandMenuCommands.filter(
+  const matchingStandardActionGlobalCommands = commandMenuCommands.filter(
     (cmd) =>
       (deferredCommandMenuSearch.length > 0
         ? checkInShortcuts(cmd, deferredCommandMenuSearch) ||
           checkInLabels(cmd, deferredCommandMenuSearch)
-        : true) && cmd.type === CommandType.WorkflowRun,
+        : true) &&
+      cmd.type === CommandType.StandardAction &&
+      cmd.scope === CommandScope.Global,
+  );
+
+  const matchingWorkflowRunRecordSelectionCommands = commandMenuCommands.filter(
+    (cmd) =>
+      (deferredCommandMenuSearch.length > 0
+        ? checkInShortcuts(cmd, deferredCommandMenuSearch) ||
+          checkInLabels(cmd, deferredCommandMenuSearch)
+        : true) &&
+      cmd.type === CommandType.WorkflowRun &&
+      cmd.scope === CommandScope.RecordSelection,
+  );
+
+  const matchingWorkflowRunGlobalCommands = commandMenuCommands.filter(
+    (cmd) =>
+      (deferredCommandMenuSearch.length > 0
+        ? checkInShortcuts(cmd, deferredCommandMenuSearch) ||
+          checkInLabels(cmd, deferredCommandMenuSearch)
+        : true) &&
+      cmd.type === CommandType.WorkflowRun &&
+      cmd.scope === CommandScope.Global,
   );
 
   useListenClickOutside({
@@ -404,8 +433,10 @@ export const CommandMenu = () => {
 
   const selectableItemIds = copilotCommands
     .map((cmd) => cmd.id)
-    .concat(matchingStandardActionCommands.map((cmd) => cmd.id))
+    .concat(matchingStandardActionRecordSelectionCommands.map((cmd) => cmd.id))
-    .concat(matchingWorkflowRunCommands.map((cmd) => cmd.id))
+    .concat(matchingWorkflowRunRecordSelectionCommands.map((cmd) => cmd.id))
+    .concat(matchingStandardActionGlobalCommands.map((cmd) => cmd.id))
+    .concat(matchingWorkflowRunGlobalCommands.map((cmd) => cmd.id))
     .concat(matchingCreateCommand.map((cmd) => cmd.id))
     .concat(matchingNavigateCommand.map((cmd) => cmd.id))
     .concat(people?.map((person) => person.id))
@@ -422,8 +453,10 @@ export const CommandMenu = () => {
     );
 
   const isNoResults =
-    !matchingStandardActionCommands.length &&
+    !matchingStandardActionRecordSelectionCommands.length &&
-    !matchingWorkflowRunCommands.length &&
+    !matchingWorkflowRunRecordSelectionCommands.length &&
+    !matchingStandardActionGlobalCommands.length &&
+    !matchingWorkflowRunGlobalCommands.length &&
     !matchingCreateCommand.length &&
     !matchingNavigateCommand.length &&
     !people?.length &&
@@ -599,38 +632,82 @@ export const CommandMenu = () => {
                       </SelectableItem>
                     </CommandGroup>
                   )}
-                  <CommandGroup heading="Standard Actions">
+                  <CommandGroup heading="Record Selection">
-                    {matchingStandardActionCommands?.map(
+                    {matchingStandardActionRecordSelectionCommands?.map(
-                      (standardActionCommand) => (
+                      (standardActionrecordSelectionCommand) => (
                         <SelectableItem
-                          itemId={standardActionCommand.id}
+                          itemId={standardActionrecordSelectionCommand.id}
-                          key={standardActionCommand.id}
+                          key={standardActionrecordSelectionCommand.id}
                         >
                           <CommandMenuItem
-                            id={standardActionCommand.id}
+                            id={standardActionrecordSelectionCommand.id}
-                            label={standardActionCommand.label}
+                            label={standardActionrecordSelectionCommand.label}
-                            Icon={standardActionCommand.Icon}
+                            Icon={standardActionrecordSelectionCommand.Icon}
-                            onClick={standardActionCommand.onCommandClick}
+                            onClick={
+                              standardActionrecordSelectionCommand.onCommandClick
+                            }
+                          />
+                        </SelectableItem>
+                      ),
+                    )}
+                    {matchingWorkflowRunRecordSelectionCommands?.map(
+                      (workflowRunRecordSelectionCommand) => (
+                        <SelectableItem
+                          itemId={workflowRunRecordSelectionCommand.id}
+                          key={workflowRunRecordSelectionCommand.id}
+                        >
+                          <CommandMenuItem
+                            id={workflowRunRecordSelectionCommand.id}
+                            label={workflowRunRecordSelectionCommand.label}
+                            Icon={workflowRunRecordSelectionCommand.Icon}
+                            onClick={
+                              workflowRunRecordSelectionCommand.onCommandClick
+                            }
                           />
                         </SelectableItem>
                       ),
                     )}
                   </CommandGroup>
-                  <CommandGroup heading="Workflows">
+                  {matchingStandardActionGlobalCommands?.length > 0 && (
-                    {matchingWorkflowRunCommands?.map((workflowRunCommand) => (
+                    <CommandGroup heading="View">
+                      {matchingStandardActionGlobalCommands?.map(
+                        (standardActionGlobalCommand) => (
                           <SelectableItem
-                        itemId={workflowRunCommand.id}
+                            itemId={standardActionGlobalCommand.id}
-                        key={workflowRunCommand.id}
+                            key={standardActionGlobalCommand.id}
                           >
                             <CommandMenuItem
-                          id={workflowRunCommand.id}
+                              id={standardActionGlobalCommand.id}
-                          label={workflowRunCommand.label}
+                              label={standardActionGlobalCommand.label}
-                          Icon={workflowRunCommand.Icon}
+                              Icon={standardActionGlobalCommand.Icon}
-                          onClick={workflowRunCommand.onCommandClick}
+                              onClick={
+                                standardActionGlobalCommand.onCommandClick
+                              }
                             />
                           </SelectableItem>
-                    ))}
+                        ),
+                      )}
                     </CommandGroup>
+                  )}
+                  {matchingWorkflowRunGlobalCommands?.length > 0 && (
+                    <CommandGroup heading="Workflows">
+                      {matchingWorkflowRunGlobalCommands?.map(
+                        (workflowRunGlobalCommand) => (
+                          <SelectableItem
+                            itemId={workflowRunGlobalCommand.id}
+                            key={workflowRunGlobalCommand.id}
+                          >
+                            <CommandMenuItem
+                              id={workflowRunGlobalCommand.id}
+                              label={workflowRunGlobalCommand.label}
+                              Icon={workflowRunGlobalCommand.Icon}
+                              onClick={workflowRunGlobalCommand.onCommandClick}
+                            />
+                          </SelectableItem>
+                        ),
+                      )}
+                    </CommandGroup>
+                  )}
 
                   {commandGroups.map(({ heading, items, renderItem }) =>
                     items?.length ? (

packages/twenty-front/src/modules/command-menu/types/Command.ts

@@ -1,5 +1,4 @@
 import { IconComponent } from 'twenty-ui';
-
 export enum CommandType {
   Navigate = 'Navigate',
   Create = 'Create',
@@ -7,15 +6,17 @@ export enum CommandType {
   WorkflowRun = 'WorkflowRun',
 }
 
+export enum CommandScope {
+  Global = 'Global',
+  RecordSelection = 'RecordSelection',
+}
+
 export type Command = {
   id: string;
   to?: string;
   label: string;
-  type?:
+  type?: CommandType;
-    | CommandType.Navigate
+  scope?: CommandScope;
-    | CommandType.Create
-    | CommandType.StandardAction
-    | CommandType.WorkflowRun;
   Icon?: IconComponent;
   firstHotKey?: string;
   secondHotKey?: string;

packages/twenty-front/src/modules/command-menu/utils/computeCommandMenuCommands.ts

@@ -1,30 +1,52 @@
-import { ActionMenuEntry } from '@/action-menu/types/ActionMenuEntry';
+import {
+  ActionMenuEntry,
+  ActionMenuEntryScope,
+  ActionMenuEntryType,
+} from '@/action-menu/types/ActionMenuEntry';
 import { COMMAND_MENU_COMMANDS } from '@/command-menu/constants/CommandMenuCommands';
-import { CommandType } from '@/command-menu/types/Command';
+import {
+  Command,
+  CommandScope,
+  CommandType,
+} from '@/command-menu/types/Command';
 
 export const computeCommandMenuCommands = (
   actionMenuEntries: ActionMenuEntry[],
-) => {
+): Command[] => {
   const commands = Object.values(COMMAND_MENU_COMMANDS);
 
-  const actionCommands = actionMenuEntries
+  const actionCommands: Command[] = actionMenuEntries
-    ?.filter((actionMenuEntry) => actionMenuEntry.type === 'standard')
+    ?.filter(
+      (actionMenuEntry) =>
+        actionMenuEntry.type === ActionMenuEntryType.Standard,
+    )
     ?.map((actionMenuEntry) => ({
       id: actionMenuEntry.key,
       label: actionMenuEntry.label,
       Icon: actionMenuEntry.Icon,
       onCommandClick: actionMenuEntry.onClick,
       type: CommandType.StandardAction,
+      scope:
+        actionMenuEntry.scope === ActionMenuEntryScope.RecordSelection
+          ? CommandScope.RecordSelection
+          : CommandScope.Global,
     }));
 
-  const workflowRunCommands = actionMenuEntries
+  const workflowRunCommands: Command[] = actionMenuEntries
-    ?.filter((actionMenuEntry) => actionMenuEntry.type === 'workflow-run')
+    ?.filter(
+      (actionMenuEntry) =>
+        actionMenuEntry.type === ActionMenuEntryType.WorkflowRun,
+    )
     ?.map((actionMenuEntry) => ({
       id: actionMenuEntry.key,
       label: actionMenuEntry.label,
       Icon: actionMenuEntry.Icon,
       onCommandClick: actionMenuEntry.onClick,
       type: CommandType.WorkflowRun,
+      scope:
+        actionMenuEntry.scope === ActionMenuEntryScope.RecordSelection
+          ? CommandScope.RecordSelection
+          : CommandScope.Global,
     }));
 
   return [...commands, ...actionCommands, ...workflowRunCommands];