[WEB-4192]fix: inactive member is hidden in created by #7435
This commit is contained in:
parent
3ab1f0de84
commit
d7d1545801
4 changed files with 8 additions and 2 deletions
|
|
@ -33,7 +33,7 @@ class WorkSpaceMemberViewSet(BaseViewSet):
|
|||
return self.filter_queryset(
|
||||
super()
|
||||
.get_queryset()
|
||||
.filter(workspace__slug=self.kwargs.get("slug"), is_active=True)
|
||||
.filter(workspace__slug=self.kwargs.get("slug"))
|
||||
.select_related("member", "member__avatar_asset")
|
||||
)
|
||||
|
||||
|
|
|
|||
|
|
@ -47,7 +47,9 @@ 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));
|
||||
const memberDetails = searchedMemberIds
|
||||
?.map((memberId) => getWorkspaceMemberDetails(memberId))
|
||||
.filter((member) => member?.is_active);
|
||||
|
||||
return (
|
||||
<>
|
||||
|
|
|
|||
|
|
@ -19,6 +19,7 @@ export interface IWorkspaceMembership {
|
|||
id: string;
|
||||
member: string;
|
||||
role: EUserPermissions;
|
||||
is_active?: boolean;
|
||||
}
|
||||
|
||||
export interface IWorkspaceMemberStore {
|
||||
|
|
@ -175,6 +176,7 @@ export class WorkspaceMemberStore implements IWorkspaceMemberStore {
|
|||
id: workspaceMember.id,
|
||||
role: workspaceMember.role,
|
||||
member: this.memberRoot?.memberMap?.[workspaceMember.member],
|
||||
is_active: workspaceMember.is_active,
|
||||
};
|
||||
return memberDetails;
|
||||
});
|
||||
|
|
@ -207,6 +209,7 @@ export class WorkspaceMemberStore implements IWorkspaceMemberStore {
|
|||
id: member.id,
|
||||
member: member.member.id,
|
||||
role: member.role,
|
||||
is_active: member.is_active,
|
||||
});
|
||||
});
|
||||
});
|
||||
|
|
|
|||
|
|
@ -83,6 +83,7 @@ export interface IWorkspaceMember {
|
|||
joining_date?: string;
|
||||
display_name?: string;
|
||||
last_login_medium?: string;
|
||||
is_active?: boolean;
|
||||
}
|
||||
|
||||
export interface IWorkspaceMemberMe {
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue