Add company relation for person table (#1612)

* - add company relation for person table

* - also for context menu

* - fix yarn.lock

* - fix newline missing

* - fixed tab

* fix

front/src/modules/activities/hooks/useOpenCreateActivityDrawerForSelectedRowIds.ts

@@ -15,12 +15,20 @@ export const useOpenCreateActivityDrawerForSelectedRowIds = () => {
 
   const openCreateActivityDrawer = useOpenCreateActivityDrawer();
 
-  return (type: ActivityType, entityType: ActivityTargetableEntityType) => {
+  return (
-    const activityTargetableEntityArray: ActivityTargetableEntity[] =
+    type: ActivityType,
+    entityType: ActivityTargetableEntityType,
+    relatedEntities?: ActivityTargetableEntity[],
+  ) => {
+    let activityTargetableEntityArray: ActivityTargetableEntity[] =
       selectedRowIds.map((id) => ({
         type: entityType,
         id,
       }));
+    if (relatedEntities) {
+      activityTargetableEntityArray =
+        activityTargetableEntityArray.concat(relatedEntities);
+    }
     openCreateActivityDrawer({
       type,
       targetableEntities: activityTargetableEntityArray,

front/src/modules/people/hooks/useCreateActivityForPeople.ts

@@ -0,0 +1,44 @@
+import { useRecoilCallback, useRecoilValue } from 'recoil';
+
+import { useOpenCreateActivityDrawerForSelectedRowIds } from '@/activities/hooks/useOpenCreateActivityDrawerForSelectedRowIds';
+import {
+  ActivityTargetableEntity,
+  ActivityTargetableEntityType,
+} from '@/activities/types/ActivityTargetableEntity';
+import { selectedRowIdsSelector } from '@/ui/table/states/selectors/selectedRowIdsSelector';
+import { tableEntitiesFamilyState } from '@/ui/table/states/tableEntitiesFamilyState';
+import { ActivityType, Person } from '~/generated/graphql';
+
+export const useCreateActivityForPeople = () => {
+  const openCreateActivityRightDrawer =
+    useOpenCreateActivityDrawerForSelectedRowIds();
+  const selectedRowIds = useRecoilValue(selectedRowIdsSelector);
+
+  return useRecoilCallback(
+    ({ snapshot }) =>
+      (type: ActivityType) => {
+        const relatedEntites: ActivityTargetableEntity[] = [];
+        for (const id of selectedRowIds) {
+          const person = snapshot
+            .getLoadable(tableEntitiesFamilyState(id))
+            .getValue() as Person;
+          if (
+            person?.company?.id &&
+            !relatedEntites.find((x) => x.id === person?.company?.id)
+          ) {
+            relatedEntites.push({
+              id: person.company.id,
+              type: ActivityTargetableEntityType.Company,
+            });
+          }
+        }
+
+        openCreateActivityRightDrawer(
+          type,
+          ActivityTargetableEntityType.Person,
+          relatedEntites,
+        );
+      },
+    [selectedRowIds, openCreateActivityRightDrawer],
+  );
+};

front/src/modules/people/hooks/usePeopleTableContextMenuEntries.tsx

@@ -1,8 +1,6 @@
 import { getOperationName } from '@apollo/client/utilities';
 import { useRecoilState, useRecoilValue, useSetRecoilState } from 'recoil';
 
-import { useOpenCreateActivityDrawerForSelectedRowIds } from '@/activities/hooks/useOpenCreateActivityDrawerForSelectedRowIds';
-import { ActivityTargetableEntityType } from '@/activities/types/ActivityTargetableEntity';
 import { contextMenuEntriesState } from '@/ui/context-menu/states/contextMenuEntriesState';
 import { IconCheckbox, IconNotes, IconTrash } from '@/ui/icon';
 import { useResetTableRowSelection } from '@/ui/table/hooks/useResetTableRowSelection';
@@ -12,15 +10,12 @@ import { ActivityType, useDeleteManyPersonMutation } from '~/generated/graphql';
 
 import { GET_PEOPLE } from '../graphql/queries/getPeople';
 
+import { useCreateActivityForPeople } from './useCreateActivityForPeople';
+
 export const usePersonTableContextMenuEntries = () => {
   const setContextMenuEntries = useSetRecoilState(contextMenuEntriesState);
 
-  const openCreateActivityRightDrawer =
+  const createActivityForPeople = useCreateActivityForPeople();
-    useOpenCreateActivityDrawerForSelectedRowIds();
-
-  const handleActivityClick = async (type: ActivityType) => {
-    openCreateActivityRightDrawer(type, ActivityTargetableEntityType.Person);
-  };
 
   const selectedRowIds = useRecoilValue(selectedRowIdsSelector);
   const [tableRowIds, setTableRowIds] = useRecoilState(tableRowIdsState);
@@ -60,12 +55,12 @@ export const usePersonTableContextMenuEntries = () => {
         {
           label: 'Note',
           Icon: IconNotes,
-          onClick: () => handleActivityClick(ActivityType.Note),
+          onClick: () => createActivityForPeople(ActivityType.Note),
         },
         {
           label: 'Task',
           Icon: IconCheckbox,
-          onClick: () => handleActivityClick(ActivityType.Task),
+          onClick: () => createActivityForPeople(ActivityType.Task),
         },
         {
           label: 'Delete',

front/src/modules/people/hooks/usePersonTableActionBarEntries.tsx

@@ -1,8 +1,6 @@
 import { getOperationName } from '@apollo/client/utilities';
 import { useRecoilState, useRecoilValue, useSetRecoilState } from 'recoil';
 
-import { useOpenCreateActivityDrawerForSelectedRowIds } from '@/activities/hooks/useOpenCreateActivityDrawerForSelectedRowIds';
-import { ActivityTargetableEntityType } from '@/activities/types/ActivityTargetableEntity';
 import { actionBarEntriesState } from '@/ui/action-bar/states/actionBarEntriesState';
 import { IconCheckbox, IconNotes, IconTrash } from '@/ui/icon';
 import { useResetTableRowSelection } from '@/ui/table/hooks/useResetTableRowSelection';
@@ -12,18 +10,13 @@ import { ActivityType, useDeleteManyPersonMutation } from '~/generated/graphql';
 
 import { GET_PEOPLE } from '../graphql/queries/getPeople';
 
+import { useCreateActivityForPeople } from './useCreateActivityForPeople';
+
 export const usePersonTableActionBarEntries = () => {
-  const setActionBarEntries = useSetRecoilState(actionBarEntriesState);
-
-  const openCreateActivityRightDrawer =
-    useOpenCreateActivityDrawerForSelectedRowIds();
-
-  const handleActivityClick = async (type: ActivityType) => {
-    openCreateActivityRightDrawer(type, ActivityTargetableEntityType.Person);
-  };
-
   const selectedRowIds = useRecoilValue(selectedRowIdsSelector);
   const [tableRowIds, setTableRowIds] = useRecoilState(tableRowIdsState);
+  const setActionBarEntries = useSetRecoilState(actionBarEntriesState);
+  const createActivityForPeople = useCreateActivityForPeople();
 
   const resetRowSelection = useResetTableRowSelection();
 
@@ -64,12 +57,12 @@ export const usePersonTableActionBarEntries = () => {
         {
           label: 'Note',
           Icon: IconNotes,
-          onClick: () => handleActivityClick(ActivityType.Note),
+          onClick: () => createActivityForPeople(ActivityType.Note),
         },
         {
           label: 'Task',
           Icon: IconCheckbox,
-          onClick: () => handleActivityClick(ActivityType.Task),
+          onClick: () => createActivityForPeople(ActivityType.Task),
         },
         {
           label: 'Delete',