Skip to content

The open alternative to Salesforce, designed for AI.

Show pinned command menu actions as icons on mobile headers (#24156)

Félix Malfaitb91b8bea0eb6
diff --git a/packages/twenty-front/src/modules/command-menu-item/components/RecordIndexCommandMenu.tsx b/packages/twenty-front/src/modules/command-menu-item/components/RecordIndexCommandMenu.tsx
index 9c6349a52df..5c6e874b098 100644
--- a/packages/twenty-front/src/modules/command-menu-item/components/RecordIndexCommandMenu.tsx
+++ b/packages/twenty-front/src/modules/command-menu-item/components/RecordIndexCommandMenu.tsx
@@ -1,3 +1,4 @@
+import { CommandMenuItemContainerType } from '@/command-menu-item/types/CommandMenuItemContainerType';
import { RecordIndexCommandMenuDropdown } from '@/command-menu-item/components/RecordIndexCommandMenuDropdown';
import { CommandMenuContextProvider } from '@/command-menu-item/contexts/CommandMenuContextProvider';
import { PinnedCommandMenuItemButtons } from '@/command-menu-item/display/components/PinnedCommandMenuItemButtons';
@@ -7,7 +8,6 @@ import { contextStoreCurrentObjectMetadataItemIdComponentState } from '@/context
import { isLayoutCustomizationModeEnabledState } from '@/layout-customization/states/isLayoutCustomizationModeEnabledState';
import { useAtomComponentStateValue } from '@/ui/utilities/state/jotai/hooks/useAtomComponentStateValue';
import { useAtomStateValue } from '@/ui/utilities/state/jotai/hooks/useAtomStateValue';
-import { useIsMobile } from 'twenty-ui/utilities';
export const RecordIndexCommandMenu = () => {
const contextStoreCurrentObjectMetadataItemId = useAtomComponentStateValue(
@@ -15,7 +15,6 @@ export const RecordIndexCommandMenu = () => {
MAIN_CONTEXT_STORE_INSTANCE_ID,
);
- const isMobile = useIsMobile();
const isLayoutCustomizationModeEnabled = useAtomStateValue(
isLayoutCustomizationModeEnabledState,
);
@@ -27,15 +26,15 @@ export const RecordIndexCommandMenu = () => {
<CommandMenuContextProvider
isInSidePanel={false}
displayType="button"
- containerType="index-page-header"
+ containerType={CommandMenuItemContainerType.IndexPageHeader}
isInPreviewMode={isLayoutCustomizationModeEnabled}
>
- {!isMobile && <PinnedCommandMenuItemButtons />}
+ <PinnedCommandMenuItemButtons />
</CommandMenuContextProvider>
<CommandMenuContextProvider
isInSidePanel={false}
displayType="dropdownItem"
- containerType="index-page-dropdown"
+ containerType={CommandMenuItemContainerType.IndexPageDropdown}
>
<RecordIndexCommandMenuDropdown />
</CommandMenuContextProvider>
diff --git a/packages/twenty-front/src/modules/command-menu-item/components/RecordPageSidePanelCommandMenu.tsx b/packages/twenty-front/src/modules/command-menu-item/components/RecordPageSidePanelCommandMenu.tsx
index 9132a6f7f18..625eca788f8 100644
--- a/packages/twenty-front/src/modules/command-menu-item/components/RecordPageSidePanelCommandMenu.tsx
+++ b/packages/twenty-front/src/modules/command-menu-item/components/RecordPageSidePanelCommandMenu.tsx
@@ -1,3 +1,4 @@
+import { CommandMenuItemContainerType } from '@/command-menu-item/types/CommandMenuItemContainerType';
import { RecordPageSidePanelCommandMenuDropdown } from '@/command-menu-item/components/RecordPageSidePanelCommandMenuDropdown';
import { CommandMenuContextProvider } from '@/command-menu-item/contexts/CommandMenuContextProvider';
import { contextStoreCurrentObjectMetadataItemIdComponentState } from '@/context-store/states/contextStoreCurrentObjectMetadataItemIdComponentState';
@@ -14,7 +15,9 @@ export const RecordPageSidePanelCommandMenu = () => {
<CommandMenuContextProvider
isInSidePanel={true}
displayType="dropdownItem"
- containerType="command-menu-show-page-dropdown"
+ containerType={
+ CommandMenuItemContainerType.CommandMenuShowPageDropdown
+ }
>
<RecordPageSidePanelCommandMenuDropdown />
</CommandMenuContextProvider>
diff --git a/packages/twenty-front/src/modules/command-menu-item/components/RecordPageSidePanelPinnedCommandMenuItems.tsx b/packages/twenty-front/src/modules/command-menu-item/components/RecordPageSidePanelPinnedCommandMenuItems.tsx
index 12430c524c3..fb28ecdc07d 100644
--- a/packages/twenty-front/src/modules/command-menu-item/components/RecordPageSidePanelPinnedCommandMenuItems.tsx
+++ b/packages/twenty-front/src/modules/command-menu-item/components/RecordPageSidePanelPinnedCommandMenuItems.tsx
@@ -1,3 +1,4 @@
+import { CommandMenuItemContainerType } from '@/command-menu-item/types/CommandMenuItemContainerType';
import { isDefined } from 'twenty-shared/utils';
import { CommandMenuContextProvider } from '@/command-menu-item/contexts/CommandMenuContextProvider';
@@ -18,7 +19,7 @@ export const RecordPageSidePanelPinnedCommandMenuItems = () => {
<CommandMenuContextProvider
isInSidePanel={true}
displayType="button"
- containerType="side-panel-footer"
+ containerType={CommandMenuItemContainerType.SidePanelFooter}
>
<PinnedCommandMenuItemButtons />
</CommandMenuContextProvider>
diff --git a/packages/twenty-front/src/modules/command-menu-item/components/RecordShowCommandMenu.tsx b/packages/twenty-front/src/modules/command-menu-item/components/RecordShowCommandMenu.tsx
index ff60df0646e..ad8da0326fc 100644
--- a/packages/twenty-front/src/modules/command-menu-item/components/RecordShowCommandMenu.tsx
+++ b/packages/twenty-front/src/modules/command-menu-item/components/RecordShowCommandMenu.tsx
@@ -1,3 +1,4 @@
+import { CommandMenuItemContainerType } from '@/command-menu-item/types/CommandMenuItemContainerType';
import { CommandMenuContextProvider } from '@/command-menu-item/contexts/CommandMenuContextProvider';
import { PinnedCommandMenuItemButtons } from '@/command-menu-item/display/components/PinnedCommandMenuItemButtons';
import { CommandMenuItemEditButton } from '@/command-menu-item/edit/components/CommandMenuItemEditButton';
@@ -7,7 +8,6 @@ import { contextStoreTargetedRecordsRuleComponentState } from '@/context-store/s
import { isLayoutCustomizationModeEnabledState } from '@/layout-customization/states/isLayoutCustomizationModeEnabledState';
import { useAtomComponentStateValue } from '@/ui/utilities/state/jotai/hooks/useAtomComponentStateValue';
import { useAtomStateValue } from '@/ui/utilities/state/jotai/hooks/useAtomStateValue';
-import { useIsMobile } from 'twenty-ui/utilities';
export const RecordShowCommandMenu = () => {
const contextStoreCurrentObjectMetadataItemId = useAtomComponentStateValue(
@@ -24,7 +24,6 @@ export const RecordShowCommandMenu = () => {
contextStoreTargetedRecordsRule.mode === 'selection' &&
contextStoreTargetedRecordsRule.selectedRecordIds.length === 1;
- const isMobile = useIsMobile();
const isLayoutCustomizationModeEnabled = useAtomStateValue(
isLayoutCustomizationModeEnabledState,
);
@@ -36,10 +35,10 @@ export const RecordShowCommandMenu = () => {
<CommandMenuContextProvider
isInSidePanel={false}
displayType="button"
- containerType="show-page-header"
+ containerType={CommandMenuItemContainerType.ShowPageHeader}
isInPreviewMode={isLayoutCustomizationModeEnabled}
>
- {!isMobile && <PinnedCommandMenuItemButtons />}
+ <PinnedCommandMenuItemButtons />
</CommandMenuContextProvider>
<CommandMenuItemEditButton />
</>
diff --git a/packages/twenty-front/src/modules/command-menu-item/components/StandalonePageCommandMenu.tsx b/packages/twenty-front/src/modules/command-menu-item/components/StandalonePageCommandMenu.tsx
index c81b5e8beb1..7f748fc7554 100644
--- a/packages/twenty-front/src/modules/command-menu-item/components/StandalonePageCommandMenu.tsx
+++ b/packages/twenty-front/src/modules/command-menu-item/components/StandalonePageCommandMenu.tsx
@@ -1,3 +1,4 @@
+import { CommandMenuItemContainerType } from '@/command-menu-item/types/CommandMenuItemContainerType';
import { currentUserState } from '@/auth/states/currentUserState';
import { currentUserWorkspaceState } from '@/auth/states/currentUserWorkspaceState';
import { currentWorkspaceState } from '@/auth/states/currentWorkspaceState';
@@ -19,12 +20,10 @@ import {
type CommandMenuContextApi,
} from 'twenty-shared/types';
import { evaluateConditionalAvailabilityExpression } from 'twenty-shared/utils';
-import { useIsMobile } from 'twenty-ui/utilities';
import { CommandMenuItemAvailabilityType } from '~/generated-metadata/graphql';
export const StandalonePageCommandMenu = () => {
const store = useStore();
- const isMobile = useIsMobile();
const commandMenuItems = useAtomStateValue(commandMenuItemsSelector);
const currentWorkspace = useAtomStateValue(currentWorkspaceState);
const currentUserWorkspace = useAtomStateValue(currentUserWorkspaceState);
@@ -128,13 +127,13 @@ export const StandalonePageCommandMenu = () => {
<CommandMenuContext.Provider
value={{
displayType: 'button',
- containerType: 'standalone-page-header',
+ containerType: CommandMenuItemContainerType.StandalonePageHeader,
commandMenuItems: filteredCommandMenuItems,
commandMenuContextApi,
isInPreviewMode: false,
}}
>
- {!isMobile && <PinnedCommandMenuItemButtons />}
+ <PinnedCommandMenuItemButtons />
<CommandMenuItemEditButton />
</CommandMenuContext.Provider>
);
diff --git a/packages/twenty-front/src/modules/command-menu-item/components/__stories__/RecordIndexCommandMenuDropdown.stories.tsx b/packages/twenty-front/src/modules/command-menu-item/components/__stories__/RecordIndexCommandMenuDropdown.stories.tsx
index 8788ef4bd84..df9ca7284bf 100644
--- a/packages/twenty-front/src/modules/command-menu-item/components/__stories__/RecordIndexCommandMenuDropdown.stories.tsx
+++ b/packages/twenty-front/src/modules/command-menu-item/components/__stories__/RecordIndexCommandMenuDropdown.stories.tsx
@@ -1,3 +1,4 @@
+import { CommandMenuItemContainerType } from '@/command-menu-item/types/CommandMenuItemContainerType';
import { type Meta, type StoryObj } from '@storybook/react-vite';
import { Provider as JotaiProvider } from 'jotai';
import { expect, within } from 'storybook/test';
@@ -42,7 +43,7 @@ const meta: Meta<typeof RecordIndexCommandMenuDropdown> = {
<CommandMenuContext.Provider
value={{
displayType: 'dropdownItem',
- containerType: 'index-page-dropdown',
+ containerType: CommandMenuItemContainerType.IndexPageDropdown,
commandMenuItems: createMockCommandMenuItems(),
commandMenuContextApi: EMPTY_COMMAND_MENU_CONTEXT_API,
isInPreviewMode: false,
diff --git a/packages/twenty-front/src/modules/command-menu-item/components/__stories__/RecordShowSidePanelCommandMenuDropdown.stories.tsx b/packages/twenty-front/src/modules/command-menu-item/components/__stories__/RecordShowSidePanelCommandMenuDropdown.stories.tsx
index 6dcf803d84e..8533ab499be 100644
--- a/packages/twenty-front/src/modules/command-menu-item/components/__stories__/RecordShowSidePanelCommandMenuDropdown.stories.tsx
+++ b/packages/twenty-front/src/modules/command-menu-item/components/__stories__/RecordShowSidePanelCommandMenuDropdown.stories.tsx
@@ -1,3 +1,4 @@
+import { CommandMenuItemContainerType } from '@/command-menu-item/types/CommandMenuItemContainerType';
import { type Meta, type StoryObj } from '@storybook/react-vite';
import { Provider as JotaiProvider } from 'jotai';
import { userEvent, within } from 'storybook/test';
@@ -38,7 +39,8 @@ const meta: Meta<typeof RecordPageSidePanelCommandMenuDropdown> = {
<CommandMenuContext.Provider
value={{
displayType: 'dropdownItem',
- containerType: 'command-menu-show-page-dropdown',
+ containerType:
+ CommandMenuItemContainerType.CommandMenuShowPageDropdown,
commandMenuItems: createMockCommandMenuItems(),
commandMenuContextApi: {
...EMPTY_COMMAND_MENU_CONTEXT_API,
diff --git a/packages/twenty-front/src/modules/command-menu-item/contexts/CommandMenuContext.ts b/packages/twenty-front/src/modules/command-menu-item/contexts/CommandMenuContext.ts
index e5fad7c5150..46bc547b683 100644
--- a/packages/twenty-front/src/modules/command-menu-item/contexts/CommandMenuContext.ts
+++ b/packages/twenty-front/src/modules/command-menu-item/contexts/CommandMenuContext.ts
@@ -1,5 +1,5 @@
import { EMPTY_COMMAND_MENU_CONTEXT_API } from '@/command-menu-item/constants/EmptyCommandMenuContextApi';
-import { type CommandMenuItemContainerType } from '@/command-menu-item/types/CommandMenuItemContainerType';
+import { CommandMenuItemContainerType } from '@/command-menu-item/types/CommandMenuItemContainerType';
import { createContext } from 'react';
import { type CommandMenuContextApi } from 'twenty-shared/types';
import { type CommandMenuItemFieldsFragment } from '~/generated-metadata/graphql';
@@ -13,7 +13,7 @@ export type CommandMenuContextType = {
};
export const CommandMenuContext = createContext<CommandMenuContextType>({
- containerType: 'command-menu-list',
+ containerType: CommandMenuItemContainerType.CommandMenuList,
displayType: 'button',
commandMenuItems: [],
commandMenuContextApi: EMPTY_COMMAND_MENU_CONTEXT_API,
diff --git a/packages/twenty-front/src/modules/command-menu-item/display/components/PinnedCommandMenuItemButtons.tsx b/packages/twenty-front/src/modules/command-menu-item/display/components/PinnedCommandMenuItemButtons.tsx
index 13e2e37c76f..b1598b580f5 100644
--- a/packages/twenty-front/src/modules/command-menu-item/display/components/PinnedCommandMenuItemButtons.tsx
+++ b/packages/twenty-front/src/modules/command-menu-item/display/components/PinnedCommandMenuItemButtons.tsx
@@ -1,3 +1,4 @@
+import { CommandMenuItemContainerType } from '@/command-menu-item/types/CommandMenuItemContainerType';
import { CommandMenuItemRenderer } from '@/command-menu-item/display/components/CommandMenuItemRenderer';
import { CommandMenuContext } from '@/command-menu-item/contexts/CommandMenuContext';
import { PinnedCommandMenuItemsInlineMeasurements } from '@/command-menu-item/display/components/PinnedCommandMenuItemsInlineMeasurements';
@@ -10,6 +11,7 @@ import { isDefined } from 'twenty-shared/utils';
import { motion } from 'framer-motion';
import { useContext, useMemo } from 'react';
import { ThemeContext } from 'twenty-ui/theme-constants';
+import { useIsMobile } from 'twenty-ui/utilities';
import {
type CommandMenuItemFieldsFragment,
EngineComponentKey,
@@ -46,23 +48,35 @@ const StyledItemsContainer = styled.div<{ shouldReverse: boolean }>`
export const PinnedCommandMenuItemButtons = () => {
const { theme } = useContext(ThemeContext);
const { commandMenuItems, containerType } = useContext(CommandMenuContext);
+ const isMobile = useIsMobile();
- // The footer is far narrower than a page header, so it labels a single action
- // and keeps that label rightmost. Headers label every action and reverse the
- // row so their labels sit left of the icons.
- const isSidePanelFooter = containerType === 'side-panel-footer';
+ // The footer keeps its label rightmost. Headers reverse the row so labels sit
+ // left of the icons.
+ const isSidePanelFooter =
+ containerType === CommandMenuItemContainerType.SidePanelFooter;
+
+ // A record header keeps its breadcrumb on mobile, so its actions stay icons
+ // and leave the record name room. Index and standalone headers drop their
+ // title there, which frees the width for one label.
+ const isRecordPageHeader =
+ containerType === CommandMenuItemContainerType.ShowPageHeader;
+
+ const shouldLabelSingleCommandMenuItem =
+ isSidePanelFooter || (isMobile && !isRecordPageHeader);
const pinnedCommandMenuItems = useMemo(
() => commandMenuItems.filter((item) => item.isPinned === true),
[commandMenuItems],
);
- const labelledCommandMenuItemId = isSidePanelFooter
+ const labelledCommandMenuItemId = shouldLabelSingleCommandMenuItem
? getLabelledPinnedCommandMenuItemId(pinnedCommandMenuItems)
: null;
const shouldHideCommandMenuItemLabel = (commandMenuItemId: string) =>
- isSidePanelFooter && commandMenuItemId !== labelledCommandMenuItemId;
+ (isMobile && isRecordPageHeader) ||
+ (shouldLabelSingleCommandMenuItem &&
+ commandMenuItemId !== labelledCommandMenuItemId);
const {
pinnedInlineCommandMenuItems,
diff --git a/packages/twenty-front/src/modules/command-menu-item/display/components/__stories__/SidePanelCommandMenuItemDisplayPage.stories.tsx b/packages/twenty-front/src/modules/command-menu-item/display/components/__stories__/SidePanelCommandMenuItemDisplayPage.stories.tsx
index d586c016aa8..2c52b819a39 100644
--- a/packages/twenty-front/src/modules/command-menu-item/display/components/__stories__/SidePanelCommandMenuItemDisplayPage.stories.tsx
+++ b/packages/twenty-front/src/modules/command-menu-item/display/components/__stories__/SidePanelCommandMenuItemDisplayPage.stories.tsx
@@ -1,3 +1,4 @@
+import { CommandMenuItemContainerType } from '@/command-menu-item/types/CommandMenuItemContainerType';
import {
type Decorator,
type Meta,
@@ -109,7 +110,7 @@ const createDecorator =
<CommandMenuContext.Provider
value={{
displayType: 'listItem',
- containerType: 'command-menu-list',
+ containerType: CommandMenuItemContainerType.CommandMenuList,
commandMenuItems,
commandMenuContextApi: EMPTY_COMMAND_MENU_CONTEXT_API,
isInPreviewMode: false,
diff --git a/packages/twenty-front/src/modules/command-menu-item/hooks/__tests__/useCloseCommandMenu.test.tsx b/packages/twenty-front/src/modules/command-menu-item/hooks/__tests__/useCloseCommandMenu.test.tsx
index 776dc757552..e46c9c8fea1 100644
--- a/packages/twenty-front/src/modules/command-menu-item/hooks/__tests__/useCloseCommandMenu.test.tsx
+++ b/packages/twenty-front/src/modules/command-menu-item/hooks/__tests__/useCloseCommandMenu.test.tsx
@@ -1,6 +1,6 @@
import { CommandMenuContext } from '@/command-menu-item/contexts/CommandMenuContext';
import { useCloseCommandMenu } from '@/command-menu-item/hooks/useCloseCommandMenu';
-import { type CommandMenuItemContainerType } from '@/command-menu-item/types/CommandMenuItemContainerType';
+import { CommandMenuItemContainerType } from '@/command-menu-item/types/CommandMenuItemContainerType';
import { act, renderHook } from '@testing-library/react';
import { type ReactNode } from 'react';
import { ContextStorePageType } from 'twenty-shared/types';
@@ -86,7 +86,9 @@ beforeEach(() => {
describe('useCloseCommandMenu', () => {
describe('when containerType is command-menu-list', () => {
it('should call closeSidePanelMenu by default', () => {
- const wrapper = getWrapper({ containerType: 'command-menu-list' });
+ const wrapper = getWrapper({
+ containerType: CommandMenuItemContainerType.CommandMenuList,
+ });
const { result } = renderHook(() => useCloseCommandMenu(), { wrapper });
@@ -99,7 +101,9 @@ describe('useCloseCommandMenu', () => {
});
it('should not call closeSidePanelMenu when closeSidePanelOnCommandMenuListExecution is false', () => {
- const wrapper = getWrapper({ containerType: 'command-menu-list' });
+ const wrapper = getWrapper({
+ containerType: CommandMenuItemContainerType.CommandMenuList,
+ });
const { result } = renderHook(
() =>
@@ -118,7 +122,9 @@ describe('useCloseCommandMenu', () => {
});
it('should not call closeDropdown', () => {
- const wrapper = getWrapper({ containerType: 'command-menu-list' });
+ const wrapper = getWrapper({
+ containerType: CommandMenuItemContainerType.CommandMenuList,
+ });
const { result } = renderHook(() => useCloseCommandMenu(), { wrapper });
@@ -132,7 +138,9 @@ describe('useCloseCommandMenu', () => {
describe('when containerType is index-page-dropdown', () => {
it('should call closeDropdown with the correct dropdown id', () => {
- const wrapper = getWrapper({ containerType: 'index-page-dropdown' });
+ const wrapper = getWrapper({
+ containerType: CommandMenuItemContainerType.IndexPageDropdown,
+ });
const { result } = renderHook(() => useCloseCommandMenu(), { wrapper });
@@ -146,7 +154,9 @@ describe('useCloseCommandMenu', () => {
});
it('should not call closeSidePanelMenu', () => {
- const wrapper = getWrapper({ containerType: 'index-page-dropdown' });
+ const wrapper = getWrapper({
+ containerType: CommandMenuItemContainerType.IndexPageDropdown,
+ });
const { result } = renderHook(() => useCloseCommandMenu(), { wrapper });
@@ -161,7 +171,7 @@ describe('useCloseCommandMenu', () => {
describe('when containerType is command-menu-show-page-dropdown', () => {
it('should call closeDropdown with the correct dropdown id', () => {
const wrapper = getWrapper({
- containerType: 'command-menu-show-page-dropdown',
+ containerType: CommandMenuItemContainerType.CommandMenuShowPageDropdown,
});
const { result } = renderHook(() => useCloseCommandMenu(), { wrapper });
@@ -177,7 +187,7 @@ describe('useCloseCommandMenu', () => {
it('should not call closeSidePanelMenu by default', () => {
const wrapper = getWrapper({
- containerType: 'command-menu-show-page-dropdown',
+ containerType: CommandMenuItemContainerType.CommandMenuShowPageDropdown,
});
const { result } = renderHook(() => useCloseCommandMenu(), { wrapper });
@@ -191,7 +201,7 @@ describe('useCloseCommandMenu', () => {
it('should call closeSidePanelMenu when closeSidePanelOnShowPageOptionsExecution is true', () => {
const wrapper = getWrapper({
- containerType: 'command-menu-show-page-dropdown',
+ containerType: CommandMenuItemContainerType.CommandMenuShowPageDropdown,
});
const { result } = renderHook(
@@ -213,7 +223,7 @@ describe('useCloseCommandMenu', () => {
describe('when isInSidePanel is true', () => {
it('should use side panel dropdown id for closeDropdown', () => {
const wrapper = getWrapper({
- containerType: 'index-page-dropdown',
+ containerType: CommandMenuItemContainerType.IndexPageDropdown,
isInSidePanel: true,
});
diff --git a/packages/twenty-front/src/modules/command-menu-item/hooks/useCloseCommandMenu.ts b/packages/twenty-front/src/modules/command-menu-item/hooks/useCloseCommandMenu.ts
index 6e6f756b05a..c0c81b8828f 100644
--- a/packages/twenty-front/src/modules/command-menu-item/hooks/useCloseCommandMenu.ts
+++ b/packages/twenty-front/src/modules/command-menu-item/hooks/useCloseCommandMenu.ts
@@ -1,3 +1,4 @@
+import { CommandMenuItemContainerType } from '@/command-menu-item/types/CommandMenuItemContainerType';
import { CommandMenuContext } from '@/command-menu-item/contexts/CommandMenuContext';
import { getCommandMenuDropdownIdFromCommandMenuId } from '@/command-menu-item/utils/getCommandMenuDropdownIdFromCommandMenuId';
import { getSidePanelCommandMenuDropdownIdFromCommandMenuId } from '@/command-menu-item/utils/getSidePanelCommandMenuDropdownIdFromCommandMenuId';
@@ -31,7 +32,7 @@ export const useCloseCommandMenu = ({
: getCommandMenuDropdownIdFromCommandMenuId(commandMenuId);
const closeCommandMenu = () => {
- if (containerType === 'command-menu-list') {
+ if (containerType === CommandMenuItemContainerType.CommandMenuList) {
if (!closeSidePanelOnCommandMenuListExecution) {
return;
}
@@ -39,14 +40,15 @@ export const useCloseCommandMenu = ({
}
if (
- containerType === 'index-page-dropdown' ||
- containerType === 'command-menu-show-page-dropdown'
+ containerType === CommandMenuItemContainerType.IndexPageDropdown ||
+ containerType === CommandMenuItemContainerType.CommandMenuShowPageDropdown
) {
closeDropdown(dropdownId);
}
if (
- containerType === 'command-menu-show-page-dropdown' &&
+ containerType ===
+ CommandMenuItemContainerType.CommandMenuShowPageDropdown &&
closeSidePanelOnShowPageOptionsExecution
) {
closeSidePanelMenu();
diff --git a/packages/twenty-front/src/modules/command-menu-item/types/CommandMenuItemContainerType.ts b/packages/twenty-front/src/modules/command-menu-item/types/CommandMenuItemContainerType.ts
index fb9bdd6c140..39aea6dd83d 100644
--- a/packages/twenty-front/src/modules/command-menu-item/types/CommandMenuItemContainerType.ts
+++ b/packages/twenty-front/src/modules/command-menu-item/types/CommandMenuItemContainerType.ts
@@ -1,8 +1,9 @@
-export type CommandMenuItemContainerType =
- | 'command-menu-list'
- | 'index-page-header'
- | 'index-page-dropdown'
- | 'show-page-header'
- | 'standalone-page-header'
- | 'command-menu-show-page-dropdown'
- | 'side-panel-footer';
+export enum CommandMenuItemContainerType {
+ CommandMenuList = 'command-menu-list',
+ IndexPageHeader = 'index-page-header',
+ IndexPageDropdown = 'index-page-dropdown',
+ ShowPageHeader = 'show-page-header',
+ StandalonePageHeader = 'standalone-page-header',
+ CommandMenuShowPageDropdown = 'command-menu-show-page-dropdown',
+ SidePanelFooter = 'side-panel-footer',
+}
diff --git a/packages/twenty-front/src/modules/object-record/record-update-multiple/components/__stories__/UpdateMultipleRecordsContainer.stories.tsx b/packages/twenty-front/src/modules/object-record/record-update-multiple/components/__stories__/UpdateMultipleRecordsContainer.stories.tsx
index 385649203bd..34ea043aced 100644
--- a/packages/twenty-front/src/modules/object-record/record-update-multiple/components/__stories__/UpdateMultipleRecordsContainer.stories.tsx
+++ b/packages/twenty-front/src/modules/object-record/record-update-multiple/components/__stories__/UpdateMultipleRecordsContainer.stories.tsx
@@ -1,5 +1,6 @@
import { EMPTY_COMMAND_MENU_CONTEXT_API } from '@/command-menu-item/constants/EmptyCommandMenuContextApi';
import { CommandMenuContext } from '@/command-menu-item/contexts/CommandMenuContext';
+import { CommandMenuItemContainerType } from '@/command-menu-item/types/CommandMenuItemContainerType';
import { MAIN_CONTEXT_STORE_INSTANCE_ID } from '@/context-store/constants/MainContextStoreInstanceId';
import { contextStoreNumberOfSelectedRecordsComponentState } from '@/context-store/states/contextStoreNumberOfSelectedRecordsComponentState';
import { ApolloCoreClientContext } from '@/object-metadata/contexts/ApolloCoreClientContext';
@@ -79,7 +80,7 @@ const meta: Meta<typeof UpdateMultipleRecordsContainer> = {
<CommandMenuContext.Provider
value={{
commandMenuItems: [],
- containerType: 'index-page-dropdown',
+ containerType: CommandMenuItemContainerType.IndexPageDropdown,
displayType: 'dropdownItem',
commandMenuContextApi: EMPTY_COMMAND_MENU_CONTEXT_API,
isInPreviewMode: false,
diff --git a/packages/twenty-front/src/modules/side-panel/components/SidePanelRouter.tsx b/packages/twenty-front/src/modules/side-panel/components/SidePanelRouter.tsx
index 199242938eb..f50b5b38a41 100644
--- a/packages/twenty-front/src/modules/side-panel/components/SidePanelRouter.tsx
+++ b/packages/twenty-front/src/modules/side-panel/components/SidePanelRouter.tsx
@@ -1,3 +1,4 @@
+import { CommandMenuItemContainerType } from '@/command-menu-item/types/CommandMenuItemContainerType';
import { CommandMenuContextProvider } from '@/command-menu-item/contexts/CommandMenuContextProvider';
import { MAIN_CONTEXT_STORE_INSTANCE_ID } from '@/context-store/constants/MainContextStoreInstanceId';
import { contextStoreCurrentObjectMetadataItemIdComponentState } from '@/context-store/states/contextStoreCurrentObjectMetadataItemIdComponentState';
@@ -82,7 +83,7 @@ export const SidePanelRouter = () => {
<CommandMenuContextProvider
isInSidePanel={true}
displayType="listItem"
- containerType="command-menu-list"
+ containerType={CommandMenuItemContainerType.CommandMenuList}
>
<SidePanelSubPageRouter>
{sidePanelPageComponent}