diff --git a/apps/api/plane/app/views/cycle/issue.py b/apps/api/plane/app/views/cycle/issue.py index f233848649..0c9dd8da66 100644 --- a/apps/api/plane/app/views/cycle/issue.py +++ b/apps/api/plane/app/views/cycle/issue.py @@ -170,12 +170,14 @@ class CycleIssueViewSet(BaseViewSet): slug=slug, project_id=project_id, filters=filters, + queryset=total_issue_queryset, ), sub_group_by_fields=issue_group_values( field=sub_group_by, slug=slug, project_id=project_id, filters=filters, + queryset=total_issue_queryset, ), group_by_field_name=group_by, sub_group_by_field_name=sub_group_by, @@ -205,6 +207,7 @@ class CycleIssueViewSet(BaseViewSet): slug=slug, project_id=project_id, filters=filters, + queryset=total_issue_queryset, ), group_by_field_name=group_by, count_filter=Q( diff --git a/apps/api/plane/app/views/issue/archive.py b/apps/api/plane/app/views/issue/archive.py index 5035410cc4..5f95b2c3b1 100644 --- a/apps/api/plane/app/views/issue/archive.py +++ b/apps/api/plane/app/views/issue/archive.py @@ -168,12 +168,14 @@ class IssueArchiveViewSet(BaseViewSet): slug=slug, project_id=project_id, filters=filters, + queryset=total_issue_queryset, ), sub_group_by_fields=issue_group_values( field=sub_group_by, slug=slug, project_id=project_id, filters=filters, + queryset=total_issue_queryset, ), group_by_field_name=group_by, sub_group_by_field_name=sub_group_by, @@ -203,6 +205,7 @@ class IssueArchiveViewSet(BaseViewSet): slug=slug, project_id=project_id, filters=filters, + queryset=total_issue_queryset, ), group_by_field_name=group_by, count_filter=Q( diff --git a/apps/api/plane/ee/views/app/epic/archive.py b/apps/api/plane/ee/views/app/epic/archive.py index 3cd6749f22..e8ea2bedf0 100644 --- a/apps/api/plane/ee/views/app/epic/archive.py +++ b/apps/api/plane/ee/views/app/epic/archive.py @@ -165,6 +165,7 @@ class EpicArchiveViewSet(BaseViewSet): project_id=project_id, filters=filters, epic=True, + queryset=filtered_issue_queryset, ), sub_group_by_fields=issue_group_values( field=sub_group_by, @@ -172,6 +173,7 @@ class EpicArchiveViewSet(BaseViewSet): project_id=project_id, filters=filters, epic=True, + queryset=filtered_issue_queryset, ), group_by_field_name=group_by, sub_group_by_field_name=sub_group_by, @@ -202,6 +204,7 @@ class EpicArchiveViewSet(BaseViewSet): project_id=project_id, filters=filters, epic=True, + queryset=filtered_issue_queryset, ), group_by_field_name=group_by, count_filter=Q( diff --git a/apps/api/plane/ee/views/app/epic/base.py b/apps/api/plane/ee/views/app/epic/base.py index ac14026f13..198448349a 100644 --- a/apps/api/plane/ee/views/app/epic/base.py +++ b/apps/api/plane/ee/views/app/epic/base.py @@ -331,6 +331,7 @@ class EpicViewSet(BaseViewSet): project_id=project_id, filters=filters, epic=True, + queryset=filtered_issue_queryset, ), sub_group_by_fields=issue_group_values( field=sub_group_by, @@ -338,6 +339,7 @@ class EpicViewSet(BaseViewSet): project_id=project_id, filters=filters, epic=True, + queryset=filtered_issue_queryset, ), group_by_field_name=group_by, sub_group_by_field_name=sub_group_by, @@ -371,6 +373,7 @@ class EpicViewSet(BaseViewSet): project_id=project_id, filters=filters, epic=True, + queryset=filtered_issue_queryset, ), group_by_field_name=group_by, count_filter=Q( diff --git a/apps/api/plane/ee/views/app/teamspace/issue.py b/apps/api/plane/ee/views/app/teamspace/issue.py index 21dc908b0c..3d3368ac6d 100644 --- a/apps/api/plane/ee/views/app/teamspace/issue.py +++ b/apps/api/plane/ee/views/app/teamspace/issue.py @@ -116,15 +116,6 @@ class TeamspaceIssueEndpoint(TeamspaceBaseEndpoint): group_by = request.GET.get("group_by", False) sub_group_by = request.GET.get("sub_group_by", False) - # Issue queryset - issue_queryset, order_by_param = order_issue_queryset( - issue_queryset=issue_queryset, order_by_param=order_by_param - ) - - # Group by - group_by = request.GET.get("group_by", False) - sub_group_by = request.GET.get("sub_group_by", False) - # issue queryset issue_queryset = issue_queryset_grouper( queryset=issue_queryset, group_by=group_by, sub_group_by=sub_group_by @@ -154,12 +145,14 @@ class TeamspaceIssueEndpoint(TeamspaceBaseEndpoint): slug=slug, filters=filters, team_id=team_space_id, + queryset=filtered_issue_queryset, ), sub_group_by_fields=issue_group_values( field=sub_group_by, slug=slug, filters=filters, team_id=team_space_id, + queryset=filtered_issue_queryset, ), group_by_field_name=group_by, sub_group_by_field_name=sub_group_by, @@ -188,6 +181,7 @@ class TeamspaceIssueEndpoint(TeamspaceBaseEndpoint): slug=slug, filters=filters, team_id=team_space_id, + queryset=filtered_issue_queryset, ), group_by_field_name=group_by, count_filter=Q( diff --git a/apps/api/plane/ee/views/space/views.py b/apps/api/plane/ee/views/space/views.py index a549e81c0d..7dbc6b8ee8 100644 --- a/apps/api/plane/ee/views/space/views.py +++ b/apps/api/plane/ee/views/space/views.py @@ -217,12 +217,14 @@ class IssueViewsPublicEndpoint(BaseAPIView): slug=slug, project_id=project_id, filters=filters, + queryset=total_issue_queryset, ), sub_group_by_fields=issue_group_values( field=sub_group_by, slug=slug, project_id=project_id, filters=filters, + queryset=total_issue_queryset, ), group_by_field_name=group_by, sub_group_by_field_name=sub_group_by, @@ -251,6 +253,7 @@ class IssueViewsPublicEndpoint(BaseAPIView): slug=slug, project_id=project_id, filters=filters, + queryset=total_issue_queryset, ), group_by_field_name=group_by, count_filter=Q( diff --git a/apps/api/plane/space/views/issue.py b/apps/api/plane/space/views/issue.py index 78d2e96daa..496e51ccec 100644 --- a/apps/api/plane/space/views/issue.py +++ b/apps/api/plane/space/views/issue.py @@ -188,12 +188,14 @@ class ProjectIssuesPublicEndpoint(BaseAPIView): slug=slug, project_id=project_id, filters=filters, + queryset=total_issue_queryset, ), sub_group_by_fields=issue_group_values( field=sub_group_by, slug=slug, project_id=project_id, filters=filters, + queryset=total_issue_queryset, ), group_by_field_name=group_by, sub_group_by_field_name=sub_group_by, @@ -222,6 +224,7 @@ class ProjectIssuesPublicEndpoint(BaseAPIView): slug=slug, project_id=project_id, filters=filters, + queryset=total_issue_queryset, ), group_by_field_name=group_by, count_filter=Q(