The open alternative to Salesforce, designed for AI.
TypeScript crmcrm-systemcustomergood-first-issuegraphqlhacktoberfestjavascriptmarketingmonoreponestjsopen-sourcepostgresqlreactreactjssalestypescriptweb
Move app preferences to /settings/app-preferences behind the flag (#29255)
nitin585096c8db27
diff --git a/packages/twenty-front/src/modules/app/components/SettingsRoutes.tsx b/packages/twenty-front/src/modules/app/components/SettingsRoutes.tsxindex 663ac587da2..1c9a8ab228c 100644--- a/packages/twenty-front/src/modules/app/components/SettingsRoutes.tsx+++ b/packages/twenty-front/src/modules/app/components/SettingsRoutes.tsx@@ -15,12 +15,16 @@ import {type WorkspaceRouteObject,} from '@/app/routing/types/WorkspaceRouteObject';import { SETTINGS_AI_TABS } from '@/settings/ai/constants/SettingsAiTabs';+import { SettingsLegacyAccountsRedirect } from '@/settings/app-preferences/components/SettingsLegacyAccountsRedirect';import { SettingsProtectedRouteWrapper } from '@/settings/components/SettingsProtectedRouteWrapper';import { SettingsSkeletonLoader } from '@/settings/components/SettingsSkeletonLoader';import { SettingPublicDomain } from '@/settings/domains/components/SettingPublicDomain';import { SettingsPath } from 'twenty-shared/types';import { getSettingsPath } from 'twenty-shared/utils';-import { PermissionFlagType } from '~/generated-metadata/graphql';+import {+ FeatureFlagKey,+ PermissionFlagType,+} from '~/generated-metadata/graphql';const SettingsGraphQLPlayground = lazy(() =>import('~/pages/settings/developers/playground/SettingsGraphQLPlayground').then(@@ -458,18 +462,10 @@ const SettingsAccountDetail = lazy(() =>})),);-const SettingsBuiltInAccountApp = lazy(() =>- import('~/pages/settings/accounts/SettingsBuiltInAccountApp').then(- (module) => ({- default: module.SettingsBuiltInAccountApp,- }),- ),-);--const SettingsApplicationPreferences = lazy(() =>- import('~/pages/settings/accounts/SettingsApplicationPreferences').then(+const SettingsAppPreferencesApp = lazy(() =>+ import('~/pages/settings/accounts/SettingsAppPreferencesApp').then((module) => ({- default: module.SettingsApplicationPreferences,+ default: module.SettingsAppPreferencesApp,}),),);@@ -814,38 +810,86 @@ const createSettingsRouteElements = ({/>}>- <Route path={SettingsPath.Accounts} element={<SettingsAccounts />} />- <Route- path={SettingsPath.AccountDetail}- element={<SettingsAccountDetail />}- />+ <Route element={<SettingsLegacyAccountsRedirect />}>+ <Route path={SettingsPath.Accounts} element={<SettingsAccounts />} />+ <Route+ path={SettingsPath.AccountsEmails}+ element={<SettingsAccountsEmails />}+ />+ <Route+ path={SettingsPath.AccountsCalendars}+ element={<SettingsAccountsCalendars />}+ />+ <Route+ path={SettingsPath.NewAccount}+ element={<SettingsNewAccount />}+ />+ <Route+ path={SettingsPath.AccountsConfiguration}+ element={<SettingsAccountsConfiguration />}+ />+ <Route+ path={SettingsPath.NewImapSmtpCaldavConnection}+ element={<SettingsNewImapSmtpCaldavConnection />}+ />+ <Route+ path={SettingsPath.EditImapSmtpCaldavConnection}+ element={<SettingsEditImapSmtpCaldavConnection />}+ />+ <Route+ path={SettingsPath.AccountDetail}+ element={+ <Navigate to={getSettingsPath(SettingsPath.Accounts)} replace />+ }+ />+ <Route+ path={SettingsPath.BuiltInAccountApp}+ element={+ <Navigate to={getSettingsPath(SettingsPath.Accounts)} replace />+ }+ />+ <Route+ path={SettingsPath.ApplicationPreferences}+ element={+ <Navigate to={getSettingsPath(SettingsPath.Accounts)} replace />+ }+ />+ </Route>+ </Route>+ <Route+ element={+ <SettingsProtectedRouteWrapper+ settingsPermission={PermissionFlagType.CONNECTED_ACCOUNTS}+ requiredFeatureFlag={FeatureFlagKey.IS_APP_PREFERENCES_ENABLED}+ />+ }+ ><Route- path={SettingsPath.BuiltInAccountApp}- element={<SettingsBuiltInAccountApp />}+ path={SettingsPath.AppPreferences}+ element={<SettingsAccounts />}/><Route- path={SettingsPath.ApplicationPreferences}- element={<SettingsApplicationPreferences />}+ path={SettingsPath.AppPreferencesApp}+ element={<SettingsAppPreferencesApp />}/><Route- path={SettingsPath.AccountsEmails}- element={<SettingsAccountsEmails />}+ path={SettingsPath.AppPreferencesAccountDetail}+ element={<SettingsAccountDetail />}/><Route- path={SettingsPath.AccountsCalendars}- element={<SettingsAccountsCalendars />}+ path={SettingsPath.AppPreferencesNewAccount}+ element={<SettingsNewAccount />}/>- <Route path={SettingsPath.NewAccount} element={<SettingsNewAccount />} /><Route- path={SettingsPath.AccountsConfiguration}+ path={SettingsPath.AppPreferencesAccountConfiguration}element={<SettingsAccountsConfiguration />}/><Route- path={SettingsPath.NewImapSmtpCaldavConnection}+ path={SettingsPath.AppPreferencesNewImapSmtpCaldavConnection}element={<SettingsNewImapSmtpCaldavConnection />}/><Route- path={SettingsPath.EditImapSmtpCaldavConnection}+ path={SettingsPath.AppPreferencesEditImapSmtpCaldavConnection}element={<SettingsEditImapSmtpCaldavConnection />}/></Route>diff --git a/packages/twenty-front/src/modules/error-handler/components/ErrorMessageEffect.tsx b/packages/twenty-front/src/modules/error-handler/components/ErrorMessageEffect.tsxindex ea010b4dc4f..f4c8a20d497 100644--- a/packages/twenty-front/src/modules/error-handler/components/ErrorMessageEffect.tsx+++ b/packages/twenty-front/src/modules/error-handler/components/ErrorMessageEffect.tsx@@ -7,7 +7,7 @@ import { useToast } from 'twenty-ui/components/feedback';export const ErrorMessageEffect = () => {const { enqueueToast } = useToast();const [searchParams] = useSearchParams();- const { hash } = useLocation();+ const { pathname, hash } = useLocation();const navigate = useNavigate();const errorMessage = searchParams.get('errorMessage');@@ -20,9 +20,12 @@ export const ErrorMessageEffect = () => {});const newSearchParams = new URLSearchParams(searchParams);newSearchParams.delete('errorMessage');- navigate({ search: newSearchParams.toString(), hash }, { replace: true });+ navigate(+ { pathname, search: newSearchParams.toString(), hash },+ { replace: true },+ );}- }, [enqueueToast, errorMessage, hash, navigate, searchParams]);+ }, [enqueueToast, errorMessage, hash, navigate, pathname, searchParams]);return <></>;};diff --git a/packages/twenty-front/src/modules/settings/accounts/hooks/useAccountsConfigurationCompletionPath.ts b/packages/twenty-front/src/modules/settings/accounts/hooks/useAccountsConfigurationCompletionPath.tsindex 9f379c508d4..c43f24aa028 100644--- a/packages/twenty-front/src/modules/settings/accounts/hooks/useAccountsConfigurationCompletionPath.ts+++ b/packages/twenty-front/src/modules/settings/accounts/hooks/useAccountsConfigurationCompletionPath.ts@@ -20,11 +20,15 @@ export const useAccountsConfigurationCompletionPath = ((app) => app.provider === connectedAccount?.provider,);- if (isAppPreferencesEnabled && isDefined(builtInAccountApp)) {- return getSettingsPath(SettingsPath.BuiltInAccountApp, {- builtInAccountAppId: builtInAccountApp.id,+ if (!isAppPreferencesEnabled) {+ return getSettingsPath(SettingsPath.Accounts);+ }++ if (isDefined(builtInAccountApp)) {+ return getSettingsPath(SettingsPath.AppPreferencesApp, {+ applicationId: builtInAccountApp.id,});}- return getSettingsPath(SettingsPath.Accounts);+ return getSettingsPath(SettingsPath.AppPreferences);};diff --git a/packages/twenty-front/src/modules/settings/app-preferences/components/SettingsAccountGroupTableRow.tsx b/packages/twenty-front/src/modules/settings/app-preferences/components/SettingsAccountGroupTableRow.tsxindex 5e974363b2b..412af70654c 100644--- a/packages/twenty-front/src/modules/settings/app-preferences/components/SettingsAccountGroupTableRow.tsx+++ b/packages/twenty-front/src/modules/settings/app-preferences/components/SettingsAccountGroupTableRow.tsx@@ -71,7 +71,7 @@ export const SettingsAccountGroupTableRow = ({onClick={hasSettings? () =>- navigateSettings(SettingsPath.AccountDetail, {+ navigateSettings(SettingsPath.AppPreferencesAccountDetail, {connectedAccountId: group.id,}): undefined@@ -79,7 +79,7 @@ export const SettingsAccountGroupTableRow = ({>{hasSettings ? (<UndecoratedLink- to={getSettingsPath(SettingsPath.AccountDetail, {+ to={getSettingsPath(SettingsPath.AppPreferencesAccountDetail, {connectedAccountId: group.id,})}onClick={(event) => event.stopPropagation()}diff --git a/packages/twenty-front/src/modules/settings/app-preferences/components/SettingsAppPreferencesRowDropdownMenu.tsx b/packages/twenty-front/src/modules/settings/app-preferences/components/SettingsAppPreferencesRowDropdownMenu.tsxindex 6420ccad093..6f5c1c97c4a 100644--- a/packages/twenty-front/src/modules/settings/app-preferences/components/SettingsAppPreferencesRowDropdownMenu.tsx+++ b/packages/twenty-front/src/modules/settings/app-preferences/components/SettingsAppPreferencesRowDropdownMenu.tsx@@ -98,9 +98,12 @@ export const SettingsAppPreferencesRowDropdownMenu = ({startIcon={<IconAt />}render={<Link- to={getSettingsPath(SettingsPath.AccountDetail, {- connectedAccountId: group.id,- })}+ to={getSettingsPath(+ SettingsPath.AppPreferencesAccountDetail,+ {+ connectedAccountId: group.id,+ },+ )}/>}>{t`Account settings`}</Dropdown.ActionItem>@@ -110,9 +113,12 @@ export const SettingsAppPreferencesRowDropdownMenu = ({startIcon={<IconPlayerPlay />}render={<Link- to={getSettingsPath(SettingsPath.AccountsConfiguration, {- connectedAccountId: builtInAccount.id,- })}+ to={getSettingsPath(+ SettingsPath.AppPreferencesAccountConfiguration,+ {+ connectedAccountId: builtInAccount.id,+ },+ )}/>}>{t`Complete setup`}</Dropdown.ActionItem>@@ -125,7 +131,7 @@ export const SettingsAppPreferencesRowDropdownMenu = ({render={<Linkto={getSettingsPath(- SettingsPath.EditImapSmtpCaldavConnection,+ SettingsPath.AppPreferencesEditImapSmtpCaldavConnection,{connectedAccountId: builtInAccount.id,},diff --git a/packages/twenty-front/src/modules/settings/app-preferences/components/SettingsLegacyAccountsRedirect.tsx b/packages/twenty-front/src/modules/settings/app-preferences/components/SettingsLegacyAccountsRedirect.tsxnew file mode 100644index 00000000000..b3afef2773d--- /dev/null+++ b/packages/twenty-front/src/modules/settings/app-preferences/components/SettingsLegacyAccountsRedirect.tsx@@ -0,0 +1,26 @@+import { getAppPreferencesPathnameFromLegacyAccountsPathname } from '@/settings/app-preferences/utils/getAppPreferencesPathnameFromLegacyAccountsPathname';+import { useIsFeatureEnabled } from '@/workspace/hooks/useIsFeatureEnabled';+import { Navigate, Outlet, useLocation } from 'react-router-dom';+import { FeatureFlagKey } from '~/generated-metadata/graphql';++export const SettingsLegacyAccountsRedirect = () => {+ const isAppPreferencesEnabled = useIsFeatureEnabled(+ FeatureFlagKey.IS_APP_PREFERENCES_ENABLED,+ );+ const { pathname, search, hash } = useLocation();++ if (!isAppPreferencesEnabled) {+ return <Outlet />;+ }++ return (+ <Navigate+ to={{+ pathname: getAppPreferencesPathnameFromLegacyAccountsPathname(pathname),+ search,+ hash,+ }}+ replace+ />+ );+};diff --git a/packages/twenty-front/src/modules/settings/app-preferences/components/__stories__/SettingsLegacyAccountsRedirect.stories.tsx b/packages/twenty-front/src/modules/settings/app-preferences/components/__stories__/SettingsLegacyAccountsRedirect.stories.tsxnew file mode 100644index 00000000000..d596f5ff388--- /dev/null+++ b/packages/twenty-front/src/modules/settings/app-preferences/components/__stories__/SettingsLegacyAccountsRedirect.stories.tsx@@ -0,0 +1,168 @@+import { type Meta, type StoryObj } from '@storybook/react-vite';+import { useState } from 'react';+import {+ createMemoryRouter,+ Outlet,+ RouterProvider,+ useLocation,+} from 'react-router-dom';+import { expect, within } from 'storybook/test';+import { SettingsPath } from 'twenty-shared/types';+import { getSettingsPath } from 'twenty-shared/utils';++import { currentWorkspaceState } from '@/auth/states/currentWorkspaceState';+import { ErrorMessageEffect } from '@/error-handler/components/ErrorMessageEffect';+import { SettingsLegacyAccountsRedirect } from '@/settings/app-preferences/components/SettingsLegacyAccountsRedirect';+import { AppToaster } from '@/ui/feedback/toast/components/AppToaster';+import { jotaiStore } from '@/ui/utilities/state/jotai/jotaiStore';+import { FeatureFlagKey } from '~/generated-metadata/graphql';+import { ToastDecorator } from '~/testing/decorators/ToastDecorator';+import { mockCurrentWorkspace } from '~/testing/mock-data/users';++type LegacyAccountsRedirectHarnessProps = {+ initialEntry: string;+};++const CurrentLocation = () => {+ const { pathname, search, hash } = useLocation();++ return <span>{`Location ${pathname}${search}${hash}`}</span>;+};++const LegacyAccountsRedirectHarness = ({+ initialEntry,+}: LegacyAccountsRedirectHarnessProps) => {+ const [router] = useState(() =>+ createMemoryRouter(+ [+ {+ element: (+ <>+ <ErrorMessageEffect />+ <AppToaster />+ <Outlet />+ </>+ ),+ children: [+ {+ element: <SettingsLegacyAccountsRedirect />,+ children: [+ {+ path: getSettingsPath(SettingsPath.Accounts),+ element: <span>Legacy accounts page</span>,+ },+ {+ path: getSettingsPath(SettingsPath.AccountsConfiguration),+ element: <span>Legacy configuration page</span>,+ },+ {+ path: getSettingsPath(SettingsPath.ApplicationPreferences),+ element: <span>Legacy application page</span>,+ },+ ],+ },+ {+ path: `${getSettingsPath(SettingsPath.AppPreferences)}/*`,+ element: <CurrentLocation />,+ },+ ],+ },+ ],+ { initialEntries: [initialEntry] },+ ),+ );++ return <RouterProvider router={router} />;+};++const setAppPreferencesFlag = (value: boolean) =>+ jotaiStore.set(currentWorkspaceState.atom, {+ ...mockCurrentWorkspace,+ featureFlags: [{ key: FeatureFlagKey.IS_APP_PREFERENCES_ENABLED, value }],+ });++const meta: Meta<typeof LegacyAccountsRedirectHarness> = {+ title: 'Modules/Settings/AppPreferences/SettingsLegacyAccountsRedirect',+ component: LegacyAccountsRedirectHarness,+ decorators: [ToastDecorator],+ beforeEach: () => {+ setAppPreferencesFlag(true);+ },+};++export default meta;++type Story = StoryObj<typeof LegacyAccountsRedirectHarness>;++export const FlagOffKeepsTheLegacyPage: Story = {+ args: { initialEntry: '/settings/accounts/configuration/account-id' },+ beforeEach: () => {+ setAppPreferencesFlag(false);+ },+ play: async ({ canvasElement }) => {+ const canvas = within(canvasElement);++ expect(await canvas.findByText('Legacy configuration page')).toBeVisible();+ },+};++export const ForwardsWithQueryAndHash: Story = {+ args: {+ initialEntry:+ '/settings/accounts/configuration/account-id?tab=emails#calendar',+ },+ play: async ({ canvasElement }) => {+ const canvas = within(canvasElement);++ expect(+ await canvas.findByText(+ 'Location /settings/app-preferences/accounts/account-id/configuration?tab=emails#calendar',+ ),+ ).toBeVisible();+ },+};++export const ForwardsAnAppConnectionReturn: Story = {+ args: {+ initialEntry: '/settings/accounts/applications/application-id#connections',+ },+ play: async ({ canvasElement }) => {+ const canvas = within(canvasElement);++ expect(+ await canvas.findByText(+ 'Location /settings/app-preferences/application-id#connections',+ ),+ ).toBeVisible();+ },+};++export const ForwardsTheAccountsRoot: Story = {+ args: { initialEntry: '/settings/accounts#accounts' },+ play: async ({ canvasElement }) => {+ const canvas = within(canvasElement);++ expect(+ await canvas.findByText('Location /settings/app-preferences#accounts'),+ ).toBeVisible();+ },+};++export const OAuthErrorIsShownOnceAndRemovedFromTheUrl: Story = {+ args: {+ initialEntry:+ '/settings/accounts?errorMessage=Sync%20failed&tab=apps#accounts',+ },+ play: async ({ canvasElement }) => {+ const canvas = within(canvasElement);++ expect(+ await canvas.findByText(+ 'Location /settings/app-preferences?tab=apps#accounts',+ ),+ ).toBeVisible();+ expect(+ await within(document.body).findAllByText('Sync failed'),+ ).toHaveLength(1);+ },+};diff --git a/packages/twenty-front/src/modules/settings/app-preferences/constants/AppPreferencesPathByLegacyAccountsPath.ts b/packages/twenty-front/src/modules/settings/app-preferences/constants/AppPreferencesPathByLegacyAccountsPath.tsnew file mode 100644index 00000000000..82e9e1cadf8--- /dev/null+++ b/packages/twenty-front/src/modules/settings/app-preferences/constants/AppPreferencesPathByLegacyAccountsPath.ts@@ -0,0 +1,18 @@+import { SettingsPath } from 'twenty-shared/types';++// TODO(@ehconitin): drop AccountDetail, BuiltInAccountApp and ApplicationPreferences after 2027-01-14, the rest with IS_APP_PREFERENCES_ENABLED.+export const APP_PREFERENCES_PATH_BY_LEGACY_ACCOUNTS_PATH = {+ [SettingsPath.Accounts]: SettingsPath.AppPreferences,+ [SettingsPath.AccountsEmails]: SettingsPath.AppPreferences,+ [SettingsPath.AccountsCalendars]: SettingsPath.AppPreferences,+ [SettingsPath.AccountDetail]: SettingsPath.AppPreferencesAccountDetail,+ [SettingsPath.BuiltInAccountApp]: SettingsPath.AppPreferencesApp,+ [SettingsPath.ApplicationPreferences]: SettingsPath.AppPreferencesApp,+ [SettingsPath.NewAccount]: SettingsPath.AppPreferencesNewAccount,+ [SettingsPath.AccountsConfiguration]:+ SettingsPath.AppPreferencesAccountConfiguration,+ [SettingsPath.NewImapSmtpCaldavConnection]:+ SettingsPath.AppPreferencesNewImapSmtpCaldavConnection,+ [SettingsPath.EditImapSmtpCaldavConnection]:+ SettingsPath.AppPreferencesEditImapSmtpCaldavConnection,+} as const;diff --git a/packages/twenty-front/src/modules/settings/app-preferences/hooks/__tests__/useAccountsSettingsBreadcrumbLink.test.tsx b/packages/twenty-front/src/modules/settings/app-preferences/hooks/__tests__/useAccountsSettingsBreadcrumbLink.test.tsxnew file mode 100644index 00000000000..79422d8da01--- /dev/null+++ b/packages/twenty-front/src/modules/settings/app-preferences/hooks/__tests__/useAccountsSettingsBreadcrumbLink.test.tsx@@ -0,0 +1,59 @@+import { i18n } from '@lingui/core';+import { I18nProvider } from '@lingui/react';+import { renderHook } from '@testing-library/react';+import { Provider as JotaiProvider } from 'jotai';+import { type ReactNode } from 'react';+import { SOURCE_LOCALE } from 'twenty-shared/translations';++import { currentWorkspaceState } from '@/auth/states/currentWorkspaceState';+import { useAccountsSettingsBreadcrumbLink } from '@/settings/app-preferences/hooks/useAccountsSettingsBreadcrumbLink';+import {+ jotaiStore,+ resetJotaiStore,+} from '@/ui/utilities/state/jotai/jotaiStore';+import { FeatureFlagKey } from '~/generated-metadata/graphql';+import { messages } from '~/locales/generated/en';+import { mockCurrentWorkspace } from '~/testing/mock-data/users';++i18n.load({ [SOURCE_LOCALE]: messages });+i18n.activate(SOURCE_LOCALE);++const wrapper = ({ children }: { children: ReactNode }) => (+ <JotaiProvider store={jotaiStore}>+ <I18nProvider i18n={i18n}>{children}</I18nProvider>+ </JotaiProvider>+);++const setAppPreferencesFlag = (value: boolean) =>+ jotaiStore.set(currentWorkspaceState.atom, {+ ...mockCurrentWorkspace,+ featureFlags: [{ key: FeatureFlagKey.IS_APP_PREFERENCES_ENABLED, value }],+ });++const renderAccountsBreadcrumbLink = () =>+ renderHook(() => useAccountsSettingsBreadcrumbLink('Account'), { wrapper })+ .result.current;++describe('useAccountsSettingsBreadcrumbLink', () => {+ beforeEach(() => {+ resetJotaiStore();+ });++ it('keeps the legacy accounts link when app preferences are off', () => {+ setAppPreferencesFlag(false);++ expect(renderAccountsBreadcrumbLink()).toEqual({+ children: 'Account',+ href: '/settings/accounts',+ });+ });++ it('links to app preferences when they are on', () => {+ setAppPreferencesFlag(true);++ expect(renderAccountsBreadcrumbLink()).toEqual({+ children: 'Apps preferences',+ href: '/settings/app-preferences',+ });+ });+});diff --git a/packages/twenty-front/src/modules/settings/app-preferences/hooks/useAccountsSettingsBreadcrumbLink.ts b/packages/twenty-front/src/modules/settings/app-preferences/hooks/useAccountsSettingsBreadcrumbLink.tsnew file mode 100644index 00000000000..c74c01ef2ba--- /dev/null+++ b/packages/twenty-front/src/modules/settings/app-preferences/hooks/useAccountsSettingsBreadcrumbLink.ts@@ -0,0 +1,29 @@+import { type BreadcrumbProps } from '@/ui/navigation/bread-crumb/types/BreadcrumbProps';+import { useIsFeatureEnabled } from '@/workspace/hooks/useIsFeatureEnabled';+import { useLingui } from '@lingui/react/macro';+import { SettingsPath } from 'twenty-shared/types';+import { getSettingsPath } from 'twenty-shared/utils';+import { FeatureFlagKey } from '~/generated-metadata/graphql';++type AccountsSettingsBreadcrumbLink = BreadcrumbProps['links'][number];++export const useAccountsSettingsBreadcrumbLink = (+ legacyAccountsLabel: AccountsSettingsBreadcrumbLink['children'],+): AccountsSettingsBreadcrumbLink => {+ const { t } = useLingui();+ const isAppPreferencesEnabled = useIsFeatureEnabled(+ FeatureFlagKey.IS_APP_PREFERENCES_ENABLED,+ );++ if (isAppPreferencesEnabled) {+ return {+ children: t`Apps preferences`,+ href: getSettingsPath(SettingsPath.AppPreferences),+ };+ }++ return {+ children: legacyAccountsLabel,+ href: getSettingsPath(SettingsPath.Accounts),+ };+};diff --git a/packages/twenty-front/src/modules/settings/app-preferences/hooks/useAddBuiltInAccount.ts b/packages/twenty-front/src/modules/settings/app-preferences/hooks/useAddBuiltInAccount.tsindex f3ae72e1c75..87757052b6c 100644--- a/packages/twenty-front/src/modules/settings/app-preferences/hooks/useAddBuiltInAccount.ts+++ b/packages/twenty-front/src/modules/settings/app-preferences/hooks/useAddBuiltInAccount.ts@@ -11,7 +11,7 @@ export const useAddBuiltInAccount = () => {if (builtInAccountApp.provider === ConnectedAccountProvider.IMAP_SMTP_CALDAV) {- navigateSettings(SettingsPath.NewImapSmtpCaldavConnection);+ navigateSettings(SettingsPath.AppPreferencesNewImapSmtpCaldavConnection);return;}diff --git a/packages/twenty-front/src/modules/settings/app-preferences/utils/__tests__/getAppPreferencesPathnameFromLegacyAccountsPathname.test.ts b/packages/twenty-front/src/modules/settings/app-preferences/utils/__tests__/getAppPreferencesPathnameFromLegacyAccountsPathname.test.tsnew file mode 100644index 00000000000..5de1cd5c390--- /dev/null+++ b/packages/twenty-front/src/modules/settings/app-preferences/utils/__tests__/getAppPreferencesPathnameFromLegacyAccountsPathname.test.ts@@ -0,0 +1,39 @@+import { getAppPreferencesPathnameFromLegacyAccountsPathname } from '@/settings/app-preferences/utils/getAppPreferencesPathnameFromLegacyAccountsPathname';++describe('getAppPreferencesPathnameFromLegacyAccountsPathname', () => {+ it.each([+ ['/settings/accounts', '/settings/app-preferences'],+ ['/settings/accounts/', '/settings/app-preferences'],+ ['/settings/accounts/emails', '/settings/app-preferences'],+ ['/settings/accounts/calendars', '/settings/app-preferences'],+ [+ '/settings/accounts/detail/account-id',+ '/settings/app-preferences/accounts/account-id',+ ],+ ['/settings/accounts/apps/google', '/settings/app-preferences/google'],+ [+ '/settings/accounts/applications/application-id',+ '/settings/app-preferences/application-id',+ ],+ ['/settings/accounts/new', '/settings/app-preferences/accounts/new'],+ [+ '/settings/accounts/configuration/account-id',+ '/settings/app-preferences/accounts/account-id/configuration',+ ],+ [+ '/settings/accounts/new-imap-smtp-caldav-connection',+ '/settings/app-preferences/accounts/new-imap-smtp-caldav-connection',+ ],+ [+ '/settings/accounts/edit-imap-smtp-caldav-connection/account-id',+ '/settings/app-preferences/accounts/account-id/edit-imap-smtp-caldav-connection',+ ],+ ['/settings/accounts/unknown/page', '/settings/app-preferences'],+ ])('maps %s to %s', (legacyAccountsPathname, appPreferencesPathname) => {+ expect(+ getAppPreferencesPathnameFromLegacyAccountsPathname(+ legacyAccountsPathname,+ ),+ ).toBe(appPreferencesPathname);+ });+});diff --git a/packages/twenty-front/src/modules/settings/app-preferences/utils/__tests__/isBuiltInAccountAppId.test.ts b/packages/twenty-front/src/modules/settings/app-preferences/utils/__tests__/isBuiltInAccountAppId.test.tsnew file mode 100644index 00000000000..df09093f7a5--- /dev/null+++ b/packages/twenty-front/src/modules/settings/app-preferences/utils/__tests__/isBuiltInAccountAppId.test.ts@@ -0,0 +1,14 @@+import { isBuiltInAccountAppId } from '@/settings/app-preferences/utils/isBuiltInAccountAppId';++describe('isBuiltInAccountAppId', () => {+ it.each(['google', 'outlook', 'imap'])('accepts %s', (applicationId) => {+ expect(isBuiltInAccountAppId(applicationId)).toBe(true);+ });++ it.each(['20202020-1a2b-4c3d-8e4f-000000000021', 'accounts', undefined])(+ 'rejects %s',+ (applicationId) => {+ expect(isBuiltInAccountAppId(applicationId)).toBe(false);+ },+ );+});diff --git a/packages/twenty-front/src/modules/settings/app-preferences/utils/getAppPreferencesPathnameFromLegacyAccountsPathname.ts b/packages/twenty-front/src/modules/settings/app-preferences/utils/getAppPreferencesPathnameFromLegacyAccountsPathname.tsnew file mode 100644index 00000000000..001b2e3ebb1--- /dev/null+++ b/packages/twenty-front/src/modules/settings/app-preferences/utils/getAppPreferencesPathnameFromLegacyAccountsPathname.ts@@ -0,0 +1,30 @@+import { APP_PREFERENCES_PATH_BY_LEGACY_ACCOUNTS_PATH } from '@/settings/app-preferences/constants/AppPreferencesPathByLegacyAccountsPath';+import { generatePath, matchPath } from 'react-router-dom';+import { SettingsPath } from 'twenty-shared/types';+import {+ getSettingsPath,+ isDefined,+ typedObjectEntries,+} from 'twenty-shared/utils';++export const getAppPreferencesPathnameFromLegacyAccountsPathname = (+ legacyAccountsPathname: string,+) => {+ for (const [legacyAccountsPath, appPreferencesPath] of typedObjectEntries(+ APP_PREFERENCES_PATH_BY_LEGACY_ACCOUNTS_PATH,+ )) {+ const legacyAccountsPathMatch = matchPath(+ getSettingsPath(legacyAccountsPath),+ legacyAccountsPathname,+ );++ if (isDefined(legacyAccountsPathMatch)) {+ return generatePath(+ getSettingsPath(appPreferencesPath),+ legacyAccountsPathMatch.params,+ );+ }+ }++ return getSettingsPath(SettingsPath.AppPreferences);+};diff --git a/packages/twenty-front/src/modules/settings/app-preferences/utils/getApplicationPreferencesGeneralPath.ts b/packages/twenty-front/src/modules/settings/app-preferences/utils/getApplicationPreferencesGeneralPath.tsindex aa2ee9d4720..bac2bd20548 100644--- a/packages/twenty-front/src/modules/settings/app-preferences/utils/getApplicationPreferencesGeneralPath.ts+++ b/packages/twenty-front/src/modules/settings/app-preferences/utils/getApplicationPreferencesGeneralPath.ts@@ -4,7 +4,7 @@ import { getSettingsPath } from 'twenty-shared/utils';export const getApplicationPreferencesGeneralPath = (applicationId: string) =>getSettingsPath(- SettingsPath.ApplicationPreferences,+ SettingsPath.AppPreferencesApp,{ applicationId },undefined,APPLICATION_PREFERENCES_GENERAL_TAB_ID,diff --git a/packages/twenty-front/src/modules/settings/app-preferences/utils/isBuiltInAccountAppId.ts b/packages/twenty-front/src/modules/settings/app-preferences/utils/isBuiltInAccountAppId.tsnew file mode 100644index 00000000000..177654c9094--- /dev/null+++ b/packages/twenty-front/src/modules/settings/app-preferences/utils/isBuiltInAccountAppId.ts@@ -0,0 +1,9 @@+import { BUILT_IN_ACCOUNT_APPS } from '@/settings/app-preferences/constants/BuiltInAccountApps';+import { type BuiltInAccountApp } from '@/settings/app-preferences/types/BuiltInAccountApp';++export const isBuiltInAccountAppId = (+ applicationId: string | undefined,+): applicationId is BuiltInAccountApp['id'] =>+ BUILT_IN_ACCOUNT_APPS.some(+ (builtInAccountApp) => builtInAccountApp.id === applicationId,+ );diff --git a/packages/twenty-front/src/modules/settings/applications/components/SettingsApplicationsTable.tsx b/packages/twenty-front/src/modules/settings/applications/components/SettingsApplicationsTable.tsxindex b91fda50490..c12f6077730 100644--- a/packages/twenty-front/src/modules/settings/applications/components/SettingsApplicationsTable.tsx+++ b/packages/twenty-front/src/modules/settings/applications/components/SettingsApplicationsTable.tsx@@ -1,14 +1,12 @@import { type BuiltInAccountApp } from '@/settings/app-preferences/types/BuiltInAccountApp';import { SettingsApplicationTableHeaderRow } from '@/settings/applications/components/SettingsApplicationTableHeaderRow';import { SettingsApplicationsTableApplicationRow } from '@/settings/applications/components/SettingsApplicationsTableApplicationRow';-import { SettingsApplicationsTableBuiltInAccountAppRow } from '@/settings/applications/components/SettingsApplicationsTableBuiltInAccountAppRow';import { type SettingsApplicationsTableApplication } from '@/settings/applications/types/SettingsApplicationsTableApplication';import { type SettingsApplicationsTableLinkTarget } from '@/settings/applications/types/SettingsApplicationsTableLinkTarget';import { type SettingsApplicationTableRowMiddleColumn } from '@/settings/applications/types/SettingsApplicationTableRowMiddleColumn';import { type SettingsMemberApplicationStatus } from '@/settings/applications/types/SettingsMemberApplicationStatus';import { type SettingsWorkspaceApplicationStatus } from '@/settings/applications/types/SettingsWorkspaceApplicationStatus';-import { sortApplicationsWithOAuthOnlyLast } from '@/settings/applications/utils/sortApplicationsWithOAuthOnlyLast';-import { splitApplicationsAroundBuiltInAccountApps } from '@/settings/applications/utils/splitApplicationsAroundBuiltInAccountApps';+import { getSettingsApplicationsTableRowItems } from '@/settings/applications/utils/getSettingsApplicationsTableRowItems';import { SettingsEmptyPlaceholder } from '@/settings/components/SettingsEmptyPlaceholder';import { SettingsSectionSkeletonLoader } from '@/settings/components/SettingsSectionSkeletonLoader';import { Table } from '@/ui/layout/table/components/Table';@@ -71,43 +69,26 @@ export const SettingsApplicationsTable = ({const [searchTerm, setSearchTerm] = useState('');- const filteredApplications = sortApplicationsWithOAuthOnlyLast(- filterBySearchQuery({- items: applications,- searchQuery: searchTerm.trim(),- getSearchableValues: (application) => [- application.name,- application.description ?? '',- ],- }),- );+ const rowItems = getSettingsApplicationsTableRowItems({+ applications,+ builtInAccountApps,+ });- const filteredBuiltInAccountApps = filterBySearchQuery({- items: builtInAccountApps,+ const filteredRowItems = filterBySearchQuery({+ items: rowItems,searchQuery: searchTerm.trim(),- getSearchableValues: (builtInAccountApp) => [- t(builtInAccountApp.name),- t(builtInAccountApp.description),+ getSearchableValues: (rowItem) => [+ rowItem.name ?? '',+ rowItem.description ?? '',],});- const {- applicationsBeforeBuiltInAccountApps,- applicationsAfterBuiltInAccountApps,- } = splitApplicationsAroundBuiltInAccountApps({- applications: filteredApplications,- hasBuiltInAccountApps: isNonEmptyArray(builtInAccountApps),- });-- const hasApplications =- isNonEmptyArray(applications) || isNonEmptyArray(builtInAccountApps);-return (<Section.Root><Section.Header title={title} description={description} />{toolbar}{isLoading && <SettingsSectionSkeletonLoader />}- {!isLoading && hasApplications && (+ {!isLoading && isNonEmptyArray(rowItems) && (<><StyledSearchInputContainer><SearchInput@@ -119,37 +100,18 @@ export const SettingsApplicationsTable = ({<Table><SettingsApplicationTableHeaderRow middleColumn={middleColumn} /><StyledTableRowsContainer>- {filteredApplications.length === 0 &&- filteredBuiltInAccountApps.length === 0 && (- <SettingsEmptyPlaceholder padding="4">- <span role="status">{t`No application matches your search`}</span>- </SettingsEmptyPlaceholder>- )}- {applicationsBeforeBuiltInAccountApps.map((application) => (- <SettingsApplicationsTableApplicationRow- key={application.id}- application={application}- linkTarget={linkTarget}- middleColumn={middleColumn}- statuses={statusesById?.[application.id]}- />- ))}- {filteredBuiltInAccountApps.map((builtInAccountApp) => (- <SettingsApplicationsTableBuiltInAccountAppRow- key={builtInAccountApp.id}- builtInAccountApp={builtInAccountApp}- linkTarget={linkTarget}- middleColumn={middleColumn}- statuses={statusesById?.[builtInAccountApp.id]}- />- ))}- {applicationsAfterBuiltInAccountApps.map((application) => (+ {filteredRowItems.length === 0 && (+ <SettingsEmptyPlaceholder padding="4">+ <span role="status">{t`No application matches your search`}</span>+ </SettingsEmptyPlaceholder>+ )}+ {filteredRowItems.map((rowItem) => (<SettingsApplicationsTableApplicationRow- key={application.id}- application={application}+ key={rowItem.id}+ rowItem={rowItem}linkTarget={linkTarget}middleColumn={middleColumn}- statuses={statusesById?.[application.id]}+ statuses={statusesById?.[rowItem.id]}/>))}</StyledTableRowsContainer>diff --git a/packages/twenty-front/src/modules/settings/applications/components/SettingsApplicationsTableApplicationRow.tsx b/packages/twenty-front/src/modules/settings/applications/components/SettingsApplicationsTableApplicationRow.tsxindex 7e80b1a95a4..7369c637a82 100644--- a/packages/twenty-front/src/modules/settings/applications/components/SettingsApplicationsTableApplicationRow.tsx+++ b/packages/twenty-front/src/modules/settings/applications/components/SettingsApplicationsTableApplicationRow.tsx@@ -1,20 +1,20 @@import { SettingsApplicationTableRow } from '@/settings/applications/components/SettingsApplicationTableRow';import { SettingsApplicationTableRowChevronIcon } from '@/settings/applications/components/SettingsApplicationTableRowChevronIcon';import { type SettingsApplicationStatus } from '@/settings/applications/types/SettingsApplicationStatus';-import { type SettingsApplicationsTableApplication } from '@/settings/applications/types/SettingsApplicationsTableApplication';import { type SettingsApplicationsTableLinkTarget } from '@/settings/applications/types/SettingsApplicationsTableLinkTarget';import { type SettingsApplicationTableRowMiddleColumn } from '@/settings/applications/types/SettingsApplicationTableRowMiddleColumn';+import { type SettingsApplicationsTableRowItem } from '@/settings/applications/types/SettingsApplicationsTableRowItem';import { getSettingsApplicationLink } from '@/settings/applications/utils/getSettingsApplicationLink';type SettingsApplicationsTableApplicationRowProps = {- application: SettingsApplicationsTableApplication;+ rowItem: SettingsApplicationsTableRowItem;linkTarget: SettingsApplicationsTableLinkTarget;middleColumn: SettingsApplicationTableRowMiddleColumn;statuses?: SettingsApplicationStatus[];};export const SettingsApplicationsTableApplicationRow = ({- application,+ rowItem,linkTarget,middleColumn,statuses,@@ -25,15 +25,15 @@ export const SettingsApplicationsTableApplicationRow = ({return (<SettingsApplicationTableRow- application={application}+ application={rowItem}shouldShowUpdateTag={shouldShowUpdateTag}- sourceType={application.applicationRegistration?.sourceType}+ sourceType={rowItem.sourceType}middleColumn={middleColumn}statuses={statuses}action={<SettingsApplicationTableRowChevronIcon />}link={getSettingsApplicationLink({linkTarget,- applicationId: application.id,+ applicationId: rowItem.id,})}/>);diff --git a/packages/twenty-front/src/modules/settings/applications/components/SettingsApplicationsTableBuiltInAccountAppRow.tsx b/packages/twenty-front/src/modules/settings/applications/components/SettingsApplicationsTableBuiltInAccountAppRow.tsxdeleted file mode 100644index 4afa2abf0a4..00000000000--- a/packages/twenty-front/src/modules/settings/applications/components/SettingsApplicationsTableBuiltInAccountAppRow.tsx+++ /dev/null@@ -1,42 +0,0 @@-import { type BuiltInAccountApp } from '@/settings/app-preferences/types/BuiltInAccountApp';-import { getBuiltInAccountAppLogoUrl } from '@/settings/app-preferences/utils/getBuiltInAccountAppLogoUrl';-import { SettingsApplicationTableRow } from '@/settings/applications/components/SettingsApplicationTableRow';-import { SettingsApplicationTableRowChevronIcon } from '@/settings/applications/components/SettingsApplicationTableRowChevronIcon';-import { type SettingsApplicationStatus } from '@/settings/applications/types/SettingsApplicationStatus';-import { type SettingsApplicationsTableLinkTarget } from '@/settings/applications/types/SettingsApplicationsTableLinkTarget';-import { type SettingsApplicationTableRowMiddleColumn } from '@/settings/applications/types/SettingsApplicationTableRowMiddleColumn';-import { getSettingsBuiltInAccountAppLink } from '@/settings/applications/utils/getSettingsBuiltInAccountAppLink';-import { useLingui } from '@lingui/react/macro';--type SettingsApplicationsTableBuiltInAccountAppRowProps = {- builtInAccountApp: BuiltInAccountApp;- linkTarget: SettingsApplicationsTableLinkTarget;- middleColumn: SettingsApplicationTableRowMiddleColumn;- statuses?: SettingsApplicationStatus[];-};--export const SettingsApplicationsTableBuiltInAccountAppRow = ({- builtInAccountApp,- linkTarget,- middleColumn,- statuses,-}: SettingsApplicationsTableBuiltInAccountAppRowProps) => {- const { t } = useLingui();-- return (- <SettingsApplicationTableRow- application={{- name: t(builtInAccountApp.name),- description: t(builtInAccountApp.description),- logoUrl: getBuiltInAccountAppLogoUrl(builtInAccountApp),- }}- middleColumn={middleColumn}- statuses={statuses}- action={<SettingsApplicationTableRowChevronIcon />}- link={getSettingsBuiltInAccountAppLink({- linkTarget,- builtInAccountAppId: builtInAccountApp.id,- })}- />- );-};diff --git a/packages/twenty-front/src/modules/settings/applications/components/__stories__/SettingsApplicationsTable.stories.tsx b/packages/twenty-front/src/modules/settings/applications/components/__stories__/SettingsApplicationsTable.stories.tsxindex 4f9ffdaeb6e..007efc39417 100644--- a/packages/twenty-front/src/modules/settings/applications/components/__stories__/SettingsApplicationsTable.stories.tsx+++ b/packages/twenty-front/src/modules/settings/applications/components/__stories__/SettingsApplicationsTable.stories.tsx@@ -196,11 +196,11 @@ export const MemberRowsLinkToTheirPreferences: Story = {expect(await canvas.findByText('Gmail and Calendar')).toBeVisible();expect(getSettingsApplicationsTableRowLinks(canvasElement)).toEqual([- '/settings/accounts/apps/google',- '/settings/accounts/apps/outlook',- '/settings/accounts/apps/imap',- '/settings/accounts/applications/npm-application-id',- '/settings/accounts/applications/oauth-application-id',+ '/settings/app-preferences/google',+ '/settings/app-preferences/outlook',+ '/settings/app-preferences/imap',+ '/settings/app-preferences/npm-application-id',+ '/settings/app-preferences/oauth-application-id',]);const acmeRow = canvas.getByRole('link', { name: /Acme Sync/ });diff --git a/packages/twenty-front/src/modules/settings/applications/types/SettingsApplicationsTableRowItem.ts b/packages/twenty-front/src/modules/settings/applications/types/SettingsApplicationsTableRowItem.tsnew file mode 100644index 00000000000..d3ab4e512d8--- /dev/null+++ b/packages/twenty-front/src/modules/settings/applications/types/SettingsApplicationsTableRowItem.ts@@ -0,0 +1,8 @@+import { type ApplicationDisplayData } from '@/applications/types/ApplicationDisplayData';+import { type ApplicationRegistrationSourceType } from '~/generated-metadata/graphql';++export type SettingsApplicationsTableRowItem = ApplicationDisplayData & {+ id: string;+ description: string | null;+ sourceType?: ApplicationRegistrationSourceType;+};diff --git a/packages/twenty-front/src/modules/settings/applications/utils/__tests__/getSettingsApplicationLink.test.ts b/packages/twenty-front/src/modules/settings/applications/utils/__tests__/getSettingsApplicationLink.test.tsindex 2f5b932baf2..54074d0c449 100644--- a/packages/twenty-front/src/modules/settings/applications/utils/__tests__/getSettingsApplicationLink.test.ts+++ b/packages/twenty-front/src/modules/settings/applications/utils/__tests__/getSettingsApplicationLink.test.ts@@ -16,6 +16,6 @@ describe('getSettingsApplicationLink', () => {linkTarget: 'applicationPreferences',applicationId: 'acme-application-id',}),- ).toBe('/settings/accounts/applications/acme-application-id');+ ).toBe('/settings/app-preferences/acme-application-id');});});diff --git a/packages/twenty-front/src/modules/settings/applications/utils/__tests__/getSettingsApplicationsTableRowItems.test.ts b/packages/twenty-front/src/modules/settings/applications/utils/__tests__/getSettingsApplicationsTableRowItems.test.tsnew file mode 100644index 00000000000..4cc3e93d07a--- /dev/null+++ b/packages/twenty-front/src/modules/settings/applications/utils/__tests__/getSettingsApplicationsTableRowItems.test.ts@@ -0,0 +1,67 @@+import { BUILT_IN_ACCOUNT_APPS } from '@/settings/app-preferences/constants/BuiltInAccountApps';+import {+ NPM_APPLICATION,+ OAUTH_ONLY_APPLICATION,+ STANDARD_APPLICATION,+} from '@/settings/applications/testing/settingsApplicationsTableFixtures';+import { getSettingsApplicationsTableRowItems } from '@/settings/applications/utils/getSettingsApplicationsTableRowItems';+import { ApplicationRegistrationSourceType } from '~/generated-metadata/graphql';++describe('getSettingsApplicationsTableRowItems', () => {+ it('lists the standard app, then built-in account apps, then the other apps with OAuth-only apps last', () => {+ const rowItems = getSettingsApplicationsTableRowItems({+ applications: [+ OAUTH_ONLY_APPLICATION,+ NPM_APPLICATION,+ STANDARD_APPLICATION,+ ],+ builtInAccountApps: BUILT_IN_ACCOUNT_APPS,+ });++ expect(rowItems.map(({ id }) => id)).toEqual([+ STANDARD_APPLICATION.id,+ 'google',+ 'outlook',+ 'imap',+ NPM_APPLICATION.id,+ OAUTH_ONLY_APPLICATION.id,+ ]);+ });++ it('keeps the existing order without built-in account apps', () => {+ const rowItems = getSettingsApplicationsTableRowItems({+ applications: [+ NPM_APPLICATION,+ OAUTH_ONLY_APPLICATION,+ STANDARD_APPLICATION,+ ],+ builtInAccountApps: [],+ });++ expect(rowItems.map(({ id }) => id)).toEqual([+ NPM_APPLICATION.id,+ STANDARD_APPLICATION.id,+ OAUTH_ONLY_APPLICATION.id,+ ]);+ });++ it('gives installed apps their source type and built-in account apps none', () => {+ const [googleRowItem, npmRowItem] = getSettingsApplicationsTableRowItems({+ applications: [NPM_APPLICATION],+ builtInAccountApps: BUILT_IN_ACCOUNT_APPS.slice(0, 1),+ });++ expect(npmRowItem).toMatchObject({+ id: NPM_APPLICATION.id,+ name: 'Acme Sync',+ description: 'Keeps Acme in sync',+ sourceType: ApplicationRegistrationSourceType.NPM,+ });+ expect(googleRowItem).toMatchObject({+ id: 'google',+ name: 'Gmail and Calendar',+ description: 'Sync emails and calendar events from your Google accounts.',+ });+ expect(googleRowItem.sourceType).toBeUndefined();+ });+});diff --git a/packages/twenty-front/src/modules/settings/applications/utils/__tests__/getSettingsBuiltInAccountAppLink.test.ts b/packages/twenty-front/src/modules/settings/applications/utils/__tests__/getSettingsBuiltInAccountAppLink.test.tsdeleted file mode 100644index a6021d3ca18..00000000000--- a/packages/twenty-front/src/modules/settings/applications/utils/__tests__/getSettingsBuiltInAccountAppLink.test.ts+++ /dev/null@@ -1,21 +0,0 @@-import { getSettingsBuiltInAccountAppLink } from '@/settings/applications/utils/getSettingsBuiltInAccountAppLink';--describe('getSettingsBuiltInAccountAppLink', () => {- it('links to the application detail page', () => {- expect(- getSettingsBuiltInAccountAppLink({- linkTarget: 'applicationDetail',- builtInAccountAppId: 'google',- }),- ).toBe('/settings/applications/google');- });-- it('links to the member preferences of the built-in account app', () => {- expect(- getSettingsBuiltInAccountAppLink({- linkTarget: 'applicationPreferences',- builtInAccountAppId: 'google',- }),- ).toBe('/settings/accounts/apps/google');- });-});diff --git a/packages/twenty-front/src/modules/settings/applications/utils/__tests__/splitApplicationsAroundBuiltInAccountApps.test.ts b/packages/twenty-front/src/modules/settings/applications/utils/__tests__/splitApplicationsAroundBuiltInAccountApps.test.tsdeleted file mode 100644index b338377e4f0..00000000000--- a/packages/twenty-front/src/modules/settings/applications/utils/__tests__/splitApplicationsAroundBuiltInAccountApps.test.ts+++ /dev/null@@ -1,51 +0,0 @@-import { TWENTY_STANDARD_APPLICATION_UNIVERSAL_IDENTIFIER } from 'twenty-shared/application';--import { splitApplicationsAroundBuiltInAccountApps } from '@/settings/applications/utils/splitApplicationsAroundBuiltInAccountApps';--const STANDARD_APPLICATION = {- id: 'standard',- universalIdentifier: TWENTY_STANDARD_APPLICATION_UNIVERSAL_IDENTIFIER,-};-const CUSTOM_APPLICATION = { id: 'custom', universalIdentifier: 'custom' };-const NPM_APPLICATION = { id: 'npm', universalIdentifier: 'npm' };--describe('splitApplicationsAroundBuiltInAccountApps', () => {- it('puts the standard application before built-in account apps and keeps the others after in order', () => {- expect(- splitApplicationsAroundBuiltInAccountApps({- applications: [- CUSTOM_APPLICATION,- STANDARD_APPLICATION,- NPM_APPLICATION,- ],- hasBuiltInAccountApps: true,- }),- ).toEqual({- applicationsBeforeBuiltInAccountApps: [STANDARD_APPLICATION],- applicationsAfterBuiltInAccountApps: [- CUSTOM_APPLICATION,- NPM_APPLICATION,- ],- });- });-- it('keeps every application in its order when there is no built-in account app', () => {- expect(- splitApplicationsAroundBuiltInAccountApps({- applications: [- CUSTOM_APPLICATION,- STANDARD_APPLICATION,- NPM_APPLICATION,- ],- hasBuiltInAccountApps: false,- }),- ).toEqual({- applicationsBeforeBuiltInAccountApps: [],- applicationsAfterBuiltInAccountApps: [- CUSTOM_APPLICATION,- STANDARD_APPLICATION,- NPM_APPLICATION,- ],- });- });-});diff --git a/packages/twenty-front/src/modules/settings/applications/utils/getSettingsApplicationLink.ts b/packages/twenty-front/src/modules/settings/applications/utils/getSettingsApplicationLink.tsindex de21c5acb53..4eb3cfdae4f 100644--- a/packages/twenty-front/src/modules/settings/applications/utils/getSettingsApplicationLink.ts+++ b/packages/twenty-front/src/modules/settings/applications/utils/getSettingsApplicationLink.ts@@ -10,5 +10,5 @@ export const getSettingsApplicationLink = ({applicationId: string;}) =>linkTarget === 'applicationPreferences'- ? getSettingsPath(SettingsPath.ApplicationPreferences, { applicationId })+ ? getSettingsPath(SettingsPath.AppPreferencesApp, { applicationId }): getSettingsPath(SettingsPath.ApplicationDetail, { applicationId });diff --git a/packages/twenty-front/src/modules/settings/applications/utils/getSettingsApplicationsTableRowItems.ts b/packages/twenty-front/src/modules/settings/applications/utils/getSettingsApplicationsTableRowItems.tsnew file mode 100644index 00000000000..8283d79a58a--- /dev/null+++ b/packages/twenty-front/src/modules/settings/applications/utils/getSettingsApplicationsTableRowItems.ts@@ -0,0 +1,52 @@+import { isTwentyStandardApplication } from '@/applications/utils/isTwentyStandardApplication';+import { type BuiltInAccountApp } from '@/settings/app-preferences/types/BuiltInAccountApp';+import { getBuiltInAccountAppLogoUrl } from '@/settings/app-preferences/utils/getBuiltInAccountAppLogoUrl';+import { type SettingsApplicationsTableApplication } from '@/settings/applications/types/SettingsApplicationsTableApplication';+import { type SettingsApplicationsTableRowItem } from '@/settings/applications/types/SettingsApplicationsTableRowItem';+import { sortApplicationsWithOAuthOnlyLast } from '@/settings/applications/utils/sortApplicationsWithOAuthOnlyLast';+import { i18n } from '@lingui/core';+import { isNonEmptyArray } from 'twenty-shared/utils';++const getApplicationRowItem = (+ application: SettingsApplicationsTableApplication,+): SettingsApplicationsTableRowItem => ({+ id: application.id,+ name: application.name,+ description: application.description ?? null,+ logoUrl: application.logoUrl,+ universalIdentifier: application.universalIdentifier,+ sourceType: application.applicationRegistration?.sourceType,+});++const getBuiltInAccountAppRowItem = (+ builtInAccountApp: BuiltInAccountApp,+): SettingsApplicationsTableRowItem => ({+ id: builtInAccountApp.id,+ name: i18n._(builtInAccountApp.name),+ description: i18n._(builtInAccountApp.description),+ logoUrl: getBuiltInAccountAppLogoUrl(builtInAccountApp),+});++export const getSettingsApplicationsTableRowItems = ({+ applications,+ builtInAccountApps,+}: {+ applications: SettingsApplicationsTableApplication[];+ builtInAccountApps: BuiltInAccountApp[];+}): SettingsApplicationsTableRowItem[] => {+ const sortedApplications = sortApplicationsWithOAuthOnlyLast(applications);++ if (!isNonEmptyArray(builtInAccountApps)) {+ return sortedApplications.map(getApplicationRowItem);+ }++ return [+ ...sortedApplications+ .filter(isTwentyStandardApplication)+ .map(getApplicationRowItem),+ ...builtInAccountApps.map(getBuiltInAccountAppRowItem),+ ...sortedApplications+ .filter((application) => !isTwentyStandardApplication(application))+ .map(getApplicationRowItem),+ ];+};diff --git a/packages/twenty-front/src/modules/settings/applications/utils/getSettingsBuiltInAccountAppLink.ts b/packages/twenty-front/src/modules/settings/applications/utils/getSettingsBuiltInAccountAppLink.tsdeleted file mode 100644index d404c3f1f9e..00000000000--- a/packages/twenty-front/src/modules/settings/applications/utils/getSettingsBuiltInAccountAppLink.ts+++ /dev/null@@ -1,17 +0,0 @@-import { type BuiltInAccountApp } from '@/settings/app-preferences/types/BuiltInAccountApp';-import { type SettingsApplicationsTableLinkTarget } from '@/settings/applications/types/SettingsApplicationsTableLinkTarget';-import { SettingsPath } from 'twenty-shared/types';-import { getSettingsPath } from 'twenty-shared/utils';--export const getSettingsBuiltInAccountAppLink = ({- linkTarget,- builtInAccountAppId,-}: {- linkTarget: SettingsApplicationsTableLinkTarget;- builtInAccountAppId: BuiltInAccountApp['id'];-}) =>- linkTarget === 'applicationPreferences'- ? getSettingsPath(SettingsPath.BuiltInAccountApp, { builtInAccountAppId })- : getSettingsPath(SettingsPath.ApplicationDetail, {- applicationId: builtInAccountAppId,- });diff --git a/packages/twenty-front/src/modules/settings/applications/utils/splitApplicationsAroundBuiltInAccountApps.ts b/packages/twenty-front/src/modules/settings/applications/utils/splitApplicationsAroundBuiltInAccountApps.tsdeleted file mode 100644index f4c9533622a..00000000000--- a/packages/twenty-front/src/modules/settings/applications/utils/splitApplicationsAroundBuiltInAccountApps.ts+++ /dev/null@@ -1,30 +0,0 @@-import { isTwentyStandardApplication } from '@/applications/utils/isTwentyStandardApplication';--export const splitApplicationsAroundBuiltInAccountApps = <- TApplication extends { universalIdentifier?: string | null },->({- applications,- hasBuiltInAccountApps,-}: {- applications: TApplication[];- hasBuiltInAccountApps: boolean;-}): {- applicationsBeforeBuiltInAccountApps: TApplication[];- applicationsAfterBuiltInAccountApps: TApplication[];-} => {- if (!hasBuiltInAccountApps) {- return {- applicationsBeforeBuiltInAccountApps: [],- applicationsAfterBuiltInAccountApps: applications,- };- }-- return {- applicationsBeforeBuiltInAccountApps: applications.filter(- isTwentyStandardApplication,- ),- applicationsAfterBuiltInAccountApps: applications.filter(- (application) => !isTwentyStandardApplication(application),- ),- };-};diff --git a/packages/twenty-front/src/modules/settings/hooks/__tests__/useSettingsNavigationItems.test.tsx b/packages/twenty-front/src/modules/settings/hooks/__tests__/useSettingsNavigationItems.test.tsxindex 0957d3415d3..18bc89d1176 100644--- a/packages/twenty-front/src/modules/settings/hooks/__tests__/useSettingsNavigationItems.test.tsx+++ b/packages/twenty-front/src/modules/settings/hooks/__tests__/useSettingsNavigationItems.test.tsx@@ -80,14 +80,18 @@ const setPermissionFlags = (permissionFlags: PermissionFlagType[]) => {});};-const getAccountsItem = () => {+const getAccountsOrAppPreferencesItem = () => {const { result } = renderHook(() => useSettingsNavigationItems(), {wrapper: Wrapper,});return result.current.find((section) => section.label === 'User')- ?.items.find((item) => item.path === SettingsPath.Accounts);+ ?.items.find(+ (item) =>+ item.path === SettingsPath.Accounts ||+ item.path === SettingsPath.AppPreferences,+ );};describe('useSettingsNavigationItems', () => {@@ -209,9 +213,10 @@ describe('useSettingsNavigationItems', () => {it('should show Accounts with Emails and Calendars when app preferences are off', () => {setPermissionFlags([PermissionFlagType.CONNECTED_ACCOUNTS]);- const accountsItem = getAccountsItem();+ const accountsItem = getAccountsOrAppPreferencesItem();expect(accountsItem?.label).toBe('Accounts');+ expect(accountsItem?.path).toBe(SettingsPath.Accounts);expect(accountsItem?.Icon).toBe(IconAt);expect(accountsItem?.subItems?.map((subItem) => subItem.path)).toEqual([SettingsPath.AccountsEmails,@@ -228,9 +233,10 @@ describe('useSettingsNavigationItems', () => {],});- const accountsItem = getAccountsItem();+ const accountsItem = getAccountsOrAppPreferencesItem();expect(accountsItem?.label).toBe('Apps preferences');+ expect(accountsItem?.path).toBe(SettingsPath.AppPreferences);expect(accountsItem?.Icon).toBe(IconApps);expect(accountsItem?.isHidden).toBe(false);expect(accountsItem?.subItems).toBeUndefined();diff --git a/packages/twenty-front/src/modules/settings/hooks/useSettingsNavigationItems.tsx b/packages/twenty-front/src/modules/settings/hooks/useSettingsNavigationItems.tsxindex f66aba19544..cca9ffe2c61 100644--- a/packages/twenty-front/src/modules/settings/hooks/useSettingsNavigationItems.tsx+++ b/packages/twenty-front/src/modules/settings/hooks/useSettingsNavigationItems.tsx@@ -93,7 +93,9 @@ const useSettingsNavigationItems = (): SettingsNavigationSection[] => {},{label: isAppPreferencesEnabled ? t`Apps preferences` : t`Accounts`,- path: SettingsPath.Accounts,+ path: isAppPreferencesEnabled+ ? SettingsPath.AppPreferences+ : SettingsPath.Accounts,Icon: isAppPreferencesEnabled ? IconApps : IconAt,isHidden: !permissionFlagMap[PermissionFlagType.CONNECTED_ACCOUNTS],subItems: isAppPreferencesEnableddiff --git a/packages/twenty-front/src/pages/settings/accounts/SettingsAccountDetail.tsx b/packages/twenty-front/src/pages/settings/accounts/SettingsAccountDetail.tsxindex 0de5f2f63c2..e88b363d077 100644--- a/packages/twenty-front/src/pages/settings/accounts/SettingsAccountDetail.tsx+++ b/packages/twenty-front/src/pages/settings/accounts/SettingsAccountDetail.tsx@@ -10,22 +10,17 @@ import { SettingsSkeletonLoader } from '@/settings/components/SettingsSkeletonLoimport { SettingsPageLayout } from '@/settings/components/layout/SettingsPageLayout';import { SettingsTabBar } from '@/settings/components/layout/SettingsTabBar';import { useSettingsActiveTabId } from '@/settings/components/layout/useSettingsActiveTabId';-import { useIsFeatureEnabled } from '@/workspace/hooks/useIsFeatureEnabled';import { useLingui } from '@lingui/react/macro';import { Navigate, useParams } from 'react-router-dom';import { SettingsPath } from 'twenty-shared/types';import { getSettingsPath, isDefined } from 'twenty-shared/utils';import { IconCalendarEvent, IconMail } from 'twenty-ui/icon';import { useTheme } from 'twenty-ui/theme';-import { FeatureFlagKey } from '~/generated-metadata/graphql';import { SettingsAppPreferencesSelectedMessageChannelDetails } from '~/pages/settings/accounts/SettingsAppPreferencesSelectedMessageChannelDetails';export const SettingsAccountDetail = () => {const { t } = useLingui();const theme = useTheme();- const isAppPreferencesEnabled = useIsFeatureEnabled(- FeatureFlagKey.IS_APP_PREFERENCES_ENABLED,- );const { connectedAccountId } = useParams<{ connectedAccountId: string }>();const { groups, loading } = useMyAccountGroups();const tabListComponentInstanceId = `${SETTINGS_ACCOUNT_GROUP_TAB_LIST_COMPONENT_ID}-${connectedAccountId}`;@@ -50,8 +45,10 @@ export const SettingsAccountDetail = () => {tabs.map((tab) => tab.id),);- if (!isAppPreferencesEnabled || (!loading && tabs.length === 0)) {- return <Navigate to={getSettingsPath(SettingsPath.Accounts)} replace />;+ if (!loading && tabs.length === 0) {+ return (+ <Navigate to={getSettingsPath(SettingsPath.AppPreferences)} replace />+ );}if (!isDefined(builtInAccount)) {@@ -94,7 +91,7 @@ export const SettingsAccountDetail = () => {{children: t`Apps preferences`,href: getSettingsPath(- SettingsPath.Accounts,+ SettingsPath.AppPreferences,undefined,undefined,SETTINGS_APP_PREFERENCES_TAB_IDS.ACCOUNTS,diff --git a/packages/twenty-front/src/pages/settings/accounts/SettingsAccountsCalendars.tsx b/packages/twenty-front/src/pages/settings/accounts/SettingsAccountsCalendars.tsxindex 88690d23c86..325ad6562fe 100644--- a/packages/twenty-front/src/pages/settings/accounts/SettingsAccountsCalendars.tsx+++ b/packages/twenty-front/src/pages/settings/accounts/SettingsAccountsCalendars.tsx@@ -6,21 +6,14 @@ import { SettingsPageContainer } from '@/settings/components/SettingsPageContainimport { SettingsSectionSkeletonLoader } from '@/settings/components/SettingsSectionSkeletonLoader';import { SettingsPageLayout } from '@/settings/components/layout/SettingsPageLayout';import { SettingsTabBar } from '@/settings/components/layout/SettingsTabBar';-import { useIsFeatureEnabled } from '@/workspace/hooks/useIsFeatureEnabled';import { useLingui } from '@lingui/react/macro';import { useMemo } from 'react';-import { Navigate } from 'react-router-dom';import { CalendarChannelSyncStage, SettingsPath } from 'twenty-shared/types';import { getSettingsPath } from 'twenty-shared/utils';import { Section } from 'twenty-ui/components/layout';-import { FeatureFlagKey } from '~/generated-metadata/graphql';export const SettingsAccountsCalendars = () => {const { t } = useLingui();- const isAppPreferencesEnabled = useIsFeatureEnabled(- FeatureFlagKey.IS_APP_PREFERENCES_ENABLED,- );-const { channels: allCalendarChannels, loading } = useMyCalendarChannels();const calendarChannels = useMemo(@@ -37,10 +30,6 @@ export const SettingsAccountsCalendars = () => {title: calendarChannel.handle,}));- if (isAppPreferencesEnabled) {- return <Navigate to={getSettingsPath(SettingsPath.Accounts)} replace />;- }-const renderContent = () => {if (loading) {return <SettingsSectionSkeletonLoader />;diff --git a/packages/twenty-front/src/pages/settings/accounts/SettingsAccountsConfigurationStepCalendar.tsx b/packages/twenty-front/src/pages/settings/accounts/SettingsAccountsConfigurationStepCalendar.tsxindex 883ada56ba7..f2408650526 100644--- a/packages/twenty-front/src/pages/settings/accounts/SettingsAccountsConfigurationStepCalendar.tsx+++ b/packages/twenty-front/src/pages/settings/accounts/SettingsAccountsConfigurationStepCalendar.tsx@@ -3,6 +3,7 @@ import { Trans, useLingui } from '@lingui/react/macro';import { type CalendarChannel } from '@/accounts/types/CalendarChannel';import { type MessageChannel } from '@/accounts/types/MessageChannel';import { SettingsAccountsCalendarChannelDetails } from '@/settings/accounts/components/SettingsAccountsCalendarChannelDetails';+import { useAccountsSettingsBreadcrumbLink } from '@/settings/app-preferences/hooks/useAccountsSettingsBreadcrumbLink';import { SettingsPageContainer } from '@/settings/components/SettingsPageContainer';import { SettingsPageLayout } from '@/settings/components/layout/SettingsPageLayout';import { SettingsPath } from 'twenty-shared/types';@@ -24,6 +25,9 @@ export const SettingsAccountsConfigurationStepCalendar = ({onAddAccount,}: SettingsAccountsConfigurationStepCalendarProps) => {const { t } = useLingui();+ const accountsBreadcrumbLink = useAccountsSettingsBreadcrumbLink(+ <Trans>Account</Trans>,+ );const stepNumber = isDefined(messageChannel) ? 2 : 1;const stepTitle = t`${stepNumber}. Calendar`;@@ -36,10 +40,7 @@ export const SettingsAccountsConfigurationStepCalendar = ({children: <Trans>User</Trans>,href: getSettingsPath(SettingsPath.ProfilePage),},- {- children: <Trans>Account</Trans>,- href: getSettingsPath(SettingsPath.Accounts),- },+ accountsBreadcrumbLink,{children: stepTitle,},diff --git a/packages/twenty-front/src/pages/settings/accounts/SettingsAccountsConfigurationStepEmail.tsx b/packages/twenty-front/src/pages/settings/accounts/SettingsAccountsConfigurationStepEmail.tsxindex e469cc5cedb..3f88da8641b 100644--- a/packages/twenty-front/src/pages/settings/accounts/SettingsAccountsConfigurationStepEmail.tsx+++ b/packages/twenty-front/src/pages/settings/accounts/SettingsAccountsConfigurationStepEmail.tsx@@ -2,6 +2,7 @@ import { Trans, useLingui } from '@lingui/react/macro';import { type MessageChannel } from '@/accounts/types/MessageChannel';import { SettingsAccountsMessageChannelDetails } from '@/settings/accounts/components/SettingsAccountsMessageChannelDetails';+import { useAccountsSettingsBreadcrumbLink } from '@/settings/app-preferences/hooks/useAccountsSettingsBreadcrumbLink';import { SettingsPageContainer } from '@/settings/components/SettingsPageContainer';import { SettingsPageLayout } from '@/settings/components/layout/SettingsPageLayout';import { SettingsPath } from 'twenty-shared/types';@@ -25,6 +26,9 @@ export const SettingsAccountsConfigurationStepEmail = ({onAddAccount,}: SettingsAccountsConfigurationStepEmailProps) => {const { t } = useLingui();+ const accountsBreadcrumbLink = useAccountsSettingsBreadcrumbLink(+ <Trans>Account</Trans>,+ );return (<SettingsPageLayout@@ -34,10 +38,7 @@ export const SettingsAccountsConfigurationStepEmail = ({children: <Trans>User</Trans>,href: getSettingsPath(SettingsPath.ProfilePage),},- {- children: <Trans>Account</Trans>,- href: getSettingsPath(SettingsPath.Accounts),- },+ accountsBreadcrumbLink,{children: t`1. Email`,},diff --git a/packages/twenty-front/src/pages/settings/accounts/SettingsAccountsEditImapSmtpCaldavConnection.tsx b/packages/twenty-front/src/pages/settings/accounts/SettingsAccountsEditImapSmtpCaldavConnection.tsxindex c7272d5593e..db1234b8ac3 100644--- a/packages/twenty-front/src/pages/settings/accounts/SettingsAccountsEditImapSmtpCaldavConnection.tsx+++ b/packages/twenty-front/src/pages/settings/accounts/SettingsAccountsEditImapSmtpCaldavConnection.tsx@@ -4,6 +4,7 @@ import { FormProvider } from 'react-hook-form';import { useParams } from 'react-router-dom';import { SaveAndCancelButtons } from '@/settings/components/SaveAndCancelButtons/SaveAndCancelButtons';+import { useAccountsSettingsBreadcrumbLink } from '@/settings/app-preferences/hooks/useAccountsSettingsBreadcrumbLink';import { SettingsPageContainer } from '@/settings/components/SettingsPageContainer';import { SettingsPageLayout } from '@/settings/components/layout/SettingsPageLayout';import { SettingsPath } from 'twenty-shared/types';@@ -28,6 +29,7 @@ const StyledLoadingContainer = styled.div`export const SettingsAccountsEditImapSmtpCaldavConnection = () => {const { t } = useLingui();const navigate = useNavigateSettings();+ const accountsBreadcrumbLink = useAccountsSettingsBreadcrumbLink(t`Accounts`);const { connectedAccountId } = useParams<{ connectedAccountId: string }>();const {@@ -71,10 +73,7 @@ export const SettingsAccountsEditImapSmtpCaldavConnection = () => {children: t`User`,href: getSettingsPath(SettingsPath.ProfilePage),},- {- children: t`Accounts`,- href: getSettingsPath(SettingsPath.Accounts),- },+ accountsBreadcrumbLink,{ children: t`Edit Account` },]}actionButton={diff --git a/packages/twenty-front/src/pages/settings/accounts/SettingsAccountsEmails.tsx b/packages/twenty-front/src/pages/settings/accounts/SettingsAccountsEmails.tsxindex 2279d960bc7..a3135522d97 100644--- a/packages/twenty-front/src/pages/settings/accounts/SettingsAccountsEmails.tsx+++ b/packages/twenty-front/src/pages/settings/accounts/SettingsAccountsEmails.tsx@@ -6,10 +6,8 @@ import { SettingsPageContainer } from '@/settings/components/SettingsPageContainimport { SettingsSectionSkeletonLoader } from '@/settings/components/SettingsSectionSkeletonLoader';import { SettingsPageLayout } from '@/settings/components/layout/SettingsPageLayout';import { SettingsTabBar } from '@/settings/components/layout/SettingsTabBar';-import { useIsFeatureEnabled } from '@/workspace/hooks/useIsFeatureEnabled';import { useLingui } from '@lingui/react/macro';import { useMemo } from 'react';-import { Navigate } from 'react-router-dom';import {MessageChannelSyncStage,MessageChannelType,@@ -17,14 +15,9 @@ import {} from 'twenty-shared/types';import { getSettingsPath } from 'twenty-shared/utils';import { Section } from 'twenty-ui/components/layout';-import { FeatureFlagKey } from '~/generated-metadata/graphql';export const SettingsAccountsEmails = () => {const { t } = useLingui();- const isAppPreferencesEnabled = useIsFeatureEnabled(- FeatureFlagKey.IS_APP_PREFERENCES_ENABLED,- );-const { channels: allMessageChannels, loading } = useMyMessageChannels();const messageChannels = useMemo(@@ -44,10 +37,6 @@ export const SettingsAccountsEmails = () => {title: messageChannel.handle,}));- if (isAppPreferencesEnabled) {- return <Navigate to={getSettingsPath(SettingsPath.Accounts)} replace />;- }-const renderContent = () => {if (loading) {return <SettingsSectionSkeletonLoader />;diff --git a/packages/twenty-front/src/pages/settings/accounts/SettingsAccountsNewImapSmtpCaldavConnection.tsx b/packages/twenty-front/src/pages/settings/accounts/SettingsAccountsNewImapSmtpCaldavConnection.tsxindex bda25b5aef6..ff5e52b53e8 100644--- a/packages/twenty-front/src/pages/settings/accounts/SettingsAccountsNewImapSmtpCaldavConnection.tsx+++ b/packages/twenty-front/src/pages/settings/accounts/SettingsAccountsNewImapSmtpCaldavConnection.tsx@@ -2,6 +2,7 @@ import { useLingui } from '@lingui/react/macro';import { FormProvider } from 'react-hook-form';import { SaveAndCancelButtons } from '@/settings/components/SaveAndCancelButtons/SaveAndCancelButtons';+import { useAccountsSettingsBreadcrumbLink } from '@/settings/app-preferences/hooks/useAccountsSettingsBreadcrumbLink';import { SettingsPageContainer } from '@/settings/components/SettingsPageContainer';import { SettingsPageLayout } from '@/settings/components/layout/SettingsPageLayout';import { SettingsPath } from 'twenty-shared/types';@@ -15,6 +16,7 @@ import { useImapSmtpCaldavConnectionForm } from '@/settings/accounts/hooks/useImexport const SettingsAccountsNewImapSmtpCaldavConnection = () => {const { t } = useLingui();const navigate = useNavigateSettings();+ const accountsBreadcrumbLink = useAccountsSettingsBreadcrumbLink(t`Accounts`);const {formMethods,@@ -37,10 +39,7 @@ export const SettingsAccountsNewImapSmtpCaldavConnection = () => {children: t`User`,href: getSettingsPath(SettingsPath.ProfilePage),},- {- children: t`Accounts`,- href: getSettingsPath(SettingsPath.Accounts),- },+ accountsBreadcrumbLink,{ children: t`New Account` },]}actionButton={diff --git a/packages/twenty-front/src/pages/settings/accounts/SettingsAppPreferencesApp.tsx b/packages/twenty-front/src/pages/settings/accounts/SettingsAppPreferencesApp.tsxnew file mode 100644index 00000000000..cfa139b23bb--- /dev/null+++ b/packages/twenty-front/src/pages/settings/accounts/SettingsAppPreferencesApp.tsx@@ -0,0 +1,14 @@+import { isBuiltInAccountAppId } from '@/settings/app-preferences/utils/isBuiltInAccountAppId';+import { useParams } from 'react-router-dom';+import { SettingsApplicationPreferences } from '~/pages/settings/accounts/SettingsApplicationPreferences';+import { SettingsBuiltInAccountApp } from '~/pages/settings/accounts/SettingsBuiltInAccountApp';++export const SettingsAppPreferencesApp = () => {+ const { applicationId } = useParams<{ applicationId: string }>();++ return isBuiltInAccountAppId(applicationId) ? (+ <SettingsBuiltInAccountApp />+ ) : (+ <SettingsApplicationPreferences />+ );+};diff --git a/packages/twenty-front/src/pages/settings/accounts/SettingsApplicationPreferences.tsx b/packages/twenty-front/src/pages/settings/accounts/SettingsApplicationPreferences.tsxindex 9297f864544..a7a5ac4e303 100644--- a/packages/twenty-front/src/pages/settings/accounts/SettingsApplicationPreferences.tsx+++ b/packages/twenty-front/src/pages/settings/accounts/SettingsApplicationPreferences.tsx@@ -3,19 +3,14 @@ import { SettingsApplicationLoadErrorBanner } from '@/settings/applications/compimport { SettingsPageContainer } from '@/settings/components/SettingsPageContainer';import { SettingsSkeletonLoader } from '@/settings/components/SettingsSkeletonLoader';import { SettingsPageLayout } from '@/settings/components/layout/SettingsPageLayout';-import { useIsFeatureEnabled } from '@/workspace/hooks/useIsFeatureEnabled';import { useLingui } from '@lingui/react/macro';import { Navigate, useParams } from 'react-router-dom';import { SettingsPath } from 'twenty-shared/types';import { getSettingsPath, isDefined } from 'twenty-shared/utils';-import { FeatureFlagKey } from '~/generated-metadata/graphql';import { SettingsApplicationPreferencesDetail } from '~/pages/settings/accounts/SettingsApplicationPreferencesDetail';export const SettingsApplicationPreferences = () => {const { t } = useLingui();- const isAppPreferencesEnabled = useIsFeatureEnabled(- FeatureFlagKey.IS_APP_PREFERENCES_ENABLED,- );const { applicationId } = useParams<{ applicationId: string }>();const { applicationsWithPreferences, loading, error, refetch } =useApplicationsWithPreferences();@@ -24,7 +19,7 @@ export const SettingsApplicationPreferences = () => {({ application }) => application.id === applicationId,);- if (isAppPreferencesEnabled && isDefined(applicationWithPreferences)) {+ if (isDefined(applicationWithPreferences)) {return (<SettingsApplicationPreferencesDetailapplicationWithPreferences={applicationWithPreferences}@@ -33,11 +28,11 @@ export const SettingsApplicationPreferences = () => {);}- if (isAppPreferencesEnabled && loading) {+ if (loading) {return <SettingsSkeletonLoader />;}- if (isAppPreferencesEnabled && isDefined(error)) {+ if (isDefined(error)) {return (<SettingsPageLayouttitle={t`Apps preferences`}@@ -48,7 +43,7 @@ export const SettingsApplicationPreferences = () => {},{children: t`Apps preferences`,- href: getSettingsPath(SettingsPath.Accounts),+ href: getSettingsPath(SettingsPath.AppPreferences),},]}>@@ -61,5 +56,5 @@ export const SettingsApplicationPreferences = () => {);}- return <Navigate to={getSettingsPath(SettingsPath.Accounts)} replace />;+ return <Navigate to={getSettingsPath(SettingsPath.AppPreferences)} replace />;};diff --git a/packages/twenty-front/src/pages/settings/accounts/SettingsApplicationPreferencesDetail.tsx b/packages/twenty-front/src/pages/settings/accounts/SettingsApplicationPreferencesDetail.tsxindex 433a1b6000d..a7c1d0a0950 100644--- a/packages/twenty-front/src/pages/settings/accounts/SettingsApplicationPreferencesDetail.tsx+++ b/packages/twenty-front/src/pages/settings/accounts/SettingsApplicationPreferencesDetail.tsx@@ -142,7 +142,7 @@ export const SettingsApplicationPreferencesDetail = ({},{children: t`Apps preferences`,- href: getSettingsPath(SettingsPath.Accounts),+ href: getSettingsPath(SettingsPath.AppPreferences),},{ children: appName },]}@@ -171,7 +171,7 @@ export const SettingsApplicationPreferencesDetail = ({onConfigure={() =>navigate(getSettingsPath(- SettingsPath.ApplicationPreferences,+ SettingsPath.AppPreferencesApp,{ applicationId: application.id },undefined,configurationTabId,diff --git a/packages/twenty-front/src/pages/settings/accounts/SettingsBuiltInAccountApp.tsx b/packages/twenty-front/src/pages/settings/accounts/SettingsBuiltInAccountApp.tsxindex e6ac583e5b0..57ba158633e 100644--- a/packages/twenty-front/src/pages/settings/accounts/SettingsBuiltInAccountApp.tsx+++ b/packages/twenty-front/src/pages/settings/accounts/SettingsBuiltInAccountApp.tsx@@ -19,7 +19,6 @@ import { SettingsPageLayout } from '@/settings/components/layout/SettingsPageLayimport { SettingsTabBar } from '@/settings/components/layout/SettingsTabBar';import { useSettingsActiveTabId } from '@/settings/components/layout/useSettingsActiveTabId';import { Select } from '@/ui/input/components/Select';-import { useIsFeatureEnabled } from '@/workspace/hooks/useIsFeatureEnabled';import { useLingui } from '@lingui/react/macro';import { useState } from 'react';import { Navigate, useParams } from 'react-router-dom';@@ -27,14 +26,12 @@ import { SettingsPath } from 'twenty-shared/types';import { getSettingsPath, isDefined } from 'twenty-shared/utils';import { Section } from 'twenty-ui/components/layout';import { IconCalendarEvent, IconMail, IconSettings } from 'twenty-ui/icon';-import { FeatureFlagKey } from '~/generated-metadata/graphql';export const SettingsBuiltInAccountApp = () => {const { t } = useLingui();- const isAppPreferencesEnabled = useIsFeatureEnabled(- FeatureFlagKey.IS_APP_PREFERENCES_ENABLED,- );- const { builtInAccountAppId } = useParams<{ builtInAccountAppId: string }>();+ const { applicationId: builtInAccountAppId } = useParams<{+ applicationId: string;+ }>();const { enabledBuiltInAccountApps } = useEnabledBuiltInAccountApps();const app = enabledBuiltInAccountApps.find((enabledApp) => enabledApp.id === builtInAccountAppId,@@ -80,8 +77,10 @@ export const SettingsBuiltInAccountApp = () => {tabs.map((tab) => tab.id),);- if (!isAppPreferencesEnabled || !isDefined(app)) {- return <Navigate to={getSettingsPath(SettingsPath.Accounts)} replace />;+ if (!isDefined(app)) {+ return (+ <Navigate to={getSettingsPath(SettingsPath.AppPreferences)} replace />+ );}const appName = t(app.name);@@ -189,7 +188,7 @@ export const SettingsBuiltInAccountApp = () => {},{children: t`Apps preferences`,- href: getSettingsPath(SettingsPath.Accounts),+ href: getSettingsPath(SettingsPath.AppPreferences),},{ children: appName },]}diff --git a/packages/twenty-front/src/pages/settings/accounts/SettingsNewAccount.tsx b/packages/twenty-front/src/pages/settings/accounts/SettingsNewAccount.tsxindex 30bbedff859..168507f8751 100644--- a/packages/twenty-front/src/pages/settings/accounts/SettingsNewAccount.tsx+++ b/packages/twenty-front/src/pages/settings/accounts/SettingsNewAccount.tsx@@ -1,4 +1,5 @@import { SettingsNewAccountSection } from '@/settings/accounts/components/SettingsNewAccountSection';+import { useAccountsSettingsBreadcrumbLink } from '@/settings/app-preferences/hooks/useAccountsSettingsBreadcrumbLink';import { SettingsPageContainer } from '@/settings/components/SettingsPageContainer';import { SettingsPageLayout } from '@/settings/components/layout/SettingsPageLayout';import { t } from '@lingui/core/macro';@@ -6,6 +7,8 @@ import { SettingsPath } from 'twenty-shared/types';import { getSettingsPath } from 'twenty-shared/utils';export const SettingsNewAccount = () => {+ const accountsBreadcrumbLink = useAccountsSettingsBreadcrumbLink(t`Accounts`);+return (<SettingsPageLayouttitle={t`New Account`}@@ -14,10 +17,7 @@ export const SettingsNewAccount = () => {children: t`User`,href: getSettingsPath(SettingsPath.ProfilePage),},- {- children: t`Accounts`,- href: getSettingsPath(SettingsPath.Accounts),- },+ accountsBreadcrumbLink,{ children: t`New` },]}>diff --git a/packages/twenty-front/src/pages/settings/accounts/__stories__/SettingsAccountDetail.stories.tsx b/packages/twenty-front/src/pages/settings/accounts/__stories__/SettingsAccountDetail.stories.tsxindex b1c243591ea..8217f6bb8b9 100644--- a/packages/twenty-front/src/pages/settings/accounts/__stories__/SettingsAccountDetail.stories.tsx+++ b/packages/twenty-front/src/pages/settings/accounts/__stories__/SettingsAccountDetail.stories.tsx@@ -20,9 +20,9 @@ const meta: Meta<PageDecoratorArgs> = {component: SettingsAccountDetail,decorators: [PageDecorator],args: {- routePath: '/settings/accounts/detail/:connectedAccountId',+ routePath: '/settings/app-preferences/accounts/:connectedAccountId',routeParams: { ':connectedAccountId': GOOGLE_ACCOUNT_ID },- additionalRoutes: ['/settings/accounts'],+ additionalRoutes: ['/settings/app-preferences'],},beforeEach: seedAccountGroupsStory,parameters: {@@ -71,12 +71,12 @@ export const TitleStaysWhileLoading: Story = {);expect(canvas.queryByText('[email protected]')).not.toBeInTheDocument();expect(- canvas.queryByText('Navigated to /settings/accounts'),+ canvas.queryByText('Navigated to /settings/app-preferences'),).not.toBeInTheDocument();},};-export const AccountWithoutSettingsGoesBackToAccounts: Story = {+export const AccountWithoutSettingsGoesBackToAppPreferences: Story = {args: {routeParams: { ':connectedAccountId': FATHOM_ONLY_ACCOUNT_ID },},@@ -84,9 +84,13 @@ export const AccountWithoutSettingsGoesBackToAccounts: Story = {const canvas = within(canvasElement);expect(- await canvas.findByText('Navigated to /settings/accounts', undefined, {- timeout: 3000,- }),+ await canvas.findByText(+ 'Navigated to /settings/app-preferences',+ undefined,+ {+ timeout: 3000,+ },+ ),).toBeVisible();},};diff --git a/packages/twenty-front/src/pages/settings/accounts/__stories__/SettingsAccounts.stories.tsx b/packages/twenty-front/src/pages/settings/accounts/__stories__/SettingsAccounts.stories.tsxindex 4a451435d8b..5a8199eb29f 100644--- a/packages/twenty-front/src/pages/settings/accounts/__stories__/SettingsAccounts.stories.tsx+++ b/packages/twenty-front/src/pages/settings/accounts/__stories__/SettingsAccounts.stories.tsx@@ -112,7 +112,9 @@ const openRowMenu = async ({const accountGroupsStory: Story = {args: {- additionalRoutes: ['/settings/accounts/detail/:connectedAccountId'],+ additionalRoutes: [+ '/settings/app-preferences/accounts/:connectedAccountId',+ ],},beforeEach: seedAccountGroupsStory,parameters: {@@ -184,7 +186,7 @@ export const AccountsGroupedByEmail: Story = {).not.toBeInTheDocument();expect(canvas.getByRole('link', { name: '[email protected]' })).toHaveAttribute('href',- `/settings/accounts/detail/${GOOGLE_ACCOUNT_ID}`,+ `/settings/app-preferences/accounts/${GOOGLE_ACCOUNT_ID}`,);expect(canvas.queryByText('[email protected]')).not.toBeInTheDocument();@@ -327,7 +329,7 @@ export const AppPreferencesListEnabledApps: Story = {...accountsTabStory,args: {...accountsTabStory.args,- additionalRoutes: ['/settings/accounts/apps/outlook'],+ additionalRoutes: ['/settings/app-preferences/outlook'],},play: async ({ canvasElement }) => {const canvas = within(canvasElement);@@ -344,7 +346,7 @@ export const AppPreferencesListEnabledApps: Story = {await userEvent.click(canvas.getByRole('link', { name: /Outlook/ }));expect(- await canvas.findByText('Navigated to /settings/accounts/apps/outlook'),+ await canvas.findByText('Navigated to /settings/app-preferences/outlook'),).toBeVisible();},};@@ -363,7 +365,7 @@ export const RowOpensAccountPage: Story = {expect(await canvas.findByText(- 'Navigated to /settings/accounts/detail/:connectedAccountId',+ 'Navigated to /settings/app-preferences/accounts/:connectedAccountId',),).toBeVisible();},@@ -516,7 +518,10 @@ export const AccountsTabMenuOpensAccountSettingsWithoutReconnect: Story = {expect(await body.findByRole('menuitem', { name: 'Account settings' }),- ).toHaveAttribute('href', `/settings/accounts/detail/${GOOGLE_ACCOUNT_ID}`);+ ).toHaveAttribute(+ 'href',+ `/settings/app-preferences/accounts/${GOOGLE_ACCOUNT_ID}`,+ );expect(body.queryByRole('menuitem', { name: 'Reconnect' }),).not.toBeInTheDocument();@@ -597,7 +602,7 @@ export const AppsFlagOnlyBrokenAccounts: Story = {export const AppPreferencesListInstalledApps: Story = {...accountGroupsStory,args: {- additionalRoutes: ['/settings/accounts/applications/:applicationId'],+ additionalRoutes: ['/settings/app-preferences/:applicationId'],},beforeEach: seedApplicationPreferencesStory,parameters: {@@ -612,7 +617,7 @@ export const AppPreferencesListInstalledApps: Story = {expect(fathomName.closest('a')).toHaveAttribute('href',- `/settings/accounts/applications/${FATHOM_APPLICATION_ID}`,+ `/settings/app-preferences/${FATHOM_APPLICATION_ID}`,);expect(canvas.getByText('Granola')).toBeVisible();expect(canvas.getByText('Linear')).toBeVisible();@@ -649,7 +654,7 @@ export const AppPreferencesListInstalledApps: Story = {expect(await canvas.findByText(- 'Navigated to /settings/accounts/applications/:applicationId',+ 'Navigated to /settings/app-preferences/:applicationId',),).toBeVisible();expect(findApplicationsGatedQuery).not.toHaveBeenCalled();diff --git a/packages/twenty-front/src/pages/settings/accounts/__stories__/SettingsAccountsCalendars.stories.tsx b/packages/twenty-front/src/pages/settings/accounts/__stories__/SettingsAccountsCalendars.stories.tsxindex 3aa2c445ca0..fd63ea41666 100644--- a/packages/twenty-front/src/pages/settings/accounts/__stories__/SettingsAccountsCalendars.stories.tsx+++ b/packages/twenty-front/src/pages/settings/accounts/__stories__/SettingsAccountsCalendars.stories.tsx@@ -1,8 +1,6 @@import { type Meta, type StoryObj } from '@storybook/react-vite';import { HttpResponse, graphql } from 'msw';-import { expect, within } from 'storybook/test';import { SettingsAccountsCalendars } from '~/pages/settings/accounts/SettingsAccountsCalendars';-import { seedAccountGroupsStory } from '~/pages/settings/accounts/__stories__/mockedAccountGroups';import {PageDecorator,@@ -109,19 +107,3 @@ export const TwoConnectedAccounts: Story = {},},};--export const RedirectsToAppPreferencesWhenFlagIsOn: Story = {- args: {- additionalRoutes: ['/settings/accounts'],- },- beforeEach: seedAccountGroupsStory,- play: async ({ canvasElement }) => {- const canvas = within(canvasElement);-- expect(- await canvas.findByText('Navigated to /settings/accounts', undefined, {- timeout: 3000,- }),- ).toBeVisible();- },-};diff --git a/packages/twenty-front/src/pages/settings/accounts/__stories__/SettingsAccountsConfiguration.stories.tsx b/packages/twenty-front/src/pages/settings/accounts/__stories__/SettingsAccountsConfiguration.stories.tsxindex 356f7cbb1b6..0ed8a586679 100644--- a/packages/twenty-front/src/pages/settings/accounts/__stories__/SettingsAccountsConfiguration.stories.tsx+++ b/packages/twenty-front/src/pages/settings/accounts/__stories__/SettingsAccountsConfiguration.stories.tsx@@ -19,9 +19,10 @@ const meta: Meta<PageDecoratorArgs> = {component: SettingsAccountsConfiguration,decorators: [PageDecorator],args: {- routePath: '/settings/accounts/configuration/:connectedAccountId',+ routePath:+ '/settings/app-preferences/accounts/:connectedAccountId/configuration',routeParams: { ':connectedAccountId': GOOGLE_ACCOUNT_ID },- additionalRoutes: ['/settings/accounts/apps/google'],+ additionalRoutes: ['/settings/app-preferences/google'],},beforeEach: seedAccountGroupsStory,parameters: {@@ -60,7 +61,7 @@ export const FinishedSetupOpensTheAppPage: Story = {);expect(- await canvas.findByText('Navigated to /settings/accounts/apps/google'),+ await canvas.findByText('Navigated to /settings/app-preferences/google'),).toBeVisible();},};diff --git a/packages/twenty-front/src/pages/settings/accounts/__stories__/SettingsAccountsEmails.stories.tsx b/packages/twenty-front/src/pages/settings/accounts/__stories__/SettingsAccountsEmails.stories.tsxindex b9c7a9ec8bc..291382cdd19 100644--- a/packages/twenty-front/src/pages/settings/accounts/__stories__/SettingsAccountsEmails.stories.tsx+++ b/packages/twenty-front/src/pages/settings/accounts/__stories__/SettingsAccountsEmails.stories.tsx@@ -1,6 +1,5 @@import { type Meta, type StoryObj } from '@storybook/react-vite';import { HttpResponse, graphql } from 'msw';-import { expect, within } from 'storybook/test';import {PageDecorator,@@ -9,7 +8,6 @@ import {import { graphqlMocks } from '~/testing/graphqlMocks';import { SettingsAccountsEmails } from '~/pages/settings/accounts/SettingsAccountsEmails';-import { seedAccountGroupsStory } from '~/pages/settings/accounts/__stories__/mockedAccountGroups';const meta: Meta<PageDecoratorArgs> = {title: 'Pages/Settings/Accounts/SettingsAccountsEmails',@@ -114,19 +112,3 @@ export const TwoConnectedAccounts: Story = {},},};--export const RedirectsToAppPreferencesWhenFlagIsOn: Story = {- args: {- additionalRoutes: ['/settings/accounts'],- },- beforeEach: seedAccountGroupsStory,- play: async ({ canvasElement }) => {- const canvas = within(canvasElement);-- expect(- await canvas.findByText('Navigated to /settings/accounts', undefined, {- timeout: 3000,- }),- ).toBeVisible();- },-};diff --git a/packages/twenty-front/src/pages/settings/accounts/__stories__/SettingsApplicationPreferences.stories.tsx b/packages/twenty-front/src/pages/settings/accounts/__stories__/SettingsApplicationPreferences.stories.tsxindex cea0bb3d69b..284a1f3a276 100644--- a/packages/twenty-front/src/pages/settings/accounts/__stories__/SettingsApplicationPreferences.stories.tsx+++ b/packages/twenty-front/src/pages/settings/accounts/__stories__/SettingsApplicationPreferences.stories.tsx@@ -6,10 +6,8 @@ import {type PageDecoratorArgs,} from '~/testing/decorators/PageDecorator';-import { currentWorkspaceState } from '@/auth/states/currentWorkspaceState';import { ErrorMessageEffect } from '@/error-handler/components/ErrorMessageEffect';import { useLocation } from 'react-router-dom';-import { jotaiStore } from '@/ui/utilities/state/jotai/jotaiStore';import { isDefined } from 'twenty-shared/utils';import { Toaster } from 'twenty-ui/components/feedback';import { SettingsApplicationPreferences } from '~/pages/settings/accounts/SettingsApplicationPreferences';@@ -33,9 +31,9 @@ const meta: Meta<PageDecoratorArgs> = {component: SettingsApplicationPreferences,decorators: [PageDecorator],args: {- routePath: '/settings/accounts/applications/:applicationId',+ routePath: '/settings/app-preferences/:applicationId',routeParams: { ':applicationId': FATHOM_APPLICATION_ID },- additionalRoutes: ['/settings/accounts'],+ additionalRoutes: ['/settings/app-preferences'],},beforeEach: seedApplicationPreferencesStory,parameters: {@@ -397,7 +395,7 @@ export const FailedOAuthReturnShowsItsMessage: Story = {},};-export const UnknownAppGoesBackToAccounts: Story = {+export const UnknownAppGoesBackToAppPreferences: Story = {args: {routeParams: { ':applicationId': '20202020-1a2b-4c3d-8e4f-000000000099' },},@@ -405,9 +403,13 @@ export const UnknownAppGoesBackToAccounts: Story = {const canvas = within(canvasElement);expect(- await canvas.findByText('Navigated to /settings/accounts', undefined, {- timeout: 3000,- }),+ await canvas.findByText(+ 'Navigated to /settings/app-preferences',+ undefined,+ {+ timeout: 3000,+ },+ ),).toBeVisible();},};@@ -442,27 +444,3 @@ export const LoadErrorOffersRetryInsteadOfGoingBack: Story = {expect(canvas.queryByText(/Navigated to/)).not.toBeInTheDocument();},};--export const FlagOffGoesBackToAccounts: Story = {- beforeEach: async () => {- await seedApplicationPreferencesStory();-- const currentWorkspace = jotaiStore.get(currentWorkspaceState.atom);-- if (isDefined(currentWorkspace)) {- jotaiStore.set(currentWorkspaceState.atom, {- ...currentWorkspace,- featureFlags: [],- });- }- },- play: async ({ canvasElement }) => {- const canvas = within(canvasElement);-- expect(- await canvas.findByText('Navigated to /settings/accounts', undefined, {- timeout: 3000,- }),- ).toBeVisible();- },-};diff --git a/packages/twenty-front/src/pages/settings/accounts/__stories__/SettingsApplicationPreferencesConnections.stories.tsx b/packages/twenty-front/src/pages/settings/accounts/__stories__/SettingsApplicationPreferencesConnections.stories.tsxindex d4cc132308f..b62ecdeb6f5 100644--- a/packages/twenty-front/src/pages/settings/accounts/__stories__/SettingsApplicationPreferencesConnections.stories.tsx+++ b/packages/twenty-front/src/pages/settings/accounts/__stories__/SettingsApplicationPreferencesConnections.stories.tsx@@ -32,9 +32,9 @@ const meta: Meta<PageDecoratorArgs> = {component: SettingsApplicationPreferences,decorators: [PageDecorator],args: {- routePath: '/settings/accounts/applications/:applicationId',+ routePath: '/settings/app-preferences/:applicationId',routeParams: { ':applicationId': LINEAR_APPLICATION_ID },- additionalRoutes: ['/settings/accounts'],+ additionalRoutes: ['/settings/app-preferences'],},beforeEach: seedApplicationPreferencesStory,parameters: {diff --git a/packages/twenty-front/src/pages/settings/accounts/__stories__/SettingsBuiltInAccountApp.stories.tsx b/packages/twenty-front/src/pages/settings/accounts/__stories__/SettingsBuiltInAccountApp.stories.tsxindex 90c35c413df..838ee68a29f 100644--- a/packages/twenty-front/src/pages/settings/accounts/__stories__/SettingsBuiltInAccountApp.stories.tsx+++ b/packages/twenty-front/src/pages/settings/accounts/__stories__/SettingsBuiltInAccountApp.stories.tsx@@ -32,9 +32,9 @@ const meta: Meta<PageDecoratorArgs> = {component: SettingsBuiltInAccountApp,decorators: [PageDecorator],args: {- routePath: '/settings/accounts/apps/:builtInAccountAppId',- routeParams: { ':builtInAccountAppId': 'google' },- additionalRoutes: ['/settings/accounts'],+ routePath: '/settings/app-preferences/:applicationId',+ routeParams: { ':applicationId': 'google' },+ additionalRoutes: ['/settings/app-preferences'],},beforeEach: seedAccountGroupsStory,parameters: {@@ -146,7 +146,7 @@ export const GoogleCalendarTabShowsCalendarSettings: Story = {export const OutlookHasEmailsAndCalendarTabs: Story = {args: {- routeParams: { ':builtInAccountAppId': 'outlook' },+ routeParams: { ':applicationId': 'outlook' },},play: async ({ canvasElement }) => {const canvas = within(canvasElement);@@ -172,7 +172,7 @@ export const OutlookHasEmailsAndCalendarTabs: Story = {export const OutlookWithoutCalendarServiceHasNoCalendarTab: Story = {args: {- routeParams: { ':builtInAccountAppId': 'outlook' },+ routeParams: { ':applicationId': 'outlook' },},parameters: {msw: {@@ -203,7 +203,7 @@ export const OutlookWithoutCalendarServiceHasNoCalendarTab: Story = {export const CalendarPendingSetupHidesCalendarTab: Story = {args: {- routeParams: { ':builtInAccountAppId': 'outlook' },+ routeParams: { ':applicationId': 'outlook' },},parameters: {msw: {@@ -234,24 +234,28 @@ export const CalendarPendingSetupHidesCalendarTab: Story = {},};-export const DisabledAppGoesBackToAccounts: Story = {+export const DisabledAppGoesBackToAppPreferences: Story = {args: {- routeParams: { ':builtInAccountAppId': 'imap' },+ routeParams: { ':applicationId': 'imap' },},play: async ({ canvasElement }) => {const canvas = within(canvasElement);expect(- await canvas.findByText('Navigated to /settings/accounts', undefined, {- timeout: 3000,- }),+ await canvas.findByText(+ 'Navigated to /settings/app-preferences',+ undefined,+ {+ timeout: 3000,+ },+ ),).toBeVisible();},};export const OutlookWithoutAccountOffersOutlookOnly: Story = {args: {- routeParams: { ':builtInAccountAppId': 'outlook' },+ routeParams: { ':applicationId': 'outlook' },},parameters: {msw: {@@ -352,7 +356,7 @@ export const ReconnectReturnsToTheAppPage: Story = {);expect(redirectUrl.searchParams.get('redirectLocation')).toBe(- '/settings/accounts/apps/google#general',+ '/settings/app-preferences/google#general',);},};diff --git a/packages/twenty-front/src/pages/settings/accounts/__stories__/mockedLinearApplicationPreferences.ts b/packages/twenty-front/src/pages/settings/accounts/__stories__/mockedLinearApplicationPreferences.tsindex 2f5de8d0536..c62286cbcf0 100644--- a/packages/twenty-front/src/pages/settings/accounts/__stories__/mockedLinearApplicationPreferences.ts+++ b/packages/twenty-front/src/pages/settings/accounts/__stories__/mockedLinearApplicationPreferences.ts@@ -10,7 +10,7 @@ import {} from '~/pages/settings/accounts/__stories__/mockedAccountGroups';export const LINEAR_APPLICATION_ID = '20202020-1a2b-4c3d-8e4f-000000000024';-export const LINEAR_GENERAL_TAB_REDIRECT_LOCATION = `/settings/accounts/applications/${LINEAR_APPLICATION_ID}#general`;+export const LINEAR_GENERAL_TAB_REDIRECT_LOCATION = `/settings/app-preferences/${LINEAR_APPLICATION_ID}#general`;const LINEAR_CONNECTION_PROVIDER_ID = '20202020-1a2b-4c3d-8e4f-000000000071';export const LINEAR_RECONNECT_NEEDED_ACCOUNT_ID ='20202020-1a2b-4c3d-8e4f-000000000081';diff --git a/packages/twenty-front/src/utils/__tests__/title-utils.test.ts b/packages/twenty-front/src/utils/__tests__/title-utils.test.tsindex 2874e981336..ff7d2f798fa 100644--- a/packages/twenty-front/src/utils/__tests__/title-utils.test.ts+++ b/packages/twenty-front/src/utils/__tests__/title-utils.test.ts@@ -43,6 +43,12 @@ describe('title-utils', () => {expect(getPageTitleFromPath('/settings/accounts/emails/:accountUuid')).toBe('Account - Settings',);+ expect(getPageTitleFromPath('/settings/app-preferences')).toBe(+ 'Apps preferences - Settings',+ );+ expect(getPageTitleFromPath('/settings/app-preferences/google')).toBe(+ 'Apps preferences - Settings',+ );expect(getPageTitleFromPath('/settings/billing/plans')).toBe('Billing - Settings',);diff --git a/packages/twenty-front/src/utils/title-utils.ts b/packages/twenty-front/src/utils/title-utils.tsindex 1d6310123fc..c3aa196dbed 100644--- a/packages/twenty-front/src/utils/title-utils.ts+++ b/packages/twenty-front/src/utils/title-utils.ts@@ -3,6 +3,7 @@ import { AppBasePath, AppPath, SettingsPath } from 'twenty-shared/types';enum SettingsPathPrefixes {Accounts = `${AppBasePath.Settings}/${SettingsPath.Accounts}`,+ AppPreferences = `${AppBasePath.Settings}/${SettingsPath.AppPreferences}`,Billing = `${AppBasePath.Settings}/${SettingsPath.Billing}`,Experience = `${AppBasePath.Settings}/${SettingsPath.Experience}`,Profile = `${AppBasePath.Settings}/${SettingsPath.ProfilePage}`,@@ -41,6 +42,8 @@ export const getPageTitleFromPath = (pathname: string): string => {return t`Experience - Settings`;case SettingsPathPrefixes.Accounts:return t`Account - Settings`;+ case SettingsPathPrefixes.AppPreferences:+ return t`Apps preferences - Settings`;case SettingsPathPrefixes.Billing:return t`Billing - Settings`;case SettingsPathPrefixes.Profile:diff --git a/packages/twenty-shared/src/types/SettingsPath.ts b/packages/twenty-shared/src/types/SettingsPath.tsindex 38c4bc4b7bd..3a5c9f95f19 100644--- a/packages/twenty-shared/src/types/SettingsPath.ts+++ b/packages/twenty-shared/src/types/SettingsPath.ts@@ -4,7 +4,7 @@ export enum SettingsPath {Experience = 'experience',Accounts = 'accounts',AccountDetail = 'accounts/detail/:connectedAccountId',- BuiltInAccountApp = 'accounts/apps/:builtInAccountAppId',+ BuiltInAccountApp = 'accounts/apps/:applicationId',ApplicationPreferences = 'accounts/applications/:applicationId',NewAccount = 'accounts/new',AccountsConfiguration = 'accounts/configuration/:connectedAccountId',@@ -12,6 +12,13 @@ export enum SettingsPath {AccountsEmails = 'accounts/emails',NewImapSmtpCaldavConnection = 'accounts/new-imap-smtp-caldav-connection',EditImapSmtpCaldavConnection = 'accounts/edit-imap-smtp-caldav-connection/:connectedAccountId',+ AppPreferences = 'app-preferences',+ AppPreferencesApp = 'app-preferences/:applicationId',+ AppPreferencesAccountDetail = 'app-preferences/accounts/:connectedAccountId',+ AppPreferencesNewAccount = 'app-preferences/accounts/new',+ AppPreferencesAccountConfiguration = 'app-preferences/accounts/:connectedAccountId/configuration',+ AppPreferencesNewImapSmtpCaldavConnection = 'app-preferences/accounts/new-imap-smtp-caldav-connection',+ AppPreferencesEditImapSmtpCaldavConnection = 'app-preferences/accounts/:connectedAccountId/edit-imap-smtp-caldav-connection',Billing = 'billing',BillingPlans = 'billing/plans',Usage = 'billing/usage',