feat: toggle heading block

.github/workflows/build-aio-base.yml

@@ -83,7 +83,7 @@ jobs:
           endpoint: ${{ env.BUILDX_ENDPOINT }}
 
       - name: Build and Push to Docker Hub
-        uses: docker/build-push-action@v6.9.0
+        uses: docker/build-push-action@v5.1.0
         with:
           context: ./aio
           file: ./aio/Dockerfile-base-full
@@ -124,7 +124,7 @@ jobs:
           endpoint: ${{ env.BUILDX_ENDPOINT }}
 
       - name: Build and Push to Docker Hub
-        uses: docker/build-push-action@v6.9.0
+        uses: docker/build-push-action@v5.1.0
         with:
           context: ./aio
           file: ./aio/Dockerfile-base-slim

.github/workflows/build-aio-branch.yml

@@ -128,7 +128,7 @@ jobs:
         uses: actions/checkout@v4
 
       - name: Build and Push to Docker Hub
-        uses: docker/build-push-action@v6.9.0
+        uses: docker/build-push-action@v5.1.0
         with:
           context: .
           file: ./aio/Dockerfile-app
@@ -188,7 +188,7 @@ jobs:
         uses: actions/checkout@v4
 
       - name: Build and Push to Docker Hub
-        uses: docker/build-push-action@v6.9.0
+        uses: docker/build-push-action@v5.1.0
         with:
           context: .
           file: ./aio/Dockerfile-app

.github/workflows/build-branch.yml

@@ -170,7 +170,7 @@ jobs:
         name: Checkout Files
         uses: actions/checkout@v4
       - name: Admin Build and Push
-        uses: ./.github/actions/build-push-ce
+        uses: ./.github/actions/buildpush-action
         with:
           build-release: ${{ needs.branch_build_setup.outputs.build_release }}
           build-prerelease: ${{ needs.branch_build_setup.outputs.build_prerelease }}
@@ -196,7 +196,7 @@ jobs:
         name: Checkout Files
         uses: actions/checkout@v4
       - name: Web Build and Push
-        uses: ./.github/actions/build-push-ce
+        uses: ./.github/actions/buildpush-action
         with:
           build-release: ${{ needs.branch_build_setup.outputs.build_release }}
           build-prerelease: ${{ needs.branch_build_setup.outputs.build_prerelease }}
@@ -222,7 +222,7 @@ jobs:
         name: Checkout Files
         uses: actions/checkout@v4
       - name: Space Build and Push
-        uses: ./.github/actions/build-push-ce
+        uses: ./.github/actions/buildpush-action
         with:
           build-release: ${{ needs.branch_build_setup.outputs.build_release }}
           build-prerelease: ${{ needs.branch_build_setup.outputs.build_prerelease }}
@@ -248,7 +248,7 @@ jobs:
         name: Checkout Files
         uses: actions/checkout@v4
       - name: Live Build and Push
-        uses: ./.github/actions/build-push-ce
+        uses: ./.github/actions/buildpush-action
         with:
           build-release: ${{ needs.branch_build_setup.outputs.build_release }}
           build-prerelease: ${{ needs.branch_build_setup.outputs.build_prerelease }}
@@ -274,7 +274,7 @@ jobs:
         name: Checkout Files
         uses: actions/checkout@v4
       - name: Backend Build and Push
-        uses: ./.github/actions/build-push-ce
+        uses: ./.github/actions/buildpush-action
         with:
           build-release: ${{ needs.branch_build_setup.outputs.build_release }}
           build-prerelease: ${{ needs.branch_build_setup.outputs.build_prerelease }}
@@ -300,7 +300,7 @@ jobs:
         name: Checkout Files
         uses: actions/checkout@v4
       - name: Proxy Build and Push
-        uses: ./.github/actions/build-push-ce
+        uses: ./.github/actions/buildpush-action
         with:
           build-release: ${{ needs.branch_build_setup.outputs.build_release }}
           build-prerelease: ${{ needs.branch_build_setup.outputs.build_prerelease }}
@@ -320,7 +320,7 @@ jobs:
     if: ${{ needs.branch_build_setup.outputs.build_type == 'Build' }}
     name: Attach Assets to Build
     runs-on: ubuntu-20.04
-    needs: [branch_build_setup]
+    needs: [ branch_build_setup ]
     steps:
       - name: Checkout
         uses: actions/checkout@v4
@@ -340,7 +340,7 @@ jobs:
             ${{ github.workspace }}/deploy/selfhost/restore.sh
             ${{ github.workspace }}/deploy/selfhost/docker-compose.yml
             ${{ github.workspace }}/deploy/selfhost/variables.env
-
+ 
   publish_release:
     if: ${{ needs.branch_build_setup.outputs.build_type == 'Release' }}
     name: Build Release
@@ -353,7 +353,7 @@ jobs:
         branch_build_push_space,
         branch_build_push_live,
         branch_build_push_apiserver,
-        branch_build_push_proxy,
+        branch_build_push_proxy
       ]
     env:
       REL_VERSION: ${{ needs.branch_build_setup.outputs.release_version }}
@@ -367,7 +367,7 @@ jobs:
 
       - name: Create Release
         id: create_release
-        uses: softprops/action-gh-release@v2.1.0
+        uses: softprops/action-gh-release@v2.0.8
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} # This token is provided by Actions, you do not need to create your own token
         with:
@@ -380,4 +380,4 @@ jobs:
             ${{ github.workspace }}/deploy/selfhost/setup.sh
             ${{ github.workspace }}/deploy/selfhost/restore.sh
             ${{ github.workspace }}/deploy/selfhost/docker-compose.yml
-            ${{ github.workspace }}/deploy/selfhost/variables.env
+            ${{ github.workspace }}/deploy/selfhost/variables.env

.github/workflows/codeql.yml

@@ -29,11 +29,11 @@ jobs:
 
     steps:
       - name: Checkout repository
-        uses: actions/checkout@v4
+        uses: actions/checkout@v3
 
       # Initializes the CodeQL tools for scanning.
       - name: Initialize CodeQL
-        uses: github/codeql-action/init@v3
+        uses: github/codeql-action/init@v2
         with:
           languages: ${{ matrix.language }}
           # If you wish to specify custom queries, you can do so here or in a config file.
@@ -46,7 +46,7 @@ jobs:
       # Autobuild attempts to build any compiled languages (C/C++, C#, Go, Java, or Swift).
       # If this step fails, then you should remove it and run the build manually (see below)
       - name: Autobuild
-        uses: github/codeql-action/autobuild@v3
+        uses: github/codeql-action/autobuild@v2
 
       # ℹ️ Command-line programs to run using the OS shell.
       # 📚 See https://docs.github.com/en/actions/using-workflows/workflow-syntax-for-github-actions#jobsjob_idstepsrun
@@ -59,6 +59,6 @@ jobs:
       #     ./location_of_script_within_repo/buildscript.sh
 
       - name: Perform CodeQL Analysis
-        uses: github/codeql-action/analyze@v3
+        uses: github/codeql-action/analyze@v2
         with:
           category: "/language:${{matrix.language}}"

.github/workflows/feature-deployment.yml

@@ -79,7 +79,7 @@ jobs:
         uses: actions/checkout@v4
 
       - name: Build and Push to Docker Hub
-        uses: docker/build-push-action@v6.9.0
+        uses: docker/build-push-action@v5.1.0
         with:
           context: .
           file: ./aio/Dockerfile-app

.github/workflows/sync-repo-pr.yml

@@ -21,7 +21,7 @@ jobs:
       contents: write
     steps:
       - name: Checkout code
-        uses: actions/checkout@v4
+        uses: actions/checkout@v4.1.1
         with:
           fetch-depth: 0 # Fetch all history for all branches and tags
 

.github/workflows/sync-repo.yml

@@ -17,7 +17,7 @@ jobs:
       contents: read
     steps:
       - name: Checkout Code
-        uses: actions/checkout@v4
+        uses: actions/checkout@v4.1.1
         with:
           persist-credentials: false
           fetch-depth: 0

admin/package.json

@@ -41,7 +41,7 @@
     "@plane/eslint-config": "*",
     "@plane/typescript-config": "*",
     "@types/node": "18.16.1",
-    "@types/react": "^18.3.11",
+    "@types/react": "^18.2.48",
     "@types/react-dom": "^18.2.18",
     "@types/uuid": "^9.0.8",
     "@types/zxcvbn": "^4.4.4",

apiserver/.env.example

@@ -57,6 +57,5 @@ ADMIN_BASE_URL=
 SPACE_BASE_URL=
 APP_BASE_URL=
 
-
 # Hard delete files after days
-HARD_DELETE_AFTER_DAYS=60
+HARD_DELETE_AFTER_DAYS=60

apiserver/Dockerfile.api

@@ -4,7 +4,6 @@ FROM python:3.12.5-alpine AS backend
 ENV PYTHONDONTWRITEBYTECODE 1
 ENV PYTHONUNBUFFERED 1
 ENV PIP_DISABLE_PIP_VERSION_CHECK=1 
-ENV INSTANCE_CHANGELOG_URL https://api.plane.so/api/public/anchor/8e1c2e4c7bc5493eb7731be3862f6960/pages/
 
 WORKDIR /code
 

apiserver/Dockerfile.dev

@@ -4,7 +4,6 @@ FROM python:3.12.5-alpine AS backend
 ENV PYTHONDONTWRITEBYTECODE 1
 ENV PYTHONUNBUFFERED 1
 ENV PIP_DISABLE_PIP_VERSION_CHECK=1 
-ENV INSTANCE_CHANGELOG_URL https://api.plane.so/api/public/anchor/8e1c2e4c7bc5493eb7731be3862f6960/pages/
 
 RUN apk --no-cache add \
     "bash~=5.2" \

apiserver/plane/api/serializers/__init__.py

@@ -18,4 +18,4 @@ from .module import (
     ModuleIssueSerializer,
     ModuleLiteSerializer,
 )
-from .intake import IntakeIssueSerializer
+from .inbox import InboxIssueSerializer

apiserver/plane/api/serializers/inbox.py

@@ -1,17 +1,15 @@
 # Module improts
 from .base import BaseSerializer
 from .issue import IssueExpandSerializer
-from plane.db.models import IntakeIssue
-from rest_framework import serializers
+from plane.db.models import InboxIssue
 
 
-class IntakeIssueSerializer(BaseSerializer):
+class InboxIssueSerializer(BaseSerializer):
 
     issue_detail = IssueExpandSerializer(read_only=True, source="issue")
-    inbox = serializers.UUIDField(source="intake.id", read_only=True)
 
     class Meta:
-        model = IntakeIssue
+        model = InboxIssue
         fields = "__all__"
         read_only_fields = [
             "id",

apiserver/plane/api/serializers/issue.py

@@ -212,7 +212,7 @@ class IssueSerializer(BaseSerializer):
         updated_by_id = instance.updated_by_id
 
         if assignees is not None:
-            IssueAssignee.objects.filter(issue=instance).delete()
+            IssueAssignee.objects.filter(issue=instance).delete(soft=False)
             IssueAssignee.objects.bulk_create(
                 [
                     IssueAssignee(
@@ -229,7 +229,7 @@ class IssueSerializer(BaseSerializer):
             )
 
         if labels is not None:
-            IssueLabel.objects.filter(issue=instance).delete()
+            IssueLabel.objects.filter(issue=instance).delete(soft=False)
             IssueLabel.objects.bulk_create(
                 [
                     IssueLabel(

apiserver/plane/api/serializers/project.py

@@ -20,7 +20,6 @@ class ProjectSerializer(BaseSerializer):
     member_role = serializers.IntegerField(read_only=True)
     is_deployed = serializers.BooleanField(read_only=True)
     cover_image_url = serializers.CharField(read_only=True)
-    inbox_view = serializers.BooleanField(read_only=True, source="intake_view")
 
     class Meta:
         model = Project

apiserver/plane/api/urls/__init__.py

@@ -3,7 +3,7 @@ from .state import urlpatterns as state_patterns
 from .issue import urlpatterns as issue_patterns
 from .cycle import urlpatterns as cycle_patterns
 from .module import urlpatterns as module_patterns
-from .intake import urlpatterns as intake_patterns
+from .inbox import urlpatterns as inbox_patterns
 from .member import urlpatterns as member_patterns
 
 urlpatterns = [
@@ -12,6 +12,6 @@ urlpatterns = [
     *issue_patterns,
     *cycle_patterns,
     *module_patterns,
-    *intake_patterns,
+    *inbox_patterns,
     *member_patterns,
 ]

apiserver/plane/api/urls/inbox.py

@@ -0,0 +1,17 @@
+from django.urls import path
+
+from plane.api.views import InboxIssueAPIEndpoint
+
+
+urlpatterns = [
+    path(
+        "workspaces/<str:slug>/projects/<uuid:project_id>/inbox-issues/",
+        InboxIssueAPIEndpoint.as_view(),
+        name="inbox-issue",
+    ),
+    path(
+        "workspaces/<str:slug>/projects/<uuid:project_id>/inbox-issues/<uuid:issue_id>/",
+        InboxIssueAPIEndpoint.as_view(),
+        name="inbox-issue",
+    ),
+]

apiserver/plane/api/urls/intake.py

@@ -1,27 +0,0 @@
-from django.urls import path
-
-from plane.api.views import IntakeIssueAPIEndpoint
-
-
-urlpatterns = [
-    path(
-        "workspaces/<str:slug>/projects/<uuid:project_id>/inbox-issues/",
-        IntakeIssueAPIEndpoint.as_view(),
-        name="inbox-issue",
-    ),
-    path(
-        "workspaces/<str:slug>/projects/<uuid:project_id>/inbox-issues/<uuid:issue_id>/",
-        IntakeIssueAPIEndpoint.as_view(),
-        name="inbox-issue",
-    ),
-    path(
-        "workspaces/<str:slug>/projects/<uuid:project_id>/intake-issues/",
-        IntakeIssueAPIEndpoint.as_view(),
-        name="intake-issue",
-    ),
-    path(
-        "workspaces/<str:slug>/projects/<uuid:project_id>/intake-issues/<uuid:issue_id>/",
-        IntakeIssueAPIEndpoint.as_view(),
-        name="intake-issue",
-    ),
-]

apiserver/plane/api/views/__init__.py

@@ -27,4 +27,5 @@ from .module import (
 
 from .member import ProjectMemberAPIEndpoint
 
-from .intake import IntakeIssueAPIEndpoint
+from .inbox import InboxIssueAPIEndpoint
+

apiserver/plane/api/views/cycle.py

@@ -78,7 +78,6 @@ class CycleAPIEndpoint(BaseAPIView):
                     filter=Q(
                         issue_cycle__issue__archived_at__isnull=True,
                         issue_cycle__issue__is_draft=False,
-                        issue_cycle__deleted_at__isnull=True,
                     ),
                 )
             )
@@ -89,7 +88,6 @@ class CycleAPIEndpoint(BaseAPIView):
                         issue_cycle__issue__state__group="completed",
                         issue_cycle__issue__archived_at__isnull=True,
                         issue_cycle__issue__is_draft=False,
-                        issue_cycle__deleted_at__isnull=True,
                     ),
                 )
             )
@@ -100,7 +98,6 @@ class CycleAPIEndpoint(BaseAPIView):
                         issue_cycle__issue__state__group="cancelled",
                         issue_cycle__issue__archived_at__isnull=True,
                         issue_cycle__issue__is_draft=False,
-                        issue_cycle__deleted_at__isnull=True,
                     ),
                 )
             )
@@ -111,7 +108,6 @@ class CycleAPIEndpoint(BaseAPIView):
                         issue_cycle__issue__state__group="started",
                         issue_cycle__issue__archived_at__isnull=True,
                         issue_cycle__issue__is_draft=False,
-                        issue_cycle__deleted_at__isnull=True,
                     ),
                 )
             )
@@ -122,7 +118,6 @@ class CycleAPIEndpoint(BaseAPIView):
                         issue_cycle__issue__state__group="unstarted",
                         issue_cycle__issue__archived_at__isnull=True,
                         issue_cycle__issue__is_draft=False,
-                        issue_cycle__deleted_at__isnull=True,
                     ),
                 )
             )
@@ -133,7 +128,6 @@ class CycleAPIEndpoint(BaseAPIView):
                         issue_cycle__issue__state__group="backlog",
                         issue_cycle__issue__archived_at__isnull=True,
                         issue_cycle__issue__is_draft=False,
-                        issue_cycle__deleted_at__isnull=True,
                     ),
                 )
             )
@@ -410,7 +404,7 @@ class CycleAPIEndpoint(BaseAPIView):
             epoch=int(timezone.now().timestamp()),
         )
         # Delete the cycle
-        cycle.delete()
+        cycle.delete(soft=False)
         # Delete the user favorite cycle
         UserFavorite.objects.filter(
             entity_type="cycle",
@@ -443,7 +437,6 @@ class CycleArchiveUnarchiveAPIEndpoint(BaseAPIView):
                     filter=Q(
                         issue_cycle__issue__archived_at__isnull=True,
                         issue_cycle__issue__is_draft=False,
-                        issue_cycle__deleted_at__isnull=True,
                     ),
                 )
             )
@@ -454,7 +447,6 @@ class CycleArchiveUnarchiveAPIEndpoint(BaseAPIView):
                         issue_cycle__issue__state__group="completed",
                         issue_cycle__issue__archived_at__isnull=True,
                         issue_cycle__issue__is_draft=False,
-                        issue_cycle__deleted_at__isnull=True,
                     ),
                 )
             )
@@ -465,7 +457,6 @@ class CycleArchiveUnarchiveAPIEndpoint(BaseAPIView):
                         issue_cycle__issue__state__group="cancelled",
                         issue_cycle__issue__archived_at__isnull=True,
                         issue_cycle__issue__is_draft=False,
-                        issue_cycle__deleted_at__isnull=True,
                     ),
                 )
             )
@@ -476,7 +467,6 @@ class CycleArchiveUnarchiveAPIEndpoint(BaseAPIView):
                         issue_cycle__issue__state__group="started",
                         issue_cycle__issue__archived_at__isnull=True,
                         issue_cycle__issue__is_draft=False,
-                        issue_cycle__deleted_at__isnull=True,
                     ),
                 )
             )
@@ -487,7 +477,6 @@ class CycleArchiveUnarchiveAPIEndpoint(BaseAPIView):
                         issue_cycle__issue__state__group="unstarted",
                         issue_cycle__issue__archived_at__isnull=True,
                         issue_cycle__issue__is_draft=False,
-                        issue_cycle__deleted_at__isnull=True,
                     ),
                 )
             )
@@ -498,7 +487,6 @@ class CycleArchiveUnarchiveAPIEndpoint(BaseAPIView):
                         issue_cycle__issue__state__group="backlog",
                         issue_cycle__issue__archived_at__isnull=True,
                         issue_cycle__issue__is_draft=False,
-                        issue_cycle__deleted_at__isnull=True,
                     ),
                 )
             )
@@ -512,7 +500,6 @@ class CycleArchiveUnarchiveAPIEndpoint(BaseAPIView):
                         issue_cycle__issue__state__group="completed",
                         issue_cycle__issue__archived_at__isnull=True,
                         issue_cycle__issue__is_draft=False,
-                        issue_cycle__deleted_at__isnull=True,
                     ),
                 )
             )
@@ -523,7 +510,6 @@ class CycleArchiveUnarchiveAPIEndpoint(BaseAPIView):
                         issue_cycle__issue__state__group="started",
                         issue_cycle__issue__archived_at__isnull=True,
                         issue_cycle__issue__is_draft=False,
-                        issue_cycle__deleted_at__isnull=True,
                     ),
                 )
             )
@@ -629,10 +615,7 @@ class CycleIssueAPIEndpoint(BaseAPIView):
         # List
         order_by = request.GET.get("order_by", "created_at")
         issues = (
-            Issue.issue_objects.filter(
-                issue_cycle__cycle_id=cycle_id,
-                issue_cycle__deleted_at__isnull=True,
-            )
+            Issue.issue_objects.filter(issue_cycle__cycle_id=cycle_id)
             .annotate(
                 sub_issues_count=Issue.issue_objects.filter(
                     parent=OuterRef("id")
@@ -829,7 +812,6 @@ class TransferCycleIssueAPIEndpoint(BaseAPIView):
                     filter=Q(
                         issue_cycle__issue__archived_at__isnull=True,
                         issue_cycle__issue__is_draft=False,
-                        issue_cycle__deleted_at__isnull=True,
                     ),
                 )
             )
@@ -840,7 +822,6 @@ class TransferCycleIssueAPIEndpoint(BaseAPIView):
                         issue_cycle__issue__state__group="completed",
                         issue_cycle__issue__archived_at__isnull=True,
                         issue_cycle__issue__is_draft=False,
-                        issue_cycle__deleted_at__isnull=True,
                     ),
                 )
             )
@@ -851,7 +832,6 @@ class TransferCycleIssueAPIEndpoint(BaseAPIView):
                         issue_cycle__issue__state__group="cancelled",
                         issue_cycle__issue__archived_at__isnull=True,
                         issue_cycle__issue__is_draft=False,
-                        issue_cycle__deleted_at__isnull=True,
                     ),
                 )
             )
@@ -862,7 +842,6 @@ class TransferCycleIssueAPIEndpoint(BaseAPIView):
                         issue_cycle__issue__state__group="started",
                         issue_cycle__issue__archived_at__isnull=True,
                         issue_cycle__issue__is_draft=False,
-                        issue_cycle__deleted_at__isnull=True,
                     ),
                 )
             )
@@ -873,7 +852,6 @@ class TransferCycleIssueAPIEndpoint(BaseAPIView):
                         issue_cycle__issue__state__group="unstarted",
                         issue_cycle__issue__archived_at__isnull=True,
                         issue_cycle__issue__is_draft=False,
-                        issue_cycle__deleted_at__isnull=True,
                     ),
                 )
             )
@@ -884,7 +862,6 @@ class TransferCycleIssueAPIEndpoint(BaseAPIView):
                         issue_cycle__issue__state__group="backlog",
                         issue_cycle__issue__archived_at__isnull=True,
                         issue_cycle__issue__is_draft=False,
-                        issue_cycle__deleted_at__isnull=True,
                     ),
                 )
             )
@@ -901,7 +878,6 @@ class TransferCycleIssueAPIEndpoint(BaseAPIView):
             assignee_estimate_data = (
                 Issue.issue_objects.filter(
                     issue_cycle__cycle_id=cycle_id,
-                    issue_cycle__deleted_at__isnull=True,
                     workspace__slug=slug,
                     project_id=project_id,
                 )
@@ -977,7 +953,6 @@ class TransferCycleIssueAPIEndpoint(BaseAPIView):
             label_distribution_data = (
                 Issue.issue_objects.filter(
                     issue_cycle__cycle_id=cycle_id,
-                    issue_cycle__deleted_at__isnull=True,
                     workspace__slug=slug,
                     project_id=project_id,
                 )
@@ -1039,7 +1014,6 @@ class TransferCycleIssueAPIEndpoint(BaseAPIView):
         assignee_distribution = (
             Issue.issue_objects.filter(
                 issue_cycle__cycle_id=cycle_id,
-                issue_cycle__deleted_at__isnull=True,
                 workspace__slug=slug,
                 project_id=project_id,
             )
@@ -1118,7 +1092,6 @@ class TransferCycleIssueAPIEndpoint(BaseAPIView):
         label_distribution = (
             Issue.issue_objects.filter(
                 issue_cycle__cycle_id=cycle_id,
-                issue_cycle__deleted_at__isnull=True,
                 workspace__slug=slug,
                 project_id=project_id,
             )

apiserver/plane/api/views/inbox.py

@@ -14,12 +14,12 @@ from rest_framework import status
 from rest_framework.response import Response
 
 # Module imports
-from plane.api.serializers import IntakeIssueSerializer, IssueSerializer
+from plane.api.serializers import InboxIssueSerializer, IssueSerializer
 from plane.app.permissions import ProjectLitePermission
 from plane.bgtasks.issue_activities_task import issue_activity
 from plane.db.models import (
-    Intake,
-    IntakeIssue,
+    Inbox,
+    InboxIssue,
     Issue,
     Project,
     ProjectMember,
@@ -29,10 +29,10 @@ from plane.db.models import (
 from .base import BaseAPIView
 
 
-class IntakeIssueAPIEndpoint(BaseAPIView):
+class InboxIssueAPIEndpoint(BaseAPIView):
     """
     This viewset automatically provides `list`, `create`, `retrieve`,
-    `update` and `destroy` actions related to intake issues.
+    `update` and `destroy` actions related to inbox issues.
 
     """
 
@@ -40,15 +40,15 @@ class IntakeIssueAPIEndpoint(BaseAPIView):
         ProjectLitePermission,
     ]
 
-    serializer_class = IntakeIssueSerializer
-    model = IntakeIssue
+    serializer_class = InboxIssueSerializer
+    model = InboxIssue
 
     filterset_fields = [
         "status",
     ]
 
     def get_queryset(self):
-        intake = Intake.objects.filter(
+        inbox = Inbox.objects.filter(
             workspace__slug=self.kwargs.get("slug"),
             project_id=self.kwargs.get("project_id"),
         ).first()
@@ -58,16 +58,16 @@ class IntakeIssueAPIEndpoint(BaseAPIView):
             pk=self.kwargs.get("project_id"),
         )
 
-        if intake is None and not project.intake_view:
-            return IntakeIssue.objects.none()
+        if inbox is None and not project.inbox_view:
+            return InboxIssue.objects.none()
 
         return (
-            IntakeIssue.objects.filter(
+            InboxIssue.objects.filter(
                 Q(snoozed_till__gte=timezone.now())
                 | Q(snoozed_till__isnull=True),
                 workspace__slug=self.kwargs.get("slug"),
                 project_id=self.kwargs.get("project_id"),
-                intake_id=intake.id,
+                inbox_id=inbox.id,
             )
             .select_related("issue", "workspace", "project")
             .order_by(self.kwargs.get("order_by", "-created_at"))
@@ -75,22 +75,22 @@ class IntakeIssueAPIEndpoint(BaseAPIView):
 
     def get(self, request, slug, project_id, issue_id=None):
         if issue_id:
-            intake_issue_queryset = self.get_queryset().get(issue_id=issue_id)
-            intake_issue_data = IntakeIssueSerializer(
-                intake_issue_queryset,
+            inbox_issue_queryset = self.get_queryset().get(issue_id=issue_id)
+            inbox_issue_data = InboxIssueSerializer(
+                inbox_issue_queryset,
                 fields=self.fields,
                 expand=self.expand,
             ).data
             return Response(
-                intake_issue_data,
+                inbox_issue_data,
                 status=status.HTTP_200_OK,
             )
         issue_queryset = self.get_queryset()
         return self.paginate(
             request=request,
             queryset=(issue_queryset),
-            on_results=lambda intake_issues: IntakeIssueSerializer(
-                intake_issues,
+            on_results=lambda inbox_issues: InboxIssueSerializer(
+                inbox_issues,
                 many=True,
                 fields=self.fields,
                 expand=self.expand,
@@ -104,7 +104,7 @@ class IntakeIssueAPIEndpoint(BaseAPIView):
                 status=status.HTTP_400_BAD_REQUEST,
             )
 
-        intake = Intake.objects.filter(
+        inbox = Inbox.objects.filter(
             workspace__slug=slug, project_id=project_id
         ).first()
 
@@ -113,11 +113,11 @@ class IntakeIssueAPIEndpoint(BaseAPIView):
             pk=project_id,
         )
 
-        # Intake view
-        if intake is None and not project.intake_view:
+        # Inbox view
+        if inbox is None and not project.inbox_view:
             return Response(
                 {
-                    "error": "Intake is not enabled for this project enable it through the project's api"
+                    "error": "Inbox is not enabled for this project enable it through the project's api"
                 },
                 status=status.HTTP_400_BAD_REQUEST,
             )
@@ -139,7 +139,7 @@ class IntakeIssueAPIEndpoint(BaseAPIView):
         state, _ = State.objects.get_or_create(
             name="Triage",
             group="triage",
-            description="Default state for managing all Intake Issues",
+            description="Default state for managing all Inbox Issues",
             project_id=project_id,
             color="#ff7700",
             is_triage=True,
@@ -157,12 +157,12 @@ class IntakeIssueAPIEndpoint(BaseAPIView):
             state=state,
         )
 
-        # create an intake issue
-        intake_issue = IntakeIssue.objects.create(
-            intake_id=intake.id,
+        # create an inbox issue
+        inbox_issue = InboxIssue.objects.create(
+            inbox_id=inbox.id,
             project_id=project_id,
             issue=issue,
-            source=request.data.get("source", "IN-APP"),
+            source=request.data.get("source", "in-app"),
         )
         # Create an Issue Activity
         issue_activity.delay(
@@ -173,37 +173,32 @@ class IntakeIssueAPIEndpoint(BaseAPIView):
             project_id=str(project_id),
             current_instance=None,
             epoch=int(timezone.now().timestamp()),
-            intake=str(intake_issue.id),
+            inbox=str(inbox_issue.id),
         )
 
-        serializer = IntakeIssueSerializer(intake_issue)
+        serializer = InboxIssueSerializer(inbox_issue)
         return Response(serializer.data, status=status.HTTP_200_OK)
 
     def patch(self, request, slug, project_id, issue_id):
-        intake = Intake.objects.filter(
+        inbox = Inbox.objects.filter(
             workspace__slug=slug, project_id=project_id
         ).first()
 
-        project = Project.objects.get(
-            workspace__slug=slug,
-            pk=project_id,
-        )
-
-        # Intake view
-        if intake is None and not project.intake_view:
+        # Inbox view
+        if inbox is None:
             return Response(
                 {
-                    "error": "Intake is not enabled for this project enable it through the project's api"
+                    "error": "Inbox is not enabled for this project enable it through the project's api"
                 },
                 status=status.HTTP_400_BAD_REQUEST,
             )
 
-        # Get the intake issue
-        intake_issue = IntakeIssue.objects.get(
+        # Get the inbox issue
+        inbox_issue = InboxIssue.objects.get(
             issue_id=issue_id,
             workspace__slug=slug,
             project_id=project_id,
-            intake_id=intake.id,
+            inbox_id=inbox.id,
         )
 
         # Get the project member
@@ -215,11 +210,11 @@ class IntakeIssueAPIEndpoint(BaseAPIView):
         )
 
         # Only project members admins and created_by users can access this endpoint
-        if project_member.role <= 5 and str(intake_issue.created_by_id) != str(
+        if project_member.role <= 5 and str(inbox_issue.created_by_id) != str(
             request.user.id
         ):
             return Response(
-                {"error": "You cannot edit intake issues"},
+                {"error": "You cannot edit inbox issues"},
                 status=status.HTTP_400_BAD_REQUEST,
             )
 
@@ -232,10 +227,7 @@ class IntakeIssueAPIEndpoint(BaseAPIView):
                     ArrayAgg(
                         "labels__id",
                         distinct=True,
-                        filter=Q(
-                            ~Q(labels__id__isnull=True)
-                            & Q(label_issue__deleted_at__isnull=True),
-                        ),
+                        filter=~Q(labels__id__isnull=True),
                     ),
                     Value([], output_field=ArrayField(UUIDField())),
                 ),
@@ -243,11 +235,7 @@ class IntakeIssueAPIEndpoint(BaseAPIView):
                     ArrayAgg(
                         "assignees__id",
                         distinct=True,
-                        filter=Q(
-                            ~Q(assignees__id__isnull=True)
-                            & Q(assignees__member_project__is_active=True)
-                            & Q(issue_assignee__deleted_at__isnull=True)
-                        ),
+                        filter=~Q(assignees__id__isnull=True),
                     ),
                     Value([], output_field=ArrayField(UUIDField())),
                 ),
@@ -288,7 +276,7 @@ class IntakeIssueAPIEndpoint(BaseAPIView):
                             cls=DjangoJSONEncoder,
                         ),
                         epoch=int(timezone.now().timestamp()),
-                        intake=(intake_issue.id),
+                        inbox=(inbox_issue.id),
                     )
                 issue_serializer.save()
             else:
@@ -296,13 +284,13 @@ class IntakeIssueAPIEndpoint(BaseAPIView):
                     issue_serializer.errors, status=status.HTTP_400_BAD_REQUEST
                 )
 
-        # Only project admins and members can edit intake issue attributes
+        # Only project admins and members can edit inbox issue attributes
         if project_member.role > 15:
-            serializer = IntakeIssueSerializer(
-                intake_issue, data=request.data, partial=True
+            serializer = InboxIssueSerializer(
+                inbox_issue, data=request.data, partial=True
             )
             current_instance = json.dumps(
-                IntakeIssueSerializer(intake_issue).data, cls=DjangoJSONEncoder
+                InboxIssueSerializer(inbox_issue).data, cls=DjangoJSONEncoder
             )
 
             if serializer.is_valid():
@@ -345,7 +333,7 @@ class IntakeIssueAPIEndpoint(BaseAPIView):
 
                 # create a activity for status change
                 issue_activity.delay(
-                    type="intake.activity.created",
+                    type="inbox.activity.created",
                     requested_data=json.dumps(
                         request.data, cls=DjangoJSONEncoder
                     ),
@@ -356,7 +344,7 @@ class IntakeIssueAPIEndpoint(BaseAPIView):
                     epoch=int(timezone.now().timestamp()),
                     notification=False,
                     origin=request.META.get("HTTP_ORIGIN"),
-                    intake=str(intake_issue.id),
+                    inbox=str(inbox_issue.id),
                 )
 
                 return Response(serializer.data, status=status.HTTP_200_OK)
@@ -365,12 +353,12 @@ class IntakeIssueAPIEndpoint(BaseAPIView):
             )
         else:
             return Response(
-                IntakeIssueSerializer(intake_issue).data,
+                InboxIssueSerializer(inbox_issue).data,
                 status=status.HTTP_200_OK,
             )
 
     def delete(self, request, slug, project_id, issue_id):
-        intake = Intake.objects.filter(
+        inbox = Inbox.objects.filter(
             workspace__slug=slug, project_id=project_id
         ).first()
 
@@ -379,25 +367,25 @@ class IntakeIssueAPIEndpoint(BaseAPIView):
             pk=project_id,
         )
 
-        # Intake view
-        if intake is None and not project.intake_view:
+        # Inbox view
+        if inbox is None and not project.inbox_view:
             return Response(
                 {
-                    "error": "Intake is not enabled for this project enable it through the project's api"
+                    "error": "Inbox is not enabled for this project enable it through the project's api"
                 },
                 status=status.HTTP_400_BAD_REQUEST,
             )
 
-        # Get the intake issue
-        intake_issue = IntakeIssue.objects.get(
+        # Get the inbox issue
+        inbox_issue = InboxIssue.objects.get(
             issue_id=issue_id,
             workspace__slug=slug,
             project_id=project_id,
-            intake_id=intake.id,
+            inbox_id=inbox.id,
         )
 
         # Check the issue status
-        if intake_issue.status in [-2, -1, 0, 2]:
+        if inbox_issue.status in [-2, -1, 0, 2]:
             # Delete the issue also
             issue = Issue.objects.filter(
                 workspace__slug=slug, project_id=project_id, pk=issue_id
@@ -417,5 +405,5 @@ class IntakeIssueAPIEndpoint(BaseAPIView):
                 )
             issue.delete()
 
-        intake_issue.delete()
+        inbox_issue.delete()
         return Response(status=status.HTTP_204_NO_CONTENT)

apiserver/plane/api/views/issue.py

@@ -16,7 +16,6 @@ from django.db.models import (
     Q,
     Value,
     When,
-    Subquery,
 )
 from django.utils import timezone
 
@@ -49,7 +48,6 @@ from plane.db.models import (
     Label,
     Project,
     ProjectMember,
-    CycleIssue,
 )
 
 from .base import BaseAPIView
@@ -205,10 +203,12 @@ class IssueAPIEndpoint(BaseAPIView):
         issue_queryset = (
             self.get_queryset()
             .annotate(
-                cycle_id=Subquery(
-                    CycleIssue.objects.filter(
-                        issue=OuterRef("id"), deleted_at__isnull=True
-                    ).values("cycle_id")[:1]
+                cycle_id=Case(
+                    When(
+                        Q(issue_cycle__cycle__deleted_at__isnull=True),
+                        then=F("issue_cycle__cycle_id"),
+                    ),
+                    default=None,
                 )
             )
             .annotate(

apiserver/plane/api/views/module.py

@@ -71,7 +71,6 @@ class ModuleAPIEndpoint(BaseAPIView):
                     filter=Q(
                         issue_module__issue__archived_at__isnull=True,
                         issue_module__issue__is_draft=False,
-                        issue_module__deleted_at__isnull=True,
                     ),
                     distinct=True,
                 ),
@@ -83,7 +82,6 @@ class ModuleAPIEndpoint(BaseAPIView):
                         issue_module__issue__state__group="completed",
                         issue_module__issue__archived_at__isnull=True,
                         issue_module__issue__is_draft=False,
-                        issue_module__deleted_at__isnull=True,
                     ),
                     distinct=True,
                 )
@@ -95,7 +93,6 @@ class ModuleAPIEndpoint(BaseAPIView):
                         issue_module__issue__state__group="cancelled",
                         issue_module__issue__archived_at__isnull=True,
                         issue_module__issue__is_draft=False,
-                        issue_module__deleted_at__isnull=True,
                     ),
                     distinct=True,
                 )
@@ -107,7 +104,6 @@ class ModuleAPIEndpoint(BaseAPIView):
                         issue_module__issue__state__group="started",
                         issue_module__issue__archived_at__isnull=True,
                         issue_module__issue__is_draft=False,
-                        issue_module__deleted_at__isnull=True,
                     ),
                     distinct=True,
                 )
@@ -119,7 +115,6 @@ class ModuleAPIEndpoint(BaseAPIView):
                         issue_module__issue__state__group="unstarted",
                         issue_module__issue__archived_at__isnull=True,
                         issue_module__issue__is_draft=False,
-                        issue_module__deleted_at__isnull=True,
                     ),
                     distinct=True,
                 )
@@ -131,7 +126,6 @@ class ModuleAPIEndpoint(BaseAPIView):
                         issue_module__issue__state__group="backlog",
                         issue_module__issue__archived_at__isnull=True,
                         issue_module__issue__is_draft=False,
-                        issue_module__deleted_at__isnull=True,
                     ),
                     distinct=True,
                 )
@@ -373,10 +367,7 @@ class ModuleIssueAPIEndpoint(BaseAPIView):
     def get(self, request, slug, project_id, module_id):
         order_by = request.GET.get("order_by", "created_at")
         issues = (
-            Issue.issue_objects.filter(
-                issue_module__module_id=module_id,
-                issue_module__deleted_at__isnull=True,
-            )
+            Issue.issue_objects.filter(issue_module__module_id=module_id)
             .annotate(
                 sub_issues_count=Issue.issue_objects.filter(
                     parent=OuterRef("id")
@@ -561,7 +552,6 @@ class ModuleArchiveUnarchiveAPIEndpoint(BaseAPIView):
                     filter=Q(
                         issue_module__issue__archived_at__isnull=True,
                         issue_module__issue__is_draft=False,
-                        issue_module__deleted_at__isnull=True,
                     ),
                     distinct=True,
                 ),
@@ -573,7 +563,6 @@ class ModuleArchiveUnarchiveAPIEndpoint(BaseAPIView):
                         issue_module__issue__state__group="completed",
                         issue_module__issue__archived_at__isnull=True,
                         issue_module__issue__is_draft=False,
-                        issue_module__deleted_at__isnull=True,
                     ),
                     distinct=True,
                 )
@@ -585,7 +574,6 @@ class ModuleArchiveUnarchiveAPIEndpoint(BaseAPIView):
                         issue_module__issue__state__group="cancelled",
                         issue_module__issue__archived_at__isnull=True,
                         issue_module__issue__is_draft=False,
-                        issue_module__deleted_at__isnull=True,
                     ),
                     distinct=True,
                 )
@@ -597,7 +585,6 @@ class ModuleArchiveUnarchiveAPIEndpoint(BaseAPIView):
                         issue_module__issue__state__group="started",
                         issue_module__issue__archived_at__isnull=True,
                         issue_module__issue__is_draft=False,
-                        issue_module__deleted_at__isnull=True,
                     ),
                     distinct=True,
                 )
@@ -609,7 +596,6 @@ class ModuleArchiveUnarchiveAPIEndpoint(BaseAPIView):
                         issue_module__issue__state__group="unstarted",
                         issue_module__issue__archived_at__isnull=True,
                         issue_module__issue__is_draft=False,
-                        issue_module__deleted_at__isnull=True,
                     ),
                     distinct=True,
                 )
@@ -621,7 +607,6 @@ class ModuleArchiveUnarchiveAPIEndpoint(BaseAPIView):
                         issue_module__issue__state__group="backlog",
                         issue_module__issue__archived_at__isnull=True,
                         issue_module__issue__is_draft=False,
-                        issue_module__deleted_at__isnull=True,
                     ),
                     distinct=True,
                 )

apiserver/plane/api/views/project.py

@@ -18,7 +18,7 @@ from plane.app.permissions import ProjectBasePermission
 # Module imports
 from plane.db.models import (
     Cycle,
-    Intake,
+    Inbox,
     IssueUserProperty,
     Module,
     Project,
@@ -285,11 +285,6 @@ class ProjectAPIEndpoint(BaseAPIView):
             current_instance = json.dumps(
                 ProjectSerializer(project).data, cls=DjangoJSONEncoder
             )
-
-            intake_view = request.data.get(
-                "inbox_view", request.data.get("intake_view", False)
-            )
-
             if project.archived_at:
                 return Response(
                     {"error": "Archived project cannot be updated"},
@@ -298,24 +293,21 @@ class ProjectAPIEndpoint(BaseAPIView):
 
             serializer = ProjectSerializer(
                 project,
-                data={
-                    **request.data,
-                    "intake_view": intake_view,
-                },
+                data={**request.data},
                 context={"workspace_id": workspace.id},
                 partial=True,
             )
 
             if serializer.is_valid():
                 serializer.save()
-                if serializer.data["intake_view"]:
-                    intake = Intake.objects.filter(
+                if serializer.data["inbox_view"]:
+                    inbox = Inbox.objects.filter(
                         project=project,
                         is_default=True,
                     ).first()
-                    if not intake:
-                        Intake.objects.create(
-                            name=f"{project.name} Intake",
+                    if not inbox:
+                        Inbox.objects.create(
+                            name=f"{project.name} Inbox",
                             project=project,
                             is_default=True,
                         )
@@ -324,7 +316,7 @@ class ProjectAPIEndpoint(BaseAPIView):
                     State.objects.get_or_create(
                         name="Triage",
                         group="triage",
-                        description="Default state for managing all Intake Issues",
+                        description="Default state for managing all Inbox Issues",
                         project_id=pk,
                         color="#ff7700",
                         is_triage=True,

apiserver/plane/app/serializers/__init__.py

@@ -57,7 +57,7 @@ from .issue import (
     IssueFlatSerializer,
     IssueStateSerializer,
     IssueLinkSerializer,
-    IssueIntakeSerializer,
+    IssueInboxSerializer,
     IssueLiteSerializer,
     IssueAttachmentSerializer,
     IssueSubscriberSerializer,
@@ -102,12 +102,12 @@ from .estimate import (
     WorkspaceEstimateSerializer,
 )
 
-from .intake import (
-    IntakeSerializer,
-    IntakeIssueSerializer,
-    IssueStateIntakeSerializer,
-    IntakeIssueLiteSerializer,
-    IntakeIssueDetailSerializer,
+from .inbox import (
+    InboxSerializer,
+    InboxIssueSerializer,
+    IssueStateInboxSerializer,
+    InboxIssueLiteSerializer,
+    InboxIssueDetailSerializer,
 )
 
 from .analytic import AnalyticViewSerializer

apiserver/plane/app/serializers/base.py

@@ -49,47 +49,44 @@ class DynamicBaseSerializer(BaseSerializer):
                 allowed.append(list(item.keys())[0])
 
         for field in allowed:
-            if field not in self.fields:
-                from . import (
-                    WorkspaceLiteSerializer,
-                    ProjectLiteSerializer,
-                    UserLiteSerializer,
-                    StateLiteSerializer,
-                    IssueSerializer,
-                    LabelSerializer,
-                    CycleIssueSerializer,
-                    IssueLiteSerializer,
-                    IssueRelationSerializer,
-                    IntakeIssueLiteSerializer,
-                    IssueReactionLiteSerializer,
-                    IssueLinkLiteSerializer,
-                    RelatedIssueSerializer,
-                )
+            from . import (
+                WorkspaceLiteSerializer,
+                ProjectLiteSerializer,
+                UserLiteSerializer,
+                StateLiteSerializer,
+                IssueSerializer,
+                LabelSerializer,
+                CycleIssueSerializer,
+                IssueLiteSerializer,
+                IssueRelationSerializer,
+                InboxIssueLiteSerializer,
+                IssueReactionLiteSerializer,
+                IssueLinkLiteSerializer,
+            )
 
-                # Expansion mapper
-                expansion = {
-                    "user": UserLiteSerializer,
-                    "workspace": WorkspaceLiteSerializer,
-                    "project": ProjectLiteSerializer,
-                    "default_assignee": UserLiteSerializer,
-                    "project_lead": UserLiteSerializer,
-                    "state": StateLiteSerializer,
-                    "created_by": UserLiteSerializer,
-                    "issue": IssueSerializer,
-                    "actor": UserLiteSerializer,
-                    "owned_by": UserLiteSerializer,
-                    "members": UserLiteSerializer,
-                    "assignees": UserLiteSerializer,
-                    "labels": LabelSerializer,
-                    "issue_cycle": CycleIssueSerializer,
-                    "parent": IssueLiteSerializer,
-                    "issue_relation": IssueRelationSerializer,
-                    "issue_intake": IntakeIssueLiteSerializer,
-                    "issue_related": RelatedIssueSerializer,
-                    "issue_reactions": IssueReactionLiteSerializer,
-                    "issue_link": IssueLinkLiteSerializer,
-                    "sub_issues": IssueLiteSerializer,
-                }
+            # Expansion mapper
+            expansion = {
+                "user": UserLiteSerializer,
+                "workspace": WorkspaceLiteSerializer,
+                "project": ProjectLiteSerializer,
+                "default_assignee": UserLiteSerializer,
+                "project_lead": UserLiteSerializer,
+                "state": StateLiteSerializer,
+                "created_by": UserLiteSerializer,
+                "issue": IssueSerializer,
+                "actor": UserLiteSerializer,
+                "owned_by": UserLiteSerializer,
+                "members": UserLiteSerializer,
+                "assignees": UserLiteSerializer,
+                "labels": LabelSerializer,
+                "issue_cycle": CycleIssueSerializer,
+                "parent": IssueLiteSerializer,
+                "issue_relation": IssueRelationSerializer,
+                "issue_inbox": InboxIssueLiteSerializer,
+                "issue_reactions": IssueReactionLiteSerializer,
+                "issue_link": IssueLinkLiteSerializer,
+                "sub_issues": IssueLiteSerializer,
+            }
 
             if field not in self.fields and field in expansion:
                 self.fields[field] = expansion[field](
@@ -102,12 +99,11 @@ class DynamicBaseSerializer(BaseSerializer):
                             "labels",
                             "issue_cycle",
                             "issue_relation",
-                            "issue_intake",
+                            "issue_inbox",
                             "issue_reactions",
                             "issue_attachment",
                             "issue_link",
                             "sub_issues",
-                            "issue_related",
                         ]
                         else False
                     )
@@ -132,12 +128,11 @@ class DynamicBaseSerializer(BaseSerializer):
                         LabelSerializer,
                         CycleIssueSerializer,
                         IssueRelationSerializer,
-                        IntakeIssueLiteSerializer,
+                        InboxIssueLiteSerializer,
                         IssueLiteSerializer,
                         IssueReactionLiteSerializer,
                         IssueAttachmentLiteSerializer,
                         IssueLinkLiteSerializer,
-                        RelatedIssueSerializer,
                     )
 
                     # Expansion mapper
@@ -158,8 +153,7 @@ class DynamicBaseSerializer(BaseSerializer):
                         "issue_cycle": CycleIssueSerializer,
                         "parent": IssueLiteSerializer,
                         "issue_relation": IssueRelationSerializer,
-                        "issue_intake": IntakeIssueLiteSerializer,
-                        "issue_related": RelatedIssueSerializer,
+                        "issue_inbox": InboxIssueLiteSerializer,
                         "issue_reactions": IssueReactionLiteSerializer,
                         "issue_attachment": IssueAttachmentLiteSerializer,
                         "issue_link": IssueLinkLiteSerializer,

apiserver/plane/app/serializers/draft.py

@@ -169,7 +169,9 @@ class DraftIssueCreateSerializer(BaseSerializer):
         updated_by_id = instance.updated_by_id
 
         if assignees is not None:
-            DraftIssueAssignee.objects.filter(draft_issue=instance).delete()
+            DraftIssueAssignee.objects.filter(draft_issue=instance).delete(
+                soft=False
+            )
             DraftIssueAssignee.objects.bulk_create(
                 [
                     DraftIssueAssignee(
@@ -186,7 +188,9 @@ class DraftIssueCreateSerializer(BaseSerializer):
             )
 
         if labels is not None:
-            DraftIssueLabel.objects.filter(draft_issue=instance).delete()
+            DraftIssueLabel.objects.filter(draft_issue=instance).delete(
+                soft=False
+            )
             DraftIssueLabel.objects.bulk_create(
                 [
                     DraftIssueLabel(
@@ -204,7 +208,7 @@ class DraftIssueCreateSerializer(BaseSerializer):
 
         if cycle_id != "not_provided":
             DraftIssueCycle.objects.filter(draft_issue=instance).delete()
-            if cycle_id:
+            if cycle_id is not None:
                 DraftIssueCycle.objects.create(
                     cycle_id=cycle_id,
                     draft_issue=instance,

apiserver/plane/app/serializers/inbox.py

@@ -4,22 +4,22 @@ from rest_framework import serializers
 # Module imports
 from .base import BaseSerializer
 from .issue import (
-    IssueIntakeSerializer,
+    IssueInboxSerializer,
     LabelLiteSerializer,
     IssueDetailSerializer,
 )
 from .project import ProjectLiteSerializer
 from .state import StateLiteSerializer
 from .user import UserLiteSerializer
-from plane.db.models import Intake, IntakeIssue, Issue
+from plane.db.models import Inbox, InboxIssue, Issue
 
 
-class IntakeSerializer(BaseSerializer):
+class InboxSerializer(BaseSerializer):
     project_detail = ProjectLiteSerializer(source="project", read_only=True)
     pending_issue_count = serializers.IntegerField(read_only=True)
 
     class Meta:
-        model = Intake
+        model = Inbox
         fields = "__all__"
         read_only_fields = [
             "project",
@@ -27,11 +27,11 @@ class IntakeSerializer(BaseSerializer):
         ]
 
 
-class IntakeIssueSerializer(BaseSerializer):
-    issue = IssueIntakeSerializer(read_only=True)
+class InboxIssueSerializer(BaseSerializer):
+    issue = IssueInboxSerializer(read_only=True)
 
     class Meta:
-        model = IntakeIssue
+        model = InboxIssue
         fields = [
             "id",
             "status",
@@ -53,14 +53,14 @@ class IntakeIssueSerializer(BaseSerializer):
         return super().to_representation(instance)
 
 
-class IntakeIssueDetailSerializer(BaseSerializer):
+class InboxIssueDetailSerializer(BaseSerializer):
     issue = IssueDetailSerializer(read_only=True)
-    duplicate_issue_detail = IssueIntakeSerializer(
+    duplicate_issue_detail = IssueInboxSerializer(
         read_only=True, source="duplicate_to"
     )
 
     class Meta:
-        model = IntakeIssue
+        model = InboxIssue
         fields = [
             "id",
             "status",
@@ -85,14 +85,14 @@ class IntakeIssueDetailSerializer(BaseSerializer):
         return super().to_representation(instance)
 
 
-class IntakeIssueLiteSerializer(BaseSerializer):
+class InboxIssueLiteSerializer(BaseSerializer):
     class Meta:
-        model = IntakeIssue
+        model = InboxIssue
         fields = ["id", "status", "duplicate_to", "snoozed_till", "source"]
         read_only_fields = fields
 
 
-class IssueStateIntakeSerializer(BaseSerializer):
+class IssueStateInboxSerializer(BaseSerializer):
     state_detail = StateLiteSerializer(read_only=True, source="state")
     project_detail = ProjectLiteSerializer(read_only=True, source="project")
     label_details = LabelLiteSerializer(
@@ -102,7 +102,7 @@ class IssueStateIntakeSerializer(BaseSerializer):
         read_only=True, source="assignees", many=True
     )
     sub_issues_count = serializers.IntegerField(read_only=True)
-    issue_intake = IntakeIssueLiteSerializer(read_only=True, many=True)
+    issue_inbox = InboxIssueLiteSerializer(read_only=True, many=True)
 
     class Meta:
         model = Issue

apiserver/plane/app/serializers/issue.py

@@ -95,8 +95,6 @@ class IssueCreateSerializer(BaseSerializer):
         write_only=True,
         required=False,
     )
-    project_id = serializers.UUIDField(source="project.id", read_only=True)
-    workspace_id = serializers.UUIDField(source="workspace.id", read_only=True)
 
     class Meta:
         model = Issue
@@ -203,7 +201,7 @@ class IssueCreateSerializer(BaseSerializer):
         updated_by_id = instance.updated_by_id
 
         if assignees is not None:
-            IssueAssignee.objects.filter(issue=instance).delete()
+            IssueAssignee.objects.filter(issue=instance).delete(soft=False)
             IssueAssignee.objects.bulk_create(
                 [
                     IssueAssignee(
@@ -220,7 +218,7 @@ class IssueCreateSerializer(BaseSerializer):
             )
 
         if labels is not None:
-            IssueLabel.objects.filter(issue=instance).delete()
+            IssueLabel.objects.filter(issue=instance).delete(soft=False)
             IssueLabel.objects.bulk_create(
                 [
                     IssueLabel(
@@ -645,7 +643,7 @@ class IssueStateSerializer(DynamicBaseSerializer):
         fields = "__all__"
 
 
-class IssueIntakeSerializer(DynamicBaseSerializer):
+class IssueInboxSerializer(DynamicBaseSerializer):
     label_ids = serializers.ListField(
         child=serializers.UUIDField(),
         required=False,

apiserver/plane/app/serializers/notification.py

@@ -12,7 +12,6 @@ class NotificationSerializer(BaseSerializer):
         read_only=True, source="triggered_by"
     )
     is_inbox_issue = serializers.BooleanField(read_only=True)
-    is_intake_issue = serializers.BooleanField(read_only=True)
     is_mentioned_notification = serializers.BooleanField(read_only=True)
 
     class Meta:

apiserver/plane/app/serializers/project.py

@@ -22,7 +22,6 @@ class ProjectSerializer(BaseSerializer):
     workspace_detail = WorkspaceLiteSerializer(
         source="workspace", read_only=True
     )
-    inbox_view = serializers.BooleanField(read_only=True, source="intake_view")
 
     class Meta:
         model = Project
@@ -120,7 +119,6 @@ class ProjectListSerializer(DynamicBaseSerializer):
     anchor = serializers.CharField(read_only=True)
     members = serializers.SerializerMethodField()
     cover_image_url = serializers.CharField(read_only=True)
-    inbox_view = serializers.BooleanField(read_only=True, source="intake_view")
 
     def get_members(self, obj):
         project_members = getattr(obj, "members_list", None)

apiserver/plane/app/urls/__init__.py

@@ -5,7 +5,7 @@ from .cycle import urlpatterns as cycle_urls
 from .dashboard import urlpatterns as dashboard_urls
 from .estimate import urlpatterns as estimate_urls
 from .external import urlpatterns as external_urls
-from .intake import urlpatterns as intake_urls
+from .inbox import urlpatterns as inbox_urls
 from .issue import urlpatterns as issue_urls
 from .module import urlpatterns as module_urls
 from .notification import urlpatterns as notification_urls
@@ -25,7 +25,7 @@ urlpatterns = [
     *dashboard_urls,
     *estimate_urls,
     *external_urls,
-    *intake_urls,
+    *inbox_urls,
     *issue_urls,
     *module_urls,
     *notification_urls,

apiserver/plane/app/urls/inbox.py

@@ -0,0 +1,53 @@
+from django.urls import path
+
+
+from plane.app.views import (
+    InboxViewSet,
+    InboxIssueViewSet,
+)
+
+
+urlpatterns = [
+    path(
+        "workspaces/<str:slug>/projects/<uuid:project_id>/inboxes/",
+        InboxViewSet.as_view(
+            {
+                "get": "list",
+                "post": "create",
+            }
+        ),
+        name="inbox",
+    ),
+    path(
+        "workspaces/<str:slug>/projects/<uuid:project_id>/inboxes/<uuid:pk>/",
+        InboxViewSet.as_view(
+            {
+                "get": "retrieve",
+                "patch": "partial_update",
+                "delete": "destroy",
+            }
+        ),
+        name="inbox",
+    ),
+    path(
+        "workspaces/<str:slug>/projects/<uuid:project_id>/inbox-issues/",
+        InboxIssueViewSet.as_view(
+            {
+                "get": "list",
+                "post": "create",
+            }
+        ),
+        name="inbox-issue",
+    ),
+    path(
+        "workspaces/<str:slug>/projects/<uuid:project_id>/inbox-issues/<uuid:pk>/",
+        InboxIssueViewSet.as_view(
+            {
+                "get": "retrieve",
+                "patch": "partial_update",
+                "delete": "destroy",
+            }
+        ),
+        name="inbox-issue",
+    ),
+]

apiserver/plane/app/urls/intake.py

@@ -1,95 +0,0 @@
-from django.urls import path
-
-
-from plane.app.views import (
-    IntakeViewSet,
-    IntakeIssueViewSet,
-)
-
-
-urlpatterns = [
-    path(
-        "workspaces/<str:slug>/projects/<uuid:project_id>/intakes/",
-        IntakeViewSet.as_view(
-            {
-                "get": "list",
-                "post": "create",
-            }
-        ),
-        name="intake",
-    ),
-    path(
-        "workspaces/<str:slug>/projects/<uuid:project_id>/intakes/<uuid:pk>/",
-        IntakeViewSet.as_view(
-            {
-                "get": "retrieve",
-                "patch": "partial_update",
-                "delete": "destroy",
-            }
-        ),
-        name="intake",
-    ),
-    path(
-        "workspaces/<str:slug>/projects/<uuid:project_id>/intake-issues/",
-        IntakeIssueViewSet.as_view(
-            {
-                "get": "list",
-                "post": "create",
-            }
-        ),
-        name="intake-issue",
-    ),
-    path(
-        "workspaces/<str:slug>/projects/<uuid:project_id>/intake-issues/<uuid:pk>/",
-        IntakeIssueViewSet.as_view(
-            {
-                "get": "retrieve",
-                "patch": "partial_update",
-                "delete": "destroy",
-            }
-        ),
-        name="intake-issue",
-    ),
-    path(
-        "workspaces/<str:slug>/projects/<uuid:project_id>/inboxes/",
-        IntakeViewSet.as_view(
-            {
-                "get": "list",
-                "post": "create",
-            }
-        ),
-        name="inbox",
-    ),
-    path(
-        "workspaces/<str:slug>/projects/<uuid:project_id>/inboxes/<uuid:pk>/",
-        IntakeViewSet.as_view(
-            {
-                "get": "retrieve",
-                "patch": "partial_update",
-                "delete": "destroy",
-            }
-        ),
-        name="inbox",
-    ),
-    path(
-        "workspaces/<str:slug>/projects/<uuid:project_id>/inbox-issues/",
-        IntakeIssueViewSet.as_view(
-            {
-                "get": "list",
-                "post": "create",
-            }
-        ),
-        name="inbox-issue",
-    ),
-    path(
-        "workspaces/<str:slug>/projects/<uuid:project_id>/inbox-issues/<uuid:pk>/",
-        IntakeIssueViewSet.as_view(
-            {
-                "get": "retrieve",
-                "patch": "partial_update",
-                "delete": "destroy",
-            }
-        ),
-        name="inbox-issue",
-    ),
-]

apiserver/plane/app/urls/issue.py

@@ -21,9 +21,7 @@ from plane.app.views import (
     BulkArchiveIssuesEndpoint,
     DeletedIssuesListViewSet,
     IssuePaginatedViewSet,
-    IssueDetailEndpoint,
     IssueAttachmentV2Endpoint,
-    IssueBulkUpdateDateEndpoint,
 )
 
 urlpatterns = [
@@ -42,12 +40,6 @@ urlpatterns = [
         ),
         name="project-issue",
     ),
-    path(
-        "workspaces/<str:slug>/projects/<uuid:project_id>/issues-detail/",
-        IssueDetailEndpoint.as_view(),
-        name="project-issue-detail",
-    ),
-    # updated v1 paginated issues
     # updated v2 paginated issues
     path(
         "workspaces/<str:slug>/projects/<uuid:project_id>/v2/issues/",
@@ -315,9 +307,4 @@ urlpatterns = [
         DeletedIssuesListViewSet.as_view(),
         name="deleted-issues",
     ),
-    path(
-        "workspaces/<str:slug>/projects/<uuid:project_id>/issue-dates/",
-        IssueBulkUpdateDateEndpoint.as_view(),
-        name="project-issue-dates",
-    ),
 ]

apiserver/plane/app/views/__init__.py

@@ -130,8 +130,6 @@ from .issue.base import (
     BulkDeleteIssuesEndpoint,
     DeletedIssuesListViewSet,
     IssuePaginatedViewSet,
-    IssueDetailEndpoint,
-    IssueBulkUpdateDateEndpoint,
 )
 
 from .issue.activity import (
@@ -220,7 +218,7 @@ from .estimate.base import (
     EstimatePointEndpoint,
 )
 
-from .intake.base import IntakeViewSet, IntakeIssueViewSet
+from .inbox.base import InboxViewSet, InboxIssueViewSet
 
 from .analytic.base import (
     AnalyticsEndpoint,

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

@@ -110,10 +110,7 @@ class AnalyticsEndpoint(BaseAPIView):
         if x_axis in ["labels__id"] or segment in ["labels__id"]:
             label_details = (
                 Issue.objects.filter(
-                    workspace__slug=slug,
-                    **filters,
-                    labels__id__isnull=False,
-                    label_issue__deleted_at__isnull=True,
+                    workspace__slug=slug, **filters, labels__id__isnull=False
                 )
                 .distinct("labels__id")
                 .order_by("labels__id")
@@ -171,7 +168,6 @@ class AnalyticsEndpoint(BaseAPIView):
                     workspace__slug=slug,
                     **filters,
                     issue_cycle__cycle_id__isnull=False,
-                    issue_cycle__deleted_at__isnull=True,
                 )
                 .distinct("issue_cycle__cycle_id")
                 .order_by("issue_cycle__cycle_id")
@@ -190,7 +186,6 @@ class AnalyticsEndpoint(BaseAPIView):
                     workspace__slug=slug,
                     **filters,
                     issue_module__module_id__isnull=False,
-                    issue_module__deleted_at__isnull=True,
                 )
                 .distinct("issue_module__module_id")
                 .order_by("issue_module__module_id")

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

@@ -50,7 +50,7 @@ class FileAssetEndpoint(BaseAPIView):
         asset_key = str(workspace_id) + "/" + asset_key
         file_asset = FileAsset.objects.get(asset=asset_key)
         file_asset.is_deleted = True
-        file_asset.save(update_fields=["is_deleted"])
+        file_asset.save()
         return Response(status=status.HTTP_204_NO_CONTENT)
 
 
@@ -59,7 +59,7 @@ class FileAssetViewSet(BaseViewSet):
         asset_key = str(workspace_id) + "/" + asset_key
         file_asset = FileAsset.objects.get(asset=asset_key)
         file_asset.is_deleted = False
-        file_asset.save(update_fields=["is_deleted"])
+        file_asset.save()
         return Response(status=status.HTTP_204_NO_CONTENT)
 
 
@@ -96,5 +96,5 @@ class UserAssetsEndpoint(BaseAPIView):
             asset=asset_key, created_by=request.user
         )
         file_asset.is_deleted = True
-        file_asset.save(update_fields=["is_deleted"])
+        file_asset.save()
         return Response(status=status.HTTP_204_NO_CONTENT)

apiserver/plane/app/views/asset/v2.py

@@ -34,7 +34,7 @@ class UserAssetsV2Endpoint(BaseAPIView):
             return
         asset.is_deleted = True
         asset.deleted_at = timezone.now()
-        asset.save(update_fields=["is_deleted", "deleted_at"])
+        asset.save()
         return
 
     def entity_asset_save(self, asset_id, entity_type, asset, request):
@@ -146,12 +146,7 @@ class UserAssetsV2Endpoint(BaseAPIView):
             )
 
         # Check if the file type is allowed
-        allowed_types = [
-            "image/jpeg",
-            "image/png",
-            "image/webp",
-            "image/jpg",
-        ]
+        allowed_types = ["image/jpeg", "image/png", "image/webp", "image/jpg"]
         if type not in allowed_types:
             return Response(
                 {
@@ -214,7 +209,7 @@ class UserAssetsV2Endpoint(BaseAPIView):
         # update the attributes
         asset.attributes = request.data.get("attributes", asset.attributes)
         # save the asset
-        asset.save(update_fields=["is_uploaded", "attributes"])
+        asset.save()
         return Response(status=status.HTTP_204_NO_CONTENT)
 
     def delete(self, request, asset_id):
@@ -225,7 +220,7 @@ class UserAssetsV2Endpoint(BaseAPIView):
         self.entity_asset_delete(
             entity_type=asset.entity_type, asset=asset, request=request
         )
-        asset.save(update_fields=["is_deleted", "deleted_at"])
+        asset.save()
         return Response(status=status.HTTP_204_NO_CONTENT)
 
 
@@ -284,7 +279,7 @@ class WorkspaceFileAssetEndpoint(BaseAPIView):
         # Mark the asset as deleted
         asset.is_deleted = True
         asset.deleted_at = timezone.now()
-        asset.save(update_fields=["is_deleted", "deleted_at"])
+        asset.save()
         return
 
     def entity_asset_save(self, asset_id, entity_type, asset, request):
@@ -322,7 +317,7 @@ class WorkspaceFileAssetEndpoint(BaseAPIView):
 
         # Project Cover
         elif entity_type == FileAsset.EntityTypeContext.PROJECT_COVER:
-            project = Project.objects.filter(id=asset.project_id).first()
+            project = Project.objects.filter(id=asset.workspace_id).first()
             if project is None:
                 return
             # Delete the previous cover image
@@ -392,13 +387,7 @@ class WorkspaceFileAssetEndpoint(BaseAPIView):
             )
 
         # Check if the file type is allowed
-        allowed_types = [
-            "image/jpeg",
-            "image/png",
-            "image/webp",
-            "image/jpg",
-            "image/gif",
-        ]
+        allowed_types = ["image/jpeg", "image/png", "image/webp", "image/jpg"]
         if type not in allowed_types:
             return Response(
                 {
@@ -470,7 +459,7 @@ class WorkspaceFileAssetEndpoint(BaseAPIView):
         # update the attributes
         asset.attributes = request.data.get("attributes", asset.attributes)
         # save the asset
-        asset.save(update_fields=["is_uploaded", "attributes"])
+        asset.save()
         return Response(status=status.HTTP_204_NO_CONTENT)
 
     def delete(self, request, slug, asset_id):
@@ -481,7 +470,7 @@ class WorkspaceFileAssetEndpoint(BaseAPIView):
         self.entity_asset_delete(
             entity_type=asset.entity_type, asset=asset, request=request
         )
-        asset.save(update_fields=["is_deleted", "deleted_at"])
+        asset.save()
         return Response(status=status.HTTP_204_NO_CONTENT)
 
     def get(self, request, slug, asset_id):
@@ -560,7 +549,7 @@ class AssetRestoreEndpoint(BaseAPIView):
         asset = FileAsset.all_objects.get(id=asset_id, workspace__slug=slug)
         asset.is_deleted = False
         asset.deleted_at = None
-        asset.save(update_fields=["is_deleted", "deleted_at"])
+        asset.save()
         return Response(status=status.HTTP_204_NO_CONTENT)
 
 
@@ -631,13 +620,7 @@ class ProjectAssetEndpoint(BaseAPIView):
             )
 
         # Check if the file type is allowed
-        allowed_types = [
-            "image/jpeg",
-            "image/png",
-            "image/webp",
-            "image/jpg",
-            "image/gif",
-        ]
+        allowed_types = ["image/jpeg", "image/png", "image/webp", "image/jpg"]
         if type not in allowed_types:
             return Response(
                 {
@@ -707,7 +690,7 @@ class ProjectAssetEndpoint(BaseAPIView):
         # update the attributes
         asset.attributes = request.data.get("attributes", asset.attributes)
         # save the asset
-        asset.save(update_fields=["is_uploaded", "attributes"])
+        asset.save()
         return Response(status=status.HTTP_204_NO_CONTENT)
 
     @allow_permission([ROLE.ADMIN, ROLE.MEMBER, ROLE.GUEST])
@@ -722,7 +705,7 @@ class ProjectAssetEndpoint(BaseAPIView):
         asset.is_deleted = True
         asset.deleted_at = timezone.now()
         # Save the asset
-        asset.save(update_fields=["is_deleted", "deleted_at"])
+        asset.save()
         return Response(status=status.HTTP_204_NO_CONTENT)
 
     @allow_permission([ROLE.ADMIN, ROLE.MEMBER, ROLE.GUEST])
@@ -755,11 +738,6 @@ class ProjectAssetEndpoint(BaseAPIView):
 
 class ProjectBulkAssetEndpoint(BaseAPIView):
 
-    def save_project_cover(self, asset, project_id):
-        project = Project.objects.get(id=project_id)
-        project.cover_image_asset_id = asset.id
-        project.save()
-
     @allow_permission([ROLE.ADMIN, ROLE.MEMBER, ROLE.GUEST])
     def post(self, request, slug, project_id, entity_id):
         asset_ids = request.data.get("asset_ids", [])
@@ -795,7 +773,6 @@ class ProjectBulkAssetEndpoint(BaseAPIView):
             assets.update(
                 project_id=project_id,
             )
-            [self.save_project_cover(asset, project_id) for asset in assets]
 
         if asset.entity_type == FileAsset.EntityTypeContext.ISSUE_DESCRIPTION:
             assets.update(

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

@@ -48,7 +48,6 @@ class CycleArchiveUnarchiveEndpoint(BaseAPIView):
                 estimate_point__estimate__type="points",
                 state__group="backlog",
                 issue_cycle__cycle_id=OuterRef("pk"),
-                issue_cycle__deleted_at__isnull=True,
             )
             .values("issue_cycle__cycle_id")
             .annotate(
@@ -63,7 +62,6 @@ class CycleArchiveUnarchiveEndpoint(BaseAPIView):
                 estimate_point__estimate__type="points",
                 state__group="unstarted",
                 issue_cycle__cycle_id=OuterRef("pk"),
-                issue_cycle__deleted_at__isnull=True,
             )
             .values("issue_cycle__cycle_id")
             .annotate(
@@ -78,7 +76,6 @@ class CycleArchiveUnarchiveEndpoint(BaseAPIView):
                 estimate_point__estimate__type="points",
                 state__group="started",
                 issue_cycle__cycle_id=OuterRef("pk"),
-                issue_cycle__deleted_at__isnull=True,
             )
             .values("issue_cycle__cycle_id")
             .annotate(
@@ -93,7 +90,6 @@ class CycleArchiveUnarchiveEndpoint(BaseAPIView):
                 estimate_point__estimate__type="points",
                 state__group="cancelled",
                 issue_cycle__cycle_id=OuterRef("pk"),
-                issue_cycle__deleted_at__isnull=True,
             )
             .values("issue_cycle__cycle_id")
             .annotate(
@@ -108,7 +104,6 @@ class CycleArchiveUnarchiveEndpoint(BaseAPIView):
                 estimate_point__estimate__type="points",
                 state__group="completed",
                 issue_cycle__cycle_id=OuterRef("pk"),
-                issue_cycle__deleted_at__isnull=True,
             )
             .values("issue_cycle__cycle_id")
             .annotate(
@@ -122,7 +117,6 @@ class CycleArchiveUnarchiveEndpoint(BaseAPIView):
             Issue.issue_objects.filter(
                 estimate_point__estimate__type="points",
                 issue_cycle__cycle_id=OuterRef("pk"),
-                issue_cycle__deleted_at__isnull=True,
             )
             .values("issue_cycle__cycle_id")
             .annotate(
@@ -354,7 +348,6 @@ class CycleArchiveUnarchiveEndpoint(BaseAPIView):
                         project_id=self.kwargs.get("project_id"),
                         parent__isnull=False,
                         issue_cycle__cycle_id=pk,
-                        issue_cycle__deleted_at__isnull=True,
                     )
                     .order_by()
                     .annotate(count=Func(F("id"), function="Count"))
@@ -409,7 +402,6 @@ class CycleArchiveUnarchiveEndpoint(BaseAPIView):
                 assignee_distribution = (
                     Issue.issue_objects.filter(
                         issue_cycle__cycle_id=pk,
-                        issue_cycle__deleted_at__isnull=True,
                         workspace__slug=slug,
                         project_id=project_id,
                     )
@@ -467,7 +459,6 @@ class CycleArchiveUnarchiveEndpoint(BaseAPIView):
                 label_distribution = (
                     Issue.issue_objects.filter(
                         issue_cycle__cycle_id=pk,
-                        issue_cycle__deleted_at__isnull=True,
                         workspace__slug=slug,
                         project_id=project_id,
                     )
@@ -523,7 +514,6 @@ class CycleArchiveUnarchiveEndpoint(BaseAPIView):
             assignee_distribution = (
                 Issue.issue_objects.filter(
                     issue_cycle__cycle_id=pk,
-                    issue_cycle__deleted_at__isnull=True,
                     workspace__slug=slug,
                     project_id=project_id,
                 )
@@ -594,7 +584,6 @@ class CycleArchiveUnarchiveEndpoint(BaseAPIView):
             label_distribution = (
                 Issue.issue_objects.filter(
                     issue_cycle__cycle_id=pk,
-                    issue_cycle__deleted_at__isnull=True,
                     workspace__slug=slug,
                     project_id=project_id,
                 )

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

@@ -102,7 +102,7 @@ class CycleViewSet(BaseViewSet):
                     filter=Q(
                         issue_cycle__issue__archived_at__isnull=True,
                         issue_cycle__issue__is_draft=False,
-                        issue_cycle__deleted_at__isnull=True,
+                        issue_cycle__issue__deleted_at__isnull=True,
                     ),
                 )
             )
@@ -114,7 +114,7 @@ class CycleViewSet(BaseViewSet):
                         issue_cycle__issue__state__group="completed",
                         issue_cycle__issue__archived_at__isnull=True,
                         issue_cycle__issue__is_draft=False,
-                        issue_cycle__deleted_at__isnull=True,
+                        issue_cycle__issue__deleted_at__isnull=True,
                     ),
                 )
             )
@@ -144,11 +144,6 @@ class CycleViewSet(BaseViewSet):
                         distinct=True,
                         filter=~Q(
                             issue_cycle__issue__assignees__id__isnull=True
-                        )
-                        & (
-                            Q(
-                                issue_cycle__issue__issue_assignee__deleted_at__isnull=True
-                            )
                         ),
                     ),
                     Value([], output_field=ArrayField(UUIDField())),
@@ -398,7 +393,6 @@ class CycleViewSet(BaseViewSet):
                     project_id=self.kwargs.get("project_id"),
                     parent__isnull=False,
                     issue_cycle__cycle_id=pk,
-                    issue_cycle__deleted_at__isnull=True,
                 )
                 .order_by()
                 .annotate(count=Func(F("id"), function="Count"))
@@ -497,7 +491,7 @@ class CycleViewSet(BaseViewSet):
             origin=request.META.get("HTTP_ORIGIN"),
         )
         # TODO: Soft delete the cycle break the onetoone relationship with cycle issue
-        cycle.delete()
+        cycle.delete(soft=False)
 
         # Delete the user favorite cycle
         UserFavorite.objects.filter(
@@ -602,7 +596,6 @@ class TransferCycleIssueEndpoint(BaseAPIView):
                     filter=Q(
                         issue_cycle__issue__archived_at__isnull=True,
                         issue_cycle__issue__is_draft=False,
-                        issue_cycle__deleted_at__isnull=True,
                     ),
                 )
             )
@@ -614,7 +607,6 @@ class TransferCycleIssueEndpoint(BaseAPIView):
                         issue_cycle__issue__archived_at__isnull=True,
                         issue_cycle__issue__is_draft=False,
                         issue_cycle__issue__deleted_at__isnull=True,
-                        issue_cycle__deleted_at__isnull=True,
                     ),
                 )
             )
@@ -626,7 +618,6 @@ class TransferCycleIssueEndpoint(BaseAPIView):
                         issue_cycle__issue__archived_at__isnull=True,
                         issue_cycle__issue__is_draft=False,
                         issue_cycle__issue__deleted_at__isnull=True,
-                        issue_cycle__deleted_at__isnull=True,
                     ),
                 )
             )
@@ -638,7 +629,6 @@ class TransferCycleIssueEndpoint(BaseAPIView):
                         issue_cycle__issue__archived_at__isnull=True,
                         issue_cycle__issue__is_draft=False,
                         issue_cycle__issue__deleted_at__isnull=True,
-                        issue_cycle__deleted_at__isnull=True,
                     ),
                 )
             )
@@ -650,7 +640,6 @@ class TransferCycleIssueEndpoint(BaseAPIView):
                         issue_cycle__issue__archived_at__isnull=True,
                         issue_cycle__issue__is_draft=False,
                         issue_cycle__issue__deleted_at__isnull=True,
-                        issue_cycle__deleted_at__isnull=True,
                     ),
                 )
             )
@@ -662,7 +651,6 @@ class TransferCycleIssueEndpoint(BaseAPIView):
                         issue_cycle__issue__archived_at__isnull=True,
                         issue_cycle__issue__is_draft=False,
                         issue_cycle__issue__deleted_at__isnull=True,
-                        issue_cycle__deleted_at__isnull=True,
                     ),
                 )
             )
@@ -679,7 +667,6 @@ class TransferCycleIssueEndpoint(BaseAPIView):
             assignee_estimate_data = (
                 Issue.issue_objects.filter(
                     issue_cycle__cycle_id=cycle_id,
-                    issue_cycle__deleted_at__isnull=True,
                     workspace__slug=slug,
                     project_id=project_id,
                 )
@@ -754,7 +741,6 @@ class TransferCycleIssueEndpoint(BaseAPIView):
             label_distribution_data = (
                 Issue.issue_objects.filter(
                     issue_cycle__cycle_id=cycle_id,
-                    issue_cycle__deleted_at__isnull=True,
                     workspace__slug=slug,
                     project_id=project_id,
                 )
@@ -816,7 +802,6 @@ class TransferCycleIssueEndpoint(BaseAPIView):
         assignee_distribution = (
             Issue.issue_objects.filter(
                 issue_cycle__cycle_id=cycle_id,
-                issue_cycle__deleted_at__isnull=True,
                 workspace__slug=slug,
                 project_id=project_id,
             )
@@ -894,7 +879,6 @@ class TransferCycleIssueEndpoint(BaseAPIView):
         label_distribution = (
             Issue.issue_objects.filter(
                 issue_cycle__cycle_id=cycle_id,
-                issue_cycle__deleted_at__isnull=True,
                 workspace__slug=slug,
                 project_id=project_id,
             )
@@ -1085,7 +1069,6 @@ class CycleProgressEndpoint(BaseAPIView):
             Issue.issue_objects.filter(
                 estimate_point__estimate__type="points",
                 issue_cycle__cycle_id=cycle_id,
-                issue_cycle__deleted_at__isnull=True,
                 workspace__slug=slug,
                 project_id=project_id,
             )
@@ -1138,7 +1121,6 @@ class CycleProgressEndpoint(BaseAPIView):
 
         backlog_issues = Issue.issue_objects.filter(
             issue_cycle__cycle_id=cycle_id,
-            issue_cycle__deleted_at__isnull=True,
             workspace__slug=slug,
             project_id=project_id,
             state__group="backlog",
@@ -1146,7 +1128,6 @@ class CycleProgressEndpoint(BaseAPIView):
 
         unstarted_issues = Issue.issue_objects.filter(
             issue_cycle__cycle_id=cycle_id,
-            issue_cycle__deleted_at__isnull=True,
             workspace__slug=slug,
             project_id=project_id,
             state__group="unstarted",
@@ -1154,7 +1135,6 @@ class CycleProgressEndpoint(BaseAPIView):
 
         started_issues = Issue.issue_objects.filter(
             issue_cycle__cycle_id=cycle_id,
-            issue_cycle__deleted_at__isnull=True,
             workspace__slug=slug,
             project_id=project_id,
             state__group="started",
@@ -1162,7 +1142,6 @@ class CycleProgressEndpoint(BaseAPIView):
 
         cancelled_issues = Issue.issue_objects.filter(
             issue_cycle__cycle_id=cycle_id,
-            issue_cycle__deleted_at__isnull=True,
             workspace__slug=slug,
             project_id=project_id,
             state__group="cancelled",
@@ -1170,7 +1149,6 @@ class CycleProgressEndpoint(BaseAPIView):
 
         completed_issues = Issue.issue_objects.filter(
             issue_cycle__cycle_id=cycle_id,
-            issue_cycle__deleted_at__isnull=True,
             workspace__slug=slug,
             project_id=project_id,
             state__group="completed",
@@ -1178,7 +1156,6 @@ class CycleProgressEndpoint(BaseAPIView):
 
         total_issues = Issue.issue_objects.filter(
             issue_cycle__cycle_id=cycle_id,
-            issue_cycle__deleted_at__isnull=True,
             workspace__slug=slug,
             project_id=project_id,
         ).count()
@@ -1238,7 +1215,6 @@ class CycleAnalyticsEndpoint(BaseAPIView):
                         issue_cycle__issue__archived_at__isnull=True,
                         issue_cycle__issue__is_draft=False,
                         issue_cycle__issue__deleted_at__isnull=True,
-                        issue_cycle__deleted_at__isnull=True,
                     ),
                 )
             )
@@ -1266,7 +1242,6 @@ class CycleAnalyticsEndpoint(BaseAPIView):
             assignee_distribution = (
                 Issue.issue_objects.filter(
                     issue_cycle__cycle_id=cycle_id,
-                    issue_cycle__deleted_at__isnull=True,
                     workspace__slug=slug,
                     project_id=project_id,
                 )
@@ -1324,7 +1299,6 @@ class CycleAnalyticsEndpoint(BaseAPIView):
             label_distribution = (
                 Issue.issue_objects.filter(
                     issue_cycle__cycle_id=cycle_id,
-                    issue_cycle__deleted_at__isnull=True,
                     workspace__slug=slug,
                     project_id=project_id,
                 )
@@ -1371,7 +1345,6 @@ class CycleAnalyticsEndpoint(BaseAPIView):
             assignee_distribution = (
                 Issue.issue_objects.filter(
                     issue_cycle__cycle_id=cycle_id,
-                    issue_cycle__deleted_at__isnull=True,
                     project_id=project_id,
                     workspace__slug=slug,
                 )
@@ -1430,7 +1403,6 @@ class CycleAnalyticsEndpoint(BaseAPIView):
             label_distribution = (
                 Issue.issue_objects.filter(
                     issue_cycle__cycle_id=cycle_id,
-                    issue_cycle__deleted_at__isnull=True,
                     project_id=project_id,
                     workspace__slug=slug,
                 )

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

@@ -3,7 +3,7 @@ import json
 
 # Django imports
 from django.core import serializers
-from django.db.models import F, Func, OuterRef, Q, Subquery
+from django.db.models import F, Func, OuterRef, Q, Case, When
 from django.utils import timezone
 from django.utils.decorators import method_decorator
 from django.views.decorators.gzip import gzip_page
@@ -12,7 +12,6 @@ from django.views.decorators.gzip import gzip_page
 from rest_framework import status
 from rest_framework.response import Response
 
-
 # Module imports
 from .. import BaseViewSet
 from plane.app.serializers import (
@@ -40,7 +39,6 @@ from plane.utils.paginator import (
 from plane.app.permissions import allow_permission, ROLE
 
 
-
 class CycleIssueViewSet(BaseViewSet):
     serializer_class = CycleIssueSerializer
     model = CycleIssue
@@ -92,10 +90,7 @@ class CycleIssueViewSet(BaseViewSet):
         order_by_param = request.GET.get("order_by", "created_at")
         filters = issue_filters(request.query_params, "GET")
         issue_queryset = (
-            Issue.issue_objects.filter(
-                issue_cycle__cycle_id=cycle_id,
-                issue_cycle__deleted_at__isnull=True,
-            )
+            Issue.issue_objects.filter(issue_cycle__cycle_id=cycle_id)
             .filter(project_id=project_id)
             .filter(workspace__slug=slug)
             .filter(**filters)
@@ -108,10 +103,12 @@ class CycleIssueViewSet(BaseViewSet):
             )
             .filter(**filters)
             .annotate(
-                cycle_id=Subquery(
-                    CycleIssue.objects.filter(
-                        issue=OuterRef("id"), deleted_at__isnull=True
-                    ).values("cycle_id")[:1]
+                cycle_id=Case(
+                    When(
+                        issue_cycle__cycle__deleted_at__isnull=True,
+                        then=F("issue_cycle__cycle_id"),
+                    ),
+                    default=None,
                 )
             )
             .annotate(
@@ -196,10 +193,10 @@ class CycleIssueViewSet(BaseViewSet):
                         group_by_field_name=group_by,
                         sub_group_by_field_name=sub_group_by,
                         count_filter=Q(
-                            Q(issue_intake__status=1)
-                            | Q(issue_intake__status=-1)
-                            | Q(issue_intake__status=2)
-                            | Q(issue_intake__isnull=True),
+                            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,
                         ),
@@ -225,10 +222,10 @@ class CycleIssueViewSet(BaseViewSet):
                     ),
                     group_by_field_name=group_by,
                     count_filter=Q(
-                        Q(issue_intake__status=1)
-                        | Q(issue_intake__status=-1)
-                        | Q(issue_intake__status=2)
-                        | Q(issue_intake__isnull=True),
+                        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,
                     ),

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

@@ -42,7 +42,6 @@ from plane.db.models import (
     Project,
     Widget,
     WorkspaceMember,
-    CycleIssue,
 )
 from plane.utils.issue_filters import issue_filters
 
@@ -192,13 +191,7 @@ def dashboard_assigned_issues(self, request, slug):
                 ).select_related("issue"),
             )
         )
-        .annotate(
-            cycle_id=Subquery(
-                CycleIssue.objects.filter(
-                    issue=OuterRef("id"), deleted_at__isnull=True
-                ).values("cycle_id")[:1]
-            )
-        )
+        .annotate(cycle_id=F("issue_cycle__cycle_id"))
         .annotate(
             link_count=IssueLink.objects.filter(issue=OuterRef("id"))
             .order_by()
@@ -225,9 +218,9 @@ def dashboard_assigned_issues(self, request, slug):
                 ArrayAgg(
                     "labels__id",
                     distinct=True,
-                    filter=Q(
+                    filter=(
                         ~Q(labels__id__isnull=True)
-                        & Q(label_issue__deleted_at__isnull=True),
+                        & Q(labels__deleted_at__isnull=True)
                     ),
                 ),
                 Value([], output_field=ArrayField(UUIDField())),
@@ -236,11 +229,8 @@ def dashboard_assigned_issues(self, request, slug):
                 ArrayAgg(
                     "assignees__id",
                     distinct=True,
-                    filter=Q(
-                        ~Q(assignees__id__isnull=True)
-                        & Q(assignees__member_project__is_active=True)
-                        & Q(issue_assignee__deleted_at__isnull=True)
-                    ),
+                    filter=~Q(assignees__id__isnull=True)
+                    & Q(assignees__member_project__is_active=True),
                 ),
                 Value([], output_field=ArrayField(UUIDField())),
             ),
@@ -248,11 +238,9 @@ def dashboard_assigned_issues(self, request, slug):
                 ArrayAgg(
                     "issue_module__module_id",
                     distinct=True,
-                    filter=Q(
-                        ~Q(issue_module__module_id__isnull=True)
-                        & Q(issue_module__module__archived_at__isnull=True)
-                        & Q(issue_module__deleted_at__isnull=True)
-                    ),
+                    filter=~Q(issue_module__module_id__isnull=True)
+                    & Q(issue_module__module__archived_at__isnull=True)
+                    & Q(issue_module__module__deleted_at__isnull=True),
                 ),
                 Value([], output_field=ArrayField(UUIDField())),
             ),
@@ -372,13 +360,7 @@ def dashboard_created_issues(self, request, slug):
         .filter(**filters)
         .select_related("workspace", "project", "state", "parent")
         .prefetch_related("assignees", "labels", "issue_module__module")
-        .annotate(
-            cycle_id=Subquery(
-                CycleIssue.objects.filter(
-                    issue=OuterRef("id"), deleted_at__isnull=True
-                ).values("cycle_id")[:1]
-            )
-        )
+        .annotate(cycle_id=F("issue_cycle__cycle_id"))
         .annotate(
             link_count=IssueLink.objects.filter(issue=OuterRef("id"))
             .order_by()
@@ -405,9 +387,9 @@ def dashboard_created_issues(self, request, slug):
                 ArrayAgg(
                     "labels__id",
                     distinct=True,
-                    filter=Q(
+                    filter=(
                         ~Q(labels__id__isnull=True)
-                        & Q(label_issue__deleted_at__isnull=True),
+                        & Q(labels__deleted_at__isnull=True)
                     ),
                 ),
                 Value([], output_field=ArrayField(UUIDField())),
@@ -416,11 +398,8 @@ def dashboard_created_issues(self, request, slug):
                 ArrayAgg(
                     "assignees__id",
                     distinct=True,
-                    filter=Q(
-                        ~Q(assignees__id__isnull=True)
-                        & Q(assignees__member_project__is_active=True)
-                        & Q(issue_assignee__deleted_at__isnull=True)
-                    ),
+                    filter=~Q(assignees__id__isnull=True)
+                    & Q(assignees__member_project__is_active=True),
                 ),
                 Value([], output_field=ArrayField(UUIDField())),
             ),
@@ -428,11 +407,9 @@ def dashboard_created_issues(self, request, slug):
                 ArrayAgg(
                     "issue_module__module_id",
                     distinct=True,
-                    filter=Q(
-                        ~Q(issue_module__module_id__isnull=True)
-                        & Q(issue_module__module__archived_at__isnull=True)
-                        & Q(issue_module__deleted_at__isnull=True)
-                    ),
+                    filter=~Q(issue_module__module_id__isnull=True)
+                    & Q(issue_module__module__archived_at__isnull=True)
+                    & Q(issue_module__module__deleted_at__isnull=True),
                 ),
                 Value([], output_field=ArrayField(UUIDField())),
             ),

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, Subquery
+from django.db.models import Q, Count, OuterRef, Func, F, Prefetch, Case, When
 from django.core.serializers.json import DjangoJSONEncoder
 from django.contrib.postgres.aggregates import ArrayAgg
 from django.contrib.postgres.fields import ArrayField
@@ -18,31 +18,30 @@ from rest_framework.response import Response
 from ..base import BaseViewSet
 from plane.app.permissions import allow_permission, ROLE
 from plane.db.models import (
-    Intake,
-    IntakeIssue,
+    Inbox,
+    InboxIssue,
     Issue,
     State,
     IssueLink,
     FileAsset,
     Project,
     ProjectMember,
-    CycleIssue,
 )
 from plane.app.serializers import (
     IssueCreateSerializer,
     IssueSerializer,
-    IntakeSerializer,
-    IntakeIssueSerializer,
-    IntakeIssueDetailSerializer,
+    InboxSerializer,
+    InboxIssueSerializer,
+    InboxIssueDetailSerializer,
 )
 from plane.utils.issue_filters import issue_filters
 from plane.bgtasks.issue_activities_task import issue_activity
 
 
-class IntakeViewSet(BaseViewSet):
+class InboxViewSet(BaseViewSet):
 
-    serializer_class = IntakeSerializer
-    model = Intake
+    serializer_class = InboxSerializer
+    model = Inbox
 
     def get_queryset(self):
         return (
@@ -54,8 +53,8 @@ class IntakeViewSet(BaseViewSet):
             )
             .annotate(
                 pending_issue_count=Count(
-                    "issue_intake",
-                    filter=Q(issue_intake__status=-2),
+                    "issue_inbox",
+                    filter=Q(issue_inbox__status=-2),
                 )
             )
             .select_related("workspace", "project")
@@ -63,9 +62,9 @@ class IntakeViewSet(BaseViewSet):
 
     @allow_permission([ROLE.ADMIN, ROLE.MEMBER])
     def list(self, request, slug, project_id):
-        intake = self.get_queryset().first()
+        inbox = self.get_queryset().first()
         return Response(
-            IntakeSerializer(intake).data,
+            InboxSerializer(inbox).data,
             status=status.HTTP_200_OK,
         )
 
@@ -75,26 +74,26 @@ class IntakeViewSet(BaseViewSet):
 
     @allow_permission([ROLE.ADMIN, ROLE.MEMBER])
     def destroy(self, request, slug, project_id, pk):
-        intake = Intake.objects.filter(
+        inbox = Inbox.objects.filter(
             workspace__slug=slug, project_id=project_id, pk=pk
         ).first()
-        # Handle default intake delete
-        if intake.is_default:
+        # Handle default inbox delete
+        if inbox.is_default:
             return Response(
-                {"error": "You cannot delete the default intake"},
+                {"error": "You cannot delete the default inbox"},
                 status=status.HTTP_400_BAD_REQUEST,
             )
-        intake.delete()
+        inbox.delete()
         return Response(status=status.HTTP_204_NO_CONTENT)
 
 
-class IntakeIssueViewSet(BaseViewSet):
+class InboxIssueViewSet(BaseViewSet):
 
-    serializer_class = IntakeIssueSerializer
-    model = IntakeIssue
+    serializer_class = InboxIssueSerializer
+    model = InboxIssue
 
     filterset_fields = [
-        "statulls",
+        "status",
     ]
 
     def get_queryset(self):
@@ -107,17 +106,19 @@ class IntakeIssueViewSet(BaseViewSet):
             .prefetch_related("assignees", "labels", "issue_module__module")
             .prefetch_related(
                 Prefetch(
-                    "issue_intake",
-                    queryset=IntakeIssue.objects.only(
+                    "issue_inbox",
+                    queryset=InboxIssue.objects.only(
                         "status", "duplicate_to", "snoozed_till", "source"
                     ),
                 )
             )
             .annotate(
-                cycle_id=Subquery(
-                    CycleIssue.objects.filter(
-                        issue=OuterRef("id"), deleted_at__isnull=True
-                    ).values("cycle_id")[:1]
+                cycle_id=Case(
+                    When(
+                        issue_cycle__cycle__deleted_at__isnull=True,
+                        then=F("issue_cycle__cycle_id"),
+                    ),
+                    default=None,
                 )
             )
             .annotate(
@@ -148,9 +149,9 @@ class IntakeIssueViewSet(BaseViewSet):
                     ArrayAgg(
                         "labels__id",
                         distinct=True,
-                        filter=Q(
+                        filter=(
                             ~Q(labels__id__isnull=True)
-                            & Q(label_issue__deleted_at__isnull=True),
+                            & Q(labels__deleted_at__isnull=True)
                         ),
                     ),
                     Value([], output_field=ArrayField(UUIDField())),
@@ -159,11 +160,8 @@ class IntakeIssueViewSet(BaseViewSet):
                     ArrayAgg(
                         "assignees__id",
                         distinct=True,
-                        filter=Q(
-                            ~Q(assignees__id__isnull=True)
-                            & Q(assignees__member_project__is_active=True)
-                            & Q(issue_assignee__deleted_at__isnull=True)
-                        ),
+                        filter=~Q(assignees__id__isnull=True)
+                        & Q(assignees__member_project__is_active=True),
                     ),
                     Value([], output_field=ArrayField(UUIDField())),
                 ),
@@ -171,11 +169,9 @@ class IntakeIssueViewSet(BaseViewSet):
                     ArrayAgg(
                         "issue_module__module_id",
                         distinct=True,
-                        filter=Q(
-                            ~Q(issue_module__module_id__isnull=True)
-                            & Q(issue_module__module__archived_at__isnull=True)
-                            & Q(issue_module__deleted_at__isnull=True)
-                        ),
+                        filter=~Q(issue_module__module_id__isnull=True)
+                        & Q(issue_module__module__archived_at__isnull=True)
+                        & Q(issue_module__module__deleted_at__isnull=True),
                     ),
                     Value([], output_field=ArrayField(UUIDField())),
                 ),
@@ -184,14 +180,14 @@ class IntakeIssueViewSet(BaseViewSet):
 
     @allow_permission([ROLE.ADMIN, ROLE.MEMBER, ROLE.GUEST])
     def list(self, request, slug, project_id):
-        intake_id = Intake.objects.filter(
+        inbox_id = Inbox.objects.filter(
             workspace__slug=slug, project_id=project_id
         ).first()
         project = Project.objects.get(pk=project_id)
         filters = issue_filters(request.GET, "GET", "issue__")
-        intake_issue = (
-            IntakeIssue.objects.filter(
-                intake_id=intake_id.id, project_id=project_id, **filters
+        inbox_issue = (
+            InboxIssue.objects.filter(
+                inbox_id=inbox_id.id, project_id=project_id, **filters
             )
             .select_related("issue")
             .prefetch_related(
@@ -202,23 +198,21 @@ class IntakeIssueViewSet(BaseViewSet):
                     ArrayAgg(
                         "issue__labels__id",
                         distinct=True,
-                        filter=Q(
-                            ~Q(issue__labels__id__isnull=True)
-                            & Q(issue__label_issue__deleted_at__isnull=True)
-                        ),
+                        filter=~Q(issue__labels__id__isnull=True)
+                        & Q(issue__labels__deleted_at__isnull=True),
                     ),
                     Value([], output_field=ArrayField(UUIDField())),
                 )
             )
         ).order_by(request.GET.get("order_by", "-issue__created_at"))
-        # Intake status filter
-        intake_status = [
+        # inbox status filter
+        inbox_status = [
             item
             for item in request.GET.get("status", "-2").split(",")
             if item != "null"
         ]
-        if intake_status:
-            intake_issue = intake_issue.filter(status__in=intake_status)
+        if inbox_status:
+            inbox_issue = inbox_issue.filter(status__in=inbox_status)
 
         if (
             ProjectMember.objects.filter(
@@ -230,12 +224,12 @@ class IntakeIssueViewSet(BaseViewSet):
             ).exists()
             and not project.guest_view_all_features
         ):
-            intake_issue = intake_issue.filter(created_by=request.user)
+            inbox_issue = inbox_issue.filter(created_by=request.user)
         return self.paginate(
             request=request,
-            queryset=(intake_issue),
-            on_results=lambda intake_issues: IntakeIssueSerializer(
-                intake_issues,
+            queryset=(inbox_issue),
+            on_results=lambda inbox_issues: InboxIssueSerializer(
+                inbox_issues,
                 many=True,
             ).data,
         )
@@ -261,6 +255,16 @@ class IntakeIssueViewSet(BaseViewSet):
                 status=status.HTTP_400_BAD_REQUEST,
             )
 
+        # Create or get state
+        state, _ = State.objects.get_or_create(
+            name="Triage",
+            group="triage",
+            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(
@@ -273,15 +277,15 @@ class IntakeIssueViewSet(BaseViewSet):
         )
         if serializer.is_valid():
             serializer.save()
-            intake_id = Intake.objects.filter(
+            inbox_id = Inbox.objects.filter(
                 workspace__slug=slug, project_id=project_id
             ).first()
-            # create an intake issue
-            intake_issue = IntakeIssue.objects.create(
-                intake_id=intake_id.id,
+            # 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"),
+                source=request.data.get("source", "in-app"),
             )
             # Create an Issue Activity
             issue_activity.delay(
@@ -294,10 +298,10 @@ class IntakeIssueViewSet(BaseViewSet):
                 epoch=int(timezone.now().timestamp()),
                 notification=True,
                 origin=request.META.get("HTTP_ORIGIN"),
-                intake=str(intake_issue.id),
+                inbox=str(inbox_issue.id),
             )
-            intake_issue = (
-                IntakeIssue.objects.select_related("issue")
+            inbox_issue = (
+                InboxIssue.objects.select_related("issue")
                 .prefetch_related(
                     "issue__labels",
                     "issue__assignees",
@@ -307,11 +311,9 @@ class IntakeIssueViewSet(BaseViewSet):
                         ArrayAgg(
                             "issue__labels__id",
                             distinct=True,
-                            filter=Q(
+                            filter=(
                                 ~Q(issue__labels__id__isnull=True)
-                                & Q(
-                                    issue__label_issue__deleted_at__isnull=True
-                                )
+                                & Q(issue__labels__deleted_at__isnull=True)
                             ),
                         ),
                         Value([], output_field=ArrayField(UUIDField())),
@@ -321,20 +323,18 @@ class IntakeIssueViewSet(BaseViewSet):
                             "issue__assignees__id",
                             distinct=True,
                             filter=~Q(issue__assignees__id__isnull=True)
-                            & Q(
-                                issue__assignees__member_project__is_active=True
-                            ),
+                            & Q(issue__assignees__member_project__is_active=True),
                         ),
                         Value([], output_field=ArrayField(UUIDField())),
                     ),
                 )
                 .get(
-                    intake_id=intake_id.id,
+                    inbox_id=inbox_id.id,
                     issue_id=serializer.data["id"],
                     project_id=project_id,
                 )
             )
-            serializer = IntakeIssueDetailSerializer(intake_issue)
+            serializer = InboxIssueDetailSerializer(inbox_issue)
             return Response(serializer.data, status=status.HTTP_200_OK)
         else:
             return Response(
@@ -343,14 +343,14 @@ class IntakeIssueViewSet(BaseViewSet):
 
     @allow_permission(allowed_roles=[ROLE.ADMIN], creator=True, model=Issue)
     def partial_update(self, request, slug, project_id, pk):
-        intake_id = Intake.objects.filter(
+        inbox_id = Inbox.objects.filter(
             workspace__slug=slug, project_id=project_id
         ).first()
-        intake_issue = IntakeIssue.objects.get(
+        inbox_issue = InboxIssue.objects.get(
             issue_id=pk,
             workspace__slug=slug,
             project_id=project_id,
-            intake_id=intake_id,
+            inbox_id=inbox_id,
         )
         # Get the project member
         project_member = ProjectMember.objects.get(
@@ -360,11 +360,11 @@ class IntakeIssueViewSet(BaseViewSet):
             is_active=True,
         )
         # Only project members admins and created_by users can access this endpoint
-        if project_member.role <= 5 and str(intake_issue.created_by_id) != str(
+        if project_member.role <= 5 and str(inbox_issue.created_by_id) != str(
             request.user.id
         ):
             return Response(
-                {"error": "You cannot edit intake issues"},
+                {"error": "You cannot edit inbox issues"},
                 status=status.HTTP_400_BAD_REQUEST,
             )
 
@@ -376,10 +376,7 @@ class IntakeIssueViewSet(BaseViewSet):
                     ArrayAgg(
                         "labels__id",
                         distinct=True,
-                        filter=Q(
-                            ~Q(labels__id__isnull=True)
-                            & Q(label_issue__deleted_at__isnull=True)
-                        ),
+                        filter=~Q(labels__id__isnull=True),
                     ),
                     Value([], output_field=ArrayField(UUIDField())),
                 ),
@@ -387,15 +384,12 @@ class IntakeIssueViewSet(BaseViewSet):
                     ArrayAgg(
                         "assignees__id",
                         distinct=True,
-                        filter=Q(
-                            ~Q(assignees__id__isnull=True)
-                            & Q(issue_assignee__deleted_at__isnull=True)
-                        ),
+                        filter=~Q(assignees__id__isnull=True),
                     ),
                     Value([], output_field=ArrayField(UUIDField())),
                 ),
             ).get(
-                pk=intake_issue.issue_id,
+                pk=inbox_issue.issue_id,
                 workspace__slug=slug,
                 project_id=project_id,
             )
@@ -433,7 +427,7 @@ class IntakeIssueViewSet(BaseViewSet):
                         epoch=int(timezone.now().timestamp()),
                         notification=True,
                         origin=request.META.get("HTTP_ORIGIN"),
-                        intake=str(intake_issue.id),
+                        inbox=str(inbox_issue.id),
                     )
                 issue_serializer.save()
             else:
@@ -441,20 +435,20 @@ class IntakeIssueViewSet(BaseViewSet):
                     issue_serializer.errors, status=status.HTTP_400_BAD_REQUEST
                 )
 
-        # Only project admins and members can edit intake issue attributes
+        # Only project admins and members can edit inbox issue attributes
         if project_member.role > 15:
-            serializer = IntakeIssueSerializer(
-                intake_issue, data=request.data, partial=True
+            serializer = InboxIssueSerializer(
+                inbox_issue, data=request.data, partial=True
             )
             current_instance = json.dumps(
-                IntakeIssueSerializer(intake_issue).data, cls=DjangoJSONEncoder
+                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
                 if serializer.data["status"] in [-1, 2]:
                     issue = Issue.objects.get(
-                        pk=intake_issue.issue_id,
+                        pk=inbox_issue.issue_id,
                         workspace__slug=slug,
                         project_id=project_id,
                     )
@@ -470,7 +464,7 @@ class IntakeIssueViewSet(BaseViewSet):
                 # Update the issue state if it is accepted
                 if serializer.data["status"] in [1]:
                     issue = Issue.objects.get(
-                        pk=intake_issue.issue_id,
+                        pk=inbox_issue.issue_id,
                         workspace__slug=slug,
                         project_id=project_id,
                     )
@@ -488,7 +482,7 @@ class IntakeIssueViewSet(BaseViewSet):
                             issue.save()
                 # create a activity for status change
                 issue_activity.delay(
-                    type="intake.activity.created",
+                    type="inbox.activity.created",
                     requested_data=json.dumps(
                         request.data, cls=DjangoJSONEncoder
                     ),
@@ -499,11 +493,11 @@ class IntakeIssueViewSet(BaseViewSet):
                     epoch=int(timezone.now().timestamp()),
                     notification=False,
                     origin=request.META.get("HTTP_ORIGIN"),
-                    intake=(intake_issue.id),
+                    inbox=(inbox_issue.id),
                 )
 
-                intake_issue = (
-                    IntakeIssue.objects.select_related("issue")
+                inbox_issue = (
+                    InboxIssue.objects.select_related("issue")
                     .prefetch_related(
                         "issue__labels",
                         "issue__assignees",
@@ -513,12 +507,7 @@ class IntakeIssueViewSet(BaseViewSet):
                             ArrayAgg(
                                 "issue__labels__id",
                                 distinct=True,
-                                filter=Q(
-                                    ~Q(issue__labels__id__isnull=True)
-                                    & Q(
-                                        issue__label_issue__deleted_at__isnull=True
-                                    )
-                                ),
+                                filter=~Q(issue__labels__id__isnull=True),
                             ),
                             Value([], output_field=ArrayField(UUIDField())),
                         ),
@@ -526,29 +515,24 @@ class IntakeIssueViewSet(BaseViewSet):
                             ArrayAgg(
                                 "issue__assignees__id",
                                 distinct=True,
-                                filter=Q(
-                                    ~Q(issue__assignees__id__isnull=True)
-                                    & Q(
-                                        issue__issue_assignee__deleted_at__isnull=True
-                                    )
-                                ),
+                                filter=~Q(issue__assignees__id__isnull=True),
                             ),
                             Value([], output_field=ArrayField(UUIDField())),
                         ),
                     )
                     .get(
-                        intake_id=intake_id.id,
+                        inbox_id=inbox_id.id,
                         issue_id=pk,
                         project_id=project_id,
                     )
                 )
-                serializer = IntakeIssueDetailSerializer(intake_issue).data
+                serializer = InboxIssueDetailSerializer(inbox_issue).data
                 return Response(serializer, status=status.HTTP_200_OK)
             return Response(
                 serializer.errors, status=status.HTTP_400_BAD_REQUEST
             )
         else:
-            serializer = IntakeIssueDetailSerializer(intake_issue).data
+            serializer = InboxIssueDetailSerializer(inbox_issue).data
             return Response(serializer, status=status.HTTP_200_OK)
 
     @allow_permission(
@@ -561,12 +545,12 @@ class IntakeIssueViewSet(BaseViewSet):
         model=Issue,
     )
     def retrieve(self, request, slug, project_id, pk):
-        intake_id = Intake.objects.filter(
+        inbox_id = Inbox.objects.filter(
             workspace__slug=slug, project_id=project_id
         ).first()
         project = Project.objects.get(pk=project_id)
-        intake_issue = (
-            IntakeIssue.objects.select_related("issue")
+        inbox_issue = (
+            InboxIssue.objects.select_related("issue")
             .prefetch_related(
                 "issue__labels",
                 "issue__assignees",
@@ -576,10 +560,7 @@ class IntakeIssueViewSet(BaseViewSet):
                     ArrayAgg(
                         "issue__labels__id",
                         distinct=True,
-                        filter=Q(
-                            ~Q(issue__labels__id__isnull=True)
-                            & Q(issue__label_issue__deleted_at__isnull=True)
-                        ),
+                        filter=~Q(issue__labels__id__isnull=True),
                     ),
                     Value([], output_field=ArrayField(UUIDField())),
                 ),
@@ -587,15 +568,12 @@ class IntakeIssueViewSet(BaseViewSet):
                     ArrayAgg(
                         "issue__assignees__id",
                         distinct=True,
-                        filter=Q(
-                            ~Q(issue__assignees__id__isnull=True)
-                            & Q(issue__issue_assignee__deleted_at__isnull=True)
-                        ),
+                        filter=~Q(issue__assignees__id__isnull=True),
                     ),
                     Value([], output_field=ArrayField(UUIDField())),
                 ),
             )
-            .get(intake_id=intake_id.id, issue_id=pk, project_id=project_id)
+            .get(inbox_id=inbox_id.id, issue_id=pk, project_id=project_id)
         )
         if (
             ProjectMember.objects.filter(
@@ -606,13 +584,13 @@ class IntakeIssueViewSet(BaseViewSet):
                 is_active=True,
             ).exists()
             and not project.guest_view_all_features
-            and not intake_issue.created_by == request.user
+            and not inbox_issue.created_by == request.user
         ):
             return Response(
                 {"error": "You are not allowed to view this issue"},
                 status=status.HTTP_400_BAD_REQUEST,
             )
-        issue = IntakeIssueDetailSerializer(intake_issue).data
+        issue = InboxIssueDetailSerializer(inbox_issue).data
         return Response(
             issue,
             status=status.HTTP_200_OK,
@@ -620,23 +598,23 @@ class IntakeIssueViewSet(BaseViewSet):
 
     @allow_permission(allowed_roles=[ROLE.ADMIN], creator=True, model=Issue)
     def destroy(self, request, slug, project_id, pk):
-        intake_id = Intake.objects.filter(
+        inbox_id = Inbox.objects.filter(
             workspace__slug=slug, project_id=project_id
         ).first()
-        intake_issue = IntakeIssue.objects.get(
+        inbox_issue = InboxIssue.objects.get(
             issue_id=pk,
             workspace__slug=slug,
             project_id=project_id,
-            intake_id=intake_id,
+            inbox_id=inbox_id,
         )
 
         # Check the issue status
-        if intake_issue.status in [-2, -1, 0, 2]:
+        if inbox_issue.status in [-2, -1, 0, 2]:
             # Delete the issue also
             issue = Issue.objects.filter(
                 workspace__slug=slug, project_id=project_id, pk=pk
             ).first()
             issue.delete()
 
-        intake_issue.delete()
+        inbox_issue.delete()
         return Response(status=status.HTTP_204_NO_CONTENT)

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

@@ -3,7 +3,7 @@ import json
 
 # Django imports
 from django.core.serializers.json import DjangoJSONEncoder
-from django.db.models import F, Func, OuterRef, Q, Prefetch, Exists, Subquery
+from django.db.models import F, Func, OuterRef, Q, Prefetch, Exists, Case, When
 from django.utils import timezone
 from django.utils.decorators import method_decorator
 from django.views.decorators.gzip import gzip_page
@@ -27,7 +27,6 @@ from plane.db.models import (
     IssueLink,
     IssueSubscriber,
     IssueReaction,
-    CycleIssue
 )
 from plane.utils.grouper import (
     issue_group_values,
@@ -66,10 +65,12 @@ class IssueArchiveViewSet(BaseViewSet):
             .select_related("workspace", "project", "state", "parent")
             .prefetch_related("assignees", "labels", "issue_module__module")
             .annotate(
-                cycle_id=Subquery(
-                    CycleIssue.objects.filter(
-                        issue=OuterRef("id"), deleted_at__isnull=True
-                    ).values("cycle_id")[:1]
+                cycle_id=Case(
+                    When(
+                        issue_cycle__cycle__deleted_at__isnull=True,
+                        then=F("issue_cycle__cycle_id"),
+                    ),
+                    default=None,
                 )
             )
             .annotate(
@@ -171,10 +172,10 @@ class IssueArchiveViewSet(BaseViewSet):
                         group_by_field_name=group_by,
                         sub_group_by_field_name=sub_group_by,
                         count_filter=Q(
-                            Q(issue_intake__status=1)
-                            | Q(issue_intake__status=-1)
-                            | Q(issue_intake__status=2)
-                            | Q(issue_intake__isnull=True),
+                            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,
                         ),
@@ -200,10 +201,10 @@ class IssueArchiveViewSet(BaseViewSet):
                     ),
                     group_by_field_name=group_by,
                     count_filter=Q(
-                        Q(issue_intake__status=1)
-                        | Q(issue_intake__status=-1)
-                        | Q(issue_intake__status=2)
-                        | Q(issue_intake__isnull=True),
+                        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,
                     ),

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

@@ -253,7 +253,6 @@ class IssueAttachmentV2Endpoint(BaseAPIView):
 
             # Update the attachment
             issue_attachment.is_uploaded = True
-            issue_attachment.created_by = request.user
 
         # Get the storage metadata
         if not issue_attachment.storage_metadata:

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

@@ -14,9 +14,8 @@ from django.db.models import (
     Q,
     UUIDField,
     Value,
-    Subquery,
-    Case,
     When,
+    Case,
 )
 from django.db.models.functions import Coalesce
 from django.utils import timezone
@@ -45,7 +44,6 @@ from plane.db.models import (
     IssueSubscriber,
     Project,
     ProjectMember,
-    CycleIssue,
 )
 from plane.utils.grouper import (
     issue_group_values,
@@ -88,10 +86,12 @@ class IssueListEndpoint(BaseAPIView):
             .select_related("workspace", "project", "state", "parent")
             .prefetch_related("assignees", "labels", "issue_module__module")
             .annotate(
-                cycle_id=Subquery(
-                    CycleIssue.objects.filter(
-                        issue=OuterRef("id"), deleted_at__isnull=True
-                    ).values("cycle_id")[:1]
+                cycle_id=Case(
+                    When(
+                        issue_cycle__cycle__deleted_at__isnull=True,
+                        then=F("issue_cycle__cycle_id"),
+                    ),
+                    default=None,
                 )
             )
             .annotate(
@@ -218,10 +218,12 @@ class IssueViewSet(BaseViewSet):
             .select_related("workspace", "project", "state", "parent")
             .prefetch_related("assignees", "labels", "issue_module__module")
             .annotate(
-                cycle_id=Subquery(
-                    CycleIssue.objects.filter(
-                        issue=OuterRef("id"), deleted_at__isnull=True
-                    ).values("cycle_id")[:1]
+                cycle_id=Case(
+                    When(
+                        issue_cycle__cycle__deleted_at__isnull=True,
+                        then=F("issue_cycle__cycle_id"),
+                    ),
+                    default=None,
                 )
             )
             .annotate(
@@ -336,10 +338,10 @@ class IssueViewSet(BaseViewSet):
                         group_by_field_name=group_by,
                         sub_group_by_field_name=sub_group_by,
                         count_filter=Q(
-                            Q(issue_intake__status=1)
-                            | Q(issue_intake__status=-1)
-                            | Q(issue_intake__status=2)
-                            | Q(issue_intake__isnull=True),
+                            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,
                         ),
@@ -364,10 +366,10 @@ class IssueViewSet(BaseViewSet):
                     ),
                     group_by_field_name=group_by,
                     count_filter=Q(
-                        Q(issue_intake__status=1)
-                        | Q(issue_intake__status=-1)
-                        | Q(issue_intake__status=2)
-                        | Q(issue_intake__isnull=True),
+                        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,
                     ),
@@ -480,53 +482,16 @@ class IssueViewSet(BaseViewSet):
         project = Project.objects.get(pk=project_id, workspace__slug=slug)
 
         issue = (
-            Issue.objects.filter(
-                project_id=self.kwargs.get("project_id")
-            )
-            .filter(workspace__slug=self.kwargs.get("slug"))
-            .select_related("workspace", "project", "state", "parent")
-            .prefetch_related("assignees", "labels", "issue_module__module")
-            .annotate(
-                cycle_id=Case(
-                    When(
-                        issue_cycle__cycle__deleted_at__isnull=True,
-                        then=F("issue_cycle__cycle_id"),
-                    ),
-                    default=None,
-                )
-            )
-            .annotate(
-                link_count=IssueLink.objects.filter(issue=OuterRef("id"))
-                .order_by()
-                .annotate(count=Func(F("id"), function="Count"))
-                .values("count")
-            )
-            .annotate(
-                attachment_count=FileAsset.objects.filter(
-                    issue_id=OuterRef("id"),
-                    entity_type=FileAsset.EntityTypeContext.ISSUE_ATTACHMENT,
-                )
-                .order_by()
-                .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")
-                )
+            self.get_queryset()
             .filter(pk=pk)
             .annotate(
                 label_ids=Coalesce(
                     ArrayAgg(
                         "labels__id",
                         distinct=True,
-                        filter=Q(
+                        filter=(
                             ~Q(labels__id__isnull=True)
-                            & Q(label_issue__deleted_at__isnull=True),
+                            & Q(labels__deleted_at__isnull=True)
                         ),
                     ),
                     Value([], output_field=ArrayField(UUIDField())),
@@ -535,11 +500,8 @@ class IssueViewSet(BaseViewSet):
                     ArrayAgg(
                         "assignees__id",
                         distinct=True,
-                        filter=Q(
-                            ~Q(assignees__id__isnull=True)
-                            & Q(assignees__member_project__is_active=True)
-                            & Q(issue_assignee__deleted_at__isnull=True)
-                        ),
+                        filter=~Q(assignees__id__isnull=True)
+                        & Q(assignees__member_project__is_active=True),
                     ),
                     Value([], output_field=ArrayField(UUIDField())),
                 ),
@@ -547,11 +509,9 @@ class IssueViewSet(BaseViewSet):
                     ArrayAgg(
                         "issue_module__module_id",
                         distinct=True,
-                        filter=Q(
-                            ~Q(issue_module__module_id__isnull=True)
-                            & Q(issue_module__module__archived_at__isnull=True)
-                            & Q(issue_module__deleted_at__isnull=True)
-                        ),
+                        filter=~Q(issue_module__module_id__isnull=True)
+                        & Q(issue_module__module__archived_at__isnull=True)
+                        & Q(issue_module__module__deleted_at__isnull=True),
                     ),
                     Value([], output_field=ArrayField(UUIDField())),
                 ),
@@ -630,9 +590,9 @@ class IssueViewSet(BaseViewSet):
                     ArrayAgg(
                         "labels__id",
                         distinct=True,
-                        filter=Q(
+                        filter=(
                             ~Q(labels__id__isnull=True)
-                            & Q(label_issue__deleted_at__isnull=True),
+                            & Q(labels__deleted_at__isnull=True)
                         ),
                     ),
                     Value([], output_field=ArrayField(UUIDField())),
@@ -641,11 +601,8 @@ class IssueViewSet(BaseViewSet):
                     ArrayAgg(
                         "assignees__id",
                         distinct=True,
-                        filter=Q(
-                            ~Q(assignees__id__isnull=True)
-                            & Q(assignees__member_project__is_active=True)
-                            & Q(issue_assignee__deleted_at__isnull=True)
-                        ),
+                        filter=~Q(assignees__id__isnull=True)
+                        & Q(assignees__member_project__is_active=True),
                     ),
                     Value([], output_field=ArrayField(UUIDField())),
                 ),
@@ -653,11 +610,9 @@ class IssueViewSet(BaseViewSet):
                     ArrayAgg(
                         "issue_module__module_id",
                         distinct=True,
-                        filter=Q(
-                            ~Q(issue_module__module_id__isnull=True)
-                            & Q(issue_module__module__archived_at__isnull=True)
-                            & Q(issue_module__deleted_at__isnull=True)
-                        ),
+                        filter=~Q(issue_module__module_id__isnull=True)
+                        & Q(issue_module__module__archived_at__isnull=True)
+                        & Q(issue_module__module__deleted_at__isnull=True),
                     ),
                     Value([], output_field=ArrayField(UUIDField())),
                 ),
@@ -821,10 +776,12 @@ class IssuePaginatedViewSet(BaseViewSet):
             )
             .prefetch_related("assignees", "labels", "issue_module__module")
             .annotate(
-                cycle_id=Subquery(
-                    CycleIssue.objects.filter(
-                        issue=OuterRef("id"), deleted_at__isnull=True
-                    ).values("cycle_id")[:1]
+                cycle_id=Case(
+                    When(
+                        issue_cycle__cycle__deleted_at__isnull=True,
+                        then=F("issue_cycle__cycle_id"),
+                    ),
+                    default=None,
                 )
             )
             .annotate(
@@ -933,9 +890,9 @@ class IssuePaginatedViewSet(BaseViewSet):
                 ArrayAgg(
                     "labels__id",
                     distinct=True,
-                    filter=Q(
+                    filter=(
                         ~Q(labels__id__isnull=True)
-                        & Q(label_issue__deleted_at__isnull=True),
+                        & Q(labels__deleted_at__isnull=True)
                     ),
                 ),
                 Value([], output_field=ArrayField(UUIDField())),
@@ -944,11 +901,8 @@ class IssuePaginatedViewSet(BaseViewSet):
                 ArrayAgg(
                     "assignees__id",
                     distinct=True,
-                    filter=Q(
-                        ~Q(assignees__id__isnull=True)
-                        & Q(assignees__member_project__is_active=True)
-                        & Q(issue_assignee__deleted_at__isnull=True)
-                    ),
+                    filter=~Q(assignees__id__isnull=True)
+                    & Q(assignees__member_project__is_active=True),
                 ),
                 Value([], output_field=ArrayField(UUIDField())),
             ),
@@ -956,11 +910,9 @@ class IssuePaginatedViewSet(BaseViewSet):
                 ArrayAgg(
                     "issue_module__module_id",
                     distinct=True,
-                    filter=Q(
-                        ~Q(issue_module__module_id__isnull=True)
-                        & Q(issue_module__module__archived_at__isnull=True)
-                        & Q(issue_module__deleted_at__isnull=True)
-                    ),
+                    filter=~Q(issue_module__module_id__isnull=True)
+                    & Q(issue_module__module__archived_at__isnull=True)
+                    & Q(issue_module__module__deleted_at__isnull=True),
                 ),
                 Value([], output_field=ArrayField(UUIDField())),
             ),
@@ -976,194 +928,3 @@ class IssuePaginatedViewSet(BaseViewSet):
         )
 
         return Response(paginated_data, status=status.HTTP_200_OK)
-
-
-class IssueDetailEndpoint(BaseAPIView):
-    @allow_permission([ROLE.ADMIN, ROLE.MEMBER, ROLE.GUEST])
-    def get(self, request, slug, project_id):
-        filters = issue_filters(request.query_params, "GET")
-        issue = (
-            Issue.issue_objects.filter(
-                workspace__slug=slug, project_id=project_id
-            )
-            .select_related("workspace", "project", "state", "parent")
-            .prefetch_related("assignees", "labels", "issue_module__module")
-            .annotate(
-                cycle_id=Subquery(
-                    CycleIssue.objects.filter(
-                        issue=OuterRef("id"), deleted_at__isnull=True
-                    ).values("cycle_id")[:1]
-                )
-            )
-            .annotate(
-                label_ids=Coalesce(
-                    ArrayAgg(
-                        "labels__id",
-                        distinct=True,
-                        filter=Q(
-                            ~Q(labels__id__isnull=True)
-                            & Q(label_issue__deleted_at__isnull=True),
-                        ),
-                    ),
-                    Value([], output_field=ArrayField(UUIDField())),
-                ),
-                assignee_ids=Coalesce(
-                    ArrayAgg(
-                        "assignees__id",
-                        distinct=True,
-                        filter=Q(
-                            ~Q(assignees__id__isnull=True)
-                            & Q(assignees__member_project__is_active=True)
-                            & Q(issue_assignee__deleted_at__isnull=True)
-                        ),
-                    ),
-                    Value([], output_field=ArrayField(UUIDField())),
-                ),
-                module_ids=Coalesce(
-                    ArrayAgg(
-                        "issue_module__module_id",
-                        distinct=True,
-                        filter=Q(
-                            ~Q(issue_module__module_id__isnull=True)
-                            & Q(issue_module__module__archived_at__isnull=True)
-                            & Q(issue_module__deleted_at__isnull=True)
-                        ),
-                    ),
-                    Value([], output_field=ArrayField(UUIDField())),
-                ),
-            )
-            .annotate(
-                link_count=IssueLink.objects.filter(issue=OuterRef("id"))
-                .order_by()
-                .annotate(count=Func(F("id"), function="Count"))
-                .values("count")
-            )
-            .annotate(
-                attachment_count=FileAsset.objects.filter(
-                    issue_id=OuterRef("id"),
-                    entity_type=FileAsset.EntityTypeContext.ISSUE_ATTACHMENT,
-                )
-                .order_by()
-                .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")
-            )
-        )
-        issue = issue.filter(**filters)
-        order_by_param = request.GET.get("order_by", "-created_at")
-        # Issue queryset
-        issue, order_by_param = order_issue_queryset(
-            issue_queryset=issue,
-            order_by_param=order_by_param,
-        )
-        return self.paginate(
-            request=request,
-            order_by=order_by_param,
-            queryset=(issue),
-            on_results=lambda issue: IssueSerializer(
-                issue,
-                many=True,
-                fields=self.fields,
-                expand=self.expand,
-            ).data,
-        )
-
-
-class IssueBulkUpdateDateEndpoint(BaseAPIView):
-
-    def validate_dates(
-        self, current_start, current_target, new_start, new_target
-    ):
-        """
-        Validate that start date is before target date.
-        """
-        start = new_start or current_start
-        target = new_target or current_target
-
-        if start and target and start > target:
-            return False
-        return True
-
-    @allow_permission([ROLE.ADMIN, ROLE.MEMBER])
-    def post(self, request, slug, project_id):
-
-        updates = request.data.get("updates", [])
-
-        issue_ids = [update["id"] for update in updates]
-        epoch = int(timezone.now().timestamp())
-
-        # Fetch all relevant issues in a single query
-        issues = list(Issue.objects.filter(id__in=issue_ids))
-        issues_dict = {str(issue.id): issue for issue in issues}
-        issues_to_update = []
-
-        for update in updates:
-            issue_id = update["id"]
-            issue = issues_dict.get(issue_id)
-
-            if not issue:
-                continue
-
-            start_date = update.get("start_date")
-            target_date = update.get("target_date")
-            validate_dates = self.validate_dates(
-                issue.start_date, issue.target_date, start_date, target_date
-            )
-            if not validate_dates:
-                return Response(
-                    {
-                        "message": "Start date cannot exceed target date",
-                    },
-                    status=status.HTTP_400_BAD_REQUEST,
-                )
-
-            if start_date:
-                issue_activity.delay(
-                    type="issue.activity.updated",
-                    requested_data=json.dumps(
-                        {"start_date": update.get("start_date")}
-                    ),
-                    current_instance=json.dumps(
-                        {"start_date": str(issue.start_date)}
-                    ),
-                    issue_id=str(issue_id),
-                    actor_id=str(request.user.id),
-                    project_id=str(project_id),
-                    epoch=epoch,
-                )
-                issue.start_date = start_date
-                issues_to_update.append(issue)
-
-            if target_date:
-                issue_activity.delay(
-                    type="issue.activity.updated",
-                    requested_data=json.dumps(
-                        {"target_date": update.get("target_date")}
-                    ),
-                    current_instance=json.dumps(
-                        {"target_date": str(issue.target_date)}
-                    ),
-                    issue_id=str(issue_id),
-                    actor_id=str(request.user.id),
-                    project_id=str(project_id),
-                    epoch=epoch,
-                )
-                issue.target_date = target_date
-                issues_to_update.append(issue)
-
-        # Bulk update issues
-        Issue.objects.bulk_update(
-            issues_to_update, ["start_date", "target_date"]
-        )
-
-        return Response(
-            {"message": "Issues updated successfully"},
-            status=status.HTTP_200_OK,
-        )

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

@@ -11,7 +11,8 @@ from django.db.models import (
     UUIDField,
     Value,
     CharField,
-    Subquery,
+    Case,
+    When,
 )
 from django.core.serializers.json import DjangoJSONEncoder
 from django.db.models.functions import Coalesce
@@ -35,10 +36,8 @@ from plane.db.models import (
     Issue,
     FileAsset,
     IssueLink,
-    CycleIssue,
 )
 from plane.bgtasks.issue_activities_task import issue_activity
-from plane.utils.issue_relation_mapper import get_actual_relation
 
 
 class IssueRelationViewSet(BaseViewSet):
@@ -90,35 +89,17 @@ class IssueRelationViewSet(BaseViewSet):
             related_issue_id=issue_id, relation_type="relates_to"
         ).values_list("issue_id", flat=True)
 
-        # get all start after issues
-        start_after_issues = issue_relations.filter(
-            relation_type="start_before", related_issue_id=issue_id
-        ).values_list("issue_id", flat=True)
-
-        # get all start_before issues
-        start_before_issues = issue_relations.filter(
-            relation_type="start_before", issue_id=issue_id
-        ).values_list("related_issue_id", flat=True)
-
-        # get all finish after issues
-        finish_after_issues = issue_relations.filter(
-            relation_type="finish_before", related_issue_id=issue_id
-        ).values_list("issue_id", flat=True)
-
-        # get all finish before issues
-        finish_before_issues = issue_relations.filter(
-            relation_type="finish_before", issue_id=issue_id
-        ).values_list("related_issue_id", flat=True)
-
         queryset = (
             Issue.issue_objects.filter(workspace__slug=slug)
             .select_related("workspace", "project", "state", "parent")
             .prefetch_related("assignees", "labels", "issue_module__module")
             .annotate(
-                cycle_id=Subquery(
-                    CycleIssue.objects.filter(
-                        issue=OuterRef("id"), deleted_at__isnull=True
-                    ).values("cycle_id")[:1]
+                cycle_id=Case(
+                    When(
+                        issue_cycle__cycle__deleted_at__isnull=True,
+                        then=F("issue_cycle__cycle_id"),
+                    ),
+                    default=None,
                 )
             )
             .annotate(
@@ -149,9 +130,9 @@ class IssueRelationViewSet(BaseViewSet):
                     ArrayAgg(
                         "labels__id",
                         distinct=True,
-                        filter=Q(
+                        filter=(
                             ~Q(labels__id__isnull=True)
-                            & (Q(label_issue__deleted_at__isnull=True))
+                            & Q(labels__deleted_at__isnull=True)
                         ),
                     ),
                     Value([], output_field=ArrayField(UUIDField())),
@@ -160,11 +141,8 @@ class IssueRelationViewSet(BaseViewSet):
                     ArrayAgg(
                         "assignees__id",
                         distinct=True,
-                        filter=Q(
-                            ~Q(assignees__id__isnull=True)
-                            & Q(assignees__member_project__is_active=True)
-                            & Q(issue_assignee__deleted_at__isnull=True)
-                        ),
+                        filter=~Q(assignees__id__isnull=True)
+                        & Q(assignees__member_project__is_active=True),
                     ),
                     Value([], output_field=ArrayField(UUIDField())),
                 ),
@@ -232,50 +210,12 @@ class IssueRelationViewSet(BaseViewSet):
                 )
             )
             .values(*fields),
-            "start_after": queryset.filter(pk__in=start_after_issues)
-            .annotate(
-                relation_type=Value(
-                    "start_after",
-                    output_field=CharField(),
-                )
-            )
-            .values(*fields),
-            "start_before": queryset.filter(pk__in=start_before_issues)
-            .annotate(
-                relation_type=Value(
-                    "start_before",
-                    output_field=CharField(),
-                )
-            )
-            .values(*fields),
-            "finish_after": queryset.filter(pk__in=finish_after_issues)
-            .annotate(
-                relation_type=Value(
-                    "finish_after",
-                    output_field=CharField(),
-                )
-            )
-            .values(*fields),
-            "finish_before": queryset.filter(pk__in=finish_before_issues)
-            .annotate(
-                relation_type=Value(
-                    "finish_before",
-                    output_field=CharField(),
-                )
-            )
-            .values(*fields),
         }
 
         return Response(response_data, status=status.HTTP_200_OK)
 
     def create(self, request, slug, project_id, issue_id):
         relation_type = request.data.get("relation_type", None)
-        if relation_type is None:
-            return Response(
-                {"message": "Issue relation type is required"},
-                status=status.HTTP_400_BAD_REQUEST,
-            )
-
         issues = request.data.get("issues", [])
         project = Project.objects.get(pk=project_id)
 
@@ -283,18 +223,16 @@ class IssueRelationViewSet(BaseViewSet):
             [
                 IssueRelation(
                     issue_id=(
-                        issue
-                        if relation_type
-                        in ["blocking", "start_after", "finish_after"]
-                        else issue_id
+                        issue if relation_type == "blocking" else issue_id
                     ),
                     related_issue_id=(
-                        issue_id
-                        if relation_type
-                        in ["blocking", "start_after", "finish_after"]
-                        else issue
+                        issue_id if relation_type == "blocking" else issue
+                    ),
+                    relation_type=(
+                        "blocked_by"
+                        if relation_type == "blocking"
+                        else relation_type
                     ),
-                    relation_type=(get_actual_relation(relation_type)),
                     project_id=project_id,
                     workspace_id=project.workspace_id,
                     created_by=request.user,
@@ -318,7 +256,7 @@ class IssueRelationViewSet(BaseViewSet):
             origin=request.META.get("HTTP_ORIGIN"),
         )
 
-        if relation_type in ["blocking", "start_after", "finish_after"]:
+        if relation_type == "blocking":
             return Response(
                 RelatedIssueSerializer(issue_relation, many=True).data,
                 status=status.HTTP_201_CREATED,
@@ -333,7 +271,7 @@ class IssueRelationViewSet(BaseViewSet):
         relation_type = request.data.get("relation_type", None)
         related_issue = request.data.get("related_issue", None)
 
-        if relation_type in ["blocking", "start_after", "finish_after"]:
+        if relation_type == "blocking":
             issue_relation = IssueRelation.objects.get(
                 workspace__slug=slug,
                 project_id=project_id,
@@ -351,7 +289,7 @@ class IssueRelationViewSet(BaseViewSet):
             IssueRelationSerializer(issue_relation).data,
             cls=DjangoJSONEncoder,
         )
-        issue_relation.delete()
+        issue_relation.delete(soft=False)
         issue_activity.delay(
             type="issue_relation.activity.deleted",
             requested_data=json.dumps(request.data, cls=DjangoJSONEncoder),

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

@@ -3,7 +3,16 @@ import json
 
 # Django imports
 from django.utils import timezone
-from django.db.models import OuterRef, Func, F, Q, Value, UUIDField, Subquery
+from django.db.models import (
+    OuterRef,
+    Func,
+    F,
+    Q,
+    Value,
+    UUIDField,
+    Case,
+    When,
+)
 from django.utils.decorators import method_decorator
 from django.views.decorators.gzip import gzip_page
 from django.contrib.postgres.aggregates import ArrayAgg
@@ -22,7 +31,6 @@ from plane.db.models import (
     Issue,
     IssueLink,
     FileAsset,
-    CycleIssue,
 )
 from plane.bgtasks.issue_activities_task import issue_activity
 from plane.utils.user_timezone_converter import user_timezone_converter
@@ -43,10 +51,12 @@ class SubIssuesEndpoint(BaseAPIView):
             .select_related("workspace", "project", "state", "parent")
             .prefetch_related("assignees", "labels", "issue_module__module")
             .annotate(
-                cycle_id=Subquery(
-                    CycleIssue.objects.filter(
-                        issue=OuterRef("id"), deleted_at__isnull=True
-                    ).values("cycle_id")[:1]
+                cycle_id=Case(
+                    When(
+                        issue_cycle__cycle__deleted_at__isnull=True,
+                        then=F("issue_cycle__cycle_id"),
+                    ),
+                    default=None,
                 )
             )
             .annotate(
@@ -77,9 +87,9 @@ class SubIssuesEndpoint(BaseAPIView):
                     ArrayAgg(
                         "labels__id",
                         distinct=True,
-                        filter=Q(
+                        filter=(
                             ~Q(labels__id__isnull=True)
-                            & Q(label_issue__deleted_at__isnull=True),
+                            & Q(labels__deleted_at__isnull=True)
                         ),
                     ),
                     Value([], output_field=ArrayField(UUIDField())),
@@ -88,11 +98,8 @@ class SubIssuesEndpoint(BaseAPIView):
                     ArrayAgg(
                         "assignees__id",
                         distinct=True,
-                        filter=Q(
-                            ~Q(assignees__id__isnull=True)
-                            & Q(assignees__member_project__is_active=True)
-                            & Q(issue_assignee__deleted_at__isnull=True)
-                        ),
+                        filter=~Q(assignees__id__isnull=True)
+                        & Q(assignees__member_project__is_active=True),
                     ),
                     Value([], output_field=ArrayField(UUIDField())),
                 ),
@@ -100,11 +107,9 @@ class SubIssuesEndpoint(BaseAPIView):
                     ArrayAgg(
                         "issue_module__module_id",
                         distinct=True,
-                        filter=Q(
-                            ~Q(issue_module__module_id__isnull=True)
-                            & Q(issue_module__module__archived_at__isnull=True)
-                            & Q(issue_module__deleted_at__isnull=True)
-                        ),
+                        filter=~Q(issue_module__module_id__isnull=True)
+                        & Q(issue_module__module__archived_at__isnull=True)
+                        & Q(issue_module__module__deleted_at__isnull=True),
                     ),
                     Value([], output_field=ArrayField(UUIDField())),
                 ),

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

@@ -57,7 +57,6 @@ class ModuleArchiveUnarchiveEndpoint(BaseAPIView):
             Issue.issue_objects.filter(
                 state__group="cancelled",
                 issue_module__module_id=OuterRef("pk"),
-                issue_module__deleted_at__isnull=True,
             )
             .values("issue_module__module_id")
             .annotate(cnt=Count("pk"))
@@ -67,7 +66,6 @@ class ModuleArchiveUnarchiveEndpoint(BaseAPIView):
             Issue.issue_objects.filter(
                 state__group="completed",
                 issue_module__module_id=OuterRef("pk"),
-                issue_module__deleted_at__isnull=True,
             )
             .values("issue_module__module_id")
             .annotate(cnt=Count("pk"))
@@ -77,7 +75,6 @@ class ModuleArchiveUnarchiveEndpoint(BaseAPIView):
             Issue.issue_objects.filter(
                 state__group="started",
                 issue_module__module_id=OuterRef("pk"),
-                issue_module__deleted_at__isnull=True,
             )
             .values("issue_module__module_id")
             .annotate(cnt=Count("pk"))
@@ -87,7 +84,6 @@ class ModuleArchiveUnarchiveEndpoint(BaseAPIView):
             Issue.issue_objects.filter(
                 state__group="unstarted",
                 issue_module__module_id=OuterRef("pk"),
-                issue_module__deleted_at__isnull=True,
             )
             .values("issue_module__module_id")
             .annotate(cnt=Count("pk"))
@@ -97,7 +93,6 @@ class ModuleArchiveUnarchiveEndpoint(BaseAPIView):
             Issue.issue_objects.filter(
                 state__group="backlog",
                 issue_module__module_id=OuterRef("pk"),
-                issue_module__deleted_at__isnull=True,
             )
             .values("issue_module__module_id")
             .annotate(cnt=Count("pk"))
@@ -106,7 +101,6 @@ class ModuleArchiveUnarchiveEndpoint(BaseAPIView):
         total_issues = (
             Issue.issue_objects.filter(
                 issue_module__module_id=OuterRef("pk"),
-                issue_module__deleted_at__isnull=True,
             )
             .values("issue_module__module_id")
             .annotate(cnt=Count("pk"))
@@ -117,7 +111,6 @@ class ModuleArchiveUnarchiveEndpoint(BaseAPIView):
                 estimate_point__estimate__type="points",
                 state__group="completed",
                 issue_module__module_id=OuterRef("pk"),
-                issue_module__deleted_at__isnull=True,
             )
             .values("issue_module__module_id")
             .annotate(
@@ -132,7 +125,6 @@ class ModuleArchiveUnarchiveEndpoint(BaseAPIView):
             Issue.issue_objects.filter(
                 estimate_point__estimate__type="points",
                 issue_module__module_id=OuterRef("pk"),
-                issue_module__deleted_at__isnull=True,
             )
             .values("issue_module__module_id")
             .annotate(
@@ -147,7 +139,6 @@ class ModuleArchiveUnarchiveEndpoint(BaseAPIView):
                 estimate_point__estimate__type="points",
                 state__group="backlog",
                 issue_module__module_id=OuterRef("pk"),
-                issue_module__deleted_at__isnull=True,
             )
             .values("issue_module__module_id")
             .annotate(
@@ -162,7 +153,6 @@ class ModuleArchiveUnarchiveEndpoint(BaseAPIView):
                 estimate_point__estimate__type="points",
                 state__group="unstarted",
                 issue_module__module_id=OuterRef("pk"),
-                issue_module__deleted_at__isnull=True,
             )
             .values("issue_module__module_id")
             .annotate(
@@ -177,7 +167,6 @@ class ModuleArchiveUnarchiveEndpoint(BaseAPIView):
                 estimate_point__estimate__type="points",
                 state__group="started",
                 issue_module__module_id=OuterRef("pk"),
-                issue_module__deleted_at__isnull=True,
             )
             .values("issue_module__module_id")
             .annotate(
@@ -192,7 +181,6 @@ class ModuleArchiveUnarchiveEndpoint(BaseAPIView):
                 estimate_point__estimate__type="points",
                 state__group="cancelled",
                 issue_module__module_id=OuterRef("pk"),
-                issue_module__deleted_at__isnull=True,
             )
             .values("issue_module__module_id")
             .annotate(
@@ -349,7 +337,6 @@ class ModuleArchiveUnarchiveEndpoint(BaseAPIView):
                         project_id=self.kwargs.get("project_id"),
                         parent__isnull=False,
                         issue_module__module_id=pk,
-                        issue_module__deleted_at__isnull=True,
                     )
                     .order_by()
                     .annotate(count=Func(F("id"), function="Count"))
@@ -373,7 +360,6 @@ class ModuleArchiveUnarchiveEndpoint(BaseAPIView):
                 assignee_distribution = (
                     Issue.issue_objects.filter(
                         issue_module__module_id=pk,
-                        issue_module__deleted_at__isnull=True,
                         workspace__slug=slug,
                         project_id=project_id,
                     )
@@ -492,7 +478,6 @@ class ModuleArchiveUnarchiveEndpoint(BaseAPIView):
             assignee_distribution = (
                 Issue.issue_objects.filter(
                     issue_module__module_id=pk,
-                    issue_module__deleted_at__isnull=True,
                     workspace__slug=slug,
                     project_id=project_id,
                 )
@@ -562,7 +547,6 @@ class ModuleArchiveUnarchiveEndpoint(BaseAPIView):
             label_distribution = (
                 Issue.issue_objects.filter(
                     issue_module__module_id=pk,
-                    issue_module__deleted_at__isnull=True,
                     workspace__slug=slug,
                     project_id=project_id,
                 )

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

@@ -85,7 +85,6 @@ class ModuleViewSet(BaseViewSet):
             Issue.issue_objects.filter(
                 state__group="cancelled",
                 issue_module__module_id=OuterRef("pk"),
-                issue_module__deleted_at__isnull=True,
             )
             .values("issue_module__module_id")
             .annotate(cnt=Count("pk"))
@@ -95,7 +94,6 @@ class ModuleViewSet(BaseViewSet):
             Issue.issue_objects.filter(
                 state__group="completed",
                 issue_module__module_id=OuterRef("pk"),
-                issue_module__deleted_at__isnull=True,
             )
             .values("issue_module__module_id")
             .annotate(cnt=Count("pk"))
@@ -105,7 +103,6 @@ class ModuleViewSet(BaseViewSet):
             Issue.issue_objects.filter(
                 state__group="started",
                 issue_module__module_id=OuterRef("pk"),
-                issue_module__deleted_at__isnull=True,
             )
             .values("issue_module__module_id")
             .annotate(cnt=Count("pk"))
@@ -115,7 +112,6 @@ class ModuleViewSet(BaseViewSet):
             Issue.issue_objects.filter(
                 state__group="unstarted",
                 issue_module__module_id=OuterRef("pk"),
-                issue_module__deleted_at__isnull=True,
             )
             .values("issue_module__module_id")
             .annotate(cnt=Count("pk"))
@@ -125,7 +121,6 @@ class ModuleViewSet(BaseViewSet):
             Issue.issue_objects.filter(
                 state__group="backlog",
                 issue_module__module_id=OuterRef("pk"),
-                issue_module__deleted_at__isnull=True,
             )
             .values("issue_module__module_id")
             .annotate(cnt=Count("pk"))
@@ -134,7 +129,6 @@ class ModuleViewSet(BaseViewSet):
         total_issues = (
             Issue.issue_objects.filter(
                 issue_module__module_id=OuterRef("pk"),
-                issue_module__deleted_at__isnull=True,
             )
             .values("issue_module__module_id")
             .annotate(cnt=Count("pk"))
@@ -145,7 +139,6 @@ class ModuleViewSet(BaseViewSet):
                 estimate_point__estimate__type="points",
                 state__group="completed",
                 issue_module__module_id=OuterRef("pk"),
-                issue_module__deleted_at__isnull=True,
             )
             .values("issue_module__module_id")
             .annotate(
@@ -160,7 +153,6 @@ class ModuleViewSet(BaseViewSet):
             Issue.issue_objects.filter(
                 estimate_point__estimate__type="points",
                 issue_module__module_id=OuterRef("pk"),
-                issue_module__deleted_at__isnull=True,
             )
             .values("issue_module__module_id")
             .annotate(
@@ -175,7 +167,6 @@ class ModuleViewSet(BaseViewSet):
                 estimate_point__estimate__type="points",
                 state__group="backlog",
                 issue_module__module_id=OuterRef("pk"),
-                issue_module__deleted_at__isnull=True,
             )
             .values("issue_module__module_id")
             .annotate(
@@ -190,7 +181,6 @@ class ModuleViewSet(BaseViewSet):
                 estimate_point__estimate__type="points",
                 state__group="unstarted",
                 issue_module__module_id=OuterRef("pk"),
-                issue_module__deleted_at__isnull=True,
             )
             .values("issue_module__module_id")
             .annotate(
@@ -205,7 +195,6 @@ class ModuleViewSet(BaseViewSet):
                 estimate_point__estimate__type="points",
                 state__group="started",
                 issue_module__module_id=OuterRef("pk"),
-                issue_module__deleted_at__isnull=True,
             )
             .values("issue_module__module_id")
             .annotate(
@@ -220,7 +209,6 @@ class ModuleViewSet(BaseViewSet):
                 estimate_point__estimate__type="points",
                 state__group="cancelled",
                 issue_module__module_id=OuterRef("pk"),
-                issue_module__deleted_at__isnull=True,
             )
             .values("issue_module__module_id")
             .annotate(
@@ -460,7 +448,6 @@ class ModuleViewSet(BaseViewSet):
                     project_id=self.kwargs.get("project_id"),
                     parent__isnull=False,
                     issue_module__module_id=pk,
-                    issue_module__deleted_at__isnull=True,
                 )
                 .order_by()
                 .annotate(count=Func(F("id"), function="Count"))
@@ -490,7 +477,6 @@ class ModuleViewSet(BaseViewSet):
             assignee_distribution = (
                 Issue.issue_objects.filter(
                     issue_module__module_id=pk,
-                    issue_module__deleted_at__isnull=True,
                     workspace__slug=slug,
                     project_id=project_id,
                 )
@@ -556,7 +542,6 @@ class ModuleViewSet(BaseViewSet):
             label_distribution = (
                 Issue.issue_objects.filter(
                     issue_module__module_id=pk,
-                    issue_module__deleted_at__isnull=True,
                     workspace__slug=slug,
                     project_id=project_id,
                 )
@@ -608,7 +593,6 @@ class ModuleViewSet(BaseViewSet):
         assignee_distribution = (
             Issue.issue_objects.filter(
                 issue_module__module_id=pk,
-                issue_module__deleted_at__isnull=True,
                 workspace__slug=slug,
                 project_id=project_id,
             )
@@ -678,7 +662,6 @@ class ModuleViewSet(BaseViewSet):
         label_distribution = (
             Issue.issue_objects.filter(
                 issue_module__module_id=pk,
-                issue_module__deleted_at__isnull=True,
                 workspace__slug=slug,
                 project_id=project_id,
             )

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

@@ -1,7 +1,14 @@
 # Python imports
 import json
 
-from django.db.models import F, Func, OuterRef, Q, Subquery
+from django.db.models import (
+    F,
+    Func,
+    OuterRef,
+    Q,
+    Case,
+    When,
+)
 
 # Django Imports
 from django.utils import timezone
@@ -23,7 +30,6 @@ from plane.db.models import (
     IssueLink,
     ModuleIssue,
     Project,
-    CycleIssue,
 )
 from plane.utils.grouper import (
     issue_group_values,
@@ -58,15 +64,16 @@ class ModuleIssueViewSet(BaseViewSet):
                 project_id=self.kwargs.get("project_id"),
                 workspace__slug=self.kwargs.get("slug"),
                 issue_module__module_id=self.kwargs.get("module_id"),
-                issue_module__deleted_at__isnull=True,
             )
             .select_related("workspace", "project", "state", "parent")
             .prefetch_related("assignees", "labels", "issue_module__module")
             .annotate(
-                cycle_id=Subquery(
-                    CycleIssue.objects.filter(
-                        issue=OuterRef("id"), deleted_at__isnull=True
-                    ).values("cycle_id")[:1]
+                cycle_id=Case(
+                    When(
+                        issue_cycle__cycle__deleted_at__isnull=True,
+                        then=F("issue_cycle__cycle_id"),
+                    ),
+                    default=None,
                 )
             )
             .annotate(
@@ -160,10 +167,10 @@ class ModuleIssueViewSet(BaseViewSet):
                         group_by_field_name=group_by,
                         sub_group_by_field_name=sub_group_by,
                         count_filter=Q(
-                            Q(issue_intake__status=1)
-                            | Q(issue_intake__status=-1)
-                            | Q(issue_intake__status=2)
-                            | Q(issue_intake__isnull=True),
+                            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,
                         ),
@@ -189,10 +196,10 @@ class ModuleIssueViewSet(BaseViewSet):
                     ),
                     group_by_field_name=group_by,
                     count_filter=Q(
-                        Q(issue_intake__status=1)
-                        | Q(issue_intake__status=-1)
-                        | Q(issue_intake__status=2)
-                        | Q(issue_intake__isnull=True),
+                        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,
                     ),

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

@@ -53,9 +53,9 @@ class NotificationViewSet(BaseViewSet, BasePaginator):
         mentioned = request.GET.get("mentioned", False)
         q_filters = Q()
 
-        intake_issue = Issue.objects.filter(
+        inbox_issue = Issue.objects.filter(
             pk=OuterRef("entity_identifier"),
-            issue_intake__status__in=[0, 2, -2],
+            issue_inbox__status__in=[0, 2, -2],
             workspace__slug=self.kwargs.get("slug"),
         )
 
@@ -64,8 +64,7 @@ class NotificationViewSet(BaseViewSet, BasePaginator):
                 workspace__slug=slug, receiver_id=request.user.id
             )
             .filter(entity_name="issue")
-            .annotate(is_inbox_issue=Exists(intake_issue))
-            .annotate(is_intake_issue=Exists(intake_issue))
+            .annotate(is_inbox_issue=Exists(inbox_issue))
             .annotate(
                 is_mentioned_notification=Case(
                     When(sender__icontains="mentioned", then=True),

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

@@ -38,7 +38,7 @@ from plane.app.permissions import (
 from plane.db.models import (
     UserFavorite,
     Cycle,
-    Intake,
+    Inbox,
     DeployBoard,
     IssueUserProperty,
     Issue,
@@ -429,9 +429,6 @@ class ProjectViewSet(BaseViewSet):
                 )
 
             workspace = Workspace.objects.get(slug=slug)
-            intake_view = request.data.get(
-                "inbox_view", request.data.get("intake_view", False)
-            )
 
             project = Project.objects.get(pk=pk)
             current_instance = json.dumps(
@@ -445,24 +442,21 @@ class ProjectViewSet(BaseViewSet):
 
             serializer = ProjectSerializer(
                 project,
-                data={
-                    **request.data,
-                    "intake_view": intake_view,
-                },
+                data={**request.data},
                 context={"workspace_id": workspace.id},
                 partial=True,
             )
 
             if serializer.is_valid():
                 serializer.save()
-                if intake_view:
-                    intake = Intake.objects.filter(
+                if serializer.data["inbox_view"]:
+                    inbox = Inbox.objects.filter(
                         project=project,
                         is_default=True,
                     ).first()
-                    if not intake:
-                        Intake.objects.create(
-                            name=f"{project.name} Intake",
+                    if not inbox:
+                        Inbox.objects.create(
+                            name=f"{project.name} Inbox",
                             project=project,
                             is_default=True,
                         )
@@ -471,7 +465,7 @@ class ProjectViewSet(BaseViewSet):
                     State.objects.get_or_create(
                         name="Triage",
                         group="triage",
-                        description="Default state for managing all Intake Issues",
+                        description="Default state for managing all Inbox Issues",
                         project_id=pk,
                         color="#ff7700",
                         is_triage=True,
@@ -765,7 +759,7 @@ class DeployBoardViewSet(BaseViewSet):
     def create(self, request, slug, project_id):
         comments = request.data.get("is_comments_enabled", False)
         reactions = request.data.get("is_reactions_enabled", False)
-        intake = request.data.get("intake", None)
+        inbox = request.data.get("inbox", None)
         votes = request.data.get("is_votes_enabled", False)
         views = request.data.get(
             "views",
@@ -783,7 +777,7 @@ class DeployBoardViewSet(BaseViewSet):
             entity_identifier=project_id,
             project_id=project_id,
         )
-        project_deploy_board.intake = intake
+        project_deploy_board.inbox = inbox
         project_deploy_board.view_props = views
         project_deploy_board.is_votes_enabled = votes
         project_deploy_board.is_comments_enabled = comments

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

@@ -42,56 +42,47 @@ class IssueSearchEndpoint(BaseAPIView):
             issues = search_issues(query, issues)
 
         if parent == "true" and issue_id:
-            issue = Issue.issue_objects.filter(pk=issue_id).first()
-            if issue:
-                issues = issues.filter(
-                    ~Q(pk=issue_id),
-                    ~Q(pk=issue.parent_id),
-                    ~Q(parent_id=issue_id),
-                )
+            issue = Issue.issue_objects.get(pk=issue_id)
+            issues = issues.filter(
+                ~Q(pk=issue_id), ~Q(pk=issue.parent_id), ~Q(parent_id=issue_id)
+            )
         if issue_relation == "true" and issue_id:
-            issue = Issue.issue_objects.filter(pk=issue_id).first()
-            if issue:
-                issues = issues.filter(
-                    ~Q(pk=issue_id),
-                    ~(
-                        Q(issue_related__issue=issue)
-                        & Q(issue_related__deleted_at__isnull=True)
-                    ),
-                    ~(
-                        Q(issue_relation__related_issue=issue)
-                        & Q(issue_relation__deleted_at__isnull=True)
-                    ),
-                )
+            issue = Issue.issue_objects.get(pk=issue_id)
+            issues = issues.filter(
+                ~Q(pk=issue_id),
+                ~Q(
+                    issue_related__issue=issue,
+                    issue_related__deleted_at__isnull=True,
+                ),
+                ~Q(
+                    issue_relation__related_issue=issue,
+                    issue_related__deleted_at__isnull=True,
+                ),
+            )
         if sub_issue == "true" and issue_id:
-            issue = Issue.issue_objects.filter(pk=issue_id).first()
-            if issue:
-                issues = issues.filter(~Q(pk=issue_id), parent__isnull=True)
+            issue = Issue.issue_objects.get(pk=issue_id)
+            issues = issues.filter(~Q(pk=issue_id), parent__isnull=True)
             if issue.parent:
                 issues = issues.filter(~Q(pk=issue.parent_id))
 
         if cycle == "true":
-            issues = issues.exclude(
-                Q(issue_cycle__isnull=False)
-                & Q(issue_cycle__deleted_at__isnull=True)
-            )
+            issues = issues.exclude(issue_cycle__isnull=False)
 
         if module:
-            issues = issues.exclude(
-                Q(issue_module__module=module)
-                & Q(issue_module__deleted_at__isnull=True)
-            )
+            issues = issues.exclude(issue_module__module=module)
 
         if target_date == "none":
             issues = issues.filter(target_date__isnull=True)
-
+        
         if ProjectMember.objects.filter(
             project_id=project_id,
             member=self.request.user,
             is_active=True,
-            role=5,
+            role=5
         ).exists():
-            issues = issues.filter(created_by=self.request.user)
+            issues = issues.filter(
+                created_by=self.request.user
+        )
 
         return Response(
             issues.values(

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

@@ -32,6 +32,7 @@ from plane.db.models import (
     Session,
 )
 from plane.license.models import Instance, InstanceAdmin
+from plane.utils.cache import cache_response, invalidate_cache
 from plane.utils.paginator import BasePaginator
 from plane.authentication.utils.host import user_ip
 from plane.bgtasks.user_deactivation_email_task import user_deactivation_email
@@ -48,6 +49,7 @@ class UserEndpoint(BaseViewSet):
     def get_object(self):
         return self.request.user
 
+    @cache_response(60 * 60)
     @method_decorator(cache_control(private=True, max_age=12))
     @method_decorator(vary_on_cookie)
     def retrieve(self, request):
@@ -57,12 +59,14 @@ class UserEndpoint(BaseViewSet):
             status=status.HTTP_200_OK,
         )
 
+    @cache_response(60 * 60)
     @method_decorator(cache_control(private=True, max_age=12))
     @method_decorator(vary_on_cookie)
     def retrieve_user_settings(self, request):
         serialized_data = UserMeSettingsSerializer(request.user).data
         return Response(serialized_data, status=status.HTTP_200_OK)
 
+    @cache_response(60 * 60)
     def retrieve_instance_admin(self, request):
         instance = Instance.objects.first()
         is_admin = InstanceAdmin.objects.filter(
@@ -72,9 +76,19 @@ 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/",
+    )
     def partial_update(self, request, *args, **kwargs):
         return super().partial_update(request, *args, **kwargs)
 
+    @invalidate_cache(path="/api/users/me/")
+    @invalidate_cache(
+        path="/api/users/me/workspaces/", multiple=True, user=False
+    )
     def deactivate(self, request):
         # Check all workspace user is active
         user = self.get_object()
@@ -221,6 +235,7 @@ class UserSessionEndpoint(BaseAPIView):
 
 class UpdateUserOnBoardedEndpoint(BaseAPIView):
 
+    @invalidate_cache(path="/api/users/me/")
     def patch(self, request):
         profile = Profile.objects.get(user_id=request.user.id)
         profile.is_onboarded = request.data.get("is_onboarded", False)
@@ -232,6 +247,7 @@ class UpdateUserOnBoardedEndpoint(BaseAPIView):
 
 class UpdateUserTourCompletedEndpoint(BaseAPIView):
 
+    @invalidate_cache(path="/api/users/me/")
     def patch(self, request):
         profile = Profile.objects.get(user_id=request.user.id)
         profile.is_tour_completed = request.data.get(
@@ -289,6 +305,7 @@ class ProfileEndpoint(BaseAPIView):
         serializer = ProfileSerializer(profile)
         return Response(serializer.data, status=status.HTTP_200_OK)
 
+    @invalidate_cache("/api/users/me/settings/")
     def patch(self, request):
         profile = Profile.objects.get(user=request.user)
         serializer = ProfileSerializer(

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

@@ -9,7 +9,8 @@ from django.db.models import (
     Q,
     UUIDField,
     Value,
-    Subquery,
+    Case,
+    When,
 )
 from django.db.models.functions import Coalesce
 from django.utils.decorators import method_decorator
@@ -37,7 +38,6 @@ from plane.db.models import (
     WorkspaceMember,
     ProjectMember,
     Project,
-    CycleIssue,
 )
 from plane.utils.grouper import (
     issue_group_values,
@@ -208,10 +208,12 @@ class WorkspaceViewIssuesViewSet(BaseViewSet):
             .select_related("workspace", "project", "state", "parent")
             .prefetch_related("assignees", "labels", "issue_module__module")
             .annotate(
-                cycle_id=Subquery(
-                    CycleIssue.objects.filter(
-                        issue=OuterRef("id"), deleted_at__isnull=True
-                    ).values("cycle_id")[:1]
+                cycle_id=Case(
+                    When(
+                        issue_cycle__cycle__deleted_at__isnull=True,
+                        then=F("issue_cycle__cycle_id"),
+                    ),
+                    default=None,
                 )
             )
             .annotate(
@@ -242,9 +244,9 @@ class WorkspaceViewIssuesViewSet(BaseViewSet):
                     ArrayAgg(
                         "labels__id",
                         distinct=True,
-                        filter=Q(
+                        filter=(
                             ~Q(labels__id__isnull=True)
-                            & Q(label_issue__deleted_at__isnull=True),
+                            & Q(labels__deleted_at__isnull=True)
                         ),
                     ),
                     Value([], output_field=ArrayField(UUIDField())),
@@ -253,11 +255,8 @@ class WorkspaceViewIssuesViewSet(BaseViewSet):
                     ArrayAgg(
                         "assignees__id",
                         distinct=True,
-                        filter=Q(
-                            ~Q(assignees__id__isnull=True)
-                            & Q(assignees__member_project__is_active=True)
-                            & Q(issue_assignee__deleted_at__isnull=True)
-                        ),
+                        filter=~Q(assignees__id__isnull=True)
+                        & Q(assignees__member_project__is_active=True),
                     ),
                     Value([], output_field=ArrayField(UUIDField())),
                 ),
@@ -265,11 +264,9 @@ class WorkspaceViewIssuesViewSet(BaseViewSet):
                     ArrayAgg(
                         "issue_module__module_id",
                         distinct=True,
-                        filter=Q(
-                            ~Q(issue_module__module_id__isnull=True)
-                            & Q(issue_module__module__archived_at__isnull=True)
-                            & Q(issue_module__deleted_at__isnull=True)
-                        ),
+                        filter=~Q(issue_module__module_id__isnull=True)
+                        & Q(issue_module__module__archived_at__isnull=True)
+                        & Q(issue_module__module__deleted_at__isnull=True),
                     ),
                     Value([], output_field=ArrayField(UUIDField())),
                 ),
@@ -289,10 +286,12 @@ class WorkspaceViewIssuesViewSet(BaseViewSet):
             self.get_queryset()
             .filter(**filters)
             .annotate(
-                cycle_id=Subquery(
-                    CycleIssue.objects.filter(
-                        issue=OuterRef("id"), deleted_at__isnull=True
-                    ).values("cycle_id")[:1]
+                cycle_id=Case(
+                    When(
+                        issue_cycle__cycle__deleted_at__isnull=True,
+                        then=F("issue_cycle__cycle_id"),
+                    ),
+                    default=None,
                 )
             )
         )
@@ -370,10 +369,10 @@ class WorkspaceViewIssuesViewSet(BaseViewSet):
                         group_by_field_name=group_by,
                         sub_group_by_field_name=sub_group_by,
                         count_filter=Q(
-                            Q(issue_intake__status=1)
-                            | Q(issue_intake__status=-1)
-                            | Q(issue_intake__status=2)
-                            | Q(issue_intake__isnull=True),
+                            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,
                         ),
@@ -399,10 +398,10 @@ class WorkspaceViewIssuesViewSet(BaseViewSet):
                     ),
                     group_by_field_name=group_by,
                     count_filter=Q(
-                        Q(issue_intake__status=1)
-                        | Q(issue_intake__status=-1)
-                        | Q(issue_intake__status=2)
-                        | Q(issue_intake__isnull=True),
+                        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,
                     ),
@@ -553,9 +552,7 @@ class IssueViewViewSet(BaseViewSet):
                 serializer.errors, status=status.HTTP_400_BAD_REQUEST
             )
 
-    @allow_permission(
-        allowed_roles=[ROLE.ADMIN], creator=True, model=IssueView
-    )
+    @allow_permission(allowed_roles=[ROLE.ADMIN], creator=True, model=IssueView)
     def destroy(self, request, slug, project_id, pk):
         project_view = IssueView.objects.get(
             pk=pk,

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

@@ -44,6 +44,7 @@ from plane.db.models import (
     WorkspaceTheme,
 )
 from plane.app.permissions import ROLE, allow_permission
+from plane.utils.cache import cache_response, invalidate_cache
 from django.utils.decorators import method_decorator
 from django.views.decorators.cache import cache_control
 from django.views.decorators.vary import vary_on_cookie
@@ -98,6 +99,9 @@ class WorkSpaceViewSet(BaseViewSet):
             .select_related("owner")
         )
 
+    @invalidate_cache(path="/api/workspaces/", user=False)
+    @invalidate_cache(path="/api/users/me/workspaces/")
+    @invalidate_cache(path="/api/instances/", user=False)
     def create(self, request):
         try:
             serializer = WorkSpaceSerializer(data=request.data)
@@ -143,6 +147,7 @@ class WorkSpaceViewSet(BaseViewSet):
                     status=status.HTTP_410_GONE,
                 )
 
+    @cache_response(60 * 60 * 2)
     @allow_permission(
         [
             ROLE.ADMIN,
@@ -154,6 +159,8 @@ class WorkSpaceViewSet(BaseViewSet):
     def list(self, request, *args, **kwargs):
         return super().list(request, *args, **kwargs)
 
+    @invalidate_cache(path="/api/workspaces/", user=False)
+    @invalidate_cache(path="/api/users/me/workspaces/")
     @allow_permission(
         [
             ROLE.ADMIN,
@@ -163,6 +170,13 @@ class WorkSpaceViewSet(BaseViewSet):
     def partial_update(self, request, *args, **kwargs):
         return super().partial_update(request, *args, **kwargs)
 
+    @invalidate_cache(path="/api/workspaces/", user=False)
+    @invalidate_cache(
+        path="/api/users/me/workspaces/", multiple=True, user=False
+    )
+    @invalidate_cache(
+        path="/api/users/me/settings/", multiple=True, user=False
+    )
     @allow_permission([ROLE.ADMIN], level="WORKSPACE")
     def destroy(self, request, *args, **kwargs):
         return super().destroy(request, *args, **kwargs)
@@ -176,6 +190,7 @@ class UserWorkSpacesEndpoint(BaseAPIView):
         "owner",
     ]
 
+    @cache_response(60 * 60 * 2)
     @method_decorator(cache_control(private=True, max_age=12))
     @method_decorator(vary_on_cookie)
     def get(self, request):

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

@@ -33,7 +33,6 @@ class WorkspaceCyclesEndpoint(BaseAPIView):
                     filter=Q(
                         issue_cycle__issue__archived_at__isnull=True,
                         issue_cycle__issue__is_draft=False,
-                        issue_cycle__deleted_at__isnull=True,
                     ),
                 )
             )
@@ -45,7 +44,6 @@ class WorkspaceCyclesEndpoint(BaseAPIView):
                         issue_cycle__issue__archived_at__isnull=True,
                         issue_cycle__issue__is_draft=False,
                         issue_cycle__issue__deleted_at__isnull=True,
-                        issue_cycle__deleted_at__isnull=True,
                     ),
                 )
             )
@@ -57,7 +55,6 @@ class WorkspaceCyclesEndpoint(BaseAPIView):
                         issue_cycle__issue__archived_at__isnull=True,
                         issue_cycle__issue__is_draft=False,
                         issue_cycle__issue__deleted_at__isnull=True,
-                        issue_cycle__deleted_at__isnull=True,
                     ),
                 )
             )
@@ -69,7 +66,6 @@ class WorkspaceCyclesEndpoint(BaseAPIView):
                         issue_cycle__issue__archived_at__isnull=True,
                         issue_cycle__issue__is_draft=False,
                         issue_cycle__issue__deleted_at__isnull=True,
-                        issue_cycle__deleted_at__isnull=True,
                     ),
                 )
             )
@@ -81,7 +77,6 @@ class WorkspaceCyclesEndpoint(BaseAPIView):
                         issue_cycle__issue__archived_at__isnull=True,
                         issue_cycle__issue__is_draft=False,
                         issue_cycle__issue__deleted_at__isnull=True,
-                        issue_cycle__deleted_at__isnull=True,
                     ),
                 )
             )
@@ -93,7 +88,6 @@ class WorkspaceCyclesEndpoint(BaseAPIView):
                         issue_cycle__issue__archived_at__isnull=True,
                         issue_cycle__issue__is_draft=False,
                         issue_cycle__issue__deleted_at__isnull=True,
-                        issue_cycle__deleted_at__isnull=True,
                     ),
                 )
             )

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

@@ -8,11 +8,12 @@ from django.core.serializers.json import DjangoJSONEncoder
 from django.contrib.postgres.aggregates import ArrayAgg
 from django.contrib.postgres.fields import ArrayField
 from django.db.models import (
+    F,
     Q,
     UUIDField,
     Value,
-    Subquery,
-    OuterRef,
+    Case,
+    When,
 )
 from django.db.models.functions import Coalesce
 from django.utils.decorators import method_decorator
@@ -35,6 +36,7 @@ from plane.db.models import (
     DraftIssue,
     CycleIssue,
     ModuleIssue,
+    DraftIssueModule,
     DraftIssueCycle,
     Workspace,
     FileAsset,
@@ -54,11 +56,14 @@ class WorkspaceDraftIssueViewSet(BaseViewSet):
             .prefetch_related(
                 "assignees", "labels", "draft_issue_module__module"
             )
+            .annotate(cycle_id=F("draft_issue_cycle__cycle_id"))
             .annotate(
-                cycle_id=Subquery(
-                    DraftIssueCycle.objects.filter(
-                        draft_issue=OuterRef("id"), deleted_at__isnull=True
-                    ).values("cycle_id")[:1]
+                cycle_id=Case(
+                    When(
+                        draft_issue_cycle__cycle__deleted_at__isnull=True,
+                        then=F("draft_issue_cycle__cycle_id"),
+                    ),
+                    default=None,
                 )
             )
             .annotate(
@@ -66,9 +71,9 @@ class WorkspaceDraftIssueViewSet(BaseViewSet):
                     ArrayAgg(
                         "labels__id",
                         distinct=True,
-                        filter=Q(
+                        filter=(
                             ~Q(labels__id__isnull=True)
-                            & (Q(draft_label_issue__deleted_at__isnull=True))
+                            & Q(labels__deleted_at__isnull=True)
                         ),
                     ),
                     Value([], output_field=ArrayField(UUIDField())),
@@ -77,11 +82,8 @@ class WorkspaceDraftIssueViewSet(BaseViewSet):
                     ArrayAgg(
                         "assignees__id",
                         distinct=True,
-                        filter=Q(
-                            ~Q(assignees__id__isnull=True)
-                            & Q(assignees__member_project__is_active=True)
-                            & Q(draft_issue_assignee__deleted_at__isnull=True)
-                        ),
+                        filter=~Q(assignees__id__isnull=True)
+                        & Q(assignees__member_project__is_active=True),
                     ),
                     Value([], output_field=ArrayField(UUIDField())),
                 ),
@@ -89,12 +91,12 @@ class WorkspaceDraftIssueViewSet(BaseViewSet):
                     ArrayAgg(
                         "draft_issue_module__module_id",
                         distinct=True,
-                        filter=Q(
-                            ~Q(draft_issue_module__module_id__isnull=True)
-                            & Q(
-                                draft_issue_module__module__archived_at__isnull=True
-                            )
-                            & Q(draft_issue_module__deleted_at__isnull=True)
+                        filter=~Q(draft_issue_module__module_id__isnull=True)
+                        & Q(
+                            draft_issue_module__module__archived_at__isnull=True
+                        )
+                        & Q(
+                            draft_issue_module__module__deleted_at__isnull=True
                         ),
                     ),
                     Value([], output_field=ArrayField(UUIDField())),

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

@@ -40,7 +40,7 @@ from plane.db.models import (
     WorkspaceMember,
     DraftIssue,
 )
-from plane.utils.cache import invalidate_cache
+from plane.utils.cache import cache_response, invalidate_cache
 
 from .. import BaseViewSet
 
@@ -66,6 +66,7 @@ class WorkSpaceMemberViewSet(BaseViewSet):
             .select_related("member")
         )
 
+    @cache_response(60 * 60 * 2)
     @allow_permission(
         allowed_roles=[ROLE.ADMIN, ROLE.MEMBER, ROLE.GUEST], level="WORKSPACE"
     )
@@ -92,6 +93,12 @@ 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,
+    )
     @allow_permission(allowed_roles=[ROLE.ADMIN], level="WORKSPACE")
     def partial_update(self, request, slug, pk):
         workspace_member = WorkspaceMember.objects.get(
@@ -120,6 +127,16 @@ class WorkSpaceMemberViewSet(BaseViewSet):
             return Response(serializer.data, status=status.HTTP_200_OK)
         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
+    )
     @allow_permission(allowed_roles=[ROLE.ADMIN], level="WORKSPACE")
     def destroy(self, request, slug, pk):
         # Check the user role who is deleting the user

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

@@ -45,7 +45,6 @@ class WorkspaceModulesEndpoint(BaseAPIView):
                     filter=Q(
                         issue_module__issue__archived_at__isnull=True,
                         issue_module__issue__is_draft=False,
-                        issue_module__deleted_at__isnull=True,
                     ),
                     distinct=True,
                 ),
@@ -57,7 +56,6 @@ class WorkspaceModulesEndpoint(BaseAPIView):
                         issue_module__issue__state__group="completed",
                         issue_module__issue__archived_at__isnull=True,
                         issue_module__issue__is_draft=False,
-                        issue_module__deleted_at__isnull=True,
                     ),
                     distinct=True,
                 )
@@ -69,7 +67,6 @@ class WorkspaceModulesEndpoint(BaseAPIView):
                         issue_module__issue__state__group="cancelled",
                         issue_module__issue__archived_at__isnull=True,
                         issue_module__issue__is_draft=False,
-                        issue_module__deleted_at__isnull=True,
                     ),
                     distinct=True,
                 )
@@ -81,7 +78,6 @@ class WorkspaceModulesEndpoint(BaseAPIView):
                         issue_module__issue__state__group="started",
                         issue_module__issue__archived_at__isnull=True,
                         issue_module__issue__is_draft=False,
-                        issue_module__deleted_at__isnull=True,
                     ),
                     distinct=True,
                 )
@@ -93,7 +89,6 @@ class WorkspaceModulesEndpoint(BaseAPIView):
                         issue_module__issue__state__group="unstarted",
                         issue_module__issue__archived_at__isnull=True,
                         issue_module__issue__is_draft=False,
-                        issue_module__deleted_at__isnull=True,
                     ),
                     distinct=True,
                 )
@@ -105,7 +100,6 @@ class WorkspaceModulesEndpoint(BaseAPIView):
                         issue_module__issue__state__group="backlog",
                         issue_module__issue__archived_at__isnull=True,
                         issue_module__issue__is_draft=False,
-                        issue_module__deleted_at__isnull=True,
                     ),
                     distinct=True,
                 )

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

@@ -14,7 +14,6 @@ from django.db.models import (
     Q,
     Value,
     When,
-    Subquery,
 )
 from django.db.models.fields import DateField
 from django.db.models.functions import Cast, ExtractWeek
@@ -122,10 +121,12 @@ class WorkspaceUserProfileIssuesEndpoint(BaseAPIView):
             .select_related("workspace", "project", "state", "parent")
             .prefetch_related("assignees", "labels", "issue_module__module")
             .annotate(
-                cycle_id=Subquery(
-                    CycleIssue.objects.filter(
-                        issue=OuterRef("id"), deleted_at__isnull=True
-                    ).values("cycle_id")[:1]
+                cycle_id=Case(
+                    When(
+                        issue_cycle__cycle__deleted_at__isnull=True,
+                        then=F("issue_cycle__cycle_id"),
+                    ),
+                    default=None,
                 )
             )
             .annotate(
@@ -204,10 +205,10 @@ class WorkspaceUserProfileIssuesEndpoint(BaseAPIView):
                         group_by_field_name=group_by,
                         sub_group_by_field_name=sub_group_by,
                         count_filter=Q(
-                            Q(issue_intake__status=1)
-                            | Q(issue_intake__status=-1)
-                            | Q(issue_intake__status=2)
-                            | Q(issue_intake__isnull=True),
+                            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,
                         ),
@@ -231,10 +232,10 @@ class WorkspaceUserProfileIssuesEndpoint(BaseAPIView):
                     ),
                     group_by_field_name=group_by,
                     count_filter=Q(
-                        Q(issue_intake__status=1)
-                        | Q(issue_intake__status=-1)
-                        | Q(issue_intake__status=2)
-                        | Q(issue_intake__isnull=True),
+                        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,
                     ),

apiserver/plane/authentication/adapter/oauth.py

@@ -3,7 +3,6 @@ import requests
 
 # Django imports
 from django.utils import timezone
-from django.db import DatabaseError, IntegrityError
 
 # Module imports
 from plane.db.models import Account
@@ -13,7 +12,6 @@ from plane.authentication.adapter.error import (
     AuthenticationException,
     AUTHENTICATION_ERROR_CODES,
 )
-from plane.utils.exception_logger import log_exception
 
 
 class OauthAdapter(Adapter):
@@ -99,48 +97,20 @@ class OauthAdapter(Adapter):
         self.user_data = data
 
     def create_update_account(self, user):
-        try:
-            # Check if the account already exists
-            account = Account.objects.filter(
-                user=user,
-                provider=self.provider,
-                provider_account_id=self.user_data.get("user").get(
-                    "provider_id"
-                ),
-            ).first()
-            # Update the account if it exists
-            if account:
-                account.access_token = self.token_data.get("access_token")
-                account.refresh_token = self.token_data.get(
-                    "refresh_token", None
-                )
-                account.access_token_expired_at = self.token_data.get(
+        account, created = Account.objects.update_or_create(
+            user=user,
+            provider=self.provider,
+            provider_account_id=self.user_data.get("user").get("provider_id"),
+            defaults={
+                "access_token": self.token_data.get("access_token"),
+                "refresh_token": self.token_data.get("refresh_token", None),
+                "access_token_expired_at": self.token_data.get(
                     "access_token_expired_at"
-                )
-                account.refresh_token_expired_at = self.token_data.get(
+                ),
+                "refresh_token_expired_at": self.token_data.get(
                     "refresh_token_expired_at"
-                )
-                account.last_connected_at = timezone.now()
-                account.id_token = self.token_data.get("id_token", "")
-                account.save()
-            # Create a new account if it does not exist
-            else:
-                Account.objects.create(
-                    user=user,
-                    provider=self.provider,
-                    provider_account_id=self.user_data.get("user", {}).get(
-                        "provider_id"
-                    ),
-                    access_token=self.token_data.get("access_token"),
-                    refresh_token=self.token_data.get("refresh_token", None),
-                    access_token_expired_at=self.token_data.get(
-                        "access_token_expired_at"
-                    ),
-                    refresh_token_expired_at=self.token_data.get(
-                        "refresh_token_expired_at"
-                    ),
-                    last_connected_at=timezone.now(),
-                    id_token=self.token_data.get("id_token", ""),
-                )
-        except (DatabaseError, IntegrityError) as e:
-            log_exception(e)
+                ),
+                "last_connected_at": timezone.now(),
+                "id_token": self.token_data.get("id_token", ""),
+            },
+        )

apiserver/plane/bgtasks/analytic_plot_export.py

@@ -130,10 +130,7 @@ def get_label_details(slug, filters):
     """Fetch label details if required"""
     return (
         Issue.objects.filter(
-            workspace__slug=slug,
-            **filters,
-            labels__id__isnull=False,
-            label_issue__deleted_at__isnull=True,
+            workspace__slug=slug, **filters, labels__id__isnull=False
         )
         .distinct("labels__id")
         .order_by("labels__id")
@@ -159,7 +156,6 @@ def get_module_details(slug, filters):
             workspace__slug=slug,
             **filters,
             issue_module__module_id__isnull=False,
-            issue_module__deleted_at__isnull=True,
         )
         .distinct("issue_module__module_id")
         .order_by("issue_module__module_id")
@@ -176,7 +172,6 @@ def get_cycle_details(slug, filters):
             workspace__slug=slug,
             **filters,
             issue_cycle__cycle_id__isnull=False,
-            issue_cycle__deleted_at__isnull=True,
         )
         .distinct("issue_cycle__cycle_id")
         .order_by("issue_cycle__cycle_id")

apiserver/plane/bgtasks/dummy_data_task.py

@@ -30,8 +30,8 @@ from plane.db.models import (
     Page,
     ProjectPage,
     PageLabel,
-    Intake,
-    IntakeIssue,
+    Inbox,
+    InboxIssue,
 )
 
 
@@ -47,7 +47,7 @@ def create_project(workspace, user_id):
             : random.randint(2, 12 if len(name) - 1 >= 12 else len(name) - 1)
         ].upper(),
         created_by_id=user_id,
-        intake_view=True,
+        inbox_view=True,
     )
 
     # Add current member as project member
@@ -406,18 +406,18 @@ def create_issues(workspace, project, user_id, issue_count):
     return issues
 
 
-def create_intake_issues(workspace, project, user_id, intake_issue_count):
-    issues = create_issues(workspace, project, user_id, intake_issue_count)
-    intake, create = Intake.objects.get_or_create(
-        name="Intake",
+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,
     )
-    IntakeIssue.objects.bulk_create(
+    InboxIssue.objects.bulk_create(
         [
-            IntakeIssue(
+            InboxIssue(
                 issue=issue,
-                intake=intake,
+                inbox=inbox,
                 status=(status := [-2, -1, 0, 1, 2][random.randint(0, 4)]),
                 snoozed_till=(
                     datetime.now() + timedelta(days=random.randint(1, 30))
@@ -599,7 +599,7 @@ def create_dummy_data(
     cycle_count,
     module_count,
     pages_count,
-    intake_issue_count,
+    inbox_issue_count,
 ):
     workspace = Workspace.objects.get(slug=slug)
 
@@ -660,12 +660,12 @@ def create_dummy_data(
         issue_count=issue_count,
     )
 
-    # create intake issues
-    create_intake_issues(
+    # create inbox issues
+    create_inbox_issues(
         workspace=workspace,
         project=project,
         user_id=user_id,
-        intake_issue_count=intake_issue_count,
+        inbox_issue_count=inbox_issue_count,
     )
 
     # create issue parent

apiserver/plane/bgtasks/issue_activities_task.py

@@ -31,7 +31,6 @@ from plane.db.models import (
 from plane.settings.redis import redis_instance
 from plane.utils.exception_logger import log_exception
 from plane.bgtasks.webhook_task import webhook_activity
-from plane.utils.issue_relation_mapper import get_inverse_relation
 
 
 # Track Changes in name
@@ -1395,9 +1394,6 @@ def create_issue_relation_activity(
                     epoch=epoch,
                 )
             )
-            inverse_relation = get_inverse_relation(
-                requested_data.get("relation_type")
-            )
             issue = Issue.objects.get(pk=issue_id)
             issue_activities.append(
                 IssueActivity(
@@ -1406,10 +1402,19 @@ def create_issue_relation_activity(
                     verb="updated",
                     old_value="",
                     new_value=f"{issue.project.identifier}-{issue.sequence_id}",
-                    field=inverse_relation,
+                    field=(
+                        "blocking"
+                        if requested_data.get("relation_type") == "blocked_by"
+                        else (
+                            "blocked_by"
+                            if requested_data.get("relation_type")
+                            == "blocking"
+                            else requested_data.get("relation_type")
+                        )
+                    ),
                     project_id=project_id,
                     workspace_id=workspace_id,
-                    comment=f"added {inverse_relation} relation",
+                    comment=f'added {"blocking" if requested_data.get("relation_type") == "blocked_by" else ("blocked_by" if requested_data.get("relation_type") == "blocking" else requested_data.get("relation_type")),} relation',
                     old_identifier=issue_id,
                     epoch=epoch,
                 )
@@ -1567,7 +1572,7 @@ def delete_draft_issue_activity(
     )
 
 
-def create_intake_activity(
+def create_inbox_activity(
     requested_data,
     current_instance,
     issue_id,
@@ -1596,8 +1601,8 @@ def create_intake_activity(
                 issue_id=issue_id,
                 project_id=project_id,
                 workspace_id=workspace_id,
-                comment="updated the intake status",
-                field="intake",
+                comment="updated the inbox status",
+                field="inbox",
                 verb=requested_data.get("status"),
                 actor_id=actor_id,
                 epoch=epoch,
@@ -1620,7 +1625,7 @@ def issue_activity(
     subscriber=True,
     notification=False,
     origin=None,
-    intake=None,
+    inbox=None,
 ):
     try:
         issue_activities = []
@@ -1668,7 +1673,7 @@ 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,
-            "intake.activity.created": create_intake_activity,
+            "inbox.activity.created": create_inbox_activity,
         }
 
         func = ACTIVITY_MAPPER.get(type)
@@ -1695,12 +1700,12 @@ def issue_activity(
                     event=(
                         "issue_comment"
                         if activity.field == "comment"
-                        else "intake_issue" if intake else "issue"
+                        else "inbox_issue" if inbox else "issue"
                     ),
                     event_id=(
                         activity.issue_comment_id
                         if activity.field == "comment"
-                        else intake if intake else activity.issue_id
+                        else inbox if inbox else activity.issue_id
                     ),
                     verb=activity.verb,
                     field=(

apiserver/plane/bgtasks/issue_automation_task.py

@@ -51,10 +51,10 @@ def archive_old_issues():
                     & Q(issue_module__isnull=False)
                 ),
             ).filter(
-                Q(issue_intake__status=1)
-                | Q(issue_intake__status=-1)
-                | Q(issue_intake__status=2)
-                | Q(issue_intake__isnull=True)
+                Q(issue_inbox__status=1)
+                | Q(issue_inbox__status=-1)
+                | Q(issue_inbox__status=2)
+                | Q(issue_inbox__isnull=True)
             )
 
             # Check if Issues
@@ -129,10 +129,10 @@ def close_old_issues():
                     & Q(issue_module__isnull=False)
                 ),
             ).filter(
-                Q(issue_intake__status=1)
-                | Q(issue_intake__status=-1)
-                | Q(issue_intake__status=2)
-                | Q(issue_intake__isnull=True)
+                Q(issue_inbox__status=1)
+                | Q(issue_inbox__status=-1)
+                | Q(issue_inbox__status=2)
+                | Q(issue_inbox__isnull=True)
             )
 
             # Check if Issues

apiserver/plane/bgtasks/storage_metadata_task.py

@@ -19,7 +19,7 @@ def get_asset_object_metadata(asset_id):
             object_name=asset.asset.name
         )
         # Save the asset
-        asset.save(update_fields=["storage_metadata"])
+        asset.save()
         return
     except FileAsset.DoesNotExist:
         return

apiserver/plane/bgtasks/webhook_task.py

@@ -27,7 +27,7 @@ from plane.api.serializers import (
     ModuleSerializer,
     ProjectSerializer,
     UserLiteSerializer,
-    IntakeIssueSerializer,
+    InboxIssueSerializer,
 )
 from plane.db.models import (
     Cycle,
@@ -40,7 +40,7 @@ from plane.db.models import (
     User,
     Webhook,
     WebhookLog,
-    IntakeIssue,
+    InboxIssue,
 )
 from plane.license.utils.instance_value import get_email_configuration
 from plane.utils.exception_logger import log_exception
@@ -54,7 +54,7 @@ SERIALIZER_MAPPER = {
     "module_issue": ModuleIssueSerializer,
     "issue_comment": IssueCommentSerializer,
     "user": UserLiteSerializer,
-    "intake_issue": IntakeIssueSerializer,
+    "inbox_issue": InboxIssueSerializer,
 }
 
 MODEL_MAPPER = {
@@ -66,7 +66,7 @@ MODEL_MAPPER = {
     "module_issue": ModuleIssue,
     "issue_comment": IssueComment,
     "user": User,
-    "intake_issue": IntakeIssue,
+    "inbox_issue": InboxIssue,
 }
 
 

apiserver/plane/celery.py

@@ -32,17 +32,17 @@ app.conf.beat_schedule = {
         "task": "plane.bgtasks.email_notification_task.stack_email_notification",
         "schedule": crontab(minute="*/5"),
     },
-    "check-every-day-to-delete-hard-delete": {
-        "task": "plane.bgtasks.deletion_task.hard_delete",
-        "schedule": crontab(hour=0, minute=0),
-    },
     "check-every-day-to-delete-api-logs": {
         "task": "plane.bgtasks.api_logs_task.delete_api_logs",
         "schedule": crontab(hour=0, minute=0),
     },
+    "check-every-day-to-delete-hard-delete": {
+        "task": "plane.bgtasks.deletion_task.hard_delete",
+        "schedule": crontab(hour=0, minute=0),
+    },
     "run-every-6-hours-for-instance-trace": {
         "task": "plane.license.bgtasks.tracer.instance_traces",
-        "schedule": crontab(hour="*/6", minute=0),
+        "schedule": crontab(hour="*/6"),
     },
 }
 

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

@@ -62,15 +62,13 @@ class Command(BaseCommand):
             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}:"
-                )
+                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: "))
-                intake_issue_count = int(
-                    input("Number of intake issues 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
@@ -83,7 +81,7 @@ class Command(BaseCommand):
                     cycle_count=cycle_count,
                     module_count=module_count,
                     pages_count=pages_count,
-                    intake_issue_count=intake_issue_count,
+                    inbox_issue_count=inbox_issue_count,
                 )
 
             self.stdout.write(

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

@@ -68,6 +68,7 @@ class Command(BaseCommand):
                 Key="test_permission_check.txt",
                 Body=b"Test",
             )
+            self.stdout.write("PutObject permission granted.")
             permissions["s3:PutObject"] = True
             # Clean up
         except ClientError as e:
@@ -149,47 +150,23 @@ class Command(BaseCommand):
 
     def handle(self, *args, **options):
         # Create a session using the credentials from Django settings
-
-        # Check if the bucket exists
-        s3_client = self.get_s3_client()
-        # Get the bucket name from the environment
-        bucket_name = os.environ.get("AWS_S3_BUCKET_NAME")
-
-        if not bucket_name:
-            self.stdout.write(
-                self.style.ERROR(
-                    "Please set the AWS_S3_BUCKET_NAME environment variable."
-                )
-            )
-            return
-
-        self.stdout.write(self.style.NOTICE("Checking bucket..."))
-        # Check if the bucket exists
         try:
+            # Check if the bucket exists
+            s3_client = self.get_s3_client()
+            # Get the bucket name from the environment
+            bucket_name = os.environ.get("AWS_S3_BUCKET_NAME")
+            self.stdout.write(self.style.NOTICE("Checking bucket..."))
+            # Check if the bucket exists
             s3_client.head_bucket(Bucket=bucket_name)
-        except ClientError as e:
-            error_code = e.response["Error"]["Code"]
-            if error_code == "404":
-                self.stdout.write(
-                    self.style.ERROR(f"Bucket '{bucket_name}' does not exist.")
-                )
-                return
-            else:
-                self.stdout.write(f"Error: {e}")
-        # If the bucket exists, print a success message
-        self.stdout.write(
-            self.style.SUCCESS(f"Bucket '{bucket_name}' exists.")
-        )
 
-        try:
+            # If the bucket exists, print a success message
+            self.stdout.write(
+                self.style.SUCCESS(f"Bucket '{bucket_name}' exists.")
+            )
+
             # Check the permissions of the access key
             permissions = self.check_s3_permissions(bucket_name)
-        except ClientError as e:
-            self.stdout.write(f"Error: {e}")
-        except Exception as e:
-            self.stdout.write(f"Error: {e}")
-        # If the access key has the required permissions
-        try:
+
             if all(permissions.values()):
                 self.stdout.write(
                     self.style.SUCCESS(
@@ -198,26 +175,35 @@ class Command(BaseCommand):
                 )
                 # Making the existing objects public
                 self.make_objects_public(bucket_name)
-                return
-        except Exception as e:
-            self.stdout.write(f"Error: {e}")
 
-        # write the bucket policy to a file
-        self.stdout.write(
-            self.style.WARNING(
-                "Generating permissions.json for manual bucket policy update."
-            )
-        )
-        try:
-            # Writing to a file
-            with open("permissions.json", "w") as f:
-                f.write(json.dumps(self.generate_bucket_policy(bucket_name)))
-            self.stdout.write(
-                self.style.WARNING(
-                    "Permissions have been written to permissions.json."
+            # If the access key does not have PutBucketPolicy permission
+            # write the bucket policy to a file
+            if (
+                all(
+                    {
+                        k: v
+                        for k, v in permissions.items()
+                        if k != "s3:PutBucketPolicy"
+                    }.values()
                 )
-            )
-            return
-        except IOError as e:
-            self.stdout.write(f"Error writing permissions.json: {e}")
-            return
+                and not permissions["s3:PutBucketPolicy"]
+            ):
+                self.stdout.write(
+                    self.style.WARNING(
+                        "Access key does not have PutBucketPolicy permission."
+                    )
+                )
+                # Writing to a file
+                with open("permissions.json", "w") as f:
+                    f.write(
+                        json.dumps(self.generate_bucket_policy(bucket_name))
+                    )
+                self.stdout.write(
+                    self.style.WARNING(
+                        "Permissions have been written to permissions.json."
+                    )
+                )
+                return
+        except Exception as ex:
+            # Handle any other exception
+            self.stdout.write(self.style.ERROR(f"An error occurred: {ex}"))

apiserver/plane/db/migrations/0043_alter_analyticview_created_by_and_more.py

@@ -3,6 +3,7 @@
 from django.conf import settings
 from django.db import migrations, models
 import django.db.models.deletion
+from plane.db.models import IssueRelation
 from sentry_sdk import capture_exception
 import uuid
 
@@ -10,7 +11,6 @@ import uuid
 def create_issue_relation(apps, schema_editor):
     try:
         IssueBlockerModel = apps.get_model("db", "IssueBlocker")
-        IssueRelation = apps.get_model("db", "IssueRelation")
         updated_issue_relation = []
         for blocked_issue in IssueBlockerModel.objects.all():
             updated_issue_relation.append(

apiserver/plane/db/migrations/0053_auto_20240102_1315.py

@@ -1,10 +1,11 @@
 # Generated by Django 4.2.7 on 2024-01-02 13:15
+
+from plane.db.models import WorkspaceUserProperties, ProjectMember, IssueView
 from django.db import migrations
 
 
 def workspace_user_properties(apps, schema_editor):
     WorkspaceMember = apps.get_model("db", "WorkspaceMember")
-    WorkspaceUserProperties = apps.get_model("db", "WorkspaceUserProperties")
     updated_workspace_user_properties = []
     for workspace_members in WorkspaceMember.objects.all():
         updated_workspace_user_properties.append(
@@ -20,14 +21,12 @@ def workspace_user_properties(apps, schema_editor):
             )
         )
     WorkspaceUserProperties.objects.bulk_create(
-        updated_workspace_user_properties,
-        batch_size=2000,
+        updated_workspace_user_properties, batch_size=2000
     )
 
 
 def project_user_properties(apps, schema_editor):
     IssueProperty = apps.get_model("db", "IssueProperty")
-    ProjectMember = apps.get_model("db", "ProjectMember")
     updated_issue_user_properties = []
     for issue_property in IssueProperty.objects.all():
         project_member = ProjectMember.objects.filter(
@@ -50,7 +49,6 @@ def project_user_properties(apps, schema_editor):
 
 def issue_view(apps, schema_editor):
     GlobalView = apps.get_model("db", "GlobalView")
-    IssueView = apps.get_model("db", "IssueView")
     updated_issue_views = []
 
     for global_view in GlobalView.objects.all():

apiserver/plane/db/migrations/0082_alter_issue_managers_alter_cycleissue_issue_and_more.py

@@ -1,63 +0,0 @@
-# Generated by Django 4.2.15 on 2024-10-22 08:00
-
-from django.db import migrations, models
-import django.db.models.deletion
-import django.db.models.manager
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ("db", "0081_remove_globalview_created_by_and_more"),
-    ]
-
-    operations = [
-        migrations.AlterModelManagers(
-            name="issue",
-            managers=[
-                ("issue_objects", django.db.models.manager.Manager()),
-            ],
-        ),
-        migrations.AlterField(
-            model_name="cycleissue",
-            name="issue",
-            field=models.ForeignKey(
-                on_delete=django.db.models.deletion.CASCADE,
-                related_name="issue_cycle",
-                to="db.issue",
-            ),
-        ),
-        migrations.AlterField(
-            model_name="draftissuecycle",
-            name="draft_issue",
-            field=models.ForeignKey(
-                on_delete=django.db.models.deletion.CASCADE,
-                related_name="draft_issue_cycle",
-                to="db.draftissue",
-            ),
-        ),
-        migrations.AlterUniqueTogether(
-            name="cycleissue",
-            unique_together={("issue", "cycle", "deleted_at")},
-        ),
-        migrations.AlterUniqueTogether(
-            name="draftissuecycle",
-            unique_together={("draft_issue", "cycle", "deleted_at")},
-        ),
-        migrations.AddConstraint(
-            model_name="cycleissue",
-            constraint=models.UniqueConstraint(
-                condition=models.Q(("deleted_at__isnull", True)),
-                fields=("cycle", "issue"),
-                name="cycle_issue_when_deleted_at_null",
-            ),
-        ),
-        migrations.AddConstraint(
-            model_name="draftissuecycle",
-            constraint=models.UniqueConstraint(
-                condition=models.Q(("deleted_at__isnull", True)),
-                fields=("draft_issue", "cycle"),
-                name="draft_issue_cycle_when_deleted_at_null",
-            ),
-        ),
-    ]

apiserver/plane/db/migrations/0083_device_workspace_timezone_and_more.py

@@ -1,874 +0,0 @@
-# Generated by Django 4.2.15 on 2024-11-01 17:02
-
-from django.conf import settings
-from django.db import migrations, models
-import django.db.models.deletion
-import uuid
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ("db", "0082_alter_issue_managers_alter_cycleissue_issue_and_more"),
-    ]
-
-    operations = [
-        migrations.CreateModel(
-            name="Device",
-            fields=[
-                (
-                    "created_at",
-                    models.DateTimeField(
-                        auto_now_add=True, verbose_name="Created At"
-                    ),
-                ),
-                (
-                    "updated_at",
-                    models.DateTimeField(
-                        auto_now=True, verbose_name="Last Modified At"
-                    ),
-                ),
-                (
-                    "deleted_at",
-                    models.DateTimeField(
-                        blank=True, null=True, verbose_name="Deleted At"
-                    ),
-                ),
-                (
-                    "id",
-                    models.UUIDField(
-                        db_index=True,
-                        default=uuid.uuid4,
-                        editable=False,
-                        primary_key=True,
-                        serialize=False,
-                        unique=True,
-                    ),
-                ),
-                (
-                    "device_id",
-                    models.CharField(blank=True, max_length=255, null=True),
-                ),
-                (
-                    "device_type",
-                    models.CharField(
-                        choices=[
-                            ("ANDROID", "Android"),
-                            ("IOS", "iOS"),
-                            ("WEB", "Web"),
-                            ("DESKTOP", "Desktop"),
-                        ],
-                        max_length=255,
-                    ),
-                ),
-                (
-                    "push_token",
-                    models.CharField(blank=True, max_length=255, null=True),
-                ),
-                ("is_active", models.BooleanField(default=True)),
-                (
-                    "created_by",
-                    models.ForeignKey(
-                        null=True,
-                        on_delete=django.db.models.deletion.SET_NULL,
-                        related_name="%(class)s_created_by",
-                        to=settings.AUTH_USER_MODEL,
-                        verbose_name="Created By",
-                    ),
-                ),
-                (
-                    "updated_by",
-                    models.ForeignKey(
-                        null=True,
-                        on_delete=django.db.models.deletion.SET_NULL,
-                        related_name="%(class)s_updated_by",
-                        to=settings.AUTH_USER_MODEL,
-                        verbose_name="Last Modified By",
-                    ),
-                ),
-                (
-                    "user",
-                    models.ForeignKey(
-                        on_delete=django.db.models.deletion.CASCADE,
-                        related_name="devices",
-                        to=settings.AUTH_USER_MODEL,
-                    ),
-                ),
-            ],
-            options={
-                "verbose_name": "Device",
-                "verbose_name_plural": "Devices",
-                "db_table": "devices",
-            },
-        ),
-        migrations.AddField(
-            model_name="issuetype",
-            name="is_epic",
-            field=models.BooleanField(default=False),
-        ),
-        migrations.AddField(
-            model_name="workspace",
-            name="timezone",
-            field=models.CharField(
-                choices=[
-                    ("Africa/Abidjan", "Africa/Abidjan"),
-                    ("Africa/Accra", "Africa/Accra"),
-                    ("Africa/Addis_Ababa", "Africa/Addis_Ababa"),
-                    ("Africa/Algiers", "Africa/Algiers"),
-                    ("Africa/Asmara", "Africa/Asmara"),
-                    ("Africa/Asmera", "Africa/Asmera"),
-                    ("Africa/Bamako", "Africa/Bamako"),
-                    ("Africa/Bangui", "Africa/Bangui"),
-                    ("Africa/Banjul", "Africa/Banjul"),
-                    ("Africa/Bissau", "Africa/Bissau"),
-                    ("Africa/Blantyre", "Africa/Blantyre"),
-                    ("Africa/Brazzaville", "Africa/Brazzaville"),
-                    ("Africa/Bujumbura", "Africa/Bujumbura"),
-                    ("Africa/Cairo", "Africa/Cairo"),
-                    ("Africa/Casablanca", "Africa/Casablanca"),
-                    ("Africa/Ceuta", "Africa/Ceuta"),
-                    ("Africa/Conakry", "Africa/Conakry"),
-                    ("Africa/Dakar", "Africa/Dakar"),
-                    ("Africa/Dar_es_Salaam", "Africa/Dar_es_Salaam"),
-                    ("Africa/Djibouti", "Africa/Djibouti"),
-                    ("Africa/Douala", "Africa/Douala"),
-                    ("Africa/El_Aaiun", "Africa/El_Aaiun"),
-                    ("Africa/Freetown", "Africa/Freetown"),
-                    ("Africa/Gaborone", "Africa/Gaborone"),
-                    ("Africa/Harare", "Africa/Harare"),
-                    ("Africa/Johannesburg", "Africa/Johannesburg"),
-                    ("Africa/Juba", "Africa/Juba"),
-                    ("Africa/Kampala", "Africa/Kampala"),
-                    ("Africa/Khartoum", "Africa/Khartoum"),
-                    ("Africa/Kigali", "Africa/Kigali"),
-                    ("Africa/Kinshasa", "Africa/Kinshasa"),
-                    ("Africa/Lagos", "Africa/Lagos"),
-                    ("Africa/Libreville", "Africa/Libreville"),
-                    ("Africa/Lome", "Africa/Lome"),
-                    ("Africa/Luanda", "Africa/Luanda"),
-                    ("Africa/Lubumbashi", "Africa/Lubumbashi"),
-                    ("Africa/Lusaka", "Africa/Lusaka"),
-                    ("Africa/Malabo", "Africa/Malabo"),
-                    ("Africa/Maputo", "Africa/Maputo"),
-                    ("Africa/Maseru", "Africa/Maseru"),
-                    ("Africa/Mbabane", "Africa/Mbabane"),
-                    ("Africa/Mogadishu", "Africa/Mogadishu"),
-                    ("Africa/Monrovia", "Africa/Monrovia"),
-                    ("Africa/Nairobi", "Africa/Nairobi"),
-                    ("Africa/Ndjamena", "Africa/Ndjamena"),
-                    ("Africa/Niamey", "Africa/Niamey"),
-                    ("Africa/Nouakchott", "Africa/Nouakchott"),
-                    ("Africa/Ouagadougou", "Africa/Ouagadougou"),
-                    ("Africa/Porto-Novo", "Africa/Porto-Novo"),
-                    ("Africa/Sao_Tome", "Africa/Sao_Tome"),
-                    ("Africa/Timbuktu", "Africa/Timbuktu"),
-                    ("Africa/Tripoli", "Africa/Tripoli"),
-                    ("Africa/Tunis", "Africa/Tunis"),
-                    ("Africa/Windhoek", "Africa/Windhoek"),
-                    ("America/Adak", "America/Adak"),
-                    ("America/Anchorage", "America/Anchorage"),
-                    ("America/Anguilla", "America/Anguilla"),
-                    ("America/Antigua", "America/Antigua"),
-                    ("America/Araguaina", "America/Araguaina"),
-                    (
-                        "America/Argentina/Buenos_Aires",
-                        "America/Argentina/Buenos_Aires",
-                    ),
-                    (
-                        "America/Argentina/Catamarca",
-                        "America/Argentina/Catamarca",
-                    ),
-                    (
-                        "America/Argentina/ComodRivadavia",
-                        "America/Argentina/ComodRivadavia",
-                    ),
-                    ("America/Argentina/Cordoba", "America/Argentina/Cordoba"),
-                    ("America/Argentina/Jujuy", "America/Argentina/Jujuy"),
-                    (
-                        "America/Argentina/La_Rioja",
-                        "America/Argentina/La_Rioja",
-                    ),
-                    ("America/Argentina/Mendoza", "America/Argentina/Mendoza"),
-                    (
-                        "America/Argentina/Rio_Gallegos",
-                        "America/Argentina/Rio_Gallegos",
-                    ),
-                    ("America/Argentina/Salta", "America/Argentina/Salta"),
-                    (
-                        "America/Argentina/San_Juan",
-                        "America/Argentina/San_Juan",
-                    ),
-                    (
-                        "America/Argentina/San_Luis",
-                        "America/Argentina/San_Luis",
-                    ),
-                    ("America/Argentina/Tucuman", "America/Argentina/Tucuman"),
-                    ("America/Argentina/Ushuaia", "America/Argentina/Ushuaia"),
-                    ("America/Aruba", "America/Aruba"),
-                    ("America/Asuncion", "America/Asuncion"),
-                    ("America/Atikokan", "America/Atikokan"),
-                    ("America/Atka", "America/Atka"),
-                    ("America/Bahia", "America/Bahia"),
-                    ("America/Bahia_Banderas", "America/Bahia_Banderas"),
-                    ("America/Barbados", "America/Barbados"),
-                    ("America/Belem", "America/Belem"),
-                    ("America/Belize", "America/Belize"),
-                    ("America/Blanc-Sablon", "America/Blanc-Sablon"),
-                    ("America/Boa_Vista", "America/Boa_Vista"),
-                    ("America/Bogota", "America/Bogota"),
-                    ("America/Boise", "America/Boise"),
-                    ("America/Buenos_Aires", "America/Buenos_Aires"),
-                    ("America/Cambridge_Bay", "America/Cambridge_Bay"),
-                    ("America/Campo_Grande", "America/Campo_Grande"),
-                    ("America/Cancun", "America/Cancun"),
-                    ("America/Caracas", "America/Caracas"),
-                    ("America/Catamarca", "America/Catamarca"),
-                    ("America/Cayenne", "America/Cayenne"),
-                    ("America/Cayman", "America/Cayman"),
-                    ("America/Chicago", "America/Chicago"),
-                    ("America/Chihuahua", "America/Chihuahua"),
-                    ("America/Ciudad_Juarez", "America/Ciudad_Juarez"),
-                    ("America/Coral_Harbour", "America/Coral_Harbour"),
-                    ("America/Cordoba", "America/Cordoba"),
-                    ("America/Costa_Rica", "America/Costa_Rica"),
-                    ("America/Creston", "America/Creston"),
-                    ("America/Cuiaba", "America/Cuiaba"),
-                    ("America/Curacao", "America/Curacao"),
-                    ("America/Danmarkshavn", "America/Danmarkshavn"),
-                    ("America/Dawson", "America/Dawson"),
-                    ("America/Dawson_Creek", "America/Dawson_Creek"),
-                    ("America/Denver", "America/Denver"),
-                    ("America/Detroit", "America/Detroit"),
-                    ("America/Dominica", "America/Dominica"),
-                    ("America/Edmonton", "America/Edmonton"),
-                    ("America/Eirunepe", "America/Eirunepe"),
-                    ("America/El_Salvador", "America/El_Salvador"),
-                    ("America/Ensenada", "America/Ensenada"),
-                    ("America/Fort_Nelson", "America/Fort_Nelson"),
-                    ("America/Fort_Wayne", "America/Fort_Wayne"),
-                    ("America/Fortaleza", "America/Fortaleza"),
-                    ("America/Glace_Bay", "America/Glace_Bay"),
-                    ("America/Godthab", "America/Godthab"),
-                    ("America/Goose_Bay", "America/Goose_Bay"),
-                    ("America/Grand_Turk", "America/Grand_Turk"),
-                    ("America/Grenada", "America/Grenada"),
-                    ("America/Guadeloupe", "America/Guadeloupe"),
-                    ("America/Guatemala", "America/Guatemala"),
-                    ("America/Guayaquil", "America/Guayaquil"),
-                    ("America/Guyana", "America/Guyana"),
-                    ("America/Halifax", "America/Halifax"),
-                    ("America/Havana", "America/Havana"),
-                    ("America/Hermosillo", "America/Hermosillo"),
-                    (
-                        "America/Indiana/Indianapolis",
-                        "America/Indiana/Indianapolis",
-                    ),
-                    ("America/Indiana/Knox", "America/Indiana/Knox"),
-                    ("America/Indiana/Marengo", "America/Indiana/Marengo"),
-                    (
-                        "America/Indiana/Petersburg",
-                        "America/Indiana/Petersburg",
-                    ),
-                    ("America/Indiana/Tell_City", "America/Indiana/Tell_City"),
-                    ("America/Indiana/Vevay", "America/Indiana/Vevay"),
-                    ("America/Indiana/Vincennes", "America/Indiana/Vincennes"),
-                    ("America/Indiana/Winamac", "America/Indiana/Winamac"),
-                    ("America/Indianapolis", "America/Indianapolis"),
-                    ("America/Inuvik", "America/Inuvik"),
-                    ("America/Iqaluit", "America/Iqaluit"),
-                    ("America/Jamaica", "America/Jamaica"),
-                    ("America/Jujuy", "America/Jujuy"),
-                    ("America/Juneau", "America/Juneau"),
-                    (
-                        "America/Kentucky/Louisville",
-                        "America/Kentucky/Louisville",
-                    ),
-                    (
-                        "America/Kentucky/Monticello",
-                        "America/Kentucky/Monticello",
-                    ),
-                    ("America/Knox_IN", "America/Knox_IN"),
-                    ("America/Kralendijk", "America/Kralendijk"),
-                    ("America/La_Paz", "America/La_Paz"),
-                    ("America/Lima", "America/Lima"),
-                    ("America/Los_Angeles", "America/Los_Angeles"),
-                    ("America/Louisville", "America/Louisville"),
-                    ("America/Lower_Princes", "America/Lower_Princes"),
-                    ("America/Maceio", "America/Maceio"),
-                    ("America/Managua", "America/Managua"),
-                    ("America/Manaus", "America/Manaus"),
-                    ("America/Marigot", "America/Marigot"),
-                    ("America/Martinique", "America/Martinique"),
-                    ("America/Matamoros", "America/Matamoros"),
-                    ("America/Mazatlan", "America/Mazatlan"),
-                    ("America/Mendoza", "America/Mendoza"),
-                    ("America/Menominee", "America/Menominee"),
-                    ("America/Merida", "America/Merida"),
-                    ("America/Metlakatla", "America/Metlakatla"),
-                    ("America/Mexico_City", "America/Mexico_City"),
-                    ("America/Miquelon", "America/Miquelon"),
-                    ("America/Moncton", "America/Moncton"),
-                    ("America/Monterrey", "America/Monterrey"),
-                    ("America/Montevideo", "America/Montevideo"),
-                    ("America/Montreal", "America/Montreal"),
-                    ("America/Montserrat", "America/Montserrat"),
-                    ("America/Nassau", "America/Nassau"),
-                    ("America/New_York", "America/New_York"),
-                    ("America/Nipigon", "America/Nipigon"),
-                    ("America/Nome", "America/Nome"),
-                    ("America/Noronha", "America/Noronha"),
-                    (
-                        "America/North_Dakota/Beulah",
-                        "America/North_Dakota/Beulah",
-                    ),
-                    (
-                        "America/North_Dakota/Center",
-                        "America/North_Dakota/Center",
-                    ),
-                    (
-                        "America/North_Dakota/New_Salem",
-                        "America/North_Dakota/New_Salem",
-                    ),
-                    ("America/Nuuk", "America/Nuuk"),
-                    ("America/Ojinaga", "America/Ojinaga"),
-                    ("America/Panama", "America/Panama"),
-                    ("America/Pangnirtung", "America/Pangnirtung"),
-                    ("America/Paramaribo", "America/Paramaribo"),
-                    ("America/Phoenix", "America/Phoenix"),
-                    ("America/Port-au-Prince", "America/Port-au-Prince"),
-                    ("America/Port_of_Spain", "America/Port_of_Spain"),
-                    ("America/Porto_Acre", "America/Porto_Acre"),
-                    ("America/Porto_Velho", "America/Porto_Velho"),
-                    ("America/Puerto_Rico", "America/Puerto_Rico"),
-                    ("America/Punta_Arenas", "America/Punta_Arenas"),
-                    ("America/Rainy_River", "America/Rainy_River"),
-                    ("America/Rankin_Inlet", "America/Rankin_Inlet"),
-                    ("America/Recife", "America/Recife"),
-                    ("America/Regina", "America/Regina"),
-                    ("America/Resolute", "America/Resolute"),
-                    ("America/Rio_Branco", "America/Rio_Branco"),
-                    ("America/Rosario", "America/Rosario"),
-                    ("America/Santa_Isabel", "America/Santa_Isabel"),
-                    ("America/Santarem", "America/Santarem"),
-                    ("America/Santiago", "America/Santiago"),
-                    ("America/Santo_Domingo", "America/Santo_Domingo"),
-                    ("America/Sao_Paulo", "America/Sao_Paulo"),
-                    ("America/Scoresbysund", "America/Scoresbysund"),
-                    ("America/Shiprock", "America/Shiprock"),
-                    ("America/Sitka", "America/Sitka"),
-                    ("America/St_Barthelemy", "America/St_Barthelemy"),
-                    ("America/St_Johns", "America/St_Johns"),
-                    ("America/St_Kitts", "America/St_Kitts"),
-                    ("America/St_Lucia", "America/St_Lucia"),
-                    ("America/St_Thomas", "America/St_Thomas"),
-                    ("America/St_Vincent", "America/St_Vincent"),
-                    ("America/Swift_Current", "America/Swift_Current"),
-                    ("America/Tegucigalpa", "America/Tegucigalpa"),
-                    ("America/Thule", "America/Thule"),
-                    ("America/Thunder_Bay", "America/Thunder_Bay"),
-                    ("America/Tijuana", "America/Tijuana"),
-                    ("America/Toronto", "America/Toronto"),
-                    ("America/Tortola", "America/Tortola"),
-                    ("America/Vancouver", "America/Vancouver"),
-                    ("America/Virgin", "America/Virgin"),
-                    ("America/Whitehorse", "America/Whitehorse"),
-                    ("America/Winnipeg", "America/Winnipeg"),
-                    ("America/Yakutat", "America/Yakutat"),
-                    ("America/Yellowknife", "America/Yellowknife"),
-                    ("Antarctica/Casey", "Antarctica/Casey"),
-                    ("Antarctica/Davis", "Antarctica/Davis"),
-                    ("Antarctica/DumontDUrville", "Antarctica/DumontDUrville"),
-                    ("Antarctica/Macquarie", "Antarctica/Macquarie"),
-                    ("Antarctica/Mawson", "Antarctica/Mawson"),
-                    ("Antarctica/McMurdo", "Antarctica/McMurdo"),
-                    ("Antarctica/Palmer", "Antarctica/Palmer"),
-                    ("Antarctica/Rothera", "Antarctica/Rothera"),
-                    ("Antarctica/South_Pole", "Antarctica/South_Pole"),
-                    ("Antarctica/Syowa", "Antarctica/Syowa"),
-                    ("Antarctica/Troll", "Antarctica/Troll"),
-                    ("Antarctica/Vostok", "Antarctica/Vostok"),
-                    ("Arctic/Longyearbyen", "Arctic/Longyearbyen"),
-                    ("Asia/Aden", "Asia/Aden"),
-                    ("Asia/Almaty", "Asia/Almaty"),
-                    ("Asia/Amman", "Asia/Amman"),
-                    ("Asia/Anadyr", "Asia/Anadyr"),
-                    ("Asia/Aqtau", "Asia/Aqtau"),
-                    ("Asia/Aqtobe", "Asia/Aqtobe"),
-                    ("Asia/Ashgabat", "Asia/Ashgabat"),
-                    ("Asia/Ashkhabad", "Asia/Ashkhabad"),
-                    ("Asia/Atyrau", "Asia/Atyrau"),
-                    ("Asia/Baghdad", "Asia/Baghdad"),
-                    ("Asia/Bahrain", "Asia/Bahrain"),
-                    ("Asia/Baku", "Asia/Baku"),
-                    ("Asia/Bangkok", "Asia/Bangkok"),
-                    ("Asia/Barnaul", "Asia/Barnaul"),
-                    ("Asia/Beirut", "Asia/Beirut"),
-                    ("Asia/Bishkek", "Asia/Bishkek"),
-                    ("Asia/Brunei", "Asia/Brunei"),
-                    ("Asia/Calcutta", "Asia/Calcutta"),
-                    ("Asia/Chita", "Asia/Chita"),
-                    ("Asia/Choibalsan", "Asia/Choibalsan"),
-                    ("Asia/Chongqing", "Asia/Chongqing"),
-                    ("Asia/Chungking", "Asia/Chungking"),
-                    ("Asia/Colombo", "Asia/Colombo"),
-                    ("Asia/Dacca", "Asia/Dacca"),
-                    ("Asia/Damascus", "Asia/Damascus"),
-                    ("Asia/Dhaka", "Asia/Dhaka"),
-                    ("Asia/Dili", "Asia/Dili"),
-                    ("Asia/Dubai", "Asia/Dubai"),
-                    ("Asia/Dushanbe", "Asia/Dushanbe"),
-                    ("Asia/Famagusta", "Asia/Famagusta"),
-                    ("Asia/Gaza", "Asia/Gaza"),
-                    ("Asia/Harbin", "Asia/Harbin"),
-                    ("Asia/Hebron", "Asia/Hebron"),
-                    ("Asia/Ho_Chi_Minh", "Asia/Ho_Chi_Minh"),
-                    ("Asia/Hong_Kong", "Asia/Hong_Kong"),
-                    ("Asia/Hovd", "Asia/Hovd"),
-                    ("Asia/Irkutsk", "Asia/Irkutsk"),
-                    ("Asia/Istanbul", "Asia/Istanbul"),
-                    ("Asia/Jakarta", "Asia/Jakarta"),
-                    ("Asia/Jayapura", "Asia/Jayapura"),
-                    ("Asia/Jerusalem", "Asia/Jerusalem"),
-                    ("Asia/Kabul", "Asia/Kabul"),
-                    ("Asia/Kamchatka", "Asia/Kamchatka"),
-                    ("Asia/Karachi", "Asia/Karachi"),
-                    ("Asia/Kashgar", "Asia/Kashgar"),
-                    ("Asia/Kathmandu", "Asia/Kathmandu"),
-                    ("Asia/Katmandu", "Asia/Katmandu"),
-                    ("Asia/Khandyga", "Asia/Khandyga"),
-                    ("Asia/Kolkata", "Asia/Kolkata"),
-                    ("Asia/Krasnoyarsk", "Asia/Krasnoyarsk"),
-                    ("Asia/Kuala_Lumpur", "Asia/Kuala_Lumpur"),
-                    ("Asia/Kuching", "Asia/Kuching"),
-                    ("Asia/Kuwait", "Asia/Kuwait"),
-                    ("Asia/Macao", "Asia/Macao"),
-                    ("Asia/Macau", "Asia/Macau"),
-                    ("Asia/Magadan", "Asia/Magadan"),
-                    ("Asia/Makassar", "Asia/Makassar"),
-                    ("Asia/Manila", "Asia/Manila"),
-                    ("Asia/Muscat", "Asia/Muscat"),
-                    ("Asia/Nicosia", "Asia/Nicosia"),
-                    ("Asia/Novokuznetsk", "Asia/Novokuznetsk"),
-                    ("Asia/Novosibirsk", "Asia/Novosibirsk"),
-                    ("Asia/Omsk", "Asia/Omsk"),
-                    ("Asia/Oral", "Asia/Oral"),
-                    ("Asia/Phnom_Penh", "Asia/Phnom_Penh"),
-                    ("Asia/Pontianak", "Asia/Pontianak"),
-                    ("Asia/Pyongyang", "Asia/Pyongyang"),
-                    ("Asia/Qatar", "Asia/Qatar"),
-                    ("Asia/Qostanay", "Asia/Qostanay"),
-                    ("Asia/Qyzylorda", "Asia/Qyzylorda"),
-                    ("Asia/Rangoon", "Asia/Rangoon"),
-                    ("Asia/Riyadh", "Asia/Riyadh"),
-                    ("Asia/Saigon", "Asia/Saigon"),
-                    ("Asia/Sakhalin", "Asia/Sakhalin"),
-                    ("Asia/Samarkand", "Asia/Samarkand"),
-                    ("Asia/Seoul", "Asia/Seoul"),
-                    ("Asia/Shanghai", "Asia/Shanghai"),
-                    ("Asia/Singapore", "Asia/Singapore"),
-                    ("Asia/Srednekolymsk", "Asia/Srednekolymsk"),
-                    ("Asia/Taipei", "Asia/Taipei"),
-                    ("Asia/Tashkent", "Asia/Tashkent"),
-                    ("Asia/Tbilisi", "Asia/Tbilisi"),
-                    ("Asia/Tehran", "Asia/Tehran"),
-                    ("Asia/Tel_Aviv", "Asia/Tel_Aviv"),
-                    ("Asia/Thimbu", "Asia/Thimbu"),
-                    ("Asia/Thimphu", "Asia/Thimphu"),
-                    ("Asia/Tokyo", "Asia/Tokyo"),
-                    ("Asia/Tomsk", "Asia/Tomsk"),
-                    ("Asia/Ujung_Pandang", "Asia/Ujung_Pandang"),
-                    ("Asia/Ulaanbaatar", "Asia/Ulaanbaatar"),
-                    ("Asia/Ulan_Bator", "Asia/Ulan_Bator"),
-                    ("Asia/Urumqi", "Asia/Urumqi"),
-                    ("Asia/Ust-Nera", "Asia/Ust-Nera"),
-                    ("Asia/Vientiane", "Asia/Vientiane"),
-                    ("Asia/Vladivostok", "Asia/Vladivostok"),
-                    ("Asia/Yakutsk", "Asia/Yakutsk"),
-                    ("Asia/Yangon", "Asia/Yangon"),
-                    ("Asia/Yekaterinburg", "Asia/Yekaterinburg"),
-                    ("Asia/Yerevan", "Asia/Yerevan"),
-                    ("Atlantic/Azores", "Atlantic/Azores"),
-                    ("Atlantic/Bermuda", "Atlantic/Bermuda"),
-                    ("Atlantic/Canary", "Atlantic/Canary"),
-                    ("Atlantic/Cape_Verde", "Atlantic/Cape_Verde"),
-                    ("Atlantic/Faeroe", "Atlantic/Faeroe"),
-                    ("Atlantic/Faroe", "Atlantic/Faroe"),
-                    ("Atlantic/Jan_Mayen", "Atlantic/Jan_Mayen"),
-                    ("Atlantic/Madeira", "Atlantic/Madeira"),
-                    ("Atlantic/Reykjavik", "Atlantic/Reykjavik"),
-                    ("Atlantic/South_Georgia", "Atlantic/South_Georgia"),
-                    ("Atlantic/St_Helena", "Atlantic/St_Helena"),
-                    ("Atlantic/Stanley", "Atlantic/Stanley"),
-                    ("Australia/ACT", "Australia/ACT"),
-                    ("Australia/Adelaide", "Australia/Adelaide"),
-                    ("Australia/Brisbane", "Australia/Brisbane"),
-                    ("Australia/Broken_Hill", "Australia/Broken_Hill"),
-                    ("Australia/Canberra", "Australia/Canberra"),
-                    ("Australia/Currie", "Australia/Currie"),
-                    ("Australia/Darwin", "Australia/Darwin"),
-                    ("Australia/Eucla", "Australia/Eucla"),
-                    ("Australia/Hobart", "Australia/Hobart"),
-                    ("Australia/LHI", "Australia/LHI"),
-                    ("Australia/Lindeman", "Australia/Lindeman"),
-                    ("Australia/Lord_Howe", "Australia/Lord_Howe"),
-                    ("Australia/Melbourne", "Australia/Melbourne"),
-                    ("Australia/NSW", "Australia/NSW"),
-                    ("Australia/North", "Australia/North"),
-                    ("Australia/Perth", "Australia/Perth"),
-                    ("Australia/Queensland", "Australia/Queensland"),
-                    ("Australia/South", "Australia/South"),
-                    ("Australia/Sydney", "Australia/Sydney"),
-                    ("Australia/Tasmania", "Australia/Tasmania"),
-                    ("Australia/Victoria", "Australia/Victoria"),
-                    ("Australia/West", "Australia/West"),
-                    ("Australia/Yancowinna", "Australia/Yancowinna"),
-                    ("Brazil/Acre", "Brazil/Acre"),
-                    ("Brazil/DeNoronha", "Brazil/DeNoronha"),
-                    ("Brazil/East", "Brazil/East"),
-                    ("Brazil/West", "Brazil/West"),
-                    ("CET", "CET"),
-                    ("CST6CDT", "CST6CDT"),
-                    ("Canada/Atlantic", "Canada/Atlantic"),
-                    ("Canada/Central", "Canada/Central"),
-                    ("Canada/Eastern", "Canada/Eastern"),
-                    ("Canada/Mountain", "Canada/Mountain"),
-                    ("Canada/Newfoundland", "Canada/Newfoundland"),
-                    ("Canada/Pacific", "Canada/Pacific"),
-                    ("Canada/Saskatchewan", "Canada/Saskatchewan"),
-                    ("Canada/Yukon", "Canada/Yukon"),
-                    ("Chile/Continental", "Chile/Continental"),
-                    ("Chile/EasterIsland", "Chile/EasterIsland"),
-                    ("Cuba", "Cuba"),
-                    ("EET", "EET"),
-                    ("EST", "EST"),
-                    ("EST5EDT", "EST5EDT"),
-                    ("Egypt", "Egypt"),
-                    ("Eire", "Eire"),
-                    ("Etc/GMT", "Etc/GMT"),
-                    ("Etc/GMT+0", "Etc/GMT+0"),
-                    ("Etc/GMT+1", "Etc/GMT+1"),
-                    ("Etc/GMT+10", "Etc/GMT+10"),
-                    ("Etc/GMT+11", "Etc/GMT+11"),
-                    ("Etc/GMT+12", "Etc/GMT+12"),
-                    ("Etc/GMT+2", "Etc/GMT+2"),
-                    ("Etc/GMT+3", "Etc/GMT+3"),
-                    ("Etc/GMT+4", "Etc/GMT+4"),
-                    ("Etc/GMT+5", "Etc/GMT+5"),
-                    ("Etc/GMT+6", "Etc/GMT+6"),
-                    ("Etc/GMT+7", "Etc/GMT+7"),
-                    ("Etc/GMT+8", "Etc/GMT+8"),
-                    ("Etc/GMT+9", "Etc/GMT+9"),
-                    ("Etc/GMT-0", "Etc/GMT-0"),
-                    ("Etc/GMT-1", "Etc/GMT-1"),
-                    ("Etc/GMT-10", "Etc/GMT-10"),
-                    ("Etc/GMT-11", "Etc/GMT-11"),
-                    ("Etc/GMT-12", "Etc/GMT-12"),
-                    ("Etc/GMT-13", "Etc/GMT-13"),
-                    ("Etc/GMT-14", "Etc/GMT-14"),
-                    ("Etc/GMT-2", "Etc/GMT-2"),
-                    ("Etc/GMT-3", "Etc/GMT-3"),
-                    ("Etc/GMT-4", "Etc/GMT-4"),
-                    ("Etc/GMT-5", "Etc/GMT-5"),
-                    ("Etc/GMT-6", "Etc/GMT-6"),
-                    ("Etc/GMT-7", "Etc/GMT-7"),
-                    ("Etc/GMT-8", "Etc/GMT-8"),
-                    ("Etc/GMT-9", "Etc/GMT-9"),
-                    ("Etc/GMT0", "Etc/GMT0"),
-                    ("Etc/Greenwich", "Etc/Greenwich"),
-                    ("Etc/UCT", "Etc/UCT"),
-                    ("Etc/UTC", "Etc/UTC"),
-                    ("Etc/Universal", "Etc/Universal"),
-                    ("Etc/Zulu", "Etc/Zulu"),
-                    ("Europe/Amsterdam", "Europe/Amsterdam"),
-                    ("Europe/Andorra", "Europe/Andorra"),
-                    ("Europe/Astrakhan", "Europe/Astrakhan"),
-                    ("Europe/Athens", "Europe/Athens"),
-                    ("Europe/Belfast", "Europe/Belfast"),
-                    ("Europe/Belgrade", "Europe/Belgrade"),
-                    ("Europe/Berlin", "Europe/Berlin"),
-                    ("Europe/Bratislava", "Europe/Bratislava"),
-                    ("Europe/Brussels", "Europe/Brussels"),
-                    ("Europe/Bucharest", "Europe/Bucharest"),
-                    ("Europe/Budapest", "Europe/Budapest"),
-                    ("Europe/Busingen", "Europe/Busingen"),
-                    ("Europe/Chisinau", "Europe/Chisinau"),
-                    ("Europe/Copenhagen", "Europe/Copenhagen"),
-                    ("Europe/Dublin", "Europe/Dublin"),
-                    ("Europe/Gibraltar", "Europe/Gibraltar"),
-                    ("Europe/Guernsey", "Europe/Guernsey"),
-                    ("Europe/Helsinki", "Europe/Helsinki"),
-                    ("Europe/Isle_of_Man", "Europe/Isle_of_Man"),
-                    ("Europe/Istanbul", "Europe/Istanbul"),
-                    ("Europe/Jersey", "Europe/Jersey"),
-                    ("Europe/Kaliningrad", "Europe/Kaliningrad"),
-                    ("Europe/Kiev", "Europe/Kiev"),
-                    ("Europe/Kirov", "Europe/Kirov"),
-                    ("Europe/Kyiv", "Europe/Kyiv"),
-                    ("Europe/Lisbon", "Europe/Lisbon"),
-                    ("Europe/Ljubljana", "Europe/Ljubljana"),
-                    ("Europe/London", "Europe/London"),
-                    ("Europe/Luxembourg", "Europe/Luxembourg"),
-                    ("Europe/Madrid", "Europe/Madrid"),
-                    ("Europe/Malta", "Europe/Malta"),
-                    ("Europe/Mariehamn", "Europe/Mariehamn"),
-                    ("Europe/Minsk", "Europe/Minsk"),
-                    ("Europe/Monaco", "Europe/Monaco"),
-                    ("Europe/Moscow", "Europe/Moscow"),
-                    ("Europe/Nicosia", "Europe/Nicosia"),
-                    ("Europe/Oslo", "Europe/Oslo"),
-                    ("Europe/Paris", "Europe/Paris"),
-                    ("Europe/Podgorica", "Europe/Podgorica"),
-                    ("Europe/Prague", "Europe/Prague"),
-                    ("Europe/Riga", "Europe/Riga"),
-                    ("Europe/Rome", "Europe/Rome"),
-                    ("Europe/Samara", "Europe/Samara"),
-                    ("Europe/San_Marino", "Europe/San_Marino"),
-                    ("Europe/Sarajevo", "Europe/Sarajevo"),
-                    ("Europe/Saratov", "Europe/Saratov"),
-                    ("Europe/Simferopol", "Europe/Simferopol"),
-                    ("Europe/Skopje", "Europe/Skopje"),
-                    ("Europe/Sofia", "Europe/Sofia"),
-                    ("Europe/Stockholm", "Europe/Stockholm"),
-                    ("Europe/Tallinn", "Europe/Tallinn"),
-                    ("Europe/Tirane", "Europe/Tirane"),
-                    ("Europe/Tiraspol", "Europe/Tiraspol"),
-                    ("Europe/Ulyanovsk", "Europe/Ulyanovsk"),
-                    ("Europe/Uzhgorod", "Europe/Uzhgorod"),
-                    ("Europe/Vaduz", "Europe/Vaduz"),
-                    ("Europe/Vatican", "Europe/Vatican"),
-                    ("Europe/Vienna", "Europe/Vienna"),
-                    ("Europe/Vilnius", "Europe/Vilnius"),
-                    ("Europe/Volgograd", "Europe/Volgograd"),
-                    ("Europe/Warsaw", "Europe/Warsaw"),
-                    ("Europe/Zagreb", "Europe/Zagreb"),
-                    ("Europe/Zaporozhye", "Europe/Zaporozhye"),
-                    ("Europe/Zurich", "Europe/Zurich"),
-                    ("GB", "GB"),
-                    ("GB-Eire", "GB-Eire"),
-                    ("GMT", "GMT"),
-                    ("GMT+0", "GMT+0"),
-                    ("GMT-0", "GMT-0"),
-                    ("GMT0", "GMT0"),
-                    ("Greenwich", "Greenwich"),
-                    ("HST", "HST"),
-                    ("Hongkong", "Hongkong"),
-                    ("Iceland", "Iceland"),
-                    ("Indian/Antananarivo", "Indian/Antananarivo"),
-                    ("Indian/Chagos", "Indian/Chagos"),
-                    ("Indian/Christmas", "Indian/Christmas"),
-                    ("Indian/Cocos", "Indian/Cocos"),
-                    ("Indian/Comoro", "Indian/Comoro"),
-                    ("Indian/Kerguelen", "Indian/Kerguelen"),
-                    ("Indian/Mahe", "Indian/Mahe"),
-                    ("Indian/Maldives", "Indian/Maldives"),
-                    ("Indian/Mauritius", "Indian/Mauritius"),
-                    ("Indian/Mayotte", "Indian/Mayotte"),
-                    ("Indian/Reunion", "Indian/Reunion"),
-                    ("Iran", "Iran"),
-                    ("Israel", "Israel"),
-                    ("Jamaica", "Jamaica"),
-                    ("Japan", "Japan"),
-                    ("Kwajalein", "Kwajalein"),
-                    ("Libya", "Libya"),
-                    ("MET", "MET"),
-                    ("MST", "MST"),
-                    ("MST7MDT", "MST7MDT"),
-                    ("Mexico/BajaNorte", "Mexico/BajaNorte"),
-                    ("Mexico/BajaSur", "Mexico/BajaSur"),
-                    ("Mexico/General", "Mexico/General"),
-                    ("NZ", "NZ"),
-                    ("NZ-CHAT", "NZ-CHAT"),
-                    ("Navajo", "Navajo"),
-                    ("PRC", "PRC"),
-                    ("PST8PDT", "PST8PDT"),
-                    ("Pacific/Apia", "Pacific/Apia"),
-                    ("Pacific/Auckland", "Pacific/Auckland"),
-                    ("Pacific/Bougainville", "Pacific/Bougainville"),
-                    ("Pacific/Chatham", "Pacific/Chatham"),
-                    ("Pacific/Chuuk", "Pacific/Chuuk"),
-                    ("Pacific/Easter", "Pacific/Easter"),
-                    ("Pacific/Efate", "Pacific/Efate"),
-                    ("Pacific/Enderbury", "Pacific/Enderbury"),
-                    ("Pacific/Fakaofo", "Pacific/Fakaofo"),
-                    ("Pacific/Fiji", "Pacific/Fiji"),
-                    ("Pacific/Funafuti", "Pacific/Funafuti"),
-                    ("Pacific/Galapagos", "Pacific/Galapagos"),
-                    ("Pacific/Gambier", "Pacific/Gambier"),
-                    ("Pacific/Guadalcanal", "Pacific/Guadalcanal"),
-                    ("Pacific/Guam", "Pacific/Guam"),
-                    ("Pacific/Honolulu", "Pacific/Honolulu"),
-                    ("Pacific/Johnston", "Pacific/Johnston"),
-                    ("Pacific/Kanton", "Pacific/Kanton"),
-                    ("Pacific/Kiritimati", "Pacific/Kiritimati"),
-                    ("Pacific/Kosrae", "Pacific/Kosrae"),
-                    ("Pacific/Kwajalein", "Pacific/Kwajalein"),
-                    ("Pacific/Majuro", "Pacific/Majuro"),
-                    ("Pacific/Marquesas", "Pacific/Marquesas"),
-                    ("Pacific/Midway", "Pacific/Midway"),
-                    ("Pacific/Nauru", "Pacific/Nauru"),
-                    ("Pacific/Niue", "Pacific/Niue"),
-                    ("Pacific/Norfolk", "Pacific/Norfolk"),
-                    ("Pacific/Noumea", "Pacific/Noumea"),
-                    ("Pacific/Pago_Pago", "Pacific/Pago_Pago"),
-                    ("Pacific/Palau", "Pacific/Palau"),
-                    ("Pacific/Pitcairn", "Pacific/Pitcairn"),
-                    ("Pacific/Pohnpei", "Pacific/Pohnpei"),
-                    ("Pacific/Ponape", "Pacific/Ponape"),
-                    ("Pacific/Port_Moresby", "Pacific/Port_Moresby"),
-                    ("Pacific/Rarotonga", "Pacific/Rarotonga"),
-                    ("Pacific/Saipan", "Pacific/Saipan"),
-                    ("Pacific/Samoa", "Pacific/Samoa"),
-                    ("Pacific/Tahiti", "Pacific/Tahiti"),
-                    ("Pacific/Tarawa", "Pacific/Tarawa"),
-                    ("Pacific/Tongatapu", "Pacific/Tongatapu"),
-                    ("Pacific/Truk", "Pacific/Truk"),
-                    ("Pacific/Wake", "Pacific/Wake"),
-                    ("Pacific/Wallis", "Pacific/Wallis"),
-                    ("Pacific/Yap", "Pacific/Yap"),
-                    ("Poland", "Poland"),
-                    ("Portugal", "Portugal"),
-                    ("ROC", "ROC"),
-                    ("ROK", "ROK"),
-                    ("Singapore", "Singapore"),
-                    ("Turkey", "Turkey"),
-                    ("UCT", "UCT"),
-                    ("US/Alaska", "US/Alaska"),
-                    ("US/Aleutian", "US/Aleutian"),
-                    ("US/Arizona", "US/Arizona"),
-                    ("US/Central", "US/Central"),
-                    ("US/East-Indiana", "US/East-Indiana"),
-                    ("US/Eastern", "US/Eastern"),
-                    ("US/Hawaii", "US/Hawaii"),
-                    ("US/Indiana-Starke", "US/Indiana-Starke"),
-                    ("US/Michigan", "US/Michigan"),
-                    ("US/Mountain", "US/Mountain"),
-                    ("US/Pacific", "US/Pacific"),
-                    ("US/Samoa", "US/Samoa"),
-                    ("UTC", "UTC"),
-                    ("Universal", "Universal"),
-                    ("W-SU", "W-SU"),
-                    ("WET", "WET"),
-                    ("Zulu", "Zulu"),
-                ],
-                default="UTC",
-                max_length=255,
-            ),
-        ),
-        migrations.AlterField(
-            model_name="issuerelation",
-            name="relation_type",
-            field=models.CharField(
-                choices=[
-                    ("duplicate", "Duplicate"),
-                    ("relates_to", "Relates To"),
-                    ("blocked_by", "Blocked By"),
-                    ("start_before", "Start Before"),
-                    ("finish_before", "Finish Before"),
-                ],
-                default="blocked_by",
-                max_length=20,
-                verbose_name="Issue Relation Type",
-            ),
-        ),
-        migrations.AlterField(
-            model_name="issuetype",
-            name="level",
-            field=models.FloatField(default=0),
-        ),
-        migrations.AlterField(
-            model_name="label",
-            name="project",
-            field=models.ForeignKey(
-                null=True,
-                on_delete=django.db.models.deletion.CASCADE,
-                related_name="project_%(class)s",
-                to="db.project",
-            ),
-        ),
-        migrations.CreateModel(
-            name="DeviceSession",
-            fields=[
-                (
-                    "created_at",
-                    models.DateTimeField(
-                        auto_now_add=True, verbose_name="Created At"
-                    ),
-                ),
-                (
-                    "updated_at",
-                    models.DateTimeField(
-                        auto_now=True, verbose_name="Last Modified At"
-                    ),
-                ),
-                (
-                    "deleted_at",
-                    models.DateTimeField(
-                        blank=True, null=True, verbose_name="Deleted At"
-                    ),
-                ),
-                (
-                    "id",
-                    models.UUIDField(
-                        db_index=True,
-                        default=uuid.uuid4,
-                        editable=False,
-                        primary_key=True,
-                        serialize=False,
-                        unique=True,
-                    ),
-                ),
-                ("is_active", models.BooleanField(default=True)),
-                (
-                    "user_agent",
-                    models.CharField(blank=True, max_length=255, null=True),
-                ),
-                (
-                    "ip_address",
-                    models.GenericIPAddressField(blank=True, null=True),
-                ),
-                ("start_time", models.DateTimeField(auto_now_add=True)),
-                ("end_time", models.DateTimeField(blank=True, null=True)),
-                (
-                    "created_by",
-                    models.ForeignKey(
-                        null=True,
-                        on_delete=django.db.models.deletion.SET_NULL,
-                        related_name="%(class)s_created_by",
-                        to=settings.AUTH_USER_MODEL,
-                        verbose_name="Created By",
-                    ),
-                ),
-                (
-                    "device",
-                    models.ForeignKey(
-                        on_delete=django.db.models.deletion.CASCADE,
-                        related_name="sessions",
-                        to="db.device",
-                    ),
-                ),
-                (
-                    "session",
-                    models.ForeignKey(
-                        on_delete=django.db.models.deletion.CASCADE,
-                        related_name="device_sessions",
-                        to="db.session",
-                    ),
-                ),
-                (
-                    "updated_by",
-                    models.ForeignKey(
-                        null=True,
-                        on_delete=django.db.models.deletion.SET_NULL,
-                        related_name="%(class)s_updated_by",
-                        to=settings.AUTH_USER_MODEL,
-                        verbose_name="Last Modified By",
-                    ),
-                ),
-            ],
-            options={
-                "verbose_name": "Device Session",
-                "verbose_name_plural": "Device Sessions",
-                "db_table": "device_sessions",
-            },
-        ),
-    ]

apiserver/plane/db/migrations/0084_remove_label_label_unique_name_project_when_deleted_at_null_and_more.py

@@ -1,75 +0,0 @@
-# Generated by Django 4.2.15 on 2024-11-05 07:02
-
-from django.db import migrations, models
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ("db", "0083_device_workspace_timezone_and_more"),
-    ]
-
-    operations = [
-        migrations.RemoveConstraint(
-            model_name="label",
-            name="label_unique_name_project_when_deleted_at_null",
-        ),
-        migrations.AlterUniqueTogether(
-            name="label",
-            unique_together=set(),
-        ),
-        migrations.AddField(
-            model_name="deployboard",
-            name="is_disabled",
-            field=models.BooleanField(default=False),
-        ),
-        migrations.AddField(
-            model_name="inboxissue",
-            name="extra",
-            field=models.JSONField(default=dict),
-        ),
-        migrations.AddField(
-            model_name="inboxissue",
-            name="source_email",
-            field=models.TextField(blank=True, null=True),
-        ),
-        migrations.AddField(
-            model_name="user",
-            name="bot_type",
-            field=models.CharField(
-                blank=True, max_length=30, null=True, verbose_name="Bot Type"
-            ),
-        ),
-        migrations.AlterField(
-            model_name="deployboard",
-            name="entity_name",
-            field=models.CharField(blank=True, max_length=30, null=True),
-        ),
-        migrations.AlterField(
-            model_name="inboxissue",
-            name="source",
-            field=models.CharField(
-                blank=True, default="IN_APP", max_length=255, null=True
-            ),
-        ),
-        migrations.AddConstraint(
-            model_name="label",
-            constraint=models.UniqueConstraint(
-                condition=models.Q(
-                    ("deleted_at__isnull", True), ("project__isnull", True)
-                ),
-                fields=("name",),
-                name="unique_name_when_project_null_and_not_deleted",
-            ),
-        ),
-        migrations.AddConstraint(
-            model_name="label",
-            constraint=models.UniqueConstraint(
-                condition=models.Q(
-                    ("deleted_at__isnull", True), ("project__isnull", False)
-                ),
-                fields=("project", "name"),
-                name="unique_project_name_when_not_deleted",
-            ),
-        ),
-    ]

apiserver/plane/db/migrations/0085_intake_intakeissue_remove_inboxissue_created_by_and_more.py

@@ -1,141 +0,0 @@
-# Generated by Django 4.2.15 on 2024-11-06 08:41
-
-from django.conf import settings
-from django.db import migrations, models
-import django.db.models.deletion
-import uuid
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('db', '0084_remove_label_label_unique_name_project_when_deleted_at_null_and_more'),
-    ]
-
-    operations = [
-        migrations.RenameModel(
-            old_name="Inbox",
-            new_name="Intake",
-        ),
-        migrations.AlterModelTable(
-            name="Intake",
-            table="intakes",
-        ),
-        migrations.AlterModelOptions(
-            name="Intake",
-            options={
-                "verbose_name": "Intake",
-                "verbose_name_plural": "Intakes",
-                "ordering": ("name",),
-            },
-        ),
-        migrations.AlterField(
-            model_name="Intake",
-            name="description",
-            field=models.TextField(
-                blank=True, verbose_name="Intake Description"
-            ),
-        ),
-        migrations.RenameModel(
-            old_name="InboxIssue",
-            new_name="IntakeIssue",
-        ),
-        # Rename the 'inbox' field to 'intake'
-        migrations.RenameField(
-            model_name="IntakeIssue",
-            old_name="inbox",
-            new_name="intake",
-        ),
-        # Update ForeignKey related_name for 'intake'
-        migrations.AlterField(
-            model_name="IntakeIssue",
-            name="intake",
-            field=models.ForeignKey(
-                "db.Intake",
-                related_name="issue_intake",
-                on_delete=django.db.models.deletion.CASCADE,
-            ),
-        ),
-        # Update ForeignKey related_name for 'issue'
-        migrations.AlterField(
-            model_name="IntakeIssue",
-            name="issue",
-            field=models.ForeignKey(
-                "db.Issue",
-                related_name="issue_intake",
-                on_delete=django.db.models.deletion.CASCADE,
-            ),
-        ),
-        # Update ForeignKey related_name for 'duplicate_to'
-        migrations.AlterField(
-            model_name="IntakeIssue",
-            name="duplicate_to",
-            field=models.ForeignKey(
-                "db.Issue",
-                related_name="intake_duplicate",
-                on_delete=django.db.models.deletion.SET_NULL,
-                null=True,
-            ),
-        ),
-        # Update Meta options
-        migrations.AlterModelOptions(
-            name="IntakeIssue",
-            options={
-                "verbose_name": "IntakeIssue",
-                "verbose_name_plural": "IntakeIssues",
-                "ordering": ("-created_at",),
-            },
-        ),
-        # Update db_table
-        migrations.AlterModelTable(
-            name="IntakeIssue",
-            table="intake_issues",
-        ),
-        migrations.RenameField(
-            model_name="project",
-            old_name="inbox_view",
-            new_name="intake_view",
-        ),
-        migrations.RenameField(
-            model_name="deployboard",
-            old_name="inbox",
-            new_name="intake",
-        ),
-        migrations.RenameField(
-            model_name="projectdeployboard",
-            old_name="inbox",
-            new_name="intake",
-        ),
-        migrations.RemoveConstraint(
-            model_name="intake",
-            name="inbox_unique_name_project_when_deleted_at_null",
-        ),
-        migrations.AlterField(
-            model_name="deployboard",
-            name="intake",
-            field=models.ForeignKey(
-                null=True,
-                on_delete=django.db.models.deletion.SET_NULL,
-                related_name="publish_intake",
-                to="db.intake",
-            ),
-        ),
-        migrations.AlterField(
-            model_name="projectdeployboard",
-            name="intake",
-            field=models.ForeignKey(
-                null=True,
-                on_delete=django.db.models.deletion.SET_NULL,
-                related_name="board_intake",
-                to="db.intake",
-            ),
-        ),
-        migrations.AddConstraint(
-            model_name="intake",
-            constraint=models.UniqueConstraint(
-                condition=models.Q(("deleted_at__isnull", True)),
-                fields=("name", "project"),
-                name="intake_unique_name_project_when_deleted_at_null",
-            ),
-        ),
-    ]

apiserver/plane/db/models/__init__.py

@@ -5,17 +5,11 @@ from .base import BaseModel
 from .cycle import Cycle, CycleIssue, CycleUserProperties
 from .dashboard import Dashboard, DashboardWidget, Widget
 from .deploy_board import DeployBoard
-from .draft import (
-    DraftIssue,
-    DraftIssueAssignee,
-    DraftIssueLabel,
-    DraftIssueModule,
-    DraftIssueCycle,
-)
+from .draft import DraftIssue, DraftIssueAssignee, DraftIssueLabel, DraftIssueModule, DraftIssueCycle
 from .estimate import Estimate, EstimatePoint
 from .exporter import ExporterHistory
 from .importer import Importer
-from .intake import Intake, IntakeIssue
+from .inbox import Inbox, InboxIssue
 from .integration import (
     GithubCommentSync,
     GithubIssueSync,
@@ -41,6 +35,7 @@ from .issue import (
     IssueSequence,
     IssueSubscriber,
     IssueVote,
+    Label,
 )
 from .module import (
     Module,
@@ -93,7 +88,7 @@ from .page import Page, PageLog, PageLabel
 
 from .estimate import Estimate, EstimatePoint
 
-from .intake import Intake, IntakeIssue
+from .inbox import Inbox, InboxIssue
 
 from .analytic import AnalyticView
 
@@ -114,7 +109,3 @@ from .favorite import UserFavorite
 from .issue_type import IssueType
 
 from .recent_visit import UserRecentVisit
-
-from .label import Label
-
-from .device import Device, DeviceSession

apiserver/plane/db/models/cycle.py

@@ -110,7 +110,7 @@ class CycleIssue(ProjectBaseModel):
     Cycle Issues
     """
 
-    issue = models.ForeignKey(
+    issue = models.OneToOneField(
         "db.Issue", on_delete=models.CASCADE, related_name="issue_cycle"
     )
     cycle = models.ForeignKey(
@@ -118,14 +118,6 @@ class CycleIssue(ProjectBaseModel):
     )
 
     class Meta:
-        unique_together = ["issue", "cycle", "deleted_at"]
-        constraints = [
-            models.UniqueConstraint(
-                fields=["cycle", "issue"],
-                condition=models.Q(deleted_at__isnull=True),
-                name="cycle_issue_when_deleted_at_null",
-            )
-        ]
         verbose_name = "Cycle Issue"
         verbose_name_plural = "Cycle Issues"
         db_table = "cycle_issues"

apiserver/plane/db/models/deploy_board.py

@@ -20,30 +20,27 @@ class DeployBoard(WorkspaceBaseModel):
         ("cycle", "Task"),
         ("page", "Page"),
         ("view", "View"),
-        ("intake", "Intake"),
     )
 
     entity_identifier = models.UUIDField(null=True)
     entity_name = models.CharField(
         max_length=30,
-        null=True,
-        blank=True,
+        choices=TYPE_CHOICES,
     )
     anchor = models.CharField(
         max_length=255, default=get_anchor, unique=True, db_index=True
     )
     is_comments_enabled = models.BooleanField(default=False)
     is_reactions_enabled = models.BooleanField(default=False)
-    intake = models.ForeignKey(
-        "db.Intake",
-        related_name="publish_intake",
+    inbox = models.ForeignKey(
+        "db.Inbox",
+        related_name="board_inbox",
         on_delete=models.SET_NULL,
         null=True,
     )
     is_votes_enabled = models.BooleanField(default=False)
     view_props = models.JSONField(default=dict)
     is_activity_enabled = models.BooleanField(default=True)
-    is_disabled = models.BooleanField(default=False)
 
     def __str__(self):
         """Return name of the deploy board"""

apiserver/plane/db/models/device.py

@@ -1,50 +0,0 @@
-# models.py
-from django.db import models
-from django.conf import settings
-from .base import BaseModel
-
-
-class Device(BaseModel):
-    class DeviceType(models.TextChoices):
-        ANDROID = "ANDROID", "Android"
-        IOS = "IOS", "iOS"
-        WEB = "WEB", "Web"
-        DESKTOP = "DESKTOP", "Desktop"
-
-    user = models.ForeignKey(
-        settings.AUTH_USER_MODEL,
-        on_delete=models.CASCADE,
-        related_name="devices",
-    )
-    device_id = models.CharField(max_length=255, blank=True, null=True)
-    device_type = models.CharField(max_length=255, choices=DeviceType.choices)
-    push_token = models.CharField(max_length=255, blank=True, null=True)
-    is_active = models.BooleanField(default=True)
-
-    class Meta:
-        db_table = "devices"
-        verbose_name = "Device"
-        verbose_name_plural = "Devices"
-
-
-class DeviceSession(BaseModel):
-    device = models.ForeignKey(
-        Device,
-        on_delete=models.CASCADE,
-        related_name="sessions",
-    )
-    session = models.ForeignKey(
-        "db.Session",
-        on_delete=models.CASCADE,
-        related_name="device_sessions",
-    )
-    is_active = models.BooleanField(default=True)
-    user_agent = models.CharField(max_length=255, null=True, blank=True)
-    ip_address = models.GenericIPAddressField(null=True, blank=True)
-    start_time = models.DateTimeField(auto_now_add=True)
-    end_time = models.DateTimeField(null=True, blank=True)
-
-    class Meta:
-        db_table = "device_sessions"
-        verbose_name = "Device Session"
-        verbose_name_plural = "Device Sessions"

apiserver/plane/db/models/draft.py

@@ -234,7 +234,7 @@ class DraftIssueCycle(WorkspaceBaseModel):
     Draft Issue Cycles
     """
 
-    draft_issue = models.ForeignKey(
+    draft_issue = models.OneToOneField(
         "db.DraftIssue",
         on_delete=models.CASCADE,
         related_name="draft_issue_cycle",
@@ -244,14 +244,6 @@ class DraftIssueCycle(WorkspaceBaseModel):
     )
 
     class Meta:
-        unique_together = ["draft_issue", "cycle", "deleted_at"]
-        constraints = [
-            models.UniqueConstraint(
-                fields=["draft_issue", "cycle"],
-                condition=models.Q(deleted_at__isnull=True),
-                name="draft_issue_cycle_when_deleted_at_null",
-            )
-        ]
         verbose_name = "Draft Issue Cycle"
         verbose_name_plural = "Draft Issue Cycles"
         db_table = "draft_issue_cycles"

apiserver/plane/db/models/inbox.py

@@ -5,17 +5,17 @@ from django.db import models
 from plane.db.models.project import ProjectBaseModel
 
 
-class Intake(ProjectBaseModel):
+class Inbox(ProjectBaseModel):
     name = models.CharField(max_length=255)
     description = models.TextField(
-        verbose_name="Intake Description", blank=True
+        verbose_name="Inbox Description", blank=True
     )
     is_default = models.BooleanField(default=False)
     view_props = models.JSONField(default=dict)
     logo_props = models.JSONField(default=dict)
 
     def __str__(self):
-        """Return name of the intake"""
+        """Return name of the Inbox"""
         return f"{self.name} <{self.project.name}>"
 
     class Meta:
@@ -24,21 +24,21 @@ class Intake(ProjectBaseModel):
             models.UniqueConstraint(
                 fields=["name", "project"],
                 condition=models.Q(deleted_at__isnull=True),
-                name="intake_unique_name_project_when_deleted_at_null",
+                name="inbox_unique_name_project_when_deleted_at_null",
             )
         ]
-        verbose_name = "Intake"
-        verbose_name_plural = "Intakes"
-        db_table = "intakes"
+        verbose_name = "Inbox"
+        verbose_name_plural = "Inboxes"
+        db_table = "inboxes"
         ordering = ("name",)
 
 
-class IntakeIssue(ProjectBaseModel):
-    intake = models.ForeignKey(
-        "db.Intake", related_name="issue_intake", on_delete=models.CASCADE
+class InboxIssue(ProjectBaseModel):
+    inbox = models.ForeignKey(
+        "db.Inbox", related_name="issue_inbox", on_delete=models.CASCADE
     )
     issue = models.ForeignKey(
-        "db.Issue", related_name="issue_intake", on_delete=models.CASCADE
+        "db.Issue", related_name="issue_inbox", on_delete=models.CASCADE
     )
     status = models.IntegerField(
         choices=(
@@ -53,27 +53,20 @@ class IntakeIssue(ProjectBaseModel):
     snoozed_till = models.DateTimeField(null=True)
     duplicate_to = models.ForeignKey(
         "db.Issue",
-        related_name="intake_duplicate",
+        related_name="inbox_duplicate",
         on_delete=models.SET_NULL,
         null=True,
     )
-    source = models.CharField(
-        max_length=255,
-        default="IN_APP",
-        null=True,
-        blank=True,
-    )
-    source_email = models.TextField(blank=True, null=True)
+    source = models.TextField(blank=True, null=True)
     external_source = models.CharField(max_length=255, null=True, blank=True)
     external_id = models.CharField(max_length=255, blank=True, null=True)
-    extra = models.JSONField(default=dict)
 
     class Meta:
-        verbose_name = "IntakeIssue"
-        verbose_name_plural = "IntakeIssues"
-        db_table = "intake_issues"
+        verbose_name = "InboxIssue"
+        verbose_name_plural = "InboxIssues"
+        db_table = "inbox_issues"
         ordering = ("-created_at",)
 
     def __str__(self):
         """Return name of the Issue"""
-        return f"{self.issue.name} <{self.intake.name}>"
+        return f"{self.issue.name} <{self.inbox.name}>"

apiserver/plane/db/models/issue.py

@@ -86,12 +86,11 @@ class IssueManager(SoftDeletionManager):
             super()
             .get_queryset()
             .filter(
-                models.Q(issue_intake__status=1)
-                | models.Q(issue_intake__status=-1)
-                | models.Q(issue_intake__status=2)
-                | models.Q(issue_intake__isnull=True)
+                models.Q(issue_inbox__status=1)
+                | models.Q(issue_inbox__status=-1)
+                | models.Q(issue_inbox__status=2)
+                | models.Q(issue_inbox__isnull=True)
             )
-            .filter(deleted_at__isnull=True)
             .filter(state__is_triage=False)
             .exclude(archived_at__isnull=False)
             .exclude(project__archived_at__isnull=False)
@@ -279,8 +278,6 @@ class IssueRelation(ProjectBaseModel):
         ("duplicate", "Duplicate"),
         ("relates_to", "Relates To"),
         ("blocked_by", "Blocked By"),
-        ("start_before", "Start Before"),
-        ("finish_before", "Finish Before"),
     )
 
     issue = models.ForeignKey(
@@ -549,6 +546,51 @@ class IssueUserProperty(ProjectBaseModel):
         return str(self.user)
 
 
+class Label(ProjectBaseModel):
+    parent = models.ForeignKey(
+        "self",
+        on_delete=models.CASCADE,
+        null=True,
+        blank=True,
+        related_name="parent_label",
+    )
+    name = models.CharField(max_length=255)
+    description = models.TextField(blank=True)
+    color = models.CharField(max_length=255, blank=True)
+    sort_order = models.FloatField(default=65535)
+    external_source = models.CharField(max_length=255, null=True, blank=True)
+    external_id = models.CharField(max_length=255, blank=True, null=True)
+
+    class Meta:
+        unique_together = ["name", "project", "deleted_at"]
+        constraints = [
+            models.UniqueConstraint(
+                fields=["name", "project"],
+                condition=Q(deleted_at__isnull=True),
+                name="label_unique_name_project_when_deleted_at_null",
+            )
+        ]
+        verbose_name = "Label"
+        verbose_name_plural = "Labels"
+        db_table = "labels"
+        ordering = ("-created_at",)
+
+    def save(self, *args, **kwargs):
+        if self._state.adding:
+            # Get the maximum sequence value from the database
+            last_id = Label.objects.filter(project=self.project).aggregate(
+                largest=models.Max("sort_order")
+            )["largest"]
+            # if last_id is not None
+            if last_id is not None:
+                self.sort_order = last_id + 10000
+
+        super(Label, self).save(*args, **kwargs)
+
+    def __str__(self):
+        return str(self.name)
+
+
 class IssueLabel(ProjectBaseModel):
     issue = models.ForeignKey(
         "db.Issue", on_delete=models.CASCADE, related_name="label_issue"

apiserver/plane/db/models/issue_type.py

@@ -16,10 +16,9 @@ class IssueType(BaseModel):
     name = models.CharField(max_length=255)
     description = models.TextField(blank=True)
     logo_props = models.JSONField(default=dict)
-    is_epic = models.BooleanField(default=False)
     is_default = models.BooleanField(default=False)
     is_active = models.BooleanField(default=True)
-    level = models.FloatField(default=0)
+    level = models.PositiveIntegerField(default=0)
     external_source = models.CharField(max_length=255, null=True, blank=True)
     external_id = models.CharField(max_length=255, blank=True, null=True)
 

apiserver/plane/db/models/label.py

@@ -1,55 +0,0 @@
-from django.db import models
-from django.db.models import Q
-
-from .workspace import WorkspaceBaseModel
-
-
-class Label(WorkspaceBaseModel):
-    parent = models.ForeignKey(
-        "self",
-        on_delete=models.CASCADE,
-        null=True,
-        blank=True,
-        related_name="parent_label",
-    )
-    name = models.CharField(max_length=255)
-    description = models.TextField(blank=True)
-    color = models.CharField(max_length=255, blank=True)
-    sort_order = models.FloatField(default=65535)
-    external_source = models.CharField(max_length=255, null=True, blank=True)
-    external_id = models.CharField(max_length=255, blank=True, null=True)
-
-    class Meta:
-        constraints = [
-            # Enforce uniqueness of name when project is NULL and deleted_at is NULL
-            models.UniqueConstraint(
-                fields=["name"],
-                condition=Q(project__isnull=True, deleted_at__isnull=True),
-                name="unique_name_when_project_null_and_not_deleted",
-            ),
-            # Enforce uniqueness of project and name when project is not NULL and deleted_at is NULL
-            models.UniqueConstraint(
-                fields=["project", "name"],
-                condition=Q(project__isnull=False, deleted_at__isnull=True),
-                name="unique_project_name_when_not_deleted",
-            ),
-        ]
-        verbose_name = "Label"
-        verbose_name_plural = "Labels"
-        db_table = "labels"
-        ordering = ("-created_at",)
-
-    def save(self, *args, **kwargs):
-        if self._state.adding:
-            # Get the maximum sequence value from the database
-            last_id = Label.objects.filter(project=self.project).aggregate(
-                largest=models.Max("sort_order")
-            )["largest"]
-            # if last_id is not None
-            if last_id is not None:
-                self.sort_order = last_id + 10000
-
-        super(Label, self).save(*args, **kwargs)
-
-    def __str__(self):
-        return str(self.name)

apiserver/plane/db/models/page.py

@@ -9,6 +9,7 @@ from django.db import models
 # Module imports
 from plane.utils.html_processor import strip_tags
 
+from .project import ProjectBaseModel
 from .base import BaseModel
 
 

apiserver/plane/db/models/project.py

@@ -95,7 +95,7 @@ class Project(BaseModel):
     cycle_view = models.BooleanField(default=True)
     issue_views_view = models.BooleanField(default=True)
     page_view = models.BooleanField(default=True)
-    intake_view = models.BooleanField(default=False)
+    inbox_view = models.BooleanField(default=False)
     is_time_tracking_enabled = models.BooleanField(default=False)
     is_issue_type_enabled = models.BooleanField(default=False)
     guest_view_all_features = models.BooleanField(default=False)
@@ -309,9 +309,9 @@ class ProjectDeployBoard(ProjectBaseModel):
     )
     comments = models.BooleanField(default=False)
     reactions = models.BooleanField(default=False)
-    intake = models.ForeignKey(
-        "db.Intake",
-        related_name="board_intake",
+    inbox = models.ForeignKey(
+        "db.Inbox",
+        related_name="bord_inbox",
         on_delete=models.SET_NULL,
         null=True,
     )

apiserver/plane/db/models/user.py

@@ -107,12 +107,6 @@ class User(AbstractBaseUser, PermissionsMixin):
     # my_issues_prop = models.JSONField(null=True)
 
     is_bot = models.BooleanField(default=False)
-    bot_type = models.CharField(
-        max_length=30,
-        verbose_name="Bot Type",
-        blank=True,
-        null=True,
-    )
 
     # timezone
     USER_TIMEZONE_CHOICES = tuple(zip(pytz.all_timezones, pytz.all_timezones))
@@ -215,12 +209,6 @@ class Profile(TimeAuditModel):
 
 
 class Account(TimeAuditModel):
-    PROVIDER_CHOICES = (
-        ("google", "Google"),
-        ("github", "Github"),
-        ("gitlab", "GitLab"),
-    )
-
     id = models.UUIDField(
         default=uuid.uuid4,
         unique=True,
@@ -233,7 +221,11 @@ class Account(TimeAuditModel):
     )
     provider_account_id = models.CharField(max_length=255)
     provider = models.CharField(
-        choices=PROVIDER_CHOICES,
+        choices=(
+            ("google", "Google"),
+            ("github", "Github"),
+            ("gitlab", "GitLab"),
+        ),
     )
     access_token = models.TextField()
     access_token_expired_at = models.DateTimeField(null=True)

apiserver/plane/db/models/view.py

@@ -3,6 +3,8 @@ from django.conf import settings
 from django.db import models
 
 # Module import
+from .base import BaseModel
+from .project import ProjectBaseModel
 from .workspace import WorkspaceBaseModel
 from plane.utils.issue_filters import issue_filters
 

apiserver/plane/db/models/workspace.py

@@ -1,6 +1,3 @@
-# Python imports
-import pytz
-
 # Django imports
 from django.conf import settings
 from django.core.exceptions import ValidationError
@@ -120,8 +117,6 @@ def slug_validator(value):
 
 
 class Workspace(BaseModel):
-    TIMEZONE_CHOICES = tuple(zip(pytz.all_timezones, pytz.all_timezones))
-
     name = models.CharField(max_length=80, verbose_name="Workspace Name")
     logo = models.TextField(verbose_name="Logo", blank=True, null=True)
     logo_asset = models.ForeignKey(
@@ -145,9 +140,6 @@ class Workspace(BaseModel):
         ],
     )
     organization_size = models.CharField(max_length=20, blank=True, null=True)
-    timezone = models.CharField(
-        max_length=255, default="UTC", choices=TIMEZONE_CHOICES
-    )
 
     def __str__(self):
         """Return name of the Workspace"""

apiserver/plane/license/api/serializers/instance.py

@@ -13,6 +13,7 @@ class InstanceSerializer(BaseSerializer):
         model = Instance
         exclude = [
             "license_key",
+            "user_count"
         ]
         read_only_fields = [
             "id",

apiserver/plane/license/api/views/__init__.py

@@ -18,5 +18,3 @@ from .admin import (
     InstanceAdminSignOutEndpoint,
     InstanceAdminUserSessionEndpoint,
 )
-
-from .changelog import ChangeLogEndpoint

apiserver/plane/license/api/views/changelog.py

@@ -1,35 +0,0 @@
-# Python imports
-import requests
-
-# Django imports
-from django.conf import settings
-
-# Third party imports
-from rest_framework.response import Response
-from rest_framework import status
-from rest_framework.permissions import AllowAny
-
-# plane imports
-from .base import BaseAPIView
-
-
-class ChangeLogEndpoint(BaseAPIView):
-    permission_classes = [
-        AllowAny,
-    ]
-
-    def fetch_change_logs(self):
-        response = requests.get(settings.INSTANCE_CHANGELOG_URL)
-        response.raise_for_status()
-        return response.json()
-
-    def get(self, request):
-        # Fetch the changelog
-        if settings.INSTANCE_CHANGELOG_URL:
-            data = self.fetch_change_logs()
-            return Response(data, status=status.HTTP_200_OK)
-        else:
-            return Response(
-                {"error": "could not fetch changelog please try again later"},
-                status=status.HTTP_400_BAD_REQUEST,
-            )

apiserver/plane/license/api/views/instance.py

@@ -177,8 +177,6 @@ class InstanceEndpoint(BaseAPIView):
         data["space_base_url"] = settings.SPACE_BASE_URL
         data["app_base_url"] = settings.APP_BASE_URL
 
-        data["instance_changelog_url"] = settings.INSTANCE_CHANGELOG_URL
-
         instance_data = serializer.data
         instance_data["workspaces_exist"] = Workspace.objects.count() >= 1
 

apiserver/plane/license/bgtasks/tracer.py

@@ -3,7 +3,7 @@ from celery import shared_task
 from opentelemetry import trace
 
 # Module imports
-from plane.license.models import Instance, InstanceAdmin
+from plane.license.models import Instance
 from plane.db.models import (
     User,
     Workspace,
@@ -25,7 +25,6 @@ def instance_traces():
 
     # Check if the instance is registered
     instance = Instance.objects.first()
-    instance_admin = InstanceAdmin.objects.first()
 
     # If instance is None then return
     if instance is None:
@@ -53,17 +52,6 @@ def instance_traces():
             span.set_attribute(
                 "is_telemetry_enabled", instance.is_telemetry_enabled
             )
-            span.set_attribute(
-                "is_support_required", instance.is_support_required
-            )
-            span.set_attribute("is_setup_done", instance.is_setup_done)
-            span.set_attribute(
-                "is_signup_screen_visited", instance.is_signup_screen_visited
-            )
-            span.set_attribute("is_verified", instance.is_verified)
-            span.set_attribute("edition", instance.edition)
-            span.set_attribute("domain", instance.domain)
-            span.set_attribute("is_test", instance.is_test)
             span.set_attribute("user_count", user_count)
             span.set_attribute("workspace_count", workspace_count)
             span.set_attribute("project_count", project_count)
@@ -74,13 +62,6 @@ def instance_traces():
             span.set_attribute("module_issue_count", module_issue_count)
             span.set_attribute("page_count", page_count)
 
-            if instance_admin:
-                span.set_attribute("admin_email", instance_admin.user.email)
-                span.set_attribute(
-                    "admin_name",
-                    f"{instance_admin.user.first_name} {instance_admin.user.last_name}",
-                )
-
         # Workspace details
         for workspace in Workspace.objects.all():
             # Count of all models

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

@@ -1,7 +1,6 @@
 # Python imports
 import json
 import secrets
-import os
 
 # Django imports
 from django.core.management.base import BaseCommand, CommandError
@@ -9,7 +8,10 @@ from django.utils import timezone
 from django.conf import settings
 
 # Module imports
-from plane.license.models import Instance, EditiontTypes
+from plane.license.models import Instance
+from plane.db.models import (
+    User,
+)
 from plane.license.bgtasks.tracer import instance_traces
 
 
@@ -30,6 +32,7 @@ class Command(BaseCommand):
         payload = {
             "instance_key": settings.INSTANCE_KEY,
             "version": data.get("version", 0.1),
+            "user_count": User.objects.filter(is_bot=False).count(),
         }
         return payload
 
@@ -51,11 +54,11 @@ class Command(BaseCommand):
             instance = Instance.objects.create(
                 instance_name="Plane Community Edition",
                 instance_id=secrets.token_hex(12),
+                license_key=None,
                 current_version=payload.get("version"),
                 latest_version=payload.get("version"),
                 last_checked_at=timezone.now(),
-                is_test=os.environ.get("IS_TEST", "0") == "1",
-                edition=EditiontTypes.PLANE_CE.value,
+                user_count=payload.get("user_count", 0),
             )
 
             self.stdout.write(self.style.SUCCESS("Instance registered"))
@@ -66,10 +69,9 @@ class Command(BaseCommand):
             payload = self.read_package_json()
             # Update the instance details
             instance.last_checked_at = timezone.now()
+            instance.user_count = payload.get("user_count", 0)
             instance.current_version = payload.get("version")
             instance.latest_version = payload.get("version")
-            instance.is_test = os.environ.get("IS_TEST", "0") == "1"
-            instance.edition = EditiontTypes.PLANE_CE.value
             instance.save()
 
         # Call the instance traces task