Fix Infinite loop on invite route (#2866)

2023-12-07 19:26:07 +01:00
parent 5efc2f00b9
commit 6c83953633
5 changed files with 93 additions and 72 deletions
@@ -1,3 +1,4 @@
+import { useCallback } from 'react';
 import { isNonEmptyString } from '@sniptt/guards';
 import { useRecoilState, useRecoilValue } from 'recoil';

@@ -32,47 +33,55 @@ export const useOpenCreateActivityDrawer = () => {
  );
  const [, setViewableActivityId] = useRecoilState(viewableActivityIdState);

-  return async ({
-    type,
-    targetableEntities,
-    assigneeId,
-  }: {
-    type: ActivityType;
-    targetableEntities?: ActivityTargetableEntity[];
-    assigneeId?: string;
-  }) => {
-    const targetableEntitiesWithRelations = targetableEntities
-      ? getTargetableEntitiesWithParents(targetableEntities)
-      : [];
+  return useCallback(
+    async ({
+      type,
+      targetableEntities,
+      assigneeId,
+    }: {
+      type: ActivityType;
+      targetableEntities?: ActivityTargetableEntity[];
+      assigneeId?: string;
+    }) => {
+      const targetableEntitiesWithRelations = targetableEntities
+        ? getTargetableEntitiesWithParents(targetableEntities)
+        : [];

-    const createdActivity = await createOneActivity?.({
-      authorId: currentWorkspaceMember?.id,
-      assigneeId:
-        assigneeId ?? isNonEmptyString(currentWorkspaceMember?.id)
-          ? currentWorkspaceMember?.id
-          : undefined,
-      type: type,
-    });
+      const createdActivity = await createOneActivity?.({
+        authorId: currentWorkspaceMember?.id,
+        assigneeId:
+          assigneeId ?? isNonEmptyString(currentWorkspaceMember?.id)
+            ? currentWorkspaceMember?.id
+            : undefined,
+        type: type,
+      });

-    if (!createdActivity) {
-      return;
-    }
+      if (!createdActivity) {
+        return;
+      }

-    await Promise.all(
-      targetableEntitiesWithRelations.map(async (targetableEntity) => {
-        await createOneActivityTarget?.({
-          companyId:
-            targetableEntity.type === 'Company' ? targetableEntity.id : null,
-          personId:
-            targetableEntity.type === 'Person' ? targetableEntity.id : null,
-          activityId: createdActivity.id,
-        });
-      }),
-    );
+      await Promise.all(
+        targetableEntitiesWithRelations.map(async (targetableEntity) => {
+          await createOneActivityTarget?.({
+            companyId:
+              targetableEntity.type === 'Company' ? targetableEntity.id : null,
+            personId:
+              targetableEntity.type === 'Person' ? targetableEntity.id : null,
+            activityId: createdActivity.id,
+          });
+        }),
+      );

-    setHotkeyScope(RightDrawerHotkeyScope.RightDrawer, { goto: false });
-    setViewableActivityId(createdActivity.id);
-    setActivityTargetableEntityArray(targetableEntities ?? []);
-    openRightDrawer(RightDrawerPages.CreateActivity);
-  };
+      setHotkeyScope(RightDrawerHotkeyScope.RightDrawer, { goto: false });
+      setViewableActivityId(createdActivity.id);
+      setActivityTargetableEntityArray(targetableEntities ?? []);
+      openRightDrawer(RightDrawerPages.CreateActivity);
+    },
+    [
+      openRightDrawer,
+      setActivityTargetableEntityArray,
+      setHotkeyScope,
+      setViewableActivityId,
+    ],
+  );
 };