Skip to content

armgit / plane

Public Imported from GitHub
0

πŸ”₯πŸ”₯πŸ”₯ Open-source Jira, Linear, Monday, and ClickUp alternative. Plane is a modern project management platform to manage tasks, sprints, docs, and triage.

[WEB-4536] fix: remove inactive workspace members from lists and dropdowns (#7473)

Prateek Shourya18e4c60b42c9
diff --git a/apps/web/core/components/workspace/settings/members-list.tsx b/apps/web/core/components/workspace/settings/members-list.tsx
index 457e852926..9bce5ea0f1 100644
--- a/apps/web/core/components/workspace/settings/members-list.tsx
+++ b/apps/web/core/components/workspace/settings/members-list.tsx
@@ -47,9 +47,7 @@ export const WorkspaceMembersList: FC<{ searchQuery: string; isAdmin: boolean }>
// derived values
const searchedMemberIds = getSearchedWorkspaceMemberIds(searchQuery);
const searchedInvitationsIds = getSearchedWorkspaceInvitationIds(searchQuery);
- const memberDetails = searchedMemberIds
- ?.map((memberId) => getWorkspaceMemberDetails(memberId))
- .filter((member) => member?.is_active);
+ const memberDetails = searchedMemberIds?.map((memberId) => getWorkspaceMemberDetails(memberId));
return (
<>
diff --git a/apps/web/core/store/member/workspace-member.store.ts b/apps/web/core/store/member/workspace-member.store.ts
index d6276a322f..9ec2b479ce 100644
--- a/apps/web/core/store/member/workspace-member.store.ts
+++ b/apps/web/core/store/member/workspace-member.store.ts
@@ -120,7 +120,9 @@ export class WorkspaceMemberStore implements IWorkspaceMemberStore {
(m) => this.memberRoot?.memberMap?.[m.member]?.display_name?.toLowerCase(),
]);
//filter out bots
- const memberIds = members.filter((m) => !this.memberRoot?.memberMap?.[m.member]?.is_bot).map((m) => m.member);
+ const memberIds = members
+ .filter((m) => m.is_active && !this.memberRoot?.memberMap?.[m.member]?.is_bot)
+ .map((m) => m.member);
return memberIds;
});
@@ -251,8 +253,7 @@ export class WorkspaceMemberStore implements IWorkspaceMemberStore {
if (!memberDetails) throw new Error("Member not found");
await this.workspaceService.deleteWorkspaceMember(workspaceSlug, memberDetails?.id).then(() => {
runInAction(() => {
- delete this.memberRoot?.memberMap?.[userId];
- delete this.workspaceMemberMap?.[workspaceSlug]?.[userId];
+ set(this.workspaceMemberMap, [workspaceSlug, userId, "is_active"], false);
});
});
};