admin/twenty
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Fix storybook (#5334)

Browse Source 
Fixing the last broken stories, tests should be back to green!
This commit is contained in:
Charles Bochet
2024-05-08 09:28:28 +02:00
committed by GitHub
parent 770ee11b9c
commit 863554bb13
2 changed files with 10 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
packages/twenty-front/src/modules/object-metadata/components/ObjectMetadataItemsLoadEffect.tsx
View File

@ -13,7 +13,7 @@ export const ObjectMetadataItemsLoadEffect = () => {
const currentUser = useRecoilValue(currentUserState); const currentUser = useRecoilValue(currentUserState);
const currentWorkspace = useRecoilValue(currentWorkspaceState); const currentWorkspace = useRecoilValue(currentWorkspaceState);
const { objectMetadataItems: newObjectMetadataItems } = const { objectMetadataItems: newObjectMetadataItems, loading } =
useFindManyObjectMetadataItems({ useFindManyObjectMetadataItems({
skip: isUndefinedOrNull(currentUser), skip: isUndefinedOrNull(currentUser),
}); });
@ -28,12 +28,16 @@ export const ObjectMetadataItemsLoadEffect = () => {
currentWorkspace?.activationStatus !== 'active' currentWorkspace?.activationStatus !== 'active'
? getObjectMetadataItemsMock() ? getObjectMetadataItemsMock()
: newObjectMetadataItems; : newObjectMetadataItems;
if (!isDeeplyEqual(objectMetadataItems, toSetObjectMetadataItems)) { if (
!loading &&
!isDeeplyEqual(objectMetadataItems, toSetObjectMetadataItems)
) {
setObjectMetadataItems(toSetObjectMetadataItems); setObjectMetadataItems(toSetObjectMetadataItems);
} }
}, [ }, [
currentUser, currentUser,
currentWorkspace?.activationStatus, currentWorkspace?.activationStatus,
loading,
newObjectMetadataItems, newObjectMetadataItems,
objectMetadataItems, objectMetadataItems,
setObjectMetadataItems, setObjectMetadataItems,

7
packages/twenty-front/src/modules/settings/data-model/fields/forms/components/__stories__/SettingsDataModelFieldTypeSelect.stories.tsx
View File

@ -3,6 +3,7 @@ import { expect, userEvent, within } from '@storybook/test';
import { ComponentDecorator } from 'twenty-ui'; import { ComponentDecorator } from 'twenty-ui';
import { FieldMetadataType } from '~/generated-metadata/graphql'; import { FieldMetadataType } from '~/generated-metadata/graphql';
import { FormProviderDecorator } from '~/testing/decorators/FormProviderDecorator';
import { graphqlMocks } from '~/testing/graphqlMocks'; import { graphqlMocks } from '~/testing/graphqlMocks';
import { SettingsDataModelFieldTypeSelect } from '../SettingsDataModelFieldTypeSelect'; import { SettingsDataModelFieldTypeSelect } from '../SettingsDataModelFieldTypeSelect';
@ -11,7 +12,7 @@ const meta: Meta<typeof SettingsDataModelFieldTypeSelect> = {
title: title:
'Modules/Settings/DataModel/Fields/Forms/SettingsDataModelFieldTypeSelect', 'Modules/Settings/DataModel/Fields/Forms/SettingsDataModelFieldTypeSelect',
component: SettingsDataModelFieldTypeSelect, component: SettingsDataModelFieldTypeSelect,
decorators: [ComponentDecorator], decorators: [FormProviderDecorator, ComponentDecorator],
parameters: { parameters: {
container: { width: 512 }, container: { width: 512 },
msw: graphqlMocks, msw: graphqlMocks,
@ -33,11 +34,11 @@ export const WithOpenSelect: Story = {
play: async ({ canvasElement }) => { play: async ({ canvasElement }) => {
const canvas = within(canvasElement); const canvas = within(canvasElement);
const inputField = await canvas.findByText('Text'); const inputField = await canvas.findByText('Unique ID');
await userEvent.click(inputField); await userEvent.click(inputField);
const input = await canvas.findByText('Unique ID'); const input = await canvas.findByText('Text');
await userEvent.click(input); await userEvent.click(input);
await userEvent.click(inputField); await userEvent.click(inputField);