[WEB-4536] fix: remove inactive workspace members from lists and dropdowns (#7473)
This commit is contained in:
parent
849b7b7bf3
commit
18e4c60b42
2 changed files with 5 additions and 6 deletions
|
|
@ -47,9 +47,7 @@ export const WorkspaceMembersList: FC<{ searchQuery: string; isAdmin: boolean }>
|
||||||
// derived values
|
// derived values
|
||||||
const searchedMemberIds = getSearchedWorkspaceMemberIds(searchQuery);
|
const searchedMemberIds = getSearchedWorkspaceMemberIds(searchQuery);
|
||||||
const searchedInvitationsIds = getSearchedWorkspaceInvitationIds(searchQuery);
|
const searchedInvitationsIds = getSearchedWorkspaceInvitationIds(searchQuery);
|
||||||
const memberDetails = searchedMemberIds
|
const memberDetails = searchedMemberIds?.map((memberId) => getWorkspaceMemberDetails(memberId));
|
||||||
?.map((memberId) => getWorkspaceMemberDetails(memberId))
|
|
||||||
.filter((member) => member?.is_active);
|
|
||||||
|
|
||||||
return (
|
return (
|
||||||
<>
|
<>
|
||||||
|
|
|
||||||
|
|
@ -120,7 +120,9 @@ export class WorkspaceMemberStore implements IWorkspaceMemberStore {
|
||||||
(m) => this.memberRoot?.memberMap?.[m.member]?.display_name?.toLowerCase(),
|
(m) => this.memberRoot?.memberMap?.[m.member]?.display_name?.toLowerCase(),
|
||||||
]);
|
]);
|
||||||
//filter out bots
|
//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;
|
return memberIds;
|
||||||
});
|
});
|
||||||
|
|
||||||
|
|
@ -251,8 +253,7 @@ export class WorkspaceMemberStore implements IWorkspaceMemberStore {
|
||||||
if (!memberDetails) throw new Error("Member not found");
|
if (!memberDetails) throw new Error("Member not found");
|
||||||
await this.workspaceService.deleteWorkspaceMember(workspaceSlug, memberDetails?.id).then(() => {
|
await this.workspaceService.deleteWorkspaceMember(workspaceSlug, memberDetails?.id).then(() => {
|
||||||
runInAction(() => {
|
runInAction(() => {
|
||||||
delete this.memberRoot?.memberMap?.[userId];
|
set(this.workspaceMemberMap, [workspaceSlug, userId, "is_active"], false);
|
||||||
delete this.workspaceMemberMap?.[workspaceSlug]?.[userId];
|
|
||||||
});
|
});
|
||||||
});
|
});
|
||||||
};
|
};
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue