5663 i should be able to accept an invite even if i have an inactive workspace (#5839)

- make invitation and reset password available on every page
- add a sleep after setKeyPair as tokens are sometimes not updated when
redirecting to Index
- refactor sleep

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

@@ -52,27 +52,27 @@ const testCases = [
   { loc: AppPath.SignInUp, status: OnboardingStatus.Completed, res: defaultHomePagePath },
   { loc: AppPath.SignInUp, status: OnboardingStatus.CompletedWithoutSubscription, res: defaultHomePagePath },
 
-  { loc: AppPath.Invite, status: OnboardingStatus.Incomplete, res: AppPath.PlanRequired },
+  { loc: AppPath.Invite, status: OnboardingStatus.Incomplete, res: undefined },
-  { loc: AppPath.Invite, status: OnboardingStatus.Canceled, res: '/settings/billing' },
+  { loc: AppPath.Invite, status: OnboardingStatus.Canceled, res: undefined },
-  { loc: AppPath.Invite, status: OnboardingStatus.Unpaid, res: '/settings/billing' },
+  { loc: AppPath.Invite, status: OnboardingStatus.Unpaid, res: undefined },
   { loc: AppPath.Invite, status: OnboardingStatus.PastDue, res: undefined },
   { loc: AppPath.Invite, status: OnboardingStatus.OngoingUserCreation, res: undefined },
-  { loc: AppPath.Invite, status: OnboardingStatus.OngoingWorkspaceActivation, res: AppPath.CreateWorkspace },
+  { loc: AppPath.Invite, status: OnboardingStatus.OngoingWorkspaceActivation, res: undefined },
-  { loc: AppPath.Invite, status: OnboardingStatus.OngoingProfileCreation, res: AppPath.CreateProfile },
+  { loc: AppPath.Invite, status: OnboardingStatus.OngoingProfileCreation, res: undefined },
-  { loc: AppPath.Invite, status: OnboardingStatus.OngoingSyncEmail, res: AppPath.SyncEmails },
+  { loc: AppPath.Invite, status: OnboardingStatus.OngoingSyncEmail, res: undefined },
-  { loc: AppPath.Invite, status: OnboardingStatus.OngoingInviteTeam, res: AppPath.InviteTeam },
+  { loc: AppPath.Invite, status: OnboardingStatus.OngoingInviteTeam, res: undefined },
   { loc: AppPath.Invite, status: OnboardingStatus.Completed, res: undefined },
   { loc: AppPath.Invite, status: OnboardingStatus.CompletedWithoutSubscription, res: undefined },
 
-  { loc: AppPath.ResetPassword, status: OnboardingStatus.Incomplete, res: AppPath.PlanRequired },
+  { loc: AppPath.ResetPassword, status: OnboardingStatus.Incomplete, res: undefined },
-  { loc: AppPath.ResetPassword, status: OnboardingStatus.Canceled, res: '/settings/billing' },
+  { loc: AppPath.ResetPassword, status: OnboardingStatus.Canceled, res: undefined },
-  { loc: AppPath.ResetPassword, status: OnboardingStatus.Unpaid, res: '/settings/billing' },
+  { loc: AppPath.ResetPassword, status: OnboardingStatus.Unpaid, res: undefined },
   { loc: AppPath.ResetPassword, status: OnboardingStatus.PastDue, res: undefined },
   { loc: AppPath.ResetPassword, status: OnboardingStatus.OngoingUserCreation, res: undefined },
-  { loc: AppPath.ResetPassword, status: OnboardingStatus.OngoingWorkspaceActivation, res: AppPath.CreateWorkspace },
+  { loc: AppPath.ResetPassword, status: OnboardingStatus.OngoingWorkspaceActivation, res: undefined },
-  { loc: AppPath.ResetPassword, status: OnboardingStatus.OngoingProfileCreation, res: AppPath.CreateProfile },
+  { loc: AppPath.ResetPassword, status: OnboardingStatus.OngoingProfileCreation, res: undefined },
-  { loc: AppPath.ResetPassword, status: OnboardingStatus.OngoingSyncEmail, res: AppPath.SyncEmails },
+  { loc: AppPath.ResetPassword, status: OnboardingStatus.OngoingSyncEmail, res: undefined },
-  { loc: AppPath.ResetPassword, status: OnboardingStatus.OngoingInviteTeam, res: AppPath.InviteTeam },
+  { loc: AppPath.ResetPassword, status: OnboardingStatus.OngoingInviteTeam, res: undefined },
   { loc: AppPath.ResetPassword, status: OnboardingStatus.Completed, res: undefined },
   { loc: AppPath.ResetPassword, status: OnboardingStatus.CompletedWithoutSubscription, res: undefined },
 

packages/twenty-front/src/hooks/usePageChangeEffectNavigateLocation.ts

@@ -29,6 +29,10 @@ export const usePageChangeEffectNavigateLocation = () => {
     isMatchingLocation(AppPath.PlanRequired) ||
     isMatchingLocation(AppPath.PlanRequiredSuccess);
 
+  if (isMatchingOpenRoute) {
+    return;
+  }
+
   if (
     onboardingStatus === OnboardingStatus.OngoingUserCreation &&
     !isMatchingOngoingUserCreationRoute
@@ -89,8 +93,7 @@ export const usePageChangeEffectNavigateLocation = () => {
 
   if (
     onboardingStatus === OnboardingStatus.Completed &&
-    isMatchingOnboardingRoute &&
+    isMatchingOnboardingRoute
-    !isMatchingOpenRoute
   ) {
     return defaultHomePagePath;
   }
@@ -98,7 +101,6 @@ export const usePageChangeEffectNavigateLocation = () => {
   if (
     onboardingStatus === OnboardingStatus.CompletedWithoutSubscription &&
     isMatchingOnboardingRoute &&
-    !isMatchingOpenRoute &&
     !isMatchingLocation(AppPath.PlanRequired)
   ) {
     return defaultHomePagePath;

packages/twenty-front/src/modules/command-menu/components/__stories__/CommandMenu.stories.tsx

@@ -19,7 +19,7 @@ import {
   mockDefaultWorkspace,
   mockedWorkspaceMemberData,
 } from '~/testing/mock-data/users';
-import { sleep } from '~/testing/sleep';
+import { sleep } from '~/utils/sleep';
 
 import { CommandMenu } from '../CommandMenu';
 

packages/twenty-front/src/modules/object-record/record-index/options/hooks/__tests__/useExportTableData.test.ts

@@ -6,24 +6,10 @@ import {
   displayedExportProgress,
   download,
   generateCsv,
-  sleep,
 } from '../useExportTableData';
 
 jest.useFakeTimers();
 
-describe('sleep', () => {
-  it('waits the provided number of milliseconds', async () => {
-    const spy = jest.fn();
-    sleep(1000).then(spy);
-
-    jest.advanceTimersByTime(999);
-    expect(spy).not.toHaveBeenCalled();
-    jest.advanceTimersByTime(1);
-    await Promise.resolve(); // let queued promises execute
-    expect(spy).toHaveBeenCalledTimes(1);
-  });
-});
-
 describe('download', () => {
   it('creates a download link and clicks it', () => {
     const link = document.createElement('a');

packages/twenty-front/src/modules/object-record/record-index/options/hooks/useExportTableData.ts

@@ -8,12 +8,10 @@ import { useRecordTableStates } from '@/object-record/record-table/hooks/interna
 import { ColumnDefinition } from '@/object-record/record-table/types/ColumnDefinition';
 import { isDefined } from '~/utils/isDefined';
 import { isUndefinedOrNull } from '~/utils/isUndefinedOrNull';
+import { sleep } from '~/utils/sleep';
 
 import { useFindManyParams } from '../../hooks/useLoadRecordIndexTable';
 
-export const sleep = (ms: number) =>
-  new Promise((resolve) => setTimeout(resolve, ms));
-
 export const download = (blob: Blob, filename: string) => {
   const url = URL.createObjectURL(blob);
   const link = document.createElement('a');

packages/twenty-front/src/modules/object-record/relation-picker/components/__stories__/SingleEntitySelect.stories.tsx

@@ -9,7 +9,7 @@ import { RelationPickerDecorator } from '~/testing/decorators/RelationPickerDeco
 import { SnackBarDecorator } from '~/testing/decorators/SnackBarDecorator';
 import { graphqlMocks } from '~/testing/graphqlMocks';
 import { getPeopleMock } from '~/testing/mock-data/people';
-import { sleep } from '~/testing/sleep';
+import { sleep } from '~/utils/sleep';
 
 import { EntityForSelect } from '../../types/EntityForSelect';
 import { SingleEntitySelect } from '../SingleEntitySelect';

packages/twenty-front/src/modules/spreadsheet-import/tests/mockRsiValues.ts

@@ -1,5 +1,6 @@
 import { defaultSpreadsheetImportProps } from '@/spreadsheet-import/provider/components/SpreadsheetImport';
 import { Fields, SpreadsheetOptions } from '@/spreadsheet-import/types';
+import { sleep } from '~/utils/sleep';
 
 const fields = [
   {
@@ -102,22 +103,16 @@ export const mockRsiValues = mockComponentBehaviourForTypes({
     return;
   },
   uploadStepHook: async (data) => {
-    await new Promise((resolve) => {
+    await sleep(4000, (resolve) => resolve(data));
-      setTimeout(() => resolve(data), 4000);
-    });
     return data;
   },
   selectHeaderStepHook: async (hData, data) => {
-    await new Promise((resolve) => {
+    await sleep(4000, (resolve) =>
-      setTimeout(
+      resolve({
-        () =>
+        headerValues: hData,
-          resolve({
+        data,
-            headerValues: hData,
+      }),
-            data,
+    );
-          }),
-        4000,
-      );
-    });
     return {
       headerValues: hData,
       data,
@@ -125,9 +120,7 @@ export const mockRsiValues = mockComponentBehaviourForTypes({
   },
   // Runs after column matching and on entry change, more performant
   matchColumnsStepHook: async (data) => {
-    await new Promise((resolve) => {
+    await sleep(4000, (resolve) => resolve(data));
-      setTimeout(() => resolve(data), 4000);
-    });
     return data;
   },
 });

packages/twenty-front/src/modules/ui/input/components/__stories__/IconPicker.stories.tsx

@@ -4,7 +4,7 @@ import { expect, userEvent, within } from '@storybook/test';
 import { ComponentDecorator } from 'twenty-ui';
 
 import { IconsProviderDecorator } from '~/testing/decorators/IconsProviderDecorator';
-import { sleep } from '~/testing/sleep';
+import { sleep } from '~/utils/sleep';
 
 import { IconPicker, IconPickerProps } from '../IconPicker';
 

packages/twenty-front/src/modules/ui/navigation/navigation-drawer/hooks/useWorkspaceSwitching.ts

@@ -5,6 +5,7 @@ import { tokenPairState } from '@/auth/states/tokenPairState';
 import { AppPath } from '@/types/AppPath';
 import { useGenerateJwtMutation } from '~/generated/graphql';
 import { isDefined } from '~/utils/isDefined';
+import { sleep } from '~/utils/sleep';
 
 export const useWorkspaceSwitching = () => {
   const setTokenPair = useSetRecoilState(tokenPairState);
@@ -29,6 +30,7 @@ export const useWorkspaceSwitching = () => {
 
     const { tokens } = jwt.data.generateJWT;
     setTokenPair(tokens);
+    await sleep(0); // This hacky workaround is necessary to ensure the tokens stored in the cookie are updated correctly.
     window.location.href = AppPath.Index;
   };
 

packages/twenty-front/src/pages/auth/Invite.tsx

@@ -66,7 +66,6 @@ export const Invite = () => {
         <>
           <StyledContentContainer>
             <MainButton
-              variant="secondary"
               title="Continue"
               type="submit"
               onClick={handleUserJoinWorkspace}

packages/twenty-front/src/pages/impersonate/__stories__/ImpersonateEffect.stories.tsx

@@ -6,7 +6,7 @@ import {
   PageDecoratorArgs,
 } from '~/testing/decorators/PageDecorator';
 import { graphqlMocks } from '~/testing/graphqlMocks';
-import { sleep } from '~/testing/sleep';
+import { sleep } from '~/utils/sleep';
 
 import { ImpersonateEffect } from '../ImpersonateEffect';
 

packages/twenty-front/src/pages/onboarding/__stories__/ChooseYourPlan.stories.tsx

@@ -12,7 +12,7 @@ import {
 } from '~/testing/decorators/PageDecorator';
 import { graphqlMocks } from '~/testing/graphqlMocks';
 import { mockedOnboardingUsersData } from '~/testing/mock-data/users';
-import { sleep } from '~/testing/sleep';
+import { sleep } from '~/utils/sleep';
 
 const meta: Meta<PageDecoratorArgs> = {
   title: 'Pages/Onboarding/ChooseYourPlan',

packages/twenty-front/src/pages/settings/__stories__/SettingsBilling.stories.tsx

@@ -8,7 +8,7 @@ import {
   PageDecoratorArgs,
 } from '~/testing/decorators/PageDecorator';
 import { graphqlMocks } from '~/testing/graphqlMocks';
-import { sleep } from '~/testing/sleep';
+import { sleep } from '~/utils/sleep';
 
 import { SettingsBilling } from '../SettingsBilling';
 

packages/twenty-front/src/pages/settings/__stories__/SettingsWorkspaceMembers.stories.tsx

@@ -6,7 +6,7 @@ import {
   PageDecoratorArgs,
 } from '~/testing/decorators/PageDecorator';
 import { graphqlMocks } from '~/testing/graphqlMocks';
-import { sleep } from '~/testing/sleep';
+import { sleep } from '~/utils/sleep';
 
 import { SettingsWorkspaceMembers } from '../SettingsWorkspaceMembers';
 

packages/twenty-front/src/pages/settings/accounts/__stories__/SettingsAccountsCalendars.stories.tsx

@@ -8,7 +8,7 @@ import {
   PageDecoratorArgs,
 } from '~/testing/decorators/PageDecorator';
 import { graphqlMocks } from '~/testing/graphqlMocks';
-import { sleep } from '~/testing/sleep';
+import { sleep } from '~/utils/sleep';
 
 import { SettingsAccountsCalendars } from '../SettingsAccountsCalendars';
 

packages/twenty-front/src/pages/settings/accounts/__stories__/SettingsAccountsCalendarsSettings.stories.tsx

@@ -10,7 +10,7 @@ import {
 } from '~/testing/decorators/PageDecorator';
 import { graphqlMocks } from '~/testing/graphqlMocks';
 import { mockedConnectedAccounts } from '~/testing/mock-data/accounts';
-import { sleep } from '~/testing/sleep';
+import { sleep } from '~/utils/sleep';
 
 import { SettingsAccountsCalendarsSettings } from '../SettingsAccountsCalendarsSettings';
 

packages/twenty-front/src/pages/settings/data-model/__stories__/SettingsObjectDetail.stories.tsx

@@ -6,7 +6,7 @@ import {
   PageDecoratorArgs,
 } from '~/testing/decorators/PageDecorator';
 import { graphqlMocks } from '~/testing/graphqlMocks';
-import { sleep } from '~/testing/sleep';
+import { sleep } from '~/utils/sleep';
 
 import { SettingsObjectDetail } from '../SettingsObjectDetail';
 

packages/twenty-front/src/pages/settings/data-model/__stories__/SettingsObjectEdit.stories.tsx

@@ -5,7 +5,7 @@ import {
   PageDecoratorArgs,
 } from '~/testing/decorators/PageDecorator';
 import { graphqlMocks } from '~/testing/graphqlMocks';
-import { sleep } from '~/testing/sleep';
+import { sleep } from '~/utils/sleep';
 
 import { SettingsObjectEdit } from '../SettingsObjectEdit';
 

packages/twenty-front/src/pages/settings/data-model/__stories__/SettingsObjects.stories.tsx

@@ -6,7 +6,7 @@ import {
   PageDecoratorArgs,
 } from '~/testing/decorators/PageDecorator';
 import { graphqlMocks } from '~/testing/graphqlMocks';
-import { sleep } from '~/testing/sleep';
+import { sleep } from '~/utils/sleep';
 
 import { SettingsObjects } from '../SettingsObjects';
 

packages/twenty-front/src/pages/settings/developers/__stories__/SettingsDevelopers.stories.tsx

@@ -7,7 +7,7 @@ import {
   PageDecoratorArgs,
 } from '~/testing/decorators/PageDecorator';
 import { graphqlMocks } from '~/testing/graphqlMocks';
-import { sleep } from '~/testing/sleep';
+import { sleep } from '~/utils/sleep';
 
 const meta: Meta<PageDecoratorArgs> = {
   title: 'Pages/Settings/Developers/SettingsDevelopers',

packages/twenty-front/src/pages/settings/integrations/__stories__/SettingsIntegrationDatabase.stories.tsx

@@ -9,7 +9,7 @@ import {
   PageDecoratorArgs,
 } from '~/testing/decorators/PageDecorator';
 import { graphqlMocks } from '~/testing/graphqlMocks';
-import { sleep } from '~/testing/sleep';
+import { sleep } from '~/utils/sleep';
 
 const meta: Meta<PageDecoratorArgs> = {
   title: 'Pages/Settings/Integrations/SettingsIntegrationDatabase',

packages/twenty-front/src/pages/settings/integrations/__stories__/SettingsIntegrationEditDatabaseConnection.stories.tsx

@@ -7,7 +7,7 @@ import {
   PageDecoratorArgs,
 } from '~/testing/decorators/PageDecorator';
 import { graphqlMocks } from '~/testing/graphqlMocks';
-import { sleep } from '~/testing/sleep';
+import { sleep } from '~/utils/sleep';
 
 const meta: Meta<PageDecoratorArgs> = {
   title:

packages/twenty-front/src/pages/settings/integrations/__stories__/SettingsIntegrationNewDatabaseConnection.stories.tsx

@@ -7,7 +7,7 @@ import {
   PageDecoratorArgs,
 } from '~/testing/decorators/PageDecorator';
 import { graphqlMocks } from '~/testing/graphqlMocks';
-import { sleep } from '~/testing/sleep';
+import { sleep } from '~/utils/sleep';
 
 const meta: Meta<PageDecoratorArgs> = {
   title: 'Pages/Settings/Integrations/SettingsIntegrationNewDatabaseConnection',

packages/twenty-front/src/pages/settings/integrations/__stories__/SettingsIntegrationShowDatabaseConnection.stories.tsx

@@ -9,7 +9,7 @@ import {
   PageDecoratorArgs,
 } from '~/testing/decorators/PageDecorator';
 import { graphqlMocks } from '~/testing/graphqlMocks';
-import { sleep } from '~/testing/sleep';
+import { sleep } from '~/utils/sleep';
 
 const meta: Meta<PageDecoratorArgs> = {
   title:

packages/twenty-front/src/pages/settings/integrations/__stories__/SettingsIntegrations.stories.tsx

@@ -9,7 +9,7 @@ import {
   PageDecoratorArgs,
 } from '~/testing/decorators/PageDecorator';
 import { graphqlMocks } from '~/testing/graphqlMocks';
-import { sleep } from '~/testing/sleep';
+import { sleep } from '~/utils/sleep';
 
 const meta: Meta<PageDecoratorArgs> = {
   title: 'Pages/Settings/Integrations/SettingsIntegrations',

packages/twenty-front/src/pages/tasks/__stories__/Tasks.stories.tsx

@@ -8,7 +8,7 @@ import {
 } from '~/testing/decorators/PageDecorator';
 import { graphqlMocks } from '~/testing/graphqlMocks';
 import { mockedWorkspaceMemberData } from '~/testing/mock-data/users';
-import { sleep } from '~/testing/sleep';
+import { sleep } from '~/utils/sleep';
 
 import { Tasks } from '../Tasks';
 

packages/twenty-front/src/testing/profiling/components/ProfilingQueueEffect.tsx

@@ -7,6 +7,7 @@ import { profilingQueueState } from '~/testing/profiling/states/profilingQueueSt
 import { profilingSessionRunsState } from '~/testing/profiling/states/profilingSessionRunsState';
 import { profilingSessionStatusState } from '~/testing/profiling/states/profilingSessionStatusState';
 import { getTestArray } from '~/testing/profiling/utils/getTestArray';
+import { sleep } from '~/utils/sleep';
 
 export const ProfilingQueueEffect = ({
   profilingId,
@@ -84,7 +85,7 @@ export const ProfilingQueueEffect = ({
             ? TIME_BETWEEN_TEST_RUNS_IN_MS * 2
             : TIME_BETWEEN_TEST_RUNS_IN_MS;
 
-          await new Promise((resolve) => setTimeout(resolve, timeInMs));
+          await sleep(timeInMs);
 
           const nextIndex = currentProfilingRunIndex + 1;
 

packages/twenty-front/src/testing/sleep.ts

@@ -1,4 +0,0 @@
-export const sleep = async (ms: number) =>
-  new Promise((resolve) => {
-    setTimeout(resolve, ms);
-  });

packages/twenty-front/src/utils/__tests__/sleep.test.ts

@@ -0,0 +1,35 @@
+import { sleep } from '~/utils/sleep';
+
+jest.useFakeTimers();
+describe('sleep', () => {
+  it('waits the provided number of milliseconds', async () => {
+    const spy = jest.fn();
+    const promise = sleep(1000).then(spy);
+
+    jest.advanceTimersByTime(999);
+    expect(spy).not.toHaveBeenCalled();
+    jest.advanceTimersByTime(1);
+    await promise; // let queued promises execute
+    expect(spy).toHaveBeenCalledTimes(1);
+  });
+
+  it('call callback after the wait', async () => {
+    const spy = jest.fn();
+    let increment = 1;
+    const callback = jest.fn((resolve) => {
+      increment += 1;
+      resolve();
+    });
+    const promise = sleep(1000, callback).then(spy);
+
+    jest.advanceTimersByTime(999);
+    expect(spy).not.toHaveBeenCalled();
+    expect(callback).not.toHaveBeenCalled();
+    expect(increment).toEqual(1);
+    jest.advanceTimersByTime(1);
+    await promise; // let queued promises execute
+    expect(spy).toHaveBeenCalledTimes(1);
+    expect(callback).toHaveBeenCalledTimes(1);
+    expect(increment).toEqual(2);
+  });
+});

packages/twenty-front/src/utils/sleep.ts

@@ -0,0 +1,8 @@
+export const sleep = async (
+  ms: number,
+  callback?: (resolve: (value: any) => void) => void,
+) =>
+  new Promise((resolve) => {
+    const handler = callback ? () => callback(resolve) : resolve;
+    setTimeout(handler, ms);
+  });