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
2 changes: 1 addition & 1 deletion apps/api/plane/app/views/workspace/member.py
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ def get_queryset(self):
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")
)

Expand Down
4 changes: 3 additions & 1 deletion apps/web/core/components/workspace/settings/members-list.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -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 (
<>
Expand Down
3 changes: 3 additions & 0 deletions apps/web/core/store/member/workspace-member.store.ts
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@ export interface IWorkspaceMembership {
id: string;
member: string;
role: EUserPermissions;
is_active?: boolean;
}

export interface IWorkspaceMemberStore {
Expand Down Expand Up @@ -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;
});
Expand Down Expand Up @@ -207,6 +209,7 @@ export class WorkspaceMemberStore implements IWorkspaceMemberStore {
id: member.id,
member: member.member.id,
role: member.role,
is_active: member.is_active,
});
});
});
Expand Down
1 change: 1 addition & 0 deletions packages/types/src/workspace.ts
Original file line number Diff line number Diff line change
Expand Up @@ -83,6 +83,7 @@ export interface IWorkspaceMember {
joining_date?: string;
display_name?: string;
last_login_medium?: string;
is_active?: boolean;
}

export interface IWorkspaceMemberMe {
Expand Down