Skip to content

Commit

Permalink
Update onboarding mocked data
Browse files Browse the repository at this point in the history
  • Loading branch information
@martmull
martmull committed Jun 19, 2024
1 parent 3caf1a5 commit 86afc6b
Show file tree
Hide file tree
Showing 14 changed files with 72 additions and 117 deletions.
6 changes: 3 additions & 3 deletions packages/twenty-front/src/__stories__/App.stories.tsx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ import { SnackBarProviderScope } from '@/ui/feedback/snack-bar-manager/scopes/Sn
import { GET_CURRENT_USER } from '@/users/graphql/queries/getCurrentUser';
import { App } from '~/App';
import { graphqlMocks } from '~/testing/graphqlMocks';
import { mockedUsersData } from '~/testing/mock-data/users';
import { mockedUserData } from '~/testing/mock-data/users';

const meta: Meta<typeof App> = {
title: 'App/App',
Expand Down Expand Up @@ -67,9 +67,9 @@ export const DarkMode: Story = {
return HttpResponse.json({
data: {
currentUser: {
...mockedUsersData[0],
...mockedUserData,
workspaceMember: {
...mockedUsersData[0].workspaceMember,
...mockedUserData.workspaceMember,
colorScheme: 'Dark',
},
},
Expand Down
4 changes: 2 additions & 2 deletions packages/twenty-front/src/hooks/__tests__/useDefaultHomePagePath.test.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ import { getObjectMetadataItemsMock } from '@/object-metadata/utils/getObjectMet
import { usePrefetchedData } from '@/prefetch/hooks/usePrefetchedData';
import { AppPath } from '@/types/AppPath';
import { useDefaultHomePagePath } from '~/hooks/useDefaultHomePagePath';
import { mockedUsersData } from '~/testing/mock-data/users';
import { mockedUserData } from '~/testing/mock-data/users';

const objectMetadataItem = getObjectMetadataItemsMock()[0];
jest.mock('@/object-metadata/hooks/useObjectMetadataItem');
Expand Down Expand Up @@ -36,7 +36,7 @@ const renderHooks = (withCurrentUser: boolean) => {
() => {
const setCurrentUser = useSetRecoilState(currentUserState);
if (withCurrentUser) {
setCurrentUser(mockedUsersData[0]);
setCurrentUser(mockedUserData);
}
return useDefaultHomePagePath();
},
Expand Down
4 changes: 2 additions & 2 deletions packages/twenty-front/src/loading/components/__stories__/UserOrMetadataLoader.stories.tsx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,15 +14,15 @@ import {
} from '~/testing/decorators/PageDecorator';
import { graphqlMocks, metadataGraphql } from '~/testing/graphqlMocks';
import { mockedClientConfig } from '~/testing/mock-data/config';
import { mockedUsersData } from '~/testing/mock-data/users';
import { mockedUserData } from '~/testing/mock-data/users';

const userMetadataLoaderMocks = {
msw: {
handlers: [
graphql.query(getOperationName(GET_CURRENT_USER) ?? '', () => {
return HttpResponse.json({
data: {
currentUser: mockedUsersData[0],
currentUser: mockedUserData,
},
});
}),
Expand Down
4 changes: 2 additions & 2 deletions packages/twenty-front/src/modules/support/components/__stories__/SupportChat.stories.tsx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ import { supportChatState } from '@/client-config/states/supportChatState';
import { graphqlMocks } from '~/testing/graphqlMocks';
import {
mockDefaultWorkspace,
mockedUsersData,
mockedUserData,
mockedWorkspaceMemberData,
} from '~/testing/mock-data/users';

Expand All @@ -30,7 +30,7 @@ const meta: Meta<typeof SupportChat> = {

setCurrentWorkspace(mockDefaultWorkspace);
setCurrentWorkspaceMember(mockedWorkspaceMemberData);
setCurrentUser(mockedUsersData[0]);
setCurrentUser(mockedUserData);
setSupportChat({ supportDriver: 'front', supportFrontChatId: '1234' });

return <Story />;
Expand Down
17 changes: 12 additions & 5 deletions packages/twenty-front/src/pages/auth/__stories__/PasswordReset.stories.tsx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,14 +4,21 @@ import { within } from '@storybook/test';
import { graphql, HttpResponse } from 'msw';

import { GET_CURRENT_USER } from '@/users/graphql/queries/getCurrentUser';
import { ValidatePasswordResetTokenDocument } from '~/generated/graphql';
import {
OnboardingStatus,
ValidatePasswordResetTokenDocument,
} from '~/generated/graphql';
import { PasswordReset } from '~/pages/auth/PasswordReset';
import {
PageDecorator,
PageDecoratorArgs,
} from '~/testing/decorators/PageDecorator';
import { graphqlMocks } from '~/testing/graphqlMocks';
import { mockedOnboardingUsersData } from '~/testing/mock-data/users';
import { mockedOnboardingUserData } from '~/testing/mock-data/users';

const mockedOnboardingUsersData = mockedOnboardingUserData(
OnboardingStatus.Completed,
);

const meta: Meta<PageDecoratorArgs> = {
title: 'Pages/Auth/PasswordReset',
Expand All @@ -30,8 +37,8 @@ const meta: Meta<PageDecoratorArgs> = {
return HttpResponse.json({
data: {
validatePasswordResetToken: {
id: mockedOnboardingUsersData[0].id,
email: mockedOnboardingUsersData[0].email,
id: mockedOnboardingUsersData.id,
email: mockedOnboardingUsersData.email,
},
},
});
Expand All @@ -40,7 +47,7 @@ const meta: Meta<PageDecoratorArgs> = {
graphql.query(getOperationName(GET_CURRENT_USER) ?? '', () => {
return HttpResponse.json({
data: {
currentUser: mockedOnboardingUsersData[0],
currentUser: mockedOnboardingUsersData,
},
});
}),
Expand Down
9 changes: 4 additions & 5 deletions packages/twenty-front/src/pages/onboarding/__stories__/ChooseYourPlan.stories.tsx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ import {
PageDecoratorArgs,
} from '~/testing/decorators/PageDecorator';
import { graphqlMocks } from '~/testing/graphqlMocks';
import { mockedOnboardingUsersData } from '~/testing/mock-data/users';
import { mockedOnboardingUserData } from '~/testing/mock-data/users';
import { sleep } from '~/utils/sleep';

const meta: Meta<PageDecoratorArgs> = {
Expand All @@ -26,10 +26,9 @@ const meta: Meta<PageDecoratorArgs> = {
graphql.query(getOperationName(GET_CURRENT_USER) ?? '', () => {
return HttpResponse.json({
data: {
currentUser: {
...mockedOnboardingUsersData[0],
onboardingStatus: OnboardingStatus.SubscriptionIncomplete,
},
currentUser: mockedOnboardingUserData(
OnboardingStatus.SubscriptionIncomplete,
),
},
});
}),
Expand Down
9 changes: 4 additions & 5 deletions packages/twenty-front/src/pages/onboarding/__stories__/CreateProfile.stories.tsx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ import {
PageDecoratorArgs,
} from '~/testing/decorators/PageDecorator';
import { graphqlMocks } from '~/testing/graphqlMocks';
import { mockedOnboardingUsersData } from '~/testing/mock-data/users';
import { mockedOnboardingUserData } from '~/testing/mock-data/users';

const meta: Meta<PageDecoratorArgs> = {
title: 'Pages/Onboarding/CreateProfile',
Expand All @@ -25,10 +25,9 @@ const meta: Meta<PageDecoratorArgs> = {
graphql.query(getOperationName(GET_CURRENT_USER) ?? '', () => {
return HttpResponse.json({
data: {
currentUser: {
...mockedOnboardingUsersData[0],
onboardingStatus: OnboardingStatus.ProfileCreation,
},
currentUser: mockedOnboardingUserData(
OnboardingStatus.ProfileCreation,
),
},
});
}),
Expand Down
9 changes: 4 additions & 5 deletions packages/twenty-front/src/pages/onboarding/__stories__/CreateWorkspace.stories.tsx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ import {
PageDecoratorArgs,
} from '~/testing/decorators/PageDecorator';
import { graphqlMocks } from '~/testing/graphqlMocks';
import { mockedOnboardingUsersData } from '~/testing/mock-data/users';
import { mockedOnboardingUserData } from '~/testing/mock-data/users';

const meta: Meta<PageDecoratorArgs> = {
title: 'Pages/Onboarding/CreateWorkspace',
Expand All @@ -25,10 +25,9 @@ const meta: Meta<PageDecoratorArgs> = {
graphql.query(getOperationName(GET_CURRENT_USER) ?? '', () => {
return HttpResponse.json({
data: {
currentUser: {
...mockedOnboardingUsersData[0],
onboardingStatus: OnboardingStatus.WorkspaceActivation,
},
currentUser: mockedOnboardingUserData(
OnboardingStatus.WorkspaceActivation,
),
},
});
}),
Expand Down
9 changes: 4 additions & 5 deletions packages/twenty-front/src/pages/onboarding/__stories__/InviteTeam.stories.tsx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ import {
PageDecoratorArgs,
} from '~/testing/decorators/PageDecorator';
import { graphqlMocks } from '~/testing/graphqlMocks';
import { mockedOnboardingUsersData } from '~/testing/mock-data/users';
import { mockedOnboardingUserData } from '~/testing/mock-data/users';

const meta: Meta<PageDecoratorArgs> = {
title: 'Pages/Onboarding/InviteTeam',
Expand All @@ -25,10 +25,9 @@ const meta: Meta<PageDecoratorArgs> = {
graphql.query(getOperationName(GET_CURRENT_USER) ?? '', () => {
return HttpResponse.json({
data: {
currentUser: {
...mockedOnboardingUsersData[0],
onboardingStatus: OnboardingStatus.InviteTeam,
},
currentUser: mockedOnboardingUserData(
OnboardingStatus.InviteTeam,
),
},
});
}),
Expand Down
7 changes: 5 additions & 2 deletions packages/twenty-front/src/pages/onboarding/__stories__/PaymentSuccess.stories.tsx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,13 +5,14 @@ import { graphql, HttpResponse } from 'msw';

import { AppPath } from '@/types/AppPath';
import { GET_CURRENT_USER } from '@/users/graphql/queries/getCurrentUser';
import { OnboardingStatus } from '~/generated/graphql';
import { PaymentSuccess } from '~/pages/onboarding/PaymentSuccess';
import {
PageDecorator,
PageDecoratorArgs,
} from '~/testing/decorators/PageDecorator';
import { graphqlMocks } from '~/testing/graphqlMocks';
import { mockedOnboardingUsersData } from '~/testing/mock-data/users';
import { mockedOnboardingUserData } from '~/testing/mock-data/users';

const meta: Meta<PageDecoratorArgs> = {
title: 'Pages/Onboarding/PaymentSuccess',
Expand All @@ -24,7 +25,9 @@ const meta: Meta<PageDecoratorArgs> = {
graphql.query(getOperationName(GET_CURRENT_USER) ?? '', () => {
return HttpResponse.json({
data: {
currentUser: mockedOnboardingUsersData[0],
currentUser: mockedOnboardingUserData(
OnboardingStatus.WorkspaceActivation,
),
},
});
}),
Expand Down
7 changes: 2 additions & 5 deletions packages/twenty-front/src/pages/onboarding/__stories__/SyncEmails.stories.tsx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ import {
PageDecoratorArgs,
} from '~/testing/decorators/PageDecorator';
import { graphqlMocks } from '~/testing/graphqlMocks';
import { mockedOnboardingUsersData } from '~/testing/mock-data/users';
import { mockedOnboardingUserData } from '~/testing/mock-data/users';

const meta: Meta<PageDecoratorArgs> = {
title: 'Pages/Onboarding/SyncEmails',
Expand All @@ -25,10 +25,7 @@ const meta: Meta<PageDecoratorArgs> = {
graphql.query(getOperationName(GET_CURRENT_USER) ?? '', () => {
return HttpResponse.json({
data: {
currentUser: {
...mockedOnboardingUsersData[0],
onboardingStatus: OnboardingStatus.SyncEmail,
},
currentUser: mockedOnboardingUserData(OnboardingStatus.SyncEmail),
},
});
}),
Expand Down
4 changes: 2 additions & 2 deletions packages/twenty-front/src/testing/decorators/ObjectMetadataItemsDecorator.tsx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ import { ObjectMetadataItemsLoadEffect } from '@/object-metadata/components/Obje
import { PreComputedChipGeneratorsContext } from '@/object-metadata/context/PreComputedChipGeneratorsContext';
import { objectMetadataItemsState } from '@/object-metadata/states/objectMetadataItemsState';
import { getRecordChipGeneratorPerObjectPerField } from '@/object-record/utils/getRecordChipGeneratorPerObjectPerField';
import { mockedUsersData } from '~/testing/mock-data/users';
import { mockedUserData } from '~/testing/mock-data/users';
import { mockWorkspaceMembers } from '~/testing/mock-data/workspace-members';

export const ObjectMetadataItemsDecorator: Decorator = (Story) => {
Expand All @@ -20,7 +20,7 @@ export const ObjectMetadataItemsDecorator: Decorator = (Story) => {

useEffect(() => {
setCurrentWorkspaceMember(mockWorkspaceMembers[0]);
setCurrentUser(mockedUsersData[0]);
setCurrentUser(mockedUserData);
}, [setCurrentUser, setCurrentWorkspaceMember]);

const chipGeneratorPerObjectPerField = useMemo(() => {
Expand Down
4 changes: 2 additions & 2 deletions packages/twenty-front/src/testing/graphqlMocks.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ import { mockedClientConfig } from '~/testing/mock-data/config';
import { mockedObjectMetadataItemsQueryResult } from '~/testing/mock-data/metadata';
import { getPeopleMock } from '~/testing/mock-data/people';
import { mockedRemoteTables } from '~/testing/mock-data/remote-tables';
import { mockedUsersData } from '~/testing/mock-data/users';
import { mockedUserData } from '~/testing/mock-data/users';
import { mockedViewsData } from '~/testing/mock-data/views';
import { mockWorkspaceMembers } from '~/testing/mock-data/workspace-members';

Expand All @@ -35,7 +35,7 @@ export const graphqlMocks = {
graphql.query(getOperationName(GET_CURRENT_USER) ?? '', () => {
return HttpResponse.json({
data: {
currentUser: mockedUsersData[0],
currentUser: mockedUserData,
},
});
}),
Expand Down
Loading

0 comments on commit 86afc6b

Please sign in to comment.