Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 1 addition & 3 deletions apps/web/core/components/workspace/settings/members-list.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -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 (
<>
Expand Down
7 changes: 4 additions & 3 deletions apps/web/core/store/member/workspace-member.store.ts
Original file line number Diff line number Diff line change
Expand Up @@ -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;
});

Expand Down Expand Up @@ -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);
});
});
};
Expand Down