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: handling the archived module ids in the issue list and issue detail endpoints (#5343)

guru_sainathf457048644f2
diff --git a/apiserver/plane/app/views/inbox/base.py b/apiserver/plane/app/views/inbox/base.py
index bda64f36ba..7a1d77d0ae 100644
--- a/apiserver/plane/app/views/inbox/base.py
+++ b/apiserver/plane/app/views/inbox/base.py
@@ -160,7 +160,8 @@ class InboxIssueViewSet(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),
),
Value([], output_field=ArrayField(UUIDField())),
),
diff --git a/apiserver/plane/app/views/issue/base.py b/apiserver/plane/app/views/issue/base.py
index e0ec019361..49c7b5b1e0 100644
--- a/apiserver/plane/app/views/issue/base.py
+++ b/apiserver/plane/app/views/issue/base.py
@@ -64,7 +64,6 @@ from plane.utils.user_timezone_converter import user_timezone_converter
class IssueListEndpoint(BaseAPIView):
-
permission_classes = [
ProjectEntityPermission,
]
@@ -438,7 +437,8 @@ 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),
),
Value([], output_field=ArrayField(UUIDField())),
),
@@ -626,7 +626,6 @@ class BulkDeleteIssuesEndpoint(BaseAPIView):
project_id=project_id,
is_active=True,
).exists():
-
return Response(
{"error": "Only admin can perform this action"},
status=status.HTTP_403_FORBIDDEN,
diff --git a/apiserver/plane/app/views/view/base.py b/apiserver/plane/app/views/view/base.py
index 297fe3f695..7a91309513 100644
--- a/apiserver/plane/app/views/view/base.py
+++ b/apiserver/plane/app/views/view/base.py
@@ -223,7 +223,8 @@ class WorkspaceViewIssuesViewSet(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),
),
Value([], output_field=ArrayField(UUIDField())),
),
diff --git a/apiserver/plane/utils/grouper.py b/apiserver/plane/utils/grouper.py
index a3ac2420e7..ba52bca03d 100644
--- a/apiserver/plane/utils/grouper.py
+++ b/apiserver/plane/utils/grouper.py
@@ -18,7 +18,6 @@ from plane.db.models import (
def issue_queryset_grouper(queryset, group_by, sub_group_by):
-
FIELD_MAPPER = {
"label_ids": "labels__id",
"assignee_ids": "assignees__id",
@@ -30,7 +29,10 @@ def issue_queryset_grouper(queryset, group_by, sub_group_by):
"label_ids": ("labels__id", ~Q(labels__id__isnull=True)),
"module_ids": (
"issue_module__module_id",
- ~Q(issue_module__module_id__isnull=True),
+ (
+ ~Q(issue_module__module_id__isnull=True)
+ & Q(issue_module__module__archived_at__isnull=True)
+ ),
),
}
default_annotations = {
@@ -51,7 +53,6 @@ def issue_queryset_grouper(queryset, group_by, sub_group_by):
def issue_on_results(issues, group_by, sub_group_by):
-
FIELD_MAPPER = {
"labels__id": "label_ids",
"assignees__id": "assignee_ids",