5509 remove flash on intermediate verify step when sign in with sso

packages/twenty-front/src/App.tsx

@@ -43,7 +43,6 @@ import { Invite } from '~/pages/auth/Invite';
 import { PasswordReset } from '~/pages/auth/PasswordReset';
 import { PaymentSuccess } from '~/pages/auth/PaymentSuccess';
 import { SignInUp } from '~/pages/auth/SignInUp';
-import { DefaultHomePage } from '~/pages/DefaultHomePage';
 import { ImpersonateEffect } from '~/pages/impersonate/ImpersonateEffect';
 import { NotFound } from '~/pages/not-found/NotFound';
 import { RecordIndexPage } from '~/pages/object-record/RecordIndexPage';
@@ -139,10 +138,7 @@ const createRouter = (isBillingEnabled?: boolean) =>
             path={AppPath.PlanRequiredSuccess}
             element={<PaymentSuccess />}
           />
-          <Route
-            path={indexAppPath.getIndexAppPath()}
-            element={<DefaultHomePage />}
-          />
+          <Route path={indexAppPath.getIndexAppPath()} element={<></>} />
           <Route path={AppPath.TasksPage} element={<Tasks />} />
           <Route path={AppPath.Impersonate} element={<ImpersonateEffect />} />
           <Route path={AppPath.RecordIndexPage} element={<RecordIndexPage />} />

packages/twenty-front/src/effect-components/PageChangeEffect.tsx

@@ -5,48 +5,41 @@ import { IconCheckbox } from 'twenty-ui';
 
 import { useOpenCreateActivityDrawer } from '@/activities/hooks/useOpenCreateActivityDrawer';
 import { useEventTracker } from '@/analytics/hooks/useEventTracker';
-import { useOnboardingStatus } from '@/auth/hooks/useOnboardingStatus';
-import { OnboardingStatus } from '@/auth/utils/getOnboardingStatus';
 import { useRequestFreshCaptchaToken } from '@/captcha/hooks/useRequestFreshCaptchaToken';
 import { isCaptchaScriptLoadedState } from '@/captcha/states/isCaptchaScriptLoadedState';
-import { isSignUpDisabledState } from '@/client-config/states/isSignUpDisabledState';
 import { useCommandMenu } from '@/command-menu/hooks/useCommandMenu';
 import { CommandType } from '@/command-menu/types/Command';
 import { TableHotkeyScope } from '@/object-record/record-table/types/TableHotkeyScope';
 import { AppBasePath } from '@/types/AppBasePath';
 import { AppPath } from '@/types/AppPath';
 import { PageHotkeyScope } from '@/types/PageHotkeyScope';
 import { SettingsPath } from '@/types/SettingsPath';
-import { useSnackBar } from '@/ui/feedback/snack-bar-manager/hooks/useSnackBar';
 import { useSetHotkeyScope } from '@/ui/utilities/hotkey/hooks/useSetHotkeyScope';
-import { useGetWorkspaceFromInviteHashLazyQuery } from '~/generated/graphql';
 import { useIsMatchingLocation } from '~/hooks/useIsMatchingLocation';
+import { usePageChangeEffectNavigateLocation } from '~/hooks/usePageChangeEffectNavigateLocation';
 import { isDefined } from '~/utils/isDefined';
 
 // TODO: break down into smaller functions and / or hooks
+//  - moved usePageChangeEffectNavigateLocation into dedicated hook
 export const PageChangeEffect = () => {
   const navigate = useNavigate();
   const isMatchingLocation = useIsMatchingLocation();
-  const { enqueueSnackBar } = useSnackBar();
 
   const [previousLocation, setPreviousLocation] = useState('');
 
-  const onboardingStatus = useOnboardingStatus();
-
   const setHotkeyScope = useSetHotkeyScope();
 
   const location = useLocation();
 
+  const pageChangeEffectNavigateLocation =
+    usePageChangeEffectNavigateLocation();
+
   const eventTracker = useEventTracker();
 
-  const [workspaceFromInviteHashQuery] =
-    useGetWorkspaceFromInviteHashLazyQuery();
   const { addToCommandMenu, setToInitialCommandMenu } = useCommandMenu();
 
   const openCreateActivity = useOpenCreateActivityDrawer();
 
-  const isSignUpDisabled = useRecoilValue(isSignUpDisabledState);
-
   useEffect(() => {
     if (!previousLocation || previousLocation !== location.pathname) {
       setPreviousLocation(location.pathname);
@@ -56,76 +49,10 @@ export const PageChangeEffect = () => {
   }, [location, previousLocation]);
 
   useEffect(() => {
-    const isMatchingOngoingUserCreationRoute =
-      isMatchingLocation(AppPath.SignInUp) ||
-      isMatchingLocation(AppPath.Invite) ||
-      isMatchingLocation(AppPath.Verify);
-
-    const isMatchingOnboardingRoute =
-      isMatchingOngoingUserCreationRoute ||
-      isMatchingLocation(AppPath.CreateWorkspace) ||
-      isMatchingLocation(AppPath.CreateProfile) ||
-      isMatchingLocation(AppPath.PlanRequired) ||
-      isMatchingLocation(AppPath.PlanRequiredSuccess);
-
-    if (
-      onboardingStatus === OnboardingStatus.OngoingUserCreation &&
-      !isMatchingOngoingUserCreationRoute &&
-      !isMatchingLocation(AppPath.ResetPassword)
-    ) {
-      navigate(AppPath.SignInUp);
-    } else if (
-      isDefined(onboardingStatus) &&
-      onboardingStatus === OnboardingStatus.Incomplete &&
-      !isMatchingLocation(AppPath.PlanRequired)
-    ) {
-      navigate(AppPath.PlanRequired);
-    } else if (
-      isDefined(onboardingStatus) &&
-      [OnboardingStatus.Unpaid, OnboardingStatus.Canceled].includes(
-        onboardingStatus,
-      ) &&
-      !(
-        isMatchingLocation(AppPath.SettingsCatchAll) ||
-        isMatchingLocation(AppPath.PlanRequired)
-      )
-    ) {
-      navigate(
-        `${AppPath.SettingsCatchAll.replace('/*', '')}/${SettingsPath.Billing}`,
-      );
-    } else if (
-      onboardingStatus === OnboardingStatus.OngoingWorkspaceActivation &&
-      !isMatchingLocation(AppPath.CreateWorkspace) &&
-      !isMatchingLocation(AppPath.PlanRequiredSuccess)
-    ) {
-      navigate(AppPath.CreateWorkspace);
-    } else if (
-      onboardingStatus === OnboardingStatus.OngoingProfileCreation &&
-      !isMatchingLocation(AppPath.CreateProfile)
-    ) {
-      navigate(AppPath.CreateProfile);
-    } else if (
-      onboardingStatus === OnboardingStatus.Completed &&
-      isMatchingOnboardingRoute &&
-      !isMatchingLocation(AppPath.Invite)
-    ) {
-      navigate(AppPath.Index);
-    } else if (
-      onboardingStatus === OnboardingStatus.CompletedWithoutSubscription &&
-      isMatchingOnboardingRoute &&
-      !isMatchingLocation(AppPath.PlanRequired)
-    ) {
-      navigate(AppPath.Index);
+    if (isDefined(pageChangeEffectNavigateLocation)) {
+      navigate(pageChangeEffectNavigateLocation);
     }
-  }, [
-    enqueueSnackBar,
-    isMatchingLocation,
-    isSignUpDisabled,
-    location.pathname,
-    navigate,
-    onboardingStatus,
-    workspaceFromInviteHashQuery,
-  ]);
+  }, [navigate, pageChangeEffectNavigateLocation]);
 
   useEffect(() => {
     switch (true) {

packages/twenty-front/src/hooks/__tests__/useDefaultHomePagePath.test.ts

@@ -0,0 +1,72 @@
+import { renderHook } from '@testing-library/react';
+import { RecoilRoot, useSetRecoilState } from 'recoil';
+
+import { currentUserState } from '@/auth/states/currentUserState';
+import { useObjectMetadataItem } from '@/object-metadata/hooks/useObjectMetadataItem';
+import { getObjectMetadataItemsMock } from '@/object-metadata/utils/getObjectMetadataItemsMock';
+import { usePrefetchedData } from '@/prefetch/hooks/usePrefetchedData';
+import { AppPath } from '@/types/AppPath';
+import { useDefaultHomePagePath } from '~/hooks/useDefaultHomePagePath';
+import { mockedUsersData } from '~/testing/mock-data/users';
+
+const objectMetadataItem = getObjectMetadataItemsMock()[0];
+jest.mock('@/object-metadata/hooks/useObjectMetadataItem');
+jest.mocked(useObjectMetadataItem).mockReturnValue({
+  objectMetadataItem,
+});
+
+jest.mock('@/prefetch/hooks/usePrefetchedData');
+const setupMockPrefetchedData = (viewId?: string) => {
+  jest.mocked(usePrefetchedData).mockReturnValue({
+    isDataPrefetched: true,
+    records: viewId
+      ? [
+          {
+            id: viewId,
+            __typename: 'object',
+            objectMetadataId: objectMetadataItem.id,
+          },
+        ]
+      : [],
+  });
+};
+
+const renderHooks = (withCurrentUser: boolean) => {
+  const { result } = renderHook(
+    () => {
+      const setCurrentUser = useSetRecoilState(currentUserState);
+      if (withCurrentUser) {
+        setCurrentUser(mockedUsersData[0]);
+      }
+      return useDefaultHomePagePath();
+    },
+    {
+      wrapper: RecoilRoot,
+    },
+  );
+  return { result };
+};
+describe('useDefaultHomePagePath', () => {
+  it('should return proper path when no currentUser', () => {
+    setupMockPrefetchedData();
+    const { result } = renderHooks(false);
+    expect(result.current.defaultHomePagePath).toEqual(AppPath.SignInUp);
+  });
+  it('should return proper path when no currentUser and existing view', () => {
+    setupMockPrefetchedData('viewId');
+    const { result } = renderHooks(false);
+    expect(result.current.defaultHomePagePath).toEqual(AppPath.SignInUp);
+  });
+  it('should return proper path when currentUser is defined', () => {
+    setupMockPrefetchedData();
+    const { result } = renderHooks(true);
+    expect(result.current.defaultHomePagePath).toEqual('/objects/companies');
+  });
+  it('should return proper path when currentUser is defined and view exists', () => {
+    setupMockPrefetchedData('viewId');
+    const { result } = renderHooks(true);
+    expect(result.current.defaultHomePagePath).toEqual(
+      '/objects/companies?view=viewId',
+    );
+  });
+});