The open alternative to Salesforce, designed for AI.
TypeScript crmcrm-systemcustomergood-first-issuegraphqlhacktoberfestjavascriptmarketingmonoreponestjsopen-sourcepostgresqlreactreactjssalestypescriptweb
Swap Settings for a record-open switcher in the workspace dropdown (#25077)
Félix Malfait60a46b2947cd
diff --git a/packages/twenty-e2e-testing/lib/pom/leftMenu.ts b/packages/twenty-e2e-testing/lib/pom/leftMenu.tsindex 8f2a79d492c..a5abfc1cb7b 100644--- a/packages/twenty-e2e-testing/lib/pom/leftMenu.ts+++ b/packages/twenty-e2e-testing/lib/pom/leftMenu.ts@@ -22,7 +22,10 @@ export class LeftMenu {this.workspaceDropdown = page.getByTestId('workspace-dropdown');this.leftMenu = page.getByRole('button').first();this.searchSubTab = page.getByText('Search');- this.settingsTab = page.getByRole('link', { name: 'Settings' });+ this.settingsTab = page.getByRole('button', {+ name: 'Settings',+ exact: true,+ });this.peopleTab = page.getByRole('link', { name: 'People' });this.companiesTab = page.getByRole('link', { name: 'Companies' });this.opportunitiesTab = page.getByRole('link', { name: 'Opportunities' });@@ -56,7 +59,6 @@ export class LeftMenu {}async goToSettings() {- await this.workspaceDropdown.click();await this.settingsTab.click();}diff --git a/packages/twenty-e2e-testing/tests/create-kanban-view.spec.ts b/packages/twenty-e2e-testing/tests/create-kanban-view.spec.tsindex 0a8a1530e19..adde31a779a 100644--- a/packages/twenty-e2e-testing/tests/create-kanban-view.spec.ts+++ b/packages/twenty-e2e-testing/tests/create-kanban-view.spec.ts@@ -4,8 +4,7 @@ test.describe.serial('Create Kanban View', () => {// the same database, and a duplicate label makes the form unsubmittable.const industryLabel = `Industry ${Date.now()}`;test('Create Industry Select Field', async ({ page }) => {- await page.getByTestId('workspace-dropdown').click();- await page.getByRole('link', { name: 'Settings' }).click();+ await page.getByRole('button', { name: 'Settings', exact: true }).click();await page.getByRole('link', { name: 'Data model' }).click();await page.getByRole('link', { name: 'Opportunities' }).click();await expect(page.getByRole('button', { name: 'New Field' })).toBeVisible();diff --git a/packages/twenty-front/src/modules/ui/navigation/navigation-drawer/components/MultiWorkspaceDropdown/MultiWorkspaceDropdownButton.tsx b/packages/twenty-front/src/modules/ui/navigation/navigation-drawer/components/MultiWorkspaceDropdown/MultiWorkspaceDropdownButton.tsxindex 74cab0fbc49..af38c7e4fdc 100644--- a/packages/twenty-front/src/modules/ui/navigation/navigation-drawer/components/MultiWorkspaceDropdown/MultiWorkspaceDropdownButton.tsx+++ b/packages/twenty-front/src/modules/ui/navigation/navigation-drawer/components/MultiWorkspaceDropdown/MultiWorkspaceDropdownButton.tsx@@ -2,6 +2,7 @@ import { isLayoutCustomizationModeEnabledState } from '@/layout-customization/stimport { Dropdown } from '@/ui/layout/dropdown/components/Dropdown';import { MultiWorkspaceDropdownClickableComponent } from '@/ui/navigation/navigation-drawer/components/MultiWorkspaceDropdown/internal/MultiWorkspaceDropdownClickableComponent';import { MultiWorkspaceDropdownDefaultComponents } from '@/ui/navigation/navigation-drawer/components/MultiWorkspaceDropdown/internal/MultiWorkspaceDropdownDefaultComponents';+import { MultiWorkspaceDropdownOpenRecordInComponents } from '@/ui/navigation/navigation-drawer/components/MultiWorkspaceDropdown/internal/MultiWorkspaceDropdownOpenRecordInComponents';import { MultiWorkspaceDropdownThemesComponents } from '@/ui/navigation/navigation-drawer/components/MultiWorkspaceDropdown/internal/MultiWorkspaceDropdownThemesComponents';import { MultiWorkspaceDropdownWorkspacesListComponents } from '@/ui/navigation/navigation-drawer/components/MultiWorkspaceDropdown/internal/MultiWorkspaceDropdownWorkspacesListComponents';import { MULTI_WORKSPACE_DROPDOWN_ID } from '@/ui/navigation/navigation-drawer/constants/MultiWorkspaceDropdownId';@@ -28,6 +29,8 @@ export const MultiWorkspaceDropdownButton = ({switch (multiWorkspaceDropdown) {case 'themes':return MultiWorkspaceDropdownThemesComponents;+ case 'open-record-in':+ return MultiWorkspaceDropdownOpenRecordInComponents;case 'workspaces-list':return MultiWorkspaceDropdownWorkspacesListComponents;default:diff --git a/packages/twenty-front/src/modules/ui/navigation/navigation-drawer/components/MultiWorkspaceDropdown/internal/MultiWorkspaceDropdownDefaultComponents.tsx b/packages/twenty-front/src/modules/ui/navigation/navigation-drawer/components/MultiWorkspaceDropdown/internal/MultiWorkspaceDropdownDefaultComponents.tsxindex 7471ea12dd7..2e0c31f91d7 100644--- a/packages/twenty-front/src/modules/ui/navigation/navigation-drawer/components/MultiWorkspaceDropdown/internal/MultiWorkspaceDropdownDefaultComponents.tsx+++ b/packages/twenty-front/src/modules/ui/navigation/navigation-drawer/components/MultiWorkspaceDropdown/internal/MultiWorkspaceDropdownDefaultComponents.tsx@@ -9,6 +9,7 @@ import { isMultiWorkspaceEnabledState } from '@/client-config/states/isMultiWorkimport { useBuildWorkspaceUrl } from '@/domain-manager/hooks/useBuildWorkspaceUrl';import { useRedirectToDefaultDomain } from '@/domain-manager/hooks/useRedirectToDefaultDomain';import { useRedirectToWorkspaceDomain } from '@/domain-manager/hooks/useRedirectToWorkspaceDomain';+import { useOpenRecordInPreference } from '@/settings/experience/hooks/useOpenRecordInPreference';import { Dropdown } from '@/ui/layout/dropdown/components/Dropdown';import { DropdownContent } from '@/ui/layout/dropdown/components/DropdownContent';import { DropdownMenuHeader } from '@/ui/layout/dropdown/components/DropdownMenuHeader/DropdownMenuHeader';@@ -16,15 +17,13 @@ import { DropdownMenuHeaderLeftComponent } from '@/ui/layout/dropdown/componentsimport { DropdownMenuItemsContainer } from '@/ui/layout/dropdown/components/DropdownMenuItemsContainer';import { DropdownMenuSeparator } from '@/ui/layout/dropdown/components/DropdownMenuSeparator';import { useCloseDropdown } from '@/ui/layout/dropdown/hooks/useCloseDropdown';-import { useOpenSettingsMenu } from '@/navigation/hooks/useOpenSettings';import { MULTI_WORKSPACE_DROPDOWN_ID } from '@/ui/navigation/navigation-drawer/constants/MultiWorkspaceDropdownId';+import { OPEN_RECORD_IN_OPTIONS } from '@/ui/navigation/navigation-drawer/constants/OpenRecordInOptions';import { multiWorkspaceDropdownState } from '@/ui/navigation/navigation-drawer/states/multiWorkspaceDropdownState';import { useColorScheme } from '@/ui/theme/hooks/useColorScheme';import { useAtomStateValue } from '@/ui/utilities/state/jotai/hooks/useAtomStateValue';import { useSetAtomState } from '@/ui/utilities/state/jotai/hooks/useSetAtomState';-import { styled } from '@linaria/react';import { useLingui } from '@lingui/react/macro';-import { themeCssVariables } from 'twenty-ui/theme-constants';import { isNonEmptyString } from '@sniptt/guards';import { AppPath, SettingsPath } from 'twenty-shared/types';import { getSettingsPath } from 'twenty-shared/utils';@@ -34,7 +33,6 @@ import {IconLogout,IconMessage,IconPlus,- IconSettings,IconSwitchHorizontal,IconUserPlus,} from 'twenty-ui/icon';@@ -44,15 +42,11 @@ import {MenuItemSelectAvatar,UndecoratedLink,} from 'twenty-ui/navigation';+import { useIsMobile } from 'twenty-ui/utilities';import { type AvailableWorkspace } from '~/generated-metadata/graphql';import { getWorkspaceUrl } from '~/utils/getWorkspaceUrl';import { getAbsoluteImageUrl } from '~/utils/image/getAbsoluteImageUrl';-const StyledDescription = styled.div`- color: ${themeCssVariables.font.color.light};- padding-left: ${themeCssVariables.spacing[1]};-`;-export const MultiWorkspaceDropdownDefaultComponents = () => {const currentWorkspace = useAtomStateValue(currentWorkspaceState);const isMultiWorkspaceEnabled = useAtomStateValue(@@ -77,7 +71,9 @@ export const MultiWorkspaceDropdownDefaultComponents = () => {multiWorkspaceDropdownState,);- const { openSettingsMenu } = useOpenSettingsMenu();+ const { openRecordInPreference } = useOpenRecordInPreference();++ const canDisplaySidePanel = !useIsMobile();const handleSupport = () => {window.FrontChat?.('show');@@ -194,15 +190,22 @@ export const MultiWorkspaceDropdownDefaultComponents = () => {<DropdownMenuItemsContainer><MenuItemLeftIcon={colorSchemeList.find(({ id }) => id === colorScheme)?.icon}- text={- <>- {t`Theme `}- <StyledDescription>{` · ${colorScheme}`}</StyledDescription>- </>- }+ text={t`Theme`}+ contextualText={colorScheme}hasSubMenu={true}onClick={() => setMultiWorkspaceDropdown('themes')}/>+ {canDisplaySidePanel && (+ <MenuItem+ LeftIcon={OPEN_RECORD_IN_OPTIONS[openRecordInPreference].Icon}+ text={t`Open in`}+ contextualText={t(+ OPEN_RECORD_IN_OPTIONS[openRecordInPreference].label,+ )}+ hasSubMenu={true}+ onClick={() => setMultiWorkspaceDropdown('open-record-in')}+ />+ )}<UndecoratedLinkto={`${getSettingsPath(SettingsPath.WorkspaceMembersPage)}#invite`}onClick={() => {@@ -218,15 +221,6 @@ export const MultiWorkspaceDropdownDefaultComponents = () => {onClick={handleSupport}/>)}- <UndecoratedLink- to={getSettingsPath(SettingsPath.ProfilePage)}- onClick={() => {- openSettingsMenu();- closeDropdown(MULTI_WORKSPACE_DROPDOWN_ID);- }}- >- <MenuItem LeftIcon={IconSettings} text={t`Settings`} />- </UndecoratedLink></DropdownMenuItemsContainer></DropdownContent>);diff --git a/packages/twenty-front/src/modules/ui/navigation/navigation-drawer/components/MultiWorkspaceDropdown/internal/MultiWorkspaceDropdownOpenRecordInComponents.tsx b/packages/twenty-front/src/modules/ui/navigation/navigation-drawer/components/MultiWorkspaceDropdown/internal/MultiWorkspaceDropdownOpenRecordInComponents.tsxnew file mode 100644index 00000000000..0b165f54c53--- /dev/null+++ b/packages/twenty-front/src/modules/ui/navigation/navigation-drawer/components/MultiWorkspaceDropdown/internal/MultiWorkspaceDropdownOpenRecordInComponents.tsx@@ -0,0 +1,51 @@+import { useOpenRecordInPreference } from '@/settings/experience/hooks/useOpenRecordInPreference';+import { DropdownContent } from '@/ui/layout/dropdown/components/DropdownContent';+import { DropdownMenuHeader } from '@/ui/layout/dropdown/components/DropdownMenuHeader/DropdownMenuHeader';+import { DropdownMenuHeaderLeftComponent } from '@/ui/layout/dropdown/components/DropdownMenuHeader/internal/DropdownMenuHeaderLeftComponent';+import { DropdownMenuItemsContainer } from '@/ui/layout/dropdown/components/DropdownMenuItemsContainer';+import { OPEN_RECORD_IN_OPTIONS } from '@/ui/navigation/navigation-drawer/constants/OpenRecordInOptions';+import { multiWorkspaceDropdownState } from '@/ui/navigation/navigation-drawer/states/multiWorkspaceDropdownState';+import { useSetAtomState } from '@/ui/utilities/state/jotai/hooks/useSetAtomState';+import { useLingui } from '@lingui/react/macro';+import { OpenRecordIn } from 'twenty-shared/types';+import { IconCheck, IconChevronLeft } from 'twenty-ui/icon';+import { MenuItem } from 'twenty-ui/navigation';++export const MultiWorkspaceDropdownOpenRecordInComponents = () => {+ const { t } = useLingui();++ const { openRecordInPreference, setOpenRecordInPreference } =+ useOpenRecordInPreference();++ const setMultiWorkspaceDropdown = useSetAtomState(+ multiWorkspaceDropdownState,+ );++ return (+ <DropdownContent>+ <DropdownMenuHeader+ StartComponent={+ <DropdownMenuHeaderLeftComponent+ onClick={() => setMultiWorkspaceDropdown('default')}+ Icon={IconChevronLeft}+ />+ }+ >+ {t`Open records in`}+ </DropdownMenuHeader>+ <DropdownMenuItemsContainer>+ {Object.values(OpenRecordIn).map((openRecordIn) => (+ <MenuItem+ key={openRecordIn}+ LeftIcon={OPEN_RECORD_IN_OPTIONS[openRecordIn].Icon}+ text={t(OPEN_RECORD_IN_OPTIONS[openRecordIn].label)}+ onClick={() => setOpenRecordInPreference(openRecordIn)}+ RightIcon={+ openRecordIn === openRecordInPreference ? IconCheck : undefined+ }+ />+ ))}+ </DropdownMenuItemsContainer>+ </DropdownContent>+ );+};diff --git a/packages/twenty-front/src/modules/ui/navigation/navigation-drawer/constants/OpenRecordInOptions.ts b/packages/twenty-front/src/modules/ui/navigation/navigation-drawer/constants/OpenRecordInOptions.tsnew file mode 100644index 00000000000..1f0cfa3692a--- /dev/null+++ b/packages/twenty-front/src/modules/ui/navigation/navigation-drawer/constants/OpenRecordInOptions.ts@@ -0,0 +1,22 @@+import { type MessageDescriptor } from '@lingui/core';+import { msg } from '@lingui/core/macro';+import { OpenRecordIn } from 'twenty-shared/types';+import {+ IconAddressBook,+ type IconComponent,+ IconLayoutSidebarRight,+} from 'twenty-ui/icon';++export const OPEN_RECORD_IN_OPTIONS = {+ [OpenRecordIn.SIDE_PANEL]: {+ Icon: IconLayoutSidebarRight,+ label: msg`Side panel`,+ },+ [OpenRecordIn.RECORD_PAGE]: {+ Icon: IconAddressBook,+ label: msg`Full page`,+ },+} satisfies Record<+ OpenRecordIn,+ { Icon: IconComponent; label: MessageDescriptor }+>;diff --git a/packages/twenty-front/src/modules/ui/navigation/navigation-drawer/states/multiWorkspaceDropdownState.ts b/packages/twenty-front/src/modules/ui/navigation/navigation-drawer/states/multiWorkspaceDropdownState.tsindex 6f18d85519e..e9a86d8e0bb 100644--- a/packages/twenty-front/src/modules/ui/navigation/navigation-drawer/states/multiWorkspaceDropdownState.ts+++ b/packages/twenty-front/src/modules/ui/navigation/navigation-drawer/states/multiWorkspaceDropdownState.ts@@ -1,7 +1,7 @@import { createAtomState } from '@/ui/utilities/state/jotai/utils/createAtomState';export const multiWorkspaceDropdownState = createAtomState<- 'default' | 'workspaces-list' | 'themes'+ 'default' | 'workspaces-list' | 'themes' | 'open-record-in'>({key: 'multiWorkspaceDropdownState',defaultValue: 'default',