The open alternative to Salesforce, designed for AI.
TypeScript crmcrm-systemcustomergood-first-issuegraphqlhacktoberfestjavascriptmarketingmonoreponestjsopen-sourcepostgresqlreactreactjssalestypescriptweb
fix(front): defer default home redirect when object metadata is not loaded (#20330)
Charles Bochet9ac503e3afb3
diff --git a/packages/twenty-front/src/modules/navigation/hooks/__tests__/useDefaultHomePagePath.test.ts b/packages/twenty-front/src/modules/navigation/hooks/__tests__/useDefaultHomePagePath.test.tsindex 0a41f9d3cb4..83e9b4c7e58 100644--- a/packages/twenty-front/src/modules/navigation/hooks/__tests__/useDefaultHomePagePath.test.ts+++ b/packages/twenty-front/src/modules/navigation/hooks/__tests__/useDefaultHomePagePath.test.ts@@ -1,5 +1,6 @@import { currentUserState } from '@/auth/states/currentUserState';import { currentUserWorkspaceState } from '@/auth/states/currentUserWorkspaceState';+import { metadataStoreState } from '@/metadata-store/states/metadataStoreState';import { useDefaultHomePagePath } from '@/navigation/hooks/useDefaultHomePagePath';import { AggregateOperations } from '@/object-record/record-table/constants/AggregateOperations';import { useSetAtomState } from '@/ui/utilities/state/jotai/hooks/useSetAtomState';@@ -25,14 +26,24 @@ const Wrapper = ({ children }: { children: ReactNode }) =>const renderHooks = ({withCurrentUser,withExistingView,+ withObjectMetadataLoaded = true,}: {withCurrentUser: boolean;withExistingView: boolean;+ withObjectMetadataLoaded?: boolean;}) => {- setTestObjectMetadataItemsInMetadataStore(- jotaiStore,- getTestEnrichedObjectMetadataItemsMock(),- );+ if (withObjectMetadataLoaded) {+ setTestObjectMetadataItemsInMetadataStore(+ jotaiStore,+ getTestEnrichedObjectMetadataItemsMock(),+ );+ } else {+ jotaiStore.set(metadataStoreState.atomFamily('objectMetadataItems'), {+ current: [],+ draft: [],+ status: 'empty',+ });+ }const { result } = renderHook(() => {@@ -129,4 +140,18 @@ describe('useDefaultHomePagePath', () => {);});});+ // Regression: during the post-login transition window object metadata may+ // not yet be loaded. We must not redirect the user to /settings/profile+ // (the genuine empty-fallback) until metadata has actually loaded.+ it('should defer to AppPath.Index when currentUser is defined but object metadata is not loaded yet', async () => {+ const { result } = renderHooks({+ withCurrentUser: true,+ withExistingView: false,+ withObjectMetadataLoaded: false,+ });++ await waitFor(() => {+ expect(result.current.defaultHomePagePath).toEqual(AppPath.Index);+ });+ });});diff --git a/packages/twenty-front/src/modules/navigation/hooks/useDefaultHomePagePath.ts b/packages/twenty-front/src/modules/navigation/hooks/useDefaultHomePagePath.tsindex 72802253f8e..516d226c875 100644--- a/packages/twenty-front/src/modules/navigation/hooks/useDefaultHomePagePath.ts+++ b/packages/twenty-front/src/modules/navigation/hooks/useDefaultHomePagePath.ts@@ -1,9 +1,11 @@import { currentUserState } from '@/auth/states/currentUserState';+import { metadataStoreState } from '@/metadata-store/states/metadataStoreState';import { lastVisitedObjectMetadataItemIdState } from '@/navigation/states/lastVisitedObjectMetadataItemIdState';import { type ObjectPathInfo } from '@/navigation/types/ObjectPathInfo';import { useFilteredObjectMetadataItems } from '@/object-metadata/hooks/useFilteredObjectMetadataItems';import { filterReadableActiveObjectMetadataItems } from '@/object-metadata/utils/filterReadableActiveObjectMetadataItems';import { useObjectPermissions } from '@/object-record/hooks/useObjectPermissions';+import { useAtomFamilyStateValue } from '@/ui/utilities/state/jotai/hooks/useAtomFamilyStateValue';import { useAtomStateValue } from '@/ui/utilities/state/jotai/hooks/useAtomStateValue';import { viewsSelector } from '@/views/states/selectors/viewsSelector';import isEmpty from 'lodash.isempty';@@ -16,6 +18,11 @@ export const useDefaultHomePagePath = () => {const store = useStore();const currentUser = useAtomStateValue(currentUserState);const { objectPermissionsByObjectMetadataId } = useObjectPermissions();+ const metadataStore = useAtomFamilyStateValue(+ metadataStoreState,+ 'objectMetadataItems',+ );+ const areObjectMetadataItemsLoaded = metadataStore.status === 'up-to-date';const { activeObjectMetadataItems } = useFilteredObjectMetadataItems();@@ -94,6 +101,15 @@ export const useDefaultHomePagePath = () => {}if (isEmpty(readableNonSystemObjectMetadataItems)) {+ // Object metadata may legitimately be empty for a user with no readable+ // objects, in which case /settings/profile is the intended fallback.+ // It can also be transiently empty during the post-login window before+ // workspace metadata has finished loading. Defer to AppPath.Index in+ // that case so the user isn't stranded on /settings/profile once+ // metadata becomes available.+ if (!areObjectMetadataItemsLoaded) {+ return AppPath.Index;+ }return getSettingsPath(SettingsPath.ProfilePage);}@@ -115,6 +131,7 @@ export const useDefaultHomePagePath = () => {currentUser,getDefaultObjectPathInfo,readableNonSystemObjectMetadataItems,+ areObjectMetadataItemsLoaded,]);return { defaultHomePagePath };