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

Migrate activities (#2545)

Browse Source 
* Start

* Migrate activities to flexible schema
This commit is contained in:
Charles Bochet
2023-11-16 17:10:22 +01:00
committed by GitHub
parent 7da18a13e8
commit dee38bb901
69 changed files with 518 additions and 1479 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
front/src/pages/companies/CompanyShow.tsx
View File

@ -1,7 +1,6 @@
import { useEffect } from 'react';
import { useNavigate, useParams } from 'react-router-dom';
import { ActivityTargetableEntityType } from '@/activities/types/ActivityTargetableEntity';
import { CompanyTeam } from '@/companies/components/CompanyTeam';
import { useCompanyQuery } from '@/companies/hooks/useCompanyQuery';
import { useFavorites } from '@/favorites/hooks/useFavorites';
@ -69,7 +68,7 @@ export const CompanyShow = () => {
key="add"
entity={{
id: company.id,
type: ActivityTargetableEntityType.Company,
type: 'Company',
}}
/>
</PageHeader>
@ -113,7 +112,7 @@ export const CompanyShow = () => {
<ShowPageRightContainer
entity={{
id: company.id,
type: ActivityTargetableEntityType.Company,
type: 'Company',
}}
timeline
tasks

68
front/src/pages/companies/__stories__/Company.stories.tsx
View File

@ -4,9 +4,6 @@ import { Meta, StoryObj } from '@storybook/react';
import { fireEvent, within } from '@storybook/testing-library';
import { graphql } from 'msw';
import { CREATE_ACTIVITY_WITH_COMMENT } from '@/activities/graphql/mutations/createActivityWithComment';
import { GET_ACTIVITIES_BY_TARGETS } from '@/activities/graphql/queries/getActivitiesByTarget';
import { GET_ACTIVITY } from '@/activities/graphql/queries/getActivity';
import { UPDATE_ONE_COMPANY } from '@/companies/graphql/mutations/updateOneCompany';
import { GET_COMPANY } from '@/companies/graphql/queries/getCompany';
import { AppPath } from '@/types/AppPath';
@ -16,7 +13,6 @@ import {
PageDecoratorArgs,
} from '~/testing/decorators/PageDecorator';
import { graphqlMocks } from '~/testing/graphqlMocks';
import { mockedActivities, mockedTasks } from '~/testing/mock-data/activities';
import { mockedCompaniesData } from '~/testing/mock-data/companies';
import { CompanyShow } from '../CompanyShow';
@ -32,19 +28,6 @@ const meta: Meta<PageDecoratorArgs> = {
parameters: {
msw: [
...graphqlMocks,
graphql.query(
getOperationName(GET_ACTIVITIES_BY_TARGETS) ?? '',
(req, res, ctx) => {
return res(
ctx.data({
findManyActivities:
req?.variables?.where?.type?.equals === 'Task'
? mockedTasks
: mockedActivities,
}),
);
},
),
graphql.query(getOperationName(GET_COMPANY) ?? '', (req, res, ctx) => {
return res(
ctx.data({
@ -90,23 +73,6 @@ export const EditNoteByAddButton: Story = {
parameters: {
msw: [
...meta.parameters?.msw,
graphql.mutation(
getOperationName(CREATE_ACTIVITY_WITH_COMMENT) ?? '',
(req, res, ctx) => {
return res(
ctx.data({
createOneActivity: mockedActivities[0],
}),
);
},
),
graphql.query(getOperationName(GET_ACTIVITY) ?? '', (req, res, ctx) => {
return res(
ctx.data({
findManyActivities: [mockedActivities[0]],
}),
);
}),
graphql.mutation(
getOperationName(UPDATE_ONE_COMPANY) ?? '',
(req, res, ctx) => {
@ -145,23 +111,6 @@ export const NoteTab: Story = {
parameters: {
msw: [
...meta.parameters?.msw,
graphql.mutation(
getOperationName(CREATE_ACTIVITY_WITH_COMMENT) ?? '',
(req, res, ctx) => {
return res(
ctx.data({
createOneActivity: mockedActivities[0],
}),
);
},
),
graphql.query(getOperationName(GET_ACTIVITY) ?? '', (req, res, ctx) => {
return res(
ctx.data({
findManyActivities: [mockedActivities[0]],
}),
);
}),
graphql.mutation(
getOperationName(UPDATE_ONE_COMPANY) ?? '',
(req, res, ctx) => {
@ -207,23 +156,6 @@ export const TaskTab: Story = {
parameters: {
msw: [
...meta.parameters?.msw,
graphql.mutation(
getOperationName(CREATE_ACTIVITY_WITH_COMMENT) ?? '',
(req, res, ctx) => {
return res(
ctx.data({
createOneActivity: mockedTasks[0],
}),
);
},
),
graphql.query(getOperationName(GET_ACTIVITY) ?? '', (req, res, ctx) => {
return res(
ctx.data({
findManyActivities: [mockedTasks[0]],
}),
);
}),
graphql.mutation(
getOperationName(UPDATE_ONE_COMPANY) ?? '',
(req, res, ctx) => {

9
front/src/pages/people/PersonShow.tsx
View File

@ -2,7 +2,6 @@ import { useEffect } from 'react';
import { useNavigate, useParams } from 'react-router-dom';
import { getOperationName } from '@apollo/client/utilities';
import { ActivityTargetableEntityType } from '@/activities/types/ActivityTargetableEntity';
import { useFavorites } from '@/favorites/hooks/useFavorites';
import { GET_PERSON } from '@/people/graphql/queries/getPerson';
import { usePersonQuery } from '@/people/hooks/usePersonQuery';
@ -84,12 +83,12 @@ export const PersonShow = () => {
key="add"
entity={{
id: person.id,
type: ActivityTargetableEntityType.Person,
type: 'Person',
relatedEntities: person.company?.id
? [
{
id: person.company?.id,
type: ActivityTargetableEntityType.Company,
type: 'Company',
},
]
: undefined,
@ -137,12 +136,12 @@ export const PersonShow = () => {
<ShowPageRightContainer
entity={{
id: person.id ?? '',
type: ActivityTargetableEntityType.Person,
type: 'Person',
relatedEntities: person.company?.id
? [
{
id: person.company?.id,
type: ActivityTargetableEntityType.Company,
type: 'Company',
},
]
: undefined,