Fix Tasks and Activities - Part 1 (#2624)

Fixed

front/src/modules/activities/notes/hooks/useNotes.ts

@@ -1,21 +1,52 @@
 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';
 
 export const useNotes = (entity: ActivityTargetableEntity) => {
-  const { objects: notes } = useFindManyObjectRecords({
-    objectNamePlural: 'activities',
+  const { objects: activityTargets } = useFindManyObjectRecords({
+    objectNamePlural: 'activityTargets',
     filter: {
-      type: { equals: 'None' },
-      activityTargets: {
-        some: {
-          OR: [
-            { companyId: { equals: entity.id } },
-            { personId: { equals: entity.id } },
-          ],
-        },
-      },
+      [entity.type === 'Company' ? 'companyId' : 'personId']: { eq: entity.id },
+    },
+  });
+
+  const { objectMetadataItem: activityObjectMetadataItem } =
+    useObjectMetadataItem({
+      objectNameSingular: 'activity',
+    });
+
+  const { registerOptimisticEffect } = useOptimisticEffect({
+    objectNameSingular: activityObjectMetadataItem?.nameSingular,
+  });
+
+  const filter = {
+    id: {
+      in: activityTargets?.map((activityTarget) => activityTarget.activityId),
+    },
+    type: { eq: 'Note' },
+  };
+  const orderBy = {
+    createdAt: 'AscNullsFirst',
+  };
+
+  const { objects: notes } = useFindManyObjectRecords({
+    skip: !activityTargets?.length,
+    objectNamePlural: 'activities',
+    filter,
+    orderBy,
+    onCompleted: () => {
+      if (activityObjectMetadataItem) {
+        registerOptimisticEffect({
+          variables: { orderBy, filter },
+          definition: getRecordOptimisticEffectDefinition({
+            objectMetadataItem: activityObjectMetadataItem,
+          }),
+        });
+      }
     },
   });