Refactor/finish activities optimistic (#4106)

* Finished optimistic effects

* Fixed tests

* Added unit test on useActivityConnectionUtils to prepare for refactor

* Fixed console.log

packages/twenty-front/src/modules/activities/hooks/useUpsertActivity.ts

@@ -1,16 +1,22 @@
-import { useApolloClient } from '@apollo/client';
+import { useLocation } from 'react-router-dom';
 import { useRecoilState, useRecoilValue, useSetRecoilState } from 'recoil';
 
+import { useActivityConnectionUtils } from '@/activities/hooks/useActivityConnectionUtils';
 import { useCreateActivityInDB } from '@/activities/hooks/useCreateActivityInDB';
+import { useInjectIntoActivitiesQueries } from '@/activities/hooks/useInjectIntoActivitiesQueries';
+import { useInjectIntoActivityTargetsQueries } from '@/activities/hooks/useInjectIntoActivityTargetsQueries';
+import { currentNotesQueryVariablesState } from '@/activities/notes/states/currentNotesQueryVariablesState';
 import { activityInDrawerState } from '@/activities/states/activityInDrawerState';
 import { isActivityInCreateModeState } from '@/activities/states/isActivityInCreateModeState';
 import { isUpsertingActivityInDBState } from '@/activities/states/isCreatingActivityInDBState';
+import { currentCompletedTaskQueryVariablesState } from '@/activities/tasks/states/currentCompletedTaskQueryVariablesState';
+import { currentIncompleteTaskQueryVariablesState } from '@/activities/tasks/states/currentIncompleteTaskQueryVariablesState';
 import { useInjectIntoTimelineActivitiesQueries } from '@/activities/timeline/hooks/useInjectIntoTimelineActivitiesQueries';
-import { timelineTargetableObjectState } from '@/activities/timeline/states/timelineTargetableObjectState';
+import { objectShowPageTargetableObjectState } from '@/activities/timeline/states/objectShowPageTargetableObjectState';
 import { Activity } from '@/activities/types/Activity';
-import { useActivityConnectionUtils } from '@/activities/utils/useActivityConnectionUtils';
 import { CoreObjectNameSingular } from '@/object-metadata/types/CoreObjectNameSingular';
 import { useUpdateOneRecord } from '@/object-record/hooks/useUpdateOneRecord';
+import { isDefined } from '~/utils/isDefined';
 
 // TODO: create a generic way to have records only in cache for create mode and delete them afterwards ?
 export const useUpsertActivity = () => {
@@ -30,16 +36,35 @@ export const useUpsertActivity = () => {
 
   const setActivityInDrawer = useSetRecoilState(activityInDrawerState);
 
-  const timelineTargetableObject = useRecoilValue(
-    timelineTargetableObjectState,
+  const objectShowPageTargetableObject = useRecoilValue(
+    objectShowPageTargetableObjectState,
   );
 
+  const { injectActivitiesQueries } = useInjectIntoActivitiesQueries();
+  const { injectActivityTargetsQueries } =
+    useInjectIntoActivityTargetsQueries();
+
+  const { pathname } = useLocation();
+
+  const weAreOnObjectShowPage = pathname.startsWith('/object');
+  const weAreOnTaskPage = pathname.startsWith('/tasks');
+
   const { injectIntoTimelineActivitiesQueries } =
     useInjectIntoTimelineActivitiesQueries();
 
   const { makeActivityWithConnection } = useActivityConnectionUtils();
 
-  const apolloClient = useApolloClient();
+  const currentCompletedTaskQueryVariables = useRecoilValue(
+    currentCompletedTaskQueryVariablesState,
+  );
+
+  const currentIncompleteTaskQueryVariables = useRecoilValue(
+    currentIncompleteTaskQueryVariablesState,
+  );
+
+  const currentNotesQueryVariables = useRecoilValue(
+    currentNotesQueryVariablesState,
+  );
 
   const upsertActivity = async ({
     activity,
@@ -59,21 +84,91 @@ export const useUpsertActivity = () => {
       const { activityWithConnection } =
         makeActivityWithConnection(activityToCreate);
 
+      if (weAreOnTaskPage) {
+        if (isDefined(activityWithConnection.completedAt)) {
+          injectActivitiesQueries({
+            activitiesFilters: currentCompletedTaskQueryVariables?.filter,
+            activitiesOrderByVariables:
+              currentCompletedTaskQueryVariables?.orderBy,
+            activityTargetsToInject: activityToCreate.activityTargets,
+            activityToInject: activityWithConnection,
+            targetableObjects: [],
+          });
+        } else {
+          injectActivitiesQueries({
+            activitiesFilters: currentIncompleteTaskQueryVariables?.filter,
+            activitiesOrderByVariables:
+              currentIncompleteTaskQueryVariables?.orderBy,
+            activityTargetsToInject: activityToCreate.activityTargets,
+            activityToInject: activityWithConnection,
+            targetableObjects: [],
+          });
+        }
+
+        injectActivityTargetsQueries({
+          activityTargetsToInject: activityToCreate.activityTargets,
+          targetableObjects: [],
+        });
+      }
+
       // Call optimistic effects
-      if (timelineTargetableObject) {
+      if (weAreOnObjectShowPage && objectShowPageTargetableObject) {
         injectIntoTimelineActivitiesQueries({
-          timelineTargetableObject: timelineTargetableObject,
+          timelineTargetableObject: objectShowPageTargetableObject,
           activityToInject: activityWithConnection,
           activityTargetsToInject: activityToCreate.activityTargets,
         });
+
+        const injectOnlyInIdFilterForTaskQueries =
+          activityWithConnection.type !== 'Task';
+
+        const injectOnlyInIdFilterForNotesQueries =
+          activityWithConnection.type !== 'Note';
+
+        if (isDefined(currentCompletedTaskQueryVariables)) {
+          injectActivitiesQueries({
+            activitiesFilters: currentCompletedTaskQueryVariables?.filter,
+            activitiesOrderByVariables:
+              currentCompletedTaskQueryVariables?.orderBy,
+            activityTargetsToInject: activityToCreate.activityTargets,
+            activityToInject: activityWithConnection,
+            targetableObjects: [objectShowPageTargetableObject],
+            injectOnlyInIdFilter: injectOnlyInIdFilterForTaskQueries,
+          });
+        }
+
+        if (isDefined(currentIncompleteTaskQueryVariables)) {
+          injectActivitiesQueries({
+            activitiesFilters:
+              currentIncompleteTaskQueryVariables?.filter ?? {},
+            activitiesOrderByVariables:
+              currentIncompleteTaskQueryVariables?.orderBy ?? {},
+            activityTargetsToInject: activityToCreate.activityTargets,
+            activityToInject: activityWithConnection,
+            targetableObjects: [objectShowPageTargetableObject],
+            injectOnlyInIdFilter: injectOnlyInIdFilterForTaskQueries,
+          });
+        }
+
+        if (isDefined(currentNotesQueryVariables)) {
+          injectActivitiesQueries({
+            activitiesFilters: currentNotesQueryVariables?.filter,
+            activitiesOrderByVariables: currentNotesQueryVariables?.orderBy,
+            activityTargetsToInject: activityToCreate.activityTargets,
+            activityToInject: activityWithConnection,
+            targetableObjects: [objectShowPageTargetableObject],
+            injectOnlyInIdFilter: injectOnlyInIdFilterForNotesQueries,
+          });
+        }
+
+        injectActivityTargetsQueries({
+          activityTargetsToInject: activityToCreate.activityTargets,
+          targetableObjects: [objectShowPageTargetableObject],
+        });
       }
 
       await createActivityInDB(activityToCreate);
 
-      await apolloClient.refetchQueries({
-        include: ['FindManyActivities', 'FindManyActivityTargets'],
-      });
-
       setActivityInDrawer(activityToCreate);
 
       setIsActivityInCreateMode(false);