mukeshs/twenty_crm
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Improved optimistic rendering (#2649)

Browse Source
This commit is contained in:
Lucas Bordeau
2023-11-22 17:08:32 +01:00
committed by GitHub
parent 713eada9ef
commit ac2fedb148
6 changed files with 37 additions and 88 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
front/src/modules/activities/notes/hooks/useNotes.ts
View File

@ -1,7 +1,4 @@
import { Note } from '@/activities/types/Note';
import { useOptimisticEffect } from '@/apollo/optimistic-effect/hooks/useOptimisticEffect';
import { useObjectMetadataItem } from '@/object-metadata/hooks/useObjectMetadataItem';
import { getRecordOptimisticEffectDefinition } from '@/object-record/graphql/optimistic-effect-definition/getRecordOptimisticEffectDefinition';
import { useFindManyObjectRecords } from '@/object-record/hooks/useFindManyObjectRecords';
import { ActivityTargetableEntity } from '../../types/ActivityTargetableEntity';
@ -14,15 +11,6 @@ export const useNotes = (entity: ActivityTargetableEntity) => {
},
});
const { objectMetadataItem: activityObjectMetadataItem } =
useObjectMetadataItem({
objectNameSingular: 'activity',
});
const { registerOptimisticEffect } = useOptimisticEffect({
objectNameSingular: activityObjectMetadataItem?.nameSingular,
});
const filter = {
id: {
in: activityTargets?.map((activityTarget) => activityTarget.activityId),
@ -38,16 +26,6 @@ export const useNotes = (entity: ActivityTargetableEntity) => {
objectNamePlural: 'activities',
filter,
orderBy,
onCompleted: () => {
if (activityObjectMetadataItem) {
registerOptimisticEffect({
variables: { orderBy, filter },
definition: getRecordOptimisticEffectDefinition({
objectMetadataItem: activityObjectMetadataItem,
}),
});
}
},
});
return {

58
front/src/modules/activities/tasks/hooks/useTasks.ts
View File

@ -2,9 +2,6 @@ import { DateTime } from 'luxon';
import { Activity } from '@/activities/types/Activity';
import { ActivityTargetableEntity } from '@/activities/types/ActivityTargetableEntity';
import { useOptimisticEffect } from '@/apollo/optimistic-effect/hooks/useOptimisticEffect';
import { useObjectMetadataItem } from '@/object-metadata/hooks/useObjectMetadataItem';
import { getRecordOptimisticEffectDefinition } from '@/object-record/graphql/optimistic-effect-definition/getRecordOptimisticEffectDefinition';
import { useFindManyObjectRecords } from '@/object-record/hooks/useFindManyObjectRecords';
import { useFilter } from '@/ui/object/object-filter-dropdown/hooks/useFilter';
import { parseDate } from '~/utils/date-utils';
@ -21,15 +18,6 @@ export const useTasks = (entity?: ActivityTargetableEntity) => {
},
});
const { objectMetadataItem: activityObjectMetadataItem } =
useObjectMetadataItem({
objectNameSingular: 'activity',
});
const { registerOptimisticEffect } = useOptimisticEffect({
objectNameSingular: activityObjectMetadataItem?.nameSingular,
});
const { objects: completeTasksData } = useFindManyObjectRecords({
objectNamePlural: 'activities',
skip: !entity && !selectedFilter,
@ -43,29 +31,6 @@ export const useTasks = (entity?: ActivityTargetableEntity) => {
orderBy: {
createdAt: 'DescNullsFirst',
},
onCompleted: () => {
if (activityObjectMetadataItem) {
registerOptimisticEffect({
variables: {
filter: {
completedAt: { is: 'NOT_NULL' },
id: {
in: activityTargets?.map(
(activityTarget) => activityTarget.activityId,
),
},
type: { eq: 'Task' },
},
orderBy: {
createdAt: 'DescNullsFirst',
},
},
definition: getRecordOptimisticEffectDefinition({
objectMetadataItem: activityObjectMetadataItem,
}),
});
}
},
});
const { objects: incompleteTaskData } = useFindManyObjectRecords({
@ -81,29 +46,6 @@ export const useTasks = (entity?: ActivityTargetableEntity) => {
orderBy: {
createdAt: 'DescNullsFirst',
},
onCompleted: () => {
if (activityObjectMetadataItem) {
registerOptimisticEffect({
variables: {
filter: {
completedAt: { is: 'NULL' },
id: {
in: activityTargets?.map(
(activityTarget) => activityTarget.activityId,
),
},
type: { eq: 'Task' },
},
orderBy: {
createdAt: 'DescNullsFirst',
},
},
definition: getRecordOptimisticEffectDefinition({
objectMetadataItem: activityObjectMetadataItem,
}),
});
}
},
});
const todayOrPreviousTasks = incompleteTaskData?.filter((task) => {