binarybeach/bb-plane-fork
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

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

Browse source
This commit is contained in:
Bavisetti Narayan 2024-10-18 13:20:32 +05:30 • committed by GitHub
parent 46302f41bc
commit 07402efd79
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
9 changed files with 82 additions and 27 deletions
Download patch file Download diff file Expand all files Collapse all files

18
apiserver/plane/app/views/dashboard/base.py
View file

@ -218,7 +218,10 @@ def dashboard_assigned_issues(self, request, slug):
ArrayAgg( ArrayAgg(
"labels__id", "labels__id",
distinct=True, 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())), Value([], output_field=ArrayField(UUIDField())),
), ),
@ -235,7 +238,9 @@ def dashboard_assigned_issues(self, request, slug):
ArrayAgg( ArrayAgg(
"issue_module__module_id", "issue_module__module_id",
distinct=True, 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())), Value([], output_field=ArrayField(UUIDField())),
), ),
@ -382,7 +387,10 @@ def dashboard_created_issues(self, request, slug):
ArrayAgg( ArrayAgg(
"labels__id", "labels__id",
distinct=True, 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())), Value([], output_field=ArrayField(UUIDField())),
), ),
@ -399,7 +407,9 @@ def dashboard_created_issues(self, request, slug):
ArrayAgg( ArrayAgg(
"issue_module__module_id", "issue_module__module_id",
distinct=True, 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())), Value([], output_field=ArrayField(UUIDField())),
), ),

19
apiserver/plane/app/views/inbox/base.py
View file

@ -141,7 +141,10 @@ class InboxIssueViewSet(BaseViewSet):
ArrayAgg( ArrayAgg(
"labels__id", "labels__id",
distinct=True, 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())), Value([], output_field=ArrayField(UUIDField())),
), ),
@ -159,7 +162,8 @@ class InboxIssueViewSet(BaseViewSet):
"issue_module__module_id", "issue_module__module_id",
distinct=True, 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__archived_at__isnull=True)
& Q(issue_module__module__deleted_at__isnull=True),
), ),
Value([], output_field=ArrayField(UUIDField())), Value([], output_field=ArrayField(UUIDField())),
), ),
@ -186,7 +190,8 @@ class InboxIssueViewSet(BaseViewSet):
ArrayAgg( ArrayAgg(
"issue__labels__id", "issue__labels__id",
distinct=True, 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())), Value([], output_field=ArrayField(UUIDField())),
) )
@ -298,7 +303,10 @@ class InboxIssueViewSet(BaseViewSet):
ArrayAgg( ArrayAgg(
"issue__labels__id", "issue__labels__id",
distinct=True, 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())), Value([], output_field=ArrayField(UUIDField())),
), ),
@ -306,7 +314,8 @@ class InboxIssueViewSet(BaseViewSet):
ArrayAgg( ArrayAgg(
"issue__assignees__id", "issue__assignees__id",
distinct=True, 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())), Value([], output_field=ArrayField(UUIDField())),
), ),

25
apiserver/plane/app/views/issue/base.py
View file

@ -471,7 +471,10 @@ class IssueViewSet(BaseViewSet):
ArrayAgg( ArrayAgg(
"labels__id", "labels__id",
distinct=True, 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())), Value([], output_field=ArrayField(UUIDField())),
), ),
@ -489,7 +492,8 @@ class IssueViewSet(BaseViewSet):
"issue_module__module_id", "issue_module__module_id",
distinct=True, 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__archived_at__isnull=True)
& Q(issue_module__module__deleted_at__isnull=True),
), ),
Value([], output_field=ArrayField(UUIDField())), Value([], output_field=ArrayField(UUIDField())),
), ),
@ -568,7 +572,10 @@ class IssueViewSet(BaseViewSet):
ArrayAgg( ArrayAgg(
"labels__id", "labels__id",
distinct=True, 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())), Value([], output_field=ArrayField(UUIDField())),
), ),
@ -585,7 +592,9 @@ class IssueViewSet(BaseViewSet):
ArrayAgg( ArrayAgg(
"issue_module__module_id", "issue_module__module_id",
distinct=True, 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())), Value([], output_field=ArrayField(UUIDField())),
), ),
@ -855,7 +864,10 @@ class IssuePaginatedViewSet(BaseViewSet):
ArrayAgg( ArrayAgg(
"labels__id", "labels__id",
distinct=True, 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())), Value([], output_field=ArrayField(UUIDField())),
), ),
@ -873,7 +885,8 @@ class IssuePaginatedViewSet(BaseViewSet):
"issue_module__module_id", "issue_module__module_id",
distinct=True, 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__archived_at__isnull=True)
& Q(issue_module__module__deleted_at__isnull=True),
), ),
Value([], output_field=ArrayField(UUIDField())), Value([], output_field=ArrayField(UUIDField())),
), ),

5
apiserver/plane/app/views/issue/relation.py
View file

@ -112,7 +112,10 @@ class IssueRelationViewSet(BaseViewSet):
ArrayAgg( ArrayAgg(
"labels__id", "labels__id",
distinct=True, 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())), Value([], output_field=ArrayField(UUIDField())),
), ),

9
apiserver/plane/app/views/issue/sub_issue.py
View file

@ -77,7 +77,10 @@ class SubIssuesEndpoint(BaseAPIView):
ArrayAgg( ArrayAgg(
"labels__id", "labels__id",
distinct=True, 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())), Value([], output_field=ArrayField(UUIDField())),
), ),
@ -94,7 +97,9 @@ class SubIssuesEndpoint(BaseAPIView):
ArrayAgg( ArrayAgg(
"issue_module__module_id", "issue_module__module_id",
distinct=True, 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())), Value([], output_field=ArrayField(UUIDField())),
), ),

8
apiserver/plane/app/views/view/base.py
View file

@ -234,7 +234,10 @@ class WorkspaceViewIssuesViewSet(BaseViewSet):
ArrayAgg( ArrayAgg(
"labels__id", "labels__id",
distinct=True, 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())), Value([], output_field=ArrayField(UUIDField())),
), ),
@ -252,7 +255,8 @@ class WorkspaceViewIssuesViewSet(BaseViewSet):
"issue_module__module_id", "issue_module__module_id",
distinct=True, 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__archived_at__isnull=True)
& Q(issue_module__module__deleted_at__isnull=True),
), ),
Value([], output_field=ArrayField(UUIDField())), Value([], output_field=ArrayField(UUIDField())),
), ),

10
apiserver/plane/app/views/workspace/draft.py
View file

@ -60,7 +60,10 @@ class WorkspaceDraftIssueViewSet(BaseViewSet):
ArrayAgg( ArrayAgg(
"labels__id", "labels__id",
distinct=True, 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())), Value([], output_field=ArrayField(UUIDField())),
), ),
@ -78,9 +81,8 @@ class WorkspaceDraftIssueViewSet(BaseViewSet):
"draft_issue_module__module_id", "draft_issue_module__module_id",
distinct=True, distinct=True,
filter=~Q(draft_issue_module__module_id__isnull=True) filter=~Q(draft_issue_module__module_id__isnull=True)
& Q( & Q(draft_issue_module__module__archived_at__isnull=True)
draft_issue_module__module__archived_at__isnull=True & Q(draft_issue_module__module__deleted_at__isnull=True),
),
), ),
Value([], output_field=ArrayField(UUIDField())), Value([], output_field=ArrayField(UUIDField())),
), ),

9
apiserver/plane/space/views/issue.py
View file

@ -701,7 +701,10 @@ class IssueRetrievePublicEndpoint(BaseAPIView):
ArrayAgg( ArrayAgg(
"labels__id", "labels__id",
distinct=True, 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())), Value([], output_field=ArrayField(UUIDField())),
), ),
@ -718,7 +721,9 @@ class IssueRetrievePublicEndpoint(BaseAPIView):
ArrayAgg( ArrayAgg(
"issue_module__module_id", "issue_module__module_id",
distinct=True, 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())), Value([], output_field=ArrayField(UUIDField())),
), ),

6
apiserver/plane/utils/grouper.py
View file

@ -26,12 +26,16 @@ def issue_queryset_grouper(queryset, group_by, sub_group_by):
annotations_map = { annotations_map = {
"assignee_ids": ("assignees__id", ~Q(assignees__id__isnull=True)), "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": ( "module_ids": (
"issue_module__module_id", "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) & Q(issue_module__module__archived_at__isnull=True)
& Q(issue_module__module__deleted_at__isnull=True)
), ),
), ),
} }