Merge pull request #1954 from ever-co/improve/filter-out-suspended-me…

…mbers-in-manage-assignees excluded the suspended members from manage assignees popup
ever-co · Dec 4, 2023 · 493f144 · 493f144
2 parents 5e9853e + 7180cb5
commit 493f144
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 4 deletions.
diff --git a/apps/mobile/app/components/Task/DetailsBlock/components/ManageAssignees.tsx b/apps/mobile/app/components/Task/DetailsBlock/components/ManageAssignees.tsx
@@ -42,15 +42,21 @@ const ManageAssignees: React.FC<IManageAssignees> = ({ memberList, task }) => {
 	const assignedToTaskMembers = useMemo(
 		() =>
 			memberList?.filter((member) =>
-				member.employee ? task?.members.map((item) => item.userId).includes(member.employee?.userId) : false
+				member.employee
+					? task?.members.map((item) => item.userId).includes(member.employee?.userId) &&
+					  member.employee?.isActive
+					: false
 			),
 		[memberList, task?.members]
 	);
 
 	const unassignedMembers = useMemo(
 		() =>
 			memberList?.filter((member) =>
-				member.employee ? !task?.members.map((item) => item.userId).includes(member.employee.userId) : false
+				member.employee
+					? !task?.members.map((item) => item.userId).includes(member.employee.userId) &&
+					  member.employee?.isActive
+					: false
 			),
 		[memberList, task?.members]
 	);

diff --git a/apps/web/components/pages/task/details-section/blocks/task-main-info.tsx b/apps/web/components/pages/task/details-section/blocks/task-main-info.tsx
@@ -1,3 +1,4 @@
+/* eslint-disable no-mixed-spaces-and-tabs */
 import { calculateRemainingDays, formatDateString } from '@app/helpers';
 import { useOrganizationTeams, useSyncRef, useTeamMemberCard, useTeamTasks } from '@app/hooks';
 import { ITeamTask, OT_Member } from '@app/interfaces';
@@ -217,15 +218,21 @@ const ManageMembersPopover = (memberList: OT_Member[], task: ITeamTask | null) =
 	const unassignedMembers = useMemo(
 		() =>
 			memberList.filter((member) =>
-				member.employee ? !task?.members.map((item) => item.userId).includes(member.employee.userId) : false
+				member.employee
+					? !task?.members.map((item) => item.userId).includes(member.employee.userId) &&
+					  member.employee?.isActive
+					: false
 			),
 		[memberList, task?.members]
 	);
 
 	const assignedTaskMembers = useMemo(
 		() =>
 			memberList.filter((member) =>
-				member.employee ? task?.members.map((item) => item.userId).includes(member.employee?.userId) : false
+				member.employee
+					? task?.members.map((item) => item.userId).includes(member.employee?.userId) &&
+					  member.employee?.isActive
+					: false
 			),
 		[memberList, task?.members]
 	);