Merge branch 'feat/pagination' of github.com:makeplane/plane into feat/pagination

.github/ISSUE_TEMPLATE/--bug-report.yaml

@@ -55,19 +55,12 @@ body:
       - Safari
       - Other
 - type: dropdown
-  id: variant
+  id: version
   attributes:
-    label: Variant
+    label: Version
     options:
       - Cloud
       - Self-hosted
       - Local
-  validations:
-    required: true
-- type: input
-  id: version
-  attributes:
-    label: Version
-    placeholder: v0.17.0-dev
   validations:
     required: true

.github/workflows/build-branch.yml

@@ -6,6 +6,7 @@ on:
     branches:
       - master
       - preview
+      - develop
   release:
     types: [released, prereleased]
 

.github/workflows/codeql.yml

@@ -3,7 +3,7 @@ name: "CodeQL"
 on:
   workflow_dispatch:
   push:
-    branches: ["preview", "master"]
+    branches: ["develop", "preview", "master"]
   pull_request:
     branches: ["develop", "preview", "master"]
   schedule:

Dockerfile

@@ -27,7 +27,7 @@ RUN yarn install
 COPY --from=builder /app/out/full/ .
 COPY turbo.json turbo.json
 COPY replace-env-vars.sh /usr/local/bin/
-
+USER root
 RUN chmod +x /usr/local/bin/replace-env-vars.sh
 
 RUN yarn turbo run build
@@ -89,17 +89,21 @@ RUN chmod -R 777 /code
 
 WORKDIR /app
 
+# Don't run production as root
+RUN addgroup --system --gid 1001 plane
+RUN adduser --system --uid 1001 captain
+
 COPY --from=installer /app/apps/app/next.config.js .
 COPY --from=installer /app/apps/app/package.json .
 COPY --from=installer /app/apps/space/next.config.js .
 COPY --from=installer /app/apps/space/package.json .
 
-COPY --from=installer /app/apps/app/.next/standalone ./
+COPY --from=installer --chown=captain:plane /app/apps/app/.next/standalone ./
 
-COPY --from=installer /app/apps/app/.next/static ./apps/app/.next/static
+COPY --from=installer --chown=captain:plane /app/apps/app/.next/static ./apps/app/.next/static
 
-COPY --from=installer /app/apps/space/.next/standalone ./
-COPY --from=installer /app/apps/space/.next ./apps/space/.next
+COPY --from=installer --chown=captain:plane /app/apps/space/.next/standalone ./
+COPY --from=installer --chown=captain:plane /app/apps/space/.next ./apps/space/.next
 
 ENV NEXT_TELEMETRY_DISABLED 1
 
@@ -114,6 +118,7 @@ ARG NEXT_PUBLIC_API_BASE_URL=http://localhost:8000
 ENV NEXT_PUBLIC_API_BASE_URL=$NEXT_PUBLIC_API_BASE_URL \
     BUILT_NEXT_PUBLIC_API_BASE_URL=$NEXT_PUBLIC_API_BASE_URL
 
+USER root
 COPY replace-env-vars.sh /usr/local/bin/
 COPY start.sh /usr/local/bin/
 RUN chmod +x /usr/local/bin/replace-env-vars.sh

README.md

@@ -52,7 +52,7 @@ If you want more control over your data, prefer to self-host Plane, please refer
 
 | Installation Methods | Documentation Link                                                                                                                                           |
 | -------------------- | ------------------------------------------------------------------------------------------------------------------------------------------------------------ |
-| Docker               | [![Docker](https://img.shields.io/badge/docker-%230db7ed.svg?style=for-the-badge&logo=docker&logoColor=white)](https://docs.plane.so/self-hosting/methods/docker-compose)         |
+| Docker               | [![Docker](https://img.shields.io/badge/docker-%230db7ed.svg?style=for-the-badge&logo=docker&logoColor=white)](https://docs.plane.so/docker-compose)         |
 | Kubernetes           | [![Kubernetes](https://img.shields.io/badge/kubernetes-%23326ce5.svg?style=for-the-badge&logo=kubernetes&logoColor=white)](https://docs.plane.so/kubernetes) |
 
 `Instance admin` can configure instance settings using our [God-mode](https://docs.plane.so/instance-admin) feature.

SECURITY.md

@@ -1,44 +0,0 @@
-# Security Policy
-
-This document outlines security procedures and vulnerabilities reporting for the Plane project.
-
-At Plane, we safeguarding the security of our systems with top priority. Despite our efforts, vulnerabilities may still exist. We greatly appreciate your assistance in identifying and reporting any such vulnerabilities to help us maintain the integrity of our systems and protect our clients.
-
-To report a security vulnerability, please email us directly at security@plane.so with a detailed description of the vulnerability and steps to reproduce it. Please refrain from disclosing the vulnerability publicly until we have had an opportunity to review and address it.
-
-## Out of Scope Vulnerabilities
-
-We appreciate your help in identifying vulnerabilities. However, please note that the following types of vulnerabilities are considered out of scope:
-
-- Attacks requiring MITM or physical access to a user's device.
-- Content spoofing and text injection issues without demonstrating an attack vector or ability to modify HTML/CSS.
-- Email spoofing.
-- Missing DNSSEC, CAA, CSP headers.
-- Lack of Secure or HTTP only flag on non-sensitive cookies.
-
-## Reporting Process
-
-If you discover a vulnerability, please adhere to the following reporting process:
-
-1. Email your findings to security@plane.so.
-2. Refrain from running automated scanners on our infrastructure or dashboard without prior consent. Contact us to set up a sandbox environment if necessary.
-3. Do not exploit the vulnerability for malicious purposes, such as downloading excessive data or altering user data.
-4. Maintain confidentiality and refrain from disclosing the vulnerability until it has been resolved.
-5. Avoid using physical security attacks, social engineering, distributed denial of service, spam, or third-party applications.
-
-When reporting a vulnerability, please provide sufficient information to allow us to reproduce and address the issue promptly. Include the IP address or URL of the affected system, along with a detailed description of the vulnerability.
-
-## Our Commitment
-
-We are committed to promptly addressing reported vulnerabilities and maintaining open communication throughout the resolution process. Here's what you can expect from us:
-
-- **Response Time:** We will acknowledge receipt of your report within three business days and provide an expected resolution date.
-- **Legal Protection:** We will not pursue legal action against you for reporting vulnerabilities, provided you adhere to the reporting guidelines.
-- **Confidentiality:** Your report will be treated with strict confidentiality. We will not disclose your personal information to third parties without your consent.
-- **Progress Updates:** We will keep you informed of our progress in resolving the reported vulnerability.
-- **Recognition:** With your permission, we will publicly acknowledge you as the discoverer of the vulnerability.
-- **Timely Resolution:** We strive to resolve all reported vulnerabilities promptly and will actively participate in the publication process once the issue is resolved.
-
-We appreciate your cooperation in helping us maintain the security of our systems and protecting our clients. Thank you for your contributions to our security efforts.
-
-reference: https://supabase.com/.well-known/security.txt

apiserver/Dockerfile.api

@@ -32,18 +32,28 @@ RUN apk add --no-cache --virtual .build-deps \
     apk del .build-deps
 
 
+RUN addgroup -S plane && \
+    adduser -S captain -G plane
+
+RUN chown captain.plane /code
+
+USER captain
+
 # Add in Django deps and generate Django's static files
 COPY manage.py manage.py
 COPY plane plane/
 COPY templates templates/
 COPY package.json package.json
-
+USER root
 RUN apk --no-cache add "bash~=5.2"
 COPY ./bin ./bin/
 
 RUN mkdir -p /code/plane/logs
 RUN chmod +x ./bin/takeoff ./bin/worker ./bin/beat
 RUN chmod -R 777 /code
+RUN chown -R captain:plane /code
+
+USER captain
 
 # Expose container port and run entry point script
 EXPOSE 8000

apiserver/Dockerfile.dev

@@ -30,13 +30,17 @@ ADD requirements ./requirements
 # Install the local development settings
 RUN pip install -r requirements/local.txt --compile --no-cache-dir
 
+RUN addgroup -S plane && \
+    adduser -S captain -G plane
 
 COPY . .
 
 RUN mkdir -p /code/plane/logs
+RUN chown -R captain.plane /code
 RUN chmod -R +x /code/bin
 RUN chmod -R 777 /code
 
+USER captain
 
 # Expose container port and run entry point script
 EXPOSE 8000

apiserver/package.json

@@ -1,4 +1,4 @@
 {
   "name": "plane-api",
-  "version": "0.18.0"
+  "version": "0.16.0"
 }

apiserver/plane/api/serializers/base.py

@@ -66,11 +66,11 @@ class BaseSerializer(serializers.ModelSerializer):
                 if expand in self.fields:
                     # Import all the expandable serializers
                     from . import (
-                        IssueSerializer,
-                        ProjectLiteSerializer,
-                        StateLiteSerializer,
-                        UserLiteSerializer,
                         WorkspaceLiteSerializer,
+                        ProjectLiteSerializer,
+                        UserLiteSerializer,
+                        StateLiteSerializer,
+                        IssueSerializer,
                     )
 
                     # Expansion mapper

apiserver/plane/api/serializers/project.py

@@ -7,7 +7,6 @@ from plane.db.models import (
     ProjectIdentifier,
     WorkspaceMember,
 )
-
 from .base import BaseSerializer
 
 

apiserver/plane/api/serializers/user.py

@@ -1,6 +1,5 @@
 # Module imports
 from plane.db.models import User
-
 from .base import BaseSerializer
 
 
@@ -11,9 +10,7 @@ class UserLiteSerializer(BaseSerializer):
             "id",
             "first_name",
             "last_name",
-            "email",
             "avatar",
             "display_name",
-            "email",
         ]
         read_only_fields = fields

apiserver/plane/api/urls/cycle.py

@@ -34,7 +34,7 @@ urlpatterns = [
         name="transfer-issues",
     ),
     path(
-        "workspaces/<str:slug>/projects/<uuid:project_id>/cycles/<uuid:cycle_id>/archive/",
+        "workspaces/<str:slug>/projects/<uuid:project_id>/cycles/<uuid:pk>/archive/",
         CycleArchiveUnarchiveAPIEndpoint.as_view(),
         name="cycle-archive-unarchive",
     ),

apiserver/plane/api/urls/project.py

@@ -12,7 +12,7 @@ urlpatterns = [
         name="project",
     ),
     path(
-        "workspaces/<str:slug>/projects/<uuid:pk>/",
+        "workspaces/<str:slug>/projects/<uuid:project_id>/",
         ProjectAPIEndpoint.as_view(),
         name="project",
     ),

apiserver/plane/api/views/base.py

@@ -7,7 +7,6 @@ import zoneinfo
 from django.conf import settings
 from django.core.exceptions import ObjectDoesNotExist, ValidationError
 from django.db import IntegrityError
-from django.urls import resolve
 from django.utils import timezone
 from rest_framework import status
 from rest_framework.permissions import IsAuthenticated
@@ -166,12 +165,7 @@ class BaseAPIView(TimezoneMixin, APIView, BasePaginator):
 
     @property
     def project_id(self):
-        project_id = self.kwargs.get("project_id", None)
-        if project_id:
-            return project_id
-
-        if resolve(self.request.path_info).url_name == "project":
-            return self.kwargs.get("pk", None)
+        return self.kwargs.get("project_id", None)
 
     @property
     def fields(self):

apiserver/plane/api/views/cycle.py

@@ -2,31 +2,29 @@
 import json
 
 # Django imports
-from django.core import serializers
-from django.db.models import Count, F, Func, OuterRef, Q, Sum
+from django.db.models import Q, Count, Sum, F, OuterRef, Func
 from django.utils import timezone
+from django.core import serializers
 
 # Third party imports
-from rest_framework import status
 from rest_framework.response import Response
+from rest_framework import status
 
 # Module imports
-from plane.api.serializers import (
-    CycleIssueSerializer,
-    CycleSerializer,
-)
-from plane.app.permissions import ProjectEntityPermission
-from plane.bgtasks.issue_activites_task import issue_activity
+from .base import BaseAPIView, WebhookMixin
 from plane.db.models import (
     Cycle,
-    CycleIssue,
     Issue,
-    IssueAttachment,
+    CycleIssue,
     IssueLink,
+    IssueAttachment,
 )
-from plane.utils.analytics_plot import burndown_plot
-
-from .base import BaseAPIView, WebhookMixin
+from plane.app.permissions import ProjectEntityPermission
+from plane.api.serializers import (
+    CycleSerializer,
+    CycleIssueSerializer,
+)
+from plane.bgtasks.issue_activites_task import issue_activity
 
 
 class CycleAPIEndpoint(WebhookMixin, BaseAPIView):
@@ -154,7 +152,9 @@ class CycleAPIEndpoint(WebhookMixin, BaseAPIView):
                 data,
                 status=status.HTTP_200_OK,
             )
-        queryset = self.get_queryset().filter(archived_at__isnull=True)
+        queryset = (
+            self.get_queryset().filter(archived_at__isnull=True)
+        )
         cycle_view = request.GET.get("cycle_view", "all")
 
         # Current Cycle
@@ -493,22 +493,17 @@ class CycleArchiveUnarchiveAPIEndpoint(BaseAPIView):
             ).data,
         )
 
-    def post(self, request, slug, project_id, cycle_id):
+    def post(self, request, slug, project_id, pk):
         cycle = Cycle.objects.get(
-            pk=cycle_id, project_id=project_id, workspace__slug=slug
+            pk=pk, project_id=project_id, workspace__slug=slug
         )
-        if cycle.end_date >= timezone.now().date():
-            return Response(
-                {"error": "Only completed cycles can be archived"},
-                status=status.HTTP_400_BAD_REQUEST,
-            )
         cycle.archived_at = timezone.now()
         cycle.save()
         return Response(status=status.HTTP_204_NO_CONTENT)
 
-    def delete(self, request, slug, project_id, cycle_id):
+    def delete(self, request, slug, project_id, pk):
         cycle = Cycle.objects.get(
-            pk=cycle_id, project_id=project_id, workspace__slug=slug
+            pk=pk, project_id=project_id, workspace__slug=slug
         )
         cycle.archived_at = None
         cycle.save()
@@ -556,21 +551,7 @@ class CycleIssueAPIEndpoint(WebhookMixin, BaseAPIView):
             .distinct()
         )
 
-    def get(self, request, slug, project_id, cycle_id, issue_id=None):
-        # Get
-        if issue_id:
-            cycle_issue = CycleIssue.objects.get(
-                workspace__slug=slug,
-                project_id=project_id,
-                cycle_id=cycle_id,
-                issue_id=issue_id,
-            )
-            serializer = CycleIssueSerializer(
-                cycle_issue, fields=self.fields, expand=self.expand
-            )
-            return Response(serializer.data, status=status.HTTP_200_OK)
-
-        # List
+    def get(self, request, slug, project_id, cycle_id):
         order_by = request.GET.get("order_by", "created_at")
         issues = (
             Issue.issue_objects.filter(issue_cycle__cycle_id=cycle_id)
@@ -746,7 +727,7 @@ class CycleIssueAPIEndpoint(WebhookMixin, BaseAPIView):
 
 class TransferCycleIssueAPIEndpoint(BaseAPIView):
     """
-    This viewset provides `create` actions for transferring the issues into a particular cycle.
+    This viewset provides `create` actions for transfering the issues into a particular cycle.
 
     """
 
@@ -767,209 +748,6 @@ class TransferCycleIssueAPIEndpoint(BaseAPIView):
             workspace__slug=slug, project_id=project_id, pk=new_cycle_id
         )
 
-        old_cycle = (
-            Cycle.objects.filter(
-                workspace__slug=slug, project_id=project_id, pk=cycle_id
-            )
-            .annotate(
-                total_issues=Count(
-                    "issue_cycle",
-                    filter=Q(
-                        issue_cycle__issue__archived_at__isnull=True,
-                        issue_cycle__issue__is_draft=False,
-                    ),
-                )
-            )
-            .annotate(
-                completed_issues=Count(
-                    "issue_cycle__issue__state__group",
-                    filter=Q(
-                        issue_cycle__issue__state__group="completed",
-                        issue_cycle__issue__archived_at__isnull=True,
-                        issue_cycle__issue__is_draft=False,
-                    ),
-                )
-            )
-            .annotate(
-                cancelled_issues=Count(
-                    "issue_cycle__issue__state__group",
-                    filter=Q(
-                        issue_cycle__issue__state__group="cancelled",
-                        issue_cycle__issue__archived_at__isnull=True,
-                        issue_cycle__issue__is_draft=False,
-                    ),
-                )
-            )
-            .annotate(
-                started_issues=Count(
-                    "issue_cycle__issue__state__group",
-                    filter=Q(
-                        issue_cycle__issue__state__group="started",
-                        issue_cycle__issue__archived_at__isnull=True,
-                        issue_cycle__issue__is_draft=False,
-                    ),
-                )
-            )
-            .annotate(
-                unstarted_issues=Count(
-                    "issue_cycle__issue__state__group",
-                    filter=Q(
-                        issue_cycle__issue__state__group="unstarted",
-                        issue_cycle__issue__archived_at__isnull=True,
-                        issue_cycle__issue__is_draft=False,
-                    ),
-                )
-            )
-            .annotate(
-                backlog_issues=Count(
-                    "issue_cycle__issue__state__group",
-                    filter=Q(
-                        issue_cycle__issue__state__group="backlog",
-                        issue_cycle__issue__archived_at__isnull=True,
-                        issue_cycle__issue__is_draft=False,
-                    ),
-                )
-            )
-        )
-
-        # Pass the new_cycle queryset to burndown_plot
-        completion_chart = burndown_plot(
-            queryset=old_cycle.first(),
-            slug=slug,
-            project_id=project_id,
-            cycle_id=cycle_id,
-        )
-
-        # Get the assignee distribution
-        assignee_distribution = (
-            Issue.objects.filter(
-                issue_cycle__cycle_id=cycle_id,
-                workspace__slug=slug,
-                project_id=project_id,
-            )
-            .annotate(display_name=F("assignees__display_name"))
-            .annotate(assignee_id=F("assignees__id"))
-            .annotate(avatar=F("assignees__avatar"))
-            .values("display_name", "assignee_id", "avatar")
-            .annotate(
-                total_issues=Count(
-                    "id",
-                    filter=Q(archived_at__isnull=True, is_draft=False),
-                ),
-            )
-            .annotate(
-                completed_issues=Count(
-                    "id",
-                    filter=Q(
-                        completed_at__isnull=False,
-                        archived_at__isnull=True,
-                        is_draft=False,
-                    ),
-                )
-            )
-            .annotate(
-                pending_issues=Count(
-                    "id",
-                    filter=Q(
-                        completed_at__isnull=True,
-                        archived_at__isnull=True,
-                        is_draft=False,
-                    ),
-                )
-            )
-            .order_by("display_name")
-        )
-        # assignee distribution serialized
-        assignee_distribution_data = [
-            {
-                "display_name": item["display_name"],
-                "assignee_id": (
-                    str(item["assignee_id"]) if item["assignee_id"] else None
-                ),
-                "avatar": item["avatar"],
-                "total_issues": item["total_issues"],
-                "completed_issues": item["completed_issues"],
-                "pending_issues": item["pending_issues"],
-            }
-            for item in assignee_distribution
-        ]
-
-        # Get the label distribution
-        label_distribution = (
-            Issue.objects.filter(
-                issue_cycle__cycle_id=cycle_id,
-                workspace__slug=slug,
-                project_id=project_id,
-            )
-            .annotate(label_name=F("labels__name"))
-            .annotate(color=F("labels__color"))
-            .annotate(label_id=F("labels__id"))
-            .values("label_name", "color", "label_id")
-            .annotate(
-                total_issues=Count(
-                    "id",
-                    filter=Q(archived_at__isnull=True, is_draft=False),
-                )
-            )
-            .annotate(
-                completed_issues=Count(
-                    "id",
-                    filter=Q(
-                        completed_at__isnull=False,
-                        archived_at__isnull=True,
-                        is_draft=False,
-                    ),
-                )
-            )
-            .annotate(
-                pending_issues=Count(
-                    "id",
-                    filter=Q(
-                        completed_at__isnull=True,
-                        archived_at__isnull=True,
-                        is_draft=False,
-                    ),
-                )
-            )
-            .order_by("label_name")
-        )
-
-        # Label distribution serilization
-        label_distribution_data = [
-            {
-                "label_name": item["label_name"],
-                "color": item["color"],
-                "label_id": (
-                    str(item["label_id"]) if item["label_id"] else None
-                ),
-                "total_issues": item["total_issues"],
-                "completed_issues": item["completed_issues"],
-                "pending_issues": item["pending_issues"],
-            }
-            for item in label_distribution
-        ]
-
-        current_cycle = Cycle.objects.filter(
-            workspace__slug=slug, project_id=project_id, pk=cycle_id
-        ).first()
-
-        if current_cycle:
-            current_cycle.progress_snapshot = {
-                "total_issues": old_cycle.first().total_issues,
-                "completed_issues": old_cycle.first().completed_issues,
-                "cancelled_issues": old_cycle.first().cancelled_issues,
-                "started_issues": old_cycle.first().started_issues,
-                "unstarted_issues": old_cycle.first().unstarted_issues,
-                "backlog_issues": old_cycle.first().backlog_issues,
-                "distribution": {
-                    "labels": label_distribution_data,
-                    "assignees": assignee_distribution_data,
-                    "completion_chart": completion_chart,
-                },
-            }
-            # Save the snapshot of the current cycle
-            current_cycle.save(update_fields=["progress_snapshot"])
-
         if (
             new_cycle.end_date is not None
             and new_cycle.end_date < timezone.now().date()

apiserver/plane/api/views/inbox.py

@@ -2,28 +2,27 @@
 import json
 
 # Django improts
-from django.core.serializers.json import DjangoJSONEncoder
-from django.db.models import Q
 from django.utils import timezone
+from django.db.models import Q
+from django.core.serializers.json import DjangoJSONEncoder
 
 # Third party imports
 from rest_framework import status
 from rest_framework.response import Response
 
 # Module imports
-from plane.api.serializers import InboxIssueSerializer, IssueSerializer
+from .base import BaseAPIView
 from plane.app.permissions import ProjectLitePermission
-from plane.bgtasks.issue_activites_task import issue_activity
+from plane.api.serializers import InboxIssueSerializer, IssueSerializer
 from plane.db.models import (
-    Inbox,
     InboxIssue,
     Issue,
-    Project,
-    ProjectMember,
     State,
+    ProjectMember,
+    Project,
+    Inbox,
 )
-
-from .base import BaseAPIView
+from plane.bgtasks.issue_activites_task import issue_activity
 
 
 class InboxIssueAPIEndpoint(BaseAPIView):
@@ -135,11 +134,10 @@ class InboxIssueAPIEndpoint(BaseAPIView):
         # Create or get state
         state, _ = State.objects.get_or_create(
             name="Triage",
-            group="triage",
+            group="backlog",
             description="Default state for managing all Inbox Issues",
             project_id=project_id,
             color="#ff7700",
-            is_triage=True,
         )
 
         # create an issue
@@ -272,9 +270,6 @@ class InboxIssueAPIEndpoint(BaseAPIView):
             serializer = InboxIssueSerializer(
                 inbox_issue, data=request.data, partial=True
             )
-            current_instance = json.dumps(
-                InboxIssueSerializer(inbox_issue).data, cls=DjangoJSONEncoder
-            )
 
             if serializer.is_valid():
                 serializer.save()
@@ -303,7 +298,7 @@ class InboxIssueAPIEndpoint(BaseAPIView):
                     )
 
                     # Update the issue state only if it is in triage state
-                    if issue.state.is_triage:
+                    if issue.state.name == "Triage":
                         # Move to default state
                         state = State.objects.filter(
                             workspace__slug=slug,
@@ -314,21 +309,6 @@ class InboxIssueAPIEndpoint(BaseAPIView):
                             issue.state = state
                             issue.save()
 
-                # create a activity for status change
-                issue_activity.delay(
-                    type="inbox.activity.created",
-                    requested_data=json.dumps(
-                        request.data, cls=DjangoJSONEncoder
-                    ),
-                    actor_id=str(request.user.id),
-                    issue_id=str(issue_id),
-                    project_id=str(project_id),
-                    current_instance=current_instance,
-                    epoch=int(timezone.now().timestamp()),
-                    notification=False,
-                    origin=request.META.get("HTTP_ORIGIN"),
-                )
-
                 return Response(serializer.data, status=status.HTTP_200_OK)
             return Response(
                 serializer.errors, status=status.HTTP_400_BAD_REQUEST

apiserver/plane/api/views/issue.py

@@ -282,7 +282,7 @@ class IssueAPIEndpoint(WebhookMixin, BaseAPIView):
         )
         if serializer.is_valid():
             if (
-                request.data.get("external_id")
+                str(request.data.get("external_id"))
                 and (issue.external_id != str(request.data.get("external_id")))
                 and Issue.objects.filter(
                     project_id=project_id,
@@ -308,6 +308,8 @@ class IssueAPIEndpoint(WebhookMixin, BaseAPIView):
                 actor_id=str(request.user.id),
                 issue_id=str(pk),
                 project_id=str(project_id),
+                external_id__isnull=False,
+                external_source__isnull=False,
                 current_instance=current_instance,
                 epoch=int(timezone.now().timestamp()),
             )
@@ -437,7 +439,7 @@ class LabelAPIEndpoint(BaseAPIView):
         serializer = LabelSerializer(label, data=request.data, partial=True)
         if serializer.is_valid():
             if (
-                request.data.get("external_id")
+                str(request.data.get("external_id"))
                 and (label.external_id != str(request.data.get("external_id")))
                 and Issue.objects.filter(
                     project_id=project_id,

apiserver/plane/api/views/module.py

@@ -2,33 +2,32 @@
 import json
 
 # Django imports
-from django.core import serializers
-from django.db.models import Count, F, Func, OuterRef, Prefetch, Q
+from django.db.models import Count, Prefetch, Q, F, Func, OuterRef
 from django.utils import timezone
+from django.core import serializers
 
 # Third party imports
 from rest_framework import status
 from rest_framework.response import Response
 
 # Module imports
-from plane.api.serializers import (
-    IssueSerializer,
-    ModuleIssueSerializer,
-    ModuleSerializer,
-)
+from .base import BaseAPIView, WebhookMixin
 from plane.app.permissions import ProjectEntityPermission
-from plane.bgtasks.issue_activites_task import issue_activity
 from plane.db.models import (
+    Project,
+    Module,
+    ModuleLink,
     Issue,
+    ModuleIssue,
     IssueAttachment,
     IssueLink,
-    Module,
-    ModuleIssue,
-    ModuleLink,
-    Project,
 )
-
-from .base import BaseAPIView, WebhookMixin
+from plane.api.serializers import (
+    ModuleSerializer,
+    ModuleIssueSerializer,
+    IssueSerializer,
+)
+from plane.bgtasks.issue_activites_task import issue_activity
 
 
 class ModuleAPIEndpoint(WebhookMixin, BaseAPIView):
@@ -554,7 +553,7 @@ class ModuleArchiveUnarchiveAPIEndpoint(BaseAPIView):
             .order_by(self.kwargs.get("order_by", "-created_at"))
         )
 
-    def get(self, request, slug, project_id, pk):
+    def get(self, request, slug, project_id):
         return self.paginate(
             request=request,
             queryset=(self.get_queryset()),
@@ -570,13 +569,6 @@ class ModuleArchiveUnarchiveAPIEndpoint(BaseAPIView):
         module = Module.objects.get(
             pk=pk, project_id=project_id, workspace__slug=slug
         )
-        if module.status not in ["completed", "cancelled"]:
-            return Response(
-                {
-                    "error": "Only completed or cancelled modules can be archived"
-                },
-                status=status.HTTP_400_BAD_REQUEST,
-            )
         module.archived_at = timezone.now()
         module.save()
         return Response(status=status.HTTP_204_NO_CONTENT)

apiserver/plane/api/views/project.py

@@ -1,29 +1,27 @@
 # Django imports
-from django.db import IntegrityError
-from django.db.models import Exists, F, Func, OuterRef, Prefetch, Q, Subquery
 from django.utils import timezone
+from django.db import IntegrityError
+from django.db.models import Exists, OuterRef, Q, F, Func, Subquery, Prefetch
 
 # Third party imports
 from rest_framework import status
 from rest_framework.response import Response
 from rest_framework.serializers import ValidationError
 
-from plane.api.serializers import ProjectSerializer
-from plane.app.permissions import ProjectBasePermission
-
 # Module imports
 from plane.db.models import (
-    Cycle,
-    Inbox,
-    IssueProperty,
-    Module,
-    Project,
-    ProjectDeployBoard,
-    ProjectMember,
-    State,
     Workspace,
+    Project,
+    ProjectMember,
+    ProjectDeployBoard,
+    State,
+    Cycle,
+    Module,
+    IssueProperty,
+    Inbox,
 )
-
+from plane.app.permissions import ProjectBasePermission
+from plane.api.serializers import ProjectSerializer
 from .base import BaseAPIView, WebhookMixin
 
 
@@ -105,8 +103,8 @@ class ProjectAPIEndpoint(WebhookMixin, BaseAPIView):
             .distinct()
         )
 
-    def get(self, request, slug, pk=None):
-        if pk is None:
+    def get(self, request, slug, project_id=None):
+        if project_id is None:
             sort_order_query = ProjectMember.objects.filter(
                 member=request.user,
                 project_id=OuterRef("pk"),
@@ -137,7 +135,7 @@ class ProjectAPIEndpoint(WebhookMixin, BaseAPIView):
                     expand=self.expand,
                 ).data,
             )
-        project = self.get_queryset().get(workspace__slug=slug, pk=pk)
+        project = self.get_queryset().get(workspace__slug=slug, pk=project_id)
         serializer = ProjectSerializer(
             project,
             fields=self.fields,
@@ -261,10 +259,10 @@ class ProjectAPIEndpoint(WebhookMixin, BaseAPIView):
                 status=status.HTTP_410_GONE,
             )
 
-    def patch(self, request, slug, pk):
+    def patch(self, request, slug, project_id=None):
         try:
             workspace = Workspace.objects.get(slug=slug)
-            project = Project.objects.get(pk=pk)
+            project = Project.objects.get(pk=project_id)
 
             if project.archived_at:
                 return Response(
@@ -291,11 +289,10 @@ class ProjectAPIEndpoint(WebhookMixin, BaseAPIView):
                     # Create the triage state in Backlog group
                     State.objects.get_or_create(
                         name="Triage",
-                        group="triage",
+                        group="backlog",
                         description="Default state for managing all Inbox Issues",
-                        project_id=pk,
+                        project_id=project_id,
                         color="#ff7700",
-                        is_triage=True,
                     )
 
                 project = (
@@ -325,8 +322,8 @@ class ProjectAPIEndpoint(WebhookMixin, BaseAPIView):
                 status=status.HTTP_410_GONE,
             )
 
-    def delete(self, request, slug, pk):
-        project = Project.objects.get(pk=pk, workspace__slug=slug)
+    def delete(self, request, slug, project_id):
+        project = Project.objects.get(pk=project_id, workspace__slug=slug)
         project.delete()
         return Response(status=status.HTTP_204_NO_CONTENT)
 

apiserver/plane/api/views/state.py

@@ -1,16 +1,16 @@
 # Django imports
 from django.db import IntegrityError
+from django.db.models import Q
 
 # Third party imports
-from rest_framework import status
 from rest_framework.response import Response
-
-from plane.api.serializers import StateSerializer
-from plane.app.permissions import ProjectEntityPermission
-from plane.db.models import Issue, State
+from rest_framework import status
 
 # Module imports
 from .base import BaseAPIView
+from plane.api.serializers import StateSerializer
+from plane.app.permissions import ProjectEntityPermission
+from plane.db.models import State, Issue
 
 
 class StateAPIEndpoint(BaseAPIView):
@@ -28,8 +28,8 @@ class StateAPIEndpoint(BaseAPIView):
                 project__project_projectmember__member=self.request.user,
                 project__project_projectmember__is_active=True,
             )
-            .filter(is_triage=False)
             .filter(project__archived_at__isnull=True)
+            .filter(~Q(name="Triage"))
             .select_related("project")
             .select_related("workspace")
             .distinct()
@@ -86,11 +86,7 @@ class StateAPIEndpoint(BaseAPIView):
 
     def get(self, request, slug, project_id, state_id=None):
         if state_id:
-            serializer = StateSerializer(
-                self.get_queryset().get(pk=state_id),
-                fields=self.fields,
-                expand=self.expand,
-            )
+            serializer = StateSerializer(self.get_queryset().get(pk=state_id))
             return Response(serializer.data, status=status.HTTP_200_OK)
         return self.paginate(
             request=request,
@@ -105,7 +101,7 @@ class StateAPIEndpoint(BaseAPIView):
 
     def delete(self, request, slug, project_id, state_id):
         state = State.objects.get(
-            is_triage=False,
+            ~Q(name="Triage"),
             pk=state_id,
             project_id=project_id,
             workspace__slug=slug,

apiserver/plane/app/permissions/project.py

@@ -1,8 +1,8 @@
 # Third Party imports
-from rest_framework.permissions import SAFE_METHODS, BasePermission
+from rest_framework.permissions import BasePermission, SAFE_METHODS
 
 # Module import
-from plane.db.models import ProjectMember, WorkspaceMember
+from plane.db.models import WorkspaceMember, ProjectMember
 
 # Permission Mappings
 Admin = 20

apiserver/plane/app/serializers/__init__.py

@@ -59,7 +59,6 @@ from .issue import (
     IssueFlatSerializer,
     IssueStateSerializer,
     IssueLinkSerializer,
-    IssueInboxSerializer,
     IssueLiteSerializer,
     IssueAttachmentSerializer,
     IssueSubscriberSerializer,
@@ -93,7 +92,6 @@ from .page import (
     PageSerializer,
     PageLogSerializer,
     SubPageSerializer,
-    PageDetailSerializer,
     PageFavoriteSerializer,
 )
 
@@ -109,7 +107,6 @@ from .inbox import (
     InboxIssueSerializer,
     IssueStateInboxSerializer,
     InboxIssueLiteSerializer,
-    InboxIssueDetailSerializer,
 )
 
 from .analytic import AnalyticViewSerializer

apiserver/plane/app/serializers/inbox.py

@@ -3,11 +3,7 @@ from rest_framework import serializers
 
 # Module imports
 from .base import BaseSerializer
-from .issue import (
-    IssueInboxSerializer,
-    LabelLiteSerializer,
-    IssueDetailSerializer,
-)
+from .issue import IssueFlatSerializer, LabelLiteSerializer
 from .project import ProjectLiteSerializer
 from .state import StateLiteSerializer
 from .user import UserLiteSerializer
@@ -28,62 +24,17 @@ class InboxSerializer(BaseSerializer):
 
 
 class InboxIssueSerializer(BaseSerializer):
-    issue = IssueInboxSerializer(read_only=True)
+    issue_detail = IssueFlatSerializer(source="issue", read_only=True)
+    project_detail = ProjectLiteSerializer(source="project", read_only=True)
 
     class Meta:
         model = InboxIssue
-        fields = [
-            "id",
-            "status",
-            "duplicate_to",
-            "snoozed_till",
-            "source",
-            "issue",
-            "created_by",
-        ]
+        fields = "__all__"
         read_only_fields = [
             "project",
             "workspace",
         ]
 
-    def to_representation(self, instance):
-        # Pass the annotated fields to the Issue instance if they exist
-        if hasattr(instance, "label_ids"):
-            instance.issue.label_ids = instance.label_ids
-        return super().to_representation(instance)
-
-
-class InboxIssueDetailSerializer(BaseSerializer):
-    issue = IssueDetailSerializer(read_only=True)
-    duplicate_issue_detail = IssueInboxSerializer(
-        read_only=True, source="duplicate_to"
-    )
-
-    class Meta:
-        model = InboxIssue
-        fields = [
-            "id",
-            "status",
-            "duplicate_to",
-            "snoozed_till",
-            "duplicate_issue_detail",
-            "source",
-            "issue",
-        ]
-        read_only_fields = [
-            "project",
-            "workspace",
-        ]
-
-    def to_representation(self, instance):
-        # Pass the annotated fields to the Issue instance if they exist
-        if hasattr(instance, "assignee_ids"):
-            instance.issue.assignee_ids = instance.assignee_ids
-        if hasattr(instance, "label_ids"):
-            instance.issue.label_ids = instance.label_ids
-
-        return super().to_representation(instance)
-
 
 class InboxIssueLiteSerializer(BaseSerializer):
     class Meta:

apiserver/plane/app/serializers/issue.py

@@ -620,26 +620,6 @@ class IssueStateSerializer(DynamicBaseSerializer):
         fields = "__all__"
 
 
-class IssueInboxSerializer(DynamicBaseSerializer):
-    label_ids = serializers.ListField(
-        child=serializers.UUIDField(),
-        required=False,
-    )
-
-    class Meta:
-        model = Issue
-        fields = [
-            "id",
-            "name",
-            "priority",
-            "sequence_id",
-            "project_id",
-            "created_at",
-            "label_ids",
-        ]
-        read_only_fields = fields
-
-
 class IssueSerializer(DynamicBaseSerializer):
     # ids
     cycle_id = serializers.PrimaryKeyRelatedField(read_only=True)
@@ -708,7 +688,7 @@ class IssueLiteSerializer(DynamicBaseSerializer):
 
 class IssueDetailSerializer(IssueSerializer):
     description_html = serializers.CharField()
-    is_subscribed = serializers.BooleanField(read_only=True)
+    is_subscribed = serializers.BooleanField()
 
     class Meta(IssueSerializer.Meta):
         fields = IssueSerializer.Meta.fields + [

apiserver/plane/app/serializers/module.py

@@ -210,7 +210,6 @@ class ModuleSerializer(DynamicBaseSerializer):
             "backlog_issues",
             "created_at",
             "updated_at",
-            "archived_at",
         ]
         read_only_fields = fields
 

apiserver/plane/app/serializers/page.py

@@ -3,6 +3,9 @@ from rest_framework import serializers
 
 # Module imports
 from .base import BaseSerializer
+from .issue import LabelLiteSerializer
+from .workspace import WorkspaceLiteSerializer
+from .project import ProjectLiteSerializer
 from plane.db.models import (
     Page,
     PageLog,
@@ -14,33 +17,22 @@ from plane.db.models import (
 
 class PageSerializer(BaseSerializer):
     is_favorite = serializers.BooleanField(read_only=True)
+    label_details = LabelLiteSerializer(
+        read_only=True, source="labels", many=True
+    )
     labels = serializers.ListField(
         child=serializers.PrimaryKeyRelatedField(queryset=Label.objects.all()),
         write_only=True,
         required=False,
     )
+    project_detail = ProjectLiteSerializer(source="project", read_only=True)
+    workspace_detail = WorkspaceLiteSerializer(
+        source="workspace", read_only=True
+    )
 
     class Meta:
         model = Page
-        fields = [
-            "id",
-            "name",
-            "owned_by",
-            "access",
-            "color",
-            "labels",
-            "parent",
-            "is_favorite",
-            "is_locked",
-            "archived_at",
-            "workspace",
-            "project",
-            "created_at",
-            "updated_at",
-            "created_by",
-            "updated_by",
-            "view_props",
-        ]
+        fields = "__all__"
         read_only_fields = [
             "workspace",
             "project",
@@ -56,12 +48,8 @@ class PageSerializer(BaseSerializer):
         labels = validated_data.pop("labels", None)
         project_id = self.context["project_id"]
         owned_by_id = self.context["owned_by_id"]
-        description_html = self.context["description_html"]
         page = Page.objects.create(
-            **validated_data,
-            description_html=description_html,
-            project_id=project_id,
-            owned_by_id=owned_by_id,
+            **validated_data, project_id=project_id, owned_by_id=owned_by_id
         )
 
         if labels is not None:
@@ -103,13 +91,6 @@ class PageSerializer(BaseSerializer):
         return super().update(instance, validated_data)
 
 
-class PageDetailSerializer(PageSerializer):
-    description_html = serializers.CharField()
-
-    class Meta(PageSerializer.Meta):
-        fields = PageSerializer.Meta.fields + ["description_html"]
-
-
 class SubPageSerializer(BaseSerializer):
     entity_details = serializers.SerializerMethodField()
 

apiserver/plane/app/urls/cycle.py

@@ -101,9 +101,4 @@ urlpatterns = [
         CycleArchiveUnarchiveEndpoint.as_view(),
         name="cycle-archive-unarchive",
     ),
-    path(
-        "workspaces/<str:slug>/projects/<uuid:project_id>/archived-cycles/<uuid:pk>/",
-        CycleArchiveUnarchiveEndpoint.as_view(),
-        name="cycle-archive-unarchive",
-    ),
 ]

apiserver/plane/app/urls/inbox.py

@@ -30,7 +30,7 @@ urlpatterns = [
         name="inbox",
     ),
     path(
-        "workspaces/<str:slug>/projects/<uuid:project_id>/inbox-issues/",
+        "workspaces/<str:slug>/projects/<uuid:project_id>/inboxes/<uuid:inbox_id>/inbox-issues/",
         InboxIssueViewSet.as_view(
             {
                 "get": "list",
@@ -40,7 +40,7 @@ urlpatterns = [
         name="inbox-issue",
     ),
     path(
-        "workspaces/<str:slug>/projects/<uuid:project_id>/inbox-issues/<uuid:issue_id>/",
+        "workspaces/<str:slug>/projects/<uuid:project_id>/inboxes/<uuid:inbox_id>/inbox-issues/<uuid:issue_id>/",
         InboxIssueViewSet.as_view(
             {
                 "get": "retrieve",

apiserver/plane/app/urls/module.py

@@ -121,9 +121,4 @@ urlpatterns = [
         ModuleArchiveUnarchiveEndpoint.as_view(),
         name="module-archive-unarchive",
     ),
-    path(
-        "workspaces/<str:slug>/projects/<uuid:project_id>/archived-modules/<uuid:pk>/",
-        ModuleArchiveUnarchiveEndpoint.as_view(),
-        name="module-archive-unarchive",
-    ),
 ]

apiserver/plane/app/urls/page.py

@@ -31,51 +31,102 @@ urlpatterns = [
         ),
         name="project-pages",
     ),
-    # favorite pages
     path(
-        "workspaces/<str:slug>/projects/<uuid:project_id>/favorite-pages/<uuid:pk>/",
+        "workspaces/<str:slug>/projects/<uuid:project_id>/user-favorite-pages/",
         PageFavoriteViewSet.as_view(
             {
+                "get": "list",
                 "post": "create",
+            }
+        ),
+        name="user-favorite-pages",
+    ),
+    path(
+        "workspaces/<str:slug>/projects/<uuid:project_id>/user-favorite-pages/<uuid:page_id>/",
+        PageFavoriteViewSet.as_view(
+            {
                 "delete": "destroy",
             }
         ),
         name="user-favorite-pages",
     ),
-    # archived pages
     path(
-        "workspaces/<str:slug>/projects/<uuid:project_id>/pages/<uuid:pk>/archive/",
+        "workspaces/<str:slug>/projects/<uuid:project_id>/pages/",
+        PageViewSet.as_view(
+            {
+                "get": "list",
+                "post": "create",
+            }
+        ),
+        name="project-pages",
+    ),
+    path(
+        "workspaces/<str:slug>/projects/<uuid:project_id>/pages/<uuid:pk>/",
+        PageViewSet.as_view(
+            {
+                "get": "retrieve",
+                "patch": "partial_update",
+                "delete": "destroy",
+            }
+        ),
+        name="project-pages",
+    ),
+    path(
+        "workspaces/<str:slug>/projects/<uuid:project_id>/pages/<uuid:page_id>/archive/",
         PageViewSet.as_view(
             {
                 "post": "archive",
-                "delete": "unarchive",
             }
         ),
-        name="project-page-archive-unarchive",
+        name="project-page-archive",
     ),
-    # lock and unlock
     path(
-        "workspaces/<str:slug>/projects/<uuid:project_id>/pages/<uuid:pk>/lock/",
+        "workspaces/<str:slug>/projects/<uuid:project_id>/pages/<uuid:page_id>/unarchive/",
+        PageViewSet.as_view(
+            {
+                "post": "unarchive",
+            }
+        ),
+        name="project-page-unarchive",
+    ),
+    path(
+        "workspaces/<str:slug>/projects/<uuid:project_id>/archived-pages/",
+        PageViewSet.as_view(
+            {
+                "get": "archive_list",
+            }
+        ),
+        name="project-pages",
+    ),
+    path(
+        "workspaces/<str:slug>/projects/<uuid:project_id>/pages/<uuid:page_id>/lock/",
         PageViewSet.as_view(
             {
                 "post": "lock",
-                "delete": "unlock",
             }
         ),
-        name="project-pages-lock-unlock",
+        name="project-pages",
     ),
     path(
-        "workspaces/<str:slug>/projects/<uuid:project_id>/pages/<uuid:pk>/transactions/",
+        "workspaces/<str:slug>/projects/<uuid:project_id>/pages/<uuid:page_id>/unlock/",
+        PageViewSet.as_view(
+            {
+                "post": "unlock",
+            }
+        ),
+    ),
+    path(
+        "workspaces/<str:slug>/projects/<uuid:project_id>/pages/<uuid:page_id>/transactions/",
         PageLogEndpoint.as_view(),
         name="page-transactions",
     ),
     path(
-        "workspaces/<str:slug>/projects/<uuid:project_id>/pages/<uuid:pk>/transactions/<uuid:transaction>/",
+        "workspaces/<str:slug>/projects/<uuid:project_id>/pages/<uuid:page_id>/transactions/<uuid:transaction>/",
         PageLogEndpoint.as_view(),
         name="page-transactions",
     ),
     path(
-        "workspaces/<str:slug>/projects/<uuid:project_id>/pages/<uuid:pk>/sub-pages/",
+        "workspaces/<str:slug>/projects/<uuid:project_id>/pages/<uuid:page_id>/sub-pages/",
         SubPagesEndpoint.as_view(),
         name="sub-page",
     ),

apiserver/plane/app/views/__init__.py

@@ -38,7 +38,7 @@ from .workspace.base import (
     WorkSpaceAvailabilityCheckEndpoint,
     UserWorkspaceDashboardEndpoint,
     WorkspaceThemeViewSet,
-    ExportWorkspaceUserActivityEndpoint,
+    ExportWorkspaceUserActivityEndpoint
 )
 
 from .workspace.member import (
@@ -91,14 +91,12 @@ from .cycle.base import (
     CycleDateCheckEndpoint,
     CycleFavoriteViewSet,
     TransferCycleIssueEndpoint,
+    CycleArchiveUnarchiveEndpoint,
     CycleUserPropertiesEndpoint,
 )
 from .cycle.issue import (
     CycleIssueViewSet,
 )
-from .cycle.archive import (
-    CycleArchiveUnarchiveEndpoint,
-)
 
 from .asset.base import FileAssetEndpoint, UserAssetsEndpoint, FileAssetViewSet
 from .issue.base import (
@@ -172,6 +170,7 @@ from .module.base import (
     ModuleViewSet,
     ModuleLinkViewSet,
     ModuleFavoriteViewSet,
+    ModuleArchiveUnarchiveEndpoint,
     ModuleUserPropertiesEndpoint,
 )
 
@@ -179,10 +178,6 @@ from .module.issue import (
     ModuleIssueViewSet,
 )
 
-from .module.archive import (
-    ModuleArchiveUnarchiveEndpoint,
-)
-
 from .api import ApiTokenEndpoint
 
 

apiserver/plane/app/views/base.py

@@ -1,4 +1,6 @@
 # Python imports
+import traceback
+
 import zoneinfo
 from django.conf import settings
 from django.core.exceptions import ObjectDoesNotExist, ValidationError
@@ -101,7 +103,11 @@ class BaseViewSet(TimezoneMixin, ModelViewSet, BasePaginator):
             response = super().handle_exception(exc)
             return response
         except Exception as e:
-            print(e) if settings.DEBUG else print("Server Error")
+            (
+                print(e, traceback.format_exc())
+                if settings.DEBUG
+                else print("Server Error")
+            )
             if isinstance(e, IntegrityError):
                 return Response(
                     {"error": "The payload is not valid"},

apiserver/plane/app/views/cycle/archive.py

@@ -1,409 +0,0 @@
-# Django imports
-from django.contrib.postgres.aggregates import ArrayAgg
-from django.contrib.postgres.fields import ArrayField
-from django.db.models import (
-    Case,
-    CharField,
-    Count,
-    Exists,
-    F,
-    Func,
-    OuterRef,
-    Prefetch,
-    Q,
-    UUIDField,
-    Value,
-    When,
-)
-from django.db.models.functions import Coalesce
-from django.utils import timezone
-
-# Third party imports
-from rest_framework import status
-from rest_framework.response import Response
-from plane.app.permissions import ProjectEntityPermission
-from plane.db.models import (
-    Cycle,
-    CycleFavorite,
-    Issue,
-    Label,
-    User,
-)
-from plane.utils.analytics_plot import burndown_plot
-
-# Module imports
-from .. import BaseAPIView
-
-
-class CycleArchiveUnarchiveEndpoint(BaseAPIView):
-
-    permission_classes = [
-        ProjectEntityPermission,
-    ]
-
-    def get_queryset(self):
-        favorite_subquery = CycleFavorite.objects.filter(
-            user=self.request.user,
-            cycle_id=OuterRef("pk"),
-            project_id=self.kwargs.get("project_id"),
-            workspace__slug=self.kwargs.get("slug"),
-        )
-        return (
-            Cycle.objects.filter(workspace__slug=self.kwargs.get("slug"))
-            .filter(project_id=self.kwargs.get("project_id"))
-            .filter(archived_at__isnull=False)
-            .filter(
-                project__project_projectmember__member=self.request.user,
-                project__project_projectmember__is_active=True,
-            )
-            .filter(project__archived_at__isnull=True)
-            .select_related("project", "workspace", "owned_by")
-            .prefetch_related(
-                Prefetch(
-                    "issue_cycle__issue__assignees",
-                    queryset=User.objects.only(
-                        "avatar", "first_name", "id"
-                    ).distinct(),
-                )
-            )
-            .prefetch_related(
-                Prefetch(
-                    "issue_cycle__issue__labels",
-                    queryset=Label.objects.only(
-                        "name", "color", "id"
-                    ).distinct(),
-                )
-            )
-            .annotate(is_favorite=Exists(favorite_subquery))
-            .annotate(
-                total_issues=Count(
-                    "issue_cycle__issue__id",
-                    distinct=True,
-                    filter=Q(
-                        issue_cycle__issue__archived_at__isnull=True,
-                        issue_cycle__issue__is_draft=False,
-                    ),
-                )
-            )
-            .annotate(
-                completed_issues=Count(
-                    "issue_cycle__issue__id",
-                    distinct=True,
-                    filter=Q(
-                        issue_cycle__issue__state__group="completed",
-                        issue_cycle__issue__archived_at__isnull=True,
-                        issue_cycle__issue__is_draft=False,
-                    ),
-                )
-            )
-            .annotate(
-                cancelled_issues=Count(
-                    "issue_cycle__issue__id",
-                    distinct=True,
-                    filter=Q(
-                        issue_cycle__issue__state__group="cancelled",
-                        issue_cycle__issue__archived_at__isnull=True,
-                        issue_cycle__issue__is_draft=False,
-                    ),
-                )
-            )
-            .annotate(
-                started_issues=Count(
-                    "issue_cycle__issue__id",
-                    distinct=True,
-                    filter=Q(
-                        issue_cycle__issue__state__group="started",
-                        issue_cycle__issue__archived_at__isnull=True,
-                        issue_cycle__issue__is_draft=False,
-                    ),
-                )
-            )
-            .annotate(
-                unstarted_issues=Count(
-                    "issue_cycle__issue__id",
-                    distinct=True,
-                    filter=Q(
-                        issue_cycle__issue__state__group="unstarted",
-                        issue_cycle__issue__archived_at__isnull=True,
-                        issue_cycle__issue__is_draft=False,
-                    ),
-                )
-            )
-            .annotate(
-                backlog_issues=Count(
-                    "issue_cycle__issue__id",
-                    distinct=True,
-                    filter=Q(
-                        issue_cycle__issue__state__group="backlog",
-                        issue_cycle__issue__archived_at__isnull=True,
-                        issue_cycle__issue__is_draft=False,
-                    ),
-                )
-            )
-            .annotate(
-                status=Case(
-                    When(
-                        Q(start_date__lte=timezone.now())
-                        & Q(end_date__gte=timezone.now()),
-                        then=Value("CURRENT"),
-                    ),
-                    When(
-                        start_date__gt=timezone.now(), then=Value("UPCOMING")
-                    ),
-                    When(end_date__lt=timezone.now(), then=Value("COMPLETED")),
-                    When(
-                        Q(start_date__isnull=True) & Q(end_date__isnull=True),
-                        then=Value("DRAFT"),
-                    ),
-                    default=Value("DRAFT"),
-                    output_field=CharField(),
-                )
-            )
-            .annotate(
-                assignee_ids=Coalesce(
-                    ArrayAgg(
-                        "issue_cycle__issue__assignees__id",
-                        distinct=True,
-                        filter=~Q(
-                            issue_cycle__issue__assignees__id__isnull=True
-                        ),
-                    ),
-                    Value([], output_field=ArrayField(UUIDField())),
-                )
-            )
-            .order_by("-is_favorite", "name")
-            .distinct()
-        )
-
-    def get(self, request, slug, project_id, pk=None):
-        if pk is None:
-            queryset = (
-                self.get_queryset()
-                .annotate(
-                    total_issues=Count(
-                        "issue_cycle",
-                        filter=Q(
-                            issue_cycle__issue__archived_at__isnull=True,
-                            issue_cycle__issue__is_draft=False,
-                        ),
-                    )
-                )
-                .values(
-                    # necessary fields
-                    "id",
-                    "workspace_id",
-                    "project_id",
-                    # model fields
-                    "name",
-                    "description",
-                    "start_date",
-                    "end_date",
-                    "owned_by_id",
-                    "view_props",
-                    "sort_order",
-                    "external_source",
-                    "external_id",
-                    "progress_snapshot",
-                    # meta fields
-                    "total_issues",
-                    "is_favorite",
-                    "cancelled_issues",
-                    "completed_issues",
-                    "started_issues",
-                    "unstarted_issues",
-                    "backlog_issues",
-                    "assignee_ids",
-                    "status",
-                    "archived_at",
-                )
-            ).order_by("-is_favorite", "-created_at")
-            return Response(queryset, status=status.HTTP_200_OK)
-        else:
-            queryset = (
-                self.get_queryset()
-                .filter(archived_at__isnull=False)
-                .filter(pk=pk)
-            )
-            data = (
-                self.get_queryset()
-                .filter(pk=pk)
-                .annotate(
-                    sub_issues=Issue.issue_objects.filter(
-                        project_id=self.kwargs.get("project_id"),
-                        parent__isnull=False,
-                        issue_cycle__cycle_id=pk,
-                    )
-                    .order_by()
-                    .annotate(count=Func(F("id"), function="Count"))
-                    .values("count")
-                )
-                .values(
-                    # necessary fields
-                    "id",
-                    "workspace_id",
-                    "project_id",
-                    # model fields
-                    "name",
-                    "description",
-                    "start_date",
-                    "end_date",
-                    "owned_by_id",
-                    "view_props",
-                    "sort_order",
-                    "external_source",
-                    "external_id",
-                    "progress_snapshot",
-                    "sub_issues",
-                    # meta fields
-                    "is_favorite",
-                    "total_issues",
-                    "cancelled_issues",
-                    "completed_issues",
-                    "started_issues",
-                    "unstarted_issues",
-                    "backlog_issues",
-                    "assignee_ids",
-                    "status",
-                )
-                .first()
-            )
-            queryset = queryset.first()
-
-            if data is None:
-                return Response(
-                    {"error": "Cycle does not exist"},
-                    status=status.HTTP_400_BAD_REQUEST,
-                )
-
-            # Assignee Distribution
-            assignee_distribution = (
-                Issue.objects.filter(
-                    issue_cycle__cycle_id=pk,
-                    workspace__slug=slug,
-                    project_id=project_id,
-                )
-                .annotate(first_name=F("assignees__first_name"))
-                .annotate(last_name=F("assignees__last_name"))
-                .annotate(assignee_id=F("assignees__id"))
-                .annotate(avatar=F("assignees__avatar"))
-                .annotate(display_name=F("assignees__display_name"))
-                .values(
-                    "first_name",
-                    "last_name",
-                    "assignee_id",
-                    "avatar",
-                    "display_name",
-                )
-                .annotate(
-                    total_issues=Count(
-                        "id",
-                        filter=Q(archived_at__isnull=True, is_draft=False),
-                    ),
-                )
-                .annotate(
-                    completed_issues=Count(
-                        "id",
-                        filter=Q(
-                            completed_at__isnull=False,
-                            archived_at__isnull=True,
-                            is_draft=False,
-                        ),
-                    )
-                )
-                .annotate(
-                    pending_issues=Count(
-                        "id",
-                        filter=Q(
-                            completed_at__isnull=True,
-                            archived_at__isnull=True,
-                            is_draft=False,
-                        ),
-                    )
-                )
-                .order_by("first_name", "last_name")
-            )
-
-            # Label Distribution
-            label_distribution = (
-                Issue.objects.filter(
-                    issue_cycle__cycle_id=pk,
-                    workspace__slug=slug,
-                    project_id=project_id,
-                )
-                .annotate(label_name=F("labels__name"))
-                .annotate(color=F("labels__color"))
-                .annotate(label_id=F("labels__id"))
-                .values("label_name", "color", "label_id")
-                .annotate(
-                    total_issues=Count(
-                        "id",
-                        filter=Q(archived_at__isnull=True, is_draft=False),
-                    ),
-                )
-                .annotate(
-                    completed_issues=Count(
-                        "id",
-                        filter=Q(
-                            completed_at__isnull=False,
-                            archived_at__isnull=True,
-                            is_draft=False,
-                        ),
-                    )
-                )
-                .annotate(
-                    pending_issues=Count(
-                        "id",
-                        filter=Q(
-                            completed_at__isnull=True,
-                            archived_at__isnull=True,
-                            is_draft=False,
-                        ),
-                    )
-                )
-                .order_by("label_name")
-            )
-
-            data["distribution"] = {
-                "assignees": assignee_distribution,
-                "labels": label_distribution,
-                "completion_chart": {},
-            }
-
-            if queryset.start_date and queryset.end_date:
-                data["distribution"]["completion_chart"] = burndown_plot(
-                    queryset=queryset,
-                    slug=slug,
-                    project_id=project_id,
-                    cycle_id=pk,
-                )
-
-            return Response(
-                data,
-                status=status.HTTP_200_OK,
-            )
-
-    def post(self, request, slug, project_id, cycle_id):
-        cycle = Cycle.objects.get(
-            pk=cycle_id, project_id=project_id, workspace__slug=slug
-        )
-
-        if cycle.end_date >= timezone.now().date():
-            return Response(
-                {"error": "Only completed cycles can be archived"},
-                status=status.HTTP_400_BAD_REQUEST,
-            )
-
-        cycle.archived_at = timezone.now()
-        cycle.save()
-        return Response(
-            {"archived_at": str(cycle.archived_at)},
-            status=status.HTTP_200_OK,
-        )
-
-    def delete(self, request, slug, project_id, cycle_id):
-        cycle = Cycle.objects.get(
-            pk=cycle_id, project_id=project_id, workspace__slug=slug
-        )
-        cycle.archived_at = None
-        cycle.save()
-        return Response(status=status.HTTP_204_NO_CONTENT)

apiserver/plane/app/views/cycle/base.py

@@ -1,9 +1,10 @@
 # Python imports
 import json
 
-# Django imports
 from django.contrib.postgres.aggregates import ArrayAgg
 from django.contrib.postgres.fields import ArrayField
+
+# Django imports
 from django.db.models import (
     Case,
     CharField,
@@ -20,10 +21,11 @@ from django.db.models import (
 )
 from django.db.models.functions import Coalesce
 from django.utils import timezone
+from rest_framework import status
 
 # Third party imports
-from rest_framework import status
 from rest_framework.response import Response
+
 from plane.app.permissions import (
     ProjectEntityPermission,
     ProjectLitePermission,
@@ -538,13 +540,6 @@ class CycleViewSet(WebhookMixin, BaseViewSet):
             .first()
         )
         queryset = queryset.first()
-
-        if data is None:
-            return Response(
-                {"error": "Cycle does not exist"},
-                status=status.HTTP_400_BAD_REQUEST,
-            )
-
         # Assignee Distribution
         assignee_distribution = (
             Issue.objects.filter(
@@ -684,6 +679,197 @@ class CycleViewSet(WebhookMixin, BaseViewSet):
         return Response(status=status.HTTP_204_NO_CONTENT)
 
 
+class CycleArchiveUnarchiveEndpoint(BaseAPIView):
+
+    permission_classes = [
+        ProjectEntityPermission,
+    ]
+
+    def get_queryset(self):
+        favorite_subquery = CycleFavorite.objects.filter(
+            user=self.request.user,
+            cycle_id=OuterRef("pk"),
+            project_id=self.kwargs.get("project_id"),
+            workspace__slug=self.kwargs.get("slug"),
+        )
+        return (
+            Cycle.objects.filter(workspace__slug=self.kwargs.get("slug"))
+            .filter(project_id=self.kwargs.get("project_id"))
+            .filter(archived_at__isnull=False)
+            .filter(
+                project__project_projectmember__member=self.request.user,
+                project__project_projectmember__is_active=True,
+            )
+            .filter(project__archived_at__isnull=True)
+            .select_related("project", "workspace", "owned_by")
+            .prefetch_related(
+                Prefetch(
+                    "issue_cycle__issue__assignees",
+                    queryset=User.objects.only(
+                        "avatar", "first_name", "id"
+                    ).distinct(),
+                )
+            )
+            .prefetch_related(
+                Prefetch(
+                    "issue_cycle__issue__labels",
+                    queryset=Label.objects.only(
+                        "name", "color", "id"
+                    ).distinct(),
+                )
+            )
+            .annotate(is_favorite=Exists(favorite_subquery))
+            .annotate(
+                completed_issues=Count(
+                    "issue_cycle__issue__state__group",
+                    filter=Q(
+                        issue_cycle__issue__state__group="completed",
+                        issue_cycle__issue__archived_at__isnull=True,
+                        issue_cycle__issue__is_draft=False,
+                    ),
+                )
+            )
+            .annotate(
+                cancelled_issues=Count(
+                    "issue_cycle__issue__state__group",
+                    filter=Q(
+                        issue_cycle__issue__state__group="cancelled",
+                        issue_cycle__issue__archived_at__isnull=True,
+                        issue_cycle__issue__is_draft=False,
+                    ),
+                )
+            )
+            .annotate(
+                started_issues=Count(
+                    "issue_cycle__issue__state__group",
+                    filter=Q(
+                        issue_cycle__issue__state__group="started",
+                        issue_cycle__issue__archived_at__isnull=True,
+                        issue_cycle__issue__is_draft=False,
+                    ),
+                )
+            )
+            .annotate(
+                unstarted_issues=Count(
+                    "issue_cycle__issue__state__group",
+                    filter=Q(
+                        issue_cycle__issue__state__group="unstarted",
+                        issue_cycle__issue__archived_at__isnull=True,
+                        issue_cycle__issue__is_draft=False,
+                    ),
+                )
+            )
+            .annotate(
+                backlog_issues=Count(
+                    "issue_cycle__issue__state__group",
+                    filter=Q(
+                        issue_cycle__issue__state__group="backlog",
+                        issue_cycle__issue__archived_at__isnull=True,
+                        issue_cycle__issue__is_draft=False,
+                    ),
+                )
+            )
+            .annotate(
+                status=Case(
+                    When(
+                        Q(start_date__lte=timezone.now())
+                        & Q(end_date__gte=timezone.now()),
+                        then=Value("CURRENT"),
+                    ),
+                    When(
+                        start_date__gt=timezone.now(), then=Value("UPCOMING")
+                    ),
+                    When(end_date__lt=timezone.now(), then=Value("COMPLETED")),
+                    When(
+                        Q(start_date__isnull=True) & Q(end_date__isnull=True),
+                        then=Value("DRAFT"),
+                    ),
+                    default=Value("DRAFT"),
+                    output_field=CharField(),
+                )
+            )
+            .annotate(
+                assignee_ids=Coalesce(
+                    ArrayAgg(
+                        "issue_cycle__issue__assignees__id",
+                        distinct=True,
+                        filter=~Q(
+                            issue_cycle__issue__assignees__id__isnull=True
+                        )
+                        & Q(
+                            issue_cycle__issue__assignees__member_project__is_active=True
+                        ),
+                    ),
+                    Value([], output_field=ArrayField(UUIDField())),
+                )
+            )
+            .order_by("-is_favorite", "name")
+            .distinct()
+        )
+
+    def get(self, request, slug, project_id):
+        queryset = (
+            self.get_queryset()
+            .annotate(
+                total_issues=Count(
+                    "issue_cycle",
+                    filter=Q(
+                        issue_cycle__issue__archived_at__isnull=True,
+                        issue_cycle__issue__is_draft=False,
+                    ),
+                )
+            )
+            .values(
+                # necessary fields
+                "id",
+                "workspace_id",
+                "project_id",
+                # model fields
+                "name",
+                "description",
+                "start_date",
+                "end_date",
+                "owned_by_id",
+                "view_props",
+                "sort_order",
+                "external_source",
+                "external_id",
+                "progress_snapshot",
+                # meta fields
+                "total_issues",
+                "is_favorite",
+                "cancelled_issues",
+                "completed_issues",
+                "started_issues",
+                "unstarted_issues",
+                "backlog_issues",
+                "assignee_ids",
+                "status",
+                "archived_at",
+            )
+        ).order_by("-is_favorite", "-created_at")
+        return Response(queryset, status=status.HTTP_200_OK)
+
+    def post(self, request, slug, project_id, cycle_id):
+        cycle = Cycle.objects.get(
+            pk=cycle_id, project_id=project_id, workspace__slug=slug
+        )
+        cycle.archived_at = timezone.now()
+        cycle.save()
+        return Response(
+            {"archived_at": str(cycle.archived_at)},
+            status=status.HTTP_200_OK,
+        )
+
+    def delete(self, request, slug, project_id, cycle_id):
+        cycle = Cycle.objects.get(
+            pk=cycle_id, project_id=project_id, workspace__slug=slug
+        )
+        cycle.archived_at = None
+        cycle.save()
+        return Response(status=status.HTTP_204_NO_CONTENT)
+
+
 class CycleDateCheckEndpoint(BaseAPIView):
     permission_classes = [
         ProjectEntityPermission,

apiserver/plane/app/views/cycle/issue.py

@@ -2,42 +2,49 @@
 import json
 
 # Django imports
-from django.db.models import (
-    Func,
-    F,
-    Q,
-    OuterRef,
-    Value,
-    UUIDField,
-)
 from django.core import serializers
+from django.db.models import (
+    F,
+    Func,
+    OuterRef,
+    Q,
+)
 from django.utils import timezone
 from django.utils.decorators import method_decorator
 from django.views.decorators.gzip import gzip_page
-from django.contrib.postgres.aggregates import ArrayAgg
-from django.contrib.postgres.fields import ArrayField
-from django.db.models.functions import Coalesce
 
 # Third party imports
-from rest_framework.response import Response
 from rest_framework import status
+from rest_framework.response import Response
 
-# Module imports
-from .. import BaseViewSet, WebhookMixin
+from plane.app.permissions import (
+    ProjectEntityPermission,
+)
 from plane.app.serializers import (
-    IssueSerializer,
     CycleIssueSerializer,
 )
-from plane.app.permissions import ProjectEntityPermission
+from plane.bgtasks.issue_activites_task import issue_activity
 from plane.db.models import (
     Cycle,
     CycleIssue,
     Issue,
-    IssueLink,
     IssueAttachment,
+    IssueLink,
+)
+from plane.utils.grouper import (
+    issue_group_values,
+    issue_on_results,
+    issue_queryset_grouper,
 )
-from plane.bgtasks.issue_activites_task import issue_activity
 from plane.utils.issue_filters import issue_filters
+from plane.utils.order_queryset import order_issue_queryset
+from plane.utils.paginator import (
+    GroupedOffsetPaginator,
+    SubGroupedOffsetPaginator,
+)
+
+# Module imports
+from .. import BaseViewSet, WebhookMixin
 
 
 class CycleIssueViewSet(WebhookMixin, BaseViewSet):
@@ -86,14 +93,9 @@ class CycleIssueViewSet(WebhookMixin, BaseViewSet):
 
     @method_decorator(gzip_page)
     def list(self, request, slug, project_id, cycle_id):
-        fields = [
-            field
-            for field in request.GET.get("fields", "").split(",")
-            if field
-        ]
-        order_by = request.GET.get("order_by", "created_at")
+        order_by_param = request.GET.get("order_by", "created_at")
         filters = issue_filters(request.query_params, "GET")
-        queryset = (
+        issue_queryset = (
             Issue.issue_objects.filter(issue_cycle__cycle_id=cycle_id)
             .filter(project_id=project_id)
             .filter(workspace__slug=slug)
@@ -105,7 +107,6 @@ class CycleIssueViewSet(WebhookMixin, BaseViewSet):
                 "issue_module__module",
                 "issue_cycle__cycle",
             )
-            .order_by(order_by)
             .filter(**filters)
             .annotate(cycle_id=F("issue_cycle__cycle_id"))
             .annotate(
@@ -130,68 +131,124 @@ class CycleIssueViewSet(WebhookMixin, BaseViewSet):
                 .annotate(count=Func(F("id"), function="Count"))
                 .values("count")
             )
-            .annotate(
-                label_ids=Coalesce(
-                    ArrayAgg(
-                        "labels__id",
-                        distinct=True,
-                        filter=~Q(labels__id__isnull=True),
-                    ),
-                    Value([], output_field=ArrayField(UUIDField())),
-                ),
-                assignee_ids=Coalesce(
-                    ArrayAgg(
-                        "assignees__id",
-                        distinct=True,
-                        filter=~Q(assignees__id__isnull=True)
-                        & Q(assignees__member_project__is_active=True),
-                    ),
-                    Value([], output_field=ArrayField(UUIDField())),
-                ),
-                module_ids=Coalesce(
-                    ArrayAgg(
-                        "issue_module__module_id",
-                        distinct=True,
-                        filter=~Q(issue_module__module_id__isnull=True),
-                    ),
-                    Value([], output_field=ArrayField(UUIDField())),
-                ),
-            )
-            .order_by(order_by)
         )
-        if self.fields:
-            issues = IssueSerializer(
-                queryset, many=True, fields=fields if fields else None
-            ).data
+        filters = issue_filters(request.query_params, "GET")
+
+        order_by_param = request.GET.get("order_by", "-created_at")
+        issue_queryset = issue_queryset.filter(**filters)
+        # Issue queryset
+        issue_queryset = 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,
+        )
+
+        if group_by:
+            # Check group and sub group value paginate
+            if sub_group_by:
+                if group_by == sub_group_by:
+                    return Response(
+                        {
+                            "error": "Group by and sub group by cannot have same parameters"
+                        },
+                        status=status.HTTP_400_BAD_REQUEST,
+                    )
+                else:
+                    # group and sub group pagination
+                    return self.paginate(
+                        request=request,
+                        order_by=(
+                            "priority_order"
+                            if order_by_param in ["priority", "-priority"]
+                            else order_by_param
+                        ),
+                        queryset=issue_queryset,
+                        on_results=lambda issues: issue_on_results(
+                            group_by=group_by,
+                            issues=issues,
+                            sub_group_by=sub_group_by,
+                        ),
+                        paginator_cls=SubGroupedOffsetPaginator,
+                        group_by_fields=issue_group_values(
+                            field=group_by,
+                            slug=slug,
+                            project_id=project_id,
+                            filters=filters,
+                        ),
+                        sub_group_by_fields=issue_group_values(
+                            field=sub_group_by,
+                            slug=slug,
+                            project_id=project_id,
+                            filters=filters,
+                        ),
+                        group_by_field_name=group_by,
+                        sub_group_by_field_name=sub_group_by,
+                        count_filter=Q(
+                            Q(issue_inbox__status=1)
+                            | Q(issue_inbox__status=-1)
+                            | Q(issue_inbox__status=2)
+                            | Q(issue_inbox__isnull=True),
+                            archived_at__isnull=True,
+                            is_draft=False,
+                        ),
+                    )
+            # Group Paginate
+            else:
+                # Group paginate
+                return self.paginate(
+                    request=request,
+                    order_by=(
+                        "priority_order"
+                        if order_by_param in ["priority", "-priority"]
+                        else order_by_param
+                    ),
+                    queryset=issue_queryset,
+                    on_results=lambda issues: issue_on_results(
+                        group_by=group_by,
+                        issues=issues,
+                        sub_group_by=sub_group_by,
+                    ),
+                    paginator_cls=GroupedOffsetPaginator,
+                    group_by_fields=issue_group_values(
+                        field=group_by,
+                        slug=slug,
+                        project_id=project_id,
+                        filters=filters,
+                    ),
+                    group_by_field_name=group_by,
+                    count_filter=Q(
+                        Q(issue_inbox__status=1)
+                        | Q(issue_inbox__status=-1)
+                        | Q(issue_inbox__status=2)
+                        | Q(issue_inbox__isnull=True),
+                        archived_at__isnull=True,
+                        is_draft=False,
+                    ),
+                )
         else:
-            issues = queryset.values(
-                "id",
-                "name",
-                "state_id",
-                "sort_order",
-                "completed_at",
-                "estimate_point",
-                "priority",
-                "start_date",
-                "target_date",
-                "sequence_id",
-                "project_id",
-                "parent_id",
-                "cycle_id",
-                "module_ids",
-                "label_ids",
-                "assignee_ids",
-                "sub_issues_count",
-                "created_at",
-                "updated_at",
-                "created_by",
-                "updated_by",
-                "attachment_count",
-                "link_count",
-                "is_draft",
-                "archived_at",
+            # List Paginate
+            return self.paginate(
+                order_by=(
+                    "-priority_order"
+                    if order_by_param in ["priority", "-priority"]
+                    else order_by_param
+                ),
+                request=request,
+                queryset=issue_queryset,
+                on_results=lambda issues: issue_on_results(
+                    group_by=group_by, issues=issues, sub_group_by=sub_group_by
+                ),
             )
-        return Response(issues, status=status.HTTP_200_OK)
 
     def create(self, request, slug, project_id, cycle_id):
         issues = request.data.get("issues", [])

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

@@ -1,52 +1,53 @@
 # Django imports
-from django.db.models import (
-    Q,
-    Case,
-    When,
-    Value,
-    CharField,
-    Count,
-    F,
-    Exists,
-    OuterRef,
-    Subquery,
-    JSONField,
-    Func,
-    Prefetch,
-    IntegerField,
-)
 from django.contrib.postgres.aggregates import ArrayAgg
 from django.contrib.postgres.fields import ArrayField
-from django.db.models import UUIDField
+from django.db.models import (
+    Case,
+    CharField,
+    Count,
+    Exists,
+    F,
+    Func,
+    IntegerField,
+    JSONField,
+    OuterRef,
+    Prefetch,
+    Q,
+    Subquery,
+    UUIDField,
+    Value,
+    When,
+)
 from django.db.models.functions import Coalesce
 from django.utils import timezone
+from rest_framework import status
 
 # Third Party imports
 from rest_framework.response import Response
-from rest_framework import status
+
+from plane.app.serializers import (
+    DashboardSerializer,
+    IssueActivitySerializer,
+    IssueSerializer,
+    WidgetSerializer,
+)
+from plane.db.models import (
+    Dashboard,
+    DashboardWidget,
+    Issue,
+    IssueActivity,
+    IssueAttachment,
+    IssueLink,
+    IssueRelation,
+    Project,
+    ProjectMember,
+    User,
+    Widget,
+)
+from plane.utils.issue_filters import issue_filters
 
 # Module imports
 from .. import BaseAPIView
-from plane.db.models import (
-    Issue,
-    IssueActivity,
-    ProjectMember,
-    Widget,
-    DashboardWidget,
-    Dashboard,
-    Project,
-    IssueLink,
-    IssueAttachment,
-    IssueRelation,
-    User,
-)
-from plane.app.serializers import (
-    IssueActivitySerializer,
-    IssueSerializer,
-    DashboardSerializer,
-    WidgetSerializer,
-)
-from plane.utils.issue_filters import issue_filters
 
 
 def dashboard_overview_stats(self, request, slug):
@@ -569,18 +570,17 @@ def dashboard_recent_collaborators(self, request, slug):
         )
 
     return self.paginate(
+        order_by=request.GET.get("order_by", "-created_at"),
         request=request,
         queryset=project_members_with_activities,
-        controller=lambda qs: self.get_results_controller(qs, slug),
+        controller=self.get_results_controller,
     )
 
 
 class DashboardEndpoint(BaseAPIView):
-    def get_results_controller(self, project_members_with_activities, slug):
+    def get_results_controller(self, project_members_with_activities):
         user_active_issue_counts = (
-            User.objects.filter(
-                id__in=project_members_with_activities,
-            )
+            User.objects.filter(id__in=project_members_with_activities)
             .annotate(
                 active_issue_count=Count(
                     Case(
@@ -589,13 +589,10 @@ class DashboardEndpoint(BaseAPIView):
                                 "unstarted",
                                 "started",
                             ],
-                            issue_assignee__issue__workspace__slug=slug,
-                            issue_assignee__issue__project__project_projectmember__is_active=True,
-                            then=F("issue_assignee__issue__id"),
+                            then=1,
                         ),
                         output_field=IntegerField(),
-                    ),
-                    distinct=True,
+                    )
                 )
             )
             .values("active_issue_count", user_id=F("id"))

apiserver/plane/app/views/exporter/base.py

@@ -1,14 +1,14 @@
 # Third Party imports
-from rest_framework.response import Response
 from rest_framework import status
+from rest_framework.response import Response
+
+from plane.app.permissions import WorkSpaceAdminPermission
+from plane.app.serializers import ExporterHistorySerializer
+from plane.bgtasks.export_task import issue_export_task
+from plane.db.models import ExporterHistory, Project, Workspace
 
 # Module imports
 from .. import BaseAPIView
-from plane.app.permissions import WorkSpaceAdminPermission
-from plane.bgtasks.export_task import issue_export_task
-from plane.db.models import Project, ExporterHistory, Workspace
-
-from plane.app.serializers import ExporterHistorySerializer
 
 
 class ExportIssuesEndpoint(BaseAPIView):
@@ -72,6 +72,7 @@ class ExportIssuesEndpoint(BaseAPIView):
             "cursor", False
         ):
             return self.paginate(
+                order_by=request.GET.get("order_by", "-created_at"),
                 request=request,
                 queryset=exporter_history,
                 on_results=lambda exporter_history: ExporterHistorySerializer(

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

@@ -3,7 +3,7 @@ import json
 
 # Django import
 from django.utils import timezone
-from django.db.models import Q, Count, OuterRef, Func, F, Prefetch
+from django.db.models import Q, Count, OuterRef, Func, F, Prefetch, Exists
 from django.core.serializers.json import DjangoJSONEncoder
 from django.contrib.postgres.aggregates import ArrayAgg
 from django.contrib.postgres.fields import ArrayField
@@ -24,15 +24,16 @@ from plane.db.models import (
     State,
     IssueLink,
     IssueAttachment,
-    Project,
     ProjectMember,
+    IssueReaction,
+    IssueSubscriber,
 )
 from plane.app.serializers import (
     IssueCreateSerializer,
     IssueSerializer,
     InboxSerializer,
     InboxIssueSerializer,
-    InboxIssueDetailSerializer,
+    IssueDetailSerializer,
 )
 from plane.utils.issue_filters import issue_filters
 from plane.bgtasks.issue_activites_task import issue_activity
@@ -63,20 +64,13 @@ class InboxViewSet(BaseViewSet):
             .select_related("workspace", "project")
         )
 
-    def list(self, request, slug, project_id):
-        inbox = self.get_queryset().first()
-        return Response(
-            InboxSerializer(inbox).data,
-            status=status.HTTP_200_OK,
-        )
-
     def perform_create(self, serializer):
         serializer.save(project_id=self.kwargs.get("project_id"))
 
     def destroy(self, request, slug, project_id, pk):
-        inbox = Inbox.objects.filter(
+        inbox = Inbox.objects.get(
             workspace__slug=slug, project_id=project_id, pk=pk
-        ).first()
+        )
         # Handle default inbox delete
         if inbox.is_default:
             return Response(
@@ -104,6 +98,7 @@ class InboxIssueViewSet(BaseViewSet):
             Issue.objects.filter(
                 project_id=self.kwargs.get("project_id"),
                 workspace__slug=self.kwargs.get("slug"),
+                issue_inbox__inbox_id=self.kwargs.get("inbox_id"),
             )
             .select_related("workspace", "project", "state", "parent")
             .prefetch_related("assignees", "labels", "issue_module__module")
@@ -167,49 +162,51 @@ class InboxIssueViewSet(BaseViewSet):
             )
         ).distinct()
 
-    def list(self, request, slug, project_id):
-        inbox_id = Inbox.objects.filter(
-            workspace__slug=slug, project_id=project_id
-        ).first()
-        filters = issue_filters(request.GET, "GET", "issue__")
-        inbox_issue = (
-            InboxIssue.objects.filter(
-                inbox_id=inbox_id.id, project_id=project_id, **filters
+    def list(self, request, slug, project_id, inbox_id):
+        filters = issue_filters(request.query_params, "GET")
+        issue_queryset = (
+            self.get_queryset()
+            .filter(**filters)
+            .order_by("issue_inbox__snoozed_till", "issue_inbox__status")
+        )
+        if self.expand:
+            issues = IssueSerializer(
+                issue_queryset, expand=self.expand, many=True
+            ).data
+        else:
+            issues = issue_queryset.values(
+                "id",
+                "name",
+                "state_id",
+                "sort_order",
+                "completed_at",
+                "estimate_point",
+                "priority",
+                "start_date",
+                "target_date",
+                "sequence_id",
+                "project_id",
+                "parent_id",
+                "cycle_id",
+                "module_ids",
+                "label_ids",
+                "assignee_ids",
+                "sub_issues_count",
+                "created_at",
+                "updated_at",
+                "created_by",
+                "updated_by",
+                "attachment_count",
+                "link_count",
+                "is_draft",
+                "archived_at",
             )
-            .select_related("issue")
-            .prefetch_related(
-                "issue__labels",
-            )
-            .annotate(
-                label_ids=Coalesce(
-                    ArrayAgg(
-                        "issue__labels__id",
-                        distinct=True,
-                        filter=~Q(issue__labels__id__isnull=True),
-                    ),
-                    Value([], output_field=ArrayField(UUIDField())),
-                )
-            )
-        ).order_by(request.GET.get("order_by", "-issue__created_at"))
-        # inbox status filter
-        inbox_status = [
-            item
-            for item in request.GET.get("status", "-2").split(",")
-            if item != "null"
-        ]
-        if inbox_status:
-            inbox_issue = inbox_issue.filter(status__in=inbox_status)
-
-        return self.paginate(
-            request=request,
-            queryset=(inbox_issue),
-            on_results=lambda inbox_issues: InboxIssueSerializer(
-                inbox_issues,
-                many=True,
-            ).data,
+        return Response(
+            issues,
+            status=status.HTTP_200_OK,
         )
 
-    def create(self, request, slug, project_id):
+    def create(self, request, slug, project_id, inbox_id):
         if not request.data.get("issue", {}).get("name", False):
             return Response(
                 {"error": "Name is required"},
@@ -232,88 +229,49 @@ class InboxIssueViewSet(BaseViewSet):
         # Create or get state
         state, _ = State.objects.get_or_create(
             name="Triage",
-            group="triage",
+            group="backlog",
             description="Default state for managing all Inbox Issues",
             project_id=project_id,
             color="#ff7700",
-            is_triage=True,
         )
 
         # create an issue
-        project = Project.objects.get(pk=project_id)
-        serializer = IssueCreateSerializer(
-            data=request.data.get("issue"),
-            context={
-                "project_id": project_id,
-                "workspace_id": project.workspace_id,
-                "default_assignee_id": project.default_assignee_id,
-            },
+        issue = Issue.objects.create(
+            name=request.data.get("issue", {}).get("name"),
+            description=request.data.get("issue", {}).get("description", {}),
+            description_html=request.data.get("issue", {}).get(
+                "description_html", "<p></p>"
+            ),
+            priority=request.data.get("issue", {}).get("priority", "low"),
+            project_id=project_id,
+            state=state,
         )
-        if serializer.is_valid():
-            serializer.save()
-            # Create an Issue Activity
-            issue_activity.delay(
-                type="issue.activity.created",
-                requested_data=json.dumps(request.data, cls=DjangoJSONEncoder),
-                actor_id=str(request.user.id),
-                issue_id=str(serializer.data["id"]),
-                project_id=str(project_id),
-                current_instance=None,
-                epoch=int(timezone.now().timestamp()),
-                notification=True,
-                origin=request.META.get("HTTP_ORIGIN"),
-            )
-            inbox_id = Inbox.objects.filter(
-                workspace__slug=slug, project_id=project_id
-            ).first()
-            # create an inbox issue
-            inbox_issue = InboxIssue.objects.create(
-                inbox_id=inbox_id.id,
-                project_id=project_id,
-                issue_id=serializer.data["id"],
-                source=request.data.get("source", "in-app"),
-            )
-            inbox_issue = (
-                InboxIssue.objects.select_related("issue")
-                .prefetch_related(
-                    "issue__labels",
-                    "issue__assignees",
-                )
-                .annotate(
-                    label_ids=Coalesce(
-                        ArrayAgg(
-                            "issue__labels__id",
-                            distinct=True,
-                            filter=~Q(issue__labels__id__isnull=True),
-                        ),
-                        Value([], output_field=ArrayField(UUIDField())),
-                    ),
-                    assignee_ids=Coalesce(
-                        ArrayAgg(
-                            "issue__assignees__id",
-                            distinct=True,
-                            filter=~Q(issue__assignees__id__isnull=True),
-                        ),
-                        Value([], output_field=ArrayField(UUIDField())),
-                    ),
-                )
-                .get(
-                    inbox_id=inbox_id.id,
-                    issue_id=serializer.data["id"],
-                    project_id=project_id,
-                )
-            )
-            serializer = InboxIssueDetailSerializer(inbox_issue)
-            return Response(serializer.data, status=status.HTTP_200_OK)
-        else:
-            return Response(
-                serializer.errors, status=status.HTTP_400_BAD_REQUEST
-            )
 
-    def partial_update(self, request, slug, project_id, issue_id):
-        inbox_id = Inbox.objects.filter(
-            workspace__slug=slug, project_id=project_id
-        ).first()
+        # Create an Issue Activity
+        issue_activity.delay(
+            type="issue.activity.created",
+            requested_data=json.dumps(request.data, cls=DjangoJSONEncoder),
+            actor_id=str(request.user.id),
+            issue_id=str(issue.id),
+            project_id=str(project_id),
+            current_instance=None,
+            epoch=int(timezone.now().timestamp()),
+            notification=True,
+            origin=request.META.get("HTTP_ORIGIN"),
+        )
+        # create an inbox issue
+        InboxIssue.objects.create(
+            inbox_id=inbox_id,
+            project_id=project_id,
+            issue=issue,
+            source=request.data.get("source", "in-app"),
+        )
+
+        issue = self.get_queryset().filter(pk=issue.id).first()
+        serializer = IssueSerializer(issue, expand=self.expand)
+        return Response(serializer.data, status=status.HTTP_200_OK)
+
+    def partial_update(self, request, slug, project_id, inbox_id, issue_id):
         inbox_issue = InboxIssue.objects.get(
             issue_id=issue_id,
             workspace__slug=slug,
@@ -338,12 +296,9 @@ class InboxIssueViewSet(BaseViewSet):
 
         # Get issue data
         issue_data = request.data.pop("issue", False)
+
         if bool(issue_data):
-            issue = Issue.objects.get(
-                pk=inbox_issue.issue_id,
-                workspace__slug=slug,
-                project_id=project_id,
-            )
+            issue = self.get_queryset().filter(pk=inbox_issue.issue_id).first()
             # Only allow guests and viewers to edit name and description
             if project_member.role <= 10:
                 # viewers and guests since only viewers and guests
@@ -391,9 +346,7 @@ class InboxIssueViewSet(BaseViewSet):
             serializer = InboxIssueSerializer(
                 inbox_issue, data=request.data, partial=True
             )
-            current_instance = json.dumps(
-                InboxIssueSerializer(inbox_issue).data, cls=DjangoJSONEncoder
-            )
+
             if serializer.is_valid():
                 serializer.save()
                 # Update the issue state if the issue is rejected or marked as duplicate
@@ -421,7 +374,7 @@ class InboxIssueViewSet(BaseViewSet):
                     )
 
                     # Update the issue state only if it is in triage state
-                    if issue.state.is_triage:
+                    if issue.state.name == "Triage":
                         # Move to default state
                         state = State.objects.filter(
                             workspace__slug=slug,
@@ -431,108 +384,60 @@ class InboxIssueViewSet(BaseViewSet):
                         if state is not None:
                             issue.state = state
                             issue.save()
-                # create a activity for status change
-                issue_activity.delay(
-                    type="inbox.activity.created",
-                    requested_data=json.dumps(
-                        request.data, cls=DjangoJSONEncoder
-                    ),
-                    actor_id=str(request.user.id),
-                    issue_id=str(issue_id),
-                    project_id=str(project_id),
-                    current_instance=current_instance,
-                    epoch=int(timezone.now().timestamp()),
-                    notification=False,
-                    origin=request.META.get("HTTP_ORIGIN"),
-                )
-
-                inbox_issue = (
-                    InboxIssue.objects.filter(
-                        inbox_id=inbox_id.id,
-                        issue_id=serializer.data["id"],
-                        project_id=project_id,
-                    )
-                    .select_related("issue")
-                    .prefetch_related(
-                        "issue__labels",
-                        "issue__assignees",
-                    )
-                    .annotate(
-                        label_ids=Coalesce(
-                            ArrayAgg(
-                                "issue__labels__id",
-                                distinct=True,
-                                filter=~Q(issue__labels__id__isnull=True),
-                            ),
-                            Value(
-                                [],
-                                output_field=ArrayField(UUIDField()),
-                            ),
-                        ),
-                        assignee_ids=Coalesce(
-                            ArrayAgg(
-                                "issue__assignees__id",
-                                distinct=True,
-                                filter=~Q(issue__assignees__id__isnull=True),
-                            ),
-                            Value(
-                                [],
-                                output_field=ArrayField(UUIDField()),
-                            ),
-                        ),
-                    ).first()
-                )
-                serializer = InboxIssueDetailSerializer(inbox_issue).data
-                return Response(serializer, status=status.HTTP_200_OK)
+                return Response(status=status.HTTP_204_NO_CONTENT)
             return Response(
                 serializer.errors, status=status.HTTP_400_BAD_REQUEST
             )
         else:
-            serializer = InboxIssueDetailSerializer(inbox_issue).data
-            return Response(serializer, status=status.HTTP_200_OK)
+            issue = self.get_queryset().filter(pk=issue_id).first()
+            serializer = IssueSerializer(issue, expand=self.expand)
+            return Response(serializer.data, status=status.HTTP_200_OK)
 
-    def retrieve(self, request, slug, project_id, issue_id):
-        inbox_id = Inbox.objects.filter(
-            workspace__slug=slug, project_id=project_id
-        ).first()
-        inbox_issue = (
-            InboxIssue.objects.select_related("issue")
+    def retrieve(self, request, slug, project_id, inbox_id, issue_id):
+        issue = (
+            self.get_queryset()
+            .filter(pk=issue_id)
             .prefetch_related(
-                "issue__labels",
-                "issue__assignees",
+                Prefetch(
+                    "issue_reactions",
+                    queryset=IssueReaction.objects.select_related(
+                        "issue", "actor"
+                    ),
+                )
+            )
+            .prefetch_related(
+                Prefetch(
+                    "issue_attachment",
+                    queryset=IssueAttachment.objects.select_related("issue"),
+                )
+            )
+            .prefetch_related(
+                Prefetch(
+                    "issue_link",
+                    queryset=IssueLink.objects.select_related("created_by"),
+                )
             )
             .annotate(
-                label_ids=Coalesce(
-                    ArrayAgg(
-                        "issue__labels__id",
-                        distinct=True,
-                        filter=~Q(issue__labels__id__isnull=True),
-                    ),
-                    Value([], output_field=ArrayField(UUIDField())),
-                ),
-                assignee_ids=Coalesce(
-                    ArrayAgg(
-                        "issue__assignees__id",
-                        distinct=True,
-                        filter=~Q(issue__assignees__id__isnull=True),
-                    ),
-                    Value([], output_field=ArrayField(UUIDField())),
-                ),
+                is_subscribed=Exists(
+                    IssueSubscriber.objects.filter(
+                        workspace__slug=slug,
+                        project_id=project_id,
+                        issue_id=OuterRef("pk"),
+                        subscriber=request.user,
+                    )
+                )
             )
-            .get(
-                inbox_id=inbox_id.id, issue_id=issue_id, project_id=project_id
-            )
-        )
-        issue = InboxIssueDetailSerializer(inbox_issue).data
-        return Response(
-            issue,
-            status=status.HTTP_200_OK,
-        )
-
-    def destroy(self, request, slug, project_id, issue_id):
-        inbox_id = Inbox.objects.filter(
-            workspace__slug=slug, project_id=project_id
         ).first()
+        if issue is None:
+            return Response(
+                {"error": "Requested object was not found"},
+                status=status.HTTP_404_NOT_FOUND,
+            )
+
+        serializer = IssueDetailSerializer(issue)
+        return Response(serializer.data, status=status.HTTP_200_OK)
+
+    def destroy(self, request, slug, project_id, inbox_id, issue_id):
         inbox_issue = InboxIssue.objects.get(
             issue_id=issue_id,
             workspace__slug=slug,

apiserver/plane/app/views/issue/archive.py

@@ -1,52 +1,55 @@
 # Python imports
 import json
 
+from django.core.serializers.json import DjangoJSONEncoder
+from django.db.models import (
+    Exists,
+    F,
+    Func,
+    OuterRef,
+    Prefetch,
+    Q,
+)
+
 # Django imports
 from django.utils import timezone
-from django.db.models import (
-    Prefetch,
-    OuterRef,
-    Func,
-    F,
-    Q,
-    Case,
-    Value,
-    CharField,
-    When,
-    Exists,
-    Max,
-    UUIDField,
-)
-from django.core.serializers.json import DjangoJSONEncoder
 from django.utils.decorators import method_decorator
 from django.views.decorators.gzip import gzip_page
-from django.contrib.postgres.aggregates import ArrayAgg
-from django.contrib.postgres.fields import ArrayField
-from django.db.models.functions import Coalesce
+from rest_framework import status
 
 # Third Party imports
 from rest_framework.response import Response
-from rest_framework import status
 
-# Module imports
-from .. import BaseViewSet
-from plane.app.serializers import (
-    IssueSerializer,
-    IssueFlatSerializer,
-    IssueDetailSerializer,
-)
 from plane.app.permissions import (
     ProjectEntityPermission,
 )
-from plane.db.models import (
-    Issue,
-    IssueLink,
-    IssueAttachment,
-    IssueSubscriber,
-    IssueReaction,
+from plane.app.serializers import (
+    IssueDetailSerializer,
+    IssueFlatSerializer,
+    IssueSerializer,
 )
 from plane.bgtasks.issue_activites_task import issue_activity
+from plane.db.models import (
+    Issue,
+    IssueAttachment,
+    IssueLink,
+    IssueReaction,
+    IssueSubscriber,
+)
+from plane.utils.grouper import (
+    issue_group_values,
+    issue_on_results,
+    issue_queryset_grouper,
+)
 from plane.utils.issue_filters import issue_filters
+from plane.utils.order_queryset import order_issue_queryset
+from plane.utils.paginator import (
+    GroupedOffsetPaginator,
+    SubGroupedOffsetPaginator,
+)
+
+# Module imports
+from .. import BaseViewSet
 
 
 class IssueArchiveViewSet(BaseViewSet):
@@ -92,33 +95,6 @@ class IssueArchiveViewSet(BaseViewSet):
                 .annotate(count=Func(F("id"), function="Count"))
                 .values("count")
             )
-            .annotate(
-                label_ids=Coalesce(
-                    ArrayAgg(
-                        "labels__id",
-                        distinct=True,
-                        filter=~Q(labels__id__isnull=True),
-                    ),
-                    Value([], output_field=ArrayField(UUIDField())),
-                ),
-                assignee_ids=Coalesce(
-                    ArrayAgg(
-                        "assignees__id",
-                        distinct=True,
-                        filter=~Q(assignees__id__isnull=True)
-                        & Q(assignees__member_project__is_active=True),
-                    ),
-                    Value([], output_field=ArrayField(UUIDField())),
-                ),
-                module_ids=Coalesce(
-                    ArrayAgg(
-                        "issue_module__module_id",
-                        distinct=True,
-                        filter=~Q(issue_module__module_id__isnull=True),
-                    ),
-                    Value([], output_field=ArrayField(UUIDField())),
-                ),
-            )
         )
 
     @method_decorator(gzip_page)
@@ -126,120 +102,128 @@ class IssueArchiveViewSet(BaseViewSet):
         filters = issue_filters(request.query_params, "GET")
         show_sub_issues = request.GET.get("show_sub_issues", "true")
 
-        # Custom ordering for priority and state
-        priority_order = ["urgent", "high", "medium", "low", "none"]
-        state_order = [
-            "backlog",
-            "unstarted",
-            "started",
-            "completed",
-            "cancelled",
-        ]
-
         order_by_param = request.GET.get("order_by", "-created_at")
 
         issue_queryset = self.get_queryset().filter(**filters)
 
-        # Priority Ordering
-        if order_by_param == "priority" or order_by_param == "-priority":
-            priority_order = (
-                priority_order
-                if order_by_param == "priority"
-                else priority_order[::-1]
-            )
-            issue_queryset = issue_queryset.annotate(
-                priority_order=Case(
-                    *[
-                        When(priority=p, then=Value(i))
-                        for i, p in enumerate(priority_order)
-                    ],
-                    output_field=CharField(),
-                )
-            ).order_by("priority_order")
-
-        # State Ordering
-        elif order_by_param in [
-            "state__name",
-            "state__group",
-            "-state__name",
-            "-state__group",
-        ]:
-            state_order = (
-                state_order
-                if order_by_param in ["state__name", "state__group"]
-                else state_order[::-1]
-            )
-            issue_queryset = issue_queryset.annotate(
-                state_order=Case(
-                    *[
-                        When(state__group=state_group, then=Value(i))
-                        for i, state_group in enumerate(state_order)
-                    ],
-                    default=Value(len(state_order)),
-                    output_field=CharField(),
-                )
-            ).order_by("state_order")
-        # assignee and label ordering
-        elif order_by_param in [
-            "labels__name",
-            "-labels__name",
-            "assignees__first_name",
-            "-assignees__first_name",
-        ]:
-            issue_queryset = issue_queryset.annotate(
-                max_values=Max(
-                    order_by_param[1::]
-                    if order_by_param.startswith("-")
-                    else order_by_param
-                )
-            ).order_by(
-                "-max_values"
-                if order_by_param.startswith("-")
-                else "max_values"
-            )
-        else:
-            issue_queryset = issue_queryset.order_by(order_by_param)
-
         issue_queryset = (
             issue_queryset
             if show_sub_issues == "true"
             else issue_queryset.filter(parent__isnull=True)
         )
-        if self.expand or self.fields:
-            issues = IssueSerializer(
-                issue_queryset,
-                many=True,
-                fields=self.fields,
-            ).data
+        # Issue queryset
+        issue_queryset = 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,
+        )
+
+        if group_by:
+            # Check group and sub group value paginate
+            if sub_group_by:
+                if group_by == sub_group_by:
+                    return Response(
+                        {
+                            "error": "Group by and sub group by cannot have same parameters"
+                        },
+                        status=status.HTTP_400_BAD_REQUEST,
+                    )
+                else:
+                    # group and sub group pagination
+                    return self.paginate(
+                        request=request,
+                        order_by=(
+                            "priority_order"
+                            if order_by_param in ["priority", "-priority"]
+                            else order_by_param
+                        ),
+                        queryset=issue_queryset,
+                        on_results=lambda issues: issue_on_results(
+                            group_by=group_by,
+                            issues=issues,
+                            sub_group_by=sub_group_by,
+                        ),
+                        paginator_cls=SubGroupedOffsetPaginator,
+                        group_by_fields=issue_group_values(
+                            field=group_by,
+                            slug=slug,
+                            project_id=project_id,
+                            filters=filters,
+                        ),
+                        sub_group_by_fields=issue_group_values(
+                            field=sub_group_by,
+                            slug=slug,
+                            project_id=project_id,
+                            filters=filters,
+                        ),
+                        group_by_field_name=group_by,
+                        sub_group_by_field_name=sub_group_by,
+                        count_filter=Q(
+                            Q(issue_inbox__status=1)
+                            | Q(issue_inbox__status=-1)
+                            | Q(issue_inbox__status=2)
+                            | Q(issue_inbox__isnull=True),
+                            archived_at__isnull=True,
+                            is_draft=False,
+                        ),
+                    )
+            # Group Paginate
+            else:
+                # Group paginate
+                return self.paginate(
+                    request=request,
+                    order_by=(
+                        "priority_order"
+                        if order_by_param in ["priority", "-priority"]
+                        else order_by_param
+                    ),
+                    queryset=issue_queryset,
+                    on_results=lambda issues: issue_on_results(
+                        group_by=group_by,
+                        issues=issues,
+                        sub_group_by=sub_group_by,
+                    ),
+                    paginator_cls=GroupedOffsetPaginator,
+                    group_by_fields=issue_group_values(
+                        field=group_by,
+                        slug=slug,
+                        project_id=project_id,
+                        filters=filters,
+                    ),
+                    group_by_field_name=group_by,
+                    count_filter=Q(
+                        Q(issue_inbox__status=1)
+                        | Q(issue_inbox__status=-1)
+                        | Q(issue_inbox__status=2)
+                        | Q(issue_inbox__isnull=True),
+                        archived_at__isnull=True,
+                        is_draft=False,
+                    ),
+                )
         else:
-            issues = issue_queryset.values(
-                "id",
-                "name",
-                "state_id",
-                "sort_order",
-                "completed_at",
-                "estimate_point",
-                "priority",
-                "start_date",
-                "target_date",
-                "sequence_id",
-                "project_id",
-                "parent_id",
-                "cycle_id",
-                "module_ids",
-                "label_ids",
-                "assignee_ids",
-                "sub_issues_count",
-                "created_at",
-                "updated_at",
-                "created_by",
-                "updated_by",
-                "attachment_count",
-                "link_count",
-                "is_draft",
-                "archived_at",
+            # List Paginate
+            return self.paginate(
+                order_by=(
+                    "-priority_order"
+                    if order_by_param in ["priority", "-priority"]
+                    else order_by_param
+                ),
+                request=request,
+                queryset=issue_queryset,
+                on_results=lambda issues: issue_on_results(
+                    group_by=group_by, issues=issues, sub_group_by=sub_group_by
+                ),
             )
-        return Response(issues, status=status.HTTP_200_OK)
 
     def retrieve(self, request, slug, project_id, pk=None):
         issue = (

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

@@ -1,26 +1,9 @@
 # Python imports
 import json
 
-from django.contrib.postgres.aggregates import ArrayAgg
-from django.contrib.postgres.fields import ArrayField
-from django.core.serializers.json import DjangoJSONEncoder
-from django.db.models import (
-    Case,
-    CharField,
-    Exists,
-    F,
-    Func,
-    Max,
-    OuterRef,
-    Prefetch,
-    Q,
-    UUIDField,
-    Value,
-    When,
-)
-from django.db.models.functions import Coalesce
-
 # Django imports
+from django.core.serializers.json import DjangoJSONEncoder
+from django.db.models import Exists, F, Func, OuterRef, Prefetch, Q
 from django.utils import timezone
 from django.utils.decorators import method_decorator
 from django.views.decorators.gzip import gzip_page
@@ -49,7 +32,17 @@ from plane.db.models import (
     IssueSubscriber,
     Project,
 )
+from plane.utils.grouper import (
+    issue_group_values,
+    issue_on_results,
+    issue_queryset_grouper,
+)
 from plane.utils.issue_filters import issue_filters
+from plane.utils.order_queryset import order_issue_queryset
+from plane.utils.paginator import (
+    GroupedOffsetPaginator,
+    SubGroupedOffsetPaginator,
+)
 
 # Module imports
 from .. import BaseAPIView, BaseViewSet, WebhookMixin
@@ -104,144 +97,125 @@ class IssueListEndpoint(BaseAPIView):
                 .annotate(count=Func(F("id"), function="Count"))
                 .values("count")
             )
-            .annotate(
-                label_ids=Coalesce(
-                    ArrayAgg(
-                        "labels__id",
-                        distinct=True,
-                        filter=~Q(labels__id__isnull=True),
-                    ),
-                    Value([], output_field=ArrayField(UUIDField())),
-                ),
-                assignee_ids=Coalesce(
-                    ArrayAgg(
-                        "assignees__id",
-                        distinct=True,
-                        filter=~Q(assignees__id__isnull=True)
-                        & Q(assignees__member_project__is_active=True),
-                    ),
-                    Value([], output_field=ArrayField(UUIDField())),
-                ),
-                module_ids=Coalesce(
-                    ArrayAgg(
-                        "issue_module__module_id",
-                        distinct=True,
-                        filter=~Q(issue_module__module_id__isnull=True),
-                    ),
-                    Value([], output_field=ArrayField(UUIDField())),
-                ),
-            )
         ).distinct()
 
         filters = issue_filters(request.query_params, "GET")
 
-        # Custom ordering for priority and state
-        priority_order = ["urgent", "high", "medium", "low", "none"]
-        state_order = [
-            "backlog",
-            "unstarted",
-            "started",
-            "completed",
-            "cancelled",
-        ]
-
         order_by_param = request.GET.get("order_by", "-created_at")
-
         issue_queryset = queryset.filter(**filters)
+        # Issue queryset
+        issue_queryset = order_issue_queryset(
+            issue_queryset=issue_queryset,
+            order_by_param=order_by_param,
+        )
 
-        # Priority Ordering
-        if order_by_param == "priority" or order_by_param == "-priority":
-            priority_order = (
-                priority_order
-                if order_by_param == "priority"
-                else priority_order[::-1]
-            )
-            issue_queryset = issue_queryset.annotate(
-                priority_order=Case(
-                    *[
-                        When(priority=p, then=Value(i))
-                        for i, p in enumerate(priority_order)
-                    ],
-                    output_field=CharField(),
-                )
-            ).order_by("priority_order")
+        # Group by
+        group_by = request.GET.get("group_by", False)
+        sub_group_by = request.GET.get("sub_group_by", False)
 
-        # State Ordering
-        elif order_by_param in [
-            "state__name",
-            "state__group",
-            "-state__name",
-            "-state__group",
-        ]:
-            state_order = (
-                state_order
-                if order_by_param in ["state__name", "state__group"]
-                else state_order[::-1]
-            )
-            issue_queryset = issue_queryset.annotate(
-                state_order=Case(
-                    *[
-                        When(state__group=state_group, then=Value(i))
-                        for i, state_group in enumerate(state_order)
-                    ],
-                    default=Value(len(state_order)),
-                    output_field=CharField(),
+        # issue queryset
+        issue_queryset = issue_queryset_grouper(
+            queryset=issue_queryset,
+            group_by=group_by,
+            sub_group_by=sub_group_by,
+        )
+
+        if group_by:
+            # Check group and sub group value paginate
+            if sub_group_by:
+                if group_by == sub_group_by:
+                    return Response(
+                        {
+                            "error": "Group by and sub group by cannot have same parameters"
+                        },
+                        status=status.HTTP_400_BAD_REQUEST,
+                    )
+                else:
+                    # group and sub group pagination
+                    return self.paginate(
+                        request=request,
+                        order_by=(
+                            "priority_order"
+                            if order_by_param in ["priority", "-priority"]
+                            else order_by_param
+                        ),
+                        queryset=issue_queryset,
+                        on_results=lambda issues: issue_on_results(
+                            group_by=group_by,
+                            issues=issues,
+                            sub_group_by=sub_group_by,
+                        ),
+                        paginator_cls=SubGroupedOffsetPaginator,
+                        group_by_fields=issue_group_values(
+                            field=group_by,
+                            slug=slug,
+                            project_id=project_id,
+                            filters=filters,
+                        ),
+                        sub_group_by_fields=issue_group_values(
+                            field=sub_group_by,
+                            slug=slug,
+                            project_id=project_id,
+                            filters=filters,
+                        ),
+                        group_by_field_name=group_by,
+                        sub_group_by_field_name=sub_group_by,
+                        count_filter=Q(
+                            Q(issue_inbox__status=1)
+                            | Q(issue_inbox__status=-1)
+                            | Q(issue_inbox__status=2)
+                            | Q(issue_inbox__isnull=True),
+                            archived_at__isnull=True,
+                            is_draft=False,
+                        ),
+                    )
+            # Group Paginate
+            else:
+                # Group paginate
+                return self.paginate(
+                    request=request,
+                    order_by=(
+                        "priority_order"
+                        if order_by_param in ["priority", "-priority"]
+                        else order_by_param
+                    ),
+                    queryset=issue_queryset,
+                    on_results=lambda issues: issue_on_results(
+                        group_by=group_by,
+                        issues=issues,
+                        sub_group_by=sub_group_by,
+                    ),
+                    paginator_cls=GroupedOffsetPaginator,
+                    group_by_fields=issue_group_values(
+                        field=group_by,
+                        slug=slug,
+                        project_id=project_id,
+                        filters=filters,
+                    ),
+                    group_by_field_name=group_by,
+                    count_filter=Q(
+                        Q(issue_inbox__status=1)
+                        | Q(issue_inbox__status=-1)
+                        | Q(issue_inbox__status=2)
+                        | Q(issue_inbox__isnull=True),
+                        archived_at__isnull=True,
+                        is_draft=False,
+                    ),
                 )
-            ).order_by("state_order")
-        # assignee and label ordering
-        elif order_by_param in [
-            "labels__name",
-            "-labels__name",
-            "assignees__first_name",
-            "-assignees__first_name",
-        ]:
-            issue_queryset = issue_queryset.annotate(
-                max_values=Max(
-                    order_by_param[1::]
-                    if order_by_param.startswith("-")
+        else:
+            # List Paginate
+            return self.paginate(
+                order_by=(
+                    "-priority_order"
+                    if order_by_param in ["priority", "-priority"]
                     else order_by_param
-                )
-            ).order_by(
-                "-max_values"
-                if order_by_param.startswith("-")
-                else "max_values"
+                ),
+                request=request,
+                queryset=issue_queryset,
+                on_results=lambda issues: issue_on_results(
+                    group_by=group_by, issues=issues, sub_group_by=sub_group_by
+                ),
             )
-        else:
-            issue_queryset = issue_queryset.order_by(order_by_param)
-
-        if self.fields or self.expand:
-            issues = IssueSerializer(
-                queryset, many=True, fields=self.fields, expand=self.expand
-            ).data
-        else:
-            issues = issue_queryset.values(
-                "id",
-                "name",
-                "state_id",
-                "sort_order",
-                "completed_at",
-                "estimate_point",
-                "priority",
-                "start_date",
-                "target_date",
-                "sequence_id",
-                "project_id",
-                "parent_id",
-                "cycle_id",
-                "module_ids",
-                "label_ids",
-                "assignee_ids",
-                "sub_issues_count",
-                "created_at",
-                "updated_at",
-                "created_by",
-                "updated_by",
-                "attachment_count",
-                "link_count",
-                "is_draft",
-                "archived_at",
-            )
-        return Response(issues, status=status.HTTP_200_OK)
 
 
 class IssueViewSet(WebhookMixin, BaseViewSet):
@@ -299,33 +273,6 @@ class IssueViewSet(WebhookMixin, BaseViewSet):
                 .annotate(count=Func(F("id"), function="Count"))
                 .values("count")
             )
-            .annotate(
-                label_ids=Coalesce(
-                    ArrayAgg(
-                        "labels__id",
-                        distinct=True,
-                        filter=~Q(labels__id__isnull=True),
-                    ),
-                    Value([], output_field=ArrayField(UUIDField())),
-                ),
-                assignee_ids=Coalesce(
-                    ArrayAgg(
-                        "assignees__id",
-                        distinct=True,
-                        filter=~Q(assignees__id__isnull=True)
-                        & Q(assignees__member_project__is_active=True),
-                    ),
-                    Value([], output_field=ArrayField(UUIDField())),
-                ),
-                module_ids=Coalesce(
-                    ArrayAgg(
-                        "issue_module__module_id",
-                        distinct=True,
-                        filter=~Q(issue_module__module_id__isnull=True),
-                    ),
-                    Value([], output_field=ArrayField(UUIDField())),
-                ),
-            )
         ).distinct()
 
     @method_decorator(gzip_page)
@@ -335,112 +282,116 @@ class IssueViewSet(WebhookMixin, BaseViewSet):
 
         issue_queryset = self.get_queryset().filter(**filters)
         # Custom ordering for priority and state
-        priority_order = ["urgent", "high", "medium", "low", "none"]
-        state_order = [
-            "backlog",
-            "unstarted",
-            "started",
-            "completed",
-            "cancelled",
-        ]
 
-        # Priority Ordering
-        if order_by_param == "priority" or order_by_param == "-priority":
-            priority_order = (
-                priority_order
-                if order_by_param == "priority"
-                else priority_order[::-1]
-            )
-            issue_queryset = issue_queryset.annotate(
-                priority_order=Case(
-                    *[
-                        When(priority=p, then=Value(i))
-                        for i, p in enumerate(priority_order)
-                    ],
-                    output_field=CharField(),
-                )
-            ).order_by("priority_order")
+        # Issue queryset
+        issue_queryset = order_issue_queryset(
+            issue_queryset=issue_queryset,
+            order_by_param=order_by_param,
+        )
 
-        # State Ordering
-        elif order_by_param in [
-            "state__name",
-            "state__group",
-            "-state__name",
-            "-state__group",
-        ]:
-            state_order = (
-                state_order
-                if order_by_param in ["state__name", "state__group"]
-                else state_order[::-1]
-            )
-            issue_queryset = issue_queryset.annotate(
-                state_order=Case(
-                    *[
-                        When(state__group=state_group, then=Value(i))
-                        for i, state_group in enumerate(state_order)
-                    ],
-                    default=Value(len(state_order)),
-                    output_field=CharField(),
+        # 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,
+        )
+
+        if group_by:
+            if sub_group_by:
+                if group_by == sub_group_by:
+                    return Response(
+                        {
+                            "error": "Group by and sub group by cannot have same parameters"
+                        },
+                        status=status.HTTP_400_BAD_REQUEST,
+                    )
+                else:
+                    return self.paginate(
+                        request=request,
+                        order_by=(
+                            "priority_order"
+                            if order_by_param in ["priority", "-priority"]
+                            else order_by_param
+                        ),
+                        queryset=issue_queryset,
+                        on_results=lambda issues: issue_on_results(
+                            group_by=group_by,
+                            issues=issues,
+                            sub_group_by=sub_group_by,
+                        ),
+                        paginator_cls=SubGroupedOffsetPaginator,
+                        group_by_fields=issue_group_values(
+                            field=group_by,
+                            slug=slug,
+                            project_id=project_id,
+                            filters=filters,
+                        ),
+                        sub_group_by_fields=issue_group_values(
+                            field=sub_group_by,
+                            slug=slug,
+                            project_id=project_id,
+                            filters=filters,
+                        ),
+                        group_by_field_name=group_by,
+                        sub_group_by_field_name=sub_group_by,
+                        count_filter=Q(
+                            Q(issue_inbox__status=1)
+                            | Q(issue_inbox__status=-1)
+                            | Q(issue_inbox__status=2)
+                            | Q(issue_inbox__isnull=True),
+                            archived_at__isnull=True,
+                            is_draft=False,
+                        ),
+                    )
+            else:
+                # Group paginate
+                return self.paginate(
+                    request=request,
+                    order_by=(
+                        "priority_order"
+                        if order_by_param in ["priority", "-priority"]
+                        else order_by_param
+                    ),
+                    queryset=issue_queryset,
+                    on_results=lambda issues: issue_on_results(
+                        group_by=group_by,
+                        issues=issues,
+                        sub_group_by=sub_group_by,
+                    ),
+                    paginator_cls=GroupedOffsetPaginator,
+                    group_by_fields=issue_group_values(
+                        field=group_by,
+                        slug=slug,
+                        project_id=project_id,
+                        filters=filters,
+                    ),
+                    group_by_field_name=group_by,
+                    count_filter=Q(
+                        Q(issue_inbox__status=1)
+                        | Q(issue_inbox__status=-1)
+                        | Q(issue_inbox__status=2)
+                        | Q(issue_inbox__isnull=True),
+                        archived_at__isnull=True,
+                        is_draft=False,
+                    ),
                 )
-            ).order_by("state_order")
-        # assignee and label ordering
-        elif order_by_param in [
-            "labels__name",
-            "-labels__name",
-            "assignees__first_name",
-            "-assignees__first_name",
-        ]:
-            issue_queryset = issue_queryset.annotate(
-                max_values=Max(
-                    order_by_param[1::]
-                    if order_by_param.startswith("-")
+        else:
+            return self.paginate(
+                order_by=(
+                    "priority_order"
+                    if order_by_param in ["priority", "-priority"]
                     else order_by_param
-                )
-            ).order_by(
-                "-max_values"
-                if order_by_param.startswith("-")
-                else "max_values"
+                ),
+                request=request,
+                queryset=issue_queryset,
+                on_results=lambda issues: issue_on_results(
+                    group_by=group_by, issues=issues, sub_group_by=sub_group_by
+                ),
             )
-        else:
-            issue_queryset = issue_queryset.order_by(order_by_param)
-
-        # Only use serializer when expand or fields else return by values
-        if self.expand or self.fields:
-            issues = IssueSerializer(
-                issue_queryset,
-                many=True,
-                fields=self.fields,
-                expand=self.expand,
-            ).data
-        else:
-            issues = issue_queryset.values(
-                "id",
-                "name",
-                "state_id",
-                "sort_order",
-                "completed_at",
-                "estimate_point",
-                "priority",
-                "start_date",
-                "target_date",
-                "sequence_id",
-                "project_id",
-                "parent_id",
-                "cycle_id",
-                "module_ids",
-                "label_ids",
-                "assignee_ids",
-                "sub_issues_count",
-                "created_at",
-                "updated_at",
-                "created_by",
-                "updated_by",
-                "attachment_count",
-                "link_count",
-                "is_draft",
-                "archived_at",
-            )
-        return Response(issues, status=status.HTTP_200_OK)
 
     def create(self, request, slug, project_id):
         project = Project.objects.get(pk=project_id)
@@ -472,8 +423,13 @@ class IssueViewSet(WebhookMixin, BaseViewSet):
                 origin=request.META.get("HTTP_ORIGIN"),
             )
             issue = (
-                self.get_queryset()
-                .filter(pk=serializer.data["id"])
+                issue_queryset_grouper(
+                    queryset=self.get_queryset().filter(
+                        pk=serializer.data["id"]
+                    ),
+                    group_by=None,
+                    sub_group_by=None,
+                )
                 .values(
                     "id",
                     "name",

apiserver/plane/app/views/issue/draft.py

@@ -1,31 +1,23 @@
 # Python imports
 import json
 
-# Django imports
-from django.contrib.postgres.aggregates import ArrayAgg
-from django.contrib.postgres.fields import ArrayField
 from django.core.serializers.json import DjangoJSONEncoder
 from django.db.models import (
-    Case,
-    CharField,
     Exists,
     F,
     Func,
-    Max,
     OuterRef,
     Prefetch,
     Q,
-    UUIDField,
-    Value,
-    When,
 )
-from django.db.models.functions import Coalesce
+
+# Django imports
 from django.utils import timezone
 from django.utils.decorators import method_decorator
 from django.views.decorators.gzip import gzip_page
+from rest_framework import status
 
 # Third Party imports
-from rest_framework import status
 from rest_framework.response import Response
 
 from plane.app.permissions import ProjectEntityPermission
@@ -44,7 +36,17 @@ from plane.db.models import (
     IssueSubscriber,
     Project,
 )
+from plane.utils.grouper import (
+    issue_group_values,
+    issue_on_results,
+    issue_queryset_grouper,
+)
 from plane.utils.issue_filters import issue_filters
+from plane.utils.order_queryset import order_issue_queryset
+from plane.utils.paginator import (
+    GroupedOffsetPaginator,
+    SubGroupedOffsetPaginator,
+)
 
 # Module imports
 from .. import BaseViewSet
@@ -87,149 +89,128 @@ class IssueDraftViewSet(BaseViewSet):
                 .annotate(count=Func(F("id"), function="Count"))
                 .values("count")
             )
-            .annotate(
-                label_ids=Coalesce(
-                    ArrayAgg(
-                        "labels__id",
-                        distinct=True,
-                        filter=~Q(labels__id__isnull=True),
-                    ),
-                    Value([], output_field=ArrayField(UUIDField())),
-                ),
-                assignee_ids=Coalesce(
-                    ArrayAgg(
-                        "assignees__id",
-                        distinct=True,
-                        filter=~Q(assignees__id__isnull=True)
-                        & Q(assignees__member_project__is_active=True),
-                    ),
-                    Value([], output_field=ArrayField(UUIDField())),
-                ),
-                module_ids=Coalesce(
-                    ArrayAgg(
-                        "issue_module__module_id",
-                        distinct=True,
-                        filter=~Q(issue_module__module_id__isnull=True),
-                    ),
-                    Value([], output_field=ArrayField(UUIDField())),
-                ),
-            )
         ).distinct()
 
     @method_decorator(gzip_page)
     def list(self, request, slug, project_id):
         filters = issue_filters(request.query_params, "GET")
-        # Custom ordering for priority and state
-        priority_order = ["urgent", "high", "medium", "low", "none"]
-        state_order = [
-            "backlog",
-            "unstarted",
-            "started",
-            "completed",
-            "cancelled",
-        ]
 
         order_by_param = request.GET.get("order_by", "-created_at")
 
         issue_queryset = self.get_queryset().filter(**filters)
+        # Issue queryset
+        issue_queryset = order_issue_queryset(
+            issue_queryset=issue_queryset,
+            order_by_param=order_by_param,
+        )
 
-        # Priority Ordering
-        if order_by_param == "priority" or order_by_param == "-priority":
-            priority_order = (
-                priority_order
-                if order_by_param == "priority"
-                else priority_order[::-1]
-            )
-            issue_queryset = issue_queryset.annotate(
-                priority_order=Case(
-                    *[
-                        When(priority=p, then=Value(i))
-                        for i, p in enumerate(priority_order)
-                    ],
-                    output_field=CharField(),
-                )
-            ).order_by("priority_order")
+        # Group by
+        group_by = request.GET.get("group_by", False)
+        sub_group_by = request.GET.get("sub_group_by", False)
 
-        # State Ordering
-        elif order_by_param in [
-            "state__name",
-            "state__group",
-            "-state__name",
-            "-state__group",
-        ]:
-            state_order = (
-                state_order
-                if order_by_param in ["state__name", "state__group"]
-                else state_order[::-1]
-            )
-            issue_queryset = issue_queryset.annotate(
-                state_order=Case(
-                    *[
-                        When(state__group=state_group, then=Value(i))
-                        for i, state_group in enumerate(state_order)
-                    ],
-                    default=Value(len(state_order)),
-                    output_field=CharField(),
+        # issue queryset
+        issue_queryset = issue_queryset_grouper(
+            queryset=issue_queryset,
+            group_by=group_by,
+            sub_group_by=sub_group_by,
+        )
+
+        if group_by:
+            # Check group and sub group value paginate
+            if sub_group_by:
+                if group_by == sub_group_by:
+                    return Response(
+                        {
+                            "error": "Group by and sub group by cannot have same parameters"
+                        },
+                        status=status.HTTP_400_BAD_REQUEST,
+                    )
+                else:
+                    # group and sub group pagination
+                    return self.paginate(
+                        request=request,
+                        order_by=(
+                            "priority_order"
+                            if order_by_param in ["priority", "-priority"]
+                            else order_by_param
+                        ),
+                        queryset=issue_queryset,
+                        on_results=lambda issues: issue_on_results(
+                            group_by=group_by,
+                            issues=issues,
+                            sub_group_by=sub_group_by,
+                        ),
+                        paginator_cls=SubGroupedOffsetPaginator,
+                        group_by_fields=issue_group_values(
+                            field=group_by,
+                            slug=slug,
+                            project_id=project_id,
+                            filters=filters,
+                        ),
+                        sub_group_by_fields=issue_group_values(
+                            field=sub_group_by,
+                            slug=slug,
+                            project_id=project_id,
+                            filters=filters,
+                        ),
+                        group_by_field_name=group_by,
+                        sub_group_by_field_name=sub_group_by,
+                        count_filter=Q(
+                            Q(issue_inbox__status=1)
+                            | Q(issue_inbox__status=-1)
+                            | Q(issue_inbox__status=2)
+                            | Q(issue_inbox__isnull=True),
+                            archived_at__isnull=True,
+                            is_draft=False,
+                        ),
+                    )
+            # Group Paginate
+            else:
+                # Group paginate
+                return self.paginate(
+                    request=request,
+                    order_by=(
+                        "priority_order"
+                        if order_by_param in ["priority", "-priority"]
+                        else order_by_param
+                    ),
+                    queryset=issue_queryset,
+                    on_results=lambda issues: issue_on_results(
+                        group_by=group_by,
+                        issues=issues,
+                        sub_group_by=sub_group_by,
+                    ),
+                    paginator_cls=GroupedOffsetPaginator,
+                    group_by_fields=issue_group_values(
+                        field=group_by,
+                        slug=slug,
+                        project_id=project_id,
+                        filters=filters,
+                    ),
+                    group_by_field_name=group_by,
+                    count_filter=Q(
+                        Q(issue_inbox__status=1)
+                        | Q(issue_inbox__status=-1)
+                        | Q(issue_inbox__status=2)
+                        | Q(issue_inbox__isnull=True),
+                        archived_at__isnull=True,
+                        is_draft=False,
+                    ),
                 )
-            ).order_by("state_order")
-        # assignee and label ordering
-        elif order_by_param in [
-            "labels__name",
-            "-labels__name",
-            "assignees__first_name",
-            "-assignees__first_name",
-        ]:
-            issue_queryset = issue_queryset.annotate(
-                max_values=Max(
-                    order_by_param[1::]
-                    if order_by_param.startswith("-")
+        else:
+            # List Paginate
+            return self.paginate(
+                order_by=(
+                    "-priority_order"
+                    if order_by_param in ["priority", "-priority"]
                     else order_by_param
-                )
-            ).order_by(
-                "-max_values"
-                if order_by_param.startswith("-")
-                else "max_values"
+                ),
+                request=request,
+                queryset=issue_queryset,
+                on_results=lambda issues: issue_on_results(
+                    group_by=group_by, issues=issues, sub_group_by=sub_group_by
+                ),
             )
-        else:
-            issue_queryset = issue_queryset.order_by(order_by_param)
-
-        # Only use serializer when expand else return by values
-        if self.expand or self.fields:
-            issues = IssueSerializer(
-                issue_queryset,
-                many=True,
-                fields=self.fields,
-                expand=self.expand,
-            ).data
-        else:
-            issues = issue_queryset.values(
-                "id",
-                "name",
-                "state_id",
-                "sort_order",
-                "completed_at",
-                "estimate_point",
-                "priority",
-                "start_date",
-                "target_date",
-                "sequence_id",
-                "project_id",
-                "parent_id",
-                "cycle_id",
-                "module_ids",
-                "label_ids",
-                "assignee_ids",
-                "sub_issues_count",
-                "created_at",
-                "updated_at",
-                "created_by",
-                "updated_by",
-                "attachment_count",
-                "link_count",
-                "is_draft",
-                "archived_at",
-            )
-        return Response(issues, status=status.HTTP_200_OK)
 
     def create(self, request, slug, project_id):
         project = Project.objects.get(pk=project_id)
@@ -260,12 +241,45 @@ class IssueDraftViewSet(BaseViewSet):
                 notification=True,
                 origin=request.META.get("HTTP_ORIGIN"),
             )
+
             issue = (
-                self.get_queryset().filter(pk=serializer.data["id"]).first()
-            )
-            return Response(
-                IssueSerializer(issue).data, status=status.HTTP_201_CREATED
+                issue_queryset_grouper(
+                    queryset=self.get_queryset().filter(
+                        pk=serializer.data["id"]
+                    ),
+                    group_by=None,
+                    sub_group_by=None,
+                )
+                .values(
+                    "id",
+                    "name",
+                    "state_id",
+                    "sort_order",
+                    "completed_at",
+                    "estimate_point",
+                    "priority",
+                    "start_date",
+                    "target_date",
+                    "sequence_id",
+                    "project_id",
+                    "parent_id",
+                    "cycle_id",
+                    "module_ids",
+                    "label_ids",
+                    "assignee_ids",
+                    "sub_issues_count",
+                    "created_at",
+                    "updated_at",
+                    "created_by",
+                    "updated_by",
+                    "attachment_count",
+                    "link_count",
+                    "is_draft",
+                    "archived_at",
+                )
+                .first()
             )
+            return Response(issue, status=status.HTTP_201_CREATED)
         return Response(serializer.errors, status=status.HTTP_400_BAD_REQUEST)
 
     def partial_update(self, request, slug, project_id, pk):

apiserver/plane/app/views/module/archive.py

@@ -1,356 +0,0 @@
-from django.contrib.postgres.aggregates import ArrayAgg
-from django.contrib.postgres.fields import ArrayField
-from django.db.models import (
-    Count,
-    Exists,
-    F,
-    Func,
-    IntegerField,
-    OuterRef,
-    Prefetch,
-    Q,
-    Subquery,
-    UUIDField,
-    Value,
-)
-from django.db.models.functions import Coalesce
-from django.utils import timezone
-
-# Third party imports
-from rest_framework import status
-from rest_framework.response import Response
-from plane.app.permissions import (
-    ProjectEntityPermission,
-)
-from plane.app.serializers import (
-    ModuleDetailSerializer,
-)
-from plane.db.models import (
-    Issue,
-    Module,
-    ModuleFavorite,
-    ModuleLink,
-)
-from plane.utils.analytics_plot import burndown_plot
-
-# Module imports
-from .. import BaseAPIView
-
-
-class ModuleArchiveUnarchiveEndpoint(BaseAPIView):
-
-    permission_classes = [
-        ProjectEntityPermission,
-    ]
-
-    def get_queryset(self):
-        favorite_subquery = ModuleFavorite.objects.filter(
-            user=self.request.user,
-            module_id=OuterRef("pk"),
-            project_id=self.kwargs.get("project_id"),
-            workspace__slug=self.kwargs.get("slug"),
-        )
-        cancelled_issues = (
-            Issue.issue_objects.filter(
-                state__group="cancelled",
-                issue_module__module_id=OuterRef("pk"),
-            )
-            .values("issue_module__module_id")
-            .annotate(cnt=Count("pk"))
-            .values("cnt")
-        )
-        completed_issues = (
-            Issue.issue_objects.filter(
-                state__group="completed",
-                issue_module__module_id=OuterRef("pk"),
-            )
-            .values("issue_module__module_id")
-            .annotate(cnt=Count("pk"))
-            .values("cnt")
-        )
-        started_issues = (
-            Issue.issue_objects.filter(
-                state__group="started",
-                issue_module__module_id=OuterRef("pk"),
-            )
-            .values("issue_module__module_id")
-            .annotate(cnt=Count("pk"))
-            .values("cnt")
-        )
-        unstarted_issues = (
-            Issue.issue_objects.filter(
-                state__group="unstarted",
-                issue_module__module_id=OuterRef("pk"),
-            )
-            .values("issue_module__module_id")
-            .annotate(cnt=Count("pk"))
-            .values("cnt")
-        )
-        backlog_issues = (
-            Issue.issue_objects.filter(
-                state__group="backlog",
-                issue_module__module_id=OuterRef("pk"),
-            )
-            .values("issue_module__module_id")
-            .annotate(cnt=Count("pk"))
-            .values("cnt")
-        )
-        total_issues = (
-            Issue.issue_objects.filter(
-                issue_module__module_id=OuterRef("pk"),
-            )
-            .values("issue_module__module_id")
-            .annotate(cnt=Count("pk"))
-            .values("cnt")
-        )
-        return (
-            Module.objects.filter(workspace__slug=self.kwargs.get("slug"))
-            .filter(archived_at__isnull=False)
-            .annotate(is_favorite=Exists(favorite_subquery))
-            .select_related("workspace", "project", "lead")
-            .prefetch_related("members")
-            .prefetch_related(
-                Prefetch(
-                    "link_module",
-                    queryset=ModuleLink.objects.select_related(
-                        "module", "created_by"
-                    ),
-                )
-            )
-            .annotate(
-                completed_issues=Coalesce(
-                    Subquery(completed_issues[:1]),
-                    Value(0, output_field=IntegerField()),
-                )
-            )
-            .annotate(
-                cancelled_issues=Coalesce(
-                    Subquery(cancelled_issues[:1]),
-                    Value(0, output_field=IntegerField()),
-                )
-            )
-            .annotate(
-                started_issues=Coalesce(
-                    Subquery(started_issues[:1]),
-                    Value(0, output_field=IntegerField()),
-                )
-            )
-            .annotate(
-                unstarted_issues=Coalesce(
-                    Subquery(unstarted_issues[:1]),
-                    Value(0, output_field=IntegerField()),
-                )
-            )
-            .annotate(
-                backlog_issues=Coalesce(
-                    Subquery(backlog_issues[:1]),
-                    Value(0, output_field=IntegerField()),
-                )
-            )
-            .annotate(
-                total_issues=Coalesce(
-                    Subquery(total_issues[:1]),
-                    Value(0, output_field=IntegerField()),
-                )
-            )
-            .annotate(
-                member_ids=Coalesce(
-                    ArrayAgg(
-                        "members__id",
-                        distinct=True,
-                        filter=~Q(members__id__isnull=True),
-                    ),
-                    Value([], output_field=ArrayField(UUIDField())),
-                )
-            )
-            .order_by("-is_favorite", "-created_at")
-        )
-
-    def get(self, request, slug, project_id, pk=None):
-        if pk is None:
-            queryset = self.get_queryset()
-            modules = queryset.values(  # Required fields
-                "id",
-                "workspace_id",
-                "project_id",
-                # Model fields
-                "name",
-                "description",
-                "description_text",
-                "description_html",
-                "start_date",
-                "target_date",
-                "status",
-                "lead_id",
-                "member_ids",
-                "view_props",
-                "sort_order",
-                "external_source",
-                "external_id",
-                # computed fields
-                "total_issues",
-                "is_favorite",
-                "cancelled_issues",
-                "completed_issues",
-                "started_issues",
-                "unstarted_issues",
-                "backlog_issues",
-                "created_at",
-                "updated_at",
-                "archived_at",
-            )
-            return Response(modules, status=status.HTTP_200_OK)
-        else:
-            queryset = (
-                self.get_queryset()
-                .filter(pk=pk)
-                .annotate(
-                    sub_issues=Issue.issue_objects.filter(
-                        project_id=self.kwargs.get("project_id"),
-                        parent__isnull=False,
-                        issue_module__module_id=pk,
-                    )
-                    .order_by()
-                    .annotate(count=Func(F("id"), function="Count"))
-                    .values("count")
-                )
-            )
-            assignee_distribution = (
-                Issue.objects.filter(
-                    issue_module__module_id=pk,
-                    workspace__slug=slug,
-                    project_id=project_id,
-                )
-                .annotate(first_name=F("assignees__first_name"))
-                .annotate(last_name=F("assignees__last_name"))
-                .annotate(assignee_id=F("assignees__id"))
-                .annotate(display_name=F("assignees__display_name"))
-                .annotate(avatar=F("assignees__avatar"))
-                .values(
-                    "first_name",
-                    "last_name",
-                    "assignee_id",
-                    "avatar",
-                    "display_name",
-                )
-                .annotate(
-                    total_issues=Count(
-                        "id",
-                        filter=Q(
-                            archived_at__isnull=True,
-                            is_draft=False,
-                        ),
-                    )
-                )
-                .annotate(
-                    completed_issues=Count(
-                        "id",
-                        filter=Q(
-                            completed_at__isnull=False,
-                            archived_at__isnull=True,
-                            is_draft=False,
-                        ),
-                    )
-                )
-                .annotate(
-                    pending_issues=Count(
-                        "id",
-                        filter=Q(
-                            completed_at__isnull=True,
-                            archived_at__isnull=True,
-                            is_draft=False,
-                        ),
-                    )
-                )
-                .order_by("first_name", "last_name")
-            )
-
-            label_distribution = (
-                Issue.objects.filter(
-                    issue_module__module_id=pk,
-                    workspace__slug=slug,
-                    project_id=project_id,
-                )
-                .annotate(label_name=F("labels__name"))
-                .annotate(color=F("labels__color"))
-                .annotate(label_id=F("labels__id"))
-                .values("label_name", "color", "label_id")
-                .annotate(
-                    total_issues=Count(
-                        "id",
-                        filter=Q(
-                            archived_at__isnull=True,
-                            is_draft=False,
-                        ),
-                    ),
-                )
-                .annotate(
-                    completed_issues=Count(
-                        "id",
-                        filter=Q(
-                            completed_at__isnull=False,
-                            archived_at__isnull=True,
-                            is_draft=False,
-                        ),
-                    )
-                )
-                .annotate(
-                    pending_issues=Count(
-                        "id",
-                        filter=Q(
-                            completed_at__isnull=True,
-                            archived_at__isnull=True,
-                            is_draft=False,
-                        ),
-                    )
-                )
-                .order_by("label_name")
-            )
-
-            data = ModuleDetailSerializer(queryset.first()).data
-            data["distribution"] = {
-                "assignees": assignee_distribution,
-                "labels": label_distribution,
-                "completion_chart": {},
-            }
-
-            # Fetch the modules
-            modules = queryset.first()
-            if modules and modules.start_date and modules.target_date:
-                data["distribution"]["completion_chart"] = burndown_plot(
-                    queryset=modules,
-                    slug=slug,
-                    project_id=project_id,
-                    module_id=pk,
-                )
-
-            return Response(
-                data,
-                status=status.HTTP_200_OK,
-            )
-
-    def post(self, request, slug, project_id, module_id):
-        module = Module.objects.get(
-            pk=module_id, project_id=project_id, workspace__slug=slug
-        )
-        if module.status not in ["completed", "cancelled"]:
-            return Response(
-                {
-                    "error": "Only completed or cancelled modules can be archived"
-                },
-                status=status.HTTP_400_BAD_REQUEST,
-            )
-        module.archived_at = timezone.now()
-        module.save()
-        return Response(
-            {"archived_at": str(module.archived_at)},
-            status=status.HTTP_200_OK,
-        )
-
-    def delete(self, request, slug, project_id, module_id):
-        module = Module.objects.get(
-            pk=module_id, project_id=project_id, workspace__slug=slug
-        )
-        module.archived_at = None
-        module.save()
-        return Response(status=status.HTTP_204_NO_CONTENT)

apiserver/plane/app/views/module/base.py

@@ -20,9 +20,9 @@ from django.db.models.functions import Coalesce
 
 # Django Imports
 from django.utils import timezone
-from rest_framework import status
 
 # Third party imports
+from rest_framework import status
 from rest_framework.response import Response
 
 from plane.app.permissions import (
@@ -515,6 +515,167 @@ class ModuleLinkViewSet(BaseViewSet):
         )
 
 
+class ModuleArchiveUnarchiveEndpoint(BaseAPIView):
+
+    permission_classes = [
+        ProjectEntityPermission,
+    ]
+
+    def get_queryset(self):
+        favorite_subquery = ModuleFavorite.objects.filter(
+            user=self.request.user,
+            module_id=OuterRef("pk"),
+            project_id=self.kwargs.get("project_id"),
+            workspace__slug=self.kwargs.get("slug"),
+        )
+        return (
+            Module.objects.filter(workspace__slug=self.kwargs.get("slug"))
+            .filter(archived_at__isnull=False)
+            .annotate(is_favorite=Exists(favorite_subquery))
+            .select_related("project")
+            .select_related("workspace")
+            .select_related("lead")
+            .prefetch_related("members")
+            .prefetch_related(
+                Prefetch(
+                    "link_module",
+                    queryset=ModuleLink.objects.select_related(
+                        "module", "created_by"
+                    ),
+                )
+            )
+            .annotate(
+                total_issues=Count(
+                    "issue_module",
+                    filter=Q(
+                        issue_module__issue__archived_at__isnull=True,
+                        issue_module__issue__is_draft=False,
+                    ),
+                    distinct=True,
+                ),
+            )
+            .annotate(
+                completed_issues=Count(
+                    "issue_module__issue__state__group",
+                    filter=Q(
+                        issue_module__issue__state__group="completed",
+                        issue_module__issue__archived_at__isnull=True,
+                        issue_module__issue__is_draft=False,
+                    ),
+                    distinct=True,
+                )
+            )
+            .annotate(
+                cancelled_issues=Count(
+                    "issue_module__issue__state__group",
+                    filter=Q(
+                        issue_module__issue__state__group="cancelled",
+                        issue_module__issue__archived_at__isnull=True,
+                        issue_module__issue__is_draft=False,
+                    ),
+                    distinct=True,
+                )
+            )
+            .annotate(
+                started_issues=Count(
+                    "issue_module__issue__state__group",
+                    filter=Q(
+                        issue_module__issue__state__group="started",
+                        issue_module__issue__archived_at__isnull=True,
+                        issue_module__issue__is_draft=False,
+                    ),
+                    distinct=True,
+                )
+            )
+            .annotate(
+                unstarted_issues=Count(
+                    "issue_module__issue__state__group",
+                    filter=Q(
+                        issue_module__issue__state__group="unstarted",
+                        issue_module__issue__archived_at__isnull=True,
+                        issue_module__issue__is_draft=False,
+                    ),
+                    distinct=True,
+                )
+            )
+            .annotate(
+                backlog_issues=Count(
+                    "issue_module__issue__state__group",
+                    filter=Q(
+                        issue_module__issue__state__group="backlog",
+                        issue_module__issue__archived_at__isnull=True,
+                        issue_module__issue__is_draft=False,
+                    ),
+                    distinct=True,
+                )
+            )
+            .annotate(
+                member_ids=Coalesce(
+                    ArrayAgg(
+                        "members__id",
+                        distinct=True,
+                        filter=~Q(members__id__isnull=True),
+                    ),
+                    Value([], output_field=ArrayField(UUIDField())),
+                )
+            )
+            .order_by("-is_favorite", "-created_at")
+        )
+
+    def get(self, request, slug, project_id):
+        queryset = self.get_queryset()
+        modules = queryset.values(  # Required fields
+            "id",
+            "workspace_id",
+            "project_id",
+            # Model fields
+            "name",
+            "description",
+            "description_text",
+            "description_html",
+            "start_date",
+            "target_date",
+            "status",
+            "lead_id",
+            "member_ids",
+            "view_props",
+            "sort_order",
+            "external_source",
+            "external_id",
+            # computed fields
+            "total_issues",
+            "is_favorite",
+            "cancelled_issues",
+            "completed_issues",
+            "started_issues",
+            "unstarted_issues",
+            "backlog_issues",
+            "created_at",
+            "updated_at",
+            "archived_at",
+        )
+        return Response(modules, status=status.HTTP_200_OK)
+
+    def post(self, request, slug, project_id, module_id):
+        module = Module.objects.get(
+            pk=module_id, project_id=project_id, workspace__slug=slug
+        )
+        module.archived_at = timezone.now()
+        module.save()
+        return Response(
+            {"archived_at": str(module.archived_at)},
+            status=status.HTTP_200_OK,
+        )
+
+    def delete(self, request, slug, project_id, module_id):
+        module = Module.objects.get(
+            pk=module_id, project_id=project_id, workspace__slug=slug
+        )
+        module.archived_at = None
+        module.save()
+        return Response(status=status.HTTP_204_NO_CONTENT)
+
+
 class ModuleFavoriteViewSet(BaseViewSet):
     serializer_class = ModuleFavoriteSerializer
     model = ModuleFavorite

apiserver/plane/app/views/module/issue.py

@@ -1,36 +1,50 @@
 # Python imports
 import json
 
+from django.db.models import (
+    F,
+    Func,
+    OuterRef,
+    Q,
+)
+
 # Django Imports
 from django.utils import timezone
-from django.db.models import F, OuterRef, Func, Q
 from django.utils.decorators import method_decorator
 from django.views.decorators.gzip import gzip_page
-from django.contrib.postgres.aggregates import ArrayAgg
-from django.contrib.postgres.fields import ArrayField
-from django.db.models import Value, UUIDField
-from django.db.models.functions import Coalesce
 
 # Third party imports
-from rest_framework.response import Response
 from rest_framework import status
+from rest_framework.response import Response
+
+from plane.app.permissions import (
+    ProjectEntityPermission,
+)
+from plane.app.serializers import (
+    ModuleIssueSerializer,
+)
+from plane.bgtasks.issue_activites_task import issue_activity
+from plane.db.models import (
+    Issue,
+    IssueAttachment,
+    IssueLink,
+    ModuleIssue,
+    Project,
+)
+from plane.utils.grouper import (
+    issue_group_values,
+    issue_on_results,
+    issue_queryset_grouper,
+)
+from plane.utils.issue_filters import issue_filters
+from plane.utils.order_queryset import order_issue_queryset
+from plane.utils.paginator import (
+    GroupedOffsetPaginator,
+    SubGroupedOffsetPaginator,
+)
 
 # Module imports
 from .. import BaseViewSet, WebhookMixin
-from plane.app.serializers import (
-    ModuleIssueSerializer,
-    IssueSerializer,
-)
-from plane.app.permissions import ProjectEntityPermission
-from plane.db.models import (
-    ModuleIssue,
-    Project,
-    Issue,
-    IssueLink,
-    IssueAttachment,
-)
-from plane.bgtasks.issue_activites_task import issue_activity
-from plane.utils.issue_filters import issue_filters
 
 
 class ModuleIssueViewSet(WebhookMixin, BaseViewSet):
@@ -80,77 +94,127 @@ class ModuleIssueViewSet(WebhookMixin, BaseViewSet):
                 .annotate(count=Func(F("id"), function="Count"))
                 .values("count")
             )
-            .annotate(
-                label_ids=Coalesce(
-                    ArrayAgg(
-                        "labels__id",
-                        distinct=True,
-                        filter=~Q(labels__id__isnull=True),
-                    ),
-                    Value([], output_field=ArrayField(UUIDField())),
-                ),
-                assignee_ids=Coalesce(
-                    ArrayAgg(
-                        "assignees__id",
-                        distinct=True,
-                        filter=~Q(assignees__id__isnull=True)
-                        & Q(assignees__member_project__is_active=True),
-                    ),
-                    Value([], output_field=ArrayField(UUIDField())),
-                ),
-                module_ids=Coalesce(
-                    ArrayAgg(
-                        "issue_module__module_id",
-                        distinct=True,
-                        filter=~Q(issue_module__module_id__isnull=True),
-                    ),
-                    Value([], output_field=ArrayField(UUIDField())),
-                ),
-            )
         ).distinct()
 
     @method_decorator(gzip_page)
     def list(self, request, slug, project_id, module_id):
-        fields = [
-            field
-            for field in request.GET.get("fields", "").split(",")
-            if field
-        ]
         filters = issue_filters(request.query_params, "GET")
         issue_queryset = self.get_queryset().filter(**filters)
-        if self.fields or self.expand:
-            issues = IssueSerializer(
-                issue_queryset, many=True, fields=fields if fields else None
-            ).data
+        order_by_param = request.GET.get("order_by", "created_at")
+
+        # Issue queryset
+        issue_queryset = 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,
+        )
+
+        if group_by:
+            # Check group and sub group value paginate
+            if sub_group_by:
+                if group_by == sub_group_by:
+                    return Response(
+                        {
+                            "error": "Group by and sub group by cannot have same parameters"
+                        },
+                        status=status.HTTP_400_BAD_REQUEST,
+                    )
+                else:
+                    # group and sub group pagination
+                    return self.paginate(
+                        request=request,
+                        order_by=(
+                            "priority_order"
+                            if order_by_param in ["priority", "-priority"]
+                            else order_by_param
+                        ),
+                        queryset=issue_queryset,
+                        on_results=lambda issues: issue_on_results(
+                            group_by=group_by,
+                            issues=issues,
+                            sub_group_by=sub_group_by,
+                        ),
+                        paginator_cls=SubGroupedOffsetPaginator,
+                        group_by_fields=issue_group_values(
+                            field=group_by,
+                            slug=slug,
+                            project_id=project_id,
+                            filters=filters,
+                        ),
+                        sub_group_by_fields=issue_group_values(
+                            field=sub_group_by,
+                            slug=slug,
+                            project_id=project_id,
+                            filters=filters,
+                        ),
+                        group_by_field_name=group_by,
+                        sub_group_by_field_name=sub_group_by,
+                        count_filter=Q(
+                            Q(issue_inbox__status=1)
+                            | Q(issue_inbox__status=-1)
+                            | Q(issue_inbox__status=2)
+                            | Q(issue_inbox__isnull=True),
+                            archived_at__isnull=True,
+                            is_draft=False,
+                        ),
+                    )
+            # Group Paginate
+            else:
+                # Group paginate
+                return self.paginate(
+                    request=request,
+                    order_by=(
+                        "priority_order"
+                        if order_by_param in ["priority", "-priority"]
+                        else order_by_param
+                    ),
+                    queryset=issue_queryset,
+                    on_results=lambda issues: issue_on_results(
+                        group_by=group_by,
+                        issues=issues,
+                        sub_group_by=sub_group_by,
+                    ),
+                    paginator_cls=GroupedOffsetPaginator,
+                    group_by_fields=issue_group_values(
+                        field=group_by,
+                        slug=slug,
+                        project_id=project_id,
+                        filters=filters,
+                    ),
+                    group_by_field_name=group_by,
+                    count_filter=Q(
+                        Q(issue_inbox__status=1)
+                        | Q(issue_inbox__status=-1)
+                        | Q(issue_inbox__status=2)
+                        | Q(issue_inbox__isnull=True),
+                        archived_at__isnull=True,
+                        is_draft=False,
+                    ),
+                )
         else:
-            issues = issue_queryset.values(
-                "id",
-                "name",
-                "state_id",
-                "sort_order",
-                "completed_at",
-                "estimate_point",
-                "priority",
-                "start_date",
-                "target_date",
-                "sequence_id",
-                "project_id",
-                "parent_id",
-                "cycle_id",
-                "module_ids",
-                "label_ids",
-                "assignee_ids",
-                "sub_issues_count",
-                "created_at",
-                "updated_at",
-                "created_by",
-                "updated_by",
-                "attachment_count",
-                "link_count",
-                "is_draft",
-                "archived_at",
+            # List Paginate
+            return self.paginate(
+                order_by=(
+                    "-priority_order"
+                    if order_by_param in ["priority", "-priority"]
+                    else order_by_param
+                ),
+                request=request,
+                queryset=issue_queryset,
+                on_results=lambda issues: issue_on_results(
+                    group_by=group_by, issues=issues, sub_group_by=sub_group_by
+                ),
             )
-        return Response(issues, status=status.HTTP_200_OK)
 
     # create multiple issues inside a module
     def create_module_issues(self, request, slug, project_id, module_id):

apiserver/plane/app/views/notification/base.py

@@ -1,26 +1,27 @@
 # Django imports
-from django.db.models import Q, OuterRef, Exists
+from django.db.models import Exists, OuterRef, Q
 from django.utils import timezone
 
 # Third party imports
 from rest_framework import status
 from rest_framework.response import Response
-from plane.utils.paginator import BasePaginator
 
-# Module imports
-from ..base import BaseViewSet, BaseAPIView
-from plane.db.models import (
-    Notification,
-    IssueAssignee,
-    IssueSubscriber,
-    Issue,
-    WorkspaceMember,
-    UserNotificationPreference,
-)
 from plane.app.serializers import (
     NotificationSerializer,
     UserNotificationPreferenceSerializer,
 )
+from plane.db.models import (
+    Issue,
+    IssueAssignee,
+    IssueSubscriber,
+    Notification,
+    UserNotificationPreference,
+    WorkspaceMember,
+)
+from plane.utils.paginator import BasePaginator
+
+# Module imports
+from ..base import BaseAPIView, BaseViewSet
 
 
 class NotificationViewSet(BaseViewSet, BasePaginator):
@@ -131,6 +132,7 @@ class NotificationViewSet(BaseViewSet, BasePaginator):
             "cursor", False
         ):
             return self.paginate(
+                order_by=request.GET.get("order_by", "-created_at"),
                 request=request,
                 queryset=(notifications),
                 on_results=lambda notifications: NotificationSerializer(

apiserver/plane/app/views/page/base.py

@@ -1,7 +1,5 @@
 # Python imports
-import json
 from datetime import datetime
-from django.core.serializers.json import DjangoJSONEncoder
 
 # Django imports
 from django.db import connection
@@ -19,7 +17,6 @@ from plane.app.serializers import (
     PageLogSerializer,
     PageSerializer,
     SubPageSerializer,
-    PageDetailSerializer,
 )
 from plane.db.models import (
     Page,
@@ -31,8 +28,6 @@ from plane.db.models import (
 # Module imports
 from ..base import BaseAPIView, BaseViewSet
 
-from plane.bgtasks.page_transaction_task import page_transaction
-
 
 def unarchive_archive_page_and_descendants(page_id, archived_at):
     # Your SQL query
@@ -92,21 +87,11 @@ class PageViewSet(BaseViewSet):
     def create(self, request, slug, project_id):
         serializer = PageSerializer(
             data=request.data,
-            context={
-                "project_id": project_id,
-                "owned_by_id": request.user.id,
-                "description_html": request.data.get(
-                    "description_html", "<p></p>"
-                ),
-            },
+            context={"project_id": project_id, "owned_by_id": request.user.id},
         )
 
         if serializer.is_valid():
             serializer.save()
-            # capture the page transaction
-            page_transaction.delay(request.data, None, serializer.data["id"])
-            page = Page.objects.get(pk=serializer.data["id"])
-            serializer = PageDetailSerializer(page)
             return Response(serializer.data, status=status.HTTP_201_CREATED)
         return Response(serializer.errors, status=status.HTTP_400_BAD_REQUEST)
 
@@ -140,25 +125,9 @@ class PageViewSet(BaseViewSet):
                     status=status.HTTP_400_BAD_REQUEST,
                 )
 
-            serializer = PageDetailSerializer(
-                page, data=request.data, partial=True
-            )
-            page_description = page.description_html
+            serializer = PageSerializer(page, data=request.data, partial=True)
             if serializer.is_valid():
                 serializer.save()
-                # capture the page transaction
-                if request.data.get("description_html"):
-                    page_transaction.delay(
-                        new_value=request.data,
-                        old_value=json.dumps(
-                            {
-                                "description_html": page_description,
-                            },
-                            cls=DjangoJSONEncoder,
-                        ),
-                        page_id=pk,
-                    )
-
                 return Response(serializer.data, status=status.HTTP_200_OK)
             return Response(
                 serializer.errors, status=status.HTTP_400_BAD_REQUEST
@@ -171,30 +140,18 @@ class PageViewSet(BaseViewSet):
                 status=status.HTTP_400_BAD_REQUEST,
             )
 
-    def retrieve(self, request, slug, project_id, pk=None):
-        page = self.get_queryset().filter(pk=pk).first()
-        if page is None:
-            return Response(
-                {"error": "Page not found"},
-                status=status.HTTP_404_NOT_FOUND,
-            )
-        else:
-            return Response(
-                PageDetailSerializer(page).data, status=status.HTTP_200_OK
-            )
-
-    def lock(self, request, slug, project_id, pk):
+    def lock(self, request, slug, project_id, page_id):
         page = Page.objects.filter(
-            pk=pk, workspace__slug=slug, project_id=project_id
+            pk=page_id, workspace__slug=slug, project_id=project_id
         ).first()
 
         page.is_locked = True
         page.save()
         return Response(status=status.HTTP_204_NO_CONTENT)
 
-    def unlock(self, request, slug, project_id, pk):
+    def unlock(self, request, slug, project_id, page_id):
         page = Page.objects.filter(
-            pk=pk, workspace__slug=slug, project_id=project_id
+            pk=page_id, workspace__slug=slug, project_id=project_id
         ).first()
 
         page.is_locked = False
@@ -203,13 +160,13 @@ class PageViewSet(BaseViewSet):
         return Response(status=status.HTTP_204_NO_CONTENT)
 
     def list(self, request, slug, project_id):
-        queryset = self.get_queryset()
+        queryset = self.get_queryset().filter(archived_at__isnull=True)
         pages = PageSerializer(queryset, many=True).data
         return Response(pages, status=status.HTTP_200_OK)
 
-    def archive(self, request, slug, project_id, pk):
+    def archive(self, request, slug, project_id, page_id):
         page = Page.objects.get(
-            pk=pk, workspace__slug=slug, project_id=project_id
+            pk=page_id, workspace__slug=slug, project_id=project_id
         )
 
         # only the owner or admin can archive the page
@@ -227,16 +184,13 @@ class PageViewSet(BaseViewSet):
                 status=status.HTTP_400_BAD_REQUEST,
             )
 
-        unarchive_archive_page_and_descendants(pk, datetime.now())
+        unarchive_archive_page_and_descendants(page_id, datetime.now())
 
-        return Response(
-            {"archived_at": str(datetime.now())},
-            status=status.HTTP_200_OK,
-        )
+        return Response(status=status.HTTP_204_NO_CONTENT)
 
-    def unarchive(self, request, slug, project_id, pk):
+    def unarchive(self, request, slug, project_id, page_id):
         page = Page.objects.get(
-            pk=pk, workspace__slug=slug, project_id=project_id
+            pk=page_id, workspace__slug=slug, project_id=project_id
         )
 
         # only the owner or admin can un archive the page
@@ -259,10 +213,19 @@ class PageViewSet(BaseViewSet):
             page.parent = None
             page.save(update_fields=["parent"])
 
-        unarchive_archive_page_and_descendants(pk, None)
+        unarchive_archive_page_and_descendants(page_id, None)
 
         return Response(status=status.HTTP_204_NO_CONTENT)
 
+    def archive_list(self, request, slug, project_id):
+        pages = Page.objects.filter(
+            project_id=project_id,
+            workspace__slug=slug,
+        ).filter(archived_at__isnull=False)
+
+        pages = PageSerializer(pages, many=True).data
+        return Response(pages, status=status.HTTP_200_OK)
+
     def destroy(self, request, slug, project_id, pk):
         page = Page.objects.get(
             pk=pk, workspace__slug=slug, project_id=project_id
@@ -306,20 +269,29 @@ class PageFavoriteViewSet(BaseViewSet):
     serializer_class = PageFavoriteSerializer
     model = PageFavorite
 
-    def create(self, request, slug, project_id, pk):
-        _ = PageFavorite.objects.create(
-            project_id=project_id,
-            page_id=pk,
-            user=request.user,
+    def get_queryset(self):
+        return self.filter_queryset(
+            super()
+            .get_queryset()
+            .filter(archived_at__isnull=True)
+            .filter(workspace__slug=self.kwargs.get("slug"))
+            .filter(user=self.request.user)
+            .select_related("page", "page__owned_by")
         )
-        return Response(status=status.HTTP_204_NO_CONTENT)
 
-    def destroy(self, request, slug, project_id, pk):
+    def create(self, request, slug, project_id):
+        serializer = PageFavoriteSerializer(data=request.data)
+        if serializer.is_valid():
+            serializer.save(user=request.user, project_id=project_id)
+            return Response(serializer.data, status=status.HTTP_201_CREATED)
+        return Response(serializer.errors, status=status.HTTP_400_BAD_REQUEST)
+
+    def destroy(self, request, slug, project_id, page_id):
         page_favorite = PageFavorite.objects.get(
             project=project_id,
             user=request.user,
             workspace__slug=slug,
-            page_id=pk,
+            page_id=page_id,
         )
         page_favorite.delete()
         return Response(status=status.HTTP_204_NO_CONTENT)

apiserver/plane/app/views/project/base.py

@@ -1,53 +1,51 @@
 # Python imports
 import boto3
+from django.conf import settings
+from django.utils import timezone
 
 # Django imports
 from django.db import IntegrityError
 from django.db.models import (
-    Prefetch,
-    Q,
     Exists,
-    OuterRef,
     F,
     Func,
+    OuterRef,
+    Prefetch,
+    Q,
     Subquery,
 )
-from django.conf import settings
-from django.utils import timezone
 
 # Third Party imports
 from rest_framework.response import Response
-from rest_framework import status
-from rest_framework import serializers
+from rest_framework import serializers, status
 from rest_framework.permissions import AllowAny
 
 # Module imports
-from plane.app.views.base import BaseViewSet, BaseAPIView, WebhookMixin
-from plane.app.serializers import (
-    ProjectSerializer,
-    ProjectListSerializer,
-    ProjectFavoriteSerializer,
-    ProjectDeployBoardSerializer,
-)
 
 from plane.app.permissions import (
     ProjectBasePermission,
     ProjectMemberPermission,
 )
-
+from plane.app.serializers import (
+    ProjectDeployBoardSerializer,
+    ProjectFavoriteSerializer,
+    ProjectListSerializer,
+    ProjectSerializer,
+)
+from plane.app.views.base import BaseAPIView, BaseViewSet, WebhookMixin
 from plane.db.models import (
-    Project,
-    ProjectMember,
-    Workspace,
-    State,
-    ProjectFavorite,
-    ProjectIdentifier,
-    Module,
     Cycle,
     Inbox,
-    ProjectDeployBoard,
-    IssueProperty,
     Issue,
+    IssueProperty,
+    Module,
+    Project,
+    ProjectDeployBoard,
+    ProjectFavorite,
+    ProjectIdentifier,
+    ProjectMember,
+    State,
+    Workspace,
 )
 from plane.utils.cache import cache_response
 
@@ -166,6 +164,7 @@ class ProjectViewSet(WebhookMixin, BaseViewSet):
             "cursor", False
         ):
             return self.paginate(
+                order_by=request.GET.get("order_by", "-created_at"),
                 request=request,
                 queryset=(projects),
                 on_results=lambda projects: ProjectListSerializer(
@@ -393,11 +392,10 @@ class ProjectViewSet(WebhookMixin, BaseViewSet):
                     # Create the triage state in Backlog group
                     State.objects.get_or_create(
                         name="Triage",
-                        group="triage",
+                        group="backlog",
                         description="Default state for managing all Inbox Issues",
                         project_id=pk,
                         color="#ff7700",
-                        is_triage=True,
                     )
 
                 project = (

apiserver/plane/app/views/state/base.py

@@ -1,6 +1,9 @@
 # Python imports
 from itertools import groupby
 
+# Django imports
+from django.db.models import Q
+
 # Third party imports
 from rest_framework.response import Response
 from rest_framework import status
@@ -14,7 +17,6 @@ from plane.app.permissions import (
 from plane.db.models import State, Issue
 from plane.utils.cache import invalidate_cache
 
-
 class StateViewSet(BaseViewSet):
     serializer_class = StateSerializer
     model = State
@@ -33,15 +35,13 @@ class StateViewSet(BaseViewSet):
                 project__project_projectmember__is_active=True,
                 project__archived_at__isnull=True,
             )
-            .filter(is_triage=False)
+            .filter(~Q(name="Triage"))
             .select_related("project")
             .select_related("workspace")
             .distinct()
         )
 
-    @invalidate_cache(
-        path="workspaces/:slug/states/", url_params=True, user=False
-    )
+    @invalidate_cache(path="workspaces/:slug/states/", url_params=True, user=False)
     def create(self, request, slug, project_id):
         serializer = StateSerializer(data=request.data)
         if serializer.is_valid():
@@ -62,9 +62,7 @@ class StateViewSet(BaseViewSet):
             return Response(state_dict, status=status.HTTP_200_OK)
         return Response(states, status=status.HTTP_200_OK)
 
-    @invalidate_cache(
-        path="workspaces/:slug/states/", url_params=True, user=False
-    )
+    @invalidate_cache(path="workspaces/:slug/states/", url_params=True, user=False)
     def mark_as_default(self, request, slug, project_id, pk):
         # Select all the states which are marked as default
         _ = State.objects.filter(
@@ -75,12 +73,10 @@ class StateViewSet(BaseViewSet):
         ).update(default=True)
         return Response(status=status.HTTP_204_NO_CONTENT)
 
-    @invalidate_cache(
-        path="workspaces/:slug/states/", url_params=True, user=False
-    )
+    @invalidate_cache(path="workspaces/:slug/states/", url_params=True, user=False)
     def destroy(self, request, slug, project_id, pk):
         state = State.objects.get(
-            is_triage=False,
+            ~Q(name="Triage"),
             pk=pk,
             project_id=project_id,
             workspace__slug=slug,

apiserver/plane/app/views/user/base.py

@@ -49,12 +49,7 @@ class UserEndpoint(BaseViewSet):
             {"is_instance_admin": is_admin}, status=status.HTTP_200_OK
         )
 
-    @invalidate_cache(
-        path="/api/users/me/",
-    )
-    @invalidate_cache(
-        path="/api/users/me/settings/",
-    )
+    @invalidate_cache(path="/api/users/me/")
     def partial_update(self, request, *args, **kwargs):
         return super().partial_update(request, *args, **kwargs)
 
@@ -188,6 +183,7 @@ class UserActivityEndpoint(BaseAPIView, BasePaginator):
         ).select_related("actor", "workspace", "issue", "project")
 
         return self.paginate(
+            order_by=request.GET.get("order_by", "-created_at"),
             request=request,
             queryset=queryset,
             on_results=lambda issue_activities: IssueActivitySerializer(

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

@@ -1,47 +1,53 @@
 # Django imports
-from django.db.models import (
-    Q,
-    OuterRef,
-    Func,
-    F,
-    Case,
-    Value,
-    CharField,
-    When,
-    Exists,
-    Max,
-)
-from django.utils.decorators import method_decorator
-from django.views.decorators.gzip import gzip_page
 from django.contrib.postgres.aggregates import ArrayAgg
 from django.contrib.postgres.fields import ArrayField
-from django.db.models import UUIDField
+from django.db.models import (
+    Exists,
+    F,
+    Func,
+    OuterRef,
+    Q,
+    UUIDField,
+    Value,
+)
 from django.db.models.functions import Coalesce
+from django.utils.decorators import method_decorator
+from django.views.decorators.gzip import gzip_page
+from rest_framework import status
 
 # Third party imports
 from rest_framework.response import Response
-from rest_framework import status
+
+from plane.app.permissions import (
+    ProjectEntityPermission,
+    WorkspaceEntityPermission,
+)
+from plane.app.serializers import (
+    IssueViewFavoriteSerializer,
+    IssueViewSerializer,
+)
+from plane.db.models import (
+    Issue,
+    IssueAttachment,
+    IssueLink,
+    IssueView,
+    IssueViewFavorite,
+    Workspace,
+)
+from plane.utils.grouper import (
+    issue_group_values,
+    issue_on_results,
+    issue_queryset_grouper,
+)
+from plane.utils.issue_filters import issue_filters
+from plane.utils.order_queryset import order_issue_queryset
+from plane.utils.paginator import (
+    GroupedOffsetPaginator,
+    SubGroupedOffsetPaginator,
+)
 
 # Module imports
 from .. import BaseViewSet
-from plane.app.serializers import (
-    IssueViewSerializer,
-    IssueSerializer,
-    IssueViewFavoriteSerializer,
-)
-from plane.app.permissions import (
-    WorkspaceEntityPermission,
-    ProjectEntityPermission,
-)
-from plane.db.models import (
-    Workspace,
-    IssueView,
-    Issue,
-    IssueViewFavorite,
-    IssueLink,
-    IssueAttachment,
-)
-from plane.utils.issue_filters import issue_filters
 
 
 class GlobalViewViewSet(BaseViewSet):
@@ -144,17 +150,6 @@ class GlobalViewIssuesViewSet(BaseViewSet):
     @method_decorator(gzip_page)
     def list(self, request, slug):
         filters = issue_filters(request.query_params, "GET")
-
-        # Custom ordering for priority and state
-        priority_order = ["urgent", "high", "medium", "low", "none"]
-        state_order = [
-            "backlog",
-            "unstarted",
-            "started",
-            "completed",
-            "cancelled",
-        ]
-
         order_by_param = request.GET.get("order_by", "-created_at")
 
         issue_queryset = (
@@ -163,99 +158,119 @@ class GlobalViewIssuesViewSet(BaseViewSet):
             .annotate(cycle_id=F("issue_cycle__cycle_id"))
         )
 
-        # Priority Ordering
-        if order_by_param == "priority" or order_by_param == "-priority":
-            priority_order = (
-                priority_order
-                if order_by_param == "priority"
-                else priority_order[::-1]
-            )
-            issue_queryset = issue_queryset.annotate(
-                priority_order=Case(
-                    *[
-                        When(priority=p, then=Value(i))
-                        for i, p in enumerate(priority_order)
-                    ],
-                    output_field=CharField(),
-                )
-            ).order_by("priority_order")
+        # Issue queryset
+        issue_queryset = order_issue_queryset(
+            issue_queryset=issue_queryset,
+            order_by_param=order_by_param,
+        )
 
-        # State Ordering
-        elif order_by_param in [
-            "state__name",
-            "state__group",
-            "-state__name",
-            "-state__group",
-        ]:
-            state_order = (
-                state_order
-                if order_by_param in ["state__name", "state__group"]
-                else state_order[::-1]
-            )
-            issue_queryset = issue_queryset.annotate(
-                state_order=Case(
-                    *[
-                        When(state__group=state_group, then=Value(i))
-                        for i, state_group in enumerate(state_order)
-                    ],
-                    default=Value(len(state_order)),
-                    output_field=CharField(),
+        # 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,
+        )
+
+        if group_by:
+            # Check group and sub group value paginate
+            if sub_group_by:
+                if group_by == sub_group_by:
+                    return Response(
+                        {
+                            "error": "Group by and sub group by cannot have same parameters"
+                        },
+                        status=status.HTTP_400_BAD_REQUEST,
+                    )
+                else:
+                    # group and sub group pagination
+                    return self.paginate(
+                        request=request,
+                        order_by=(
+                            "priority_order"
+                            if order_by_param in ["priority", "-priority"]
+                            else order_by_param
+                        ),
+                        queryset=issue_queryset,
+                        on_results=lambda issues: issue_on_results(
+                            group_by=group_by,
+                            issues=issues,
+                            sub_group_by=sub_group_by,
+                        ),
+                        paginator_cls=SubGroupedOffsetPaginator,
+                        group_by_fields=issue_group_values(
+                            field=group_by,
+                            slug=slug,
+                            project_id=None,
+                            filters=filters,
+                        ),
+                        sub_group_by_fields=issue_group_values(
+                            field=sub_group_by,
+                            slug=slug,
+                            project_id=None,
+                            filters=filters,
+                        ),
+                        group_by_field_name=group_by,
+                        sub_group_by_field_name=sub_group_by,
+                        count_filter=Q(
+                            Q(issue_inbox__status=1)
+                            | Q(issue_inbox__status=-1)
+                            | Q(issue_inbox__status=2)
+                            | Q(issue_inbox__isnull=True),
+                            archived_at__isnull=True,
+                            is_draft=False,
+                        ),
+                    )
+            # Group Paginate
+            else:
+                # Group paginate
+                return self.paginate(
+                    request=request,
+                    order_by=(
+                        "priority_order"
+                        if order_by_param in ["priority", "-priority"]
+                        else order_by_param
+                    ),
+                    queryset=issue_queryset,
+                    on_results=lambda issues: issue_on_results(
+                        group_by=group_by,
+                        issues=issues,
+                        sub_group_by=sub_group_by,
+                    ),
+                    paginator_cls=GroupedOffsetPaginator,
+                    group_by_fields=issue_group_values(
+                        field=group_by,
+                        slug=slug,
+                        project_id=None,
+                        filters=filters,
+                    ),
+                    group_by_field_name=group_by,
+                    count_filter=Q(
+                        Q(issue_inbox__status=1)
+                        | Q(issue_inbox__status=-1)
+                        | Q(issue_inbox__status=2)
+                        | Q(issue_inbox__isnull=True),
+                        archived_at__isnull=True,
+                        is_draft=False,
+                    ),
                 )
-            ).order_by("state_order")
-        # assignee and label ordering
-        elif order_by_param in [
-            "labels__name",
-            "-labels__name",
-            "assignees__first_name",
-            "-assignees__first_name",
-        ]:
-            issue_queryset = issue_queryset.annotate(
-                max_values=Max(
-                    order_by_param[1::]
-                    if order_by_param.startswith("-")
+        else:
+            # List Paginate
+            return self.paginate(
+                order_by=(
+                    "-priority_order"
+                    if order_by_param in ["priority", "-priority"]
                     else order_by_param
-                )
-            ).order_by(
-                "-max_values"
-                if order_by_param.startswith("-")
-                else "max_values"
+                ),
+                request=request,
+                queryset=issue_queryset,
+                on_results=lambda issues: issue_on_results(
+                    group_by=group_by, issues=issues, sub_group_by=sub_group_by
+                ),
             )
-        else:
-            issue_queryset = issue_queryset.order_by(order_by_param)
-
-        if self.fields:
-            issues = IssueSerializer(
-                issue_queryset, many=True, fields=self.fields
-            ).data
-        else:
-            issues = issue_queryset.values(
-                "id",
-                "name",
-                "state_id",
-                "sort_order",
-                "completed_at",
-                "estimate_point",
-                "priority",
-                "start_date",
-                "target_date",
-                "sequence_id",
-                "project_id",
-                "parent_id",
-                "cycle_id",
-                "module_ids",
-                "label_ids",
-                "assignee_ids",
-                "sub_issues_count",
-                "created_at",
-                "updated_at",
-                "created_by",
-                "updated_by",
-                "attachment_count",
-                "link_count",
-                "is_draft",
-                "archived_at",
-            )
-        return Response(issues, status=status.HTTP_200_OK)
 
 
 class IssueViewViewSet(BaseViewSet):
@@ -326,11 +341,11 @@ class IssueViewFavoriteViewSet(BaseViewSet):
         return Response(serializer.errors, status=status.HTTP_400_BAD_REQUEST)
 
     def destroy(self, request, slug, project_id, view_id):
-        view_favorite = IssueViewFavorite.objects.get(
+        view_favourite = IssueViewFavorite.objects.get(
             project=project_id,
             user=request.user,
             workspace__slug=slug,
             view_id=view_id,
         )
-        view_favorite.delete()
+        view_favourite.delete()
         return Response(status=status.HTTP_204_NO_CONTENT)

apiserver/plane/app/views/workspace/base.py

@@ -151,8 +151,8 @@ class WorkSpaceViewSet(BaseViewSet):
         return super().partial_update(request, *args, **kwargs)
 
     @invalidate_cache(path="/api/workspaces/", user=False)
-    @invalidate_cache(path="/api/users/me/workspaces/", multiple=True)
-    @invalidate_cache(path="/api/users/me/settings/", multiple=True)
+    @invalidate_cache(path="/api/users/me/workspaces/")
+    @invalidate_cache(path="/api/users/me/settings/")
     def destroy(self, request, *args, **kwargs):
         return super().destroy(request, *args, **kwargs)
 

apiserver/plane/app/views/workspace/cycle.py

@@ -27,7 +27,6 @@ class WorkspaceCyclesEndpoint(BaseAPIView):
             .select_related("project")
             .select_related("workspace")
             .select_related("owned_by")
-            .filter(archived_at__isnull=False)
             .annotate(
                 total_issues=Count(
                     "issue_cycle",

apiserver/plane/app/views/workspace/invite.py

@@ -1,39 +1,36 @@
 # Python imports
-from datetime import datetime
-
 import jwt
+from datetime import datetime
 
 # Django imports
 from django.conf import settings
+from django.utils import timezone
+from django.db.models import Count
 from django.core.exceptions import ValidationError
 from django.core.validators import validate_email
-from django.db.models import Count
-from django.utils import timezone
 
 # Third party modules
 from rest_framework import status
-from rest_framework.permissions import AllowAny
 from rest_framework.response import Response
+from rest_framework.permissions import AllowAny
 
 # Module imports
-from plane.app.permissions import WorkSpaceAdminPermission
 from plane.app.serializers import (
-    WorkSpaceMemberInviteSerializer,
     WorkSpaceMemberSerializer,
+    WorkSpaceMemberInviteSerializer,
 )
 from plane.app.views.base import BaseAPIView
-from plane.bgtasks.event_tracking_task import workspace_invite_event
-from plane.bgtasks.workspace_invitation_task import workspace_invitation
+from .. import BaseViewSet
 from plane.db.models import (
     User,
     Workspace,
-    WorkspaceMember,
     WorkspaceMemberInvite,
+    WorkspaceMember,
 )
-from plane.utils.cache import invalidate_cache, invalidate_cache_directly
-
-from .. import BaseViewSet
-
+from plane.app.permissions import WorkSpaceAdminPermission
+from plane.bgtasks.workspace_invitation_task import workspace_invitation
+from plane.bgtasks.event_tracking_task import workspace_invite_event
+from plane.utils.cache import invalidate_cache
 
 class WorkspaceInvitationsViewset(BaseViewSet):
     """Endpoint for creating, listing and  deleting workspaces"""
@@ -169,14 +166,7 @@ class WorkspaceJoinEndpoint(BaseAPIView):
     """Invitation response endpoint the user can respond to the invitation"""
 
     @invalidate_cache(path="/api/workspaces/", user=False)
-    @invalidate_cache(path="/api/users/me/workspaces/", multiple=True)
-    @invalidate_cache(
-        path="/api/workspaces/:slug/members/",
-        user=False,
-        multiple=True,
-        url_params=True,
-    )
-    @invalidate_cache(path="/api/users/me/settings/", multiple=True)
+    @invalidate_cache(path="/api/users/me/workspaces/")
     def post(self, request, slug, pk):
         workspace_invite = WorkspaceMemberInvite.objects.get(
             pk=pk, workspace__slug=slug
@@ -274,7 +264,10 @@ class UserWorkspaceInvitationsViewSet(BaseViewSet):
         )
 
     @invalidate_cache(path="/api/workspaces/", user=False)
-    @invalidate_cache(path="/api/users/me/workspaces/", multiple=True)
+    @invalidate_cache(path="/api/users/me/workspaces/")
+    @invalidate_cache(
+        path="/api/workspaces/:slug/members/", url_params=True, user=False
+    )
     def create(self, request):
         invitations = request.data.get("invitations", [])
         workspace_invitations = WorkspaceMemberInvite.objects.filter(
@@ -283,12 +276,6 @@ class UserWorkspaceInvitationsViewSet(BaseViewSet):
 
         # If the user is already a member of workspace and was deactivated then activate the user
         for invitation in workspace_invitations:
-            invalidate_cache_directly(
-                path=f"/api/workspaces/{invitation.workspace.slug}/members/",
-                user=False,
-                request=request,
-                multiple=True,
-            )
             # Update the WorkspaceMember for this specific invitation
             WorkspaceMember.objects.filter(
                 workspace_id=invitation.workspace_id, member=request.user

apiserver/plane/app/views/workspace/member.py

@@ -102,10 +102,7 @@ class WorkSpaceMemberViewSet(BaseViewSet):
         return Response(serializer.data, status=status.HTTP_200_OK)
 
     @invalidate_cache(
-        path="/api/workspaces/:slug/members/",
-        url_params=True,
-        user=False,
-        multiple=True,
+        path="/api/workspaces/:slug/members/", url_params=True, user=False
     )
     def partial_update(self, request, slug, pk):
         workspace_member = WorkspaceMember.objects.get(
@@ -150,15 +147,9 @@ class WorkSpaceMemberViewSet(BaseViewSet):
         return Response(serializer.errors, status=status.HTTP_400_BAD_REQUEST)
 
     @invalidate_cache(
-        path="/api/workspaces/:slug/members/",
-        url_params=True,
-        user=False,
-        multiple=True,
-    )
-    @invalidate_cache(path="/api/users/me/settings/", multiple=True)
-    @invalidate_cache(
-        path="/api/users/me/workspaces/", user=False, multiple=True
+        path="/api/workspaces/:slug/members/", url_params=True, user=False
     )
+    @invalidate_cache(path="/api/users/me/settings/")
     def destroy(self, request, slug, pk):
         # Check the user role who is deleting the user
         workspace_member = WorkspaceMember.objects.get(
@@ -224,15 +215,9 @@ class WorkSpaceMemberViewSet(BaseViewSet):
         return Response(status=status.HTTP_204_NO_CONTENT)
 
     @invalidate_cache(
-        path="/api/workspaces/:slug/members/",
-        url_params=True,
-        user=False,
-        multiple=True,
+        path="/api/workspaces/:slug/members/", url_params=True, user=False
     )
     @invalidate_cache(path="/api/users/me/settings/")
-    @invalidate_cache(
-        path="api/users/me/workspaces/", user=False, multiple=True
-    )
     def leave(self, request, slug):
         workspace_member = WorkspaceMember.objects.get(
             workspace__slug=slug,

apiserver/plane/app/views/workspace/module.py

@@ -30,7 +30,6 @@ class WorkspaceModulesEndpoint(BaseAPIView):
             .select_related("workspace")
             .select_related("lead")
             .prefetch_related("members")
-            .filter(archived_at__isnull=False)
             .prefetch_related(
                 Prefetch(
                     "link_module",

apiserver/plane/app/views/workspace/user.py

@@ -1,60 +1,61 @@
 # Python imports
 from datetime import date
+
 from dateutil.relativedelta import relativedelta
+from django.contrib.postgres.aggregates import ArrayAgg
+from django.contrib.postgres.fields import ArrayField
+from django.db.models import (
+    Case,
+    CharField,
+    Count,
+    F,
+    Func,
+    IntegerField,
+    Max,
+    OuterRef,
+    Q,
+    UUIDField,
+    Value,
+    When,
+)
+from django.db.models.fields import DateField
+from django.db.models.functions import Cast, Coalesce, ExtractWeek
 
 # Django imports
 from django.utils import timezone
-from django.db.models import (
-    OuterRef,
-    Func,
-    F,
-    Q,
-    Count,
-    Case,
-    Value,
-    CharField,
-    When,
-    Max,
-    IntegerField,
-    UUIDField,
-)
-from django.db.models.functions import ExtractWeek, Cast
-from django.db.models.fields import DateField
-from django.contrib.postgres.aggregates import ArrayAgg
-from django.contrib.postgres.fields import ArrayField
-from django.db.models.functions import Coalesce
 
 # Third party modules
 from rest_framework import status
 from rest_framework.response import Response
 
+from plane.app.permissions import (
+    WorkspaceEntityPermission,
+    WorkspaceViewerPermission,
+)
+
 # Module imports
 from plane.app.serializers import (
-    WorkSpaceSerializer,
-    ProjectMemberSerializer,
     IssueActivitySerializer,
     IssueSerializer,
+    ProjectMemberSerializer,
+    WorkSpaceSerializer,
     WorkspaceUserPropertiesSerializer,
 )
 from plane.app.views.base import BaseAPIView
 from plane.db.models import (
-    User,
-    Workspace,
-    ProjectMember,
-    IssueActivity,
+    CycleIssue,
     Issue,
-    IssueLink,
+    IssueActivity,
     IssueAttachment,
+    IssueLink,
     IssueSubscriber,
     Project,
+    ProjectMember,
+    User,
+    Workspace,
     WorkspaceMember,
-    CycleIssue,
     WorkspaceUserProperties,
 )
-from plane.app.permissions import (
-    WorkspaceEntityPermission,
-    WorkspaceViewerPermission,
-)
 from plane.utils.issue_filters import issue_filters
 
 
@@ -397,6 +398,7 @@ class WorkspaceUserActivityEndpoint(BaseAPIView):
             queryset = queryset.filter(project__in=projects)
 
         return self.paginate(
+            order_by=request.GET.get("order_by", "-created_at"),
             request=request,
             queryset=queryset,
             on_results=lambda issue_activities: IssueActivitySerializer(

apiserver/plane/bgtasks/dummy_data_task.py

@@ -1,679 +0,0 @@
-# Python imports
-import uuid
-import random
-from datetime import datetime, timedelta
-
-# Django imports
-from django.db.models import Max
-
-# Third party imports
-from celery import shared_task
-from faker import Faker
-
-# Module imports
-from plane.db.models import (
-    Workspace,
-    User,
-    Project,
-    ProjectMember,
-    State,
-    Label,
-    Cycle,
-    Module,
-    Issue,
-    IssueSequence,
-    IssueAssignee,
-    IssueLabel,
-    IssueActivity,
-    CycleIssue,
-    ModuleIssue,
-    Page,
-    PageLabel,
-    Inbox,
-    InboxIssue,
-)
-
-
-def create_project(workspace, user_id):
-    fake = Faker()
-    name = fake.name()
-    unique_id = str(uuid.uuid4())[:5] 
-
-    project = Project.objects.create(
-        workspace=workspace,
-        name=f"{name}_{unique_id}",
-        identifier=name[
-            : random.randint(2, 12 if len(name) - 1 >= 12 else len(name) - 1)
-        ].upper(),
-        created_by_id=user_id,
-        inbox_view=True,
-    )
-
-    # Add current member as project member
-    _ = ProjectMember.objects.create(
-        project=project,
-        member_id=user_id,
-        role=20,
-    )
-
-    return project
-
-
-def create_project_members(workspace, project, members):
-    members = User.objects.filter(email__in=members)
-
-    _ = ProjectMember.objects.bulk_create(
-        [
-            ProjectMember(
-                project=project,
-                workspace=workspace,
-                member=member,
-                role=20,
-                sort_order=random.randint(0, 65535),
-            )
-            for member in members
-        ],
-        ignore_conflicts=True,
-    )
-    return
-
-
-def create_states(workspace, project, user_id):
-    states = [
-        {
-            "name": "Backlog",
-            "color": "#A3A3A3",
-            "sequence": 15000,
-            "group": "backlog",
-            "default": True,
-        },
-        {
-            "name": "Todo",
-            "color": "#3A3A3A",
-            "sequence": 25000,
-            "group": "unstarted",
-        },
-        {
-            "name": "In Progress",
-            "color": "#F59E0B",
-            "sequence": 35000,
-            "group": "started",
-        },
-        {
-            "name": "Done",
-            "color": "#16A34A",
-            "sequence": 45000,
-            "group": "completed",
-        },
-        {
-            "name": "Cancelled",
-            "color": "#EF4444",
-            "sequence": 55000,
-            "group": "cancelled",
-        },
-    ]
-
-    states = State.objects.bulk_create(
-        [
-            State(
-                name=state["name"],
-                color=state["color"],
-                project=project,
-                sequence=state["sequence"],
-                workspace=workspace,
-                group=state["group"],
-                default=state.get("default", False),
-                created_by_id=user_id,
-            )
-            for state in states
-        ]
-    )
-
-    return states
-
-
-def create_labels(workspace, project, user_id):
-    fake = Faker()
-    Faker.seed(0)
-
-    return Label.objects.bulk_create(
-        [
-            Label(
-                name=fake.color_name(),
-                color=fake.hex_color(),
-                project=project,
-                workspace=workspace,
-                created_by_id=user_id,
-                sort_order=random.randint(0, 65535),
-            )
-            for _ in range(0, 50)
-        ],
-        ignore_conflicts=True,
-    )
-
-
-def create_cycles(workspace, project, user_id, cycle_count):
-    fake = Faker()
-    Faker.seed(0)
-
-    cycles = []
-    used_date_ranges = set()  # Track used date ranges
-
-    while len(cycles) <= cycle_count:
-        # Generate a start date, allowing for None
-        start_date_option = [None, fake.date_this_year()]
-        start_date = start_date_option[random.randint(0, 1)]
-
-        # Initialize end_date based on start_date
-        end_date = (
-            None
-            if start_date is None
-            else fake.date_between_dates(
-                date_start=start_date,
-                date_end=datetime.now().date().replace(month=12, day=31),
-            )
-        )
-
-        # Ensure end_date is strictly after start_date if start_date is not None
-        while start_date is not None and (
-            end_date <= start_date
-            or (start_date, end_date) in used_date_ranges
-        ):
-            end_date = fake.date_this_year()
-
-        # Add the unique date range to the set
-        (
-            used_date_ranges.add((start_date, end_date))
-            if (end_date is not None and start_date is not None)
-            else None
-        )
-
-        # Append the cycle with unique date range
-        cycles.append(
-            Cycle(
-                name=fake.name(),
-                owned_by_id=user_id,
-                sort_order=random.randint(0, 65535),
-                start_date=start_date,
-                end_date=end_date,
-                project=project,
-                workspace=workspace,
-            )
-        )
-
-    return Cycle.objects.bulk_create(cycles, ignore_conflicts=True)
-
-
-def create_modules(workspace, project, user_id, module_count):
-    fake = Faker()
-    Faker.seed(0)
-
-    modules = []
-    for _ in range(0, module_count):
-        start_date = [None, fake.date_this_year()][random.randint(0, 1)]
-        end_date = (
-            None
-            if start_date is None
-            else fake.date_between_dates(
-                date_start=start_date,
-                date_end=datetime.now().date().replace(month=12, day=31),
-            )
-        )
-
-        modules.append(
-            Module(
-                name=fake.name(),
-                sort_order=random.randint(0, 65535),
-                start_date=start_date,
-                target_date=end_date,
-                project=project,
-                workspace=workspace,
-            )
-        )
-
-    return Module.objects.bulk_create(modules, ignore_conflicts=True)
-
-
-def create_pages(workspace, project, user_id, pages_count):
-    fake = Faker()
-    Faker.seed(0)
-
-    pages = []
-    for _ in range(0, pages_count):
-        text = fake.text(max_nb_chars=60000)
-        pages.append(
-            Page(
-                name=fake.name(),
-                project=project,
-                workspace=workspace,
-                owned_by_id=user_id,
-                access=random.randint(0, 1),
-                color=fake.hex_color(),
-                description_html=f"<p>{text}</p>",
-                archived_at=None,
-                is_locked=False,
-            )
-        )
-
-    return Page.objects.bulk_create(pages, ignore_conflicts=True)
-
-
-def create_page_labels(workspace, project, user_id, pages_count):
-    # labels
-    labels = Label.objects.filter(project=project).values_list("id", flat=True)
-    pages = random.sample(
-        list(
-            Page.objects.filter(project=project).values_list("id", flat=True)
-        ),
-        int(pages_count / 2),
-    )
-
-    # Bulk page labels
-    bulk_page_labels = []
-    for page in pages:
-        for label in random.sample(
-            list(labels), random.randint(0, len(labels) - 1)
-        ):
-            bulk_page_labels.append(
-                PageLabel(
-                    page_id=page,
-                    label_id=label,
-                    project=project,
-                    workspace=workspace,
-                )
-            )
-
-    # Page labels
-    PageLabel.objects.bulk_create(
-        bulk_page_labels, batch_size=1000, ignore_conflicts=True
-    )
-
-
-def create_issues(workspace, project, user_id, issue_count):
-    fake = Faker()
-    Faker.seed(0)
-
-    states = State.objects.filter(workspace=workspace, project=project).exclude(group="Triage").values_list("id", flat=True)
-    creators = ProjectMember.objects.filter(workspace=workspace, project=project).values_list("member_id", flat=True)
-
-    issues = []
-
-    # Get the maximum sequence_id
-    last_id = IssueSequence.objects.filter(
-        project=project,
-    ).aggregate(
-        largest=Max("sequence")
-    )["largest"]
-
-    last_id = 1 if last_id is None else last_id + 1
-
-    # Get the maximum sort order
-    largest_sort_order = Issue.objects.filter(
-        project=project,
-        state_id=states[random.randint(0, len(states) - 1)],
-    ).aggregate(largest=Max("sort_order"))["largest"]
-
-    largest_sort_order = (
-        65535 if largest_sort_order is None else largest_sort_order + 10000
-    )
-
-    for _ in range(0, issue_count):
-        start_date = [None, fake.date_this_year()][random.randint(0, 1)]
-        end_date = (
-            None
-            if start_date is None
-            else fake.date_between_dates(
-                date_start=start_date,
-                date_end=datetime.now().date().replace(month=12, day=31),
-            )
-        )
-
-        text = fake.text(max_nb_chars=60000)
-        issues.append(
-            Issue(
-                state_id=states[random.randint(0, len(states) - 1)],
-                project=project,
-                workspace=workspace,
-                name=text[:254],
-                description_html=f"<p>{text}</p>",
-                description_stripped=text,
-                sequence_id=last_id,
-                sort_order=largest_sort_order,
-                start_date=start_date,
-                target_date=end_date,
-                priority=["urgent", "high", "medium", "low", "none"][
-                    random.randint(0, 4)
-                ],
-                created_by_id=creators[random.randint(0, len(creators) - 1)],
-            )
-        )
-
-        largest_sort_order = largest_sort_order + random.randint(0, 1000)
-        last_id = last_id + 1
-
-    issues = Issue.objects.bulk_create(
-        issues, ignore_conflicts=True, batch_size=1000
-    )
-    # Sequences
-    _ = IssueSequence.objects.bulk_create(
-        [
-            IssueSequence(
-                issue=issue,
-                sequence=issue.sequence_id,
-                project=project,
-                workspace=workspace,
-            )
-            for issue in issues
-        ],
-        batch_size=100,
-    )
-
-    # Track the issue activities
-    IssueActivity.objects.bulk_create(
-        [
-            IssueActivity(
-                issue=issue,
-                actor_id=user_id,
-                project=project,
-                workspace=workspace,
-                comment="created the issue",
-                verb="created",
-                created_by_id=user_id,
-            )
-            for issue in issues
-        ],
-        batch_size=100,
-    )
-    return issues
-
-
-def create_inbox_issues(workspace, project, user_id, inbox_issue_count):
-    issues = create_issues(workspace, project, user_id, inbox_issue_count)
-    inbox, create = Inbox.objects.get_or_create(
-        name="Inbox",
-        project=project,
-        is_default=True,
-    )
-    InboxIssue.objects.bulk_create(
-        [
-            InboxIssue(
-                issue=issue,
-                inbox=inbox,
-                status=(status := [-2, -1, 0, 1, 2][random.randint(0, 4)]),
-                snoozed_till=(
-                    datetime.now() + timedelta(days=random.randint(1, 30))
-                    if status == 0
-                    else None
-                ),
-                source="in-app",
-                workspace=workspace,
-                project=project,
-            )
-            for issue in issues
-        ],
-        batch_size=100,
-    )
-
-
-def create_issue_parent(workspace, project, user_id, issue_count):
-
-    parent_count = issue_count / 4
-
-    parent_issues = Issue.objects.filter(project=project).values_list(
-        "id", flat=True
-    )[: int(parent_count)]
-    sub_issues = Issue.objects.filter(project=project).exclude(
-        pk__in=parent_issues
-    )[: int(issue_count / 2)]
-
-    bulk_sub_issues = []
-    for sub_issue in sub_issues:
-        sub_issue.parent_id = parent_issues[
-            random.randint(0, int(parent_count - 1))
-        ]
-
-    Issue.objects.bulk_update(bulk_sub_issues, ["parent"], batch_size=1000)
-
-
-def create_issue_assignees(workspace, project, user_id, issue_count):
-    # assignees
-    assignees = ProjectMember.objects.filter(project=project).values_list(
-        "member_id", flat=True
-    )
-    issues = random.sample(
-        list(
-            Issue.objects.filter(project=project).values_list("id", flat=True)
-        ),
-        int(issue_count / 2),
-    )
-
-    # Bulk issue
-    bulk_issue_assignees = []
-    for issue in issues:
-        for assignee in random.sample(
-            list(assignees), random.randint(0, len(assignees) - 1)
-        ):
-            bulk_issue_assignees.append(
-                IssueAssignee(
-                    issue_id=issue,
-                    assignee_id=assignee,
-                    project=project,
-                    workspace=workspace,
-                )
-            )
-
-    # Issue assignees
-    IssueAssignee.objects.bulk_create(
-        bulk_issue_assignees, batch_size=1000, ignore_conflicts=True
-    )
-
-
-def create_issue_labels(workspace, project, user_id, issue_count):
-    # labels
-    labels = Label.objects.filter(project=project).values_list("id", flat=True)
-    issues = random.sample(
-        list(
-            Issue.objects.filter(project=project).values_list("id", flat=True)
-        ),
-        int(issue_count / 2),
-    )
-
-    # Bulk issue
-    bulk_issue_labels = []
-    for issue in issues:
-        for label in random.sample(
-            list(labels), random.randint(0, len(labels) - 1)
-        ):
-            bulk_issue_labels.append(
-                IssueLabel(
-                    issue_id=issue,
-                    label_id=label,
-                    project=project,
-                    workspace=workspace,
-                )
-            )
-
-    # Issue labels
-    IssueLabel.objects.bulk_create(
-        bulk_issue_labels, batch_size=1000, ignore_conflicts=True
-    )
-
-
-def create_cycle_issues(workspace, project, user_id, issue_count):
-    # assignees
-    cycles = Cycle.objects.filter(project=project).values_list("id", flat=True)
-    issues = random.sample(
-        list(
-            Issue.objects.filter(project=project).values_list("id", flat=True)
-        ),
-        int(issue_count / 2),
-    )
-
-    # Bulk issue
-    bulk_cycle_issues = []
-    for issue in issues:
-        cycle = cycles[random.randint(0, len(cycles) - 1)]
-        bulk_cycle_issues.append(
-            CycleIssue(
-                cycle_id=cycle,
-                issue_id=issue,
-                project=project,
-                workspace=workspace,
-            )
-        )
-
-    # Issue assignees
-    CycleIssue.objects.bulk_create(
-        bulk_cycle_issues, batch_size=1000, ignore_conflicts=True
-    )
-
-
-def create_module_issues(workspace, project, user_id, issue_count):
-    # assignees
-    modules = Module.objects.filter(project=project).values_list(
-        "id", flat=True
-    )
-    issues = random.sample(
-        list(
-            Issue.objects.filter(project=project).values_list("id", flat=True)
-        ),
-        int(issue_count / 2),
-    )
-
-    # Bulk issue
-    bulk_module_issues = []
-    for issue in issues:
-        module = modules[random.randint(0, len(modules) - 1)]
-        bulk_module_issues.append(
-            ModuleIssue(
-                module_id=module,
-                issue_id=issue,
-                project=project,
-                workspace=workspace,
-            )
-        )
-    # Issue assignees
-    ModuleIssue.objects.bulk_create(
-        bulk_module_issues, batch_size=1000, ignore_conflicts=True
-    )
-
-
-@shared_task
-def create_dummy_data(
-    slug,
-    email,
-    members,
-    issue_count,
-    cycle_count,
-    module_count,
-    pages_count,
-    inbox_issue_count,
-):
-    workspace = Workspace.objects.get(slug=slug)
-
-    user = User.objects.get(email=email)
-    user_id = user.id
-
-    # Create a project
-    project = create_project(workspace=workspace, user_id=user_id)
-
-    # create project members
-    create_project_members(
-        workspace=workspace, project=project, members=members
-    )
-
-    # Create states
-    create_states(workspace=workspace, project=project, user_id=user_id)
-
-    # Create labels
-    create_labels(workspace=workspace, project=project, user_id=user_id)
-
-    # create cycles
-    create_cycles(
-        workspace=workspace,
-        project=project,
-        user_id=user_id,
-        cycle_count=cycle_count,
-    )
-
-    # create modules
-    create_modules(
-        workspace=workspace,
-        project=project,
-        user_id=user_id,
-        module_count=module_count,
-    )
-
-    # create pages
-    create_pages(
-        workspace=workspace,
-        project=project,
-        user_id=user_id,
-        pages_count=pages_count,
-    )
-
-    # create page labels
-    create_page_labels(
-        workspace=workspace,
-        project=project,
-        user_id=user_id,
-        pages_count=pages_count,
-    )
-
-    # create issues
-    create_issues(
-        workspace=workspace,
-        project=project,
-        user_id=user_id,
-        issue_count=issue_count,
-    )
-
-    # create inbox issues
-    create_inbox_issues(
-        workspace=workspace,
-        project=project,
-        user_id=user_id,
-        inbox_issue_count=inbox_issue_count,
-    )
-
-    # create issue parent
-    create_issue_parent(
-        workspace=workspace,
-        project=project,
-        user_id=user_id,
-        issue_count=issue_count,
-    )
-
-    # create issue assignees
-    create_issue_assignees(
-        workspace=workspace,
-        project=project,
-        user_id=user_id,
-        issue_count=issue_count,
-    )
-
-    # create issue labels
-    create_issue_labels(
-        workspace=workspace,
-        project=project,
-        user_id=user_id,
-        issue_count=issue_count,
-    )
-
-    # create cycle issues
-    create_cycle_issues(
-        workspace=workspace,
-        project=project,
-        user_id=user_id,
-        issue_count=issue_count,
-    )
-
-    # create module issues
-    create_module_issues(
-        workspace=workspace,
-        project=project,
-        user_id=user_id,
-        issue_count=issue_count,
-    )
-
-    return

apiserver/plane/bgtasks/email_notification_task.py

@@ -1,5 +1,4 @@
 import logging
-import re
 from datetime import datetime
 
 from bs4 import BeautifulSoup
@@ -20,12 +19,6 @@ from plane.settings.redis import redis_instance
 from plane.utils.exception_logger import log_exception
 
 
-def remove_unwanted_characters(input_text):
-    # Keep only alphanumeric characters, spaces, and dashes.
-    processed_text = re.sub(r"[^a-zA-Z0-9 \-]", "", input_text)
-    return processed_text
-
-
 # acquire and delete redis lock
 def acquire_lock(lock_id, expire_time=300):
     redis_client = redis_instance()
@@ -182,16 +175,7 @@ def send_email_notification(
         if acquire_lock(lock_id=lock_id):
             # get the redis instance
             ri = redis_instance()
-            base_api = (
-                ri.get(str(issue_id)).decode()
-                if ri.get(str(issue_id))
-                else None
-            )
-
-            # Skip if base api is not present
-            if not base_api:
-                return
-
+            base_api = ri.get(str(issue_id)).decode()
             data = create_payload(notification_data=notification_data)
 
             # Get email configurations
@@ -271,7 +255,9 @@ def send_email_notification(
             summary = "Updates were made to the issue by"
 
             # Send the mail
-            subject = f"{issue.project.identifier}-{issue.sequence_id} {remove_unwanted_characters(issue.name)}"
+            subject = (
+                f"{issue.project.identifier}-{issue.sequence_id} {issue.name}"
+            )
             context = {
                 "data": template_data,
                 "summary": summary,
@@ -335,7 +321,8 @@ def send_email_notification(
                 "Duplicate email received skipping"
             )
             return
-    except (Issue.DoesNotExist, User.DoesNotExist):
+    except (Issue.DoesNotExist, User.DoesNotExist) as e:
+        log_exception(e)
         release_lock(lock_id=lock_id)
         return
     except Exception as e:

apiserver/plane/bgtasks/issue_activites_task.py

@@ -1553,46 +1553,6 @@ def delete_draft_issue_activity(
     )
 
 
-def create_inbox_activity(
-    requested_data,
-    current_instance,
-    issue_id,
-    project_id,
-    workspace_id,
-    actor_id,
-    issue_activities,
-    epoch,
-):
-    requested_data = (
-        json.loads(requested_data) if requested_data is not None else None
-    )
-    current_instance = (
-        json.loads(current_instance) if current_instance is not None else None
-    )
-    status_dict = {
-        -2: "Pending",
-        -1: "Rejected",
-        0: "Snoozed",
-        1: "Accepted",
-        2: "Duplicate",
-    }
-    if requested_data.get("status") is not None:
-        issue_activities.append(
-            IssueActivity(
-                issue_id=issue_id,
-                project_id=project_id,
-                workspace_id=workspace_id,
-                comment="updated the inbox status",
-                field="inbox",
-                verb=requested_data.get("status"),
-                actor_id=actor_id,
-                epoch=epoch,
-                old_value=status_dict.get(current_instance.get("status")),
-                new_value=status_dict.get(requested_data.get("status")),
-            )
-        )
-
-
 # Receive message from room group
 @shared_task
 def issue_activity(
@@ -1653,7 +1613,6 @@ def issue_activity(
             "issue_draft.activity.created": create_draft_issue_activity,
             "issue_draft.activity.updated": update_draft_issue_activity,
             "issue_draft.activity.deleted": delete_draft_issue_activity,
-            "inbox.activity.created": create_inbox_activity,
         }
 
         func = ACTIVITY_MAPPER.get(type)

apiserver/plane/bgtasks/page_transaction_task.py

@@ -1,76 +0,0 @@
-# Python imports
-import json
-
-# Django imports
-from django.utils import timezone
-
-# Third-party imports
-from bs4 import BeautifulSoup
-
-# Module imports
-from plane.db.models import Page, PageLog
-from celery import shared_task
-
-
-def extract_components(value, tag):
-    try:
-        mentions = []
-        html = value.get("description_html")
-        soup = BeautifulSoup(html, "html.parser")
-        mention_tags = soup.find_all(tag)
-
-        for mention_tag in mention_tags:
-            mention = {
-                "id": mention_tag.get("id"),
-                "entity_identifier": mention_tag.get("entity_identifier"),
-                "entity_name": mention_tag.get("entity_name"),
-            }
-            mentions.append(mention)
-
-        return mentions
-    except Exception:
-        return []
-
-
-@shared_task
-def page_transaction(new_value, old_value, page_id):
-    page = Page.objects.get(pk=page_id)
-    new_page_mention = PageLog.objects.filter(page_id=page_id).exists()
-
-    old_value = json.loads(old_value) if old_value else {}
-
-    new_transactions = []
-    deleted_transaction_ids = set()
-
-    # TODO - Add "issue-embed-component", "img", "todo" components
-    components = ["mention-component"]
-    for component in components:
-        old_mentions = extract_components(old_value, component)
-        new_mentions = extract_components(new_value, component)
-
-        new_mentions_ids = {mention["id"] for mention in new_mentions}
-        old_mention_ids = {mention["id"] for mention in old_mentions}
-        deleted_transaction_ids.update(old_mention_ids - new_mentions_ids)
-
-        new_transactions.extend(
-            PageLog(
-                transaction=mention["id"],
-                page_id=page_id,
-                entity_identifier=mention["entity_identifier"],
-                entity_name=mention["entity_name"],
-                workspace_id=page.workspace_id,
-                project_id=page.project_id,
-                created_at=timezone.now(),
-                updated_at=timezone.now(),
-            )
-            for mention in new_mentions
-            if mention["id"] not in old_mention_ids or not new_page_mention
-        )
-
-    # Create new PageLog objects for new transactions
-    PageLog.objects.bulk_create(
-        new_transactions, batch_size=10, ignore_conflicts=True
-    )
-
-    # Delete the removed transactions
-    PageLog.objects.filter(transaction__in=deleted_transaction_ids).delete()

apiserver/plane/bgtasks/project_invitation_task.py

@@ -5,6 +5,7 @@ import logging
 from celery import shared_task
 
 # Django imports
+# Third party imports
 from django.core.mail import EmailMultiAlternatives, get_connection
 from django.template.loader import render_to_string
 from django.utils.html import strip_tags

apiserver/plane/bgtasks/webhook_task.py

@@ -202,7 +202,16 @@ def send_webhook(event, payload, kw, action, slug, bulk, current_site):
         if webhooks:
             if action in ["POST", "PATCH"]:
                 if bulk and event in ["cycle_issue", "module_issue"]:
-                    return
+                    event_data = IssueExpandSerializer(
+                        Issue.objects.filter(
+                            pk__in=[
+                                str(event.get("issue")) for event in payload
+                            ]
+                        ).prefetch_related("issue_cycle", "issue_module"),
+                        many=True,
+                    ).data
+                    event = "issue"
+                    action = "PATCH"
                 else:
                     event_data = [
                         get_model_data(
@@ -210,7 +219,7 @@ def send_webhook(event, payload, kw, action, slug, bulk, current_site):
                             event_id=(
                                 payload.get("id")
                                 if isinstance(payload, dict)
-                                else kw.get("pk")
+                                else None
                             ),
                             many=False,
                         )

apiserver/plane/db/management/commands/create_dummy_data.py

@@ -1,95 +0,0 @@
-# Django imports
-from typing import Any
-from django.core.management.base import BaseCommand, CommandError
-
-# Module imports
-from plane.db.models import User, Workspace, WorkspaceMember
-
-
-class Command(BaseCommand):
-    help = "Create dump issues, cycles etc. for a project in a given workspace"
-
-    def handle(self, *args: Any, **options: Any) -> str | None:
-
-        try:
-            workspace_name = input("Workspace Name: ")
-            workspace_slug = input("Workspace slug: ")
-
-            if workspace_slug == "":
-                raise CommandError("Workspace slug is required")
-
-            if Workspace.objects.filter(slug=workspace_slug).exists():
-                raise CommandError("Workspace already exists")
-
-            creator = input("Your email: ")
-
-            if (
-                creator == ""
-                or not User.objects.filter(email=creator).exists()
-            ):
-                raise CommandError(
-                    "User email is required and should have signed in plane"
-                )
-
-            user = User.objects.get(email=creator)
-
-            members = input("Enter Member emails (comma separated): ")
-            members = members.split(",") if members != "" else []
-            # Create workspace
-            workspace = Workspace.objects.create(
-                slug=workspace_slug,
-                name=workspace_name,
-                owner=user,
-            )
-            # Create workspace member
-            WorkspaceMember.objects.create(
-                workspace=workspace, role=20, member=user
-            )
-            user_ids = User.objects.filter(email__in=members)
-
-            _ = WorkspaceMember.objects.bulk_create(
-                [
-                    WorkspaceMember(
-                        workspace=workspace,
-                        member=user_id,
-                        role=20,
-                    )
-                    for user_id in user_ids
-                ],
-                ignore_conflicts=True,
-            )
-
-            project_count = int(input("Number of projects to be created: "))
-
-            for i in range(project_count):
-                print(f"Please provide the following details for project {i+1}:")
-                issue_count = int(input("Number of issues to be created: "))
-                cycle_count = int(input("Number of cycles to be created: "))
-                module_count = int(input("Number of modules to be created: "))
-                pages_count = int(input("Number of pages to be created: "))
-                inbox_issue_count = int(
-                    input("Number of inbox issues to be created: ")
-                )
-
-                from plane.bgtasks.dummy_data_task import create_dummy_data
-
-                create_dummy_data.delay(
-                    slug=workspace_slug,
-                    email=creator,
-                    members=members,
-                    issue_count=issue_count,
-                    cycle_count=cycle_count,
-                    module_count=module_count,
-                    pages_count=pages_count,
-                    inbox_issue_count=inbox_issue_count,
-                )
-
-            self.stdout.write(
-                self.style.SUCCESS("Data is pushed to the queue")
-            )
-            return
-        except Exception as e:
-            self.stdout.write(
-                self.style.ERROR(f"Command errored out {str(e)}")
-            )
-            return

apiserver/plane/db/management/commands/create_instance_admin.py

@@ -1,48 +0,0 @@
-# Django imports
-from django.core.management.base import BaseCommand, CommandError
-
-# Module imports
-from plane.license.models import Instance, InstanceAdmin
-from plane.db.models import User
-
-
-class Command(BaseCommand):
-    help = "Add a new instance admin"
-
-    def add_arguments(self, parser):
-        # Positional argument
-        parser.add_argument(
-            "admin_email", type=str, help="Instance Admin Email"
-        )
-
-    def handle(self, *args, **options):
-
-        admin_email = options.get("admin_email", False)
-
-        if not admin_email:
-            raise CommandError("Please provide the email of the admin.")
-
-        user = User.objects.filter(email=admin_email).first()
-        if user is None:
-            raise CommandError("User with the provided email does not exist.")
-
-        try:
-            # Get the instance
-            instance = Instance.objects.last()
-
-            # Get or create an instance admin
-            _, created = InstanceAdmin.objects.get_or_create(
-                user=user, instance=instance, role=20
-            )
-
-            if not created:
-                raise CommandError(
-                    "The provided email is already an instance admin."
-                )
-
-            self.stdout.write(
-                self.style.SUCCESS("Successfully created the admin")
-            )
-        except Exception as e:
-            print(e)
-            raise CommandError("Failed to create the instance admin.")

apiserver/plane/db/management/commands/test_email.py

@@ -15,7 +15,7 @@ class Command(BaseCommand):
         receiver_email = options.get("to_email")
 
         if not receiver_email:
-            raise CommandError("Receiver email is required")
+            raise CommandError("Reciever email is required")
 
         (
             EMAIL_HOST,
@@ -54,7 +54,7 @@ class Command(BaseCommand):
                 connection=connection,
             )
             msg.send()
-            self.stdout.write(self.style.SUCCESS("Email successfully sent"))
+            self.stdout.write(self.style.SUCCESS("Email succesfully sent"))
         except Exception as e:
             self.stdout.write(
                 self.style.ERROR(

apiserver/plane/db/migrations/0063_state_is_triage_alter_state_group.py

@@ -1,44 +0,0 @@
-# Generated by Django 4.2.10 on 2024-04-02 12:18
-
-from django.db import migrations, models
-
-
-def update_project_state_group(apps, schema_editor):
-    State = apps.get_model("db", "State")
-
-    # Update states in bulk
-    State.objects.filter(group="backlog", name="Triage").update(
-        is_triage=True, group="triage"
-    )
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ("db", "0062_cycle_archived_at_module_archived_at_and_more"),
-    ]
-
-    operations = [
-        migrations.AddField(
-            model_name="state",
-            name="is_triage",
-            field=models.BooleanField(default=False),
-        ),
-        migrations.AlterField(
-            model_name="state",
-            name="group",
-            field=models.CharField(
-                choices=[
-                    ("backlog", "Backlog"),
-                    ("unstarted", "Unstarted"),
-                    ("started", "Started"),
-                    ("completed", "Completed"),
-                    ("cancelled", "Cancelled"),
-                    ("triage", "Triage"),
-                ],
-                default="backlog",
-                max_length=20,
-            ),
-        ),
-        migrations.RunPython(update_project_state_group),
-    ]

apiserver/plane/db/migrations/0064_auto_20240409_1134.py

@@ -1,20 +0,0 @@
-# Generated by Django 4.2.10 on 2024-04-09 11:34
-
-from django.db import migrations, models
-import plane.db.models.page
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('db', '0063_state_is_triage_alter_state_group'),
-    ]
-
-    operations = [
-        migrations.AddField(
-            model_name="page",
-            name="view_props",
-            field=models.JSONField(
-                default=plane.db.models.page.get_view_props
-            ),
-        ),
-    ]

apiserver/plane/db/models/issue.py

@@ -171,14 +171,14 @@ class Issue(ProjectBaseModel):
                 from plane.db.models import State
 
                 default_state = State.objects.filter(
-                    ~models.Q(is_triage=True),
+                    ~models.Q(name="Triage"),
                     project=self.project,
                     default=True,
                 ).first()
                 # if there is no default state assign any random state
                 if default_state is None:
                     random_state = State.objects.filter(
-                        ~models.Q(is_triage=True), project=self.project
+                        ~models.Q(name="Triage"), project=self.project
                     ).first()
                     self.state = random_state
                 else:

apiserver/plane/db/models/page.py

@@ -9,10 +9,6 @@ from . import ProjectBaseModel
 from plane.utils.html_processor import strip_tags
 
 
-def get_view_props():
-    return {"full_width": False}
-
-
 class Page(ProjectBaseModel):
     name = models.CharField(max_length=255)
     description = models.JSONField(default=dict, blank=True)
@@ -39,7 +35,6 @@ class Page(ProjectBaseModel):
     )
     archived_at = models.DateField(null=True)
     is_locked = models.BooleanField(default=False)
-    view_props = models.JSONField(default=get_view_props)
 
     class Meta:
         verbose_name = "Page"
@@ -86,7 +81,7 @@ class PageLog(ProjectBaseModel):
         ordering = ("-created_at",)
 
     def __str__(self):
-        return f"{self.page.name} {self.entity_name}"
+        return f"{self.page.name} {self.type}"
 
 
 class PageBlock(ProjectBaseModel):

apiserver/plane/db/models/state.py

@@ -21,12 +21,10 @@ class State(ProjectBaseModel):
             ("started", "Started"),
             ("completed", "Completed"),
             ("cancelled", "Cancelled"),
-            ("triage", "Triage")
         ),
         default="backlog",
         max_length=20,
     )
-    is_triage = models.BooleanField(default=False)
     default = models.BooleanField(default=False)
     external_source = models.CharField(max_length=255, null=True, blank=True)
     external_id = models.CharField(max_length=255, blank=True, null=True)

apiserver/plane/license/management/commands/configure_instance.py

@@ -88,12 +88,6 @@ class Command(BaseCommand):
                 "category": "SMTP",
                 "is_encrypted": False,
             },
-            {
-                "key": "EMAIL_USE_SSL",
-                "value": os.environ.get("EMAIL_USE_SSL", "0"),
-                "category": "SMTP",
-                "is_encrypted": False,
-            },
             {
                 "key": "OPENAI_API_KEY",
                 "value": os.environ.get("OPENAI_API_KEY"),

apiserver/plane/settings/common.py

@@ -288,13 +288,10 @@ else:
     CELERY_BROKER_URL = REDIS_URL
 
 CELERY_IMPORTS = (
-    # scheduled tasks
     "plane.bgtasks.issue_automation_task",
     "plane.bgtasks.exporter_expired_task",
     "plane.bgtasks.file_asset_task",
     "plane.bgtasks.email_notification_task",
-    # management tasks
-    "plane.bgtasks.dummy_data_task",
 )
 
 # Sentry Settings

apiserver/plane/settings/production.py

@@ -6,7 +6,7 @@ from .common import *  # noqa
 
 # SECURITY WARNING: don't run with debug turned on in production!
 DEBUG = int(os.environ.get("DEBUG", 0)) == 1
-
+DEBUG = True
 # Honor the 'X-Forwarded-Proto' header for request.is_secure()
 SECURE_PROXY_SSL_HEADER = ("HTTP_X_FORWARDED_PROTO", "https")
 
@@ -25,7 +25,7 @@ LOG_DIR = os.path.join(BASE_DIR, "logs")  # noqa
 if not os.path.exists(LOG_DIR):
     os.makedirs(LOG_DIR)
 
-# Logging configuration
+
 LOGGING = {
     "version": 1,
     "disable_existing_loggers": False,

apiserver/plane/space/views/issue.py

@@ -1,56 +1,57 @@
 # Python imports
 import json
 
+from django.core.serializers.json import DjangoJSONEncoder
+from django.db.models import (
+    Exists,
+    F,
+    Func,
+    OuterRef,
+    Q,
+)
+
 # Django imports
 from django.utils import timezone
-from django.db.models import (
-    Prefetch,
-    OuterRef,
-    Func,
-    F,
-    Q,
-    Case,
-    Value,
-    CharField,
-    When,
-    Exists,
-    Max,
-    IntegerField,
-)
-from django.core.serializers.json import DjangoJSONEncoder
-
-# Third Party imports
-from rest_framework.response import Response
 from rest_framework import status
 from rest_framework.permissions import AllowAny, IsAuthenticated
 
-# Module imports
-from .base import BaseViewSet, BaseAPIView
-from plane.app.serializers import (
-    IssueCommentSerializer,
-    IssueReactionSerializer,
-    CommentReactionSerializer,
-    IssueVoteSerializer,
-    IssuePublicSerializer,
-)
+# Third Party imports
+from rest_framework.response import Response
 
-from plane.db.models import (
-    Issue,
-    IssueComment,
-    Label,
-    IssueLink,
-    IssueAttachment,
-    State,
-    ProjectMember,
-    IssueReaction,
-    CommentReaction,
-    ProjectDeployBoard,
-    IssueVote,
-    ProjectPublicMember,
+from plane.app.serializers import (
+    CommentReactionSerializer,
+    IssueCommentSerializer,
+    IssuePublicSerializer,
+    IssueReactionSerializer,
+    IssueVoteSerializer,
 )
 from plane.bgtasks.issue_activites_task import issue_activity
-from plane.utils.grouper import group_results
+from plane.db.models import (
+    CommentReaction,
+    Issue,
+    IssueAttachment,
+    IssueComment,
+    IssueLink,
+    IssueReaction,
+    IssueVote,
+    ProjectDeployBoard,
+    ProjectMember,
+    ProjectPublicMember,
+)
+from plane.utils.grouper import (
+    issue_group_values,
+    issue_on_results,
+    issue_queryset_grouper,
+)
 from plane.utils.issue_filters import issue_filters
+from plane.utils.order_queryset import order_issue_queryset
+from plane.utils.paginator import (
+    GroupedOffsetPaginator,
+    SubGroupedOffsetPaginator,
+)
+
+# Module imports
+from .base import BaseAPIView, BaseViewSet
 
 
 class IssueCommentPublicViewSet(BaseViewSet):
@@ -523,46 +524,15 @@ class ProjectIssuesPublicEndpoint(BaseAPIView):
 
         filters = issue_filters(request.query_params, "GET")
 
-        # Custom ordering for priority and state
-        priority_order = ["urgent", "high", "medium", "low", "none"]
-        state_order = [
-            "backlog",
-            "unstarted",
-            "started",
-            "completed",
-            "cancelled",
-        ]
-
         order_by_param = request.GET.get("order_by", "-created_at")
 
         issue_queryset = (
-            Issue.issue_objects.annotate(
-                sub_issues_count=Issue.issue_objects.filter(
-                    parent=OuterRef("id")
-                )
-                .order_by()
-                .annotate(count=Func(F("id"), function="Count"))
-                .values("count")
-            )
-            .filter(project_id=project_id)
-            .filter(workspace__slug=slug)
-            .select_related("project", "workspace", "state", "parent")
-            .prefetch_related("assignees", "labels")
-            .prefetch_related(
-                Prefetch(
-                    "issue_reactions",
-                    queryset=IssueReaction.objects.select_related("actor"),
-                )
-            )
-            .prefetch_related(
-                Prefetch(
-                    "votes",
-                    queryset=IssueVote.objects.select_related("actor"),
-                )
-            )
-            .filter(**filters)
+            Issue.objects.filter(project_id=self.kwargs.get("project_id"))
+            .filter(workspace__slug=self.kwargs.get("slug"))
+            .filter(is_draft=True)
+            .select_related("workspace", "project", "state", "parent")
+            .prefetch_related("assignees", "labels", "issue_module__module")
             .annotate(cycle_id=F("issue_cycle__cycle_id"))
-            .annotate(module_id=F("issue_module__module_id"))
             .annotate(
                 link_count=IssueLink.objects.filter(issue=OuterRef("id"))
                 .order_by()
@@ -577,112 +547,130 @@ class ProjectIssuesPublicEndpoint(BaseAPIView):
                 .annotate(count=Func(F("id"), function="Count"))
                 .values("count")
             )
+            .annotate(
+                sub_issues_count=Issue.issue_objects.filter(
+                    parent=OuterRef("id")
+                )
+                .order_by()
+                .annotate(count=Func(F("id"), function="Count"))
+                .values("count")
+            )
+        ).distinct()
+
+        order_by_param = request.GET.get("order_by", "-created_at")
+
+        issue_queryset = self.get_queryset().filter(**filters)
+
+        # Issue queryset
+        issue_queryset = order_issue_queryset(
+            issue_queryset=issue_queryset,
+            order_by_param=order_by_param,
         )
 
-        # Priority Ordering
-        if order_by_param == "priority" or order_by_param == "-priority":
-            priority_order = (
-                priority_order
-                if order_by_param == "priority"
-                else priority_order[::-1]
-            )
-            issue_queryset = issue_queryset.annotate(
-                priority_order=Case(
-                    *[
-                        When(priority=p, then=Value(i))
-                        for i, p in enumerate(priority_order)
-                    ],
-                    output_field=CharField(),
-                )
-            ).order_by("priority_order")
+        # Group by
+        group_by = request.GET.get("group_by", False)
+        sub_group_by = request.GET.get("sub_group_by", False)
 
-        # State Ordering
-        elif order_by_param in [
-            "state__name",
-            "state__group",
-            "-state__name",
-            "-state__group",
-        ]:
-            state_order = (
-                state_order
-                if order_by_param in ["state__name", "state__group"]
-                else state_order[::-1]
-            )
-            issue_queryset = issue_queryset.annotate(
-                state_order=Case(
-                    *[
-                        When(state__group=state_group, then=Value(i))
-                        for i, state_group in enumerate(state_order)
-                    ],
-                    default=Value(len(state_order)),
-                    output_field=CharField(),
+        # issue queryset
+        issue_queryset = issue_queryset_grouper(
+            queryset=issue_queryset,
+            group_by=group_by,
+            sub_group_by=sub_group_by,
+        )
+
+        if group_by:
+            # Check group and sub group value paginate
+            if sub_group_by:
+                if group_by == sub_group_by:
+                    return Response(
+                        {
+                            "error": "Group by and sub group by cannot have same parameters"
+                        },
+                        status=status.HTTP_400_BAD_REQUEST,
+                    )
+                else:
+                    # group and sub group pagination
+                    return self.paginate(
+                        request=request,
+                        order_by=(
+                            "priority_order"
+                            if order_by_param in ["priority", "-priority"]
+                            else order_by_param
+                        ),
+                        queryset=issue_queryset,
+                        on_results=lambda issues: issue_on_results(
+                            group_by=group_by,
+                            issues=issues,
+                            sub_group_by=sub_group_by,
+                        ),
+                        paginator_cls=SubGroupedOffsetPaginator,
+                        group_by_fields=issue_group_values(
+                            field=group_by,
+                            slug=slug,
+                            project_id=project_id,
+                            filters=filters,
+                        ),
+                        sub_group_by_fields=issue_group_values(
+                            field=sub_group_by,
+                            slug=slug,
+                            project_id=project_id,
+                            filters=filters,
+                        ),
+                        group_by_field_name=group_by,
+                        sub_group_by_field_name=sub_group_by,
+                        count_filter=Q(
+                            Q(issue_inbox__status=1)
+                            | Q(issue_inbox__status=-1)
+                            | Q(issue_inbox__status=2)
+                            | Q(issue_inbox__isnull=True),
+                            archived_at__isnull=True,
+                            is_draft=False,
+                        ),
+                    )
+            # Group Paginate
+            else:
+                # Group paginate
+                return self.paginate(
+                    request=request,
+                    order_by=(
+                        "priority_order"
+                        if order_by_param in ["priority", "-priority"]
+                        else order_by_param
+                    ),
+                    queryset=issue_queryset,
+                    on_results=lambda issues: issue_on_results(
+                        group_by=group_by,
+                        issues=issues,
+                        sub_group_by=sub_group_by,
+                    ),
+                    paginator_cls=GroupedOffsetPaginator,
+                    group_by_fields=issue_group_values(
+                        field=group_by,
+                        slug=slug,
+                        project_id=project_id,
+                        filters=filters,
+                    ),
+                    group_by_field_name=group_by,
+                    count_filter=Q(
+                        Q(issue_inbox__status=1)
+                        | Q(issue_inbox__status=-1)
+                        | Q(issue_inbox__status=2)
+                        | Q(issue_inbox__isnull=True),
+                        archived_at__isnull=True,
+                        is_draft=False,
+                    ),
                 )
-            ).order_by("state_order")
-        # assignee and label ordering
-        elif order_by_param in [
-            "labels__name",
-            "-labels__name",
-            "assignees__first_name",
-            "-assignees__first_name",
-        ]:
-            issue_queryset = issue_queryset.annotate(
-                max_values=Max(
-                    order_by_param[1::]
-                    if order_by_param.startswith("-")
-                    else order_by_param
-                )
-            ).order_by(
-                "-max_values"
-                if order_by_param.startswith("-")
-                else "max_values"
-            )
         else:
-            issue_queryset = issue_queryset.order_by(order_by_param)
-
-        issues = IssuePublicSerializer(issue_queryset, many=True).data
-
-        state_group_order = [
-            "backlog",
-            "unstarted",
-            "started",
-            "completed",
-            "cancelled",
-        ]
-
-        states = (
-            State.objects.filter(
-                ~Q(name="Triage"),
-                workspace__slug=slug,
-                project_id=project_id,
-            )
-            .annotate(
-                custom_order=Case(
-                    *[
-                        When(group=value, then=Value(index))
-                        for index, value in enumerate(state_group_order)
-                    ],
-                    default=Value(len(state_group_order)),
-                    output_field=IntegerField(),
+            # List Paginate
+            return self.paginate(
+                order_by=(
+                    "-priority_order"
+                    if order_by_param in ["priority", "-priority"]
+                    else order_by_param
+                ),
+                request=request,
+                queryset=issue_queryset,
+                on_results=lambda issues: issue_on_results(
+                    group_by=group_by, issues=issues, sub_group_by=sub_group_by
                 ),
             )
-            .values("name", "group", "color", "id")
-            .order_by("custom_order", "sequence")
-        )
-
-        labels = Label.objects.filter(
-            workspace__slug=slug, project_id=project_id
-        ).values("id", "name", "color", "parent")
-
-        ## Grouping the results
-        group_by = request.GET.get("group_by", False)
-        if group_by:
-            issues = group_results(issues, group_by)
-
-        return Response(
-            {
-                "issues": issues,
-                "states": states,
-                "labels": labels,
-            },
-            status=status.HTTP_200_OK,
-        )

apiserver/plane/utils/analytics_plot.py

@@ -1,18 +1,18 @@
 # Python imports
-from datetime import timedelta
 from itertools import groupby
+from datetime import timedelta
 
 # Django import
 from django.db import models
-from django.db.models import Case, CharField, Count, F, Sum, Value, When
+from django.utils import timezone
+from django.db.models.functions import TruncDate
+from django.db.models import Count, F, Sum, Value, Case, When, CharField
 from django.db.models.functions import (
     Coalesce,
-    Concat,
     ExtractMonth,
     ExtractYear,
-    TruncDate,
+    Concat,
 )
-from django.utils import timezone
 
 # Module imports
 from plane.db.models import Issue
@@ -115,16 +115,11 @@ def burndown_plot(queryset, slug, project_id, cycle_id=None, module_id=None):
     total_issues = queryset.total_issues
 
     if cycle_id:
-        if queryset.end_date and queryset.start_date:
-            # Get all dates between the two dates
-            date_range = [
-                queryset.start_date + timedelta(days=x)
-                for x in range(
-                    (queryset.end_date - queryset.start_date).days + 1
-                )
-            ]
-        else:
-            date_range = []
+        # Get all dates between the two dates
+        date_range = [
+            queryset.start_date + timedelta(days=x)
+            for x in range((queryset.end_date - queryset.start_date).days + 1)
+        ]
 
         chart_data = {str(date): 0 for date in date_range}
 

apiserver/plane/utils/cache.py

@@ -33,12 +33,12 @@ def cache_response(timeout=60 * 60, path=None, user=True):
             custom_path = path if path is not None else request.get_full_path()
             key = generate_cache_key(custom_path, auth_header)
             cached_result = cache.get(key)
-
             if cached_result is not None:
                 return Response(
                     cached_result["data"], status=cached_result["status"]
                 )
             response = view_func(instance, request, *args, **kwargs)
+
             if response.status_code == 200 and not settings.DEBUG:
                 cache.set(
                     key,
@@ -53,42 +53,34 @@ def cache_response(timeout=60 * 60, path=None, user=True):
     return decorator
 
 
-def invalidate_cache_directly(
-    path=None, url_params=False, user=True, request=None, multiple=False
-):
-    if url_params and path:
-        path_with_values = path
-        # Assuming `kwargs` could be passed directly if needed, otherwise, skip this part
-        for key, value in request.resolver_match.kwargs.items():
-            path_with_values = path_with_values.replace(f":{key}", str(value))
-        custom_path = path_with_values
-    else:
-        custom_path = path if path is not None else request.get_full_path()
-    auth_header = (
-        None
-        if request.user.is_anonymous
-        else str(request.user.id) if user else None
-    )
-    key = generate_cache_key(custom_path, auth_header)
+def invalidate_cache(path=None, url_params=False, user=True):
+    """invalidate cache per user"""
 
-    if multiple:
-        cache.delete_many(keys=cache.keys(f"*{key}*"))
-    else:
-        cache.delete(key)
-
-
-def invalidate_cache(path=None, url_params=False, user=True, multiple=False):
     def decorator(view_func):
         @wraps(view_func)
         def _wrapped_view(instance, request, *args, **kwargs):
-            # invalidate the cache
-            invalidate_cache_directly(
-                path=path,
-                url_params=url_params,
-                user=user,
-                request=request,
-                multiple=multiple,
+            # Invalidate cache before executing the view function
+            if url_params:
+                path_with_values = path
+                for key, value in kwargs.items():
+                    path_with_values = path_with_values.replace(
+                        f":{key}", str(value)
+                    )
+
+                custom_path = path_with_values
+            else:
+                custom_path = (
+                    path if path is not None else request.get_full_path()
+                )
+
+            auth_header = (
+                None
+                if request.user.is_anonymous
+                else str(request.user.id) if user else None
             )
+            key = generate_cache_key(custom_path, auth_header)
+            cache.delete(key)
+            # Execute the view function
             return view_func(instance, request, *args, **kwargs)
 
         return _wrapped_view

apiserver/plane/utils/grouper.py

@@ -1,240 +1,191 @@
-def resolve_keys(group_keys, value):
-    """resolve keys to a key which will be used for
-    grouping
+# Django imports
+from django.contrib.postgres.aggregates import ArrayAgg
+from django.contrib.postgres.fields import ArrayField
+from django.db.models import Q, UUIDField, Value
+from django.db.models.functions import Coalesce
 
-    Args:
-        group_keys (string): key which will be used for grouping
-        value (obj): data value
-
-    Returns:
-        string: the key which will be used for
-    """
-    keys = group_keys.split(".")
-    for key in keys:
-        value = value.get(key, None)
-    return value
+# Module imports
+from plane.db.models import (
+    Cycle,
+    Issue,
+    Label,
+    Module,
+    Project,
+    ProjectMember,
+    State,
+    WorkspaceMember,
+)
 
 
-def group_results(results_data, group_by, sub_group_by=False):
-    """group results data into certain group_by
+def issue_queryset_grouper(queryset, group_by, sub_group_by):
 
-    Args:
-        results_data (obj): complete results data
-        group_by (key): string
+    FIELD_MAPPER = {
+        "label_ids": "labels__id",
+        "assignee_ids": "assignees__id",
+        "module_ids": "modules__id",
+    }
 
-    Returns:
-        obj: grouped results
-    """
-    if sub_group_by:
-        main_responsive_dict = dict()
+    annotations_map = {
+        "assignee_ids": ("assignees__id", ~Q(assignees__id__isnull=True)),
+        "label_ids": ("labels__id", ~Q(labels__id__isnull=True)),
+        "module_ids": (
+            "issue_module__module_id",
+            ~Q(issue_module__module_id__isnull=True),
+        ),
+    }
+    default_annotations = {
+        key: Coalesce(
+            ArrayAgg(
+                field,
+                distinct=True,
+                filter=condition,
+            ),
+            Value([], output_field=ArrayField(UUIDField())),
+        )
+        for key, (field, condition) in annotations_map.items()
+        if FIELD_MAPPER.get(key) != group_by
+        or FIELD_MAPPER.get(key) != sub_group_by
+    }
 
-        if sub_group_by == "priority":
-            main_responsive_dict = {
-                "urgent": {},
-                "high": {},
-                "medium": {},
-                "low": {},
-                "none": {},
-            }
+    return queryset.annotate(**default_annotations)
 
-        for value in results_data:
-            main_group_attribute = resolve_keys(sub_group_by, value)
-            group_attribute = resolve_keys(group_by, value)
-            if isinstance(main_group_attribute, list) and not isinstance(
-                group_attribute, list
-            ):
-                if len(main_group_attribute):
-                    for attrib in main_group_attribute:
-                        if str(attrib) not in main_responsive_dict:
-                            main_responsive_dict[str(attrib)] = {}
-                        if (
-                            str(group_attribute)
-                            in main_responsive_dict[str(attrib)]
-                        ):
-                            main_responsive_dict[str(attrib)][
-                                str(group_attribute)
-                            ].append(value)
-                        else:
-                            main_responsive_dict[str(attrib)][
-                                str(group_attribute)
-                            ] = []
-                            main_responsive_dict[str(attrib)][
-                                str(group_attribute)
-                            ].append(value)
-                else:
-                    if str(None) not in main_responsive_dict:
-                        main_responsive_dict[str(None)] = {}
 
-                    if str(group_attribute) in main_responsive_dict[str(None)]:
-                        main_responsive_dict[str(None)][
-                            str(group_attribute)
-                        ].append(value)
-                    else:
-                        main_responsive_dict[str(None)][
-                            str(group_attribute)
-                        ] = []
-                        main_responsive_dict[str(None)][
-                            str(group_attribute)
-                        ].append(value)
+def issue_on_results(issues, group_by, sub_group_by):
 
-            elif isinstance(group_attribute, list) and not isinstance(
-                main_group_attribute, list
-            ):
-                if str(main_group_attribute) not in main_responsive_dict:
-                    main_responsive_dict[str(main_group_attribute)] = {}
-                if len(group_attribute):
-                    for attrib in group_attribute:
-                        if (
-                            str(attrib)
-                            in main_responsive_dict[str(main_group_attribute)]
-                        ):
-                            main_responsive_dict[str(main_group_attribute)][
-                                str(attrib)
-                            ].append(value)
-                        else:
-                            main_responsive_dict[str(main_group_attribute)][
-                                str(attrib)
-                            ] = []
-                            main_responsive_dict[str(main_group_attribute)][
-                                str(attrib)
-                            ].append(value)
-                else:
-                    if (
-                        str(None)
-                        in main_responsive_dict[str(main_group_attribute)]
-                    ):
-                        main_responsive_dict[str(main_group_attribute)][
-                            str(None)
-                        ].append(value)
-                    else:
-                        main_responsive_dict[str(main_group_attribute)][
-                            str(None)
-                        ] = []
-                        main_responsive_dict[str(main_group_attribute)][
-                            str(None)
-                        ].append(value)
+    FIELD_MAPPER = {
+        "labels__id": "label_ids",
+        "assignees__id": "assignee_ids",
+        "modules__id": "module_ids",
+    }
 
-            elif isinstance(group_attribute, list) and isinstance(
-                main_group_attribute, list
-            ):
-                if len(main_group_attribute):
-                    for main_attrib in main_group_attribute:
-                        if str(main_attrib) not in main_responsive_dict:
-                            main_responsive_dict[str(main_attrib)] = {}
-                        if len(group_attribute):
-                            for attrib in group_attribute:
-                                if (
-                                    str(attrib)
-                                    in main_responsive_dict[str(main_attrib)]
-                                ):
-                                    main_responsive_dict[str(main_attrib)][
-                                        str(attrib)
-                                    ].append(value)
-                                else:
-                                    main_responsive_dict[str(main_attrib)][
-                                        str(attrib)
-                                    ] = []
-                                    main_responsive_dict[str(main_attrib)][
-                                        str(attrib)
-                                    ].append(value)
-                        else:
-                            if (
-                                str(None)
-                                in main_responsive_dict[str(main_attrib)]
-                            ):
-                                main_responsive_dict[str(main_attrib)][
-                                    str(None)
-                                ].append(value)
-                            else:
-                                main_responsive_dict[str(main_attrib)][
-                                    str(None)
-                                ] = []
-                                main_responsive_dict[str(main_attrib)][
-                                    str(None)
-                                ].append(value)
-                else:
-                    if str(None) not in main_responsive_dict:
-                        main_responsive_dict[str(None)] = {}
-                    if len(group_attribute):
-                        for attrib in group_attribute:
-                            if str(attrib) in main_responsive_dict[str(None)]:
-                                main_responsive_dict[str(None)][
-                                    str(attrib)
-                                ].append(value)
-                            else:
-                                main_responsive_dict[str(None)][
-                                    str(attrib)
-                                ] = []
-                                main_responsive_dict[str(None)][
-                                    str(attrib)
-                                ].append(value)
-                    else:
-                        if str(None) in main_responsive_dict[str(None)]:
-                            main_responsive_dict[str(None)][str(None)].append(
-                                value
-                            )
-                        else:
-                            main_responsive_dict[str(None)][str(None)] = []
-                            main_responsive_dict[str(None)][str(None)].append(
-                                value
-                            )
-            else:
-                main_group_attribute = resolve_keys(sub_group_by, value)
-                group_attribute = resolve_keys(group_by, value)
+    original_list = ["assignee_ids", "label_ids", "module_ids"]
 
-                if str(main_group_attribute) not in main_responsive_dict:
-                    main_responsive_dict[str(main_group_attribute)] = {}
+    required_fields = [
+        "id",
+        "name",
+        "state_id",
+        "sort_order",
+        "completed_at",
+        "estimate_point",
+        "priority",
+        "start_date",
+        "target_date",
+        "sequence_id",
+        "project_id",
+        "parent_id",
+        "cycle_id",
+        "sub_issues_count",
+        "created_at",
+        "updated_at",
+        "created_by",
+        "updated_by",
+        "attachment_count",
+        "link_count",
+        "is_draft",
+        "archived_at",
+        "state__group",
+    ]
 
-                if (
-                    str(group_attribute)
-                    in main_responsive_dict[str(main_group_attribute)]
-                ):
-                    main_responsive_dict[str(main_group_attribute)][
-                        str(group_attribute)
-                    ].append(value)
-                else:
-                    main_responsive_dict[str(main_group_attribute)][
-                        str(group_attribute)
-                    ] = []
-                    main_responsive_dict[str(main_group_attribute)][
-                        str(group_attribute)
-                    ].append(value)
+    if group_by in FIELD_MAPPER:
+        original_list.remove(FIELD_MAPPER[group_by])
+        original_list.append(group_by)
 
-        return main_responsive_dict
+    if sub_group_by in FIELD_MAPPER:
+        original_list.remove(FIELD_MAPPER[sub_group_by])
+        original_list.append(sub_group_by)
 
-    else:
-        response_dict = {}
+    required_fields.extend(original_list)
+    return issues.values(*required_fields)
 
-        if group_by == "priority":
-            response_dict = {
-                "urgent": [],
-                "high": [],
-                "medium": [],
-                "low": [],
-                "none": [],
-            }
 
-        for value in results_data:
-            group_attribute = resolve_keys(group_by, value)
-            if isinstance(group_attribute, list):
-                if len(group_attribute):
-                    for attrib in group_attribute:
-                        if str(attrib) in response_dict:
-                            response_dict[str(attrib)].append(value)
-                        else:
-                            response_dict[str(attrib)] = []
-                            response_dict[str(attrib)].append(value)
-                else:
-                    if str(None) in response_dict:
-                        response_dict[str(None)].append(value)
-                    else:
-                        response_dict[str(None)] = []
-                        response_dict[str(None)].append(value)
-            else:
-                if str(group_attribute) in response_dict:
-                    response_dict[str(group_attribute)].append(value)
-                else:
-                    response_dict[str(group_attribute)] = []
-                    response_dict[str(group_attribute)].append(value)
-
-        return response_dict
+def issue_group_values(field, slug, project_id=None, filters={}):
+    if field == "state_id":
+        queryset = State.objects.filter(
+            ~Q(name="Triage"),
+            workspace__slug=slug,
+        ).values_list("id", flat=True)
+        if project_id:
+            return list(queryset.filter(project_id=project_id))
+        else:
+            return list(queryset)
+    if field == "labels__id":
+        queryset = Label.objects.filter(workspace__slug=slug).values_list(
+            "id", flat=True
+        )
+        if project_id:
+            return list(queryset.filter(project_id=project_id)) + ["None"]
+        else:
+            return list(queryset) + ["None"]
+    if field == "assignees__id":
+        if project_id:
+            return ProjectMember.objects.filter(
+                workspace__slug=slug,
+                project_id=project_id,
+                is_active=True,
+            ).values_list("member_id", flat=True)
+        else:
+            return list(
+                WorkspaceMember.objects.filter(
+                    workspace__slug=slug, is_active=True
+                ).values_list("member_id", flat=True)
+            )
+    if field == "modules__id":
+        queryset = Module.objects.filter(
+            workspace__slug=slug,
+        ).values_list("id", flat=True)
+        if project_id:
+            return list(queryset.filter(project_id=project_id)) + ["None"]
+        else:
+            return list(queryset) + ["None"]
+    if field == "cycle_id":
+        queryset = Cycle.objects.filter(
+            workspace__slug=slug,
+        ).values_list("id", flat=True)
+        if project_id:
+            return list(queryset.filter(project_id=project_id)) + ["None"]
+        else:
+            return list(queryset) + ["None"]
+    if field == "project_id":
+        queryset = Project.objects.filter(workspace__slug=slug).values_list(
+            "id", flat=True
+        )
+        return list(queryset)
+    if field == "priority":
+        return [
+            "low",
+            "medium",
+            "high",
+            "urgent",
+            "none",
+        ]
+    if field == "state__group":
+        return [
+            "backlog",
+            "unstarted",
+            "started",
+            "completed",
+            "cancelled",
+        ]
+    if field == "target_date":
+        queryset = (
+            Issue.issue_objects.filter(workspace__slug=slug)
+            .filter(**filters)
+            .values_list("target_date", flat=True)
+            .distinct()
+        )
+        if project_id:
+            return list(queryset.filter(project_id=project_id))
+        else:
+            return list(queryset)
+    if field == "start_date":
+        queryset = (
+            Issue.issue_objects.filter(workspace__slug=slug)
+            .filter(**filters)
+            .values_list("start_date", flat=True)
+            .distinct()
+        )
+        if project_id:
+            return list(queryset.filter(project_id=project_id))
+        else:
+            return list(queryset)
+    return []

apiserver/plane/utils/issue_filters.py

@@ -1,6 +1,7 @@
 import re
 import uuid
 from datetime import timedelta
+
 from django.utils import timezone
 
 # The date from pattern
@@ -52,9 +53,9 @@ def string_date_filter(
                 filter[f"{date_filter}__gte"] = now - timedelta(weeks=duration)
         else:
             if offset == "fromnow":
-                filter[f"{date_filter}__lte"] = now + timedelta(weeks=duration)
+                filter[f"{date_filter}__lte"] = now + timedelta(days=duration)
             else:
-                filter[f"{date_filter}__lte"] = now - timedelta(weeks=duration)
+                filter[f"{date_filter}__lte"] = now - timedelta(days=duration)
 
 
 def date_filter(filter, date_term, queries):
@@ -63,45 +64,48 @@ def date_filter(filter, date_term, queries):
     """
     for query in queries:
         date_query = query.split(";")
-        if len(date_query) >= 2:
-            match = pattern.match(date_query[0])
-            if match:
-                if len(date_query) == 3:
-                    digit, term = date_query[0].split("_")
-                    string_date_filter(
-                        filter=filter,
-                        duration=int(digit),
-                        subsequent=date_query[1],
-                        term=term,
-                        date_filter=date_term,
-                        offset=date_query[2],
-                    )
-            else:
-                if "after" in date_query:
-                    filter[f"{date_term}__gte"] = date_query[0]
+        if date_query:
+            if len(date_query) >= 2:
+                match = pattern.match(date_query[0])
+                if match:
+                    if len(date_query) == 3:
+                        digit, term = date_query[0].split("_")
+                        string_date_filter(
+                            filter=filter,
+                            duration=int(digit),
+                            subsequent=date_query[1],
+                            term=term,
+                            date_filter=date_term,
+                            offset=date_query[2],
+                        )
                 else:
-                    filter[f"{date_term}__lte"] = date_query[0]
+                    if "after" in date_query:
+                        filter[f"{date_term}__gte"] = date_query[0]
+                    else:
+                        filter[f"{date_term}__lte"] = date_query[0]
+            else:
+                filter[f"{date_term}__contains"] = date_query[0]
 
 
-def filter_state(params, filter, method, prefix=""):
+def filter_state(params, filter, method):
     if method == "GET":
         states = [
             item for item in params.get("state").split(",") if item != "null"
         ]
         states = filter_valid_uuids(states)
         if len(states) and "" not in states:
-            filter[f"{prefix}state__in"] = states
+            filter["state__in"] = states
     else:
         if (
             params.get("state", None)
             and len(params.get("state"))
             and params.get("state") != "null"
         ):
-            filter[f"{prefix}state__in"] = params.get("state")
+            filter["state__in"] = params.get("state")
     return filter
 
 
-def filter_state_group(params, filter, method, prefix=""):
+def filter_state_group(params, filter, method):
     if method == "GET":
         state_group = [
             item
@@ -109,18 +113,18 @@ def filter_state_group(params, filter, method, prefix=""):
             if item != "null"
         ]
         if len(state_group) and "" not in state_group:
-            filter[f"{prefix}state__group__in"] = state_group
+            filter["state__group__in"] = state_group
     else:
         if (
             params.get("state_group", None)
             and len(params.get("state_group"))
             and params.get("state_group") != "null"
         ):
-            filter[f"{prefix}state__group__in"] = params.get("state_group")
+            filter["state__group__in"] = params.get("state_group")
     return filter
 
 
-def filter_estimate_point(params, filter, method, prefix=""):
+def filter_estimate_point(params, filter, method):
     if method == "GET":
         estimate_points = [
             item
@@ -128,20 +132,18 @@ def filter_estimate_point(params, filter, method, prefix=""):
             if item != "null"
         ]
         if len(estimate_points) and "" not in estimate_points:
-            filter[f"{prefix}estimate_point__in"] = estimate_points
+            filter["estimate_point__in"] = estimate_points
     else:
         if (
             params.get("estimate_point", None)
             and len(params.get("estimate_point"))
             and params.get("estimate_point") != "null"
         ):
-            filter[f"{prefix}estimate_point__in"] = params.get(
-                "estimate_point"
-            )
+            filter["estimate_point__in"] = params.get("estimate_point")
     return filter
 
 
-def filter_priority(params, filter, method, prefix=""):
+def filter_priority(params, filter, method):
     if method == "GET":
         priorities = [
             item
@@ -149,47 +151,47 @@ def filter_priority(params, filter, method, prefix=""):
             if item != "null"
         ]
         if len(priorities) and "" not in priorities:
-            filter[f"{prefix}priority__in"] = priorities
+            filter["priority__in"] = priorities
     return filter
 
 
-def filter_parent(params, filter, method, prefix=""):
+def filter_parent(params, filter, method):
     if method == "GET":
         parents = [
             item for item in params.get("parent").split(",") if item != "null"
         ]
         parents = filter_valid_uuids(parents)
         if len(parents) and "" not in parents:
-            filter[f"{prefix}parent__in"] = parents
+            filter["parent__in"] = parents
     else:
         if (
             params.get("parent", None)
             and len(params.get("parent"))
             and params.get("parent") != "null"
         ):
-            filter[f"{prefix}parent__in"] = params.get("parent")
+            filter["parent__in"] = params.get("parent")
     return filter
 
 
-def filter_labels(params, filter, method, prefix=""):
+def filter_labels(params, filter, method):
     if method == "GET":
         labels = [
             item for item in params.get("labels").split(",") if item != "null"
         ]
         labels = filter_valid_uuids(labels)
         if len(labels) and "" not in labels:
-            filter[f"{prefix}labels__in"] = labels
+            filter["labels__in"] = labels
     else:
         if (
             params.get("labels", None)
             and len(params.get("labels"))
             and params.get("labels") != "null"
         ):
-            filter[f"{prefix}labels__in"] = params.get("labels")
+            filter["labels__in"] = params.get("labels")
     return filter
 
 
-def filter_assignees(params, filter, method, prefix=""):
+def filter_assignees(params, filter, method):
     if method == "GET":
         assignees = [
             item
@@ -198,18 +200,18 @@ def filter_assignees(params, filter, method, prefix=""):
         ]
         assignees = filter_valid_uuids(assignees)
         if len(assignees) and "" not in assignees:
-            filter[f"{prefix}assignees__in"] = assignees
+            filter["assignees__in"] = assignees
     else:
         if (
             params.get("assignees", None)
             and len(params.get("assignees"))
             and params.get("assignees") != "null"
         ):
-            filter[f"{prefix}assignees__in"] = params.get("assignees")
+            filter["assignees__in"] = params.get("assignees")
     return filter
 
 
-def filter_mentions(params, filter, method, prefix=""):
+def filter_mentions(params, filter, method):
     if method == "GET":
         mentions = [
             item
@@ -218,20 +220,18 @@ def filter_mentions(params, filter, method, prefix=""):
         ]
         mentions = filter_valid_uuids(mentions)
         if len(mentions) and "" not in mentions:
-            filter[f"{prefix}issue_mention__mention__id__in"] = mentions
+            filter["issue_mention__mention__id__in"] = mentions
     else:
         if (
             params.get("mentions", None)
             and len(params.get("mentions"))
             and params.get("mentions") != "null"
         ):
-            filter[f"{prefix}issue_mention__mention__id__in"] = params.get(
-                "mentions"
-            )
+            filter["issue_mention__mention__id__in"] = params.get("mentions")
     return filter
 
 
-def filter_created_by(params, filter, method, prefix=""):
+def filter_created_by(params, filter, method):
     if method == "GET":
         created_bys = [
             item
@@ -240,98 +240,94 @@ def filter_created_by(params, filter, method, prefix=""):
         ]
         created_bys = filter_valid_uuids(created_bys)
         if len(created_bys) and "" not in created_bys:
-            filter[f"{prefix}created_by__in"] = created_bys
+            filter["created_by__in"] = created_bys
     else:
         if (
             params.get("created_by", None)
             and len(params.get("created_by"))
             and params.get("created_by") != "null"
         ):
-            filter[f"{prefix}created_by__in"] = params.get("created_by")
+            filter["created_by__in"] = params.get("created_by")
     return filter
 
 
-def filter_name(params, filter, method, prefix=""):
+def filter_name(params, filter, method):
     if params.get("name", "") != "":
-        filter[f"{prefix}name__icontains"] = params.get("name")
+        filter["name__icontains"] = params.get("name")
     return filter
 
 
-def filter_created_at(params, filter, method, prefix=""):
+def filter_created_at(params, filter, method):
     if method == "GET":
         created_ats = params.get("created_at").split(",")
         if len(created_ats) and "" not in created_ats:
             date_filter(
                 filter=filter,
-                date_term=f"{prefix}created_at__date",
+                date_term="created_at__date",
                 queries=created_ats,
             )
     else:
         if params.get("created_at", None) and len(params.get("created_at")):
             date_filter(
                 filter=filter,
-                date_term=f"{prefix}created_at__date",
+                date_term="created_at__date",
                 queries=params.get("created_at", []),
             )
     return filter
 
 
-def filter_updated_at(params, filter, method, prefix=""):
+def filter_updated_at(params, filter, method):
     if method == "GET":
         updated_ats = params.get("updated_at").split(",")
         if len(updated_ats) and "" not in updated_ats:
             date_filter(
                 filter=filter,
-                date_term=f"{prefix}created_at__date",
+                date_term="created_at__date",
                 queries=updated_ats,
             )
     else:
         if params.get("updated_at", None) and len(params.get("updated_at")):
             date_filter(
                 filter=filter,
-                date_term=f"{prefix}created_at__date",
+                date_term="created_at__date",
                 queries=params.get("updated_at", []),
             )
     return filter
 
 
-def filter_start_date(params, filter, method, prefix=""):
+def filter_start_date(params, filter, method):
     if method == "GET":
         start_dates = params.get("start_date").split(",")
         if len(start_dates) and "" not in start_dates:
             date_filter(
-                filter=filter,
-                date_term=f"{prefix}start_date",
-                queries=start_dates,
+                filter=filter, date_term="start_date", queries=start_dates
             )
     else:
         if params.get("start_date", None) and len(params.get("start_date")):
-            filter[f"{prefix}start_date"] = params.get("start_date")
+            filter["start_date"] = params.get("start_date")
     return filter
 
 
-def filter_target_date(params, filter, method, prefix=""):
+def filter_target_date(params, filter, method):
     if method == "GET":
         target_dates = params.get("target_date").split(",")
         if len(target_dates) and "" not in target_dates:
             date_filter(
-                filter=filter,
-                date_term=f"{prefix}target_date",
-                queries=target_dates,
+                filter=filter, date_term="target_date", queries=target_dates
             )
     else:
         if params.get("target_date", None) and len(params.get("target_date")):
-            filter[f"{prefix}target_date"] = params.get("target_date")
+            filter["target_date"] = params.get("target_date")
     return filter
 
 
-def filter_completed_at(params, filter, method, prefix=""):
+def filter_completed_at(params, filter, method):
     if method == "GET":
         completed_ats = params.get("completed_at").split(",")
         if len(completed_ats) and "" not in completed_ats:
             date_filter(
                 filter=filter,
-                date_term=f"{prefix}completed_at__date",
+                date_term="completed_at__date",
                 queries=completed_ats,
             )
     else:
@@ -340,13 +336,13 @@ def filter_completed_at(params, filter, method, prefix=""):
         ):
             date_filter(
                 filter=filter,
-                date_term=f"{prefix}completed_at__date",
+                date_term="completed_at__date",
                 queries=params.get("completed_at", []),
             )
     return filter
 
 
-def filter_issue_state_type(params, filter, method, prefix=""):
+def filter_issue_state_type(params, filter, method):
     type = params.get("type", "all")
     group = ["backlog", "unstarted", "started", "completed", "cancelled"]
     if type == "backlog":
@@ -354,67 +350,65 @@ def filter_issue_state_type(params, filter, method, prefix=""):
     if type == "active":
         group = ["unstarted", "started"]
 
-    filter[f"{prefix}state__group__in"] = group
+    filter["state__group__in"] = group
     return filter
 
 
-def filter_project(params, filter, method, prefix=""):
+def filter_project(params, filter, method):
     if method == "GET":
         projects = [
             item for item in params.get("project").split(",") if item != "null"
         ]
         projects = filter_valid_uuids(projects)
         if len(projects) and "" not in projects:
-            filter[f"{prefix}project__in"] = projects
+            filter["project__in"] = projects
     else:
         if (
             params.get("project", None)
             and len(params.get("project"))
             and params.get("project") != "null"
         ):
-            filter[f"{prefix}project__in"] = params.get("project")
+            filter["project__in"] = params.get("project")
     return filter
 
 
-def filter_cycle(params, filter, method, prefix=""):
+def filter_cycle(params, filter, method):
     if method == "GET":
         cycles = [
             item for item in params.get("cycle").split(",") if item != "null"
         ]
         cycles = filter_valid_uuids(cycles)
         if len(cycles) and "" not in cycles:
-            filter[f"{prefix}issue_cycle__cycle_id__in"] = cycles
+            filter["issue_cycle__cycle_id__in"] = cycles
     else:
         if (
             params.get("cycle", None)
             and len(params.get("cycle"))
             and params.get("cycle") != "null"
         ):
-            filter[f"{prefix}issue_cycle__cycle_id__in"] = params.get("cycle")
+            filter["issue_cycle__cycle_id__in"] = params.get("cycle")
     return filter
 
 
-def filter_module(params, filter, method, prefix=""):
+def filter_module(params, filter, method):
     if method == "GET":
         modules = [
             item for item in params.get("module").split(",") if item != "null"
         ]
         modules = filter_valid_uuids(modules)
         if len(modules) and "" not in modules:
-            filter[f"{prefix}issue_module__module_id__in"] = modules
+            filter["issue_module__module_id__in"] = modules
     else:
         if (
             params.get("module", None)
             and len(params.get("module"))
             and params.get("module") != "null"
         ):
-            filter[f"{prefix}issue_module__module_id__in"] = params.get(
-                "module"
-            )
+            filter["issue_module__module_id__in"] = params.get("module")
     return filter
 
 
-def filter_inbox_status(params, filter, method, prefix=""):
+def filter_inbox_status(params, filter, method):
     if method == "GET":
         status = [
             item
@@ -422,32 +416,30 @@ def filter_inbox_status(params, filter, method, prefix=""):
             if item != "null"
         ]
         if len(status) and "" not in status:
-            filter[f"{prefix}issue_inbox__status__in"] = status
+            filter["issue_inbox__status__in"] = status
     else:
         if (
             params.get("inbox_status", None)
             and len(params.get("inbox_status"))
             and params.get("inbox_status") != "null"
         ):
-            filter[f"{prefix}issue_inbox__status__in"] = params.get(
-                "inbox_status"
-            )
+            filter["issue_inbox__status__in"] = params.get("inbox_status")
     return filter
 
 
-def filter_sub_issue_toggle(params, filter, method, prefix=""):
+def filter_sub_issue_toggle(params, filter, method):
     if method == "GET":
         sub_issue = params.get("sub_issue", "false")
         if sub_issue == "false":
-            filter[f"{prefix}parent__isnull"] = True
+            filter["parent__isnull"] = True
     else:
         sub_issue = params.get("sub_issue", "false")
         if sub_issue == "false":
-            filter[f"{prefix}parent__isnull"] = True
+            filter["parent__isnull"] = True
     return filter
 
 
-def filter_subscribed_issues(params, filter, method, prefix=""):
+def filter_subscribed_issues(params, filter, method):
     if method == "GET":
         subscribers = [
             item
@@ -456,30 +448,28 @@ def filter_subscribed_issues(params, filter, method, prefix=""):
         ]
         subscribers = filter_valid_uuids(subscribers)
         if len(subscribers) and "" not in subscribers:
-            filter[f"{prefix}issue_subscribers__subscriber_id__in"] = (
-                subscribers
-            )
+            filter["issue_subscribers__subscriber_id__in"] = subscribers
     else:
         if (
             params.get("subscriber", None)
             and len(params.get("subscriber"))
             and params.get("subscriber") != "null"
         ):
-            filter[f"{prefix}issue_subscribers__subscriber_id__in"] = (
-                params.get("subscriber")
+            filter["issue_subscribers__subscriber_id__in"] = params.get(
+                "subscriber"
             )
     return filter
 
 
-def filter_start_target_date_issues(params, filter, method, prefix=""):
+def filter_start_target_date_issues(params, filter, method):
     start_target_date = params.get("start_target_date", "false")
     if start_target_date == "true":
-        filter[f"{prefix}target_date__isnull"] = False
-        filter[f"{prefix}start_date__isnull"] = False
+        filter["target_date__isnull"] = False
+        filter["start_date__isnull"] = False
     return filter
 
 
-def issue_filters(query_params, method, prefix=""):
+def issue_filters(query_params, method):
     filter = {}
 
     ISSUE_FILTER = {
@@ -511,5 +501,6 @@ def issue_filters(query_params, method, prefix=""):
     for key, value in ISSUE_FILTER.items():
         if key in query_params:
             func = value
-            func(query_params, filter, method, prefix)
+            func(query_params, filter, method)
+
     return filter

apiserver/plane/utils/order_queryset.py

@@ -0,0 +1,79 @@
+from django.db.models import (
+    Case,
+    Value,
+    CharField,
+    When,
+    Max,
+)
+
+# Custom ordering for priority and state
+PRIORITY_ORDER = ["urgent", "high", "medium", "low", "none"]
+STATE_ORDER = [
+    "backlog",
+    "unstarted",
+    "started",
+    "completed",
+    "cancelled",
+]
+
+
+def order_issue_queryset(issue_queryset, order_by_param="created_at"):
+    # Priority Ordering
+    if order_by_param == "priority" or order_by_param == "-priority":
+        priority_order = (
+            PRIORITY_ORDER
+            if order_by_param == "priority"
+            else PRIORITY_ORDER[::-1]
+        )
+        issue_queryset = issue_queryset.annotate(
+            priority_order=Case(
+                *[
+                    When(priority=p, then=Value(i))
+                    for i, p in enumerate(priority_order)
+                ],
+                output_field=CharField(),
+            )
+        ).order_by("priority_order")
+
+    # State Ordering
+    elif order_by_param in [
+        "state__name",
+        "state__group",
+        "-state__name",
+        "-state__group",
+    ]:
+        state_order = (
+            STATE_ORDER
+            if order_by_param in ["state__name", "state__group"]
+            else STATE_ORDER[::-1]
+        )
+        issue_queryset = issue_queryset.annotate(
+            state_order=Case(
+                *[
+                    When(state__group=state_group, then=Value(i))
+                    for i, state_group in enumerate(state_order)
+                ],
+                default=Value(len(state_order)),
+                output_field=CharField(),
+            )
+        ).order_by("state_order")
+    # assignee and label ordering
+    elif order_by_param in [
+        "labels__name",
+        "-labels__name",
+        "assignees__first_name",
+        "-assignees__first_name",
+    ]:
+        issue_queryset = issue_queryset.annotate(
+            max_values=Max(
+                order_by_param[1::]
+                if order_by_param.startswith("-")
+                else order_by_param
+            )
+        ).order_by(
+            "-max_values" if order_by_param.startswith("-") else "max_values"
+        )
+    else:
+        issue_queryset = issue_queryset.order_by(order_by_param)
+
+    return issue_queryset

apiserver/plane/utils/paginator.py

@@ -1,7 +1,17 @@
-from rest_framework.response import Response
-from rest_framework.exceptions import ParseError
-from collections.abc import Sequence
+# Python imports
 import math
+from collections import defaultdict
+from collections.abc import Sequence
+
+# Django imports
+from django.db.models import Count, F, Window
+from django.db.models.functions import RowNumber
+
+# Third party imports
+from rest_framework.exceptions import ParseError
+from rest_framework.response import Response
+
+# Module imports
 
 
 class Cursor:
@@ -105,7 +115,10 @@ class OffsetPaginator:
 
         queryset = self.queryset
         if self.key:
-            queryset = queryset.order_by(*self.key)
+            queryset = queryset.order_by(
+                *self.key,
+                "-created_at",
+            )
 
         page = cursor.offset
         offset = cursor.offset * cursor.value
@@ -116,14 +129,15 @@ class OffsetPaginator:
         if offset < 0:
             raise BadPaginationError("Pagination offset cannot be negative")
 
-        results = list(queryset[offset:stop])
+        results = queryset[offset:stop]
+
         if cursor.value != limit:
             results = results[-(limit + 1) :]
 
-        next_cursor = Cursor(limit, page + 1, False, len(results) > limit)
+        next_cursor = Cursor(limit, page + 1, False, results.count() > limit)
         prev_cursor = Cursor(limit, page - 1, True, page > 0)
 
-        results = list(results[:limit])
+        results = results[:limit]
         if self.on_results:
             results = self.on_results(results)
 
@@ -138,6 +152,462 @@ class OffsetPaginator:
             max_hits=max_hits,
         )
 
+    def process_results(self, results):
+        raise NotImplementedError
+
+
+class GroupedOffsetPaginator(OffsetPaginator):
+
+    FIELD_MAPPER = {
+        "labels__id": "label_ids",
+        "assignees__id": "assignee_ids",
+        "modules__id": "module_ids",
+    }
+
+    def __init__(
+        self,
+        queryset,
+        group_by_field_name,
+        group_by_fields,
+        count_filter,
+        *args,
+        **kwargs,
+    ):
+        super().__init__(queryset, *args, **kwargs)
+        self.group_by_field_name = group_by_field_name
+        self.group_by_fields = group_by_fields
+        self.count_filter = count_filter
+
+    def get_result(self, limit=50, cursor=None):
+        # offset is page #
+        # value is page limit
+        if cursor is None:
+            cursor = Cursor(0, 0, 0)
+
+        limit = min(limit, self.max_limit)
+
+        # Adjust the initial offset and stop based on the cursor and limit
+        queryset = self.queryset
+        if self.key:
+            queryset = queryset.order_by(*self.key)
+
+        page = cursor.offset
+        offset = cursor.offset * cursor.value
+        stop = offset + (cursor.value or limit) + 1
+
+        if self.max_offset is not None and offset >= self.max_offset:
+            raise BadPaginationError("Pagination offset too large")
+        if offset < 0:
+            raise BadPaginationError("Pagination offset cannot be negative")
+
+        # Compute the results
+        results = {}
+        queryset = queryset.annotate(
+            row_number=Window(
+                expression=RowNumber(),
+                partition_by=[F(self.group_by_field_name)],
+                order_by=(
+                    *self.key,
+                    "-created_at",
+                ),
+            )
+        )
+
+        # Filter the results
+        results = queryset.filter(row_number__gt=offset, row_number__lt=stop)
+
+        # Adjust cursors based on the grouped results for pagination
+        next_cursor = Cursor(
+            limit,
+            page + 1,
+            False,
+            queryset.filter(row_number__gte=stop).exists(),
+        )
+        prev_cursor = Cursor(
+            limit,
+            page - 1,
+            True,
+            page > 0,
+        )
+
+        count = queryset.count()
+
+        # Optionally, calculate the total count and max_hits if needed
+        # This might require adjustments based on specific use cases
+        max_hits = math.ceil(
+            queryset.values(self.group_by_field_name)
+            .annotate(
+                count=Count(
+                    "id",
+                    filter=self.count_filter,
+                    distinct=True,
+                )
+            )
+            .order_by("-count")[0]["count"]
+            / limit
+        )
+        return CursorResult(
+            results=results,
+            next=next_cursor,
+            prev=prev_cursor,
+            hits=count,
+            max_hits=max_hits,
+        )
+
+    def __get_total_queryset(self):
+        return (
+            self.queryset.values(self.group_by_field_name)
+            .annotate(
+                count=Count(
+                    "id",
+                    filter=self.count_filter,
+                    distinct=True,
+                )
+            )
+            .order_by()
+        )
+
+    def __get_total_dict(self):
+        total_group_dict = {}
+        for group in self.__get_total_queryset():
+            total_group_dict[str(group.get(self.group_by_field_name))] = (
+                total_group_dict.get(
+                    str(group.get(self.group_by_field_name)), 0
+                )
+                + (1 if group.get("count") == 0 else group.get("count"))
+            )
+
+        return total_group_dict
+
+    def __get_field_dict(self):
+        total_group_dict = self.__get_total_dict()
+        return {
+            str(field): {
+                "results": [],
+                "total_results": total_group_dict.get(str(field), 0),
+            }
+            for field in self.group_by_fields
+        }
+
+    def __result_already_added(self, result, group):
+        for existing_issue in group:
+            if existing_issue["id"] == result["id"]:
+                return True
+        return False
+
+    def __query_multi_grouper(self, results):
+
+        total_group_dict = self.__get_total_dict()
+
+        # Preparing a dict to keep track of group IDs associated with each label ID
+        result_group_mapping = defaultdict(set)
+        # Preparing a dict to group result by group ID
+        grouped_by_field_name = defaultdict(list)
+
+        # Iterate over results to fill the above dictionaries
+        for result in results:
+            result_id = result["id"]
+            group_id = result[self.group_by_field_name]
+            result_group_mapping[str(result_id)].add(str(group_id))
+
+        # Adding group_ids key to each issue and grouping by group_name
+        for result in results:
+            result_id = result["id"]
+            group_ids = list(result_group_mapping[str(result_id)])
+            result[self.FIELD_MAPPER.get(self.group_by_field_name)] = (
+                [] if "None" in group_ids else group_ids
+            )
+            # If a result belongs to multiple groups, add it to each group
+            for group_id in group_ids:
+                if not self.__result_already_added(
+                    result, grouped_by_field_name[group_id]
+                ):
+                    grouped_by_field_name[group_id].append(result)
+
+        # Convert grouped_by_field_name back to a list for each group
+        processed_results = {
+            str(group_id): {
+                "results": issues,
+                "total_results": total_group_dict.get(str(group_id)),
+            }
+            for group_id, issues in grouped_by_field_name.items()
+        }
+
+        # ordering
+        for group_value, data in processed_results.items():
+            data["results"].sort(
+                key=lambda x: x.get("created_at"), reverse=True
+            )
+        return processed_results
+
+    def __query_grouper(self, results):
+        processed_results = self.__get_field_dict()
+        for result in results:
+            group_value = str(result.get(self.group_by_field_name))
+            if group_value in processed_results:
+                processed_results[str(group_value)]["results"].append(result)
+
+        for group_value, data in processed_results.items():
+            data["results"].sort(
+                key=lambda x: x.get("created_at"), reverse=True
+            )
+        return processed_results
+
+    def process_results(self, results):
+        if self.group_by_field_name in self.FIELD_MAPPER:
+            processed_results = self.__query_multi_grouper(results=results)
+        else:
+            processed_results = self.__query_grouper(results=results)
+        return processed_results
+
+
+class SubGroupedOffsetPaginator(OffsetPaginator):
+    FIELD_MAPPER = {
+        "labels__id": "label_ids",
+        "assignees__id": "assignee_ids",
+        "modules__id": "module_ids",
+    }
+
+    def __init__(
+        self,
+        queryset,
+        group_by_field_name,
+        sub_group_by_field_name,
+        group_by_fields,
+        sub_group_by_fields,
+        count_filter,
+        *args,
+        **kwargs,
+    ):
+        super().__init__(queryset, *args, **kwargs)
+        self.group_by_field_name = group_by_field_name
+        self.group_by_fields = group_by_fields
+        self.sub_group_by_field_name = sub_group_by_field_name
+        self.sub_group_by_fields = sub_group_by_fields
+        self.count_filter = count_filter
+
+    def get_result(self, limit=30, cursor=None):
+        # offset is page #
+        # value is page limit
+        if cursor is None:
+            cursor = Cursor(0, 0, 0)
+
+        limit = min(limit, self.max_limit)
+
+        # Adjust the initial offset and stop based on the cursor and limit
+        queryset = self.queryset
+        if self.key:
+            queryset = queryset.order_by(*self.key)
+
+        page = cursor.offset
+        offset = cursor.offset * cursor.value
+        stop = offset + (cursor.value or limit) + 1
+
+        if self.max_offset is not None and offset >= self.max_offset:
+            raise BadPaginationError("Pagination offset too large")
+        if offset < 0:
+            raise BadPaginationError("Pagination offset cannot be negative")
+
+        # Compute the results
+        results = {}
+        queryset = queryset.annotate(
+            row_number=Window(
+                expression=RowNumber(),
+                partition_by=[
+                    F(self.group_by_field_name),
+                    F(self.sub_group_by_field_name),
+                ],
+                order_by=(
+                    *self.key,
+                    "-created_at",
+                ),
+            )
+        )
+
+        # Filter the results
+        results = queryset.filter(row_number__gt=offset, row_number__lt=stop)
+
+        # Adjust cursors based on the grouped results for pagination
+        next_cursor = Cursor(
+            limit,
+            page + 1,
+            False,
+            queryset.filter(row_number__gte=stop).exists(),
+        )
+        prev_cursor = Cursor(
+            limit,
+            page - 1,
+            True,
+            page > 0,
+        )
+
+        count = queryset.count()
+
+        # Optionally, calculate the total count and max_hits if needed
+        # This might require adjustments based on specific use cases
+        max_hits = math.ceil(
+            queryset.values(self.group_by_field_name)
+            .annotate(
+                count=Count(
+                    "id",
+                    filter=self.count_filter,
+                    distinct=True,
+                )
+            )
+            .order_by("-count")[0]["count"]
+            / limit
+        )
+        return CursorResult(
+            results=results,
+            next=next_cursor,
+            prev=prev_cursor,
+            hits=count,
+            max_hits=max_hits,
+        )
+
+    def __get_group_total_queryset(self):
+        return (
+            self.queryset.order_by(self.group_by_field_name)
+            .values(self.group_by_field_name)
+            .annotate(
+                count=Count(
+                    "id",
+                    filter=self.count_filter,
+                    distinct=True,
+                )
+            )
+            .distinct()
+        )
+
+    def __get_subgroup_total_queryset(self):
+        return (
+            self.queryset.values(
+                self.group_by_field_name, self.sub_group_by_field_name
+            )
+            .annotate(
+                count=Count("id", filter=self.count_filter, distinct=True)
+            )
+            .order_by()
+            .values(
+                self.group_by_field_name, self.sub_group_by_field_name, "count"
+            )
+        )
+
+    def __get_total_dict(self):
+        total_group_dict = {}
+        total_sub_group_dict = {}
+        for group in self.__get_group_total_queryset():
+            total_group_dict[str(group.get(self.group_by_field_name))] = (
+                total_group_dict.get(
+                    str(group.get(self.group_by_field_name)), 0
+                )
+                + (1 if group.get("count") == 0 else group.get("count"))
+            )
+
+        # Sub group total values
+        for item in self.__get_subgroup_total_queryset():
+            group = str(item[self.group_by_field_name])
+            subgroup = str(item[self.sub_group_by_field_name])
+            count = item["count"]
+
+            if group not in total_sub_group_dict:
+                total_sub_group_dict[str(group)] = {}
+
+            if subgroup not in total_sub_group_dict[group]:
+                total_sub_group_dict[str(group)][str(subgroup)] = {}
+
+            total_sub_group_dict[group][subgroup] = count
+
+        return total_group_dict, total_sub_group_dict
+
+    def __get_field_dict(self):
+        total_group_dict, total_sub_group_dict = self.__get_total_dict()
+
+        return {
+            str(group): {
+                "results": {
+                    str(sub_group): {
+                        "results": [],
+                        "total_results": total_sub_group_dict.get(
+                            str(group)
+                        ).get(str(sub_group), 0),
+                    }
+                    for sub_group in total_sub_group_dict.get(str(group))
+                },
+                "total_results": total_group_dict.get(str(group), 0),
+            }
+            for group in self.group_by_fields
+        }
+
+    def __query_multi_grouper(self, results):
+        processed_results = self.__get_field_dict()
+        # Preparing a dict to keep track of group IDs associated with each label ID
+        result_group_mapping = defaultdict(set)
+        result_sub_group_mapping = defaultdict(set)
+
+        # Iterate over results to fill the above dictionaries
+        if self.group_by_field_name in self.FIELD_MAPPER:
+            for result in results:
+                result_id = result["id"]
+                group_id = result[self.group_by_field_name]
+                result_group_mapping[str(result_id)].add(str(group_id))
+
+        # Use the same calculation for the sub group
+        if self.sub_group_by_field_name in self.FIELD_MAPPER:
+            for result in results:
+                result_id = result["id"]
+                sub_group_id = result[self.sub_group_by_field_name]
+                result_sub_group_mapping[str(result_id)].add(str(sub_group_id))
+
+        # Iterate over results
+        for result in results:
+            # Get the group value
+            group_value = str(result.get(self.group_by_field_name))
+            # Get the sub group value
+            sub_group_value = str(result.get(self.sub_group_by_field_name))
+            if (
+                group_value in processed_results
+                and sub_group_value
+                in processed_results[str(group_value)]["results"]
+            ):
+                if self.group_by_field_name in self.FIELD_MAPPER:
+                    # for multi grouper
+                    group_ids = list(result_group_mapping[str(result_id)])
+                    result[self.FIELD_MAPPER.get(self.group_by_field_name)] = (
+                        [] if "None" in group_ids else group_ids
+                    )
+                if self.sub_group_by_field_name in self.FIELD_MAPPER:
+                    sub_group_ids = list(result_group_mapping[str(result_id)])
+                    # for multi groups
+                    result[self.FIELD_MAPPER.get(self.group_by_field_name)] = (
+                        [] if "None" in sub_group_ids else sub_group_ids
+                    )
+
+                processed_results[str(group_value)]["results"][
+                    str(sub_group_value)
+                ]["results"].append(result)
+        return processed_results
+
+    def __query_grouper(self, results):
+        processed_results = self.__get_field_dict()
+        for result in results:
+            group_value = str(result.get(self.group_by_field_name))
+            sub_group_value = str(result.get(self.sub_group_by_field_name))
+            processed_results[group_value]["results"][sub_group_value][
+                "results"
+            ].append(result)
+        return processed_results
+
+    def process_results(self, results):
+        if (
+            self.group_by_field_name in self.FIELD_MAPPER
+            or self.sub_group_by_field_name in self.FIELD_MAPPER
+        ):
+            processed_results = self.__query_multi_grouper(results=results)
+        else:
+            processed_results = self.__query_grouper(results=results)
+        return processed_results
+
 
 class BasePaginator:
     """BasePaginator class can be inherited by any View to return a paginated view"""
@@ -171,6 +641,11 @@ class BasePaginator:
         cursor_cls=Cursor,
         extra_stats=None,
         controller=None,
+        group_by_field_name=None,
+        group_by_fields=None,
+        sub_group_by_field_name=None,
+        sub_group_by_fields=None,
+        count_filter=None,
         **paginator_kwargs,
     ):
         """Paginate the request"""
@@ -178,15 +653,27 @@ class BasePaginator:
 
         # Convert the cursor value to integer and float from string
         input_cursor = None
-        if request.GET.get(self.cursor_name):
-            try:
-                input_cursor = cursor_cls.from_string(
-                    request.GET.get(self.cursor_name)
-                )
-            except ValueError:
-                raise ParseError(detail="Invalid cursor parameter.")
+        try:
+            input_cursor = cursor_cls.from_string(
+                request.GET.get(self.cursor_name, f"{per_page}:0:0"),
+            )
+        except ValueError:
+            raise ParseError(detail="Invalid cursor parameter.")
 
         if not paginator:
+            if group_by_field_name:
+                paginator_kwargs["group_by_field_name"] = group_by_field_name
+                paginator_kwargs["group_by_fields"] = group_by_fields
+                paginator_kwargs["count_filter"] = count_filter
+
+                if sub_group_by_field_name:
+                    paginator_kwargs["sub_group_by_field_name"] = (
+                        sub_group_by_field_name
+                    )
+                    paginator_kwargs["sub_group_by_fields"] = (
+                        sub_group_by_fields
+                    )
+
             paginator = paginator_cls(**paginator_kwargs)
 
         try:
@@ -196,11 +683,11 @@ class BasePaginator:
         except BadPaginationError:
             raise ParseError(detail="Error in parsing")
 
-        # Serialize result according to the on_result function
         if on_results:
             results = on_results(cursor_result.results)
-        else:
-            results = cursor_result.results
+
+        if group_by_field_name:
+            results = paginator.process_results(results=results)
 
         # Add Manipulation functions to the response
         if controller is not None:
@@ -211,13 +698,15 @@ class BasePaginator:
         # Return the response
         response = Response(
             {
+                "grouped_by": group_by_field_name,
+                "sub_grouped_by": sub_group_by_field_name,
+                "total_count": (cursor_result.hits),
                 "next_cursor": str(cursor_result.next),
                 "prev_cursor": str(cursor_result.prev),
                 "next_page_results": cursor_result.next.has_results,
                 "prev_page_results": cursor_result.prev.has_results,
                 "count": cursor_result.__len__(),
                 "total_pages": cursor_result.max_hits,
-                "total_results": cursor_result.hits,
                 "extra_stats": extra_stats,
                 "results": results,
             }

apiserver/requirements/base.txt

@@ -34,4 +34,4 @@ posthog==3.0.2
 cryptography==42.0.4
 lxml==4.9.3
 boto3==1.28.40
-
+ruff==0.3.1

apiserver/requirements/production.txt

@@ -1,3 +1,3 @@
 -r base.txt
 
-gunicorn==22.0.0
+gunicorn==21.2.0

apiserver/runtime.txt

@@ -1 +1 @@
-python-3.11.9
+python-3.11.8

deploy/selfhost/docker-compose.yml

@@ -1,13 +1,15 @@
+version: "3.8"
+
 x-app-env: &app-env
   environment:
     - NGINX_PORT=${NGINX_PORT:-80}
     - WEB_URL=${WEB_URL:-http://localhost}
     - DEBUG=${DEBUG:-0}
-    - SENTRY_DSN=${SENTRY_DSN}
+    - SENTRY_DSN=${SENTRY_DSN:-""}
     - SENTRY_ENVIRONMENT=${SENTRY_ENVIRONMENT:-"production"}
-    - CORS_ALLOWED_ORIGINS=${CORS_ALLOWED_ORIGINS}
+    - CORS_ALLOWED_ORIGINS=${CORS_ALLOWED_ORIGINS:-""}
     # Gunicorn Workers
-    - GUNICORN_WORKERS=${GUNICORN_WORKERS:-1}
+    - GUNICORN_WORKERS=${GUNICORN_WORKERS:-2}
     #DB SETTINGS
     - PGHOST=${PGHOST:-plane-db}
     - PGDATABASE=${PGDATABASE:-plane}
@@ -15,11 +17,11 @@ x-app-env: &app-env
     - POSTGRES_PASSWORD=${POSTGRES_PASSWORD:-plane}
     - POSTGRES_DB=${POSTGRES_DB:-plane}
     - PGDATA=${PGDATA:-/var/lib/postgresql/data}
-    - DATABASE_URL=${DATABASE_URL:-postgresql://plane:plane@plane-db/plane}
+    - DATABASE_URL=${DATABASE_URL:-postgresql://${POSTGRES_USER}:${POSTGRES_PASSWORD}@${PGHOST}/${PGDATABASE}}
     # REDIS SETTINGS
     - REDIS_HOST=${REDIS_HOST:-plane-redis}
     - REDIS_PORT=${REDIS_PORT:-6379}
-    - REDIS_URL=${REDIS_URL:-redis://plane-redis:6379/}
+    - REDIS_URL=${REDIS_URL:-redis://${REDIS_HOST}:6379/}
     # Application secret
     - SECRET_KEY=${SECRET_KEY:-60gp0byfz2dvffa45cxl20p1scy9xbpf6d8c5y0geejgkyp1b5}
     # DATA STORE SETTINGS
@@ -37,7 +39,7 @@ x-app-env: &app-env
 services:
   web:
     <<: *app-env
-    image: ${DOCKERHUB_USER:-makeplane}/plane-frontend:${APP_RELEASE:-stable}
+    image: ${DOCKERHUB_USER:-makeplane}/plane-frontend:${APP_RELEASE:-latest}
     pull_policy: ${PULL_POLICY:-always}
     restart: unless-stopped
     command: /usr/local/bin/start.sh web/server.js web
@@ -49,7 +51,7 @@ services:
 
   space:
     <<: *app-env
-    image: ${DOCKERHUB_USER:-makeplane}/plane-space:${APP_RELEASE:-stable}
+    image: ${DOCKERHUB_USER:-makeplane}/plane-space:${APP_RELEASE:-latest}
     pull_policy: ${PULL_POLICY:-always}
     restart: unless-stopped
     command: /usr/local/bin/start.sh space/server.js space
@@ -62,7 +64,7 @@ services:
 
   api:
     <<: *app-env
-    image: ${DOCKERHUB_USER:-makeplane}/plane-backend:${APP_RELEASE:-stable}
+    image: ${DOCKERHUB_USER:-makeplane}/plane-backend:${APP_RELEASE:-latest}
     pull_policy: ${PULL_POLICY:-always}
     restart: unless-stopped
     command: ./bin/takeoff
@@ -76,7 +78,7 @@ services:
 
   worker:
     <<: *app-env
-    image: ${DOCKERHUB_USER:-makeplane}/plane-backend:${APP_RELEASE:-stable}
+    image: ${DOCKERHUB_USER:-makeplane}/plane-backend:${APP_RELEASE:-latest}
     pull_policy: ${PULL_POLICY:-always}
     restart: unless-stopped
     command: ./bin/worker
@@ -89,7 +91,7 @@ services:
 
   beat-worker:
     <<: *app-env
-    image: ${DOCKERHUB_USER:-makeplane}/plane-backend:${APP_RELEASE:-stable}
+    image: ${DOCKERHUB_USER:-makeplane}/plane-backend:${APP_RELEASE:-latest}
     pull_policy: ${PULL_POLICY:-always}
     restart: unless-stopped
     command: ./bin/beat
@@ -102,7 +104,7 @@ services:
 
   migrator:
     <<: *app-env
-    image: ${DOCKERHUB_USER:-makeplane}/plane-backend:${APP_RELEASE:-stable}
+    image: ${DOCKERHUB_USER:-makeplane}/plane-backend:${APP_RELEASE:-latest}
     pull_policy: ${PULL_POLICY:-always}
     restart: no
     command: >
@@ -116,7 +118,7 @@ services:
 
   plane-db:
     <<: *app-env
-    image: postgres:15.5-alpine
+    image: postgres:15.2-alpine
     pull_policy: if_not_present
     restart: unless-stopped
     command: postgres -c 'max_connections=1000'
@@ -124,7 +126,7 @@ services:
       - pgdata:/var/lib/postgresql/data
   plane-redis:
     <<: *app-env
-    image: redis:7.2.4-alpine
+    image: redis:6.2.7-alpine
     pull_policy: if_not_present
     restart: unless-stopped
     volumes:
@@ -142,7 +144,7 @@ services:
   # Comment this if you already have a reverse proxy running
   proxy:
     <<: *app-env
-    image: ${DOCKERHUB_USER:-makeplane}/plane-proxy:${APP_RELEASE:-stable}
+    image: ${DOCKERHUB_USER:-makeplane}/plane-proxy:${APP_RELEASE:-latest}
     pull_policy: ${PULL_POLICY:-always}
     ports:
       - ${NGINX_PORT}:80

deploy/selfhost/install.sh

@@ -17,16 +17,16 @@ function print_header() {
 clear
 
 cat <<"EOF"
---------------------------------------------
- ____  _                          ///////// 
-|  _ \| | __ _ _ __   ___         ///////// 
-| |_) | |/ _` | '_ \ / _ \   /////    ///// 
-|  __/| | (_| | | | |  __/   /////    ///// 
-|_|   |_|\__,_|_| |_|\___|        ////      
-                                  ////      
---------------------------------------------
+---------------------------------------
+ ____  _                  
+|  _ \| | __ _ _ __   ___ 
+| |_) | |/ _` | '_ \ / _ \
+|  __/| | (_| | | | |  __/
+|_|   |_|\__,_|_| |_|\___|    
+
+---------------------------------------
 Project management tool from the future
---------------------------------------------
+---------------------------------------
 EOF
 }
 
@@ -66,7 +66,7 @@ function buildLocalImage() {
         cd $PLANE_TEMP_CODE_DIR
         if [ "$BRANCH" == "master" ];
         then
-            export APP_RELEASE=stable
+            export APP_RELEASE=latest
         fi
 
         docker compose -f build.yml build --no-cache  >&2
@@ -99,17 +99,17 @@ function download() {
     curl -H 'Cache-Control: no-cache, no-store' -s -o $PLANE_INSTALL_DIR/docker-compose.yaml  https://raw.githubusercontent.com/makeplane/plane/$BRANCH/deploy/selfhost/docker-compose.yml?$(date +%s)
     curl -H 'Cache-Control: no-cache, no-store' -s -o $PLANE_INSTALL_DIR/variables-upgrade.env https://raw.githubusercontent.com/makeplane/plane/$BRANCH/deploy/selfhost/variables.env?$(date +%s)
 
-    if [ -f "$DOCKER_ENV_PATH" ];
+    if [ -f "$PLANE_INSTALL_DIR/.env" ];
     then
-        cp $DOCKER_ENV_PATH $PLANE_INSTALL_DIR/archive/$TS.env
+        cp $PLANE_INSTALL_DIR/.env $PLANE_INSTALL_DIR/archive/$TS.env
     else
-        mv $PLANE_INSTALL_DIR/variables-upgrade.env $DOCKER_ENV_PATH
+        mv $PLANE_INSTALL_DIR/variables-upgrade.env $PLANE_INSTALL_DIR/.env
     fi
 
     if [ "$BRANCH" != "master" ];
     then
         cp $PLANE_INSTALL_DIR/docker-compose.yaml $PLANE_INSTALL_DIR/temp.yaml 
-        sed -e 's@${APP_RELEASE:-stable}@'"$BRANCH"'@g' \
+        sed -e 's@${APP_RELEASE:-latest}@'"$BRANCH"'@g' \
             $PLANE_INSTALL_DIR/temp.yaml > $PLANE_INSTALL_DIR/docker-compose.yaml
 
         rm $PLANE_INSTALL_DIR/temp.yaml
@@ -131,9 +131,9 @@ function download() {
     fi
     
     echo ""
-    echo "Most recent Stable version is now available for you to use"
+    echo "Latest version is now available for you to use"
     echo ""
-    echo "In case of Upgrade, your new setting file is availabe as 'variables-upgrade.env'. Please compare and set the required values in 'plane.env 'file."
+    echo "In case of Upgrade, your new setting file is availabe as 'variables-upgrade.env'. Please compare and set the required values in '.env 'file."
     echo ""
 
 }
@@ -144,7 +144,7 @@ function startServices() {
     if [ -n "$migrator_container_id" ]; then
         local idx=0
         while docker inspect --format='{{.State.Status}}' $migrator_container_id | grep -q "running"; do
-            local message=">> Waiting for Data Migration to finish"
+            local message=">>> Waiting for Data Migration to finish"
             local dots=$(printf '%*s' $idx | tr ' ' '.')
             echo -ne "\r$message$dots"
             ((idx++))
@@ -152,18 +152,13 @@ function startServices() {
         done
     fi
     printf "\r\033[K"
-    echo ""
-    echo "   Data Migration completed successfully ✅"
 
     # if migrator exit status is not 0, show error message and exit
     if [ -n "$migrator_container_id" ]; then
         local migrator_exit_code=$(docker inspect --format='{{.State.ExitCode}}' $migrator_container_id)
         if [ $migrator_exit_code -ne 0 ]; then
             echo "Plane Server failed to start ❌"
-            # stopServices
-            echo
-            echo "Please check the logs for the 'migrator' service and resolve the issue(s)."
-            echo "Stop the services by running the command: ./setup.sh stop"
+            stopServices
             exit 1
         fi
     fi
@@ -172,35 +167,26 @@ function startServices() {
     local idx2=0
     while ! docker logs $api_container_id 2>&1 | grep -m 1 -i "Application startup complete" | grep -q ".";
     do
-        local message=">> Waiting for API Service to Start"
+        local message=">>> Waiting for API Service to Start"
         local dots=$(printf '%*s' $idx2 | tr ' ' '.')    
         echo -ne "\r$message$dots"
         ((idx2++))
         sleep 1
     done
     printf "\r\033[K"
-    echo "   API Service started successfully ✅"
-    source "${DOCKER_ENV_PATH}"
-    echo "   Plane Server started successfully ✅"
-    echo ""
-    echo "   You can access the application at $WEB_URL"
-    echo ""
-
 }
 function stopServices() {
     docker compose -f $DOCKER_FILE_PATH --env-file=$DOCKER_ENV_PATH down
 }
 function restartServices() {
-    # docker compose -f $DOCKER_FILE_PATH --env-file=$DOCKER_ENV_PATH restart
-    stopServices
-    startServices
+    docker compose -f $DOCKER_FILE_PATH --env-file=$DOCKER_ENV_PATH restart
 }
 function upgrade() {
     echo "***** STOPPING SERVICES ****"
     stopServices
 
     echo
-    echo "***** DOWNLOADING STABLE VERSION ****"
+    echo "***** DOWNLOADING LATEST VERSION ****"
     download
 
     echo "***** PLEASE VALIDATE AND START SERVICES ****"
@@ -317,15 +303,15 @@ function askForAction() {
     elif [ "$ACTION" == "2" ] || [ "$DEFAULT_ACTION" == "start" ]
     then
         startServices
-        # askForAction
+        askForAction
     elif [ "$ACTION" == "3" ] || [ "$DEFAULT_ACTION" == "stop" ]
     then
         stopServices
-        # askForAction
+        askForAction
     elif [ "$ACTION" == "4" ] || [ "$DEFAULT_ACTION" == "restart" ]
     then
         restartServices
-        # askForAction
+        askForAction
     elif [ "$ACTION" == "5" ]  || [ "$DEFAULT_ACTION" == "upgrade" ]
     then
         upgrade
@@ -357,7 +343,7 @@ fi
 
 if [ "$BRANCH" == "master" ];
 then
-    export APP_RELEASE=stable
+    export APP_RELEASE=latest
 fi
 
 # REMOVE SPECIAL CHARACTERS FROM BRANCH NAME
@@ -368,21 +354,7 @@ fi
 mkdir -p $PLANE_INSTALL_DIR/archive
 
 DOCKER_FILE_PATH=$PLANE_INSTALL_DIR/docker-compose.yaml
-DOCKER_ENV_PATH=$PLANE_INSTALL_DIR/plane.env
-
-# BACKWARD COMPATIBILITY
-OLD_DOCKER_ENV_PATH=$PLANE_INSTALL_DIR/.env
-if [ -f "$OLD_DOCKER_ENV_PATH" ];
-then
-    mv "$OLD_DOCKER_ENV_PATH" "$DOCKER_ENV_PATH"
-    OS_NAME=$(uname)
-    if [ "$OS_NAME" == "Darwin" ];
-    then
-        sed -i '' -e 's@APP_RELEASE=latest@APP_RELEASE=stable@' "$DOCKER_ENV_PATH" 
-    else
-        sed -i -e 's@APP_RELEASE=latest@APP_RELEASE=stable@' "$DOCKER_ENV_PATH" 
-    fi
-fi
+DOCKER_ENV_PATH=$PLANE_INSTALL_DIR/.env
 
 print_header
 askForAction $@

deploy/selfhost/variables.env

@@ -1,4 +1,4 @@
-APP_RELEASE=stable
+APP_RELEASE=latest
 
 WEB_REPLICAS=1
 SPACE_REPLICAS=1
@@ -18,12 +18,12 @@ POSTGRES_USER=plane
 POSTGRES_PASSWORD=plane
 POSTGRES_DB=plane
 PGDATA=/var/lib/postgresql/data
-DATABASE_URL=
+DATABASE_URL=postgresql://${POSTGRES_USER}:${POSTGRES_PASSWORD}@${PGHOST}/${PGDATABASE}
 
 # REDIS SETTINGS
 REDIS_HOST=plane-redis
 REDIS_PORT=6379
-REDIS_URL=
+REDIS_URL=redis://${REDIS_HOST}:6379/
 
 # Secret Key
 SECRET_KEY=60gp0byfz2dvffa45cxl20p1scy9xbpf6d8c5y0geejgkyp1b5
@@ -41,4 +41,4 @@ BUCKET_NAME=uploads
 FILE_SIZE_LIMIT=5242880
 
 # Gunicorn Workers
-GUNICORN_WORKERS=1
+GUNICORN_WORKERS=2

docker-compose-local.yml

@@ -1,3 +1,5 @@
+version: "3.8"
+
 networks:
   dev_env:
     driver: bridge

docker-compose.yml

@@ -1,3 +1,5 @@
+version: "3.8"
+
 services:
   web:
     container_name: web

nginx/nginx.conf.template

@@ -30,7 +30,7 @@ http {
         }
 
         location /${BUCKET_NAME}/ {
-            proxy_pass http://plane-minio:9000/${BUCKET_NAME}/;
+            proxy_pass http://plane-minio:9000/uploads/;
         }
     }
 }

package.json

@@ -1,6 +1,6 @@
 {
   "repository": "https://github.com/makeplane/plane.git",
-  "version": "0.18.0",
+  "version": "0.16.0",
   "license": "AGPL-3.0",
   "private": true,
   "workspaces": [
@@ -28,7 +28,7 @@
     "prettier": "latest",
     "prettier-plugin-tailwindcss": "^0.5.4",
     "tailwindcss": "^3.3.3",
-    "turbo": "^1.13.2"
+    "turbo": "^1.11.3"
   },
   "resolutions": {
     "@types/react": "18.2.42"

packages/editor/core/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@plane/editor-core",
-  "version": "0.18.0",
+  "version": "0.16.0",
   "description": "Core Editor that powers Plane",
   "private": true,
   "main": "./dist/index.mjs",
@@ -28,13 +28,13 @@
     "react-dom": "18.2.0"
   },
   "dependencies": {
-    "@plane/ui": "*",
     "@tiptap/core": "^2.1.13",
     "@tiptap/extension-blockquote": "^2.1.13",
+    "@tiptap/extension-code-block-lowlight": "^2.1.13",
+    "@tiptap/extension-color": "^2.1.13",
     "@tiptap/extension-image": "^2.1.13",
     "@tiptap/extension-list-item": "^2.1.13",
     "@tiptap/extension-mention": "^2.1.13",
-    "@tiptap/extension-placeholder": "^2.3.0",
     "@tiptap/extension-task-item": "^2.1.13",
     "@tiptap/extension-task-list": "^2.1.13",
     "@tiptap/extension-text-style": "^2.1.13",
@@ -50,7 +50,6 @@
     "linkifyjs": "^4.1.3",
     "lowlight": "^3.0.0",
     "lucide-react": "^0.294.0",
-    "prosemirror-codemark": "^0.4.2",
     "react-moveable": "^0.54.2",
     "tailwind-merge": "^1.14.0",
     "tippy.js": "^6.3.7",

packages/editor/core/src/helpers/insert-content-at-cursor-position.ts

@@ -7,22 +7,11 @@ export const insertContentAtSavedSelection = (
   content: string,
   savedSelection: Selection
 ) => {
-  if (!editorRef.current || editorRef.current.isDestroyed) {
-    console.error("Editor reference is not available or has been destroyed.");
-    return;
-  }
-
-  if (!savedSelection) {
-    console.error("Saved selection is invalid.");
-    return;
-  }
-
-  const docSize = editorRef.current.state.doc.content.size;
-  const safePosition = Math.max(0, Math.min(savedSelection.anchor, docSize));
-
-  try {
-    editorRef.current.chain().focus().insertContentAt(safePosition, content).run();
-  } catch (error) {
-    console.error("An error occurred while inserting content at saved selection:", error);
+  if (editorRef.current && savedSelection) {
+    editorRef.current
+      .chain()
+      .focus()
+      .insertContentAt(savedSelection?.anchor, content)
+      .run();
   }
 };

packages/editor/core/src/helpers/scroll-to-node.ts

@@ -1,40 +0,0 @@
-import { Editor } from "@tiptap/react";
-
-export interface IMarking {
-  type: "heading";
-  level: number;
-  text: string;
-  sequence: number;
-}
-
-function findNthH1(editor: Editor, n: number, level: number): number {
-  let count = 0;
-  let pos = 0;
-  editor.state.doc.descendants((node, position) => {
-    if (node.type.name === "heading" && node.attrs.level === level) {
-      count++;
-      if (count === n) {
-        pos = position;
-        return false;
-      }
-    }
-  });
-  return pos;
-}
-
-function scrollToNode(editor: Editor, pos: number): void {
-  const headingNode = editor.state.doc.nodeAt(pos);
-  if (headingNode) {
-    const headingDOM = editor.view.nodeDOM(pos);
-    if (headingDOM instanceof HTMLElement) {
-      headingDOM.scrollIntoView({ behavior: "smooth" });
-    }
-  }
-}
-
-export function scrollSummary(editor: Editor, marking: IMarking) {
-  if (editor) {
-    const pos = findNthH1(editor, marking.sequence, marking.level);
-    scrollToNode(editor, pos);
-  }
-}

packages/editor/core/src/hooks/use-editor.tsx

@@ -1,215 +1,111 @@
 import { useEditor as useCustomEditor, Editor } from "@tiptap/react";
-import { useImperativeHandle, useRef, MutableRefObject, useState, useEffect } from "react";
+import { useImperativeHandle, useRef, MutableRefObject, useState } from "react";
 import { CoreEditorProps } from "src/ui/props";
 import { CoreEditorExtensions } from "src/ui/extensions";
 import { EditorProps } from "@tiptap/pm/view";
 import { getTrimmedHTML } from "src/lib/utils";
 import { DeleteImage } from "src/types/delete-image";
-import { IMentionHighlight, IMentionSuggestion } from "src/types/mention-suggestion";
+import { IMentionSuggestion } from "src/types/mention-suggestion";
 import { RestoreImage } from "src/types/restore-image";
 import { UploadImage } from "src/types/upload-image";
 import { Selection } from "@tiptap/pm/state";
 import { insertContentAtSavedSelection } from "src/helpers/insert-content-at-cursor-position";
-import { EditorMenuItemNames, getEditorMenuItems } from "src/ui/menus/menu-items";
-import { EditorRefApi } from "src/types/editor-ref-api";
-import { IMarking, scrollSummary } from "src/helpers/scroll-to-node";
 
 interface CustomEditorProps {
-  id?: string;
   uploadFile: UploadImage;
   restoreFile: RestoreImage;
+  rerenderOnPropsChange?: {
+    id: string;
+    description_html: string;
+  };
   deleteFile: DeleteImage;
-  cancelUploadImage?: () => void;
-  initialValue: string;
-  editorClassName: string;
-  // undefined when prop is not passed, null if intentionally passed to stop
-  // swr syncing
-  value: string | null | undefined;
-  onChange?: (json: object, html: string) => void;
+  cancelUploadImage?: () => any;
+  setIsSubmitting?: (isSubmitting: "submitting" | "submitted" | "saved") => void;
+  setShouldShowAlert?: (showAlert: boolean) => void;
+  value: string;
+  debouncedUpdatesEnabled?: boolean;
+  onStart?: (json: any, html: string) => void;
+  onChange?: (json: any, html: string) => void;
   extensions?: any;
   editorProps?: EditorProps;
-  forwardedRef?: MutableRefObject<EditorRefApi | null>;
-  mentionHandler: {
-    highlights: () => Promise<IMentionHighlight[]>;
-    suggestions?: () => Promise<IMentionSuggestion[]>;
-  };
-  handleEditorReady?: (value: boolean) => void;
-  placeholder?: string | ((isFocused: boolean) => string);
-  tabIndex?: number;
+  forwardedRef?: any;
+  mentionHighlights?: string[];
+  mentionSuggestions?: IMentionSuggestion[];
 }
 
 export const useEditor = ({
   uploadFile,
-  id = "",
   deleteFile,
   cancelUploadImage,
   editorProps = {},
-  initialValue,
-  editorClassName,
   value,
+  rerenderOnPropsChange,
   extensions = [],
+  onStart,
   onChange,
+  setIsSubmitting,
   forwardedRef,
-  tabIndex,
   restoreFile,
-  handleEditorReady,
-  mentionHandler,
-  placeholder,
+  setShouldShowAlert,
+  mentionHighlights,
+  mentionSuggestions,
 }: CustomEditorProps) => {
-  const editor = useCustomEditor({
-    editorProps: {
-      ...CoreEditorProps(editorClassName),
-      ...editorProps,
-    },
-    extensions: [
-      ...CoreEditorExtensions({
-        mentionConfig: {
-          mentionSuggestions: mentionHandler.suggestions ?? (() => Promise.resolve<IMentionSuggestion[]>([])),
-          mentionHighlights: mentionHandler.highlights ?? [],
-        },
-        fileConfig: {
+  const editor = useCustomEditor(
+    {
+      editorProps: {
+        ...CoreEditorProps(uploadFile, setIsSubmitting),
+        ...editorProps,
+      },
+      extensions: [
+        ...CoreEditorExtensions(
+          {
+            mentionSuggestions: mentionSuggestions ?? [],
+            mentionHighlights: mentionHighlights ?? [],
+          },
           deleteFile,
           restoreFile,
-          cancelUploadImage,
-          uploadFile,
-        },
-        placeholder,
-        tabIndex,
-      }),
-      ...extensions,
-    ],
-    content: typeof initialValue === "string" && initialValue.trim() !== "" ? initialValue : "<p></p>",
-    onCreate: async () => {
-      handleEditorReady?.(true);
+          cancelUploadImage
+        ),
+        ...extensions,
+      ],
+      content: typeof value === "string" && value.trim() !== "" ? value : "<p></p>",
+      onCreate: async ({ editor }) => {
+        onStart?.(editor.getJSON(), getTrimmedHTML(editor.getHTML()));
+      },
+      onTransaction: async ({ editor }) => {
+        setSavedSelection(editor.state.selection);
+      },
+      onUpdate: async ({ editor }) => {
+        setIsSubmitting?.("submitting");
+        setShouldShowAlert?.(true);
+        onChange?.(editor.getJSON(), getTrimmedHTML(editor.getHTML()));
+      },
     },
-    onTransaction: async ({ editor }) => {
-      setSavedSelection(editor.state.selection);
-    },
-    onUpdate: async ({ editor }) => {
-      onChange?.(editor.getJSON(), getTrimmedHTML(editor.getHTML()));
-    },
-    onDestroy: async () => {
-      handleEditorReady?.(false);
-    },
-  });
+    [rerenderOnPropsChange]
+  );
 
   const editorRef: MutableRefObject<Editor | null> = useRef(null);
+  editorRef.current = editor;
 
   const [savedSelection, setSavedSelection] = useState<Selection | null>(null);
 
-  // Inside your component or hook
-  const savedSelectionRef = useRef(savedSelection);
-
-  // Update the ref whenever savedSelection changes
-  useEffect(() => {
-    savedSelectionRef.current = savedSelection;
-  }, [savedSelection]);
-
-  // Effect for syncing SWR data
-  useEffect(() => {
-    // value is null when intentionally passed where syncing is not yet
-    // supported and value is undefined when the data from swr is not populated
-    if (value === null || value === undefined) return;
-    if (editor && !editor.isDestroyed && !editor.storage.image.uploadInProgress) {
-      try {
-        editor.commands.setContent(value);
-        const currentSavedSelection = savedSelectionRef.current;
-        if (currentSavedSelection) {
-          const docLength = editor.state.doc.content.size;
-          const relativePosition = Math.min(currentSavedSelection.from, docLength - 1);
-          editor.commands.setTextSelection(relativePosition);
-        }
-      } catch (error) {
-        console.error("Error syncing editor content with external value:", error);
+  useImperativeHandle(forwardedRef, () => ({
+    clearEditor: () => {
+      editorRef.current?.commands.clearContent();
+    },
+    setEditorValue: (content: string) => {
+      editorRef.current?.commands.setContent(content);
+    },
+    setEditorValueAtCursorPosition: (content: string) => {
+      if (savedSelection) {
+        insertContentAtSavedSelection(editorRef, content, savedSelection);
       }
-    }
-  }, [editor, value, id]);
-
-  useImperativeHandle(
-    forwardedRef,
-    () => ({
-      clearEditor: () => {
-        editorRef.current?.commands.clearContent();
-      },
-      setEditorValue: (content: string) => {
-        editorRef.current?.commands.setContent(content);
-      },
-      setEditorValueAtCursorPosition: (content: string) => {
-        if (savedSelection) {
-          insertContentAtSavedSelection(editorRef, content, savedSelection);
-        }
-      },
-      executeMenuItemCommand: (itemName: EditorMenuItemNames) => {
-        const editorItems = getEditorMenuItems(editorRef.current, uploadFile);
-
-        const getEditorMenuItem = (itemName: EditorMenuItemNames) => editorItems.find((item) => item.name === itemName);
-
-        const item = getEditorMenuItem(itemName);
-        if (item) {
-          if (item.name === "image") {
-            item.command(savedSelection);
-          } else {
-            item.command();
-          }
-        } else {
-          console.warn(`No command found for item: ${itemName}`);
-        }
-      },
-      isMenuItemActive: (itemName: EditorMenuItemNames): boolean => {
-        const editorItems = getEditorMenuItems(editorRef.current, uploadFile);
-
-        const getEditorMenuItem = (itemName: EditorMenuItemNames) => editorItems.find((item) => item.name === itemName);
-        const item = getEditorMenuItem(itemName);
-        return item ? item.isActive() : false;
-      },
-      onStateChange: (callback: () => void) => {
-        // Subscribe to editor state changes
-        editorRef.current?.on("transaction", () => {
-          callback();
-        });
-        // Return a function to unsubscribe to the continuous transactions of
-        // the editor on unmounting the component that has subscribed to this
-        // method
-        return () => {
-          editorRef.current?.off("transaction");
-        };
-      },
-      getMarkDown: (): string => {
-        const markdownOutput = editorRef.current?.storage.markdown.getMarkdown();
-        return markdownOutput;
-      },
-      scrollSummary: (marking: IMarking): void => {
-        if (!editorRef.current) return;
-        scrollSummary(editorRef.current, marking);
-      },
-      setFocusAtPosition: (position: number) => {
-        if (!editorRef.current || editorRef.current.isDestroyed) {
-          console.error("Editor reference is not available or has been destroyed.");
-          return;
-        }
-        try {
-          const docSize = editorRef.current.state.doc.content.size;
-          const safePosition = Math.max(0, Math.min(position, docSize));
-          editorRef.current
-            .chain()
-            .insertContentAt(safePosition, [{ type: "paragraph" }])
-            .focus()
-            .run();
-        } catch (error) {
-          console.error("An error occurred while setting focus at position:", error);
-        }
-      },
-    }),
-    [editorRef, savedSelection, uploadFile]
-  );
+    },
+  }));
 
   if (!editor) {
     return null;
   }
 
-  // the editorRef is used to access the editor instance from outside the hook
-  // and should only be used after editor is initialized
-  editorRef.current = editor;
-
   return editor;
 };

packages/editor/core/src/hooks/use-read-only-editor.tsx

@@ -1,61 +1,53 @@
 import { useEditor as useCustomEditor, Editor } from "@tiptap/react";
-import { useImperativeHandle, useRef, MutableRefObject, useEffect } from "react";
+import { useImperativeHandle, useRef, MutableRefObject } from "react";
 import { CoreReadOnlyEditorExtensions } from "src/ui/read-only/extensions";
 import { CoreReadOnlyEditorProps } from "src/ui/read-only/props";
 import { EditorProps } from "@tiptap/pm/view";
-import { EditorReadOnlyRefApi } from "src/types/editor-ref-api";
-import { IMarking, scrollSummary } from "src/helpers/scroll-to-node";
-import { IMentionHighlight } from "src/types/mention-suggestion";
+import { IMentionSuggestion } from "src/types/mention-suggestion";
 
 interface CustomReadOnlyEditorProps {
-  initialValue: string;
-  editorClassName: string;
-  forwardedRef?: MutableRefObject<EditorReadOnlyRefApi | null>;
+  value: string;
+  forwardedRef?: any;
   extensions?: any;
   editorProps?: EditorProps;
-  handleEditorReady?: (value: boolean) => void;
-  mentionHandler: {
-    highlights: () => Promise<IMentionHighlight[]>;
+  rerenderOnPropsChange?: {
+    id: string;
+    description_html: string;
   };
+  mentionHighlights?: string[];
+  mentionSuggestions?: IMentionSuggestion[];
 }
 
 export const useReadOnlyEditor = ({
-  initialValue,
-  editorClassName,
+  value,
   forwardedRef,
   extensions = [],
   editorProps = {},
-  handleEditorReady,
-  mentionHandler,
+  rerenderOnPropsChange,
+  mentionHighlights,
+  mentionSuggestions,
 }: CustomReadOnlyEditorProps) => {
-  const editor = useCustomEditor({
-    editable: false,
-    content: typeof initialValue === "string" && initialValue.trim() !== "" ? initialValue : "<p></p>",
-    editorProps: {
-      ...CoreReadOnlyEditorProps(editorClassName),
-      ...editorProps,
+  const editor = useCustomEditor(
+    {
+      editable: false,
+      content: typeof value === "string" && value.trim() !== "" ? value : "<p></p>",
+      editorProps: {
+        ...CoreReadOnlyEditorProps,
+        ...editorProps,
+      },
+      extensions: [
+        ...CoreReadOnlyEditorExtensions({
+          mentionSuggestions: mentionSuggestions ?? [],
+          mentionHighlights: mentionHighlights ?? [],
+        }),
+        ...extensions,
+      ],
     },
-    onCreate: async () => {
-      handleEditorReady?.(true);
-    },
-    extensions: [
-      ...CoreReadOnlyEditorExtensions({
-        mentionHighlights: mentionHandler.highlights,
-      }),
-      ...extensions,
-    ],
-    onDestroy: () => {
-      handleEditorReady?.(false);
-    },
-  });
-
-  // for syncing swr data on tab refocus etc
-  useEffect(() => {
-    if (initialValue === null || initialValue === undefined) return;
-    if (editor && !editor.isDestroyed) editor?.commands.setContent(initialValue);
-  }, [editor, initialValue]);
+    [rerenderOnPropsChange]
+  );
 
   const editorRef: MutableRefObject<Editor | null> = useRef(null);
+  editorRef.current = editor;
 
   useImperativeHandle(forwardedRef, () => ({
     clearEditor: () => {
@@ -64,20 +56,11 @@ export const useReadOnlyEditor = ({
     setEditorValue: (content: string) => {
       editorRef.current?.commands.setContent(content);
     },
-    getMarkDown: (): string => {
-      const markdownOutput = editorRef.current?.storage.markdown.getMarkdown();
-      return markdownOutput;
-    },
-    scrollSummary: (marking: IMarking): void => {
-      if (!editorRef.current) return;
-      scrollSummary(editorRef.current, marking);
-    },
   }));
 
   if (!editor) {
     return null;
   }
 
-  editorRef.current = editor;
   return editor;
 };

packages/editor/core/src/index.ts

@@ -26,7 +26,6 @@ export * from "src/lib/editor-commands";
 // types
 export type { DeleteImage } from "src/types/delete-image";
 export type { UploadImage } from "src/types/upload-image";
-export type { EditorRefApi, EditorReadOnlyRefApi } from "src/types/editor-ref-api";
 export type { RestoreImage } from "src/types/restore-image";
 export type { IMentionHighlight, IMentionSuggestion } from "src/types/mention-suggestion";
 export type { ISlashCommandItem, CommandProps } from "src/types/slash-commands-suggestion";

packages/editor/core/src/lib/editor-commands.ts

@@ -1,22 +1,21 @@
 import { Editor, Range } from "@tiptap/core";
 import { startImageUpload } from "src/ui/plugins/upload-image";
 import { findTableAncestor } from "src/lib/utils";
-import { Selection } from "@tiptap/pm/state";
 import { UploadImage } from "src/types/upload-image";
 
 export const toggleHeadingOne = (editor: Editor, range?: Range) => {
-  if (range) editor.chain().focus().deleteRange(range).setNode("heading", { level: 1 }).run();
-  else editor.chain().focus().toggleHeading({ level: 1 }).run();
+  if (range) editor.chain().focus().deleteRange(range).clearNodes().setNode("heading", { level: 1 }).run();
+  else editor.chain().focus().clearNodes().toggleHeading({ level: 1 }).run();
 };
 
 export const toggleHeadingTwo = (editor: Editor, range?: Range) => {
-  if (range) editor.chain().focus().deleteRange(range).setNode("heading", { level: 2 }).run();
-  else editor.chain().focus().toggleHeading({ level: 2 }).run();
+  if (range) editor.chain().focus().deleteRange(range).clearNodes().setNode("heading", { level: 2 }).run();
+  else editor.chain().focus().clearNodes().toggleHeading({ level: 2 }).run();
 };
 
 export const toggleHeadingThree = (editor: Editor, range?: Range) => {
-  if (range) editor.chain().focus().deleteRange(range).setNode("heading", { level: 3 }).run();
-  else editor.chain().focus().toggleHeading({ level: 3 }).run();
+  if (range) editor.chain().focus().deleteRange(range).clearNodes().setNode("heading", { level: 3 }).run();
+  else editor.chain().focus().clearNodes().toggleHeading({ level: 3 }).run();
 };
 
 export const toggleBold = (editor: Editor, range?: Range) => {
@@ -34,98 +33,48 @@ export const toggleUnderline = (editor: Editor, range?: Range) => {
   else editor.chain().focus().toggleUnderline().run();
 };
 
-const replaceCodeBlockWithContent = (editor: Editor) => {
-  try {
-    const { schema } = editor.state;
-    const { paragraph } = schema.nodes;
-    let replaced = false;
-
-    const replaceCodeBlock = (from: number, to: number, textContent: string) => {
-      const docSize = editor.state.doc.content.size;
-
-      if (from < 0 || to > docSize || from > to) {
-        console.error("Invalid range for replacement: ", from, to, "in a document of size", docSize);
-        return;
-      }
-
-      // split the textContent by new lines to handle each line as a separate paragraph
-      const lines = textContent.split(/\r?\n/);
-
-      const tr = editor.state.tr;
-
-      // Calculate the position for inserting the first paragraph
-      let insertPos = from;
-
-      // Remove the code block first
-      tr.delete(from, to);
-
-      // For each line, create a paragraph node and insert it
-      lines.forEach((line) => {
-        const paragraphNode = paragraph.create({}, schema.text(line));
-        tr.insert(insertPos, paragraphNode);
-        // Update insertPos for the next insertion
-        insertPos += paragraphNode.nodeSize;
-      });
-
-      // Dispatch the transaction
-      editor.view.dispatch(tr);
-      replaced = true;
-    };
-
-    editor.state.doc.nodesBetween(editor.state.selection.from, editor.state.selection.to, (node, pos) => {
-      if (node.type === schema.nodes.codeBlock) {
-        const startPos = pos;
-        const endPos = pos + node.nodeSize;
-        const textContent = node.textContent;
-        replaceCodeBlock(startPos, endPos, textContent);
-        return false;
-      }
-    });
-
-    if (!replaced) {
-      console.log("No code block to replace.");
-    }
-  } catch (error) {
-    console.error("An error occurred while replacing code block content:", error);
-  }
-};
-
 export const toggleCodeBlock = (editor: Editor, range?: Range) => {
-  try {
-    if (editor.isActive("codeBlock")) {
-      replaceCodeBlockWithContent(editor);
+  // Check if code block is active then toggle code block
+  if (editor.isActive("codeBlock")) {
+    if (range) {
+      editor.chain().focus().deleteRange(range).clearNodes().toggleCodeBlock().run();
       return;
     }
+    editor.chain().focus().clearNodes().toggleCodeBlock().run();
+    return;
+  }
 
-    const { from, to } = range || editor.state.selection;
-    const text = editor.state.doc.textBetween(from, to, "\n");
-    const isMultiline = text.includes("\n");
+  // Check if user hasn't selected any text
+  const isSelectionEmpty = editor.state.selection.empty;
 
-    if (editor.state.selection.empty) {
-      editor.chain().focus().toggleCodeBlock().run();
-    } else if (isMultiline) {
-      editor.chain().focus().deleteRange({ from, to }).insertContentAt(from, `\`\`\`\n${text}\n\`\`\``).run();
-    } else {
-      editor.chain().focus().toggleCode().run();
+  if (isSelectionEmpty) {
+    if (range) {
+      editor.chain().focus().deleteRange(range).clearNodes().toggleCodeBlock().run();
+      return;
     }
-  } catch (error) {
-    console.error("An error occurred while toggling code block:", error);
+    editor.chain().focus().clearNodes().toggleCodeBlock().run();
+  } else {
+    if (range) {
+      editor.chain().focus().deleteRange(range).clearNodes().toggleCode().run();
+      return;
+    }
+    editor.chain().focus().clearNodes().toggleCode().run();
   }
 };
 
 export const toggleOrderedList = (editor: Editor, range?: Range) => {
-  if (range) editor.chain().focus().deleteRange(range).toggleOrderedList().run();
-  else editor.chain().focus().toggleOrderedList().run();
+  if (range) editor.chain().focus().deleteRange(range).clearNodes().toggleOrderedList().run();
+  else editor.chain().focus().clearNodes().toggleOrderedList().run();
 };
 
 export const toggleBulletList = (editor: Editor, range?: Range) => {
-  if (range) editor.chain().focus().deleteRange(range).toggleBulletList().run();
-  else editor.chain().focus().toggleBulletList().run();
+  if (range) editor.chain().focus().deleteRange(range).clearNodes().toggleBulletList().run();
+  else editor.chain().focus().clearNodes().toggleBulletList().run();
 };
 
 export const toggleTaskList = (editor: Editor, range?: Range) => {
-  if (range) editor.chain().focus().deleteRange(range).toggleTaskList().run();
-  else editor.chain().focus().toggleTaskList().run();
+  if (range) editor.chain().focus().deleteRange(range).clearNodes().toggleTaskList().run();
+  else editor.chain().focus().clearNodes().toggleTaskList().run();
 };
 
 export const toggleStrike = (editor: Editor, range?: Range) => {
@@ -134,19 +83,17 @@ export const toggleStrike = (editor: Editor, range?: Range) => {
 };
 
 export const toggleBlockquote = (editor: Editor, range?: Range) => {
-  if (range) editor.chain().focus().deleteRange(range).toggleBlockquote().run();
-  else editor.chain().focus().toggleBlockquote().run();
+  if (range) editor.chain().focus().deleteRange(range).clearNodes().toggleBlockquote().run();
+  else editor.chain().focus().clearNodes().toggleBlockquote().run();
 };
 
 export const insertTableCommand = (editor: Editor, range?: Range) => {
   if (typeof window !== "undefined") {
-    const selection = window.getSelection();
-    if (selection) {
-      if (selection.rangeCount !== 0) {
-        const range = selection.getRangeAt(0);
-        if (findTableAncestor(range.startContainer)) {
-          return;
-        }
+    const selection: any = window?.getSelection();
+    if (selection.rangeCount !== 0) {
+      const range = selection.getRangeAt(0);
+      if (findTableAncestor(range.startContainer)) {
+        return;
       }
     }
   }
@@ -165,7 +112,7 @@ export const setLinkEditor = (editor: Editor, url: string) => {
 export const insertImageCommand = (
   editor: Editor,
   uploadFile: UploadImage,
-  savedSelection?: Selection | null,
+  setIsSubmitting?: (isSubmitting: "submitting" | "submitted" | "saved") => void,
   range?: Range
 ) => {
   if (range) editor.chain().focus().deleteRange(range).run();
@@ -175,8 +122,8 @@ export const insertImageCommand = (
   input.onchange = async () => {
     if (input.files?.length) {
       const file = input.files[0];
-      const pos = savedSelection?.anchor ?? editor.view.state.selection.from;
-      startImageUpload(editor, file, editor.view, pos, uploadFile);
+      const pos = editor.view.state.selection.from;
+      startImageUpload(file, editor.view, pos, uploadFile, setIsSubmitting);
     }
   };
   input.click();

packages/editor/core/src/lib/utils.ts

@@ -4,17 +4,15 @@ import { twMerge } from "tailwind-merge";
 interface EditorClassNames {
   noBorder?: boolean;
   borderOnFocus?: boolean;
-  containerClassName?: string;
+  customClassName?: string;
 }
 
-export const getEditorClassNames = ({ noBorder, borderOnFocus, containerClassName }: EditorClassNames) =>
+export const getEditorClassNames = ({ noBorder, borderOnFocus, customClassName }: EditorClassNames) =>
   cn(
-    "w-full max-w-full sm:rounded-lg focus:outline-none focus:border-0",
-    {
-      "border border-custom-border-200": !noBorder,
-      "focus:border border-custom-border-300": borderOnFocus,
-    },
-    containerClassName
+    "relative w-full max-w-full sm:rounded-lg mt-2 p-3 relative focus:outline-none rounded-md",
+    noBorder ? "" : "border border-custom-border-200",
+    borderOnFocus ? "focus:border border-custom-border-300" : "focus:border-0",
+    customClassName
   );
 
 export function cn(...inputs: ClassValue[]) {

packages/editor/core/src/styles/editor.css

@@ -7,17 +7,10 @@
 }
 
 /* block quotes */
-.ProseMirror blockquote {
-  font-style: normal;
-  font-weight: 400;
-  border-left: 3px solid rgb(var(--color-border-300));
-}
-
 .ProseMirror blockquote p::before,
 .ProseMirror blockquote p::after {
   display: none;
 }
-/* end block quotes */
 
 .ProseMirror code::before,
 .ProseMirror code::after {
@@ -35,8 +28,8 @@
 /* Custom image styles */
 .ProseMirror img {
   transition: filter 0.1s ease-in-out;
-  margin-top: 8px;
-  margin-bottom: 0;
+  margin-top: 0 !important;
+  margin-bottom: 0 !important;
 
   &:hover {
     cursor: pointer;
@@ -44,49 +37,22 @@
   }
 
   &.ProseMirror-selectednode {
-    outline: 3px solid rgba(var(--color-primary-100));
+    outline: 3px solid #5abbf7;
     filter: brightness(90%);
   }
 }
 
-/* Custom gap cursor styles  */
-.ProseMirror-gapcursor::after {
+.ProseMirror-gapcursor:after {
   border-top: 1px solid rgb(var(--color-text-100)) !important;
 }
 
-/* to-do list */
-ul[data-type="taskList"] li {
-  font-size: 1rem;
-  line-height: 1.5;
-}
+/* Custom TODO list checkboxes – shoutout to this awesome tutorial: https://moderncss.dev/pure-css-custom-checkbox-style/ */
 
 ul[data-type="taskList"] li > label {
-  margin: 0.1rem 0.15rem 0 0;
+  margin-right: 0.2rem;
   user-select: none;
 }
 
-ul[data-type="taskList"] li > label input[type="checkbox"] {
-  border: 1px solid rgba(var(--color-border-300)) !important;
-  outline: none;
-  border-radius: 2px;
-  transform: scale(1.05);
-}
-
-ul[data-type="taskList"] li > label input[type="checkbox"]:hover {
-  background-color: rgba(var(--color-background-80)) !important;
-}
-
-ul[data-type="taskList"] li > label input[type="checkbox"]:checked {
-  background-color: rgba(var(--color-primary-100)) !important;
-  border-color: rgba(var(--color-primary-100)) !important;
-  color: white !important;
-}
-
-ul[data-type="taskList"] li > label input[type="checkbox"]:checked:hover {
-  background-color: rgba(var(--color-primary-300)) !important;
-  border-color: rgba(var(--color-primary-300)) !important;
-}
-
 @media screen and (max-width: 768px) {
   ul[data-type="taskList"] li > label {
     margin-right: 0.5rem;
@@ -94,7 +60,6 @@ ul[data-type="taskList"] li > label input[type="checkbox"]:checked:hover {
 }
 
 ul[data-type="taskList"] li > label input[type="checkbox"] {
-  position: relative;
   -webkit-appearance: none;
   appearance: none;
   background-color: rgb(var(--color-background-100));
@@ -106,6 +71,8 @@ ul[data-type="taskList"] li > label input[type="checkbox"] {
   border: 1.5px solid rgb(var(--color-text-100));
   margin-right: 0.2rem;
   margin-top: 0.15rem;
+  display: grid;
+  place-content: center;
 
   &:hover {
     background-color: rgb(var(--color-background-80));
@@ -115,32 +82,27 @@ ul[data-type="taskList"] li > label input[type="checkbox"] {
     background-color: rgb(var(--color-background-90));
   }
 
-  /* check sign */
   &::before {
     content: "";
-    position: absolute;
-    top: 50%;
-    left: 50%;
     width: 0.5em;
     height: 0.5em;
     transform: scale(0);
-    transform-origin: center;
     transition: 120ms transform ease-in-out;
     box-shadow: inset 1em 1em;
+    transform-origin: center;
     clip-path: polygon(14% 44%, 0 65%, 50% 100%, 100% 16%, 80% 0%, 43% 62%);
   }
 
   &:checked::before {
-    transform: scale(1) translate(-50%, -50%);
+    transform: scale(1);
   }
 }
 
 ul[data-type="taskList"] li[data-checked="true"] > div > p {
-  color: rgb(var(--color-text-400));
+  color: rgb(var(--color-text-200));
   text-decoration: line-through;
   text-decoration-thickness: 2px;
 }
-/* end to-do list */
 
 /* Overwrite tippy-box original max-width */
 
@@ -171,12 +133,12 @@ ul[data-type="taskList"] li[data-checked="true"] > div > p {
   -moz-appearance: textfield;
 }
 
-.fade-in {
+.fadeIn {
   opacity: 1;
   transition: opacity 0.3s ease-in;
 }
 
-.fade-out {
+.fadeOut {
   opacity: 0;
   transition: opacity 0.2s ease-out;
 }
@@ -187,7 +149,7 @@ ul[data-type="taskList"] li[data-checked="true"] > div > p {
   margin-top: 0 !important;
   margin-bottom: 0 !important;
 
-  &::before {
+  &:before {
     content: "";
     box-sizing: border-box;
     position: absolute;
@@ -213,13 +175,21 @@ ul[data-type="taskList"] li[data-checked="true"] > div > p {
   cursor: col-resize;
 }
 
+.ProseMirror table * p {
+  padding: 0px 1px;
+  margin: 6px 2px;
+}
+
 .ProseMirror table * .is-empty::before {
   opacity: 0;
 }
 
 .ProseMirror pre {
-  font-family: JetBrainsMono, monospace;
-  tab-size: 2;
+  background: rgba(var(--color-background-80));
+  border-radius: 0.5rem;
+  color: rgba(var(--color-text-100));
+  font-family: "JetBrainsMono", monospace;
+  padding: 0.75rem 1rem;
 }
 
 .ProseMirror pre code {
@@ -236,7 +206,7 @@ div[data-type="horizontalRule"] {
   margin-bottom: 0;
 
   & > div {
-    border-bottom: 2px solid rgb(var(--color-border-200));
+    border-bottom: 1px solid rgb(var(--color-text-100));
   }
 }
 
@@ -244,107 +214,3 @@ div[data-type="horizontalRule"] {
 .moveable-control-box {
   z-index: 10 !important;
 }
-
-/* Cursor styles for the inline code blocks */
-@keyframes blink {
-  49% {
-    border-color: unset;
-  }
-
-  50% {
-    border-color: transparent;
-  }
-
-  99% {
-    border-color: transparent;
-  }
-}
-
-.no-cursor {
-  caret-color: transparent;
-}
-
-div:focus .fake-cursor,
-span:focus .fake-cursor {
-  margin-right: -1px;
-  border-left-width: 1.5px;
-  border-left-style: solid;
-  animation: blink 1s;
-  animation-iteration-count: infinite;
-  position: relative;
-  z-index: 1;
-}
-
-/* numbered, bulleted and to-do lists spacing */
-.prose ol:where(.prose > :first-child):not(:where([class~="not-prose"], [class~="not-prose"] *)),
-.prose
-  ul:not([data-type="taskList"]):where(.prose > :first-child):not(:where([class~="not-prose"], [class~="not-prose"] *)),
-.prose ul[data-type="taskList"]:where(.prose > :first-child) {
-  margin-top: 0.25rem !important;
-  margin-bottom: 1px !important;
-}
-
-.prose ol:not(:where(.prose > :first-child):not(:where([class~="not-prose"], [class~="not-prose"] *))),
-.prose
-  ul:not([data-type="taskList"]):not(
-    :where(.prose > :first-child):not(:where([class~="not-prose"], [class~="not-prose"] *))
-  ),
-.prose ul[data-type="taskList"]:not(:where(.prose > :first-child)) {
-  margin-top: calc(0.25rem + 3px) !important;
-  margin-bottom: 1px !important;
-}
-
-ol ol,
-ol ul:not([data-type="taskList"]),
-ul:not([data-type="taskList"]) ul:not([data-type="taskList"]),
-ul:not([data-type="taskList"]) ol {
-  margin-top: 0.45rem !important;
-}
-
-ul[data-type="taskList"] ul[data-type="taskList"] {
-  margin-top: 0.6rem;
-}
-/* end numbered, bulleted and to-do lists spacing */
-
-/* tailwind typography */
-.prose :where(h1):not(:where([class~="not-prose"], [class~="not-prose"] *)) {
-  margin-top: 2rem;
-  margin-bottom: 4px;
-  font-size: 1.875rem;
-  font-weight: 700;
-  line-height: 1.3;
-}
-
-.prose :where(h2):not(:where([class~="not-prose"], [class~="not-prose"] *)) {
-  margin-top: 1.4rem;
-  margin-bottom: 1px;
-  font-size: 1.5rem;
-  font-weight: 600;
-  line-height: 1.3;
-}
-
-.prose :where(h3):not(:where([class~="not-prose"], [class~="not-prose"] *)) {
-  margin-top: 1rem;
-  margin-bottom: 1px;
-  font-size: 1.25rem;
-  line-height: 1.3;
-}
-
-.prose :where(p):not(:where([class~="not-prose"], [class~="not-prose"] *)) {
-  margin-top: 0.25rem;
-  margin-bottom: 1px;
-  padding: 3px 2px;
-  font-size: 1rem;
-  line-height: 1.5;
-}
-
-.prose :where(ol):not(:where([class~="not-prose"], [class~="not-prose"] *)) li p,
-.prose :where(ul):not(:where([class~="not-prose"], [class~="not-prose"] *)) li p {
-  font-size: 1rem;
-  line-height: 1.5;
-}
-
-.prose :where(.prose > :first-child):not(:where([class~="not-prose"], [class~="not-prose"] *)) {
-  margin-top: 0;
-}
-/* end tailwind typography */