The open alternative to Salesforce, designed for AI.
TypeScript crmcrm-systemcustomergood-first-issuegraphqlhacktoberfestjavascriptmarketingmonoreponestjsopen-sourcepostgresqlreactreactjssalestypescriptweb
fix force redirect with Navigate (#27130)
Bulat08a44ff8470d
diff --git a/packages/twenty-front/src/modules/app/hooks/__tests__/usePageChangeEffectNavigateLocation.test.ts b/packages/twenty-front/src/modules/app/hooks/__tests__/usePageChangeEffectNavigateLocation.test.tsindex df52df80b70..4c930cd1908 100644--- a/packages/twenty-front/src/modules/app/hooks/__tests__/usePageChangeEffectNavigateLocation.test.ts+++ b/packages/twenty-front/src/modules/app/hooks/__tests__/usePageChangeEffectNavigateLocation.test.ts@@ -276,6 +276,15 @@ const testCases: {{ loc: AppPath.TasksPage, isLogged: true, isWorkspaceSuspended: false, onboardingStatus: OnboardingStatus.INVITE_TEAM, res: AppPath.InviteTeam },{ loc: AppPath.TasksPage, isLogged: true, isWorkspaceSuspended: false, onboardingStatus: OnboardingStatus.BOOK_CALL, res: AppPath.BookCall },{ loc: AppPath.TasksPage, isLogged: true, isWorkspaceSuspended: false, onboardingStatus: OnboardingStatus.COMPLETED, res: undefined },+ { loc: AppPath.Dpa, isLogged: true, isWorkspaceSuspended: false, onboardingStatus: OnboardingStatus.PLAN_REQUIRED, res: AppPath.PlanRequired },+ { loc: AppPath.Dpa, isLogged: true, isWorkspaceSuspended: true, onboardingStatus: OnboardingStatus.COMPLETED, res: getSettingsPath(SettingsPath.Billing) },+ { loc: AppPath.Dpa, isLogged: false, isWorkspaceSuspended: false, onboardingStatus: undefined, res: AppPath.SignInUp },+ { loc: AppPath.Dpa, isLogged: true, isWorkspaceSuspended: false, onboardingStatus: OnboardingStatus.WORKSPACE_ACTIVATION, res: AppPath.WorkspaceActivation },+ { loc: AppPath.Dpa, isLogged: true, isWorkspaceSuspended: false, onboardingStatus: OnboardingStatus.PROFILE_CREATION, res: AppPath.CreateProfile },+ { loc: AppPath.Dpa, isLogged: true, isWorkspaceSuspended: false, onboardingStatus: OnboardingStatus.SYNC_EMAIL, res: AppPath.SyncEmails },+ { loc: AppPath.Dpa, isLogged: true, isWorkspaceSuspended: false, onboardingStatus: OnboardingStatus.INVITE_TEAM, res: AppPath.InviteTeam },+ { loc: AppPath.Dpa, isLogged: true, isWorkspaceSuspended: false, onboardingStatus: OnboardingStatus.BOOK_CALL, res: AppPath.BookCall },+ { loc: AppPath.Dpa, isLogged: true, isWorkspaceSuspended: false, onboardingStatus: OnboardingStatus.COMPLETED, res: getSettingsPath(SettingsPath.LegalDpa) },{ loc: AppPath.AiChat, isLogged: true, isWorkspaceSuspended: false, onboardingStatus: OnboardingStatus.PLAN_REQUIRED, res: AppPath.PlanRequired },{ loc: AppPath.AiChat, isLogged: true, isWorkspaceSuspended: true, onboardingStatus: OnboardingStatus.COMPLETED, res: getSettingsPath(SettingsPath.Billing) },diff --git a/packages/twenty-front/src/modules/app/hooks/usePageChangeEffectNavigateLocation.ts b/packages/twenty-front/src/modules/app/hooks/usePageChangeEffectNavigateLocation.tsindex 3fcc20c4107..25c37d0af55 100644--- a/packages/twenty-front/src/modules/app/hooks/usePageChangeEffectNavigateLocation.ts+++ b/packages/twenty-front/src/modules/app/hooks/usePageChangeEffectNavigateLocation.ts@@ -196,6 +196,10 @@ export const usePageChangeEffectNavigateLocation = () => {return resolvedReturnToPath ?? defaultHomePagePath;}+ if (isMatchingLocation(location, AppPath.Dpa)) {+ return getSettingsPath(SettingsPath.LegalDpa);+ }+if (isMinimalMetadataReady &&isMatchingLocation(location, AppPath.RecordIndexPage) &&diff --git a/packages/twenty-front/src/modules/app/routing/utils/createWorkspaceRouteObjects.tsx b/packages/twenty-front/src/modules/app/routing/utils/createWorkspaceRouteObjects.tsxindex c3b2d2b19ba..41cdb8859e0 100644--- a/packages/twenty-front/src/modules/app/routing/utils/createWorkspaceRouteObjects.tsx+++ b/packages/twenty-front/src/modules/app/routing/utils/createWorkspaceRouteObjects.tsx@@ -1,7 +1,5 @@import { lazy } from 'react';-import { Navigate } from 'react-router-dom';-import { AppPath, SettingsPath } from 'twenty-shared/types';-import { getSettingsPath } from 'twenty-shared/utils';+import { AppPath } from 'twenty-shared/types';import { LazyRoute } from '@/app/components/LazyRoute';import {@@ -178,7 +176,7 @@ export const createWorkspaceRouteObjects = ({},{path: AppPath.Dpa,- element: <Navigate to={getSettingsPath(SettingsPath.LegalDpa)} replace />,+ element: null,},{path: AppPath.NotFoundWildcard,diff --git a/packages/twenty-front/src/testing/constants/UntestedAppPaths.ts b/packages/twenty-front/src/testing/constants/UntestedAppPaths.tsindex 22422b62dcd..e9392c4f9b1 100644--- a/packages/twenty-front/src/testing/constants/UntestedAppPaths.ts+++ b/packages/twenty-front/src/testing/constants/UntestedAppPaths.ts@@ -1,9 +1,3 @@import { AppPath } from 'twenty-shared/types';-export const UNTESTED_APP_PATHS = [- AppPath.Settings,- AppPath.Developers,- // Public, unauthenticated redirect route handled in useCreateWorkspaceAppRouter- // — not part of the onboarding/auth page-change navigation matrix.- AppPath.Dpa,-];+export const UNTESTED_APP_PATHS = [AppPath.Settings, AppPath.Developers];