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-4192]fix: inactive member is hidden in created by #7435

Vamsi Krishnad7d154580115
diff --git a/apps/api/plane/app/views/workspace/member.py b/apps/api/plane/app/views/workspace/member.py
index 7669425eca..7743ff4cd0 100644
--- a/apps/api/plane/app/views/workspace/member.py
+++ b/apps/api/plane/app/views/workspace/member.py
@@ -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")
)
diff --git a/apps/web/core/components/workspace/settings/members-list.tsx b/apps/web/core/components/workspace/settings/members-list.tsx
index 9bce5ea0f1..457e852926 100644
--- a/apps/web/core/components/workspace/settings/members-list.tsx
+++ b/apps/web/core/components/workspace/settings/members-list.tsx
@@ -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 (
<>
diff --git a/apps/web/core/store/member/workspace-member.store.ts b/apps/web/core/store/member/workspace-member.store.ts
index a4a5b1f1ce..d6276a322f 100644
--- a/apps/web/core/store/member/workspace-member.store.ts
+++ b/apps/web/core/store/member/workspace-member.store.ts
@@ -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,
});
});
});
diff --git a/packages/types/src/workspace.ts b/packages/types/src/workspace.ts
index 09b05c62e0..4b5c3df618 100644
--- a/packages/types/src/workspace.ts
+++ b/packages/types/src/workspace.ts
@@ -83,6 +83,7 @@ export interface IWorkspaceMember {
joining_date?: string;
display_name?: string;
last_login_medium?: string;
+ is_active?: boolean;
}
export interface IWorkspaceMemberMe {