Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix perf tests storybook #6584

Merged
merged 1 commit into from
Aug 8, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
import { ActorFieldDisplay } from '@/object-record/record-field/meta-types/display/components/ActorFieldDisplay';
import { FieldActorValue } from '@/object-record/record-field/types/FieldMetadata';
import { Meta, StoryObj } from '@storybook/react';
import { ComponentDecorator } from 'twenty-ui';

Expand All @@ -13,11 +12,10 @@ const meta: Meta = {
decorators: [
MemoryRouterDecorator,
ChipGeneratorsDecorator,
getFieldDecorator('person', 'actor', {
getFieldDecorator('company', 'createdBy', {
id: '1',
name: 'John Doe',
source: 'API',
workspaceMemberId: undefined,
} satisfies FieldActorValue),
}),
ComponentDecorator,
],
component: ActorFieldDisplay,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,16 @@ const meta: Meta = {
title: 'UI/Data/Field/Display/AddressFieldDisplay',
decorators: [
MemoryRouterDecorator,
getFieldDecorator('person', 'testAddress'),
getFieldDecorator('company', 'address', {
addressCity: 'San Francisco',
addressCountry: 'United States',
addressStreet1: '1234 Elm Street',
addressStreet2: 'Apt 1234',
addressLat: 0,
addressLng: 0,
addressPostcode: '12345',
addressState: 'CA',
} as FieldAddressValue),
ComponentDecorator,
],
component: AddressFieldDisplay,
Expand All @@ -32,7 +41,7 @@ export const Elipsis: Story = {
container: { width: 100 },
},
decorators: [
getFieldDecorator('person', 'testAddress', {
getFieldDecorator('company', 'address', {
addressCity:
'Lorem ipsum dolor sit amet, consectetur adipiscing elit. Nullam',
addressCountry: 'United States',
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ const meta: Meta = {
title: 'UI/Data/Field/Display/BooleanFieldDisplay',
decorators: [
MemoryRouterDecorator,
getFieldDecorator('person', 'testBoolean'),
getFieldDecorator('company', 'idealCustomerProfile'),
ComponentDecorator,
],
component: BooleanFieldDisplay,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,10 @@ const meta: Meta = {
title: 'UI/Data/Field/Display/JsonFieldDisplay',
decorators: [
MemoryRouterDecorator,
getFieldDecorator('person', 'testJson'),
getFieldDecorator('company', 'testRawJson', {
key1: 'value1',
key2: 'value2',
}),
ComponentDecorator,
],
component: JsonFieldDisplay,
Expand Down

This file was deleted.

Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { useContext, useEffect } from 'react';
import { Meta, StoryObj } from '@storybook/react';
import { useContext, useEffect } from 'react';
import { ComponentDecorator } from 'twenty-ui';

import { FieldFocusContext } from '@/object-record/record-field/contexts/FieldFocusContext';
Expand All @@ -23,7 +23,11 @@ const meta: Meta = {
title: 'UI/Data/Field/Display/LinksFieldDisplay',
decorators: [
MemoryRouterDecorator,
getFieldDecorator('person', 'testLinks'),
getFieldDecorator('company', 'domainName', {
primaryLinkUrl: 'https://www.google.com',
primaryLinkLabel: 'Google',
secondaryLinks: ['https://www.toto.com'],
}),
ComponentDecorator,
],
component: LinksFieldDisplay,
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { useContext, useEffect } from 'react';
import { Meta, StoryObj } from '@storybook/react';
import { useContext, useEffect } from 'react';
import { ComponentDecorator } from 'twenty-ui';

import { FieldFocusContext } from '@/object-record/record-field/contexts/FieldFocusContext';
Expand All @@ -23,7 +23,11 @@ const meta: Meta = {
title: 'UI/Data/Field/Display/MultiSelectFieldDisplay',
decorators: [
MemoryRouterDecorator,
getFieldDecorator('person', 'testMultiSelect'),
getFieldDecorator('company', 'testMultiSelect', [
'Option 1',
'Option 2',
'Option 3',
]),
ComponentDecorator,
],
component: MultiSelectFieldDisplay,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ const meta: Meta = {
title: 'UI/Data/Field/Display/RatingFieldDisplay',
decorators: [
MemoryRouterDecorator,
getFieldDecorator('person', 'testRating'),
getFieldDecorator('company', 'testRating'),
ComponentDecorator,
],
component: RatingFieldDisplay,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ const meta: Meta = {
title: 'UI/Data/Field/Display/SelectFieldDisplay',
decorators: [
MemoryRouterDecorator,
getFieldDecorator('person', 'testSelect'),
getFieldDecorator('task', 'status'),
ComponentDecorator,
],
component: SelectFieldDisplay,
Expand Down
39 changes: 31 additions & 8 deletions packages/twenty-front/src/testing/decorators/getFieldDecorator.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -14,18 +14,21 @@ import { ObjectRecord } from '@/object-record/types/ObjectRecord';
import { getCompaniesMock } from '~/testing/mock-data/companies';
import { generatedMockObjectMetadataItems } from '~/testing/mock-data/objectMetadataItems';
import { getPeopleMock } from '~/testing/mock-data/people';
import { mockedTasks } from '~/testing/mock-data/tasks';
import { isDefined } from '~/utils/isDefined';

const RecordMockSetterEffect = ({
companies,
people,
tasks,
}: {
companies: ObjectRecord[];
people: ObjectRecord[];
tasks: ObjectRecord[];
}) => {
const setRecordValue = useSetRecordValue();

const setRecordInBothStores = useRecoilCallback(
const setRecordInStores = useRecoilCallback(
({ set }) =>
(record: ObjectRecord) => {
set(recordStoreFamilyState(record.id), record);
Expand All @@ -36,20 +39,24 @@ const RecordMockSetterEffect = ({

useEffect(() => {
for (const company of companies) {
setRecordInBothStores(company);
setRecordInStores(company);
}

for (const person of people) {
setRecordInBothStores(person);
setRecordInStores(person);
}
}, [setRecordInBothStores, companies, people]);

for (const task of tasks) {
setRecordInStores(task);
}
}, [companies, people, tasks, setRecordInStores]);

return null;
};

export const getFieldDecorator =
(
objectNameSingular: 'company' | 'person',
objectNameSingular: 'company' | 'person' | 'task',
fieldName: string,
fieldValue?: any,
): Decorator =>
Expand All @@ -74,7 +81,19 @@ export const getFieldDecorator =
]
: peopleMock;

const record = objectNameSingular === 'company' ? companies[0] : people[0];
const tasksMock = mockedTasks;

const tasks =
objectNameSingular === 'task'
? [{ ...tasksMock[0], [fieldName]: fieldValue }, ...tasksMock.slice(1)]
: tasksMock;

const record =
objectNameSingular === 'company'
? companies[0]
: objectNameSingular === 'person'
? people[0]
: tasks[0];

if (isDefined(fieldValue)) {
(record as any)[fieldName] = fieldValue;
Expand Down Expand Up @@ -113,13 +132,17 @@ export const getFieldDecorator =
isLabelIdentifier,
fieldDefinition: formatFieldMetadataItemAsColumnDefinition({
field: fieldMetadataItem,
position: record.position ?? 0,
position: 0,
objectMetadataItem,
}),
hotkeyScope: 'hotkey-scope',
}}
>
<RecordMockSetterEffect companies={companies} people={people} />
<RecordMockSetterEffect
companies={companies}
people={people}
tasks={tasks}
/>
<Story />
</FieldContext.Provider>
</RecordFieldValueSelectorContextProvider>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7936,6 +7936,75 @@ export const mockedStandardObjectMetadataQueryResult: ObjectMetadataItemsQuery =
"fromRelationMetadata": null,
"toRelationMetadata": null
}
},
{
"__typename": "fieldEdge",
"node": {
"__typename": "field",
"id": "af19a3ba-b725-4b9d-a0b7-8bf6b04fadds",
"type": "MULTI_SELECT",
"name": "testMultiSelect",
"label": "Test Multi Select",
"description": "Test Multi Select",
"icon": "IconSelect",
"isCustom": false,
"isActive": true,
"isSystem": true,
"isNullable": false,
"createdAt": "2024-08-02T16:00:05.938Z",
"updatedAt": "2024-08-02T16:00:05.938Z",
"defaultValue": null,
"options": null,
"relationDefinition": null,
"fromRelationMetadata": null,
"toRelationMetadata": null
}
},
{
"__typename": "fieldEdge",
"node": {
"__typename": "field",
"id": "tt929592-4f74-419e-8b26-6d216859078f",
"type": "RAW_JSON",
"name": "testRawJson",
"label": "Test Raw Json",
"description": "Json value for event details",
"icon": "IconListDetails",
"isCustom": false,
"isActive": true,
"isSystem": true,
"isNullable": true,
"createdAt": "2024-08-02T16:00:05.938Z",
"updatedAt": "2024-08-02T16:00:05.938Z",
"defaultValue": null,
"options": null,
"relationDefinition": null,
"fromRelationMetadata": null,
"toRelationMetadata": null
}
},
{
"__typename": "fieldEdge",
"node": {
"__typename": "field",
"id": "vv929592-4f74-419e-8b26-6d216859078f",
"type": "RATING",
"name": "testRating",
"label": "Rating",
"description": "Rating value",
"icon": "IconListDetails",
"isCustom": false,
"isActive": true,
"isSystem": true,
"isNullable": true,
"createdAt": "2024-08-02T16:00:05.938Z",
"updatedAt": "2024-08-02T16:00:05.938Z",
"defaultValue": null,
"options": null,
"relationDefinition": null,
"fromRelationMetadata": null,
"toRelationMetadata": null
}
},
{
"__typename": "fieldEdge",
Expand Down
Loading
Loading