From 0aa48fb1e45fd852a220129ffe8501de12b682d7 Mon Sep 17 00:00:00 2001
From: Lucas Bordeau <bordeau.lucas@gmail.com>
Date: Fri, 20 Sep 2024 12:53:29 +0200
Subject: [PATCH] Fixed bug with record without activity target (#7175)

Fixed bug that was appearing with records without any activity target

The problem may come from the new TwentyORM that doesn't understand the
filter like before.
---
 .../src/modules/activities/hooks/useActivities.ts   | 13 ++++++-------
 1 file changed, 6 insertions(+), 7 deletions(-)

diff --git a/packages/twenty-front/src/modules/activities/hooks/useActivities.ts b/packages/twenty-front/src/modules/activities/hooks/useActivities.ts
index d63109339..b5311a800 100644
--- a/packages/twenty-front/src/modules/activities/hooks/useActivities.ts
+++ b/packages/twenty-front/src/modules/activities/hooks/useActivities.ts
@@ -51,13 +51,12 @@ export const useActivities = <T extends Task | Note>({
     ),
   ];
 
+  const skipBecauseNoActivityTargetFound = activityIds.length === 0;
+
   const filter: RecordGqlOperationFilter = {
-    id:
-      targetableObjects.length > 0
-        ? {
-            in: activityIds,
-          }
-        : undefined,
+    id: {
+      in: activityIds,
+    },
     ...activitiesFilters,
   };
 
@@ -69,7 +68,7 @@ export const useActivities = <T extends Task | Note>({
 
   const { records: activities, loading: loadingActivities } =
     useFindManyRecords<Task | Note>({
-      skip: skip || loadingActivityTargets,
+      skip: skip || loadingActivityTargets || skipBecauseNoActivityTargetFound,
       objectNameSingular:
         FIND_ACTIVITIES_OPERATION_SIGNATURE.objectNameSingular,
       recordGqlFields: FIND_ACTIVITIES_OPERATION_SIGNATURE.fields,