dev: update the docker directory create

.deepsource.toml

@@ -0,0 +1,23 @@
+version = 1
+
+exclude_patterns = [  
+  "bin/**",  
+  "**/node_modules/",  
+  "**/*.min.js"  
+]
+
+[[analyzers]]
+name = "shell"
+
+[[analyzers]]
+name = "javascript"
+
+  [analyzers.meta]
+  plugins = ["react"]
+  environment = ["nodejs"]
+
+[[analyzers]]
+name = "python"
+
+  [analyzers.meta]
+  runtime_version = "3.x.x"

.github/workflows/build-branch.yml

@@ -2,10 +2,32 @@ name: Branch Build
 
 on:
   workflow_dispatch:
+    inputs:
+      build-web:
+        required: false
+        description: "Build Web"
+        type: boolean
+        default: false
+      build-space:
+        required: false
+        description: "Build Space"
+        type: boolean
+        default: false
+      build-api:
+        required: false
+        description: "Build API"
+        type: boolean
+        default: false
+      build-proxy:
+        required: false
+        description: "Build Proxy"
+        type: boolean
+        default: false
   push:
     branches:
       - master
       - preview
+      - develop
   release:
     types: [released, prereleased]
 
@@ -73,7 +95,7 @@ jobs:
               - nginx/**
 
   branch_build_push_frontend:
-    if: ${{ needs.branch_build_setup.outputs.build_frontend == 'true' || github.event_name == 'workflow_dispatch' || github.event_name == 'release' || needs.branch_build_setup.outputs.gh_branch_name == 'master' }}
+    if: ${{ needs.branch_build_setup.outputs.build_frontend == 'true' || github.event.inputs.build-web=='true' || github.event_name == 'release' || needs.branch_build_setup.outputs.gh_branch_name == 'master' }}
     runs-on: ubuntu-20.04
     needs: [branch_build_setup]
     env:
@@ -125,7 +147,7 @@ jobs:
           DOCKER_PASSWORD: ${{ secrets.DOCKERHUB_TOKEN }}
 
   branch_build_push_space:
-    if: ${{ needs.branch_build_setup.outputs.build_space == 'true' || github.event_name == 'workflow_dispatch' || github.event_name == 'release' || needs.branch_build_setup.outputs.gh_branch_name == 'master' }}
+    if: ${{ needs.branch_build_setup.outputs.build_space == 'true' || github.event.inputs.build-space=='true' || github.event_name == 'release' || needs.branch_build_setup.outputs.gh_branch_name == 'master' }}
     runs-on: ubuntu-20.04
     needs: [branch_build_setup]
     env:
@@ -177,7 +199,7 @@ jobs:
           DOCKER_PASSWORD: ${{ secrets.DOCKERHUB_TOKEN }}
 
   branch_build_push_backend:
-    if: ${{ needs.branch_build_setup.outputs.build_backend == 'true' || github.event_name == 'workflow_dispatch' || github.event_name == 'release' || needs.branch_build_setup.outputs.gh_branch_name == 'master' }}
+    if: ${{ needs.branch_build_setup.outputs.build_backend == 'true' || github.event.inputs.build-api=='true' || github.event_name == 'release' || needs.branch_build_setup.outputs.gh_branch_name == 'master' }}
     runs-on: ubuntu-20.04
     needs: [branch_build_setup]
     env:
@@ -229,7 +251,7 @@ jobs:
           DOCKER_PASSWORD: ${{ secrets.DOCKERHUB_TOKEN }}
 
   branch_build_push_proxy:
-    if: ${{ needs.branch_build_setup.outputs.build_proxy == 'true' || github.event_name == 'workflow_dispatch' || github.event_name == 'release' || needs.branch_build_setup.outputs.gh_branch_name == 'master' }}
+    if: ${{ needs.branch_build_setup.outputs.build_proxy == 'true' || github.event.inputs.build-web=='true' || github.event_name == 'release' || needs.branch_build_setup.outputs.gh_branch_name == 'master' }}
     runs-on: ubuntu-20.04
     needs: [branch_build_setup]
     env:

.github/workflows/codeql.yml

@@ -1,13 +1,13 @@
 name: "CodeQL"
 
 on:
-  workflow_dispatch:
   push:
-    branches: ["develop", "preview", "master"]
+    branches: [ 'develop', 'preview', 'master' ]
   pull_request:
-    branches: ["develop", "preview", "master"]
+    # The branches below must be a subset of the branches above
+    branches: [ 'develop', 'preview', 'master' ]
   schedule:
-    - cron: "53 19 * * 5"
+    - cron: '53 19 * * 5'
 
 jobs:
   analyze:
@@ -21,44 +21,45 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        language: ["python", "javascript"]
+        language: [ 'python', 'javascript' ]
         # CodeQL supports [ 'cpp', 'csharp', 'go', 'java', 'javascript', 'python', 'ruby' ]
         # Use only 'java' to analyze code written in Java, Kotlin or both
         # Use only 'javascript' to analyze code written in JavaScript, TypeScript or both
         # Learn more about CodeQL language support at https://aka.ms/codeql-docs/language-support
 
     steps:
-      - name: Checkout repository
-        uses: actions/checkout@v3
+    - name: Checkout repository
+      uses: actions/checkout@v3
 
-      # Initializes the CodeQL tools for scanning.
-      - name: Initialize CodeQL
-        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.
-          # By default, queries listed here will override any specified in a config file.
-          # Prefix the list here with "+" to use these queries and those in the config file.
+    # Initializes the CodeQL tools for scanning.
+    - name: Initialize CodeQL
+      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.
+        # By default, queries listed here will override any specified in a config file.
+        # Prefix the list here with "+" to use these queries and those in the config file.
 
-          # For more details on CodeQL's query packs, refer to: https://docs.github.com/en/code-security/code-scanning/automatically-scanning-your-code-for-vulnerabilities-and-errors/configuring-code-scanning#using-queries-in-ql-packs
-          # queries: security-extended,security-and-quality
+        # For more details on CodeQL's query packs, refer to: https://docs.github.com/en/code-security/code-scanning/automatically-scanning-your-code-for-vulnerabilities-and-errors/configuring-code-scanning#using-queries-in-ql-packs
+        # queries: security-extended,security-and-quality
 
-      # 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@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
+    # 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@v2
 
-      #   If the Autobuild fails above, remove it and uncomment the following three lines.
-      #   modify them (or add more) to build your code if your project, please refer to the EXAMPLE below for guidance.
+    # ℹ️ 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
 
-      # - run: |
-      #     echo "Run, Build Application using script"
-      #     ./location_of_script_within_repo/buildscript.sh
+    #   If the Autobuild fails above, remove it and uncomment the following three lines.
+    #   modify them (or add more) to build your code if your project, please refer to the EXAMPLE below for guidance.
 
-      - name: Perform CodeQL Analysis
-        uses: github/codeql-action/analyze@v2
-        with:
-          category: "/language:${{matrix.language}}"
+    # - run: |
+    #     echo "Run, Build Application using script"
+    #     ./location_of_script_within_repo/buildscript.sh
+
+    - name: Perform CodeQL Analysis
+      uses: github/codeql-action/analyze@v2
+      with:
+        category: "/language:${{matrix.language}}"

README.md

@@ -17,10 +17,10 @@
 </p>
 
 <p align="center">
-    <a href="https://dub.sh/plane-website-readme"><b>Website</b></a> •
-    <a href="https://git.new/releases"><b>Releases</b></a> •
-    <a href="https://dub.sh/planepowershq"><b>Twitter</b></a> •
-    <a href="https://dub.sh/planedocs"><b>Documentation</b></a>
+    <a href="http://www.plane.so"><b>Website</b></a> •
+    <a href="https://github.com/makeplane/plane/releases"><b>Releases</b></a> •
+    <a href="https://twitter.com/planepowers"><b>Twitter</b></a> •
+    <a href="https://docs.plane.so/"><b>Documentation</b></a>
 </p>
 
 <p>
@@ -40,28 +40,28 @@
     </a>
 </p>
 
-Meet [Plane](https://dub.sh/plane-website-readme). An open-source software development tool to manage issues, sprints, and product roadmaps with peace of mind. 🧘‍♀️
+Meet [Plane](https://plane.so). An open-source software development tool to manage issues, sprints, and product roadmaps with peace of mind. 🧘‍♀️
 
-> Plane is still in its early days, not everything will be perfect yet, and hiccups may happen. Please let us know of any suggestions, ideas, or bugs that you encounter on our [Discord](https://discord.com/invite/A92xrEGCge) or GitHub issues, and we will use your feedback to improve in our upcoming releases.
+> Plane is still in its early days, not everything will be perfect yet, and hiccups may happen. Please let us know of any suggestions, ideas, or bugs that you encounter on our [Discord](https://discord.com/invite/A92xrEGCge) or GitHub issues, and we will use your feedback to improve on our upcoming releases.
 
 ## ⚡ Installation
 
 The easiest way to get started with Plane is by creating a [Plane Cloud](https://app.plane.so) account where we offer a hosted solution for users.
 
-If you want more control over your data, prefer to self-host Plane, please refer to our [deployment documentation](https://docs.plane.so/docker-compose).
+If you want more control over your data prefer to self-host Plane, please refer to our [deployment documentation](https://docs.plane.so/docker-compose).
 
 | Installation Methods | Documentation Link                                                                                                                                           |
 | -------------------- | ------------------------------------------------------------------------------------------------------------------------------------------------------------ |
-| Docker               | [![Docker](https://img.shields.io/badge/docker-%230db7ed.svg?style=for-the-badge&logo=docker&logoColor=white)](https://docs.plane.so/self-hosting/methods/docker-compose)         |
+| Docker               | [![Docker](https://img.shields.io/badge/docker-%230db7ed.svg?style=for-the-badge&logo=docker&logoColor=white)](https://docs.plane.so/docker-compose)         |
 | Kubernetes           | [![Kubernetes](https://img.shields.io/badge/kubernetes-%23326ce5.svg?style=for-the-badge&logo=kubernetes&logoColor=white)](https://docs.plane.so/kubernetes) |
 
 `Instance admin` can configure instance settings using our [God-mode](https://docs.plane.so/instance-admin) feature.
 
 ## 🚀 Features
 
-- **Issues**: Quickly create issues and add details using a powerful rich text editor that supports file uploads. Add sub-properties and references to problems for better organization and tracking.
+- **Issues**: Quickly create issues and add details using a powerful, rich text editor that supports file uploads. Add sub-properties and references to problems for better organization and tracking.
 
-- **Cycles**:
+- **Cycles**
   Keep up your team's momentum with Cycles. Gain insights into your project's progress with burn-down charts and other valuable features.
 
 - **Modules**: Break down your large projects into smaller, more manageable modules. Assign modules between teams to track and plan your project's progress easily.
@@ -74,11 +74,11 @@ If you want more control over your data, prefer to self-host Plane, please refer
 
 - **Drive** (_coming soon_): The drive helps you share documents, images, videos, or any other files that make sense to you or your team and align on the problem/solution.
 
-## 🛠️ Quick start for contributors
+## 🛠️ Contributors Quick Start
 
 > Development system must have docker engine installed and running.
 
-Setting up local environment is extremely easy and straight forward. Follow the below step and you will be ready to contribute - 
+Setting up local environment is extremely easy and straight forward. Follow the below step and you will be ready to contribute
 
 1. Clone the code locally using:
    ```

apiserver/Dockerfile.api

@@ -48,7 +48,7 @@ USER root
 RUN apk --no-cache add "bash~=5.2"
 COPY ./bin ./bin/
 
-RUN mkdir -p /code/plane/logs
+RUN mkdir /code/plane/logs
 RUN chmod +x ./bin/takeoff ./bin/worker ./bin/beat
 RUN chmod -R 777 /code
 RUN chown -R captain:plane /code

apiserver/Dockerfile.dev

@@ -35,7 +35,6 @@ RUN addgroup -S plane && \
 
 COPY . .
 
-RUN mkdir -p /code/plane/logs
 RUN chown -R captain.plane /code
 RUN chmod -R +x /code/bin
 RUN chmod -R 777 /code

apiserver/back_migration.py

@@ -182,7 +182,7 @@ def update_label_color():
         labels = Label.objects.filter(color="")
         updated_labels = []
         for label in labels:
-            label.color = f"#{random.randint(0, 0xFFFFFF+1):06X}"
+            label.color = "#" + "%06x" % random.randint(0, 0xFFFFFF)
             updated_labels.append(label)
 
         Label.objects.bulk_update(updated_labels, ["color"], batch_size=100)

apiserver/package.json

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

apiserver/plane/api/serializers/issue.py

@@ -1,33 +1,32 @@
-from django.core.exceptions import ValidationError
-from django.core.validators import URLValidator
+from lxml import html
 
 # Django imports
 from django.utils import timezone
-from lxml import html
+from django.core.validators import URLValidator
+from django.core.exceptions import ValidationError
 
 #  Third party imports
 from rest_framework import serializers
 
 # Module imports
 from plane.db.models import (
+    User,
     Issue,
-    IssueActivity,
+    State,
     IssueAssignee,
-    IssueAttachment,
-    IssueComment,
+    Label,
     IssueLabel,
     IssueLink,
-    Label,
+    IssueComment,
+    IssueAttachment,
+    IssueActivity,
     ProjectMember,
-    State,
-    User,
 )
-
 from .base import BaseSerializer
-from .cycle import CycleLiteSerializer, CycleSerializer
-from .module import ModuleLiteSerializer, ModuleSerializer
-from .state import StateLiteSerializer
+from .cycle import CycleSerializer, CycleLiteSerializer
+from .module import ModuleSerializer, ModuleLiteSerializer
 from .user import UserLiteSerializer
+from .state import StateLiteSerializer
 
 
 class IssueSerializer(BaseSerializer):
@@ -80,7 +79,7 @@ class IssueSerializer(BaseSerializer):
                 data["description_html"] = parsed_str
 
         except Exception as e:
-            raise serializers.ValidationError("Invalid HTML passed")
+            raise serializers.ValidationError(f"Invalid HTML: {str(e)}")
 
         # Validate assignees are from project
         if data.get("assignees", []):
@@ -295,7 +294,7 @@ class IssueLinkSerializer(BaseSerializer):
             raise serializers.ValidationError("Invalid URL format.")
 
         # Check URL scheme
-        if not value.startswith(("http://", "https://")):
+        if not value.startswith(('http://', 'https://')):
             raise serializers.ValidationError("Invalid URL scheme.")
 
         return value
@@ -367,7 +366,7 @@ class IssueCommentSerializer(BaseSerializer):
                 data["comment_html"] = parsed_str
 
         except Exception as e:
-            raise serializers.ValidationError("Invalid HTML passed")
+            raise serializers.ValidationError(f"Invalid HTML: {str(e)}")
         return data
 
 

apiserver/plane/api/urls/cycle.py

@@ -4,7 +4,6 @@ from plane.api.views.cycle import (
     CycleAPIEndpoint,
     CycleIssueAPIEndpoint,
     TransferCycleIssueAPIEndpoint,
-    CycleArchiveUnarchiveAPIEndpoint,
 )
 
 urlpatterns = [
@@ -33,14 +32,4 @@ urlpatterns = [
         TransferCycleIssueAPIEndpoint.as_view(),
         name="transfer-issues",
     ),
-    path(
-        "workspaces/<str:slug>/projects/<uuid:project_id>/cycles/<uuid:pk>/archive/",
-        CycleArchiveUnarchiveAPIEndpoint.as_view(),
-        name="cycle-archive-unarchive",
-    ),
-    path(
-        "workspaces/<str:slug>/projects/<uuid:project_id>/archived-cycles/",
-        CycleArchiveUnarchiveAPIEndpoint.as_view(),
-        name="cycle-archive-unarchive",
-    ),
 ]

apiserver/plane/api/urls/module.py

@@ -1,10 +1,6 @@
 from django.urls import path
 
-from plane.api.views import (
-    ModuleAPIEndpoint,
-    ModuleIssueAPIEndpoint,
-    ModuleArchiveUnarchiveAPIEndpoint,
-)
+from plane.api.views import ModuleAPIEndpoint, ModuleIssueAPIEndpoint
 
 urlpatterns = [
     path(
@@ -27,14 +23,4 @@ urlpatterns = [
         ModuleIssueAPIEndpoint.as_view(),
         name="module-issues",
     ),
-    path(
-        "workspaces/<str:slug>/projects/<uuid:project_id>/modules/<uuid:pk>/archive/",
-        ModuleArchiveUnarchiveAPIEndpoint.as_view(),
-        name="module-archive-unarchive",
-    ),
-    path(
-        "workspaces/<str:slug>/projects/<uuid:project_id>/archived-modules/",
-        ModuleArchiveUnarchiveAPIEndpoint.as_view(),
-        name="module-archive-unarchive",
-    ),
 ]

apiserver/plane/api/urls/project.py

@@ -1,9 +1,6 @@
 from django.urls import path
 
-from plane.api.views import (
-    ProjectAPIEndpoint,
-    ProjectArchiveUnarchiveAPIEndpoint,
-)
+from plane.api.views import ProjectAPIEndpoint
 
 urlpatterns = [
     path(
@@ -16,9 +13,4 @@ urlpatterns = [
         ProjectAPIEndpoint.as_view(),
         name="project",
     ),
-    path(
-        "workspaces/<str:slug>/projects/<uuid:project_id>/archive/",
-        ProjectArchiveUnarchiveAPIEndpoint.as_view(),
-        name="project-archive-unarchive",
-    ),
 ]

apiserver/plane/api/views/__init__.py

@@ -1,4 +1,4 @@
-from .project import ProjectAPIEndpoint, ProjectArchiveUnarchiveAPIEndpoint
+from .project import ProjectAPIEndpoint
 
 from .state import StateAPIEndpoint
 
@@ -14,13 +14,8 @@ from .cycle import (
     CycleAPIEndpoint,
     CycleIssueAPIEndpoint,
     TransferCycleIssueAPIEndpoint,
-    CycleArchiveUnarchiveAPIEndpoint,
 )
 
-from .module import (
-    ModuleAPIEndpoint,
-    ModuleIssueAPIEndpoint,
-    ModuleArchiveUnarchiveAPIEndpoint,
-)
+from .module import ModuleAPIEndpoint, ModuleIssueAPIEndpoint
 
 from .inbox import InboxIssueAPIEndpoint

apiserver/plane/api/views/cycle.py

@@ -140,9 +140,7 @@ class CycleAPIEndpoint(WebhookMixin, BaseAPIView):
 
     def get(self, request, slug, project_id, pk=None):
         if pk:
-            queryset = (
-                self.get_queryset().filter(archived_at__isnull=True).get(pk=pk)
-            )
+            queryset = self.get_queryset().get(pk=pk)
             data = CycleSerializer(
                 queryset,
                 fields=self.fields,
@@ -152,9 +150,7 @@ class CycleAPIEndpoint(WebhookMixin, BaseAPIView):
                 data,
                 status=status.HTTP_200_OK,
             )
-        queryset = (
-            self.get_queryset().filter(archived_at__isnull=True)
-        )
+        queryset = self.get_queryset()
         cycle_view = request.GET.get("cycle_view", "all")
 
         # Current Cycle
@@ -295,11 +291,6 @@ class CycleAPIEndpoint(WebhookMixin, BaseAPIView):
         cycle = Cycle.objects.get(
             workspace__slug=slug, project_id=project_id, pk=pk
         )
-        if cycle.archived_at:
-            return Response(
-                {"error": "Archived cycle cannot be edited"},
-                status=status.HTTP_400_BAD_REQUEST,
-            )
 
         request_data = request.data
 
@@ -377,139 +368,6 @@ class CycleAPIEndpoint(WebhookMixin, BaseAPIView):
         return Response(status=status.HTTP_204_NO_CONTENT)
 
 
-class CycleArchiveUnarchiveAPIEndpoint(BaseAPIView):
-
-    permission_classes = [
-        ProjectEntityPermission,
-    ]
-
-    def get_queryset(self):
-        return (
-            Cycle.objects.filter(workspace__slug=self.kwargs.get("slug"))
-            .filter(project_id=self.kwargs.get("project_id"))
-            .filter(
-                project__project_projectmember__member=self.request.user,
-                project__project_projectmember__is_active=True,
-            )
-            .filter(archived_at__isnull=False)
-            .select_related("project")
-            .select_related("workspace")
-            .select_related("owned_by")
-            .annotate(
-                total_issues=Count(
-                    "issue_cycle",
-                    filter=Q(
-                        issue_cycle__issue__archived_at__isnull=True,
-                        issue_cycle__issue__is_draft=False,
-                    ),
-                )
-            )
-            .annotate(
-                completed_issues=Count(
-                    "issue_cycle__issue__state__group",
-                    filter=Q(
-                        issue_cycle__issue__state__group="completed",
-                        issue_cycle__issue__archived_at__isnull=True,
-                        issue_cycle__issue__is_draft=False,
-                    ),
-                )
-            )
-            .annotate(
-                cancelled_issues=Count(
-                    "issue_cycle__issue__state__group",
-                    filter=Q(
-                        issue_cycle__issue__state__group="cancelled",
-                        issue_cycle__issue__archived_at__isnull=True,
-                        issue_cycle__issue__is_draft=False,
-                    ),
-                )
-            )
-            .annotate(
-                started_issues=Count(
-                    "issue_cycle__issue__state__group",
-                    filter=Q(
-                        issue_cycle__issue__state__group="started",
-                        issue_cycle__issue__archived_at__isnull=True,
-                        issue_cycle__issue__is_draft=False,
-                    ),
-                )
-            )
-            .annotate(
-                unstarted_issues=Count(
-                    "issue_cycle__issue__state__group",
-                    filter=Q(
-                        issue_cycle__issue__state__group="unstarted",
-                        issue_cycle__issue__archived_at__isnull=True,
-                        issue_cycle__issue__is_draft=False,
-                    ),
-                )
-            )
-            .annotate(
-                backlog_issues=Count(
-                    "issue_cycle__issue__state__group",
-                    filter=Q(
-                        issue_cycle__issue__state__group="backlog",
-                        issue_cycle__issue__archived_at__isnull=True,
-                        issue_cycle__issue__is_draft=False,
-                    ),
-                )
-            )
-            .annotate(
-                total_estimates=Sum("issue_cycle__issue__estimate_point")
-            )
-            .annotate(
-                completed_estimates=Sum(
-                    "issue_cycle__issue__estimate_point",
-                    filter=Q(
-                        issue_cycle__issue__state__group="completed",
-                        issue_cycle__issue__archived_at__isnull=True,
-                        issue_cycle__issue__is_draft=False,
-                    ),
-                )
-            )
-            .annotate(
-                started_estimates=Sum(
-                    "issue_cycle__issue__estimate_point",
-                    filter=Q(
-                        issue_cycle__issue__state__group="started",
-                        issue_cycle__issue__archived_at__isnull=True,
-                        issue_cycle__issue__is_draft=False,
-                    ),
-                )
-            )
-            .order_by(self.kwargs.get("order_by", "-created_at"))
-            .distinct()
-        )
-
-    def get(self, request, slug, project_id):
-        return self.paginate(
-            request=request,
-            queryset=(self.get_queryset()),
-            on_results=lambda cycles: CycleSerializer(
-                cycles,
-                many=True,
-                fields=self.fields,
-                expand=self.expand,
-            ).data,
-        )
-
-    def post(self, request, slug, project_id, pk):
-        cycle = Cycle.objects.get(
-            pk=pk, project_id=project_id, workspace__slug=slug
-        )
-        cycle.archived_at = timezone.now()
-        cycle.save()
-        return Response(status=status.HTTP_204_NO_CONTENT)
-
-    def delete(self, request, slug, project_id, pk):
-        cycle = Cycle.objects.get(
-            pk=pk, project_id=project_id, workspace__slug=slug
-        )
-        cycle.archived_at = None
-        cycle.save()
-        return Response(status=status.HTTP_204_NO_CONTENT)
-
-
 class CycleIssueAPIEndpoint(WebhookMixin, BaseAPIView):
     """
     This viewset automatically provides `list`, `create`,

apiserver/plane/api/views/issue.py

@@ -357,7 +357,6 @@ class LabelAPIEndpoint(BaseAPIView):
                 project__project_projectmember__member=self.request.user,
                 project__project_projectmember__is_active=True,
             )
-            .filter(project__archived_at__isnull=True)
             .select_related("project")
             .select_related("workspace")
             .select_related("parent")
@@ -490,7 +489,6 @@ class IssueLinkAPIEndpoint(BaseAPIView):
                 project__project_projectmember__member=self.request.user,
                 project__project_projectmember__is_active=True,
             )
-            .filter(project__archived_at__isnull=True)
             .order_by(self.kwargs.get("order_by", "-created_at"))
             .distinct()
         )
@@ -620,7 +618,6 @@ class IssueCommentAPIEndpoint(WebhookMixin, BaseAPIView):
                 project__project_projectmember__member=self.request.user,
                 project__project_projectmember__is_active=True,
             )
-            .filter(project__archived_at__isnull=True)
             .select_related("workspace", "project", "issue", "actor")
             .annotate(
                 is_member=Exists(
@@ -796,7 +793,6 @@ class IssueActivityAPIEndpoint(BaseAPIView):
                 project__project_projectmember__member=self.request.user,
                 project__project_projectmember__is_active=True,
             )
-            .filter(project__archived_at__isnull=True)
             .select_related("actor", "workspace", "issue", "project")
         ).order_by(request.GET.get("order_by", "created_at"))
 

apiserver/plane/api/views/module.py

@@ -67,7 +67,6 @@ class ModuleAPIEndpoint(WebhookMixin, BaseAPIView):
                         issue_module__issue__archived_at__isnull=True,
                         issue_module__issue__is_draft=False,
                     ),
-                    distinct=True,
                 ),
             )
             .annotate(
@@ -78,7 +77,6 @@ class ModuleAPIEndpoint(WebhookMixin, BaseAPIView):
                         issue_module__issue__archived_at__isnull=True,
                         issue_module__issue__is_draft=False,
                     ),
-                    distinct=True,
                 )
             )
             .annotate(
@@ -89,7 +87,6 @@ class ModuleAPIEndpoint(WebhookMixin, BaseAPIView):
                         issue_module__issue__archived_at__isnull=True,
                         issue_module__issue__is_draft=False,
                     ),
-                    distinct=True,
                 )
             )
             .annotate(
@@ -100,7 +97,6 @@ class ModuleAPIEndpoint(WebhookMixin, BaseAPIView):
                         issue_module__issue__archived_at__isnull=True,
                         issue_module__issue__is_draft=False,
                     ),
-                    distinct=True,
                 )
             )
             .annotate(
@@ -111,7 +107,6 @@ class ModuleAPIEndpoint(WebhookMixin, BaseAPIView):
                         issue_module__issue__archived_at__isnull=True,
                         issue_module__issue__is_draft=False,
                     ),
-                    distinct=True,
                 )
             )
             .annotate(
@@ -122,7 +117,6 @@ class ModuleAPIEndpoint(WebhookMixin, BaseAPIView):
                         issue_module__issue__archived_at__isnull=True,
                         issue_module__issue__is_draft=False,
                     ),
-                    distinct=True,
                 )
             )
             .order_by(self.kwargs.get("order_by", "-created_at"))
@@ -171,11 +165,6 @@ class ModuleAPIEndpoint(WebhookMixin, BaseAPIView):
         module = Module.objects.get(
             pk=pk, project_id=project_id, workspace__slug=slug
         )
-        if module.archived_at:
-            return Response(
-                {"error": "Archived module cannot be edited"},
-                status=status.HTTP_400_BAD_REQUEST,
-            )
         serializer = ModuleSerializer(
             module,
             data=request.data,
@@ -208,9 +197,7 @@ class ModuleAPIEndpoint(WebhookMixin, BaseAPIView):
 
     def get(self, request, slug, project_id, pk=None):
         if pk:
-            queryset = (
-                self.get_queryset().filter(archived_at__isnull=True).get(pk=pk)
-            )
+            queryset = self.get_queryset().get(pk=pk)
             data = ModuleSerializer(
                 queryset,
                 fields=self.fields,
@@ -222,7 +209,7 @@ class ModuleAPIEndpoint(WebhookMixin, BaseAPIView):
             )
         return self.paginate(
             request=request,
-            queryset=(self.get_queryset().filter(archived_at__isnull=True)),
+            queryset=(self.get_queryset()),
             on_results=lambda modules: ModuleSerializer(
                 modules,
                 many=True,
@@ -292,7 +279,6 @@ class ModuleIssueAPIEndpoint(WebhookMixin, BaseAPIView):
                 project__project_projectmember__member=self.request.user,
                 project__project_projectmember__is_active=True,
             )
-            .filter(project__archived_at__isnull=True)
             .select_related("project")
             .select_related("workspace")
             .select_related("module")
@@ -460,123 +446,3 @@ class ModuleIssueAPIEndpoint(WebhookMixin, BaseAPIView):
             epoch=int(timezone.now().timestamp()),
         )
         return Response(status=status.HTTP_204_NO_CONTENT)
-
-
-class ModuleArchiveUnarchiveAPIEndpoint(BaseAPIView):
-
-    permission_classes = [
-        ProjectEntityPermission,
-    ]
-
-    def get_queryset(self):
-        return (
-            Module.objects.filter(project_id=self.kwargs.get("project_id"))
-            .filter(workspace__slug=self.kwargs.get("slug"))
-            .filter(archived_at__isnull=False)
-            .select_related("project")
-            .select_related("workspace")
-            .select_related("lead")
-            .prefetch_related("members")
-            .prefetch_related(
-                Prefetch(
-                    "link_module",
-                    queryset=ModuleLink.objects.select_related(
-                        "module", "created_by"
-                    ),
-                )
-            )
-            .annotate(
-                total_issues=Count(
-                    "issue_module",
-                    filter=Q(
-                        issue_module__issue__archived_at__isnull=True,
-                        issue_module__issue__is_draft=False,
-                    ),
-                    distinct=True,
-                ),
-            )
-            .annotate(
-                completed_issues=Count(
-                    "issue_module__issue__state__group",
-                    filter=Q(
-                        issue_module__issue__state__group="completed",
-                        issue_module__issue__archived_at__isnull=True,
-                        issue_module__issue__is_draft=False,
-                    ),
-                    distinct=True,
-                )
-            )
-            .annotate(
-                cancelled_issues=Count(
-                    "issue_module__issue__state__group",
-                    filter=Q(
-                        issue_module__issue__state__group="cancelled",
-                        issue_module__issue__archived_at__isnull=True,
-                        issue_module__issue__is_draft=False,
-                    ),
-                    distinct=True,
-                )
-            )
-            .annotate(
-                started_issues=Count(
-                    "issue_module__issue__state__group",
-                    filter=Q(
-                        issue_module__issue__state__group="started",
-                        issue_module__issue__archived_at__isnull=True,
-                        issue_module__issue__is_draft=False,
-                    ),
-                    distinct=True,
-                )
-            )
-            .annotate(
-                unstarted_issues=Count(
-                    "issue_module__issue__state__group",
-                    filter=Q(
-                        issue_module__issue__state__group="unstarted",
-                        issue_module__issue__archived_at__isnull=True,
-                        issue_module__issue__is_draft=False,
-                    ),
-                    distinct=True,
-                )
-            )
-            .annotate(
-                backlog_issues=Count(
-                    "issue_module__issue__state__group",
-                    filter=Q(
-                        issue_module__issue__state__group="backlog",
-                        issue_module__issue__archived_at__isnull=True,
-                        issue_module__issue__is_draft=False,
-                    ),
-                    distinct=True,
-                )
-            )
-            .order_by(self.kwargs.get("order_by", "-created_at"))
-        )
-
-    def get(self, request, slug, project_id):
-        return self.paginate(
-            request=request,
-            queryset=(self.get_queryset()),
-            on_results=lambda modules: ModuleSerializer(
-                modules,
-                many=True,
-                fields=self.fields,
-                expand=self.expand,
-            ).data,
-        )
-
-    def post(self, request, slug, project_id, pk):
-        module = Module.objects.get(
-            pk=pk, project_id=project_id, workspace__slug=slug
-        )
-        module.archived_at = timezone.now()
-        module.save()
-        return Response(status=status.HTTP_204_NO_CONTENT)
-
-    def delete(self, request, slug, project_id, pk):
-        module = Module.objects.get(
-            pk=pk, project_id=project_id, workspace__slug=slug
-        )
-        module.archived_at = None
-        module.save()
-        return Response(status=status.HTTP_204_NO_CONTENT)

apiserver/plane/api/views/project.py

@@ -1,5 +1,4 @@
 # Django imports
-from django.utils import timezone
 from django.db import IntegrityError
 from django.db.models import Exists, OuterRef, Q, F, Func, Subquery, Prefetch
 
@@ -40,10 +39,7 @@ class ProjectAPIEndpoint(WebhookMixin, BaseAPIView):
         return (
             Project.objects.filter(workspace__slug=self.kwargs.get("slug"))
             .filter(
-                Q(
-                    project_projectmember__member=self.request.user,
-                    project_projectmember__is_active=True,
-                )
+                Q(project_projectmember__member=self.request.user)
                 | Q(network=2)
             )
             .select_related(
@@ -264,12 +260,6 @@ class ProjectAPIEndpoint(WebhookMixin, BaseAPIView):
             workspace = Workspace.objects.get(slug=slug)
             project = Project.objects.get(pk=project_id)
 
-            if project.archived_at:
-                return Response(
-                    {"error": "Archived project cannot be updated"},
-                    status=status.HTTP_400_BAD_REQUEST,
-                )
-
             serializer = ProjectSerializer(
                 project,
                 data={**request.data},
@@ -326,22 +316,3 @@ class ProjectAPIEndpoint(WebhookMixin, BaseAPIView):
         project = Project.objects.get(pk=project_id, workspace__slug=slug)
         project.delete()
         return Response(status=status.HTTP_204_NO_CONTENT)
-
-
-class ProjectArchiveUnarchiveAPIEndpoint(BaseAPIView):
-
-    permission_classes = [
-        ProjectBasePermission,
-    ]
-
-    def post(self, request, slug, project_id):
-        project = Project.objects.get(pk=project_id, workspace__slug=slug)
-        project.archived_at = timezone.now()
-        project.save()
-        return Response(status=status.HTTP_204_NO_CONTENT)
-
-    def delete(self, request, slug, project_id):
-        project = Project.objects.get(pk=project_id, workspace__slug=slug)
-        project.archived_at = None
-        project.save()
-        return Response(status=status.HTTP_204_NO_CONTENT)

apiserver/plane/api/views/state.py

@@ -28,7 +28,6 @@ class StateAPIEndpoint(BaseAPIView):
                 project__project_projectmember__member=self.request.user,
                 project__project_projectmember__is_active=True,
             )
-            .filter(project__archived_at__isnull=True)
             .filter(~Q(name="Triage"))
             .select_related("project")
             .select_related("workspace")

apiserver/plane/app/serializers/cycle.py

@@ -31,7 +31,6 @@ class CycleWriteSerializer(BaseSerializer):
             "workspace",
             "project",
             "owned_by",
-            "archived_at",
         ]
 
 

apiserver/plane/app/serializers/issue.py

@@ -533,8 +533,8 @@ class IssueReactionLiteSerializer(DynamicBaseSerializer):
         model = IssueReaction
         fields = [
             "id",
-            "actor",
-            "issue",
+            "actor_id",
+            "issue_id",
             "reaction",
         ]
 

apiserver/plane/app/serializers/module.py

@@ -39,7 +39,6 @@ class ModuleWriteSerializer(BaseSerializer):
             "updated_by",
             "created_at",
             "updated_at",
-            "archived_at",
         ]
 
     def to_representation(self, instance):

apiserver/plane/app/urls/cycle.py

@@ -8,7 +8,6 @@ from plane.app.views import (
     CycleFavoriteViewSet,
     TransferCycleIssueEndpoint,
     CycleUserPropertiesEndpoint,
-    CycleArchiveUnarchiveEndpoint,
 )
 
 
@@ -91,14 +90,4 @@ urlpatterns = [
         CycleUserPropertiesEndpoint.as_view(),
         name="cycle-user-filters",
     ),
-    path(
-        "workspaces/<str:slug>/projects/<uuid:project_id>/cycles/<uuid:cycle_id>/archive/",
-        CycleArchiveUnarchiveEndpoint.as_view(),
-        name="cycle-archive-unarchive",
-    ),
-    path(
-        "workspaces/<str:slug>/projects/<uuid:project_id>/archived-cycles/",
-        CycleArchiveUnarchiveEndpoint.as_view(),
-        name="cycle-archive-unarchive",
-    ),
 ]

apiserver/plane/app/urls/module.py

@@ -7,7 +7,6 @@ from plane.app.views import (
     ModuleLinkViewSet,
     ModuleFavoriteViewSet,
     ModuleUserPropertiesEndpoint,
-    ModuleArchiveUnarchiveEndpoint,
 )
 
 
@@ -111,14 +110,4 @@ urlpatterns = [
         ModuleUserPropertiesEndpoint.as_view(),
         name="cycle-user-filters",
     ),
-    path(
-        "workspaces/<str:slug>/projects/<uuid:project_id>/modules/<uuid:module_id>/archive/",
-        ModuleArchiveUnarchiveEndpoint.as_view(),
-        name="module-archive-unarchive",
-    ),
-    path(
-        "workspaces/<str:slug>/projects/<uuid:project_id>/archived-modules/",
-        ModuleArchiveUnarchiveEndpoint.as_view(),
-        name="module-archive-unarchive",
-    ),
 ]

apiserver/plane/app/urls/project.py

@@ -14,7 +14,6 @@ from plane.app.views import (
     ProjectPublicCoverImagesEndpoint,
     ProjectDeployBoardViewSet,
     UserProjectRolesEndpoint,
-    ProjectArchiveUnarchiveEndpoint,
 )
 
 
@@ -176,9 +175,4 @@ urlpatterns = [
         ),
         name="project-deploy-board",
     ),
-    path(
-        "workspaces/<str:slug>/projects/<uuid:project_id>/archive/",
-        ProjectArchiveUnarchiveEndpoint.as_view(),
-        name="project-archive-unarchive",
-    ),
 ]

apiserver/plane/app/views/__init__.py

@@ -5,7 +5,6 @@ from .project.base import (
     ProjectFavoritesViewSet,
     ProjectPublicCoverImagesEndpoint,
     ProjectDeployBoardViewSet,
-    ProjectArchiveUnarchiveEndpoint,
 )
 
 from .project.invite import (
@@ -91,7 +90,6 @@ from .cycle.base import (
     CycleDateCheckEndpoint,
     CycleFavoriteViewSet,
     TransferCycleIssueEndpoint,
-    CycleArchiveUnarchiveEndpoint,
     CycleUserPropertiesEndpoint,
 )
 from .cycle.issue import (
@@ -170,7 +168,6 @@ from .module.base import (
     ModuleViewSet,
     ModuleLinkViewSet,
     ModuleFavoriteViewSet,
-    ModuleArchiveUnarchiveEndpoint,
     ModuleUserPropertiesEndpoint,
 )
 

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

@@ -1,56 +1,54 @@
 # Python imports
 import json
 
-from django.contrib.postgres.aggregates import ArrayAgg
-from django.contrib.postgres.fields import ArrayField
-
 # Django imports
 from django.db.models import (
-    Case,
-    CharField,
-    Count,
-    Exists,
-    F,
     Func,
-    OuterRef,
-    Prefetch,
+    F,
     Q,
-    UUIDField,
-    Value,
+    Exists,
+    OuterRef,
+    Count,
+    Prefetch,
+    Case,
     When,
+    Value,
+    CharField,
 )
-from django.db.models.functions import Coalesce
 from django.utils import timezone
-from rest_framework import status
+from django.contrib.postgres.aggregates import ArrayAgg
+from django.contrib.postgres.fields import ArrayField
+from django.db.models import UUIDField
+from django.db.models.functions import Coalesce
 
 # Third party imports
 from rest_framework.response import Response
+from rest_framework import status
 
+# Module imports
+from .. import BaseViewSet, BaseAPIView, WebhookMixin
+from plane.app.serializers import (
+    CycleSerializer,
+    CycleFavoriteSerializer,
+    CycleWriteSerializer,
+    CycleUserPropertiesSerializer,
+)
 from plane.app.permissions import (
     ProjectEntityPermission,
     ProjectLitePermission,
 )
-from plane.app.serializers import (
-    CycleFavoriteSerializer,
-    CycleSerializer,
-    CycleUserPropertiesSerializer,
-    CycleWriteSerializer,
+from plane.db.models import (
+    User,
+    Cycle,
+    CycleIssue,
+    Issue,
+    CycleFavorite,
+    Label,
+    CycleUserProperties,
 )
 from plane.bgtasks.issue_activites_task import issue_activity
-from plane.db.models import (
-    Cycle,
-    CycleFavorite,
-    CycleIssue,
-    CycleUserProperties,
-    Issue,
-    Label,
-    User,
-)
 from plane.utils.analytics_plot import burndown_plot
 
-# Module imports
-from .. import BaseAPIView, BaseViewSet, WebhookMixin
-
 
 class CycleViewSet(WebhookMixin, BaseViewSet):
     serializer_class = CycleSerializer
@@ -82,7 +80,6 @@ class CycleViewSet(WebhookMixin, BaseViewSet):
                 project__project_projectmember__member=self.request.user,
                 project__project_projectmember__is_active=True,
             )
-            .filter(project__archived_at__isnull=True)
             .select_related("project", "workspace", "owned_by")
             .prefetch_related(
                 Prefetch(
@@ -101,20 +98,9 @@ class CycleViewSet(WebhookMixin, BaseViewSet):
                 )
             )
             .annotate(is_favorite=Exists(favorite_subquery))
-            .annotate(
-                total_issues=Count(
-                    "issue_cycle__issue__id",
-                    distinct=True,
-                    filter=Q(
-                        issue_cycle__issue__archived_at__isnull=True,
-                        issue_cycle__issue__is_draft=False,
-                    ),
-                )
-            )
             .annotate(
                 completed_issues=Count(
-                    "issue_cycle__issue__id",
-                    distinct=True,
+                    "issue_cycle__issue__state__group",
                     filter=Q(
                         issue_cycle__issue__state__group="completed",
                         issue_cycle__issue__archived_at__isnull=True,
@@ -124,8 +110,7 @@ class CycleViewSet(WebhookMixin, BaseViewSet):
             )
             .annotate(
                 cancelled_issues=Count(
-                    "issue_cycle__issue__id",
-                    distinct=True,
+                    "issue_cycle__issue__state__group",
                     filter=Q(
                         issue_cycle__issue__state__group="cancelled",
                         issue_cycle__issue__archived_at__isnull=True,
@@ -135,8 +120,7 @@ class CycleViewSet(WebhookMixin, BaseViewSet):
             )
             .annotate(
                 started_issues=Count(
-                    "issue_cycle__issue__id",
-                    distinct=True,
+                    "issue_cycle__issue__state__group",
                     filter=Q(
                         issue_cycle__issue__state__group="started",
                         issue_cycle__issue__archived_at__isnull=True,
@@ -146,8 +130,7 @@ class CycleViewSet(WebhookMixin, BaseViewSet):
             )
             .annotate(
                 unstarted_issues=Count(
-                    "issue_cycle__issue__id",
-                    distinct=True,
+                    "issue_cycle__issue__state__group",
                     filter=Q(
                         issue_cycle__issue__state__group="unstarted",
                         issue_cycle__issue__archived_at__isnull=True,
@@ -157,8 +140,7 @@ class CycleViewSet(WebhookMixin, BaseViewSet):
             )
             .annotate(
                 backlog_issues=Count(
-                    "issue_cycle__issue__id",
-                    distinct=True,
+                    "issue_cycle__issue__state__group",
                     filter=Q(
                         issue_cycle__issue__state__group="backlog",
                         issue_cycle__issue__archived_at__isnull=True,
@@ -202,7 +184,15 @@ class CycleViewSet(WebhookMixin, BaseViewSet):
         )
 
     def list(self, request, slug, project_id):
-        queryset = self.get_queryset().filter(archived_at__isnull=True)
+        queryset = self.get_queryset().annotate(
+            total_issues=Count(
+                "issue_cycle",
+                filter=Q(
+                    issue_cycle__issue__archived_at__isnull=True,
+                    issue_cycle__issue__is_draft=False,
+                ),
+            )
+        )
         cycle_view = request.GET.get("cycle_view", "all")
 
         # Update the order by
@@ -356,8 +346,8 @@ class CycleViewSet(WebhookMixin, BaseViewSet):
             "external_id",
             "progress_snapshot",
             # meta fields
-            "is_favorite",
             "total_issues",
+            "is_favorite",
             "cancelled_issues",
             "completed_issues",
             "started_issues",
@@ -404,7 +394,6 @@ class CycleViewSet(WebhookMixin, BaseViewSet):
                         # meta fields
                         "is_favorite",
                         "cancelled_issues",
-                        "total_issues",
                         "completed_issues",
                         "started_issues",
                         "unstarted_issues",
@@ -431,11 +420,6 @@ class CycleViewSet(WebhookMixin, BaseViewSet):
             workspace__slug=slug, project_id=project_id, pk=pk
         )
         cycle = queryset.first()
-        if cycle.archived_at:
-            return Response(
-                {"error": "Archived cycle cannot be updated"},
-                status=status.HTTP_400_BAD_REQUEST,
-            )
         request_data = request.data
 
         if (
@@ -480,7 +464,6 @@ class CycleViewSet(WebhookMixin, BaseViewSet):
                 "progress_snapshot",
                 # meta fields
                 "is_favorite",
-                "total_issues",
                 "cancelled_issues",
                 "completed_issues",
                 "started_issues",
@@ -494,11 +477,31 @@ class CycleViewSet(WebhookMixin, BaseViewSet):
 
     def retrieve(self, request, slug, project_id, pk):
         queryset = (
-            self.get_queryset().filter(archived_at__isnull=True).filter(pk=pk)
+            self.get_queryset()
+            .filter(pk=pk)
+            .annotate(
+                total_issues=Count(
+                    "issue_cycle",
+                    filter=Q(
+                        issue_cycle__issue__archived_at__isnull=True,
+                        issue_cycle__issue__is_draft=False,
+                    ),
+                )
+            )
         )
         data = (
             self.get_queryset()
             .filter(pk=pk)
+            .annotate(
+                total_issues=Issue.issue_objects.filter(
+                    project_id=self.kwargs.get("project_id"),
+                    parent__isnull=True,
+                    issue_cycle__cycle_id=pk,
+                )
+                .order_by()
+                .annotate(count=Func(F("id"), function="Count"))
+                .values("count")
+            )
             .annotate(
                 sub_issues=Issue.issue_objects.filter(
                     project_id=self.kwargs.get("project_id"),
@@ -679,197 +682,6 @@ class CycleViewSet(WebhookMixin, BaseViewSet):
         return Response(status=status.HTTP_204_NO_CONTENT)
 
 
-class CycleArchiveUnarchiveEndpoint(BaseAPIView):
-
-    permission_classes = [
-        ProjectEntityPermission,
-    ]
-
-    def get_queryset(self):
-        favorite_subquery = CycleFavorite.objects.filter(
-            user=self.request.user,
-            cycle_id=OuterRef("pk"),
-            project_id=self.kwargs.get("project_id"),
-            workspace__slug=self.kwargs.get("slug"),
-        )
-        return (
-            Cycle.objects.filter(workspace__slug=self.kwargs.get("slug"))
-            .filter(project_id=self.kwargs.get("project_id"))
-            .filter(archived_at__isnull=False)
-            .filter(
-                project__project_projectmember__member=self.request.user,
-                project__project_projectmember__is_active=True,
-            )
-            .filter(project__archived_at__isnull=True)
-            .select_related("project", "workspace", "owned_by")
-            .prefetch_related(
-                Prefetch(
-                    "issue_cycle__issue__assignees",
-                    queryset=User.objects.only(
-                        "avatar", "first_name", "id"
-                    ).distinct(),
-                )
-            )
-            .prefetch_related(
-                Prefetch(
-                    "issue_cycle__issue__labels",
-                    queryset=Label.objects.only(
-                        "name", "color", "id"
-                    ).distinct(),
-                )
-            )
-            .annotate(is_favorite=Exists(favorite_subquery))
-            .annotate(
-                completed_issues=Count(
-                    "issue_cycle__issue__state__group",
-                    filter=Q(
-                        issue_cycle__issue__state__group="completed",
-                        issue_cycle__issue__archived_at__isnull=True,
-                        issue_cycle__issue__is_draft=False,
-                    ),
-                )
-            )
-            .annotate(
-                cancelled_issues=Count(
-                    "issue_cycle__issue__state__group",
-                    filter=Q(
-                        issue_cycle__issue__state__group="cancelled",
-                        issue_cycle__issue__archived_at__isnull=True,
-                        issue_cycle__issue__is_draft=False,
-                    ),
-                )
-            )
-            .annotate(
-                started_issues=Count(
-                    "issue_cycle__issue__state__group",
-                    filter=Q(
-                        issue_cycle__issue__state__group="started",
-                        issue_cycle__issue__archived_at__isnull=True,
-                        issue_cycle__issue__is_draft=False,
-                    ),
-                )
-            )
-            .annotate(
-                unstarted_issues=Count(
-                    "issue_cycle__issue__state__group",
-                    filter=Q(
-                        issue_cycle__issue__state__group="unstarted",
-                        issue_cycle__issue__archived_at__isnull=True,
-                        issue_cycle__issue__is_draft=False,
-                    ),
-                )
-            )
-            .annotate(
-                backlog_issues=Count(
-                    "issue_cycle__issue__state__group",
-                    filter=Q(
-                        issue_cycle__issue__state__group="backlog",
-                        issue_cycle__issue__archived_at__isnull=True,
-                        issue_cycle__issue__is_draft=False,
-                    ),
-                )
-            )
-            .annotate(
-                status=Case(
-                    When(
-                        Q(start_date__lte=timezone.now())
-                        & Q(end_date__gte=timezone.now()),
-                        then=Value("CURRENT"),
-                    ),
-                    When(
-                        start_date__gt=timezone.now(), then=Value("UPCOMING")
-                    ),
-                    When(end_date__lt=timezone.now(), then=Value("COMPLETED")),
-                    When(
-                        Q(start_date__isnull=True) & Q(end_date__isnull=True),
-                        then=Value("DRAFT"),
-                    ),
-                    default=Value("DRAFT"),
-                    output_field=CharField(),
-                )
-            )
-            .annotate(
-                assignee_ids=Coalesce(
-                    ArrayAgg(
-                        "issue_cycle__issue__assignees__id",
-                        distinct=True,
-                        filter=~Q(
-                            issue_cycle__issue__assignees__id__isnull=True
-                        )
-                        & Q(
-                            issue_cycle__issue__assignees__member_project__is_active=True
-                        ),
-                    ),
-                    Value([], output_field=ArrayField(UUIDField())),
-                )
-            )
-            .order_by("-is_favorite", "name")
-            .distinct()
-        )
-
-    def get(self, request, slug, project_id):
-        queryset = (
-            self.get_queryset()
-            .annotate(
-                total_issues=Count(
-                    "issue_cycle",
-                    filter=Q(
-                        issue_cycle__issue__archived_at__isnull=True,
-                        issue_cycle__issue__is_draft=False,
-                    ),
-                )
-            )
-            .values(
-                # necessary fields
-                "id",
-                "workspace_id",
-                "project_id",
-                # model fields
-                "name",
-                "description",
-                "start_date",
-                "end_date",
-                "owned_by_id",
-                "view_props",
-                "sort_order",
-                "external_source",
-                "external_id",
-                "progress_snapshot",
-                # meta fields
-                "total_issues",
-                "is_favorite",
-                "cancelled_issues",
-                "completed_issues",
-                "started_issues",
-                "unstarted_issues",
-                "backlog_issues",
-                "assignee_ids",
-                "status",
-                "archived_at",
-            )
-        ).order_by("-is_favorite", "-created_at")
-        return Response(queryset, status=status.HTTP_200_OK)
-
-    def post(self, request, slug, project_id, cycle_id):
-        cycle = Cycle.objects.get(
-            pk=cycle_id, project_id=project_id, workspace__slug=slug
-        )
-        cycle.archived_at = timezone.now()
-        cycle.save()
-        return Response(
-            {"archived_at": str(cycle.archived_at)},
-            status=status.HTTP_200_OK,
-        )
-
-    def delete(self, request, slug, project_id, cycle_id):
-        cycle = Cycle.objects.get(
-            pk=cycle_id, project_id=project_id, workspace__slug=slug
-        )
-        cycle.archived_at = None
-        cycle.save()
-        return Response(status=status.HTTP_204_NO_CONTENT)
-
-
 class CycleDateCheckEndpoint(BaseAPIView):
     permission_classes = [
         ProjectEntityPermission,

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

@@ -74,7 +74,6 @@ class CycleIssueViewSet(WebhookMixin, BaseViewSet):
                 project__project_projectmember__member=self.request.user,
                 project__project_projectmember__is_active=True,
             )
-            .filter(project__archived_at__isnull=True)
             .filter(cycle_id=self.kwargs.get("cycle_id"))
             .select_related("project")
             .select_related("workspace")
@@ -143,8 +142,7 @@ class CycleIssueViewSet(WebhookMixin, BaseViewSet):
                     ArrayAgg(
                         "assignees__id",
                         distinct=True,
-                        filter=~Q(assignees__id__isnull=True)
-                        & Q(assignees__member_project__is_active=True),
+                        filter=~Q(assignees__id__isnull=True),
                     ),
                     Value([], output_field=ArrayField(UUIDField())),
                 ),

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

@@ -149,8 +149,7 @@ def dashboard_assigned_issues(self, request, slug):
                 ArrayAgg(
                     "assignees__id",
                     distinct=True,
-                    filter=~Q(assignees__id__isnull=True)
-                    & Q(assignees__member_project__is_active=True),
+                    filter=~Q(assignees__id__isnull=True),
                 ),
                 Value([], output_field=ArrayField(UUIDField())),
             ),
@@ -304,8 +303,7 @@ def dashboard_created_issues(self, request, slug):
                 ArrayAgg(
                     "assignees__id",
                     distinct=True,
-                    filter=~Q(assignees__id__isnull=True)
-                    & Q(assignees__member_project__is_active=True),
+                    filter=~Q(assignees__id__isnull=True),
                 ),
                 Value([], output_field=ArrayField(UUIDField())),
             ),
@@ -473,7 +471,6 @@ def dashboard_recent_activity(self, request, slug):
         workspace__slug=slug,
         project__project_projectmember__member=request.user,
         project__project_projectmember__is_active=True,
-        project__archived_at__isnull=True,
         actor=request.user,
     ).select_related("actor", "workspace", "issue", "project")[:8]
 
@@ -489,7 +486,6 @@ def dashboard_recent_projects(self, request, slug):
             workspace__slug=slug,
             project__project_projectmember__member=request.user,
             project__project_projectmember__is_active=True,
-            project__archived_at__isnull=True,
             actor=request.user,
         )
         .values_list("project_id", flat=True)
@@ -504,7 +500,6 @@ def dashboard_recent_projects(self, request, slug):
         additional_projects = Project.objects.filter(
             project_projectmember__member=request.user,
             project_projectmember__is_active=True,
-            archived_at__isnull=True,
             workspace__slug=slug,
         ).exclude(id__in=unique_project_ids)
 
@@ -527,7 +522,6 @@ def dashboard_recent_collaborators(self, request, slug):
             actor=OuterRef("member"),
             project__project_projectmember__member=request.user,
             project__project_projectmember__is_active=True,
-            project__archived_at__isnull=True,
         )
         .values("actor")
         .annotate(num_activities=Count("pk"))
@@ -540,7 +534,6 @@ def dashboard_recent_collaborators(self, request, slug):
             workspace__slug=slug,
             project__project_projectmember__member=request.user,
             project__project_projectmember__is_active=True,
-            project__archived_at__isnull=True,
         )
         .annotate(
             num_activities=Coalesce(

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

@@ -29,10 +29,7 @@ class ExportIssuesEndpoint(BaseAPIView):
         if provider in ["csv", "xlsx", "json"]:
             if not project_ids:
                 project_ids = Project.objects.filter(
-                    workspace__slug=slug,
-                    project_projectmember__member=request.user,
-                    project_projectmember__is_active=True,
-                    archived_at__isnull=True,
+                    workspace__slug=slug
                 ).values_list("id", flat=True)
                 project_ids = [str(project_id) for project_id in project_ids]
 

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

@@ -146,8 +146,7 @@ class InboxIssueViewSet(BaseViewSet):
                     ArrayAgg(
                         "assignees__id",
                         distinct=True,
-                        filter=~Q(assignees__id__isnull=True)
-                        & Q(assignees__member_project__is_active=True),
+                        filter=~Q(assignees__id__isnull=True),
                     ),
                     Value([], output_field=ArrayField(UUIDField())),
                 ),

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

@@ -44,7 +44,6 @@ class IssueActivityEndpoint(BaseAPIView):
                 ~Q(field__in=["comment", "vote", "reaction", "draft"]),
                 project__project_projectmember__member=self.request.user,
                 project__project_projectmember__is_active=True,
-                project__archived_at__isnull=True,
                 workspace__slug=slug,
             )
             .filter(**filters)
@@ -55,7 +54,6 @@ class IssueActivityEndpoint(BaseAPIView):
             .filter(
                 project__project_projectmember__member=self.request.user,
                 project__project_projectmember__is_active=True,
-                project__archived_at__isnull=True,
                 workspace__slug=slug,
             )
             .filter(**filters)

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

@@ -105,8 +105,7 @@ class IssueArchiveViewSet(BaseViewSet):
                     ArrayAgg(
                         "assignees__id",
                         distinct=True,
-                        filter=~Q(assignees__id__isnull=True)
-                        & Q(assignees__member_project__is_active=True),
+                        filter=~Q(assignees__id__isnull=True),
                     ),
                     Value([], output_field=ArrayField(UUIDField())),
                 ),

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

@@ -52,7 +52,6 @@ from plane.db.models import (
 from plane.bgtasks.issue_activites_task import issue_activity
 from plane.utils.issue_filters import issue_filters
 
-
 class IssueListEndpoint(BaseAPIView):
 
     permission_classes = [
@@ -115,8 +114,7 @@ class IssueListEndpoint(BaseAPIView):
                     ArrayAgg(
                         "assignees__id",
                         distinct=True,
-                        filter=~Q(assignees__id__isnull=True)
-                        & Q(assignees__member_project__is_active=True),
+                        filter=~Q(assignees__id__isnull=True),
                     ),
                     Value([], output_field=ArrayField(UUIDField())),
                 ),
@@ -310,8 +308,7 @@ class IssueViewSet(WebhookMixin, BaseViewSet):
                     ArrayAgg(
                         "assignees__id",
                         distinct=True,
-                        filter=~Q(assignees__id__isnull=True)
-                        & Q(assignees__member_project__is_active=True),
+                        filter=~Q(assignees__id__isnull=True),
                     ),
                     Value([], output_field=ArrayField(UUIDField())),
                 ),

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

@@ -48,7 +48,6 @@ class IssueCommentViewSet(WebhookMixin, BaseViewSet):
             .filter(
                 project__project_projectmember__member=self.request.user,
                 project__project_projectmember__is_active=True,
-                project__archived_at__isnull=True,
             )
             .select_related("project")
             .select_related("workspace")
@@ -164,7 +163,6 @@ class CommentReactionViewSet(BaseViewSet):
             .filter(
                 project__project_projectmember__member=self.request.user,
                 project__project_projectmember__is_active=True,
-                project__archived_at__isnull=True,
             )
             .order_by("-created_at")
             .distinct()

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

@@ -1,54 +1,52 @@
 # Python imports
 import json
 
-from django.contrib.postgres.aggregates import ArrayAgg
-from django.contrib.postgres.fields import ArrayField
-from django.core.serializers.json import DjangoJSONEncoder
-from django.db.models import (
-    Case,
-    CharField,
-    Exists,
-    F,
-    Func,
-    Max,
-    OuterRef,
-    Prefetch,
-    Q,
-    UUIDField,
-    Value,
-    When,
-)
-from django.db.models.functions import Coalesce
-
 # Django imports
 from django.utils import timezone
+from django.db.models import (
+    Prefetch,
+    OuterRef,
+    Func,
+    F,
+    Q,
+    Case,
+    Value,
+    CharField,
+    When,
+    Exists,
+    Max,
+    UUIDField,
+)
+from django.core.serializers.json import DjangoJSONEncoder
 from django.utils.decorators import method_decorator
 from django.views.decorators.gzip import gzip_page
-from rest_framework import status
+from django.contrib.postgres.aggregates import ArrayAgg
+from django.contrib.postgres.fields import ArrayField
+from django.db.models.functions import Coalesce
 
 # Third Party imports
 from rest_framework.response import Response
-
-from plane.app.permissions import ProjectEntityPermission
-from plane.app.serializers import (
-    IssueCreateSerializer,
-    IssueDetailSerializer,
-    IssueFlatSerializer,
-    IssueSerializer,
-)
-from plane.bgtasks.issue_activites_task import issue_activity
-from plane.db.models import (
-    Issue,
-    IssueAttachment,
-    IssueLink,
-    IssueReaction,
-    IssueSubscriber,
-    Project,
-)
-from plane.utils.issue_filters import issue_filters
+from rest_framework import status
 
 # Module imports
 from .. import BaseViewSet
+from plane.app.serializers import (
+    IssueSerializer,
+    IssueCreateSerializer,
+    IssueFlatSerializer,
+    IssueDetailSerializer,
+)
+from plane.app.permissions import ProjectEntityPermission
+from plane.db.models import (
+    Project,
+    Issue,
+    IssueLink,
+    IssueAttachment,
+    IssueSubscriber,
+    IssueReaction,
+)
+from plane.bgtasks.issue_activites_task import issue_activity
+from plane.utils.issue_filters import issue_filters
 
 
 class IssueDraftViewSet(BaseViewSet):
@@ -101,8 +99,7 @@ class IssueDraftViewSet(BaseViewSet):
                     ArrayAgg(
                         "assignees__id",
                         distinct=True,
-                        filter=~Q(assignees__id__isnull=True)
-                        & Q(assignees__member_project__is_active=True),
+                        filter=~Q(assignees__id__isnull=True),
                     ),
                     Value([], output_field=ArrayField(UUIDField())),
                 ),
@@ -120,6 +117,11 @@ class IssueDraftViewSet(BaseViewSet):
     @method_decorator(gzip_page)
     def list(self, request, slug, project_id):
         filters = issue_filters(request.query_params, "GET")
+        fields = [
+            field
+            for field in request.GET.get("fields", "").split(",")
+            if field
+        ]
 
         # Custom ordering for priority and state
         priority_order = ["urgent", "high", "medium", "low", "none"]

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

@@ -87,7 +87,7 @@ class BulkCreateIssueLabelsEndpoint(BaseAPIView):
                 Label(
                     name=label.get("name", "Migrated"),
                     description=label.get("description", "Migrated Issue"),
-                    color=f"#{random.randint(0, 0xFFFFFF+1):06X}",
+                    color="#" + "%06x" % random.randint(0, 0xFFFFFF),
                     project_id=project_id,
                     workspace_id=project.workspace_id,
                     created_by=request.user,

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

@@ -35,7 +35,6 @@ class IssueLinkViewSet(BaseViewSet):
             .filter(
                 project__project_projectmember__member=self.request.user,
                 project__project_projectmember__is_active=True,
-                project__archived_at__isnull=True,
             )
             .order_by("-created_at")
             .distinct()

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

@@ -34,7 +34,6 @@ class IssueReactionViewSet(BaseViewSet):
             .filter(
                 project__project_projectmember__member=self.request.user,
                 project__project_projectmember__is_active=True,
-                project__archived_at__isnull=True,
             )
             .order_by("-created_at")
             .distinct()

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

@@ -41,7 +41,6 @@ class IssueRelationViewSet(BaseViewSet):
             .filter(
                 project__project_projectmember__member=self.request.user,
                 project__project_projectmember__is_active=True,
-                project__archived_at__isnull=True,
             )
             .select_related("project")
             .select_related("workspace")

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

@@ -83,8 +83,7 @@ class SubIssuesEndpoint(BaseAPIView):
                     ArrayAgg(
                         "assignees__id",
                         distinct=True,
-                        filter=~Q(assignees__id__isnull=True)
-                        & Q(assignees__member_project__is_active=True),
+                        filter=~Q(assignees__id__isnull=True),
                     ),
                     Value([], output_field=ArrayField(UUIDField())),
                 ),

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

@@ -54,7 +54,6 @@ class IssueSubscriberViewSet(BaseViewSet):
             .filter(
                 project__project_projectmember__member=self.request.user,
                 project__project_projectmember__is_active=True,
-                project__archived_at__isnull=True,
             )
             .order_by("-created_at")
             .distinct()

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

@@ -1,57 +1,44 @@
 # Python imports
 import json
 
-from django.contrib.postgres.aggregates import ArrayAgg
-from django.contrib.postgres.fields import ArrayField
-from django.db.models import (
-    Count,
-    Exists,
-    F,
-    Func,
-    IntegerField,
-    OuterRef,
-    Prefetch,
-    Q,
-    Subquery,
-    UUIDField,
-    Value,
-)
-from django.db.models.functions import Coalesce
-
 # Django Imports
 from django.utils import timezone
-from rest_framework import status
+from django.db.models import Prefetch, F, OuterRef, Exists, Count, Q, Func
+from django.contrib.postgres.aggregates import ArrayAgg
+from django.contrib.postgres.fields import ArrayField
+from django.db.models import Value, UUIDField
+from django.db.models.functions import Coalesce
 
 # Third party imports
 from rest_framework.response import Response
+from rest_framework import status
 
+# Module imports
+from .. import BaseViewSet, BaseAPIView, WebhookMixin
+from plane.app.serializers import (
+    ModuleWriteSerializer,
+    ModuleSerializer,
+    ModuleLinkSerializer,
+    ModuleFavoriteSerializer,
+    ModuleUserPropertiesSerializer,
+    ModuleDetailSerializer,
+)
 from plane.app.permissions import (
     ProjectEntityPermission,
     ProjectLitePermission,
 )
-from plane.app.serializers import (
-    ModuleDetailSerializer,
-    ModuleFavoriteSerializer,
-    ModuleLinkSerializer,
-    ModuleSerializer,
-    ModuleUserPropertiesSerializer,
-    ModuleWriteSerializer,
+from plane.db.models import (
+    Module,
+    ModuleIssue,
+    Project,
+    Issue,
+    ModuleLink,
+    ModuleFavorite,
+    ModuleUserProperties,
 )
 from plane.bgtasks.issue_activites_task import issue_activity
-from plane.db.models import (
-    Issue,
-    Module,
-    ModuleFavorite,
-    ModuleIssue,
-    ModuleLink,
-    ModuleUserProperties,
-    Project,
-)
 from plane.utils.analytics_plot import burndown_plot
 
-# Module imports
-from .. import BaseAPIView, BaseViewSet, WebhookMixin
-
 
 class ModuleViewSet(WebhookMixin, BaseViewSet):
     model = Module
@@ -74,59 +61,6 @@ class ModuleViewSet(WebhookMixin, BaseViewSet):
             project_id=self.kwargs.get("project_id"),
             workspace__slug=self.kwargs.get("slug"),
         )
-        cancelled_issues = (
-            Issue.issue_objects.filter(
-                state__group="cancelled",
-                issue_module__module_id=OuterRef("pk"),
-            )
-            .values("issue_module__module_id")
-            .annotate(cnt=Count("pk"))
-            .values("cnt")
-        )
-        completed_issues = (
-            Issue.issue_objects.filter(
-                state__group="completed",
-                issue_module__module_id=OuterRef("pk"),
-            )
-            .values("issue_module__module_id")
-            .annotate(cnt=Count("pk"))
-            .values("cnt")
-        )
-        started_issues = (
-            Issue.issue_objects.filter(
-                state__group="started",
-                issue_module__module_id=OuterRef("pk"),
-            )
-            .values("issue_module__module_id")
-            .annotate(cnt=Count("pk"))
-            .values("cnt")
-        )
-        unstarted_issues = (
-            Issue.issue_objects.filter(
-                state__group="unstarted",
-                issue_module__module_id=OuterRef("pk"),
-            )
-            .values("issue_module__module_id")
-            .annotate(cnt=Count("pk"))
-            .values("cnt")
-        )
-        backlog_issues = (
-            Issue.issue_objects.filter(
-                state__group="backlog",
-                issue_module__module_id=OuterRef("pk"),
-            )
-            .values("issue_module__module_id")
-            .annotate(cnt=Count("pk"))
-            .values("cnt")
-        )
-        total_issues = (
-            Issue.issue_objects.filter(
-                issue_module__module_id=OuterRef("pk"),
-            )
-            .values("issue_module__module_id")
-            .annotate(cnt=Count("pk"))
-            .values("cnt")
-        )
         return (
             super()
             .get_queryset()
@@ -146,39 +80,62 @@ class ModuleViewSet(WebhookMixin, BaseViewSet):
                 )
             )
             .annotate(
-                completed_issues=Coalesce(
-                    Subquery(completed_issues[:1]),
-                    Value(0, output_field=IntegerField()),
+                total_issues=Count(
+                    "issue_module",
+                    filter=Q(
+                        issue_module__issue__archived_at__isnull=True,
+                        issue_module__issue__is_draft=False,
+                    ),
+                ),
+            )
+            .annotate(
+                completed_issues=Count(
+                    "issue_module__issue__state__group",
+                    filter=Q(
+                        issue_module__issue__state__group="completed",
+                        issue_module__issue__archived_at__isnull=True,
+                        issue_module__issue__is_draft=False,
+                    ),
                 )
             )
             .annotate(
-                cancelled_issues=Coalesce(
-                    Subquery(cancelled_issues[:1]),
-                    Value(0, output_field=IntegerField()),
+                cancelled_issues=Count(
+                    "issue_module__issue__state__group",
+                    filter=Q(
+                        issue_module__issue__state__group="cancelled",
+                        issue_module__issue__archived_at__isnull=True,
+                        issue_module__issue__is_draft=False,
+                    ),
                 )
             )
             .annotate(
-                started_issues=Coalesce(
-                    Subquery(started_issues[:1]),
-                    Value(0, output_field=IntegerField()),
+                started_issues=Count(
+                    "issue_module__issue__state__group",
+                    filter=Q(
+                        issue_module__issue__state__group="started",
+                        issue_module__issue__archived_at__isnull=True,
+                        issue_module__issue__is_draft=False,
+                    ),
                 )
             )
             .annotate(
-                unstarted_issues=Coalesce(
-                    Subquery(unstarted_issues[:1]),
-                    Value(0, output_field=IntegerField()),
+                unstarted_issues=Count(
+                    "issue_module__issue__state__group",
+                    filter=Q(
+                        issue_module__issue__state__group="unstarted",
+                        issue_module__issue__archived_at__isnull=True,
+                        issue_module__issue__is_draft=False,
+                    ),
                 )
             )
             .annotate(
-                backlog_issues=Coalesce(
-                    Subquery(backlog_issues[:1]),
-                    Value(0, output_field=IntegerField()),
-                )
-            )
-            .annotate(
-                total_issues=Coalesce(
-                    Subquery(total_issues[:1]),
-                    Value(0, output_field=IntegerField()),
+                backlog_issues=Count(
+                    "issue_module__issue__state__group",
+                    filter=Q(
+                        issue_module__issue__state__group="backlog",
+                        issue_module__issue__archived_at__isnull=True,
+                        issue_module__issue__is_draft=False,
+                    ),
                 )
             )
             .annotate(
@@ -228,7 +185,6 @@ class ModuleViewSet(WebhookMixin, BaseViewSet):
                     "is_favorite",
                     "cancelled_issues",
                     "completed_issues",
-                    "total_issues",
                     "started_issues",
                     "unstarted_issues",
                     "backlog_issues",
@@ -240,7 +196,7 @@ class ModuleViewSet(WebhookMixin, BaseViewSet):
         return Response(serializer.errors, status=status.HTTP_400_BAD_REQUEST)
 
     def list(self, request, slug, project_id):
-        queryset = self.get_queryset().filter(archived_at__isnull=True)
+        queryset = self.get_queryset()
         if self.fields:
             modules = ModuleSerializer(
                 queryset,
@@ -282,8 +238,17 @@ class ModuleViewSet(WebhookMixin, BaseViewSet):
     def retrieve(self, request, slug, project_id, pk):
         queryset = (
             self.get_queryset()
-            .filter(archived_at__isnull=True)
             .filter(pk=pk)
+            .annotate(
+                total_issues=Issue.issue_objects.filter(
+                    project_id=self.kwargs.get("project_id"),
+                    parent__isnull=True,
+                    issue_module__module_id=pk,
+                )
+                .order_by()
+                .annotate(count=Func(F("id"), function="Count"))
+                .values("count")
+            )
             .annotate(
                 sub_issues=Issue.issue_objects.filter(
                     project_id=self.kwargs.get("project_id"),
@@ -395,11 +360,9 @@ class ModuleViewSet(WebhookMixin, BaseViewSet):
             "completion_chart": {},
         }
 
-        # Fetch the modules
-        modules = queryset.first()
-        if modules and modules.start_date and modules.target_date:
+        if queryset.first().start_date and queryset.first().target_date:
             data["distribution"]["completion_chart"] = burndown_plot(
-                queryset=modules,
+                queryset=queryset.first(),
                 slug=slug,
                 project_id=project_id,
                 module_id=pk,
@@ -411,20 +374,14 @@ class ModuleViewSet(WebhookMixin, BaseViewSet):
         )
 
     def partial_update(self, request, slug, project_id, pk):
-        module = self.get_queryset().filter(pk=pk)
-
-        if module.first().archived_at:
-            return Response(
-                {"error": "Archived module cannot be updated"},
-                status=status.HTTP_400_BAD_REQUEST,
-            )
+        queryset = self.get_queryset().filter(pk=pk)
         serializer = ModuleWriteSerializer(
-            module.first(), data=request.data, partial=True
+            queryset.first(), data=request.data, partial=True
         )
 
         if serializer.is_valid():
             serializer.save()
-            module = module.values(
+            module = queryset.values(
                 # Required fields
                 "id",
                 "workspace_id",
@@ -448,7 +405,6 @@ class ModuleViewSet(WebhookMixin, BaseViewSet):
                 "cancelled_issues",
                 "completed_issues",
                 "started_issues",
-                "total_issues",
                 "unstarted_issues",
                 "backlog_issues",
                 "created_at",
@@ -508,174 +464,12 @@ class ModuleLinkViewSet(BaseViewSet):
             .filter(
                 project__project_projectmember__member=self.request.user,
                 project__project_projectmember__is_active=True,
-                project__archived_at__isnull=True,
             )
             .order_by("-created_at")
             .distinct()
         )
 
 
-class ModuleArchiveUnarchiveEndpoint(BaseAPIView):
-
-    permission_classes = [
-        ProjectEntityPermission,
-    ]
-
-    def get_queryset(self):
-        favorite_subquery = ModuleFavorite.objects.filter(
-            user=self.request.user,
-            module_id=OuterRef("pk"),
-            project_id=self.kwargs.get("project_id"),
-            workspace__slug=self.kwargs.get("slug"),
-        )
-        return (
-            Module.objects.filter(workspace__slug=self.kwargs.get("slug"))
-            .filter(archived_at__isnull=False)
-            .annotate(is_favorite=Exists(favorite_subquery))
-            .select_related("project")
-            .select_related("workspace")
-            .select_related("lead")
-            .prefetch_related("members")
-            .prefetch_related(
-                Prefetch(
-                    "link_module",
-                    queryset=ModuleLink.objects.select_related(
-                        "module", "created_by"
-                    ),
-                )
-            )
-            .annotate(
-                total_issues=Count(
-                    "issue_module",
-                    filter=Q(
-                        issue_module__issue__archived_at__isnull=True,
-                        issue_module__issue__is_draft=False,
-                    ),
-                    distinct=True,
-                ),
-            )
-            .annotate(
-                completed_issues=Count(
-                    "issue_module__issue__state__group",
-                    filter=Q(
-                        issue_module__issue__state__group="completed",
-                        issue_module__issue__archived_at__isnull=True,
-                        issue_module__issue__is_draft=False,
-                    ),
-                    distinct=True,
-                )
-            )
-            .annotate(
-                cancelled_issues=Count(
-                    "issue_module__issue__state__group",
-                    filter=Q(
-                        issue_module__issue__state__group="cancelled",
-                        issue_module__issue__archived_at__isnull=True,
-                        issue_module__issue__is_draft=False,
-                    ),
-                    distinct=True,
-                )
-            )
-            .annotate(
-                started_issues=Count(
-                    "issue_module__issue__state__group",
-                    filter=Q(
-                        issue_module__issue__state__group="started",
-                        issue_module__issue__archived_at__isnull=True,
-                        issue_module__issue__is_draft=False,
-                    ),
-                    distinct=True,
-                )
-            )
-            .annotate(
-                unstarted_issues=Count(
-                    "issue_module__issue__state__group",
-                    filter=Q(
-                        issue_module__issue__state__group="unstarted",
-                        issue_module__issue__archived_at__isnull=True,
-                        issue_module__issue__is_draft=False,
-                    ),
-                    distinct=True,
-                )
-            )
-            .annotate(
-                backlog_issues=Count(
-                    "issue_module__issue__state__group",
-                    filter=Q(
-                        issue_module__issue__state__group="backlog",
-                        issue_module__issue__archived_at__isnull=True,
-                        issue_module__issue__is_draft=False,
-                    ),
-                    distinct=True,
-                )
-            )
-            .annotate(
-                member_ids=Coalesce(
-                    ArrayAgg(
-                        "members__id",
-                        distinct=True,
-                        filter=~Q(members__id__isnull=True),
-                    ),
-                    Value([], output_field=ArrayField(UUIDField())),
-                )
-            )
-            .order_by("-is_favorite", "-created_at")
-        )
-
-    def get(self, request, slug, project_id):
-        queryset = self.get_queryset()
-        modules = queryset.values(  # Required fields
-            "id",
-            "workspace_id",
-            "project_id",
-            # Model fields
-            "name",
-            "description",
-            "description_text",
-            "description_html",
-            "start_date",
-            "target_date",
-            "status",
-            "lead_id",
-            "member_ids",
-            "view_props",
-            "sort_order",
-            "external_source",
-            "external_id",
-            # computed fields
-            "total_issues",
-            "is_favorite",
-            "cancelled_issues",
-            "completed_issues",
-            "started_issues",
-            "unstarted_issues",
-            "backlog_issues",
-            "created_at",
-            "updated_at",
-            "archived_at",
-        )
-        return Response(modules, status=status.HTTP_200_OK)
-
-    def post(self, request, slug, project_id, module_id):
-        module = Module.objects.get(
-            pk=module_id, project_id=project_id, workspace__slug=slug
-        )
-        module.archived_at = timezone.now()
-        module.save()
-        return Response(
-            {"archived_at": str(module.archived_at)},
-            status=status.HTTP_200_OK,
-        )
-
-    def delete(self, request, slug, project_id, module_id):
-        module = Module.objects.get(
-            pk=module_id, project_id=project_id, workspace__slug=slug
-        )
-        module.archived_at = None
-        module.save()
-        return Response(status=status.HTTP_204_NO_CONTENT)
-
-
 class ModuleFavoriteViewSet(BaseViewSet):
     serializer_class = ModuleFavoriteSerializer
     model = ModuleFavorite

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

@@ -93,8 +93,7 @@ class ModuleIssueViewSet(WebhookMixin, BaseViewSet):
                     ArrayAgg(
                         "assignees__id",
                         distinct=True,
-                        filter=~Q(assignees__id__isnull=True)
-                        & Q(assignees__member_project__is_active=True),
+                        filter=~Q(assignees__id__isnull=True),
                     ),
                     Value([], output_field=ArrayField(UUIDField())),
                 ),

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

@@ -70,7 +70,6 @@ class PageViewSet(BaseViewSet):
             .filter(
                 project__project_projectmember__member=self.request.user,
                 project__project_projectmember__is_active=True,
-                project__archived_at__isnull=True,
             )
             .filter(parent__isnull=True)
             .filter(Q(owned_by=self.request.user) | Q(access=0))

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

@@ -13,7 +13,6 @@ from django.db.models import (
     Subquery,
 )
 from django.conf import settings
-from django.utils import timezone
 
 # Third Party imports
 from rest_framework.response import Response
@@ -73,10 +72,7 @@ class ProjectViewSet(WebhookMixin, BaseViewSet):
             .get_queryset()
             .filter(workspace__slug=self.kwargs.get("slug"))
             .filter(
-                Q(
-                    project_projectmember__member=self.request.user,
-                    project_projectmember__is_active=True,
-                )
+                Q(project_projectmember__member=self.request.user)
                 | Q(network=2)
             )
             .select_related(
@@ -180,7 +176,6 @@ class ProjectViewSet(WebhookMixin, BaseViewSet):
     def retrieve(self, request, slug, pk):
         project = (
             self.get_queryset()
-            .filter(archived_at__isnull=True)
             .filter(pk=pk)
             .annotate(
                 total_issues=Issue.issue_objects.filter(
@@ -368,12 +363,6 @@ class ProjectViewSet(WebhookMixin, BaseViewSet):
 
             project = Project.objects.get(pk=pk)
 
-            if project.archived_at:
-                return Response(
-                    {"error": "Archived projects cannot be updated"},
-                    status=status.HTTP_400_BAD_REQUEST,
-                )
-
             serializer = ProjectSerializer(
                 project,
                 data={**request.data},
@@ -428,28 +417,6 @@ class ProjectViewSet(WebhookMixin, BaseViewSet):
             )
 
 
-class ProjectArchiveUnarchiveEndpoint(BaseAPIView):
-
-    permission_classes = [
-        ProjectBasePermission,
-    ]
-
-    def post(self, request, slug, project_id):
-        project = Project.objects.get(pk=project_id, workspace__slug=slug)
-        project.archived_at = timezone.now()
-        project.save()
-        return Response(
-            {"archived_at": str(project.archived_at)},
-            status=status.HTTP_200_OK,
-        )
-
-    def delete(self, request, slug, project_id):
-        project = Project.objects.get(pk=project_id, workspace__slug=slug)
-        project.archived_at = None
-        project.save()
-        return Response(status=status.HTTP_204_NO_CONTENT)
-
-
 class ProjectIdentifierEndpoint(BaseAPIView):
     permission_classes = [
         ProjectBasePermission,

apiserver/plane/app/views/search.py

@@ -50,7 +50,6 @@ class GlobalSearchEndpoint(BaseAPIView):
                 q,
                 project_projectmember__member=self.request.user,
                 project_projectmember__is_active=True,
-                archived_at__isnull=True,
                 workspace__slug=slug,
             )
             .distinct()
@@ -73,7 +72,6 @@ class GlobalSearchEndpoint(BaseAPIView):
             q,
             project__project_projectmember__member=self.request.user,
             project__project_projectmember__is_active=True,
-            project__archived_at__isnull=True,
             workspace__slug=slug,
         )
 
@@ -99,7 +97,6 @@ class GlobalSearchEndpoint(BaseAPIView):
             q,
             project__project_projectmember__member=self.request.user,
             project__project_projectmember__is_active=True,
-            project__archived_at__isnull=True,
             workspace__slug=slug,
         )
 
@@ -124,7 +121,6 @@ class GlobalSearchEndpoint(BaseAPIView):
             q,
             project__project_projectmember__member=self.request.user,
             project__project_projectmember__is_active=True,
-            project__archived_at__isnull=True,
             workspace__slug=slug,
         )
 
@@ -149,7 +145,6 @@ class GlobalSearchEndpoint(BaseAPIView):
             q,
             project__project_projectmember__member=self.request.user,
             project__project_projectmember__is_active=True,
-            project__archived_at__isnull=True,
             workspace__slug=slug,
         )
 
@@ -174,7 +169,6 @@ class GlobalSearchEndpoint(BaseAPIView):
             q,
             project__project_projectmember__member=self.request.user,
             project__project_projectmember__is_active=True,
-            project__archived_at__isnull=True,
             workspace__slug=slug,
         )
 
@@ -249,7 +243,6 @@ class IssueSearchEndpoint(BaseAPIView):
             workspace__slug=slug,
             project__project_projectmember__member=self.request.user,
             project__project_projectmember__is_active=True,
-            project__archived_at__isnull=True
         )
 
         if workspace_search == "false":

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

@@ -33,7 +33,6 @@ class StateViewSet(BaseViewSet):
             .filter(
                 project__project_projectmember__member=self.request.user,
                 project__project_projectmember__is_active=True,
-                project__archived_at__isnull=True,
             )
             .filter(~Q(name="Triage"))
             .select_related("project")

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

@@ -125,8 +125,7 @@ class GlobalViewIssuesViewSet(BaseViewSet):
                     ArrayAgg(
                         "assignees__id",
                         distinct=True,
-                        filter=~Q(assignees__id__isnull=True)
-                        & Q(assignees__member_project__is_active=True),
+                        filter=~Q(assignees__id__isnull=True),
                     ),
                     Value([], output_field=ArrayField(UUIDField())),
                 ),
@@ -283,7 +282,6 @@ class IssueViewViewSet(BaseViewSet):
             .filter(
                 project__project_projectmember__member=self.request.user,
                 project__project_projectmember__is_active=True,
-                project__archived_at__isnull=True,
             )
             .select_related("project")
             .select_related("workspace")

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

@@ -1,51 +1,49 @@
 # Python imports
+from datetime import date
+from dateutil.relativedelta import relativedelta
 import csv
 import io
-from datetime import date
 
-from dateutil.relativedelta import relativedelta
-from django.db import IntegrityError
-from django.db.models import (
-    Count,
-    F,
-    Func,
-    OuterRef,
-    Prefetch,
-    Q,
-)
-from django.db.models.fields import DateField
-from django.db.models.functions import Cast, ExtractDay, ExtractWeek
 
 # Django imports
 from django.http import HttpResponse
+from django.db import IntegrityError
 from django.utils import timezone
+from django.db.models import (
+    Prefetch,
+    OuterRef,
+    Func,
+    F,
+    Q,
+    Count,
+)
+from django.db.models.functions import ExtractWeek, Cast, ExtractDay
+from django.db.models.fields import DateField
 
 # Third party modules
 from rest_framework import status
 from rest_framework.response import Response
 
-from plane.app.permissions import (
-    WorkSpaceAdminPermission,
-    WorkSpaceBasePermission,
-    WorkspaceEntityPermission,
-)
-
 # Module imports
 from plane.app.serializers import (
     WorkSpaceSerializer,
     WorkspaceThemeSerializer,
 )
-from plane.app.views.base import BaseAPIView, BaseViewSet
+from plane.app.views.base import BaseViewSet, BaseAPIView
 from plane.db.models import (
-    Issue,
-    IssueActivity,
     Workspace,
-    WorkspaceMember,
+    IssueActivity,
+    Issue,
     WorkspaceTheme,
+    WorkspaceMember,
+)
+from plane.app.permissions import (
+    WorkSpaceBasePermission,
+    WorkSpaceAdminPermission,
+    WorkspaceEntityPermission,
 )
 from plane.utils.cache import cache_response, invalidate_cache
 
-
 class WorkSpaceViewSet(BaseViewSet):
     model = Workspace
     serializer_class = WorkSpaceSerializer
@@ -140,7 +138,6 @@ class WorkSpaceViewSet(BaseViewSet):
                     {"slug": "The workspace with the slug already exists"},
                     status=status.HTTP_410_GONE,
                 )
-
     @cache_response(60 * 60 * 2)
     def list(self, request, *args, **kwargs):
         return super().list(request, *args, **kwargs)
@@ -152,7 +149,6 @@ class WorkSpaceViewSet(BaseViewSet):
 
     @invalidate_cache(path="/api/workspaces/", user=False)
     @invalidate_cache(path="/api/users/me/workspaces/")
-    @invalidate_cache(path="/api/users/me/settings/")
     def destroy(self, request, *args, **kwargs):
         return super().destroy(request, *args, **kwargs)
 

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

@@ -3,10 +3,15 @@ from rest_framework import status
 from rest_framework.response import Response
 
 # Module imports
-from plane.app.permissions import WorkspaceEntityPermission
 from plane.app.serializers import WorkspaceEstimateSerializer
 from plane.app.views.base import BaseAPIView
-from plane.db.models import Estimate, Project
+from plane.db.models import Project, Estimate
+from plane.app.permissions import WorkspaceEntityPermission
+
+# Django imports
+from django.db.models import (
+    Prefetch,
+)
 from plane.utils.cache import cache_response
 
 
@@ -20,11 +25,15 @@ class WorkspaceEstimatesEndpoint(BaseAPIView):
         estimate_ids = Project.objects.filter(
             workspace__slug=slug, estimate__isnull=False
         ).values_list("estimate_id", flat=True)
-        estimates = (
-            Estimate.objects.filter(pk__in=estimate_ids, workspace__slug=slug)
-            .prefetch_related("points")
-            .select_related("workspace", "project")
+        estimates = Estimate.objects.filter(
+            pk__in=estimate_ids
+        ).prefetch_related(
+            Prefetch(
+                "points",
+                queryset=Project.objects.select_related(
+                    "estimate", "workspace", "project"
+                ),
+            )
         )
-
         serializer = WorkspaceEstimateSerializer(estimates, many=True)
         return Response(serializer.data, status=status.HTTP_200_OK)

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

@@ -20,7 +20,6 @@ class WorkspaceLabelsEndpoint(BaseAPIView):
             workspace__slug=slug,
             project__project_projectmember__member=request.user,
             project__project_projectmember__is_active=True,
-            project__archived_at__isnull=True,
         )
         serializer = LabelSerializer(labels, many=True).data
         return Response(serializer, status=status.HTTP_200_OK)

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

@@ -1,43 +1,41 @@
 # Django imports
 from django.db.models import (
-    CharField,
-    Count,
     Q,
+    Count,
 )
 from django.db.models.functions import Cast
+from django.db.models import CharField
 
 # Third party modules
 from rest_framework import status
 from rest_framework.response import Response
 
+# Module imports
+from plane.app.serializers import (
+    WorkSpaceMemberSerializer,
+    TeamSerializer,
+    UserLiteSerializer,
+    WorkspaceMemberAdminSerializer,
+    WorkspaceMemberMeSerializer,
+    ProjectMemberRoleSerializer,
+)
+from plane.app.views.base import BaseAPIView
+from .. import BaseViewSet
+from plane.db.models import (
+    User,
+    Workspace,
+    Team,
+    ProjectMember,
+    Project,
+    WorkspaceMember,
+)
 from plane.app.permissions import (
     WorkSpaceAdminPermission,
     WorkspaceEntityPermission,
     WorkspaceUserPermission,
 )
-
-# Module imports
-from plane.app.serializers import (
-    ProjectMemberRoleSerializer,
-    TeamSerializer,
-    UserLiteSerializer,
-    WorkspaceMemberAdminSerializer,
-    WorkspaceMemberMeSerializer,
-    WorkSpaceMemberSerializer,
-)
-from plane.app.views.base import BaseAPIView
-from plane.db.models import (
-    Project,
-    ProjectMember,
-    Team,
-    User,
-    Workspace,
-    WorkspaceMember,
-)
 from plane.utils.cache import cache_response, invalidate_cache
 
-from .. import BaseViewSet
-
 
 class WorkSpaceMemberViewSet(BaseViewSet):
     serializer_class = WorkspaceMemberAdminSerializer
@@ -149,7 +147,6 @@ class WorkSpaceMemberViewSet(BaseViewSet):
     @invalidate_cache(
         path="/api/workspaces/:slug/members/", url_params=True, user=False
     )
-    @invalidate_cache(path="/api/users/me/settings/")
     def destroy(self, request, slug, pk):
         # Check the user role who is deleting the user
         workspace_member = WorkspaceMember.objects.get(
@@ -217,7 +214,6 @@ class WorkSpaceMemberViewSet(BaseViewSet):
     @invalidate_cache(
         path="/api/workspaces/:slug/members/", url_params=True, user=False
     )
-    @invalidate_cache(path="/api/users/me/settings/")
     def leave(self, request, slug):
         workspace_member = WorkspaceMember.objects.get(
             workspace__slug=slug,

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

@@ -45,7 +45,6 @@ class WorkspaceModulesEndpoint(BaseAPIView):
                         issue_module__issue__archived_at__isnull=True,
                         issue_module__issue__is_draft=False,
                     ),
-                    distinct=True,
                 ),
             )
             .annotate(
@@ -56,7 +55,6 @@ class WorkspaceModulesEndpoint(BaseAPIView):
                         issue_module__issue__archived_at__isnull=True,
                         issue_module__issue__is_draft=False,
                     ),
-                    distinct=True,
                 )
             )
             .annotate(
@@ -67,7 +65,6 @@ class WorkspaceModulesEndpoint(BaseAPIView):
                         issue_module__issue__archived_at__isnull=True,
                         issue_module__issue__is_draft=False,
                     ),
-                    distinct=True,
                 )
             )
             .annotate(
@@ -78,7 +75,6 @@ class WorkspaceModulesEndpoint(BaseAPIView):
                         issue_module__issue__archived_at__isnull=True,
                         issue_module__issue__is_draft=False,
                     ),
-                    distinct=True,
                 )
             )
             .annotate(
@@ -89,7 +85,6 @@ class WorkspaceModulesEndpoint(BaseAPIView):
                         issue_module__issue__archived_at__isnull=True,
                         issue_module__issue__is_draft=False,
                     ),
-                    distinct=True,
                 )
             )
             .annotate(
@@ -100,7 +95,6 @@ class WorkspaceModulesEndpoint(BaseAPIView):
                         issue_module__issue__archived_at__isnull=True,
                         issue_module__issue__is_draft=False,
                     ),
-                    distinct=True,
                 )
             )
             .order_by(self.kwargs.get("order_by", "-created_at"))

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

@@ -20,7 +20,6 @@ class WorkspaceStatesEndpoint(BaseAPIView):
             workspace__slug=slug,
             project__project_projectmember__member=request.user,
             project__project_projectmember__is_active=True,
-            project__archived_at__isnull=True,
         )
         serializer = StateSerializer(states, many=True).data
         return Response(serializer, status=status.HTTP_200_OK)

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

@@ -124,7 +124,7 @@ class WorkspaceUserProfileIssuesEndpoint(BaseAPIView):
                 | Q(issue_subscribers__subscriber_id=user_id),
                 workspace__slug=slug,
                 project__project_projectmember__member=request.user,
-                project__project_projectmember__is_active=True,
+                project__project_projectmember__is_active=True
             )
             .filter(**filters)
             .select_related("workspace", "project", "state", "parent")
@@ -165,8 +165,7 @@ class WorkspaceUserProfileIssuesEndpoint(BaseAPIView):
                     ArrayAgg(
                         "assignees__id",
                         distinct=True,
-                        filter=~Q(assignees__id__isnull=True)
-                        & Q(assignees__member_project__is_active=True),
+                        filter=~Q(assignees__id__isnull=True),
                     ),
                     Value([], output_field=ArrayField(UUIDField())),
                 ),
@@ -300,7 +299,6 @@ class WorkspaceUserProfileEndpoint(BaseAPIView):
                     workspace__slug=slug,
                     project_projectmember__member=request.user,
                     project_projectmember__is_active=True,
-                    archived_at__isnull=True,
                 )
                 .annotate(
                     created_issues=Count(
@@ -389,7 +387,6 @@ class WorkspaceUserActivityEndpoint(BaseAPIView):
             workspace__slug=slug,
             project__project_projectmember__member=request.user,
             project__project_projectmember__is_active=True,
-            project__archived_at__isnull=True,
             actor=user_id,
         ).select_related("actor", "workspace", "issue", "project")
 
@@ -501,7 +498,6 @@ class WorkspaceUserProfileStatsEndpoint(BaseAPIView):
                 subscriber_id=user_id,
                 project__project_projectmember__member=request.user,
                 project__project_projectmember__is_active=True,
-                project__archived_at__isnull=True,
             )
             .filter(**filters)
             .count()

apiserver/plane/bgtasks/analytic_plot_export.py

@@ -55,7 +55,6 @@ def send_export_email(email, slug, csv_buffer, rows):
         EMAIL_HOST_PASSWORD,
         EMAIL_PORT,
         EMAIL_USE_TLS,
-        EMAIL_USE_SSL,
         EMAIL_FROM,
     ) = get_email_configuration()
 
@@ -65,7 +64,6 @@ def send_export_email(email, slug, csv_buffer, rows):
         username=EMAIL_HOST_USER,
         password=EMAIL_HOST_PASSWORD,
         use_tls=EMAIL_USE_TLS == "1",
-        use_ssl=EMAIL_USE_SSL == "1",
     )
 
     msg = EmailMultiAlternatives(

apiserver/plane/bgtasks/email_notification_task.py

@@ -185,7 +185,6 @@ def send_email_notification(
                 EMAIL_HOST_PASSWORD,
                 EMAIL_PORT,
                 EMAIL_USE_TLS,
-                EMAIL_USE_SSL,
                 EMAIL_FROM,
             ) = get_email_configuration()
 
@@ -289,7 +288,6 @@ def send_email_notification(
                     username=EMAIL_HOST_USER,
                     password=EMAIL_HOST_PASSWORD,
                     use_tls=EMAIL_USE_TLS == "1",
-                    use_ssl=EMAIL_USE_SSL == "1",
                 )
 
                 msg = EmailMultiAlternatives(

apiserver/plane/bgtasks/export_task.py

@@ -304,7 +304,6 @@ def issue_export_task(
                     project_id__in=project_ids,
                     project__project_projectmember__member=exporter_instance.initiated_by_id,
                     project__project_projectmember__is_active=True,
-                    project__archived_at__isnull=True,
                 )
                 .select_related(
                     "project", "workspace", "state", "parent", "created_by"

apiserver/plane/bgtasks/forgot_password_task.py

@@ -26,7 +26,6 @@ def forgot_password(first_name, email, uidb64, token, current_site):
             EMAIL_HOST_PASSWORD,
             EMAIL_PORT,
             EMAIL_USE_TLS,
-            EMAIL_USE_SSL,
             EMAIL_FROM,
         ) = get_email_configuration()
 
@@ -50,7 +49,6 @@ def forgot_password(first_name, email, uidb64, token, current_site):
             username=EMAIL_HOST_USER,
             password=EMAIL_HOST_PASSWORD,
             use_tls=EMAIL_USE_TLS == "1",
-            use_ssl=EMAIL_USE_SSL == "1",
         )
 
         msg = EmailMultiAlternatives(

apiserver/plane/bgtasks/magic_link_code_task.py

@@ -23,7 +23,6 @@ def magic_link(email, key, token, current_site):
             EMAIL_HOST_PASSWORD,
             EMAIL_PORT,
             EMAIL_USE_TLS,
-            EMAIL_USE_SSL,
             EMAIL_FROM,
         ) = get_email_configuration()
 
@@ -42,7 +41,6 @@ def magic_link(email, key, token, current_site):
             username=EMAIL_HOST_USER,
             password=EMAIL_HOST_PASSWORD,
             use_tls=EMAIL_USE_TLS == "1",
-            use_ssl=EMAIL_USE_SSL == "1",
         )
 
         msg = EmailMultiAlternatives(

apiserver/plane/bgtasks/project_invitation_task.py

@@ -52,7 +52,6 @@ def project_invitation(email, project_id, token, current_site, invitor):
             EMAIL_HOST_PASSWORD,
             EMAIL_PORT,
             EMAIL_USE_TLS,
-            EMAIL_USE_SSL,
             EMAIL_FROM,
         ) = get_email_configuration()
 
@@ -62,7 +61,6 @@ def project_invitation(email, project_id, token, current_site, invitor):
             username=EMAIL_HOST_USER,
             password=EMAIL_HOST_PASSWORD,
             use_tls=EMAIL_USE_TLS == "1",
-            use_ssl=EMAIL_USE_SSL == "1",
         )
 
         msg = EmailMultiAlternatives(

apiserver/plane/bgtasks/webhook_task.py

@@ -257,7 +257,6 @@ def send_webhook_deactivation_email(
         EMAIL_HOST_PASSWORD,
         EMAIL_PORT,
         EMAIL_USE_TLS,
-        EMAIL_USE_SSL,
         EMAIL_FROM,
     ) = get_email_configuration()
 
@@ -286,7 +285,6 @@ def send_webhook_deactivation_email(
             username=EMAIL_HOST_USER,
             password=EMAIL_HOST_PASSWORD,
             use_tls=EMAIL_USE_TLS == "1",
-            use_ssl=EMAIL_USE_SSL == "1",
         )
 
         msg = EmailMultiAlternatives(

apiserver/plane/bgtasks/workspace_invitation_task.py

@@ -37,7 +37,6 @@ def workspace_invitation(email, workspace_id, token, current_site, invitor):
             EMAIL_HOST_PASSWORD,
             EMAIL_PORT,
             EMAIL_USE_TLS,
-            EMAIL_USE_SSL,
             EMAIL_FROM,
         ) = get_email_configuration()
 
@@ -66,7 +65,6 @@ def workspace_invitation(email, workspace_id, token, current_site, invitor):
             username=EMAIL_HOST_USER,
             password=EMAIL_HOST_PASSWORD,
             use_tls=EMAIL_USE_TLS == "1",
-            use_ssl=EMAIL_USE_SSL == "1",
         )
 
         msg = EmailMultiAlternatives(

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

@@ -23,7 +23,6 @@ class Command(BaseCommand):
             EMAIL_HOST_PASSWORD,
             EMAIL_PORT,
             EMAIL_USE_TLS,
-            EMAIL_USE_SSL,
             EMAIL_FROM,
         ) = get_email_configuration()
 
@@ -33,7 +32,6 @@ class Command(BaseCommand):
             username=EMAIL_HOST_USER,
             password=EMAIL_HOST_PASSWORD,
             use_tls=EMAIL_USE_TLS == "1",
-            use_ssl=EMAIL_USE_SSL == "1",
             timeout=30,
         )
         # Prepare email details

apiserver/plane/db/migrations/0062_cycle_archived_at_module_archived_at_and_more.py

@@ -1,41 +0,0 @@
-# Generated by Django 4.2.7 on 2024-03-19 08:28
-
-from django.db import migrations, models
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('db', '0061_project_logo_props'),
-    ]
-
-    operations = [
-        migrations.AddField(
-            model_name="cycle",
-            name="archived_at",
-            field=models.DateTimeField(null=True),
-        ),
-        migrations.AddField(
-            model_name="module",
-            name="archived_at",
-            field=models.DateTimeField(null=True),
-        ),
-        migrations.AddField(
-            model_name="project",
-            name="archived_at",
-            field=models.DateTimeField(null=True),
-        ),
-        migrations.AlterField(
-            model_name="socialloginconnection",
-            name="medium",
-            field=models.CharField(
-                choices=[
-                    ("Google", "google"),
-                    ("Github", "github"),
-                    ("Jira", "jira"),
-                ],
-                default=None,
-                max_length=20,
-            ),
-        ),
-    ]

apiserver/plane/db/models/cycle.py

@@ -69,7 +69,6 @@ class Cycle(ProjectBaseModel):
     external_source = models.CharField(max_length=255, null=True, blank=True)
     external_id = models.CharField(max_length=255, blank=True, null=True)
     progress_snapshot = models.JSONField(default=dict)
-    archived_at = models.DateTimeField(null=True)
 
     class Meta:
         verbose_name = "Cycle"

apiserver/plane/db/models/issue.py

@@ -91,7 +91,6 @@ class IssueManager(models.Manager):
                 | models.Q(issue_inbox__isnull=True)
             )
             .exclude(archived_at__isnull=False)
-            .exclude(project__archived_at__isnull=False)
             .exclude(is_draft=True)
         )
 

apiserver/plane/db/models/module.py

@@ -92,7 +92,6 @@ class Module(ProjectBaseModel):
     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)
-    archived_at = models.DateTimeField(null=True)
 
     class Meta:
         unique_together = ["name", "project"]

apiserver/plane/db/models/project.py

@@ -114,7 +114,6 @@ class Project(BaseModel):
         null=True,
         related_name="default_state",
     )
-    archived_at = models.DateTimeField(null=True)
 
     def __str__(self):
         """Return name of the project"""

apiserver/plane/license/utils/instance_value.py

@@ -64,10 +64,6 @@ def get_email_configuration():
                 "key": "EMAIL_USE_TLS",
                 "default": os.environ.get("EMAIL_USE_TLS", "1"),
             },
-            {
-                "key": "EMAIL_USE_SSL",
-                "default": os.environ.get("EMAIL_USE_SSL", "0"),
-            },
             {
                 "key": "EMAIL_FROM",
                 "default": os.environ.get(

apiserver/requirements/base.txt

@@ -1,6 +1,6 @@
 # base requirements
 
-Django==4.2.11
+Django==4.2.10
 psycopg==3.1.12
 djangorestframework==3.14.0
 redis==4.6.0

deploy/1-click/README.md

@@ -0,0 +1,79 @@
+# One-click deploy
+
+Deployment methods for Plane have improved significantly to make self-managing super-easy. One of those is a single-line-command installation of Plane.
+
+This short guide will guide you through the process, the background tasks that run with the command for the Community, One, and Enterprise editions, and the post-deployment configuration options available to you.
+
+### Requirements
+
+- Operating systems: Debian, Ubuntu, CentOS
+- Supported CPU architectures: AMD64, ARM64, x86_64, AArch64
+
+### Download the latest stable release
+
+Run ↓ on any CLI.
+
+```
+curl -fsSL https://raw.githubusercontent.com/makeplane/plane/master/deploy/1-click/install.sh | sh -
+```
+
+### Download the Preview release
+
+`Preview` builds do not support ARM64, AArch64 CPU architectures
+
+Run ↓ on any CLI.
+
+```
+export BRANCH=preview
+curl -fsSL https://raw.githubusercontent.com/makeplane/plane/preview/deploy/1-click/install.sh | sh -
+```
+
+---
+
+### Successful installation
+
+You should see ↓ if there are no hitches. That output will also list the IP address you can use to access your Plane instance.
+
+![Install Output](images/install.png)
+
+---
+
+### Manage your Plane instance
+
+Use `plane-app` [OPERATOR] to manage your Plane instance easily. Get a list of all operators with `plane-app ---help`.
+
+![Plane Help](images/help.png)
+
+1. Basic operators
+
+   1. `plane-app start` starts the Plane server.
+   2. `plane-app restart` restarts the Plane server.
+   3. `plane-app stop` stops the Plane server.
+
+2. Advanced operators
+
+   `plane-app --configure` will show advanced configurators.
+
+   - Change your proxy or listening port
+     <br>Default: 80
+   - Change your domain name
+     <br>Default: Deployed server's public IP address
+   - File upload size
+     <br>Default: 5MB
+   - Specify external database address when using an external database
+     <br>Default: `Empty`
+     <br>`Default folder: /opt/plane/data/postgres`
+   - Specify external Redis URL when using external Redis
+     <br>Default: `Empty`
+     <br>`Default folder: /opt/plane/data/redis`
+   - Configure AWS S3 bucket
+     <br>Use only when you or your users want to use S3
+     <br>`Default folder: /opt/plane/data/minio`
+
+3. Version operators
+
+   1. `plane-app --upgrade` gets the latest stable version of `docker-compose.yaml`, `.env`, and Docker images
+   2. `plane-app --update-installer` updates the installer and the `plane-app` utility.
+   3. `plane-app --uninstall` uninstalls the Plane application and all Docker containers from the server but leaves the data stored in
+      Postgres, Redis, and Minio alone.
+   4. `plane-app --install` installs the Plane app again.

deploy/1-click/install.sh

@@ -0,0 +1,20 @@
+#!/bin/bash
+
+export GIT_REPO=makeplane/plane
+
+# Check if the user has sudo access
+if command -v curl &> /dev/null; then
+    sudo curl -sSL \
+        -o /usr/local/bin/plane-app \
+        https://raw.githubusercontent.com/$GIT_REPO/${BRANCH:-master}/deploy/1-click/plane-app?token=$(date +%s)
+else 
+    sudo wget -q \
+        -O /usr/local/bin/plane-app \
+        https://raw.githubusercontent.com/$GIT_REPO/${BRANCH:-master}/deploy/1-click/plane-app?token=$(date +%s)
+fi
+
+sudo chmod +x /usr/local/bin/plane-app
+sudo sed -i 's@export DEPLOY_BRANCH=${BRANCH:-master}@export DEPLOY_BRANCH='${BRANCH:-master}'@' /usr/local/bin/plane-app
+sudo sed -i 's@CODE_REPO=${GIT_REPO:-makeplane/plane}@CODE_REPO='$GIT_REPO'@' /usr/local/bin/plane-app
+
+plane-app -i #--help

deploy/1-click/plane-app

@@ -0,0 +1,791 @@
+#!/bin/bash
+
+function print_header() {
+clear
+
+cat <<"EOF"
+---------------------------------------
+ ____  _                  
+|  _ \| | __ _ _ __   ___ 
+| |_) | |/ _` | '_ \ / _ \
+|  __/| | (_| | | | |  __/
+|_|   |_|\__,_|_| |_|\___|
+
+---------------------------------------
+Project management tool from the future
+---------------------------------------
+
+EOF
+}
+function update_env_file() {
+    config_file=$1
+    key=$2
+    value=$3
+
+    # Check if the config file exists
+    if [ ! -f "$config_file" ]; then
+        echo "Config file not found. Creating a new one..." >&2
+        sudo touch "$config_file"
+    fi
+
+    # Check if the key already exists in the config file
+    if sudo grep "^$key=" "$config_file"; then
+        sudo awk -v key="$key" -v value="$value" -F '=' '{if ($1 == key) $2 = value} 1' OFS='=' "$config_file" | sudo tee "$config_file.tmp" > /dev/null
+        sudo mv "$config_file.tmp" "$config_file" &> /dev/null
+    else
+        # sudo echo "$key=$value" >> "$config_file"
+        echo -e "$key=$value" | sudo tee -a "$config_file" > /dev/null
+    fi
+}
+function read_env_file() {
+    config_file=$1
+    key=$2
+
+    # Check if the config file exists
+    if [ ! -f "$config_file" ]; then
+        echo "Config file not found. Creating a new one..." >&2
+        sudo touch "$config_file"
+    fi
+
+    # Check if the key already exists in the config file
+    if sudo grep -q "^$key=" "$config_file"; then
+        value=$(sudo awk -v key="$key" -F '=' '{if ($1 == key) print $2}' "$config_file")
+        echo "$value"
+    else
+        echo ""
+    fi
+}
+function update_config() {
+    config_file="$PLANE_INSTALL_DIR/config.env"
+    update_env_file $config_file $1 $2
+}
+function read_config() {
+    config_file="$PLANE_INSTALL_DIR/config.env"
+    read_env_file $config_file $1
+}
+function update_env() {
+    config_file="$PLANE_INSTALL_DIR/.env"
+    update_env_file $config_file $1 $2
+}
+function read_env() {
+    config_file="$PLANE_INSTALL_DIR/.env"
+    read_env_file $config_file $1
+}
+function show_message() {
+    print_header
+
+    if [ "$2" == "replace_last_line" ]; then
+        PROGRESS_MSG[-1]="$1"
+    else
+        PROGRESS_MSG+=("$1")
+    fi
+
+    for statement in "${PROGRESS_MSG[@]}"; do
+        echo "$statement"
+    done
+
+}
+function prepare_environment() {
+    show_message "Prepare Environment..." >&2
+
+    show_message "- Updating OS with required tools ✋"  >&2
+    sudo "$PACKAGE_MANAGER" update -y
+    # sudo "$PACKAGE_MANAGER" upgrade -y
+
+    local required_tools=("curl" "awk" "wget" "nano" "dialog" "git" "uidmap" "jq")
+
+    for tool in "${required_tools[@]}"; do
+        if ! command -v $tool &> /dev/null; then
+            sudo "$PACKAGE_MANAGER" install -y $tool
+        fi
+    done
+
+    show_message "- OS Updated ✅" "replace_last_line"  >&2
+
+    # Install Docker if not installed
+    if ! command -v docker &> /dev/null; then
+        show_message "- Installing Docker ✋"  >&2
+        # curl -o- https://get.docker.com | bash - 
+
+        if [ "$PACKAGE_MANAGER" == "yum" ]; then
+            sudo $PACKAGE_MANAGER install -y yum-utils
+            sudo yum-config-manager --add-repo https://download.docker.com/linux/centos/docker-ce.repo &> /dev/null
+        elif [ "$PACKAGE_MANAGER" == "apt-get" ]; then
+            # Add Docker's official GPG key:
+            sudo $PACKAGE_MANAGER update 
+            sudo $PACKAGE_MANAGER install ca-certificates curl &> /dev/null
+            sudo install -m 0755 -d /etc/apt/keyrings &> /dev/null
+            sudo curl -fsSL https://download.docker.com/linux/ubuntu/gpg -o /etc/apt/keyrings/docker.asc &> /dev/null
+            sudo chmod a+r /etc/apt/keyrings/docker.asc &> /dev/null
+
+            # Add the repository to Apt sources:
+            echo \
+                "deb [arch=$(dpkg --print-architecture) signed-by=/etc/apt/keyrings/docker.asc] https://download.docker.com/linux/ubuntu \
+                $(. /etc/os-release && echo "$VERSION_CODENAME") stable" | \
+                sudo tee /etc/apt/sources.list.d/docker.list > /dev/null
+            
+            sudo $PACKAGE_MANAGER update
+        fi
+
+        sudo $PACKAGE_MANAGER install docker-ce docker-ce-cli containerd.io docker-buildx-plugin docker-compose-plugin -y
+
+        show_message "- Docker Installed ✅" "replace_last_line"  >&2
+    else
+        show_message "- Docker is already installed ✅"  >&2
+    fi
+
+    update_config "PLANE_ARCH" "$CPU_ARCH"
+    update_config "DOCKER_VERSION" "$(docker -v | awk '{print $3}' | sed 's/,//g')"
+    update_config "PLANE_DATA_DIR" "$DATA_DIR"
+    update_config "PLANE_LOG_DIR" "$LOG_DIR"
+
+    # echo "TRUE"
+    echo "Environment prepared successfully ✅"
+    show_message "Environment prepared successfully ✅" >&2
+    show_message "" >&2
+    return 0
+}
+function download_plane() {
+    # Download Docker Compose File from github url 
+    show_message "Downloading Plane Setup Files ✋"  >&2
+    sudo curl -H 'Cache-Control: no-cache, no-store' \
+        -s -o $PLANE_INSTALL_DIR/docker-compose.yaml  \
+        https://raw.githubusercontent.com/$CODE_REPO/$DEPLOY_BRANCH/deploy/selfhost/docker-compose.yml?token=$(date +%s) 
+
+    sudo curl -H 'Cache-Control: no-cache, no-store' \
+        -s -o $PLANE_INSTALL_DIR/variables-upgrade.env \
+        https://raw.githubusercontent.com/$CODE_REPO/$DEPLOY_BRANCH/deploy/selfhost/variables.env?token=$(date +%s) 
+
+    # if .env does not exists rename variables-upgrade.env to .env
+    if [ ! -f "$PLANE_INSTALL_DIR/.env" ]; then
+        sudo mv $PLANE_INSTALL_DIR/variables-upgrade.env $PLANE_INSTALL_DIR/.env
+    fi
+
+    show_message "Plane Setup Files Downloaded ✅" "replace_last_line"  >&2
+    show_message ""  >&2
+
+    echo "PLANE_DOWNLOADED"
+    return 0
+}
+function printUsageInstructions() {
+    show_message ""  >&2
+    show_message "----------------------------------" >&2
+    show_message "Usage Instructions" >&2
+    show_message "----------------------------------" >&2
+    show_message ""  >&2
+    show_message "To use the Plane Setup utility, use below commands" >&2
+    show_message "" >&2
+
+    show_message "Usage: plane-app [OPTION]" >&2
+    show_message "" >&2
+    show_message "  start                       Start Server" >&2
+    show_message "  stop                        Stop Server" >&2
+    show_message "  restart                     Restart Server" >&2
+    show_message "" >&2
+    show_message "other options" >&2
+    show_message "  -i, --install               Install Plane" >&2
+    show_message "  -c, --configure             Configure Plane" >&2
+    show_message "  -up, --upgrade              Upgrade Plane" >&2
+    show_message "  -un, --uninstall            Uninstall Plane" >&2
+    show_message "  -ui, --update-installer     Update Plane Installer" >&2
+    show_message "  -h, --help                  Show help" >&2
+    show_message "" >&2
+    show_message ""  >&2
+    show_message "Application Data is stored in mentioned folders" >&2
+    show_message "  - DB Data: $DATA_DIR/postgres" >&2
+    show_message "  - Redis Data: $DATA_DIR/redis" >&2
+    show_message "  - Minio Data: $DATA_DIR/minio" >&2
+    show_message "" >&2
+    show_message "" >&2
+    show_message "----------------------------------" >&2
+    show_message ""  >&2
+}
+function build_local_image() {
+    show_message "- Downloading Plane Source Code ✋" >&2
+    REPO=https://github.com/$CODE_REPO.git
+    CURR_DIR=$PWD
+    PLANE_TEMP_CODE_DIR=$PLANE_INSTALL_DIR/temp
+    sudo rm -rf $PLANE_TEMP_CODE_DIR > /dev/null
+
+    sudo git clone $REPO $PLANE_TEMP_CODE_DIR  --branch $DEPLOY_BRANCH --single-branch -q > /dev/null
+
+    sudo cp $PLANE_TEMP_CODE_DIR/deploy/selfhost/build.yml $PLANE_TEMP_CODE_DIR/build.yml
+
+    show_message "- Plane Source Code Downloaded ✅" "replace_last_line" >&2
+    
+    show_message "- Building Docker Images ✋" >&2
+    sudo docker compose --env-file=$PLANE_INSTALL_DIR/.env -f $PLANE_TEMP_CODE_DIR/build.yml build --no-cache
+}
+function check_for_docker_images() {
+    show_message "" >&2
+    # show_message "Building Plane Images" >&2
+    
+    CURR_DIR=$(pwd)
+    
+    if [ "$DEPLOY_BRANCH" == "master" ]; then
+        update_env "APP_RELEASE" "latest"
+        export APP_RELEASE=latest
+    else
+        update_env "APP_RELEASE" "$DEPLOY_BRANCH"
+        export APP_RELEASE=$DEPLOY_BRANCH    
+    fi
+
+    if [ $USE_GLOBAL_IMAGES == 1 ]; then
+        # show_message "Building Plane Images for $CPU_ARCH is not required. Skipping... ✅" "replace_last_line" >&2
+        export DOCKERHUB_USER=makeplane
+        update_env "DOCKERHUB_USER" "$DOCKERHUB_USER"
+        update_env "PULL_POLICY" "always"
+        echo "Building Plane Images for $CPU_ARCH is not required. Skipping..."
+    else
+        export DOCKERHUB_USER=myplane
+        show_message "Building Plane Images for $CPU_ARCH " >&2
+        update_env "DOCKERHUB_USER" "$DOCKERHUB_USER"
+        update_env "PULL_POLICY" "never"
+
+        build_local_image
+
+        sudo rm -rf $PLANE_INSTALL_DIR/temp > /dev/null
+
+        show_message "- Docker Images Built ✅" "replace_last_line" >&2
+        sudo cd $CURR_DIR
+    fi
+
+    sudo sed -i "s|- pgdata:|- $DATA_DIR/postgres:|g" $PLANE_INSTALL_DIR/docker-compose.yaml
+    sudo sed -i "s|- redisdata:|- $DATA_DIR/redis:|g" $PLANE_INSTALL_DIR/docker-compose.yaml
+    sudo sed -i "s|- uploads:|- $DATA_DIR/minio:|g" $PLANE_INSTALL_DIR/docker-compose.yaml
+
+    show_message "Downloading Plane Images for $CPU_ARCH ✋" >&2
+    sudo docker compose -f $PLANE_INSTALL_DIR/docker-compose.yaml --env-file=$PLANE_INSTALL_DIR/.env pull
+    show_message "Plane Images Downloaded ✅" "replace_last_line" >&2
+}
+function configure_plane() {
+    show_message "" >&2
+    show_message "Configuring Plane" >&2
+    show_message "" >&2
+
+    exec 3>&1
+
+    nginx_port=$(read_env "NGINX_PORT")
+    domain_name=$(read_env "DOMAIN_NAME")
+    upload_limit=$(read_env "FILE_SIZE_LIMIT")
+
+    NGINX_SETTINGS=$(dialog \
+        --ok-label "Next" \
+        --cancel-label "Skip" \
+        --backtitle "Plane Configuration" \
+        --title "Nginx Settings" \
+        --form "" \
+        0 0 0 \
+        "Port:"                   1 1	        "${nginx_port:-80}"            1 10 50 0 \
+        "Domain:"                 2 1	        "${domain_name:-localhost}"     2 10 50 0 \
+        "Upload Limit:"           3 1	        "${upload_limit:-5242880}"       3 10 15 0 \
+    2>&1 1>&3)
+
+    save_nginx_settings=0
+    if [ $? -eq 0 ]; then
+        save_nginx_settings=1
+        nginx_port=$(echo "$NGINX_SETTINGS" | sed -n 1p)
+        domain_name=$(echo "$NGINX_SETTINGS" | sed -n 2p)
+        upload_limit=$(echo "$NGINX_SETTINGS" | sed -n 3p)
+    fi
+
+
+    # smtp_host=$(read_env "EMAIL_HOST")
+    # smtp_user=$(read_env "EMAIL_HOST_USER")
+    # smtp_password=$(read_env "EMAIL_HOST_PASSWORD")
+    # smtp_port=$(read_env "EMAIL_PORT")
+    # smtp_from=$(read_env "EMAIL_FROM")
+    # smtp_tls=$(read_env "EMAIL_USE_TLS")
+    # smtp_ssl=$(read_env "EMAIL_USE_SSL")
+
+    # SMTP_SETTINGS=$(dialog \
+    #     --ok-label "Next" \
+    #     --cancel-label "Skip" \
+    #     --backtitle "Plane Configuration" \
+    #     --title "SMTP Settings" \
+    #     --form "" \
+    #     0 0 0 \
+    #     "Host:"        1 1	  "$smtp_host" 	              1 10 80 0 \
+    #     "User:"        2 1	  "$smtp_user" 	              2 10 80 0 \
+    #     "Password:"    3 1	  "$smtp_password" 	              3 10 80 0 \
+    #     "Port:"        4 1	  "${smtp_port:-587}"               4 10 5 0 \
+    #     "From:"        5 1	  "${smtp_from:-Mailer <mailer@example.com>}"               5 10 80 0 \
+    #     "TLS:"         6 1	  "${smtp_tls:-1}"                 6 10 1 1 \
+    #     "SSL:"         7 1	  "${smtp_ssl:-0}"                 7 10 1 1 \
+    # 2>&1 1>&3)
+
+    # save_smtp_settings=0
+    # if [ $? -eq 0 ]; then
+    #     save_smtp_settings=1
+    #     smtp_host=$(echo "$SMTP_SETTINGS" | sed -n 1p)
+    #     smtp_user=$(echo "$SMTP_SETTINGS" | sed -n 2p)
+    #     smtp_password=$(echo "$SMTP_SETTINGS" | sed -n 3p)
+    #     smtp_port=$(echo "$SMTP_SETTINGS" | sed -n 4p)
+    #     smtp_from=$(echo "$SMTP_SETTINGS" | sed -n 5p)
+    #     smtp_tls=$(echo "$SMTP_SETTINGS" | sed -n 6p)
+    # fi
+    external_pgdb_url=$(dialog \
+                    --backtitle "Plane Configuration" \
+                    --title "Using External Postgres Database ?" \
+                    --ok-label "Next" \
+                    --cancel-label "Skip" \
+                    --inputbox "Enter your external database url" \
+                    8 60 3>&1 1>&2 2>&3)
+
+
+    external_redis_url=$(dialog \
+                    --backtitle "Plane Configuration" \
+                    --title "Using External Redis Database ?" \
+                    --ok-label "Next" \
+                    --cancel-label "Skip" \
+                    --inputbox "Enter your external redis url" \
+                    8 60 3>&1 1>&2 2>&3)
+
+    
+    aws_region=$(read_env "AWS_REGION")
+    aws_access_key=$(read_env "AWS_ACCESS_KEY_ID")
+    aws_secret_key=$(read_env "AWS_SECRET_ACCESS_KEY")
+    aws_bucket=$(read_env "AWS_S3_BUCKET_NAME")
+    
+
+    AWS_S3_SETTINGS=$(dialog \
+        --ok-label "Next" \
+        --cancel-label "Skip" \
+        --backtitle "Plane Configuration" \
+        --title "AWS S3 Bucket Configuration" \
+        --form "" \
+        0 0 0 \
+        "Region:"         1 1	        "$aws_region"       1 10 50 0 \
+        "Access Key:"     2 1	        "$aws_access_key"   2 10 50 0 \
+        "Secret Key:"     3 1	        "$aws_secret_key"   3 10 50 0 \
+        "Bucket:"         4 1	        "$aws_bucket"       4 10 50 0 \
+    2>&1 1>&3)
+
+    save_aws_settings=0
+    if [ $? -eq 0 ]; then
+        save_aws_settings=1
+        aws_region=$(echo "$AWS_S3_SETTINGS" | sed -n 1p)
+        aws_access_key=$(echo "$AWS_S3_SETTINGS" | sed -n 2p)
+        aws_secret_key=$(echo "$AWS_S3_SETTINGS" | sed -n 3p)
+        aws_bucket=$(echo "$AWS_S3_SETTINGS" | sed -n 4p)
+    fi
+
+    # display dialogbox asking for confirmation to continue
+    CONFIRM_CONFIG=$(dialog \
+            --title "Confirm Configuration" \
+            --backtitle "Plane Configuration" \
+            --yes-label "Confirm" \
+            --no-label "Cancel" \
+            --yesno \
+            "
+            save_ngnix_settings:  $save_nginx_settings
+            nginx_port:           $nginx_port
+            domain_name:          $domain_name
+            upload_limit:         $upload_limit
+
+            save_aws_settings:    $save_aws_settings
+            aws_region:           $aws_region
+            aws_access_key:       $aws_access_key
+            aws_secret_key:       $aws_secret_key
+            aws_bucket:           $aws_bucket
+
+            pdgb_url:             $external_pgdb_url
+            redis_url:            $external_redis_url
+            " \
+            0 0 3>&1 1>&2 2>&3)
+    
+    if [ $? -eq 0 ]; then
+        if [ $save_nginx_settings == 1 ]; then
+            update_env "NGINX_PORT" "$nginx_port"
+            update_env "DOMAIN_NAME" "$domain_name"
+            update_env "WEB_URL" "http://$domain_name"
+            update_env "CORS_ALLOWED_ORIGINS" "http://$domain_name"
+            update_env "FILE_SIZE_LIMIT" "$upload_limit"
+        fi
+
+        # check enable smpt settings value
+        # if [ $save_smtp_settings == 1 ]; then
+        #     update_env "EMAIL_HOST" "$smtp_host"
+        #     update_env "EMAIL_HOST_USER" "$smtp_user"
+        #     update_env "EMAIL_HOST_PASSWORD" "$smtp_password"
+        #     update_env "EMAIL_PORT" "$smtp_port"
+        #     update_env "EMAIL_FROM" "$smtp_from"
+        #     update_env "EMAIL_USE_TLS" "$smtp_tls"
+        #     update_env "EMAIL_USE_SSL" "$smtp_ssl"
+        # fi
+
+        # check enable aws settings value
+        if [[ $save_aws_settings == 1 &&  $aws_access_key != ""  &&  $aws_secret_key != "" ]] ; then
+            update_env "USE_MINIO" "0"
+            update_env "AWS_REGION" "$aws_region"
+            update_env "AWS_ACCESS_KEY_ID" "$aws_access_key"
+            update_env "AWS_SECRET_ACCESS_KEY" "$aws_secret_key"
+            update_env "AWS_S3_BUCKET_NAME" "$aws_bucket"
+        elif [[ -z $aws_access_key || -z $aws_secret_key  ]] ; then
+            update_env "USE_MINIO" "1"
+            update_env "AWS_REGION" ""
+            update_env "AWS_ACCESS_KEY_ID" ""
+            update_env "AWS_SECRET_ACCESS_KEY" ""
+            update_env "AWS_S3_BUCKET_NAME" "uploads"
+        fi
+
+        if [ "$external_pgdb_url" != "" ]; then
+            update_env "DATABASE_URL" "$external_pgdb_url"
+        fi
+        if [ "$external_redis_url" != "" ]; then
+            update_env "REDIS_URL" "$external_redis_url"
+        fi
+    fi
+
+    exec 3>&-
+}
+function upgrade_configuration() {
+    upg_env_file="$PLANE_INSTALL_DIR/variables-upgrade.env"
+    # Check if the file exists
+    if [ -f "$upg_env_file" ]; then
+        # Read each line from the file
+        while IFS= read -r line; do
+            # Skip comments and empty lines
+            if [[ "$line" =~ ^\s*#.*$ ]] || [[ -z "$line" ]]; then
+                continue
+            fi
+
+            # Split the line into key and value
+            key=$(echo "$line" | cut -d'=' -f1)
+            value=$(echo "$line" | cut -d'=' -f2-)
+
+            current_value=$(read_env "$key")
+
+            if [ -z "$current_value" ]; then
+                update_env "$key" "$value"
+            fi
+        done < "$upg_env_file"
+    fi
+}
+function install() {
+    show_message ""
+    if [ "$(uname)" == "Linux" ]; then
+        OS="linux"
+        OS_NAME=$(sudo awk -F= '/^ID=/{print $2}' /etc/os-release)
+        OS_NAME=$(echo "$OS_NAME" | tr -d '"')
+        print_header
+        if [ "$OS_NAME" == "ubuntu" ] || [ "$OS_NAME" == "debian" ] || 
+                [ "$OS_NAME" == "centos" ] || [ "$OS_NAME" == "amazon" ]; then
+            OS_SUPPORTED=true
+            show_message "******** Installing Plane ********"
+            show_message ""
+
+            prepare_environment
+
+            if [ $? -eq 0 ]; then
+                download_plane
+                if [ $? -eq 0 ]; then
+                    # create_service
+                    check_for_docker_images
+
+                    last_installed_on=$(read_config "INSTALLATION_DATE")
+                    # if [ "$last_installed_on" == "" ]; then
+                    #     configure_plane
+                    # fi
+                    
+                    update_env "NGINX_PORT" "80"
+                    update_env "DOMAIN_NAME" "$MY_IP"
+                    update_env "WEB_URL" "http://$MY_IP"
+                    update_env "CORS_ALLOWED_ORIGINS" "http://$MY_IP"
+
+                    update_config "INSTALLATION_DATE" "$(date '+%Y-%m-%d')"
+
+                    show_message "Plane Installed Successfully ✅"
+                    show_message ""
+                else
+                    show_message "Download Failed ❌"
+                    exit 1
+                fi
+            else
+                show_message "Initialization Failed ❌"
+                exit 1
+            fi
+            
+        else
+            OS_SUPPORTED=false
+            PROGRESS_MSG="❌❌ Unsupported OS Varient Detected : $OS_NAME ❌❌"
+            show_message ""
+            exit 1
+        fi
+    else
+        PROGRESS_MSG="❌❌❌ Unsupported OS Detected : $(uname) ❌❌❌"
+        show_message ""
+        exit 1
+    fi
+}
+function upgrade() {
+    print_header
+    if [ "$(uname)" == "Linux" ]; then
+        OS="linux"
+        OS_NAME=$(sudo awk -F= '/^ID=/{print $2}' /etc/os-release)
+        OS_NAME=$(echo "$OS_NAME" | tr -d '"')
+        if [ "$OS_NAME" == "ubuntu" ] || [ "$OS_NAME" == "debian" ] || 
+                [ "$OS_NAME" == "centos" ] || [ "$OS_NAME" == "amazon" ]; then
+
+            OS_SUPPORTED=true
+            show_message "******** Upgrading Plane ********"
+            show_message ""
+
+            prepare_environment
+
+            if [ $? -eq 0 ]; then
+                stop_server
+                download_plane
+                if [ $? -eq 0 ]; then
+                    check_for_docker_images
+                    upgrade_configuration
+                    update_config "UPGRADE_DATE" "$(date)"
+
+                    start_server
+
+                    show_message ""
+                    show_message "Plane Upgraded Successfully ✅"
+                    show_message ""
+                    printUsageInstructions
+                else
+                    show_message "Download Failed ❌"
+                    exit 1
+                fi
+            else
+                show_message "Initialization Failed ❌"
+                exit 1
+            fi
+        else
+            PROGRESS_MSG="❌❌ Unsupported OS Varient Detected : $OS_NAME ❌❌"
+            show_message ""
+            exit 1
+        fi
+    else
+        PROGRESS_MSG="❌❌❌ Unsupported OS Detected : $(uname) ❌❌❌"
+        show_message ""
+        exit 1
+    fi
+}
+function uninstall() {
+    print_header
+    if [ "$(uname)" == "Linux" ]; then
+        OS="linux"
+        OS_NAME=$(awk -F= '/^ID=/{print $2}' /etc/os-release)
+        OS_NAME=$(echo "$OS_NAME" | tr -d '"')
+        if [ "$OS_NAME" == "ubuntu" ] || [ "$OS_NAME" == "debian" ] || 
+                [ "$OS_NAME" == "centos" ] || [ "$OS_NAME" == "amazon" ]; then
+
+            OS_SUPPORTED=true
+            show_message "******** Uninstalling Plane ********"
+            show_message ""
+
+            stop_server
+
+            if ! [ -x "$(command -v docker)" ]; then
+                echo "DOCKER_NOT_INSTALLED" &> /dev/null
+            else
+                # Ask of user input to confirm uninstall docker ?
+                CONFIRM_DOCKER_PURGE=$(dialog --title "Uninstall Docker" --defaultno --yesno "Are you sure you want to uninstall docker ?" 8 60 3>&1 1>&2 2>&3)
+                if [ $? -eq 0 ]; then
+                    show_message "- Uninstalling Docker ✋"
+                    sudo docker images -q | xargs -r sudo docker rmi -f &> /dev/null
+                    sudo "$PACKAGE_MANAGER" remove -y docker-engine docker docker.io docker-ce docker-ce-cli docker-compose-plugin &> /dev/null
+                    sudo "$PACKAGE_MANAGER" autoremove -y docker-engine docker docker.io docker-ce docker-compose-plugin &> /dev/null
+                    show_message "- Docker Uninstalled ✅" "replace_last_line" >&2
+                fi
+            fi
+
+            sudo rm $PLANE_INSTALL_DIR/.env &> /dev/null
+            sudo rm $PLANE_INSTALL_DIR/variables-upgrade.env &> /dev/null
+            sudo rm $PLANE_INSTALL_DIR/config.env &> /dev/null
+            sudo rm $PLANE_INSTALL_DIR/docker-compose.yaml &> /dev/null
+            
+            # rm -rf $PLANE_INSTALL_DIR &> /dev/null
+            show_message "- Configuration Cleaned ✅"
+
+            show_message ""
+            show_message "******** Plane Uninstalled ********"
+            show_message ""
+            show_message ""
+            show_message "Plane Configuration Cleaned with some exceptions"
+            show_message "- DB Data: $DATA_DIR/postgres"
+            show_message "- Redis Data: $DATA_DIR/redis"
+            show_message "- Minio Data: $DATA_DIR/minio"
+            show_message ""
+            show_message ""
+            show_message "Thank you for using Plane. We hope to see you again soon."
+            show_message ""
+            show_message ""
+        else
+            PROGRESS_MSG="❌❌ Unsupported OS Varient Detected : $OS_NAME ❌❌"
+            show_message ""
+            exit 1
+        fi
+    else
+        PROGRESS_MSG="❌❌❌ Unsupported OS Detected : $(uname) ❌❌❌"
+        show_message ""
+        exit 1
+    fi
+}
+function start_server() {
+    docker_compose_file="$PLANE_INSTALL_DIR/docker-compose.yaml"
+    env_file="$PLANE_INSTALL_DIR/.env"
+    # check if both the files exits 
+    if [ -f "$docker_compose_file" ] && [ -f "$env_file" ]; then
+        show_message "Starting Plane Server ($APP_RELEASE) ✋"
+        sudo docker compose -f $docker_compose_file --env-file=$env_file up -d
+
+        # Wait for containers to be running
+        echo "Waiting for containers to start..."
+        while ! sudo docker compose -f "$docker_compose_file" --env-file="$env_file" ps --services --filter "status=running" --quiet | grep -q "."; do
+            sleep 1
+        done
+        # wait for migrator container to exit with status 0 before starting the application
+        migrator_container_id=$(sudo docker container ls -aq -f "name=plane-migrator")
+
+        # if migrator container is running, wait for it to exit
+        if [ -n "$migrator_container_id" ]; then
+            while sudo docker inspect --format='{{.State.Status}}' $migrator_container_id | grep -q "running"; do
+                show_message "Waiting for Plane Server ($APP_RELEASE) to start...✋ (Migrator in progress)" "replace_last_line" >&2
+                sleep 1
+            done
+        fi
+
+        # if migrator exit status is not 0, show error message and exit
+        if [ -n "$migrator_container_id" ]; then
+            migrator_exit_code=$(sudo docker inspect --format='{{.State.ExitCode}}' $migrator_container_id)
+            if [ $migrator_exit_code -ne 0 ]; then
+                # show_message "Migrator failed with exit code $migrator_exit_code ❌" "replace_last_line" >&2
+                show_message "Plane Server failed to start ❌" "replace_last_line" >&2
+                stop_server
+                exit 1
+            fi
+        fi
+
+        api_container_id=$(sudo docker container ls -q -f "name=plane-api")
+        while ! sudo docker logs $api_container_id 2>&1 | grep -i "Application startup complete";
+        do
+            show_message "Waiting for Plane Server ($APP_RELEASE) to start...✋ (API starting)" "replace_last_line" >&2
+            sleep 1
+        done
+        show_message "Plane Server Started ($APP_RELEASE) ✅" "replace_last_line" >&2
+        show_message "---------------------------------------------------------------" >&2
+        show_message "Access the Plane application at http://$MY_IP" >&2
+        show_message "---------------------------------------------------------------" >&2
+
+    else
+        show_message "Plane Server not installed. Please install Plane first ❌" "replace_last_line" >&2
+    fi
+}
+function stop_server() {
+    docker_compose_file="$PLANE_INSTALL_DIR/docker-compose.yaml"
+    env_file="$PLANE_INSTALL_DIR/.env"
+    # check if both the files exits 
+    if [ -f "$docker_compose_file" ] && [ -f "$env_file" ]; then
+        show_message "Stopping Plane Server ($APP_RELEASE) ✋"
+        sudo docker compose -f $docker_compose_file --env-file=$env_file down
+        show_message "Plane Server Stopped ($APP_RELEASE) ✅" "replace_last_line" >&2
+    else
+        show_message "Plane Server not installed [Skipping] ✅" "replace_last_line" >&2
+    fi
+}
+function restart_server() {
+    docker_compose_file="$PLANE_INSTALL_DIR/docker-compose.yaml"
+    env_file="$PLANE_INSTALL_DIR/.env"
+    # check if both the files exits 
+    if [ -f "$docker_compose_file" ] && [ -f "$env_file" ]; then
+        show_message "Restarting Plane Server ($APP_RELEASE) ✋"
+        sudo docker compose -f $docker_compose_file --env-file=$env_file restart
+        show_message "Plane Server Restarted ($APP_RELEASE) ✅" "replace_last_line" >&2
+    else
+        show_message "Plane Server not installed. Please install Plane first ❌" "replace_last_line" >&2
+    fi
+}
+function show_help() {
+    # print_header
+    show_message "Usage: plane-app [OPTION]" >&2
+    show_message "" >&2
+    show_message "  start                       Start Server" >&2
+    show_message "  stop                        Stop Server" >&2
+    show_message "  restart                     Restart Server" >&2
+    show_message "" >&2
+    show_message "other options" >&2
+    show_message "  -i, --install               Install Plane" >&2
+    show_message "  -c, --configure             Configure Plane" >&2
+    show_message "  -up, --upgrade              Upgrade Plane" >&2
+    show_message "  -un, --uninstall            Uninstall Plane" >&2
+    show_message "  -ui, --update-installer     Update Plane Installer" >&2
+    show_message "  -h, --help                  Show help" >&2
+    show_message "" >&2
+    exit 1
+    
+}
+function update_installer() {
+    show_message "Updating Plane Installer ✋" >&2
+    sudo curl -H 'Cache-Control: no-cache, no-store' \
+        -s -o /usr/local/bin/plane-app  \
+        https://raw.githubusercontent.com/$CODE_REPO/$DEPLOY_BRANCH/deploy/1-click/plane-app?token=$(date +%s) 
+
+    sudo chmod +x /usr/local/bin/plane-app > /dev/null&> /dev/null
+    show_message "Plane Installer Updated ✅" "replace_last_line" >&2
+}
+
+export DEPLOY_BRANCH=${BRANCH:-master}
+export APP_RELEASE=$DEPLOY_BRANCH
+export DOCKERHUB_USER=makeplane
+export PULL_POLICY=always
+
+if [ "$DEPLOY_BRANCH" == "master" ]; then
+    export APP_RELEASE=latest
+fi
+
+PLANE_INSTALL_DIR=/opt/plane
+DATA_DIR=$PLANE_INSTALL_DIR/data
+LOG_DIR=$PLANE_INSTALL_DIR/logs
+CODE_REPO=${GIT_REPO:-makeplane/plane}
+OS_SUPPORTED=false
+CPU_ARCH=$(uname -m)
+PROGRESS_MSG=""
+USE_GLOBAL_IMAGES=0
+PACKAGE_MANAGER=""
+MY_IP=$(curl -s ifconfig.me)
+
+if [[ $CPU_ARCH == "amd64" || $CPU_ARCH == "x86_64" || ( $DEPLOY_BRANCH == "master" && ( $CPU_ARCH == "arm64" || $CPU_ARCH == "aarch64" ) ) ]]; then
+    USE_GLOBAL_IMAGES=1
+fi
+
+sudo mkdir -p $PLANE_INSTALL_DIR/{data,log}
+
+if command -v apt-get &> /dev/null; then
+    PACKAGE_MANAGER="apt-get"
+elif command -v yum &> /dev/null; then
+    PACKAGE_MANAGER="yum"
+elif command -v apk &> /dev/null; then
+    PACKAGE_MANAGER="apk"
+fi
+
+if [ "$1" == "start" ]; then
+    start_server
+elif [ "$1" == "stop" ]; then
+    stop_server
+elif [ "$1" == "restart" ]; then
+    restart_server
+elif [ "$1" == "--install" ] || [ "$1" == "-i" ]; then
+    install
+    start_server
+    show_message "" >&2
+    show_message "To view help, use plane-app --help " >&2
+elif [ "$1" == "--configure" ] || [ "$1" == "-c" ]; then
+    configure_plane
+    printUsageInstructions
+elif [ "$1" == "--upgrade" ] || [ "$1" == "-up" ]; then
+    upgrade
+elif [ "$1" == "--uninstall" ] || [ "$1" == "-un" ]; then
+    uninstall
+elif [ "$1" == "--update-installer" ] || [ "$1" == "-ui" ]; then
+    update_installer
+elif [ "$1" == "--help" ] || [ "$1" == "-h" ]; then
+    show_help
+else
+    show_help
+fi

deploy/selfhost/docker-compose.yml

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

deploy/selfhost/install.sh

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

deploy/selfhost/variables.env

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

nginx/nginx.conf.template

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

package.json

@@ -1,6 +1,6 @@
 {
   "repository": "https://github.com/makeplane/plane.git",
-  "version": "0.17.0",
+  "version": "0.16.0",
   "license": "AGPL-3.0",
   "private": true,
   "workspaces": [

packages/editor/core/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@plane/editor-core",
-  "version": "0.17.0",
+  "version": "0.16.0",
   "description": "Core Editor that powers Plane",
   "private": true,
   "main": "./dist/index.mjs",

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

@@ -4,18 +4,18 @@ import { findTableAncestor } from "src/lib/utils";
 import { UploadImage } from "src/types/upload-image";
 
 export const toggleHeadingOne = (editor: Editor, range?: Range) => {
-  if (range) editor.chain().focus().deleteRange(range).clearNodes().setNode("heading", { level: 1 }).run();
-  else editor.chain().focus().clearNodes().toggleHeading({ level: 1 }).run();
+  if (range) editor.chain().focus().deleteRange(range).setNode("heading", { level: 1 }).run();
+  else editor.chain().focus().toggleHeading({ level: 1 }).run();
 };
 
 export const toggleHeadingTwo = (editor: Editor, range?: Range) => {
-  if (range) editor.chain().focus().deleteRange(range).clearNodes().setNode("heading", { level: 2 }).run();
-  else editor.chain().focus().clearNodes().toggleHeading({ level: 2 }).run();
+  if (range) editor.chain().focus().deleteRange(range).setNode("heading", { level: 2 }).run();
+  else editor.chain().focus().toggleHeading({ level: 2 }).run();
 };
 
 export const toggleHeadingThree = (editor: Editor, range?: Range) => {
-  if (range) editor.chain().focus().deleteRange(range).clearNodes().setNode("heading", { level: 3 }).run();
-  else editor.chain().focus().clearNodes().toggleHeading({ level: 3 }).run();
+  if (range) editor.chain().focus().deleteRange(range).setNode("heading", { level: 3 }).run();
+  else editor.chain().focus().toggleHeading({ level: 3 }).run();
 };
 
 export const toggleBold = (editor: Editor, range?: Range) => {
@@ -37,10 +37,10 @@ export const toggleCodeBlock = (editor: Editor, range?: Range) => {
   // Check if code block is active then toggle code block
   if (editor.isActive("codeBlock")) {
     if (range) {
-      editor.chain().focus().deleteRange(range).clearNodes().toggleCodeBlock().run();
+      editor.chain().focus().deleteRange(range).toggleCodeBlock().run();
       return;
     }
-    editor.chain().focus().clearNodes().toggleCodeBlock().run();
+    editor.chain().focus().toggleCodeBlock().run();
     return;
   }
 
@@ -49,32 +49,32 @@ export const toggleCodeBlock = (editor: Editor, range?: Range) => {
 
   if (isSelectionEmpty) {
     if (range) {
-      editor.chain().focus().deleteRange(range).clearNodes().toggleCodeBlock().run();
+      editor.chain().focus().deleteRange(range).toggleCodeBlock().run();
       return;
     }
-    editor.chain().focus().clearNodes().toggleCodeBlock().run();
+    editor.chain().focus().toggleCodeBlock().run();
   } else {
     if (range) {
-      editor.chain().focus().deleteRange(range).clearNodes().toggleCode().run();
+      editor.chain().focus().deleteRange(range).toggleCode().run();
       return;
     }
-    editor.chain().focus().clearNodes().toggleCode().run();
+    editor.chain().focus().toggleCode().run();
   }
 };
 
 export const toggleOrderedList = (editor: Editor, range?: Range) => {
-  if (range) editor.chain().focus().deleteRange(range).clearNodes().toggleOrderedList().run();
-  else editor.chain().focus().clearNodes().toggleOrderedList().run();
+  if (range) editor.chain().focus().deleteRange(range).toggleOrderedList().run();
+  else editor.chain().focus().toggleOrderedList().run();
 };
 
 export const toggleBulletList = (editor: Editor, range?: Range) => {
-  if (range) editor.chain().focus().deleteRange(range).clearNodes().toggleBulletList().run();
-  else editor.chain().focus().clearNodes().toggleBulletList().run();
+  if (range) editor.chain().focus().deleteRange(range).toggleBulletList().run();
+  else editor.chain().focus().toggleBulletList().run();
 };
 
 export const toggleTaskList = (editor: Editor, range?: Range) => {
-  if (range) editor.chain().focus().deleteRange(range).clearNodes().toggleTaskList().run();
-  else editor.chain().focus().clearNodes().toggleTaskList().run();
+  if (range) editor.chain().focus().deleteRange(range).toggleTaskList().run();
+  else editor.chain().focus().toggleTaskList().run();
 };
 
 export const toggleStrike = (editor: Editor, range?: Range) => {
@@ -83,8 +83,8 @@ export const toggleStrike = (editor: Editor, range?: Range) => {
 };
 
 export const toggleBlockquote = (editor: Editor, range?: Range) => {
-  if (range) editor.chain().focus().deleteRange(range).clearNodes().toggleBlockquote().run();
-  else editor.chain().focus().clearNodes().toggleBlockquote().run();
+  if (range) editor.chain().focus().deleteRange(range).toggleBlockquote().run();
+  else editor.chain().focus().toggleBlockquote().run();
 };
 
 export const insertTableCommand = (editor: Editor, range?: Range) => {
@@ -97,8 +97,8 @@ export const insertTableCommand = (editor: Editor, range?: Range) => {
       }
     }
   }
-  if (range) editor.chain().focus().deleteRange(range).clearNodes().insertTable({ rows: 3, cols: 3 }).run();
-  else editor.chain().focus().clearNodes().insertTable({ rows: 3, cols: 3 }).run();
+  if (range) editor.chain().focus().deleteRange(range).insertTable({ rows: 3, cols: 3 }).run();
+  else editor.chain().focus().insertTable({ rows: 3, cols: 3 }).run();
 };
 
 export const unsetLinkEditor = (editor: Editor) => {

packages/editor/core/src/ui/components/editor-container.tsx

@@ -1,6 +1,5 @@
 import { Editor } from "@tiptap/react";
 import { FC, ReactNode } from "react";
-import { cn } from "src/lib/utils";
 
 interface EditorContainerProps {
   editor: Editor | null;
@@ -54,7 +53,7 @@ export const EditorContainer: FC<EditorContainerProps> = (props) => {
       onMouseLeave={() => {
         hideDragHandle?.();
       }}
-      className={cn(`cursor-text`, { "active-editor": editor?.isFocused && editor?.isEditable }, editorClassNames)}
+      className={`cursor-text ${editorClassNames}`}
     >
       {children}
     </div>

packages/editor/core/src/ui/mentions/suggestion.ts

@@ -22,7 +22,7 @@ export const Suggestion = (suggestions: IMentionSuggestion[]) => ({
         // @ts-ignore
         popup = tippy("body", {
           getReferenceClientRect: props.clientRect,
-          appendTo: () => document.querySelector(".active-editor") ?? document.querySelector("#editor-container"),
+          appendTo: () => document.querySelector("#editor-container"),
           content: reactRenderer.element,
           showOnCreate: true,
           interactive: true,

packages/editor/document-editor/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@plane/document-editor",
-  "version": "0.17.0",
+  "version": "0.16.0",
   "description": "Package that powers Plane's Pages Editor",
   "main": "./dist/index.mjs",
   "module": "./dist/index.mjs",

packages/editor/document-editor/src/ui/components/editor-header.tsx

@@ -7,7 +7,6 @@ import { AlertLabel } from "src/ui/components/alert-label";
 import { IVerticalDropdownItemProps, VerticalDropdownMenu } from "src/ui/components/vertical-dropdown-menu";
 import { SummaryPopover } from "src/ui/components/summary-popover";
 import { InfoPopover } from "src/ui/components/info-popover";
-import { getDate } from "src/utils/date-utils";
 
 interface IEditorHeader {
   editor: Editor;
@@ -73,7 +72,7 @@ export const EditorHeader = (props: IEditorHeader) => {
             Icon={Archive}
             backgroundColor="bg-blue-500/20"
             textColor="text-blue-500"
-            label={`Archived at ${getDate(archivedAt)?.toLocaleString()}`}
+            label={`Archived at ${new Date(archivedAt).toLocaleString()}`}
           />
         )}
 

packages/editor/document-editor/src/ui/components/info-popover.tsx

@@ -3,15 +3,13 @@ import { usePopper } from "react-popper";
 import { Calendar, History, Info } from "lucide-react";
 // types
 import { DocumentDetails } from "src/types/editor-types";
-//utils
-import { getDate } from "src/utils/date-utils";
 
 type Props = {
   documentDetails: DocumentDetails;
 };
 
 // function to render a Date in the format- 25 May 2023 at 2:53PM
-const renderDate = (date: Date | undefined): string => {
+const renderDate = (date: Date): string => {
   const options: Intl.DateTimeFormatOptions = {
     day: "numeric",
     month: "long",
@@ -54,14 +52,14 @@ export const InfoPopover: React.FC<Props> = (props) => {
             <h6 className="text-xs text-custom-text-400">Last updated on</h6>
             <h5 className="flex items-center gap-1 text-sm">
               <History className="h-3 w-3" />
-              {renderDate(getDate(documentDetails?.last_updated_at))}
+              {renderDate(new Date(documentDetails.last_updated_at))}
             </h5>
           </div>
           <div className="space-y-1.5">
             <h6 className="text-xs text-custom-text-400">Created on</h6>
             <h5 className="flex items-center gap-1 text-sm">
               <Calendar className="h-3 w-3" />
-              {renderDate(getDate(documentDetails?.created_on))}
+              {renderDate(new Date(documentDetails.created_on))}
             </h5>
           </div>
         </div>

packages/editor/document-editor/src/utils/date-utils.ts

@@ -1,26 +0,0 @@
-function isNumber(value: any) {
-  return typeof value === "number";
-}
-
-/**
- * This method returns a date from string of type yyyy-mm-dd
- * This method is recommended to use instead of new Date() as this does not introduce any timezone offsets
- * @param date
- * @returns date or undefined
- */
-export const getDate = (date: string | Date | undefined | null): Date | undefined => {
-  try {
-    if (!date || date === "") return;
-
-    if (typeof date !== "string" && !(date instanceof String)) return date;
-    const [yearString, monthString, dayString] = date.substring(0, 10).split("-");
-    const year = parseInt(yearString);
-    const month = parseInt(monthString);
-    const day = parseInt(dayString);
-    if (!isNumber(year) || !isNumber(month) || !isNumber(day)) return;
-
-    return new Date(year, month - 1, day);
-  } catch (e) {
-    return undefined;
-  }
-};

packages/editor/extensions/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@plane/editor-extensions",
-  "version": "0.17.0",
+  "version": "0.16.0",
   "description": "Package that powers Plane's Editor with extensions",
   "private": true,
   "main": "./dist/index.mjs",

packages/editor/extensions/src/extensions/slash-commands.tsx

@@ -85,10 +85,7 @@ const getSuggestionItems =
         searchTerms: ["p", "paragraph"],
         icon: <CaseSensitive className="h-3.5 w-3.5" />,
         command: ({ editor, range }: CommandProps) => {
-          if (range) {
-            editor.chain().focus().deleteRange(range).clearNodes().run();
-          }
-          editor.chain().focus().clearNodes().run();
+          editor.chain().focus().deleteRange(range).toggleNode("paragraph", "paragraph").run();
         },
       },
       {
@@ -330,7 +327,7 @@ const renderItems = () => {
       // @ts-ignore
       popup = tippy("body", {
         getReferenceClientRect: props.clientRect,
-        appendTo: () => document.querySelector(".active-editor") ?? document.querySelector("#editor-container"),
+        appendTo: () => document.querySelector("#editor-container"),
         content: component.element,
         showOnCreate: true,
         interactive: true,

packages/editor/lite-text-editor/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@plane/lite-text-editor",
-  "version": "0.17.0",
+  "version": "0.16.0",
   "description": "Package that powers Plane's Comment Editor",
   "private": true,
   "main": "./dist/index.mjs",

packages/editor/rich-text-editor/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@plane/rich-text-editor",
-  "version": "0.17.0",
+  "version": "0.16.0",
   "description": "Rich Text Editor that powers Plane",
   "private": true,
   "main": "./dist/index.mjs",

packages/editor/rich-text-editor/src/ui/menus/bubble-menu/index.tsx

@@ -25,20 +25,16 @@ type EditorBubbleMenuProps = Omit<BubbleMenuProps, "children">;
 
 export const EditorBubbleMenu: FC<EditorBubbleMenuProps> = (props: any) => {
   const items: BubbleMenuItem[] = [
-    ...(props.editor.isActive("code")
-      ? []
-      : [
-          BoldItem(props.editor),
-          ItalicItem(props.editor),
-          UnderLineItem(props.editor),
-          StrikeThroughItem(props.editor),
-        ]),
+    BoldItem(props.editor),
+    ItalicItem(props.editor),
+    UnderLineItem(props.editor),
+    StrikeThroughItem(props.editor),
     CodeItem(props.editor),
   ];
 
   const bubbleMenuProps: EditorBubbleMenuProps = {
     ...props,
-    shouldShow: ({ state, editor }) => {
+    shouldShow: ({ view, state, editor }) => {
       const { selection } = state;
 
       const { empty } = selection;
@@ -68,7 +64,6 @@ export const EditorBubbleMenu: FC<EditorBubbleMenuProps> = (props: any) => {
   const [isLinkSelectorOpen, setIsLinkSelectorOpen] = useState(false);
 
   const [isSelecting, setIsSelecting] = useState(false);
-
   useEffect(() => {
     function handleMouseDown() {
       function handleMouseMove() {
@@ -113,16 +108,14 @@ export const EditorBubbleMenu: FC<EditorBubbleMenuProps> = (props: any) => {
               }}
             />
           )}
-          {!props.editor.isActive("code") && (
-            <LinkSelector
-              editor={props.editor}
-              isOpen={isLinkSelectorOpen}
-              setIsOpen={() => {
-                setIsLinkSelectorOpen(!isLinkSelectorOpen);
-                setIsNodeSelectorOpen(false);
-              }}
-            />
-          )}
+          <LinkSelector
+            editor={props.editor!!}
+            isOpen={isLinkSelectorOpen}
+            setIsOpen={() => {
+              setIsLinkSelectorOpen(!isLinkSelectorOpen);
+              setIsNodeSelectorOpen(false);
+            }}
+          />
           <div className="flex">
             {items.map((item) => (
               <button

packages/editor/rich-text-editor/src/ui/menus/bubble-menu/link-selector.tsx

@@ -84,8 +84,8 @@ export const LinkSelector: FC<LinkSelectorProps> = ({ editor, isOpen, setIsOpen
               className="flex items-center rounded-sm p-1 text-custom-text-300 transition-all hover:bg-custom-background-90"
               type="button"
               onClick={(e) => {
-                onLinkSubmit();
                 e.stopPropagation();
+                onLinkSubmit();
               }}
             >
               <Check className="h-4 w-4" />

packages/editor/rich-text-editor/src/ui/menus/bubble-menu/node-selector.tsx

@@ -26,7 +26,7 @@ export const NodeSelector: FC<NodeSelectorProps> = ({ editor, isOpen, setIsOpen
     {
       name: "Text",
       icon: TextIcon,
-      command: () => editor.chain().focus().clearNodes().run(),
+      command: () => editor.chain().focus().toggleNode("paragraph", "paragraph").run(),
       isActive: () => editor.isActive("paragraph") && !editor.isActive("bulletList") && !editor.isActive("orderedList"),
     },
     HeadingOneItem(editor),

packages/eslint-config-custom/package.json

@@ -1,7 +1,7 @@
 {
   "name": "eslint-config-custom",
   "private": true,
-  "version": "0.17.0",
+  "version": "0.16.0",
   "main": "index.js",
   "license": "MIT",
   "devDependencies": {},

packages/tailwind-config-custom/package.json

@@ -1,6 +1,6 @@
 {
   "name": "tailwind-config-custom",
-  "version": "0.17.0",
+  "version": "0.16.0",
   "description": "common tailwind configuration across monorepo",
   "main": "index.js",
   "private": true,

packages/tsconfig/package.json

@@ -1,6 +1,6 @@
 {
   "name": "tsconfig",
-  "version": "0.17.0",
+  "version": "0.16.0",
   "private": true,
   "files": [
     "base.json",