π₯π₯π₯ Open-source Jira, Linear, Monday, and ClickUp alternative. Plane is a modern project management platform to manage tasks, sprints, docs, and triage.
TypeScript boardsbug-trackerdjangodockerganttissue-trackerjirajira-alternativekanbanlinearpostgresqlproduct-managementproject-managementproject-planningpythonreactredistypesciptvitework-management
[WEB-590] chore: project member active (#3820)
Bavisetti Narayanbd142989b4f0
diff --git a/apiserver/plane/api/views/cycle.py b/apiserver/plane/api/views/cycle.pyindex 6f66c373ec..84931f46be 100644--- a/apiserver/plane/api/views/cycle.py+++ b/apiserver/plane/api/views/cycle.py@@ -45,7 +45,10 @@ class CycleAPIEndpoint(WebhookMixin, BaseAPIView):return (Cycle.objects.filter(workspace__slug=self.kwargs.get("slug")).filter(project_id=self.kwargs.get("project_id"))- .filter(project__project_projectmember__member=self.request.user)+ .filter(+ project__project_projectmember__member=self.request.user,+ project__project_projectmember__is_active=True,+ ).select_related("project").select_related("workspace").select_related("owned_by")@@ -390,7 +393,10 @@ class CycleIssueAPIEndpoint(WebhookMixin, BaseAPIView):).filter(workspace__slug=self.kwargs.get("slug")).filter(project_id=self.kwargs.get("project_id"))- .filter(project__project_projectmember__member=self.request.user)+ .filter(+ project__project_projectmember__member=self.request.user,+ project__project_projectmember__is_active=True,+ ).filter(cycle_id=self.kwargs.get("cycle_id")).select_related("project").select_related("workspace")diff --git a/apiserver/plane/api/views/issue.py b/apiserver/plane/api/views/issue.pyindex 50269fe072..0905ae1f7d 100644--- a/apiserver/plane/api/views/issue.py+++ b/apiserver/plane/api/views/issue.py@@ -352,7 +352,10 @@ class LabelAPIEndpoint(BaseAPIView):return (Label.objects.filter(workspace__slug=self.kwargs.get("slug")).filter(project_id=self.kwargs.get("project_id"))- .filter(project__project_projectmember__member=self.request.user)+ .filter(+ project__project_projectmember__member=self.request.user,+ project__project_projectmember__is_active=True,+ ).select_related("project").select_related("workspace").select_related("parent")@@ -481,7 +484,10 @@ class IssueLinkAPIEndpoint(BaseAPIView):IssueLink.objects.filter(workspace__slug=self.kwargs.get("slug")).filter(project_id=self.kwargs.get("project_id")).filter(issue_id=self.kwargs.get("issue_id"))- .filter(project__project_projectmember__member=self.request.user)+ .filter(+ project__project_projectmember__member=self.request.user,+ project__project_projectmember__is_active=True,+ ).order_by(self.kwargs.get("order_by", "-created_at")).distinct())@@ -607,11 +613,11 @@ class IssueCommentAPIEndpoint(WebhookMixin, BaseAPIView):).filter(project_id=self.kwargs.get("project_id")).filter(issue_id=self.kwargs.get("issue_id"))- .filter(project__project_projectmember__member=self.request.user)- .select_related("project")- .select_related("workspace")- .select_related("issue")- .select_related("actor")+ .filter(+ project__project_projectmember__member=self.request.user,+ project__project_projectmember__is_active=True,+ )+ .select_related("workspace", "project", "issue", "actor").annotate(is_member=Exists(ProjectMember.objects.filter(@@ -784,6 +790,7 @@ class IssueActivityAPIEndpoint(BaseAPIView):.filter(~Q(field__in=["comment", "vote", "reaction", "draft"]),project__project_projectmember__member=self.request.user,+ project__project_projectmember__is_active=True,).select_related("actor", "workspace", "issue", "project")).order_by(request.GET.get("order_by", "created_at"))diff --git a/apiserver/plane/api/views/module.py b/apiserver/plane/api/views/module.pyindex d509a53c79..2e5bb85e2b 100644--- a/apiserver/plane/api/views/module.py+++ b/apiserver/plane/api/views/module.py@@ -273,7 +273,10 @@ class ModuleIssueAPIEndpoint(WebhookMixin, BaseAPIView):.filter(workspace__slug=self.kwargs.get("slug")).filter(project_id=self.kwargs.get("project_id")).filter(module_id=self.kwargs.get("module_id"))- .filter(project__project_projectmember__member=self.request.user)+ .filter(+ project__project_projectmember__member=self.request.user,+ project__project_projectmember__is_active=True,+ ).select_related("project").select_related("workspace").select_related("module")diff --git a/apiserver/plane/api/views/state.py b/apiserver/plane/api/views/state.pyindex dedc15ccdc..ec10f9babe 100644--- a/apiserver/plane/api/views/state.py+++ b/apiserver/plane/api/views/state.py@@ -24,7 +24,10 @@ class StateAPIEndpoint(BaseAPIView):return (State.objects.filter(workspace__slug=self.kwargs.get("slug")).filter(project_id=self.kwargs.get("project_id"))- .filter(project__project_projectmember__member=self.request.user)+ .filter(+ project__project_projectmember__member=self.request.user,+ project__project_projectmember__is_active=True,+ ).filter(~Q(name="Triage")).select_related("project").select_related("workspace")diff --git a/apiserver/plane/app/views/cycle.py b/apiserver/plane/app/views/cycle.pyindex 866396655f..85e1e9f2e8 100644--- a/apiserver/plane/app/views/cycle.py+++ b/apiserver/plane/app/views/cycle.py@@ -85,7 +85,10 @@ class CycleViewSet(WebhookMixin, BaseViewSet):.get_queryset().filter(workspace__slug=self.kwargs.get("slug")).filter(project_id=self.kwargs.get("project_id"))- .filter(project__project_projectmember__member=self.request.user)+ .filter(+ project__project_projectmember__member=self.request.user,+ project__project_projectmember__is_active=True,+ ).select_related("project", "workspace", "owned_by").prefetch_related(Prefetch(@@ -689,7 +692,10 @@ class CycleIssueViewSet(WebhookMixin, BaseViewSet):).filter(workspace__slug=self.kwargs.get("slug")).filter(project_id=self.kwargs.get("project_id"))- .filter(project__project_projectmember__member=self.request.user)+ .filter(+ project__project_projectmember__member=self.request.user,+ project__project_projectmember__is_active=True,+ ).filter(cycle_id=self.kwargs.get("cycle_id")).select_related("project").select_related("workspace")diff --git a/apiserver/plane/app/views/integration/slack.py b/apiserver/plane/app/views/integration/slack.pyindex 410e6b332c..c22ee3e52b 100644--- a/apiserver/plane/app/views/integration/slack.py+++ b/apiserver/plane/app/views/integration/slack.py@@ -36,7 +36,10 @@ class SlackProjectSyncViewSet(BaseViewSet):workspace__slug=self.kwargs.get("slug"),project_id=self.kwargs.get("project_id"),)- .filter(project__project_projectmember__member=self.request.user)+ .filter(+ project__project_projectmember__member=self.request.user,+ project__project_projectmember__is_active=True,+ ))def create(self, request, slug, project_id, workspace_integration_id):diff --git a/apiserver/plane/app/views/issue.py b/apiserver/plane/app/views/issue.pyindex 66cc3caf72..6d50a2aba2 100644--- a/apiserver/plane/app/views/issue.py+++ b/apiserver/plane/app/views/issue.py@@ -773,7 +773,10 @@ class WorkSpaceIssuesEndpoint(BaseAPIView):def get(self, request, slug):issues = (Issue.issue_objects.filter(workspace__slug=slug)- .filter(project__project_projectmember__member=self.request.user)+ .filter(+ project__project_projectmember__member=self.request.user,+ project__project_projectmember__is_active=True,+ ).order_by("-created_at"))serializer = IssueSerializer(issues, many=True)@@ -796,6 +799,7 @@ class IssueActivityEndpoint(BaseAPIView):.filter(~Q(field__in=["comment", "vote", "reaction", "draft"]),project__project_projectmember__member=self.request.user,+ project__project_projectmember__is_active=True,workspace__slug=slug,).filter(**filters)@@ -805,6 +809,7 @@ class IssueActivityEndpoint(BaseAPIView):IssueComment.objects.filter(issue_id=issue_id).filter(project__project_projectmember__member=self.request.user,+ project__project_projectmember__is_active=True,workspace__slug=slug,).filter(**filters)@@ -856,7 +861,10 @@ class IssueCommentViewSet(WebhookMixin, BaseViewSet):.filter(workspace__slug=self.kwargs.get("slug")).filter(project_id=self.kwargs.get("project_id")).filter(issue_id=self.kwargs.get("issue_id"))- .filter(project__project_projectmember__member=self.request.user)+ .filter(+ project__project_projectmember__member=self.request.user,+ project__project_projectmember__is_active=True,+ ).select_related("project").select_related("workspace").select_related("issue")@@ -1018,7 +1026,10 @@ class LabelViewSet(BaseViewSet):.get_queryset().filter(workspace__slug=self.kwargs.get("slug")).filter(project_id=self.kwargs.get("project_id"))- .filter(project__project_projectmember__member=self.request.user)+ .filter(+ project__project_projectmember__member=self.request.user,+ project__project_projectmember__is_active=True,+ ).select_related("project").select_related("workspace").select_related("parent")@@ -1231,7 +1242,10 @@ class IssueLinkViewSet(BaseViewSet):.filter(workspace__slug=self.kwargs.get("slug")).filter(project_id=self.kwargs.get("project_id")).filter(issue_id=self.kwargs.get("issue_id"))- .filter(project__project_projectmember__member=self.request.user)+ .filter(+ project__project_projectmember__member=self.request.user,+ project__project_projectmember__is_active=True,+ ).order_by("-created_at").distinct())@@ -1692,7 +1706,10 @@ class IssueSubscriberViewSet(BaseViewSet):.filter(workspace__slug=self.kwargs.get("slug")).filter(project_id=self.kwargs.get("project_id")).filter(issue_id=self.kwargs.get("issue_id"))- .filter(project__project_projectmember__member=self.request.user)+ .filter(+ project__project_projectmember__member=self.request.user,+ project__project_projectmember__is_active=True,+ ).order_by("-created_at").distinct())@@ -1776,7 +1793,10 @@ class IssueReactionViewSet(BaseViewSet):.filter(workspace__slug=self.kwargs.get("slug")).filter(project_id=self.kwargs.get("project_id")).filter(issue_id=self.kwargs.get("issue_id"))- .filter(project__project_projectmember__member=self.request.user)+ .filter(+ project__project_projectmember__member=self.request.user,+ project__project_projectmember__is_active=True,+ ).order_by("-created_at").distinct())@@ -1845,7 +1865,10 @@ class CommentReactionViewSet(BaseViewSet):.filter(workspace__slug=self.kwargs.get("slug")).filter(project_id=self.kwargs.get("project_id")).filter(comment_id=self.kwargs.get("comment_id"))- .filter(project__project_projectmember__member=self.request.user)+ .filter(+ project__project_projectmember__member=self.request.user,+ project__project_projectmember__is_active=True,+ ).order_by("-created_at").distinct())@@ -1915,7 +1938,10 @@ class IssueRelationViewSet(BaseViewSet):.filter(workspace__slug=self.kwargs.get("slug")).filter(project_id=self.kwargs.get("project_id")).filter(issue_id=self.kwargs.get("issue_id"))- .filter(project__project_projectmember__member=self.request.user)+ .filter(+ project__project_projectmember__member=self.request.user,+ project__project_projectmember__is_active=True,+ ).select_related("project").select_related("workspace").select_related("issue")diff --git a/apiserver/plane/app/views/module.py b/apiserver/plane/app/views/module.pyindex 5ac244dda3..3b52db64f9 100644--- a/apiserver/plane/app/views/module.py+++ b/apiserver/plane/app/views/module.py@@ -673,7 +673,10 @@ class ModuleLinkViewSet(BaseViewSet):.filter(workspace__slug=self.kwargs.get("slug")).filter(project_id=self.kwargs.get("project_id")).filter(module_id=self.kwargs.get("module_id"))- .filter(project__project_projectmember__member=self.request.user)+ .filter(+ project__project_projectmember__member=self.request.user,+ project__project_projectmember__is_active=True,+ ).order_by("-created_at").distinct())diff --git a/apiserver/plane/app/views/page.py b/apiserver/plane/app/views/page.pyindex 1d8ff1fbb1..7ecf22fa84 100644--- a/apiserver/plane/app/views/page.py+++ b/apiserver/plane/app/views/page.py@@ -60,7 +60,10 @@ class PageViewSet(BaseViewSet):.get_queryset().filter(workspace__slug=self.kwargs.get("slug")).filter(project_id=self.kwargs.get("project_id"))- .filter(project__project_projectmember__member=self.request.user)+ .filter(+ project__project_projectmember__member=self.request.user,+ project__project_projectmember__is_active=True,+ ).filter(parent__isnull=True).filter(Q(owned_by=self.request.user) | Q(access=0)).select_related("project")diff --git a/apiserver/plane/app/views/search.py b/apiserver/plane/app/views/search.pyindex ccef3d18f1..a2ed1c015a 100644--- a/apiserver/plane/app/views/search.py+++ b/apiserver/plane/app/views/search.py@@ -48,8 +48,8 @@ class GlobalSearchEndpoint(BaseAPIView):return (Project.objects.filter(q,- Q(project_projectmember__member=self.request.user)- | Q(network=2),+ project_projectmember__member=self.request.user,+ project_projectmember__is_active=True,workspace__slug=slug,).distinct()@@ -71,6 +71,7 @@ class GlobalSearchEndpoint(BaseAPIView):issues = Issue.issue_objects.filter(q,project__project_projectmember__member=self.request.user,+ project__project_projectmember__is_active=True,workspace__slug=slug,)@@ -95,6 +96,7 @@ class GlobalSearchEndpoint(BaseAPIView):cycles = Cycle.objects.filter(q,project__project_projectmember__member=self.request.user,+ project__project_projectmember__is_active=True,workspace__slug=slug,)@@ -118,6 +120,7 @@ class GlobalSearchEndpoint(BaseAPIView):modules = Module.objects.filter(q,project__project_projectmember__member=self.request.user,+ project__project_projectmember__is_active=True,workspace__slug=slug,)@@ -141,6 +144,7 @@ class GlobalSearchEndpoint(BaseAPIView):pages = Page.objects.filter(q,project__project_projectmember__member=self.request.user,+ project__project_projectmember__is_active=True,workspace__slug=slug,)@@ -164,6 +168,7 @@ class GlobalSearchEndpoint(BaseAPIView):issue_views = IssueView.objects.filter(q,project__project_projectmember__member=self.request.user,+ project__project_projectmember__is_active=True,workspace__slug=slug,)@@ -236,6 +241,7 @@ class IssueSearchEndpoint(BaseAPIView):issues = Issue.issue_objects.filter(workspace__slug=slug,project__project_projectmember__member=self.request.user,+ project__project_projectmember__is_active=True,)if workspace_search == "false":diff --git a/apiserver/plane/app/views/state.py b/apiserver/plane/app/views/state.pyindex 242061e187..34b3d1dcc0 100644--- a/apiserver/plane/app/views/state.py+++ b/apiserver/plane/app/views/state.py@@ -31,7 +31,10 @@ class StateViewSet(BaseViewSet):.get_queryset().filter(workspace__slug=self.kwargs.get("slug")).filter(project_id=self.kwargs.get("project_id"))- .filter(project__project_projectmember__member=self.request.user)+ .filter(+ project__project_projectmember__member=self.request.user,+ project__project_projectmember__is_active=True,+ ).filter(~Q(name="Triage")).select_related("project").select_related("workspace")diff --git a/apiserver/plane/app/views/view.py b/apiserver/plane/app/views/view.pyindex 97a0f036f6..ade445fae8 100644--- a/apiserver/plane/app/views/view.py+++ b/apiserver/plane/app/views/view.py@@ -86,6 +86,10 @@ class GlobalViewIssuesViewSet(BaseViewSet):.values("count")).filter(workspace__slug=self.kwargs.get("slug"))+ .filter(+ project__project_projectmember__member=self.request.user,+ project__project_projectmember__is_active=True,+ ).select_related("workspace", "project", "state", "parent").prefetch_related("assignees", "labels", "issue_module__module").annotate(cycle_id=F("issue_cycle__cycle_id"))@@ -163,7 +167,6 @@ class GlobalViewIssuesViewSet(BaseViewSet):issue_queryset = (self.get_queryset().filter(**filters)- .filter(project__project_projectmember__member=self.request.user).annotate(cycle_id=F("issue_cycle__cycle_id")))@@ -284,7 +287,10 @@ class IssueViewViewSet(BaseViewSet):.get_queryset().filter(workspace__slug=self.kwargs.get("slug")).filter(project_id=self.kwargs.get("project_id"))- .filter(project__project_projectmember__member=self.request.user)+ .filter(+ project__project_projectmember__member=self.request.user,+ project__project_projectmember__is_active=True,+ ).select_related("project").select_related("workspace").annotate(is_favorite=Exists(subquery))diff --git a/apiserver/plane/app/views/workspace.py b/apiserver/plane/app/views/workspace.pyindex 6677b4c4bd..47de86a1c1 100644--- a/apiserver/plane/app/views/workspace.py+++ b/apiserver/plane/app/views/workspace.py@@ -1086,6 +1086,7 @@ class WorkspaceUserProfileStatsEndpoint(BaseAPIView):workspace__slug=slug,assignees__in=[user_id],project__project_projectmember__member=request.user,+ project__project_projectmember__is_active=True).filter(**filters).annotate(state_group=F("state__group"))@@ -1101,6 +1102,7 @@ class WorkspaceUserProfileStatsEndpoint(BaseAPIView):workspace__slug=slug,assignees__in=[user_id],project__project_projectmember__member=request.user,+ project__project_projectmember__is_active=True).filter(**filters).values("priority")@@ -1123,6 +1125,7 @@ class WorkspaceUserProfileStatsEndpoint(BaseAPIView):Issue.issue_objects.filter(workspace__slug=slug,project__project_projectmember__member=request.user,+ project__project_projectmember__is_active=True,created_by_id=user_id,).filter(**filters)@@ -1134,6 +1137,7 @@ class WorkspaceUserProfileStatsEndpoint(BaseAPIView):workspace__slug=slug,assignees__in=[user_id],project__project_projectmember__member=request.user,+ project__project_projectmember__is_active=True,).filter(**filters).count()@@ -1145,6 +1149,7 @@ class WorkspaceUserProfileStatsEndpoint(BaseAPIView):workspace__slug=slug,assignees__in=[user_id],project__project_projectmember__member=request.user,+ project__project_projectmember__is_active=True,).filter(**filters).count()@@ -1156,6 +1161,7 @@ class WorkspaceUserProfileStatsEndpoint(BaseAPIView):assignees__in=[user_id],state__group="completed",project__project_projectmember__member=request.user,+ project__project_projectmember__is_active=True).filter(**filters).count()@@ -1166,6 +1172,7 @@ class WorkspaceUserProfileStatsEndpoint(BaseAPIView):workspace__slug=slug,subscriber_id=user_id,project__project_projectmember__member=request.user,+ project__project_projectmember__is_active=True).filter(**filters).count()@@ -1215,6 +1222,7 @@ class WorkspaceUserActivityEndpoint(BaseAPIView):~Q(field__in=["comment", "vote", "reaction", "draft"]),workspace__slug=slug,project__project_projectmember__member=request.user,+ project__project_projectmember__is_active=True,actor=user_id,).select_related("actor", "workspace", "issue", "project")@@ -1355,6 +1363,7 @@ class WorkspaceUserProfileIssuesEndpoint(BaseAPIView):| Q(issue_subscribers__subscriber_id=user_id),workspace__slug=slug,project__project_projectmember__member=request.user,+ project__project_projectmember__is_active=True).filter(**filters).select_related("workspace", "project", "state", "parent")@@ -1486,6 +1495,7 @@ class WorkspaceLabelsEndpoint(BaseAPIView):labels = Label.objects.filter(workspace__slug=slug,project__project_projectmember__member=request.user,+ project__project_projectmember__is_active=True)serializer = LabelSerializer(labels, many=True).datareturn Response(serializer, status=status.HTTP_200_OK)@@ -1500,6 +1510,7 @@ class WorkspaceStatesEndpoint(BaseAPIView):states = State.objects.filter(workspace__slug=slug,project__project_projectmember__member=request.user,+ project__project_projectmember__is_active=True)serializer = StateSerializer(states, many=True).datareturn Response(serializer, status=status.HTTP_200_OK)diff --git a/apiserver/plane/bgtasks/export_task.py b/apiserver/plane/bgtasks/export_task.pyindex b99e4b1d94..d8522e7697 100644--- a/apiserver/plane/bgtasks/export_task.py+++ b/apiserver/plane/bgtasks/export_task.py@@ -292,6 +292,7 @@ def issue_export_task(workspace__id=workspace_id,project_id__in=project_ids,project__project_projectmember__member=exporter_instance.initiated_by_id,+ project__project_projectmember__is_active=True).select_related("project", "workspace", "state", "parent", "created_by"