Skip to content

Commit 07402ef

Browse files
NarayanBavisettiNarayanBavisetti
authored
chore: filtered the deleted labels and modules (#5860)
1 parent 46302f4 commit 07402ef

File tree

9 files changed

+82
-27
lines changed

9 files changed

+82
-27
lines changed

‎apiserver/plane/app/views/dashboard/base.py‎

Lines changed: 14 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -218,7 +218,10 @@ def dashboard_assigned_issues(self, request, slug):
218218
ArrayAgg(
219219
"labels__id",
220220
distinct=True,
221-
filter=~Q(labels__id__isnull=True),
221+
filter=(
222+
~Q(labels__id__isnull=True)
223+
& Q(labels__deleted_at__isnull=True)
224+
),
222225
),
223226
Value([], output_field=ArrayField(UUIDField())),
224227
),
@@ -235,7 +238,9 @@ def dashboard_assigned_issues(self, request, slug):
235238
ArrayAgg(
236239
"issue_module__module_id",
237240
distinct=True,
238-
filter=~Q(issue_module__module_id__isnull=True),
241+
filter=~Q(issue_module__module_id__isnull=True)
242+
& Q(issue_module__module__archived_at__isnull=True)
243+
& Q(issue_module__module__deleted_at__isnull=True),
239244
),
240245
Value([], output_field=ArrayField(UUIDField())),
241246
),
@@ -382,7 +387,10 @@ def dashboard_created_issues(self, request, slug):
382387
ArrayAgg(
383388
"labels__id",
384389
distinct=True,
385-
filter=~Q(labels__id__isnull=True),
390+
filter=(
391+
~Q(labels__id__isnull=True)
392+
& Q(labels__deleted_at__isnull=True)
393+
),
386394
),
387395
Value([], output_field=ArrayField(UUIDField())),
388396
),
@@ -399,7 +407,9 @@ def dashboard_created_issues(self, request, slug):
399407
ArrayAgg(
400408
"issue_module__module_id",
401409
distinct=True,
402-
filter=~Q(issue_module__module_id__isnull=True),
410+
filter=~Q(issue_module__module_id__isnull=True)
411+
& Q(issue_module__module__archived_at__isnull=True)
412+
& Q(issue_module__module__deleted_at__isnull=True),
403413
),
404414
Value([], output_field=ArrayField(UUIDField())),
405415
),

‎apiserver/plane/app/views/inbox/base.py‎

Lines changed: 14 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -141,7 +141,10 @@ def get_queryset(self):
141141
ArrayAgg(
142142
"labels__id",
143143
distinct=True,
144-
filter=~Q(labels__id__isnull=True),
144+
filter=(
145+
~Q(labels__id__isnull=True)
146+
& Q(labels__deleted_at__isnull=True)
147+
),
145148
),
146149
Value([], output_field=ArrayField(UUIDField())),
147150
),
@@ -159,7 +162,8 @@ def get_queryset(self):
159162
"issue_module__module_id",
160163
distinct=True,
161164
filter=~Q(issue_module__module_id__isnull=True)
162-
& Q(issue_module__module__archived_at__isnull=True),
165+
& Q(issue_module__module__archived_at__isnull=True)
166+
& Q(issue_module__module__deleted_at__isnull=True),
163167
),
164168
Value([], output_field=ArrayField(UUIDField())),
165169
),
@@ -186,7 +190,8 @@ def list(self, request, slug, project_id):
186190
ArrayAgg(
187191
"issue__labels__id",
188192
distinct=True,
189-
filter=~Q(issue__labels__id__isnull=True),
193+
filter=~Q(issue__labels__id__isnull=True)
194+
& Q(issue__labels__deleted_at__isnull=True),
190195
),
191196
Value([], output_field=ArrayField(UUIDField())),
192197
)
@@ -298,15 +303,19 @@ def create(self, request, slug, project_id):
298303
ArrayAgg(
299304
"issue__labels__id",
300305
distinct=True,
301-
filter=~Q(issue__labels__id__isnull=True),
306+
filter=(
307+
~Q(labels__id__isnull=True)
308+
& Q(labels__deleted_at__isnull=True)
309+
),
302310
),
303311
Value([], output_field=ArrayField(UUIDField())),
304312
),
305313
assignee_ids=Coalesce(
306314
ArrayAgg(
307315
"issue__assignees__id",
308316
distinct=True,
309-
filter=~Q(issue__assignees__id__isnull=True),
317+
filter=~Q(assignees__id__isnull=True)
318+
& Q(assignees__member_project__is_active=True),
310319
),
311320
Value([], output_field=ArrayField(UUIDField())),
312321
),

‎apiserver/plane/app/views/issue/base.py‎

Lines changed: 19 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -471,7 +471,10 @@ def retrieve(self, request, slug, project_id, pk=None):
471471
ArrayAgg(
472472
"labels__id",
473473
distinct=True,
474-
filter=~Q(labels__id__isnull=True),
474+
filter=(
475+
~Q(labels__id__isnull=True)
476+
& Q(labels__deleted_at__isnull=True)
477+
),
475478
),
476479
Value([], output_field=ArrayField(UUIDField())),
477480
),
@@ -489,7 +492,8 @@ def retrieve(self, request, slug, project_id, pk=None):
489492
"issue_module__module_id",
490493
distinct=True,
491494
filter=~Q(issue_module__module_id__isnull=True)
492-
& Q(issue_module__module__archived_at__isnull=True),
495+
& Q(issue_module__module__archived_at__isnull=True)
496+
& Q(issue_module__module__deleted_at__isnull=True),
493497
),
494498
Value([], output_field=ArrayField(UUIDField())),
495499
),
@@ -568,7 +572,10 @@ def partial_update(self, request, slug, project_id, pk=None):
568572
ArrayAgg(
569573
"labels__id",
570574
distinct=True,
571-
filter=~Q(labels__id__isnull=True),
575+
filter=(
576+
~Q(labels__id__isnull=True)
577+
& Q(labels__deleted_at__isnull=True)
578+
),
572579
),
573580
Value([], output_field=ArrayField(UUIDField())),
574581
),
@@ -585,7 +592,9 @@ def partial_update(self, request, slug, project_id, pk=None):
585592
ArrayAgg(
586593
"issue_module__module_id",
587594
distinct=True,
588-
filter=~Q(issue_module__module_id__isnull=True),
595+
filter=~Q(issue_module__module_id__isnull=True)
596+
& Q(issue_module__module__archived_at__isnull=True)
597+
& Q(issue_module__module__deleted_at__isnull=True),
589598
),
590599
Value([], output_field=ArrayField(UUIDField())),
591600
),
@@ -855,7 +864,10 @@ def list(self, request, slug, project_id):
855864
ArrayAgg(
856865
"labels__id",
857866
distinct=True,
858-
filter=~Q(labels__id__isnull=True),
867+
filter=(
868+
~Q(labels__id__isnull=True)
869+
& Q(labels__deleted_at__isnull=True)
870+
),
859871
),
860872
Value([], output_field=ArrayField(UUIDField())),
861873
),
@@ -873,7 +885,8 @@ def list(self, request, slug, project_id):
873885
"issue_module__module_id",
874886
distinct=True,
875887
filter=~Q(issue_module__module_id__isnull=True)
876-
& Q(issue_module__module__archived_at__isnull=True),
888+
& Q(issue_module__module__archived_at__isnull=True)
889+
& Q(issue_module__module__deleted_at__isnull=True),
877890
),
878891
Value([], output_field=ArrayField(UUIDField())),
879892
),

‎apiserver/plane/app/views/issue/relation.py‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -112,7 +112,10 @@ def list(self, request, slug, project_id, issue_id):
112112
ArrayAgg(
113113
"labels__id",
114114
distinct=True,
115-
filter=~Q(labels__id__isnull=True),
115+
filter=(
116+
~Q(labels__id__isnull=True)
117+
& Q(labels__deleted_at__isnull=True)
118+
),
116119
),
117120
Value([], output_field=ArrayField(UUIDField())),
118121
),

‎apiserver/plane/app/views/issue/sub_issue.py‎

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,10 @@ def get(self, request, slug, project_id, issue_id):
7777
ArrayAgg(
7878
"labels__id",
7979
distinct=True,
80-
filter=~Q(labels__id__isnull=True),
80+
filter=(
81+
~Q(labels__id__isnull=True)
82+
& Q(labels__deleted_at__isnull=True)
83+
),
8184
),
8285
Value([], output_field=ArrayField(UUIDField())),
8386
),
@@ -94,7 +97,9 @@ def get(self, request, slug, project_id, issue_id):
9497
ArrayAgg(
9598
"issue_module__module_id",
9699
distinct=True,
97-
filter=~Q(issue_module__module_id__isnull=True),
100+
filter=~Q(issue_module__module_id__isnull=True)
101+
& Q(issue_module__module__archived_at__isnull=True)
102+
& Q(issue_module__module__deleted_at__isnull=True),
98103
),
99104
Value([], output_field=ArrayField(UUIDField())),
100105
),

‎apiserver/plane/app/views/view/base.py‎

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -234,7 +234,10 @@ def get_queryset(self):
234234
ArrayAgg(
235235
"labels__id",
236236
distinct=True,
237-
filter=~Q(labels__id__isnull=True),
237+
filter=(
238+
~Q(labels__id__isnull=True)
239+
& Q(labels__deleted_at__isnull=True)
240+
),
238241
),
239242
Value([], output_field=ArrayField(UUIDField())),
240243
),
@@ -252,7 +255,8 @@ def get_queryset(self):
252255
"issue_module__module_id",
253256
distinct=True,
254257
filter=~Q(issue_module__module_id__isnull=True)
255-
& Q(issue_module__module__archived_at__isnull=True),
258+
& Q(issue_module__module__archived_at__isnull=True)
259+
& Q(issue_module__module__deleted_at__isnull=True),
256260
),
257261
Value([], output_field=ArrayField(UUIDField())),
258262
),

‎apiserver/plane/app/views/workspace/draft.py‎

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,10 @@ def get_queryset(self):
6060
ArrayAgg(
6161
"labels__id",
6262
distinct=True,
63-
filter=~Q(labels__id__isnull=True),
63+
filter=(
64+
~Q(labels__id__isnull=True)
65+
& Q(labels__deleted_at__isnull=True)
66+
),
6467
),
6568
Value([], output_field=ArrayField(UUIDField())),
6669
),
@@ -78,9 +81,8 @@ def get_queryset(self):
7881
"draft_issue_module__module_id",
7982
distinct=True,
8083
filter=~Q(draft_issue_module__module_id__isnull=True)
81-
& Q(
82-
draft_issue_module__module__archived_at__isnull=True
83-
),
84+
& Q(draft_issue_module__module__archived_at__isnull=True)
85+
& Q(draft_issue_module__module__deleted_at__isnull=True),
8486
),
8587
Value([], output_field=ArrayField(UUIDField())),
8688
),

‎apiserver/plane/space/views/issue.py‎

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -701,7 +701,10 @@ def get(self, request, anchor, issue_id):
701701
ArrayAgg(
702702
"labels__id",
703703
distinct=True,
704-
filter=~Q(labels__id__isnull=True),
704+
filter=(
705+
~Q(labels__id__isnull=True)
706+
& Q(labels__deleted_at__isnull=True)
707+
),
705708
),
706709
Value([], output_field=ArrayField(UUIDField())),
707710
),
@@ -718,7 +721,9 @@ def get(self, request, anchor, issue_id):
718721
ArrayAgg(
719722
"issue_module__module_id",
720723
distinct=True,
721-
filter=~Q(issue_module__module_id__isnull=True),
724+
filter=~Q(issue_module__module_id__isnull=True)
725+
& Q(issue_module__module__archived_at__isnull=True)
726+
& Q(issue_module__module__deleted_at__isnull=True),
722727
),
723728
Value([], output_field=ArrayField(UUIDField())),
724729
),

‎apiserver/plane/utils/grouper.py‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,12 +26,16 @@ def issue_queryset_grouper(queryset, group_by, sub_group_by):
2626

2727
annotations_map = {
2828
"assignee_ids": ("assignees__id", ~Q(assignees__id__isnull=True)),
29-
"label_ids": ("labels__id", ~Q(labels__id__isnull=True)),
29+
"label_ids": (
30+
"labels__id",
31+
~Q(labels__id__isnull=True) & (Q(labels__deleted_at__isnull=True)),
32+
),
3033
"module_ids": (
3134
"issue_module__module_id",
3235
(
3336
~Q(issue_module__module_id__isnull=True)
3437
& Q(issue_module__module__archived_at__isnull=True)
38+
& Q(issue_module__module__deleted_at__isnull=True)
3539
),
3640
),
3741
}

0 commit comments

Comments
 (0)