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

Fixed bug for refectch activities and create activity on the currently filtered user. (#1493)

Browse Source 
* Fixed bug for refectch activities and create activity on the currently filtered user.

* Refactor optimistif effect

---------

Co-authored-by: Charles Bochet <charles@twenty.com>
This commit is contained in:
Lucas Bordeau
2023-09-11 08:02:51 +02:00
committed by GitHub
parent 08727aafe5
commit 9be069bedc
37 changed files with 363 additions and 243 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
front/src/modules/activities/hooks/useOpenCreateActivityDrawer.ts
View File

@ -30,10 +30,15 @@ export function useOpenCreateActivityDrawer() {
);
const [, setViewableActivityId] = useRecoilState(viewableActivityIdState);
return function openCreateActivityDrawer(
type: ActivityType,
entities?: ActivityTargetableEntity[],
) {
return function openCreateActivityDrawer({
type,
targetableEntities,
assigneeId,
}: {
type: ActivityType;
targetableEntities?: ActivityTargetableEntity[];
assigneeId?: string;
}) {
const now = new Date().toISOString();
return createActivityMutation({
@ -43,11 +48,13 @@ export function useOpenCreateActivityDrawer() {
createdAt: now,
updatedAt: now,
author: { connect: { id: currentUser?.id ?? '' } },
assignee: { connect: { id: currentUser?.id ?? '' } },
assignee: { connect: { id: assigneeId ?? currentUser?.id ?? '' } },
type: type,
activityTargets: {
createMany: {
data: entities ? getRelationData(entities) : [],
data: targetableEntities
? getRelationData(targetableEntities)
: [],
skipDuplicates: true,
},
},
@ -63,7 +70,7 @@ export function useOpenCreateActivityDrawer() {
onCompleted(data) {
setHotkeyScope(RightDrawerHotkeyScope.RightDrawer, { goto: false });
setViewableActivityId(data.createOneActivity.id);
setActivityTargetableEntityArray(entities ?? []);
setActivityTargetableEntityArray(targetableEntities ?? []);
openRightDrawer(RightDrawerPages.CreateActivity);
},
});