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.

chore: filtered the deleted labels and modules (#5860)

Bavisetti Narayan07402efd7929
diff --git a/apiserver/plane/app/views/dashboard/base.py b/apiserver/plane/app/views/dashboard/base.py
index 19ff8dfb47..1cb446abb1 100644
--- a/apiserver/plane/app/views/dashboard/base.py
+++ b/apiserver/plane/app/views/dashboard/base.py
@@ -218,7 +218,10 @@ def dashboard_assigned_issues(self, request, slug):
ArrayAgg(
"labels__id",
distinct=True,
- filter=~Q(labels__id__isnull=True),
+ filter=(
+ ~Q(labels__id__isnull=True)
+ & Q(labels__deleted_at__isnull=True)
+ ),
),
Value([], output_field=ArrayField(UUIDField())),
),
@@ -235,7 +238,9 @@ def dashboard_assigned_issues(self, request, slug):
ArrayAgg(
"issue_module__module_id",
distinct=True,
- filter=~Q(issue_module__module_id__isnull=True),
+ filter=~Q(issue_module__module_id__isnull=True)
+ & Q(issue_module__module__archived_at__isnull=True)
+ & Q(issue_module__module__deleted_at__isnull=True),
),
Value([], output_field=ArrayField(UUIDField())),
),
@@ -382,7 +387,10 @@ def dashboard_created_issues(self, request, slug):
ArrayAgg(
"labels__id",
distinct=True,
- filter=~Q(labels__id__isnull=True),
+ filter=(
+ ~Q(labels__id__isnull=True)
+ & Q(labels__deleted_at__isnull=True)
+ ),
),
Value([], output_field=ArrayField(UUIDField())),
),
@@ -399,7 +407,9 @@ def dashboard_created_issues(self, request, slug):
ArrayAgg(
"issue_module__module_id",
distinct=True,
- filter=~Q(issue_module__module_id__isnull=True),
+ filter=~Q(issue_module__module_id__isnull=True)
+ & Q(issue_module__module__archived_at__isnull=True)
+ & Q(issue_module__module__deleted_at__isnull=True),
),
Value([], output_field=ArrayField(UUIDField())),
),
diff --git a/apiserver/plane/app/views/inbox/base.py b/apiserver/plane/app/views/inbox/base.py
index 81e8ad2f9d..ac4da95370 100644
--- a/apiserver/plane/app/views/inbox/base.py
+++ b/apiserver/plane/app/views/inbox/base.py
@@ -141,7 +141,10 @@ class InboxIssueViewSet(BaseViewSet):
ArrayAgg(
"labels__id",
distinct=True,
- filter=~Q(labels__id__isnull=True),
+ filter=(
+ ~Q(labels__id__isnull=True)
+ & Q(labels__deleted_at__isnull=True)
+ ),
),
Value([], output_field=ArrayField(UUIDField())),
),
@@ -159,7 +162,8 @@ class InboxIssueViewSet(BaseViewSet):
"issue_module__module_id",
distinct=True,
filter=~Q(issue_module__module_id__isnull=True)
- & Q(issue_module__module__archived_at__isnull=True),
+ & Q(issue_module__module__archived_at__isnull=True)
+ & Q(issue_module__module__deleted_at__isnull=True),
),
Value([], output_field=ArrayField(UUIDField())),
),
@@ -186,7 +190,8 @@ class InboxIssueViewSet(BaseViewSet):
ArrayAgg(
"issue__labels__id",
distinct=True,
- filter=~Q(issue__labels__id__isnull=True),
+ filter=~Q(issue__labels__id__isnull=True)
+ & Q(issue__labels__deleted_at__isnull=True),
),
Value([], output_field=ArrayField(UUIDField())),
)
@@ -298,7 +303,10 @@ class InboxIssueViewSet(BaseViewSet):
ArrayAgg(
"issue__labels__id",
distinct=True,
- filter=~Q(issue__labels__id__isnull=True),
+ filter=(
+ ~Q(labels__id__isnull=True)
+ & Q(labels__deleted_at__isnull=True)
+ ),
),
Value([], output_field=ArrayField(UUIDField())),
),
@@ -306,7 +314,8 @@ class InboxIssueViewSet(BaseViewSet):
ArrayAgg(
"issue__assignees__id",
distinct=True,
- filter=~Q(issue__assignees__id__isnull=True),
+ filter=~Q(assignees__id__isnull=True)
+ & Q(assignees__member_project__is_active=True),
),
Value([], output_field=ArrayField(UUIDField())),
),
diff --git a/apiserver/plane/app/views/issue/base.py b/apiserver/plane/app/views/issue/base.py
index 1703813672..a1cca7f431 100644
--- a/apiserver/plane/app/views/issue/base.py
+++ b/apiserver/plane/app/views/issue/base.py
@@ -471,7 +471,10 @@ class IssueViewSet(BaseViewSet):
ArrayAgg(
"labels__id",
distinct=True,
- filter=~Q(labels__id__isnull=True),
+ filter=(
+ ~Q(labels__id__isnull=True)
+ & Q(labels__deleted_at__isnull=True)
+ ),
),
Value([], output_field=ArrayField(UUIDField())),
),
@@ -489,7 +492,8 @@ class IssueViewSet(BaseViewSet):
"issue_module__module_id",
distinct=True,
filter=~Q(issue_module__module_id__isnull=True)
- & Q(issue_module__module__archived_at__isnull=True),
+ & Q(issue_module__module__archived_at__isnull=True)
+ & Q(issue_module__module__deleted_at__isnull=True),
),
Value([], output_field=ArrayField(UUIDField())),
),
@@ -568,7 +572,10 @@ class IssueViewSet(BaseViewSet):
ArrayAgg(
"labels__id",
distinct=True,
- filter=~Q(labels__id__isnull=True),
+ filter=(
+ ~Q(labels__id__isnull=True)
+ & Q(labels__deleted_at__isnull=True)
+ ),
),
Value([], output_field=ArrayField(UUIDField())),
),
@@ -585,7 +592,9 @@ class IssueViewSet(BaseViewSet):
ArrayAgg(
"issue_module__module_id",
distinct=True,
- filter=~Q(issue_module__module_id__isnull=True),
+ filter=~Q(issue_module__module_id__isnull=True)
+ & Q(issue_module__module__archived_at__isnull=True)
+ & Q(issue_module__module__deleted_at__isnull=True),
),
Value([], output_field=ArrayField(UUIDField())),
),
@@ -855,7 +864,10 @@ class IssuePaginatedViewSet(BaseViewSet):
ArrayAgg(
"labels__id",
distinct=True,
- filter=~Q(labels__id__isnull=True),
+ filter=(
+ ~Q(labels__id__isnull=True)
+ & Q(labels__deleted_at__isnull=True)
+ ),
),
Value([], output_field=ArrayField(UUIDField())),
),
@@ -873,7 +885,8 @@ class IssuePaginatedViewSet(BaseViewSet):
"issue_module__module_id",
distinct=True,
filter=~Q(issue_module__module_id__isnull=True)
- & Q(issue_module__module__archived_at__isnull=True),
+ & Q(issue_module__module__archived_at__isnull=True)
+ & Q(issue_module__module__deleted_at__isnull=True),
),
Value([], output_field=ArrayField(UUIDField())),
),
diff --git a/apiserver/plane/app/views/issue/relation.py b/apiserver/plane/app/views/issue/relation.py
index f3cd418ec3..4bf622f28a 100644
--- a/apiserver/plane/app/views/issue/relation.py
+++ b/apiserver/plane/app/views/issue/relation.py
@@ -112,7 +112,10 @@ class IssueRelationViewSet(BaseViewSet):
ArrayAgg(
"labels__id",
distinct=True,
- filter=~Q(labels__id__isnull=True),
+ filter=(
+ ~Q(labels__id__isnull=True)
+ & Q(labels__deleted_at__isnull=True)
+ ),
),
Value([], output_field=ArrayField(UUIDField())),
),
diff --git a/apiserver/plane/app/views/issue/sub_issue.py b/apiserver/plane/app/views/issue/sub_issue.py
index 19a3db1513..cf9c0f709c 100644
--- a/apiserver/plane/app/views/issue/sub_issue.py
+++ b/apiserver/plane/app/views/issue/sub_issue.py
@@ -77,7 +77,10 @@ class SubIssuesEndpoint(BaseAPIView):
ArrayAgg(
"labels__id",
distinct=True,
- filter=~Q(labels__id__isnull=True),
+ filter=(
+ ~Q(labels__id__isnull=True)
+ & Q(labels__deleted_at__isnull=True)
+ ),
),
Value([], output_field=ArrayField(UUIDField())),
),
@@ -94,7 +97,9 @@ class SubIssuesEndpoint(BaseAPIView):
ArrayAgg(
"issue_module__module_id",
distinct=True,
- filter=~Q(issue_module__module_id__isnull=True),
+ filter=~Q(issue_module__module_id__isnull=True)
+ & Q(issue_module__module__archived_at__isnull=True)
+ & Q(issue_module__module__deleted_at__isnull=True),
),
Value([], output_field=ArrayField(UUIDField())),
),
diff --git a/apiserver/plane/app/views/view/base.py b/apiserver/plane/app/views/view/base.py
index 2579eb1da7..56f03cda65 100644
--- a/apiserver/plane/app/views/view/base.py
+++ b/apiserver/plane/app/views/view/base.py
@@ -234,7 +234,10 @@ class WorkspaceViewIssuesViewSet(BaseViewSet):
ArrayAgg(
"labels__id",
distinct=True,
- filter=~Q(labels__id__isnull=True),
+ filter=(
+ ~Q(labels__id__isnull=True)
+ & Q(labels__deleted_at__isnull=True)
+ ),
),
Value([], output_field=ArrayField(UUIDField())),
),
@@ -252,7 +255,8 @@ class WorkspaceViewIssuesViewSet(BaseViewSet):
"issue_module__module_id",
distinct=True,
filter=~Q(issue_module__module_id__isnull=True)
- & Q(issue_module__module__archived_at__isnull=True),
+ & Q(issue_module__module__archived_at__isnull=True)
+ & Q(issue_module__module__deleted_at__isnull=True),
),
Value([], output_field=ArrayField(UUIDField())),
),
diff --git a/apiserver/plane/app/views/workspace/draft.py b/apiserver/plane/app/views/workspace/draft.py
index e54dde553b..ee899be682 100644
--- a/apiserver/plane/app/views/workspace/draft.py
+++ b/apiserver/plane/app/views/workspace/draft.py
@@ -60,7 +60,10 @@ class WorkspaceDraftIssueViewSet(BaseViewSet):
ArrayAgg(
"labels__id",
distinct=True,
- filter=~Q(labels__id__isnull=True),
+ filter=(
+ ~Q(labels__id__isnull=True)
+ & Q(labels__deleted_at__isnull=True)
+ ),
),
Value([], output_field=ArrayField(UUIDField())),
),
@@ -78,9 +81,8 @@ class WorkspaceDraftIssueViewSet(BaseViewSet):
"draft_issue_module__module_id",
distinct=True,
filter=~Q(draft_issue_module__module_id__isnull=True)
- & Q(
- draft_issue_module__module__archived_at__isnull=True
- ),
+ & Q(draft_issue_module__module__archived_at__isnull=True)
+ & Q(draft_issue_module__module__deleted_at__isnull=True),
),
Value([], output_field=ArrayField(UUIDField())),
),
diff --git a/apiserver/plane/space/views/issue.py b/apiserver/plane/space/views/issue.py
index 1c1fe7d638..d79940e1c9 100644
--- a/apiserver/plane/space/views/issue.py
+++ b/apiserver/plane/space/views/issue.py
@@ -701,7 +701,10 @@ class IssueRetrievePublicEndpoint(BaseAPIView):
ArrayAgg(
"labels__id",
distinct=True,
- filter=~Q(labels__id__isnull=True),
+ filter=(
+ ~Q(labels__id__isnull=True)
+ & Q(labels__deleted_at__isnull=True)
+ ),
),
Value([], output_field=ArrayField(UUIDField())),
),
@@ -718,7 +721,9 @@ class IssueRetrievePublicEndpoint(BaseAPIView):
ArrayAgg(
"issue_module__module_id",
distinct=True,
- filter=~Q(issue_module__module_id__isnull=True),
+ filter=~Q(issue_module__module_id__isnull=True)
+ & Q(issue_module__module__archived_at__isnull=True)
+ & Q(issue_module__module__deleted_at__isnull=True),
),
Value([], output_field=ArrayField(UUIDField())),
),
diff --git a/apiserver/plane/utils/grouper.py b/apiserver/plane/utils/grouper.py
index ba52bca03d..fef47e0b08 100644
--- a/apiserver/plane/utils/grouper.py
+++ b/apiserver/plane/utils/grouper.py
@@ -26,12 +26,16 @@ def issue_queryset_grouper(queryset, group_by, sub_group_by):
annotations_map = {
"assignee_ids": ("assignees__id", ~Q(assignees__id__isnull=True)),
- "label_ids": ("labels__id", ~Q(labels__id__isnull=True)),
+ "label_ids": (
+ "labels__id",
+ ~Q(labels__id__isnull=True) & (Q(labels__deleted_at__isnull=True)),
+ ),
"module_ids": (
"issue_module__module_id",
(
~Q(issue_module__module_id__isnull=True)
& Q(issue_module__module__archived_at__isnull=True)
+ & Q(issue_module__module__deleted_at__isnull=True)
),
),
}