fix: service layer fixes

* dev: error response for duplicate items created through external apis

* dev: return identifier and also add the validation for state

* fix: validation for external id and external source

.github/workflows/build-branch.yml

@@ -1,61 +1,30 @@
 name: Branch Build
 
 on:
-  pull_request:
-    types:
-      - closed
+  workflow_dispatch:
+    inputs:
+      branch_name:
+        description: "Branch Name"
+        required: true
+        default: "preview"
+  push:
     branches:
       - master
       - preview
-      - qa
       - develop
-      - release-*
   release:
     types: [released, prereleased]
 
 env:
-  TARGET_BRANCH: ${{ github.event.pull_request.base.ref || github.event.release.target_commitish }}
+  TARGET_BRANCH: ${{ inputs.branch_name || github.ref_name || github.event.release.target_commitish }}
 
 jobs:
   branch_build_setup:
-    if: ${{ (github.event_name == 'pull_request' && github.event.action =='closed' && github.event.pull_request.merged == true) || github.event_name == 'release' }}
     name: Build-Push Web/Space/API/Proxy Docker Image
     runs-on: ubuntu-20.04
-
     steps:
       - name: Check out the repo
         uses: actions/checkout@v3.3.0
-
-      - name: Uploading Proxy Source
-        uses: actions/upload-artifact@v3
-        with:
-          name: proxy-src-code
-          path: ./nginx
-      - name: Uploading Backend Source
-        uses: actions/upload-artifact@v3
-        with:
-          name: backend-src-code
-          path: ./apiserver
-      - name: Uploading Web Source
-        uses: actions/upload-artifact@v3
-        with:
-          name: web-src-code
-          path: |
-            ./
-            !./apiserver
-            !./nginx
-            !./deploy
-            !./space
-      - name: Uploading Space Source
-        uses: actions/upload-artifact@v3
-        with:
-          name: space-src-code
-          path: |
-            ./
-            !./apiserver
-            !./nginx
-            !./deploy
-            !./web
     outputs:
       gh_branch_name: ${{ env.TARGET_BRANCH }}
 
@@ -63,33 +32,38 @@ jobs:
     runs-on: ubuntu-20.04
     needs: [branch_build_setup]
     env:
-      FRONTEND_TAG: ${{ secrets.DOCKERHUB_USERNAME }}/plane-frontend${{ secrets.DOCKER_REPO_SUFFIX || '' }}:${{ needs.branch_build_setup.outputs.gh_branch_name }}
+      FRONTEND_TAG: ${{ secrets.DOCKERHUB_USERNAME }}/plane-frontend:${{ needs.branch_build_setup.outputs.gh_branch_name }}
     steps:
-      - name: Set Frontend Docker Tag 
+      - name: Set Frontend Docker Tag
         run: |
           if [ "${{ needs.branch_build_setup.outputs.gh_branch_name }}" == "master" ] && [ "${{ github.event_name }}" == "release" ]; then
-            TAG=${{ secrets.DOCKERHUB_USERNAME }}/plane-frontend${{ secrets.DOCKER_REPO_SUFFIX || '' }}:latest,${{ secrets.DOCKERHUB_USERNAME }}/plane-frontend${{ secrets.DOCKER_REPO_SUFFIX || '' }}:${{ github.event.release.tag_name }}
+            TAG=${{ secrets.DOCKERHUB_USERNAME }}/plane-frontend:latest,${{ secrets.DOCKERHUB_USERNAME }}/plane-frontend:${{ github.event.release.tag_name }}
           elif [ "${{ needs.branch_build_setup.outputs.gh_branch_name }}" == "master" ]; then
-            TAG=${{ secrets.DOCKERHUB_USERNAME }}/plane-frontend${{ secrets.DOCKER_REPO_SUFFIX || '' }}:stable
+            TAG=${{ secrets.DOCKERHUB_USERNAME }}/plane-frontend:stable
           else
             TAG=${{ env.FRONTEND_TAG }}
           fi
           echo "FRONTEND_TAG=${TAG}" >> $GITHUB_ENV
+      - name: Docker Setup QEMU
+        uses: docker/setup-qemu-action@v3.0.0
+
       - name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v2.5.0
+        uses: docker/setup-buildx-action@v3.0.0
+        with:
+          platforms: linux/amd64,linux/arm64
+          buildkitd-flags: "--allow-insecure-entitlement security.insecure"
 
       - name: Login to Docker Hub
-        uses: docker/login-action@v2.1.0
+        uses: docker/login-action@v3.0.0
         with:
           username: ${{ secrets.DOCKERHUB_USERNAME }}
           password: ${{ secrets.DOCKERHUB_TOKEN }}
-      - name: Downloading Web Source Code
-        uses: actions/download-artifact@v3
-        with:
-          name: web-src-code
+
+      - name: Check out the repo
+        uses: actions/checkout@v4.1.1
 
       - name: Build and Push Frontend to Docker Container Registry
-        uses: docker/build-push-action@v4.0.0
+        uses: docker/build-push-action@v5.1.0
         with:
           context: .
           file: ./web/Dockerfile.web
@@ -105,33 +79,39 @@ jobs:
     runs-on: ubuntu-20.04
     needs: [branch_build_setup]
     env:
-      SPACE_TAG: ${{ secrets.DOCKERHUB_USERNAME }}/plane-space${{ secrets.DOCKER_REPO_SUFFIX || '' }}:${{ needs.branch_build_setup.outputs.gh_branch_name }}
+      SPACE_TAG: ${{ secrets.DOCKERHUB_USERNAME }}/plane-space:${{ needs.branch_build_setup.outputs.gh_branch_name }}
     steps:
-      - name: Set Space Docker Tag 
+      - name: Set Space Docker Tag
         run: |
           if [ "${{ needs.branch_build_setup.outputs.gh_branch_name }}" == "master" ] && [ "${{ github.event_name }}" == "release" ]; then
-            TAG=${{ secrets.DOCKERHUB_USERNAME }}/plane-space${{ secrets.DOCKER_REPO_SUFFIX || '' }}:latest,${{ secrets.DOCKERHUB_USERNAME }}/plane-space${{ secrets.DOCKER_REPO_SUFFIX || '' }}:${{ github.event.release.tag_name }}
+            TAG=${{ secrets.DOCKERHUB_USERNAME }}/plane-space:latest,${{ secrets.DOCKERHUB_USERNAME }}/plane-space:${{ github.event.release.tag_name }}
           elif [ "${{ needs.branch_build_setup.outputs.gh_branch_name }}" == "master" ]; then
-            TAG=${{ secrets.DOCKERHUB_USERNAME }}/plane-space${{ secrets.DOCKER_REPO_SUFFIX || '' }}:stable
+            TAG=${{ secrets.DOCKERHUB_USERNAME }}/plane-space:stable
           else
             TAG=${{ env.SPACE_TAG }}
           fi
           echo "SPACE_TAG=${TAG}" >> $GITHUB_ENV
+
+      - name: Docker Setup QEMU
+        uses: docker/setup-qemu-action@v3.0.0
+
       - name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v2.5.0
+        uses: docker/setup-buildx-action@v3.0.0
+        with:
+          platforms: linux/amd64,linux/arm64
+          buildkitd-flags: "--allow-insecure-entitlement security.insecure"
 
       - name: Login to Docker Hub
-        uses: docker/login-action@v2.1.0
+        uses: docker/login-action@v3.0.0
         with:
           username: ${{ secrets.DOCKERHUB_USERNAME }}
           password: ${{ secrets.DOCKERHUB_TOKEN }}
-      - name: Downloading Space Source Code
-        uses: actions/download-artifact@v3
-        with:
-          name: space-src-code
+
+      - name: Check out the repo
+        uses: actions/checkout@v4.1.1
 
       - name: Build and Push Space to Docker Hub
-        uses: docker/build-push-action@v4.0.0
+        uses: docker/build-push-action@v5.1.0
         with:
           context: .
           file: ./space/Dockerfile.space
@@ -147,36 +127,42 @@ jobs:
     runs-on: ubuntu-20.04
     needs: [branch_build_setup]
     env:
-      BACKEND_TAG: ${{ secrets.DOCKERHUB_USERNAME }}/plane-backend${{ secrets.DOCKER_REPO_SUFFIX || '' }}:${{ needs.branch_build_setup.outputs.gh_branch_name }}
+      BACKEND_TAG: ${{ secrets.DOCKERHUB_USERNAME }}/plane-backend:${{ needs.branch_build_setup.outputs.gh_branch_name }}
     steps:
-      - name: Set Backend Docker Tag 
+      - name: Set Backend Docker Tag
         run: |
           if [ "${{ needs.branch_build_setup.outputs.gh_branch_name }}" == "master" ] && [ "${{ github.event_name }}" == "release" ]; then
-            TAG=${{ secrets.DOCKERHUB_USERNAME }}/plane-backend${{ secrets.DOCKER_REPO_SUFFIX || '' }}:latest,${{ secrets.DOCKERHUB_USERNAME }}/plane-backend${{ secrets.DOCKER_REPO_SUFFIX || '' }}:${{ github.event.release.tag_name }}
+            TAG=${{ secrets.DOCKERHUB_USERNAME }}/plane-backend:latest,${{ secrets.DOCKERHUB_USERNAME }}/plane-backend:${{ github.event.release.tag_name }}
           elif [ "${{ needs.branch_build_setup.outputs.gh_branch_name }}" == "master" ]; then
-            TAG=${{ secrets.DOCKERHUB_USERNAME }}/plane-backend${{ secrets.DOCKER_REPO_SUFFIX || '' }}:stable
+            TAG=${{ secrets.DOCKERHUB_USERNAME }}/plane-backend:stable
           else
             TAG=${{ env.BACKEND_TAG }}
           fi
           echo "BACKEND_TAG=${TAG}" >> $GITHUB_ENV
+
+      - name: Docker Setup QEMU
+        uses: docker/setup-qemu-action@v3.0.0
+
       - name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v2.5.0
+        uses: docker/setup-buildx-action@v3.0.0
+        with:
+          platforms: linux/amd64,linux/arm64
+          buildkitd-flags: "--allow-insecure-entitlement security.insecure"
 
       - name: Login to Docker Hub
-        uses: docker/login-action@v2.1.0
+        uses: docker/login-action@v3.0.0
         with:
           username: ${{ secrets.DOCKERHUB_USERNAME }}
           password: ${{ secrets.DOCKERHUB_TOKEN }}
-      - name: Downloading Backend Source Code
-        uses: actions/download-artifact@v3
-        with:
-          name: backend-src-code
+
+      - name: Check out the repo
+        uses: actions/checkout@v4.1.1
 
       - name: Build and Push Backend to Docker Hub
-        uses: docker/build-push-action@v4.0.0
+        uses: docker/build-push-action@v5.1.0
         with:
-          context: .
-          file: ./Dockerfile.api
+          context: ./apiserver
+          file: ./apiserver/Dockerfile.api
           platforms: linux/amd64
           push: true
           tags: ${{ env.BACKEND_TAG }}
@@ -189,37 +175,42 @@ jobs:
     runs-on: ubuntu-20.04
     needs: [branch_build_setup]
     env:
-      PROXY_TAG: ${{ secrets.DOCKERHUB_USERNAME }}/plane-proxy${{ secrets.DOCKER_REPO_SUFFIX || '' }}:${{ needs.branch_build_setup.outputs.gh_branch_name }}
+      PROXY_TAG: ${{ secrets.DOCKERHUB_USERNAME }}/plane-proxy:${{ needs.branch_build_setup.outputs.gh_branch_name }}
     steps:
-      - name: Set Proxy Docker Tag 
+      - name: Set Proxy Docker Tag
         run: |
           if [ "${{ needs.branch_build_setup.outputs.gh_branch_name }}" == "master" ] && [ "${{ github.event_name }}" == "release" ]; then
-            TAG=${{ secrets.DOCKERHUB_USERNAME }}/plane-proxy${{ secrets.DOCKER_REPO_SUFFIX || '' }}:latest,${{ secrets.DOCKERHUB_USERNAME }}/plane-proxy${{ secrets.DOCKER_REPO_SUFFIX || '' }}:${{ github.event.release.tag_name }}
+            TAG=${{ secrets.DOCKERHUB_USERNAME }}/plane-proxy:latest,${{ secrets.DOCKERHUB_USERNAME }}/plane-proxy:${{ github.event.release.tag_name }}
           elif [ "${{ needs.branch_build_setup.outputs.gh_branch_name }}" == "master" ]; then
-            TAG=${{ secrets.DOCKERHUB_USERNAME }}/plane-proxy${{ secrets.DOCKER_REPO_SUFFIX || '' }}:stable
+            TAG=${{ secrets.DOCKERHUB_USERNAME }}/plane-proxy:stable
           else
             TAG=${{ env.PROXY_TAG }}
           fi
           echo "PROXY_TAG=${TAG}" >> $GITHUB_ENV
+
+      - name: Docker Setup QEMU
+        uses: docker/setup-qemu-action@v3.0.0
+
       - name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v2.5.0
+        uses: docker/setup-buildx-action@v3.0.0
+        with:
+          platforms: linux/amd64,linux/arm64
+          buildkitd-flags: "--allow-insecure-entitlement security.insecure"
 
       - name: Login to Docker Hub
-        uses: docker/login-action@v2.1.0
+        uses: docker/login-action@v3.0.0
         with:
           username: ${{ secrets.DOCKERHUB_USERNAME }}
           password: ${{ secrets.DOCKERHUB_TOKEN }}
 
-      - name: Downloading Proxy Source Code
-        uses: actions/download-artifact@v3
-        with:
-          name: proxy-src-code
+      - name: Check out the repo
+        uses: actions/checkout@v4.1.1
 
       - name: Build and Push Plane-Proxy to Docker Hub
-        uses: docker/build-push-action@v4.0.0
+        uses: docker/build-push-action@v5.1.0
         with:
-          context: .
-          file: ./Dockerfile
+          context: ./nginx
+          file: ./nginx/Dockerfile
           platforms: linux/amd64
           tags: ${{ env.PROXY_TAG }}
           push: true

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

@@ -1,25 +1,23 @@
 name: Create Sync Action
 
 on:
-  pull_request:
+  workflow_dispatch:
+  push: 
     branches:
       - preview
-    types:
-      - closed
+
 env:
-  SOURCE_BRANCH_NAME: ${{github.event.pull_request.base.ref}}
+  SOURCE_BRANCH_NAME: ${{ github.ref_name }}
 
 jobs:
   sync_changes:
-    # Only run the job when a PR is merged
-    if: github.event.pull_request.merged == true
     runs-on: ubuntu-latest
     permissions:
       pull-requests: write
       contents: read
     steps:
       - name: Checkout Code
-        uses: actions/checkout@v2
+        uses: actions/checkout@v4.1.1 
         with:
           persist-credentials: false
           fetch-depth: 0

README.md

@@ -37,7 +37,7 @@ Meet [Plane](https://plane.so). An open-source software development tool to mana
 
 > 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.
 
-The easiest way to get started with Plane is by creating a [Plane Cloud](https://app.plane.so) account. Plane Cloud offers a hosted solution for Plane. If you prefer to self-host Plane, please refer to our [deployment documentation](https://docs.plane.so/self-hosting/docker-compose).
+The easiest way to get started with Plane is by creating a [Plane Cloud](https://app.plane.so) account. Plane Cloud offers a hosted solution for Plane. If you prefer to self-host Plane, please refer to our [deployment documentation](https://docs.plane.so/docker-compose). 
 
 ## ⚡️ Contributors Quick Start
 

apiserver/.env.example

@@ -8,11 +8,11 @@ SENTRY_DSN=""
 SENTRY_ENVIRONMENT="development"
 
 # Database Settings
-PGUSER="plane"
-PGPASSWORD="plane"
-PGHOST="plane-db"
-PGDATABASE="plane"
-DATABASE_URL=postgresql://${PGUSER}:${PGPASSWORD}@${PGHOST}/${PGDATABASE}
+POSTGRES_USER="plane"
+POSTGRES_PASSWORD="plane"
+POSTGRES_HOST="plane-db"
+POSTGRES_DB="plane"
+DATABASE_URL=postgresql://${POSTGRES_USER}:${POSTGRES_PASSWORD}@${POSTGRES_HOST}/${POSTGRES_DB}
 
 # Oauth variables
 GOOGLE_CLIENT_ID=""

apiserver/Dockerfile.dev

@@ -33,15 +33,10 @@ RUN pip install -r requirements/local.txt --compile --no-cache-dir
 RUN addgroup -S plane && \
     adduser -S captain -G plane
 
-RUN chown captain.plane /code
+COPY . .
 
-USER captain
-
-# Add in Django deps and generate Django's static files
-
-USER root
-
-# RUN chmod +x ./bin/takeoff ./bin/worker ./bin/beat
+RUN chown -R captain.plane /code
+RUN chmod -R +x /code/bin
 RUN chmod -R 777 /code
 
 USER captain

apiserver/bin/beat

@@ -2,4 +2,7 @@
 set -e
 
 python manage.py wait_for_db
+# Wait for migrations
+python manage.py wait_for_migrations
+# Run the processes
 celery -A plane beat -l info

apiserver/bin/takeoff

@@ -1,7 +1,8 @@
 #!/bin/bash
 set -e
 python manage.py wait_for_db
-python manage.py migrate
+# Wait for migrations
+python manage.py wait_for_migrations
 
 # Create the default bucket
 #!/bin/bash

apiserver/bin/takeoff.local

@@ -1,7 +1,8 @@
 #!/bin/bash
 set -e
 python manage.py wait_for_db
-python manage.py migrate
+# Wait for migrations
+python manage.py wait_for_migrations
 
 # Create the default bucket
 #!/bin/bash

apiserver/bin/worker

@@ -2,4 +2,7 @@
 set -e
 
 python manage.py wait_for_db
+# Wait for migrations
+python manage.py wait_for_migrations
+# Run the processes
 celery -A plane worker -l info

apiserver/package.json

@@ -1,4 +1,4 @@
 {
   "name": "plane-api",
-  "version": "0.14.0"
+  "version": "0.15.0"
 }

apiserver/plane/api/views/cycle.py

@@ -243,6 +243,29 @@ class CycleAPIEndpoint(WebhookMixin, BaseAPIView):
         ):
             serializer = CycleSerializer(data=request.data)
             if serializer.is_valid():
+                if (
+                    request.data.get("external_id")
+                    and request.data.get("external_source")
+                    and Cycle.objects.filter(
+                        project_id=project_id,
+                        workspace__slug=slug,
+                        external_source=request.data.get("external_source"),
+                        external_id=request.data.get("external_id"),
+                    ).exists()
+                ):
+                    cycle = Cycle.objects.filter(
+                        workspace__slug=slug,
+                        project_id=project_id,
+                        external_source=request.data.get("external_source"),
+                        external_id=request.data.get("external_id"),
+                    ).first()
+                    return Response(
+                        {
+                            "error": "Cycle with the same external id and external source already exists",
+                            "cycle": str(cycle.id),
+                        },
+                        status=status.HTTP_409_CONFLICT,
+                    )
                 serializer.save(
                     project_id=project_id,
                     owned_by=request.user,
@@ -289,6 +312,23 @@ class CycleAPIEndpoint(WebhookMixin, BaseAPIView):
 
         serializer = CycleSerializer(cycle, data=request.data, partial=True)
         if serializer.is_valid():
+            if (
+                request.data.get("external_id")
+                and (cycle.external_id != request.data.get("external_id"))
+                and Cycle.objects.filter(
+                    project_id=project_id,
+                    workspace__slug=slug,
+                    external_source=request.data.get("external_source", cycle.external_source),
+                    external_id=request.data.get("external_id"),
+                ).exists()
+            ):
+                return Response(
+                    {
+                        "error": "Cycle with the same external id and external source already exists",
+                        "cycle_id": str(cycle.id),
+                    },
+                    status=status.HTTP_409_CONFLICT,
+                )
             serializer.save()
             return Response(serializer.data, status=status.HTTP_200_OK)
         return Response(serializer.errors, status=status.HTTP_400_BAD_REQUEST)

apiserver/plane/api/views/issue.py

@@ -220,6 +220,30 @@ class IssueAPIEndpoint(WebhookMixin, BaseAPIView):
         )
 
         if serializer.is_valid():
+            if (
+                request.data.get("external_id")
+                and request.data.get("external_source")
+                and Issue.objects.filter(
+                    project_id=project_id,
+                    workspace__slug=slug,
+                    external_source=request.data.get("external_source"),
+                    external_id=request.data.get("external_id"),
+                ).exists()
+            ):
+                issue = Issue.objects.filter(
+                    workspace__slug=slug,
+                    project_id=project_id,
+                    external_id=request.data.get("external_id"),
+                    external_source=request.data.get("external_source"),
+                ).first()
+                return Response(
+                    {
+                        "error": "Issue with the same external id and external source already exists",
+                        "issue_id": str(issue.id),
+                    },
+                    status=status.HTTP_409_CONFLICT,
+                )
+
             serializer.save()
 
             # Track the issue
@@ -256,6 +280,24 @@ class IssueAPIEndpoint(WebhookMixin, BaseAPIView):
             partial=True,
         )
         if serializer.is_valid():
+            if (
+                str(request.data.get("external_id"))
+                and (issue.external_id != str(request.data.get("external_id")))
+                and Issue.objects.filter(
+                    project_id=project_id,
+                    workspace__slug=slug,
+                    external_source=request.data.get("external_source", issue.external_source),
+                    external_id=request.data.get("external_id"),
+                ).exists()
+            ):
+                return Response(
+                    {
+                        "error": "Issue with the same external id and external source already exists",
+                        "issue_id": str(issue.id),
+                    },
+                    status=status.HTTP_409_CONFLICT,
+                )
+
             serializer.save()
             issue_activity.delay(
                 type="issue.activity.updated",
@@ -263,6 +305,8 @@ class IssueAPIEndpoint(WebhookMixin, BaseAPIView):
                 actor_id=str(request.user.id),
                 issue_id=str(pk),
                 project_id=str(project_id),
+                external_id__isnull=False,
+                external_source__isnull=False,
                 current_instance=current_instance,
                 epoch=int(timezone.now().timestamp()),
             )

apiserver/plane/api/views/module.py

@@ -132,6 +132,29 @@ class ModuleAPIEndpoint(WebhookMixin, BaseAPIView):
             },
         )
         if serializer.is_valid():
+            if (
+                request.data.get("external_id")
+                and request.data.get("external_source")
+                and Module.objects.filter(
+                    project_id=project_id,
+                    workspace__slug=slug,
+                    external_source=request.data.get("external_source"),
+                    external_id=request.data.get("external_id"),
+                ).exists()
+            ):
+                module = Module.objects.filter(
+                    project_id=project_id,
+                    workspace__slug=slug,
+                    external_source=request.data.get("external_source"),
+                    external_id=request.data.get("external_id"),
+                ).first()
+                return Response(
+                    {
+                        "error": "Module with the same external id and external source already exists",
+                        "module_id": str(module.id),
+                    },
+                    status=status.HTTP_409_CONFLICT,
+                )
             serializer.save()
             module = Module.objects.get(pk=serializer.data["id"])
             serializer = ModuleSerializer(module)
@@ -149,8 +172,25 @@ class ModuleAPIEndpoint(WebhookMixin, BaseAPIView):
             partial=True,
         )
         if serializer.is_valid():
+            if (
+                request.data.get("external_id")
+                and (module.external_id != request.data.get("external_id"))
+                and Module.objects.filter(
+                    project_id=project_id,
+                    workspace__slug=slug,
+                    external_source=request.data.get("external_source", module.external_source),
+                    external_id=request.data.get("external_id"),
+                ).exists()
+            ):
+                return Response(
+                    {
+                        "error": "Module with the same external id and external source already exists",
+                        "module_id": str(module.id),
+                    },
+                    status=status.HTTP_409_CONFLICT,
+                )
             serializer.save()
-            return Response(serializer.data, status=status.HTTP_201_CREATED)
+            return Response(serializer.data, status=status.HTTP_200_OK)
         return Response(serializer.errors, status=status.HTTP_400_BAD_REQUEST)
 
     def get(self, request, slug, project_id, pk=None):

apiserver/plane/api/views/state.py

@@ -38,6 +38,30 @@ class StateAPIEndpoint(BaseAPIView):
             data=request.data, context={"project_id": project_id}
         )
         if serializer.is_valid():
+            if (
+                request.data.get("external_id")
+                and request.data.get("external_source")
+                and State.objects.filter(
+                    project_id=project_id,
+                    workspace__slug=slug,
+                    external_source=request.data.get("external_source"),
+                    external_id=request.data.get("external_id"),
+                ).exists()
+            ):
+                state = State.objects.filter(
+                    workspace__slug=slug,
+                    project_id=project_id,
+                    external_id=request.data.get("external_id"),
+                    external_source=request.data.get("external_source"),
+                ).first()
+                return Response(
+                    {
+                        "error": "State with the same external id and external source already exists",
+                        "state_id": str(state.id),
+                    },
+                    status=status.HTTP_409_CONFLICT,
+                )
+
             serializer.save(project_id=project_id)
             return Response(serializer.data, status=status.HTTP_200_OK)
         return Response(serializer.errors, status=status.HTTP_400_BAD_REQUEST)
@@ -91,6 +115,23 @@ class StateAPIEndpoint(BaseAPIView):
         )
         serializer = StateSerializer(state, data=request.data, partial=True)
         if serializer.is_valid():
+            if (
+                str(request.data.get("external_id"))
+                and (state.external_id != str(request.data.get("external_id")))
+                and State.objects.filter(
+                    project_id=project_id,
+                    workspace__slug=slug,
+                    external_source=request.data.get("external_source", state.external_source),
+                    external_id=request.data.get("external_id"),
+                ).exists()
+            ):
+                return Response(
+                    {
+                        "error": "State with the same external id and external source already exists",
+                        "state_id": str(state.id),
+                    },
+                    status=status.HTTP_409_CONFLICT,
+                )
             serializer.save()
             return Response(serializer.data, status=status.HTTP_200_OK)
         return Response(serializer.errors, status=status.HTTP_400_BAD_REQUEST)

apiserver/plane/app/serializers/__init__.py

@@ -111,11 +111,12 @@ from .inbox import (
     InboxSerializer,
     InboxIssueSerializer,
     IssueStateInboxSerializer,
+    InboxIssueLiteSerializer,
 )
 
 from .analytic import AnalyticViewSerializer
 
-from .notification import NotificationSerializer
+from .notification import NotificationSerializer, UserNotificationPreferenceSerializer
 
 from .exporter import ExporterHistorySerializer
 

apiserver/plane/app/serializers/base.py

@@ -60,6 +60,7 @@ class DynamicBaseSerializer(BaseSerializer):
                     CycleIssueSerializer,
                     IssueFlatSerializer,
                     IssueRelationSerializer,
+                    InboxIssueLiteSerializer
                 )
 
                 # Expansion mapper
@@ -80,9 +81,10 @@ class DynamicBaseSerializer(BaseSerializer):
                     "issue_cycle": CycleIssueSerializer,
                     "parent": IssueSerializer,
                     "issue_relation": IssueRelationSerializer,
+                    "issue_inbox" : InboxIssueLiteSerializer,
                 }
                 
-                self.fields[field] = expansion[field](many=True if field in ["members", "assignees", "labels", "issue_cycle", "issue_relation"] else False)            
+                self.fields[field] = expansion[field](many=True if field in ["members", "assignees", "labels", "issue_cycle", "issue_relation", "issue_inbox"] else False)            
 
         return self.fields
 
@@ -103,6 +105,7 @@ class DynamicBaseSerializer(BaseSerializer):
                         LabelSerializer,
                         CycleIssueSerializer,
                         IssueRelationSerializer,
+                        InboxIssueLiteSerializer
                     )
 
                     # Expansion mapper
@@ -122,7 +125,8 @@ class DynamicBaseSerializer(BaseSerializer):
                         "labels": LabelSerializer,
                         "issue_cycle": CycleIssueSerializer,
                         "parent": IssueSerializer,
-                        "issue_relation": IssueRelationSerializer
+                        "issue_relation": IssueRelationSerializer,
+                        "issue_inbox" : InboxIssueLiteSerializer,
                     }
                     # Check if field in expansion then expand the field
                     if expand in expansion:

apiserver/plane/app/serializers/cycle.py

@@ -33,7 +33,6 @@ class CycleWriteSerializer(BaseSerializer):
 
 
 class CycleSerializer(BaseSerializer):
-    owned_by = UserLiteSerializer(read_only=True)
     is_favorite = serializers.BooleanField(read_only=True)
     total_issues = serializers.IntegerField(read_only=True)
     cancelled_issues = serializers.IntegerField(read_only=True)

apiserver/plane/app/serializers/issue.py

@@ -304,6 +304,7 @@ class IssueRelationSerializer(BaseSerializer):
     sequence_id = serializers.IntegerField(
         source="related_issue.sequence_id", read_only=True
     )
+    name = serializers.CharField(source="related_issue.name", read_only=True)
     relation_type = serializers.CharField(read_only=True)
 
     class Meta:
@@ -313,6 +314,7 @@ class IssueRelationSerializer(BaseSerializer):
             "project_id",
             "sequence_id",
             "relation_type",
+            "name",
         ]
         read_only_fields = [
             "workspace",
@@ -328,6 +330,7 @@ class RelatedIssueSerializer(BaseSerializer):
     sequence_id = serializers.IntegerField(
         source="issue.sequence_id", read_only=True
     )
+    name = serializers.CharField(source="issue.name", read_only=True)
     relation_type = serializers.CharField(read_only=True)
 
     class Meta:
@@ -337,6 +340,7 @@ class RelatedIssueSerializer(BaseSerializer):
             "project_id",
             "sequence_id",
             "relation_type",
+            "name",
         ]
         read_only_fields = [
             "workspace",
@@ -469,19 +473,6 @@ class IssueReactionSerializer(BaseSerializer):
         ]
 
 
-class CommentReactionLiteSerializer(BaseSerializer):
-    actor_detail = UserLiteSerializer(read_only=True, source="actor")
-
-    class Meta:
-        model = CommentReaction
-        fields = [
-            "id",
-            "reaction",
-            "comment",
-            "actor_detail",
-        ]
-
-
 class CommentReactionSerializer(BaseSerializer):
     class Meta:
         model = CommentReaction
@@ -512,7 +503,7 @@ class IssueCommentSerializer(BaseSerializer):
     workspace_detail = WorkspaceLiteSerializer(
         read_only=True, source="workspace"
     )
-    comment_reactions = CommentReactionLiteSerializer(
+    comment_reactions = CommentReactionSerializer(
         read_only=True, many=True
     )
     is_member = serializers.BooleanField(read_only=True)
@@ -571,7 +562,7 @@ class IssueSerializer(DynamicBaseSerializer):
     state_id = serializers.PrimaryKeyRelatedField(read_only=True)
     parent_id = serializers.PrimaryKeyRelatedField(read_only=True)
     cycle_id = serializers.PrimaryKeyRelatedField(read_only=True)
-    module_id = serializers.PrimaryKeyRelatedField(read_only=True)
+    module_ids = serializers.SerializerMethodField()
 
     # Many to many
     label_ids = serializers.PrimaryKeyRelatedField(
@@ -606,7 +597,7 @@ class IssueSerializer(DynamicBaseSerializer):
             "project_id",
             "parent_id",
             "cycle_id",
-            "module_id",
+            "module_ids",
             "label_ids",
             "assignee_ids",
             "sub_issues_count",
@@ -622,6 +613,10 @@ class IssueSerializer(DynamicBaseSerializer):
         ]
         read_only_fields = fields
 
+    def get_module_ids(self, obj):
+        # Access the prefetched modules and extract module IDs
+        return [module for module in obj.issue_module.values_list("module_id", flat=True)]
+
 
 class IssueLiteSerializer(DynamicBaseSerializer):
     workspace_detail = WorkspaceLiteSerializer(

apiserver/plane/app/serializers/notification.py

@@ -1,7 +1,7 @@
 # Module imports
 from .base import BaseSerializer
 from .user import UserLiteSerializer
-from plane.db.models import Notification
+from plane.db.models import Notification, UserNotificationPreference
 
 
 class NotificationSerializer(BaseSerializer):
@@ -12,3 +12,10 @@ class NotificationSerializer(BaseSerializer):
     class Meta:
         model = Notification
         fields = "__all__"
+
+
+class UserNotificationPreferenceSerializer(BaseSerializer):
+
+    class Meta:
+        model = UserNotificationPreference
+        fields = "__all__"

apiserver/plane/app/urls/cycle.py

@@ -8,16 +8,10 @@ from plane.app.views import (
     CycleFavoriteViewSet,
     TransferCycleIssueEndpoint,
     CycleUserPropertiesEndpoint,
-    ActiveCycleEndpoint
 )
 
 
 urlpatterns = [
-    path(
-        "workspaces/<str:slug>/active-cycles/",
-        ActiveCycleEndpoint.as_view(),
-        name="workspace-active-cycle",
-    ),
     path(
         "workspaces/<str:slug>/projects/<uuid:project_id>/cycles/",
         CycleViewSet.as_view(

apiserver/plane/app/urls/module.py

@@ -35,17 +35,26 @@ urlpatterns = [
         name="project-modules",
     ),
     path(
-        "workspaces/<str:slug>/projects/<uuid:project_id>/modules/<uuid:module_id>/module-issues/",
+        "workspaces/<str:slug>/projects/<uuid:project_id>/issues/<uuid:issue_id>/modules/",
         ModuleIssueViewSet.as_view(
             {
+                "post": "create_issue_modules",
+            }
+        ),
+        name="issue-module",
+    ),
+    path(
+        "workspaces/<str:slug>/projects/<uuid:project_id>/modules/<uuid:module_id>/issues/",
+        ModuleIssueViewSet.as_view(
+            {
+                "post": "create_module_issues",
                 "get": "list",
-                "post": "create",
             }
         ),
         name="project-module-issues",
     ),
     path(
-        "workspaces/<str:slug>/projects/<uuid:project_id>/modules/<uuid:module_id>/module-issues/<uuid:issue_id>/",
+        "workspaces/<str:slug>/projects/<uuid:project_id>/modules/<uuid:module_id>/issues/<uuid:issue_id>/",
         ModuleIssueViewSet.as_view(
             {
                 "get": "retrieve",

apiserver/plane/app/urls/notification.py

@@ -5,6 +5,7 @@ from plane.app.views import (
     NotificationViewSet,
     UnreadNotificationEndpoint,
     MarkAllReadNotificationViewSet,
+    UserNotificationPreferenceEndpoint,
 )
 
 
@@ -63,4 +64,9 @@ urlpatterns = [
         ),
         name="mark-all-read-notifications",
     ),
+    path(
+        "users/me/notification-preferences/",
+        UserNotificationPreferenceEndpoint.as_view(),
+        name="user-notification-preferences",
+    ),
 ]

apiserver/plane/app/views/__init__.py

@@ -64,7 +64,6 @@ from .cycle import (
     CycleFavoriteViewSet,
     TransferCycleIssueEndpoint,
     CycleUserPropertiesEndpoint,
-    ActiveCycleEndpoint,
 )
 from .asset import FileAssetEndpoint, UserAssetsEndpoint, FileAssetViewSet
 from .issue import (
@@ -168,6 +167,7 @@ from .notification import (
     NotificationViewSet,
     UnreadNotificationEndpoint,
     MarkAllReadNotificationViewSet,
+    UserNotificationPreferenceEndpoint,
 )
 
 from .exporter import ExportIssuesEndpoint

apiserver/plane/app/views/cycle.py

@@ -39,7 +39,6 @@ from plane.app.serializers import (
 from plane.app.permissions import (
     ProjectEntityPermission,
     ProjectLitePermission,
-    WorkspaceUserPermission
 )
 from plane.db.models import (
     User,
@@ -531,6 +530,8 @@ class CycleViewSet(WebhookMixin, BaseViewSet):
             project_id=str(project_id),
             current_instance=None,
             epoch=int(timezone.now().timestamp()),
+            notification=True,
+            origin=request.META.get("HTTP_ORIGIN"),
         )
         # Delete the cycle
         cycle.delete()
@@ -598,16 +599,11 @@ class CycleIssueViewSet(WebhookMixin, BaseViewSet):
             )
             .filter(project_id=project_id)
             .filter(workspace__slug=slug)
-            .select_related("project")
-            .select_related("workspace")
-            .select_related("state")
-            .select_related("parent")
-            .prefetch_related("assignees")
-            .prefetch_related("labels")
+            .select_related("workspace", "project", "state", "parent")
+            .prefetch_related("assignees", "labels", "issue_module__module")
             .order_by(order_by)
             .filter(**filters)
             .annotate(cycle_id=F("issue_cycle__cycle_id"))
-            .annotate(module_id=F("issue_module__module_id"))
             .annotate(
                 link_count=IssueLink.objects.filter(issue=OuterRef("id"))
                 .order_by()
@@ -722,6 +718,8 @@ class CycleIssueViewSet(WebhookMixin, BaseViewSet):
                 }
             ),
             epoch=int(timezone.now().timestamp()),
+            notification=True,
+            origin=request.META.get("HTTP_ORIGIN"),
         )
 
         # Return all Cycle Issues
@@ -754,6 +752,8 @@ class CycleIssueViewSet(WebhookMixin, BaseViewSet):
             project_id=str(self.kwargs.get("project_id", None)),
             current_instance=None,
             epoch=int(timezone.now().timestamp()),
+            notification=True,
+            origin=request.META.get("HTTP_ORIGIN"),
         )
         cycle_issue.delete()
         return Response(status=status.HTTP_204_NO_CONTENT)
@@ -910,235 +910,3 @@ class CycleUserPropertiesEndpoint(BaseAPIView):
         )
         serializer = CycleUserPropertiesSerializer(cycle_properties)
         return Response(serializer.data, status=status.HTTP_200_OK)
-
-
-class ActiveCycleEndpoint(BaseAPIView):
-    permission_classes = [
-        WorkspaceUserPermission,
-    ]
-    def get(self, request, slug):
-        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"),
-        )
-        active_cycles = (
-            Cycle.objects.filter(
-                workspace__slug=slug,
-                project__project_projectmember__member=self.request.user,
-                start_date__lte=timezone.now(),
-                end_date__gte=timezone.now(),
-            )
-            .select_related("project")
-            .select_related("workspace")
-            .select_related("owned_by")
-            .annotate(is_favorite=Exists(subquery))
-            .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,
-                    ),
-                )
-            )
-            .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(),
-                )
-            )
-            .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(),
-                )
-            )
-            .order_by("-created_at")
-        )
-
-        cycles = CycleSerializer(active_cycles, many=True).data
-
-        for cycle in cycles:
-            assignee_distribution = (
-                Issue.objects.filter(
-                    issue_cycle__cycle_id=cycle["id"],
-                    project_id=cycle["project"],
-                    workspace__slug=slug,
-                )
-                .annotate(display_name=F("assignees__display_name"))
-                .annotate(assignee_id=F("assignees__id"))
-                .annotate(avatar=F("assignees__avatar"))
-                .values("display_name", "assignee_id", "avatar")
-                .annotate(
-                    total_issues=Count(
-                        "assignee_id",
-                        filter=Q(archived_at__isnull=True, is_draft=False),
-                    ),
-                )
-                .annotate(
-                    completed_issues=Count(
-                        "assignee_id",
-                        filter=Q(
-                            completed_at__isnull=False,
-                            archived_at__isnull=True,
-                            is_draft=False,
-                        ),
-                    )
-                )
-                .annotate(
-                    pending_issues=Count(
-                        "assignee_id",
-                        filter=Q(
-                            completed_at__isnull=True,
-                            archived_at__isnull=True,
-                            is_draft=False,
-                        ),
-                    )
-                )
-                .order_by("display_name")
-            )
-
-            label_distribution = (
-                Issue.objects.filter(
-                    issue_cycle__cycle_id=cycle["id"],
-                    project_id=cycle["project"],
-                    workspace__slug=slug,
-                )
-                .annotate(label_name=F("labels__name"))
-                .annotate(color=F("labels__color"))
-                .annotate(label_id=F("labels__id"))
-                .values("label_name", "color", "label_id")
-                .annotate(
-                    total_issues=Count(
-                        "label_id",
-                        filter=Q(archived_at__isnull=True, is_draft=False),
-                    )
-                )
-                .annotate(
-                    completed_issues=Count(
-                        "label_id",
-                        filter=Q(
-                            completed_at__isnull=False,
-                            archived_at__isnull=True,
-                            is_draft=False,
-                        ),
-                    )
-                )
-                .annotate(
-                    pending_issues=Count(
-                        "label_id",
-                        filter=Q(
-                            completed_at__isnull=True,
-                            archived_at__isnull=True,
-                            is_draft=False,
-                        ),
-                    )
-                )
-                .order_by("label_name")
-            )
-            cycle["distribution"] = {
-                "assignees": assignee_distribution,
-                "labels": label_distribution,
-                "completion_chart": {},
-            }
-            if cycle["start_date"] and cycle["end_date"]:
-                cycle["distribution"][
-                    "completion_chart"
-                ] = burndown_plot(
-                    queryset=active_cycles.get(pk=cycle["id"]),
-                    slug=slug,
-                    project_id=cycle["project"],
-                    cycle_id=cycle["id"],
-                )
-
-        return Response(cycles, status=status.HTTP_200_OK)

apiserver/plane/app/views/dashboard.py

@@ -100,7 +100,7 @@ def dashboard_assigned_issues(self, request, slug):
         )
         .filter(**filters)
         .select_related("workspace", "project", "state", "parent")
-        .prefetch_related("assignees", "labels")
+        .prefetch_related("assignees", "labels", "issue_module__module")
         .prefetch_related(
             Prefetch(
                 "issue_relation",
@@ -110,7 +110,6 @@ def dashboard_assigned_issues(self, request, slug):
             )
         )
         .annotate(cycle_id=F("issue_cycle__cycle_id"))
-        .annotate(module_id=F("issue_module__module_id"))
         .annotate(
             link_count=IssueLink.objects.filter(issue=OuterRef("id"))
             .order_by()
@@ -221,9 +220,8 @@ def dashboard_created_issues(self, request, slug):
         )
         .filter(**filters)
         .select_related("workspace", "project", "state", "parent")
-        .prefetch_related("assignees", "labels")
+        .prefetch_related("assignees", "labels", "issue_module__module")
         .annotate(cycle_id=F("issue_cycle__cycle_id"))
-        .annotate(module_id=F("issue_module__module_id"))
         .annotate(
             link_count=IssueLink.objects.filter(issue=OuterRef("id"))
             .order_by()

apiserver/plane/app/views/inbox.py

@@ -88,39 +88,23 @@ class InboxIssueViewSet(BaseViewSet):
     ]
 
     def get_queryset(self):
-        return self.filter_queryset(
-            super()
-            .get_queryset()
-            .filter(
-                Q(snoozed_till__gte=timezone.now())
-                | Q(snoozed_till__isnull=True),
-                workspace__slug=self.kwargs.get("slug"),
-                project_id=self.kwargs.get("project_id"),
-                inbox_id=self.kwargs.get("inbox_id"),
-            )
-            .select_related("issue", "workspace", "project")
-        )
-
-    def list(self, request, slug, project_id, inbox_id):
-        filters = issue_filters(request.query_params, "GET")
-        issues = (
+        return (
             Issue.objects.filter(
-                issue_inbox__inbox_id=inbox_id,
-                workspace__slug=slug,
-                project_id=project_id,
+                project_id=self.kwargs.get("project_id"),
+                workspace__slug=self.kwargs.get("slug"),
+                issue_inbox__inbox_id=self.kwargs.get("inbox_id")
             )
-            .filter(**filters)
             .select_related("workspace", "project", "state", "parent")
-            .prefetch_related("assignees", "labels")
-            .order_by("issue_inbox__snoozed_till", "issue_inbox__status")
-            .annotate(
-                sub_issues_count=Issue.issue_objects.filter(
-                    parent=OuterRef("id")
+            .prefetch_related("assignees", "labels", "issue_module__module")
+            .prefetch_related(
+                Prefetch(
+                    "issue_inbox",
+                    queryset=InboxIssue.objects.only(
+                        "status", "duplicate_to", "snoozed_till", "source"
+                    ),
                 )
-                .order_by()
-                .annotate(count=Func(F("id"), function="Count"))
-                .values("count")
             )
+            .annotate(cycle_id=F("issue_cycle__cycle_id"))
             .annotate(
                 link_count=IssueLink.objects.filter(issue=OuterRef("id"))
                 .order_by()
@@ -135,16 +119,20 @@ class InboxIssueViewSet(BaseViewSet):
                 .annotate(count=Func(F("id"), function="Count"))
                 .values("count")
             )
-            .prefetch_related(
-                Prefetch(
-                    "issue_inbox",
-                    queryset=InboxIssue.objects.only(
-                        "status", "duplicate_to", "snoozed_till", "source"
-                    ),
+            .annotate(
+                sub_issues_count=Issue.issue_objects.filter(
+                    parent=OuterRef("id")
                 )
+                .order_by()
+                .annotate(count=Func(F("id"), function="Count"))
+                .values("count")
             )
-        )
-        issues_data = IssueStateInboxSerializer(issues, many=True).data
+        ).distinct()
+
+    def list(self, request, slug, project_id, inbox_id):
+        filters = issue_filters(request.query_params, "GET")
+        issue_queryset = self.get_queryset().filter(**filters).order_by("issue_inbox__snoozed_till", "issue_inbox__status")
+        issues_data = IssueSerializer(issue_queryset, expand=self.expand, many=True).data
         return Response(
             issues_data,
             status=status.HTTP_200_OK,
@@ -200,6 +188,8 @@ class InboxIssueViewSet(BaseViewSet):
             project_id=str(project_id),
             current_instance=None,
             epoch=int(timezone.now().timestamp()),
+            notification=True,
+            origin=request.META.get("HTTP_ORIGIN"),
         )
         # create an inbox issue
         InboxIssue.objects.create(
@@ -209,7 +199,8 @@ class InboxIssueViewSet(BaseViewSet):
             source=request.data.get("source", "in-app"),
         )
 
-        serializer = IssueStateInboxSerializer(issue)
+        issue = (self.get_queryset().filter(pk=issue.id).first())
+        serializer = IssueSerializer(issue ,expand=self.expand)
         return Response(serializer.data, status=status.HTTP_200_OK)
 
     def partial_update(self, request, slug, project_id, inbox_id, issue_id):
@@ -277,6 +268,8 @@ class InboxIssueViewSet(BaseViewSet):
                             cls=DjangoJSONEncoder,
                         ),
                         epoch=int(timezone.now().timestamp()),
+                        notification=True,
+                        origin=request.META.get("HTTP_ORIGIN"),
                     )
                 issue_serializer.save()
             else:
@@ -327,22 +320,20 @@ class InboxIssueViewSet(BaseViewSet):
                         if state is not None:
                             issue.state = state
                             issue.save()
-
+                issue = (self.get_queryset().filter(pk=issue_id).first())
+                serializer = IssueSerializer(issue, expand=self.expand)
                 return Response(serializer.data, status=status.HTTP_200_OK)
             return Response(
                 serializer.errors, status=status.HTTP_400_BAD_REQUEST
             )
         else:
-            return Response(
-                InboxIssueSerializer(inbox_issue).data,
-                status=status.HTTP_200_OK,
-            )
+            issue = (self.get_queryset().filter(pk=issue_id).first())
+            serializer = IssueSerializer(issue ,expand=self.expand)
+            return Response(serializer.data, status=status.HTTP_200_OK)
 
     def retrieve(self, request, slug, project_id, inbox_id, issue_id):
-        issue = Issue.objects.get(
-            pk=issue_id, workspace__slug=slug, project_id=project_id
-        )
-        serializer = IssueStateInboxSerializer(issue)
+        issue = self.get_queryset().filter(pk=issue_id).first()
+        serializer = IssueSerializer(issue, expand=self.expand,)
         return Response(serializer.data, status=status.HTTP_200_OK)
 
     def destroy(self, request, slug, project_id, inbox_id, issue_id):

apiserver/plane/app/views/issue.py

@@ -48,10 +48,8 @@ from plane.app.serializers import (
     ProjectMemberLiteSerializer,
     IssueReactionSerializer,
     CommentReactionSerializer,
-    IssueVoteSerializer,
     IssueRelationSerializer,
     RelatedIssueSerializer,
-    IssuePublicSerializer,
 )
 from plane.app.permissions import (
     ProjectEntityPermission,
@@ -114,12 +112,8 @@ class IssueViewSet(WebhookMixin, BaseViewSet):
                 project_id=self.kwargs.get("project_id")
             )
             .filter(workspace__slug=self.kwargs.get("slug"))
-            .select_related("project")
-            .select_related("workspace")
-            .select_related("state")
-            .select_related("parent")
-            .prefetch_related("assignees")
-            .prefetch_related("labels")
+            .select_related("workspace", "project", "state", "parent")
+            .prefetch_related("assignees", "labels", "issue_module__module")
             .prefetch_related(
                 Prefetch(
                     "issue_reactions",
@@ -127,7 +121,6 @@ class IssueViewSet(WebhookMixin, BaseViewSet):
                 )
             )
             .annotate(cycle_id=F("issue_cycle__cycle_id"))
-            .annotate(module_id=F("issue_module__module_id"))
             .annotate(
                 link_count=IssueLink.objects.filter(issue=OuterRef("id"))
                 .order_by()
@@ -261,6 +254,8 @@ class IssueViewSet(WebhookMixin, BaseViewSet):
                 project_id=str(project_id),
                 current_instance=None,
                 epoch=int(timezone.now().timestamp()),
+                notification=True,
+                origin=request.META.get("HTTP_ORIGIN"),
             )
             issue = (
                 self.get_queryset().filter(pk=serializer.data["id"]).first()
@@ -299,6 +294,8 @@ class IssueViewSet(WebhookMixin, BaseViewSet):
                 project_id=str(project_id),
                 current_instance=current_instance,
                 epoch=int(timezone.now().timestamp()),
+                notification=True,
+                origin=request.META.get("HTTP_ORIGIN"),
             )
             issue = self.get_queryset().filter(pk=pk).first()
             return Response(
@@ -322,6 +319,8 @@ class IssueViewSet(WebhookMixin, BaseViewSet):
             project_id=str(project_id),
             current_instance=current_instance,
             epoch=int(timezone.now().timestamp()),
+            notification=True,
+            origin=request.META.get("HTTP_ORIGIN"),
         )
         return Response(status=status.HTTP_204_NO_CONTENT)
 
@@ -493,17 +492,27 @@ class IssueActivityEndpoint(BaseAPIView):
 
     @method_decorator(gzip_page)
     def get(self, request, slug, project_id, issue_id):
+        filters = {}
+        if request.GET.get("created_at__gt", None) is not None:
+            filters = {"created_at__gt": request.GET.get("created_at__gt")}
+
         issue_activities = (
             IssueActivity.objects.filter(issue_id=issue_id)
             .filter(
                 ~Q(field__in=["comment", "vote", "reaction", "draft"]),
                 project__project_projectmember__member=self.request.user,
+                workspace__slug=slug,
             )
+            .filter(**filters)
             .select_related("actor", "workspace", "issue", "project")
         ).order_by("created_at")
         issue_comments = (
             IssueComment.objects.filter(issue_id=issue_id)
-            .filter(project__project_projectmember__member=self.request.user)
+            .filter(
+                project__project_projectmember__member=self.request.user,
+                workspace__slug=slug,
+            )
+            .filter(**filters)
             .order_by("created_at")
             .select_related("actor", "issue", "project", "workspace")
             .prefetch_related(
@@ -518,6 +527,12 @@ class IssueActivityEndpoint(BaseAPIView):
         ).data
         issue_comments = IssueCommentSerializer(issue_comments, many=True).data
 
+        if request.GET.get("activity_type", None) == "issue-property":
+            return Response(issue_activities, status=status.HTTP_200_OK)
+
+        if request.GET.get("activity_type", None) == "issue-comment":
+            return Response(issue_comments, status=status.HTTP_200_OK)
+
         result_list = sorted(
             chain(issue_activities, issue_comments),
             key=lambda instance: instance["created_at"],
@@ -581,6 +596,8 @@ class IssueCommentViewSet(WebhookMixin, BaseViewSet):
                 project_id=str(self.kwargs.get("project_id")),
                 current_instance=None,
                 epoch=int(timezone.now().timestamp()),
+                notification=True,
+                origin=request.META.get("HTTP_ORIGIN"),
             )
             return Response(serializer.data, status=status.HTTP_201_CREATED)
         return Response(serializer.errors, status=status.HTTP_400_BAD_REQUEST)
@@ -610,6 +627,8 @@ class IssueCommentViewSet(WebhookMixin, BaseViewSet):
                 project_id=str(project_id),
                 current_instance=current_instance,
                 epoch=int(timezone.now().timestamp()),
+                notification=True,
+                origin=request.META.get("HTTP_ORIGIN"),
             )
             return Response(serializer.data, status=status.HTTP_200_OK)
         return Response(serializer.errors, status=status.HTTP_400_BAD_REQUEST)
@@ -634,6 +653,8 @@ class IssueCommentViewSet(WebhookMixin, BaseViewSet):
             project_id=str(project_id),
             current_instance=current_instance,
             epoch=int(timezone.now().timestamp()),
+            notification=True,
+            origin=request.META.get("HTTP_ORIGIN"),
         )
         return Response(status=status.HTTP_204_NO_CONTENT)
 
@@ -836,6 +857,8 @@ class SubIssuesEndpoint(BaseAPIView):
                 project_id=str(project_id),
                 current_instance=json.dumps({"parent": str(sub_issue_id)}),
                 epoch=int(timezone.now().timestamp()),
+                notification=True,
+                origin=request.META.get("HTTP_ORIGIN"),
             )
             for sub_issue_id in sub_issue_ids
         ]
@@ -895,6 +918,8 @@ class IssueLinkViewSet(BaseViewSet):
                 project_id=str(self.kwargs.get("project_id")),
                 current_instance=None,
                 epoch=int(timezone.now().timestamp()),
+                notification=True,
+                origin=request.META.get("HTTP_ORIGIN"),
             )
             return Response(serializer.data, status=status.HTTP_201_CREATED)
         return Response(serializer.errors, status=status.HTTP_400_BAD_REQUEST)
@@ -924,6 +949,8 @@ class IssueLinkViewSet(BaseViewSet):
                 project_id=str(project_id),
                 current_instance=current_instance,
                 epoch=int(timezone.now().timestamp()),
+                notification=True,
+                origin=request.META.get("HTTP_ORIGIN"),
             )
             return Response(serializer.data, status=status.HTTP_200_OK)
         return Response(serializer.errors, status=status.HTTP_400_BAD_REQUEST)
@@ -947,6 +974,8 @@ class IssueLinkViewSet(BaseViewSet):
             project_id=str(project_id),
             current_instance=current_instance,
             epoch=int(timezone.now().timestamp()),
+            notification=True,
+            origin=request.META.get("HTTP_ORIGIN"),
         )
         issue_link.delete()
         return Response(status=status.HTTP_204_NO_CONTENT)
@@ -1003,6 +1032,8 @@ class IssueAttachmentEndpoint(BaseAPIView):
                     cls=DjangoJSONEncoder,
                 ),
                 epoch=int(timezone.now().timestamp()),
+                notification=True,
+                origin=request.META.get("HTTP_ORIGIN"),
             )
             return Response(serializer.data, status=status.HTTP_201_CREATED)
         return Response(serializer.errors, status=status.HTTP_400_BAD_REQUEST)
@@ -1019,6 +1050,8 @@ class IssueAttachmentEndpoint(BaseAPIView):
             project_id=str(self.kwargs.get("project_id", None)),
             current_instance=None,
             epoch=int(timezone.now().timestamp()),
+            notification=True,
+            origin=request.META.get("HTTP_ORIGIN"),
         )
 
         return Response(status=status.HTTP_204_NO_CONTENT)
@@ -1049,12 +1082,31 @@ class IssueArchiveViewSet(BaseViewSet):
             .filter(archived_at__isnull=False)
             .filter(project_id=self.kwargs.get("project_id"))
             .filter(workspace__slug=self.kwargs.get("slug"))
-            .select_related("project")
-            .select_related("workspace")
-            .select_related("state")
-            .select_related("parent")
-            .prefetch_related("assignees")
-            .prefetch_related("labels")
+            .select_related("workspace", "project", "state", "parent")
+            .prefetch_related("assignees", "labels", "issue_module__module")
+            .annotate(cycle_id=F("issue_cycle__cycle_id"))            
+            .annotate(
+                link_count=IssueLink.objects.filter(issue=OuterRef("id"))
+                .order_by()
+                .annotate(count=Func(F("id"), function="Count"))
+                .values("count")
+            )
+            .annotate(
+                attachment_count=IssueAttachment.objects.filter(
+                    issue=OuterRef("id")
+                )
+                .order_by()
+                .annotate(count=Func(F("id"), function="Count"))
+                .values("count")
+            )
+            .annotate(
+                sub_issues_count=Issue.issue_objects.filter(
+                    parent=OuterRef("id")
+                )
+                .order_by()
+                .annotate(count=Func(F("id"), function="Count"))
+                .values("count")
+            )
         )
 
     @method_decorator(gzip_page)
@@ -1082,22 +1134,6 @@ class IssueArchiveViewSet(BaseViewSet):
         issue_queryset = (
             self.get_queryset()
             .filter(**filters)
-            .annotate(cycle_id=F("issue_cycle__cycle_id"))
-            .annotate(module_id=F("issue_module__module_id"))
-            .annotate(
-                link_count=IssueLink.objects.filter(issue=OuterRef("id"))
-                .order_by()
-                .annotate(count=Func(F("id"), function="Count"))
-                .values("count")
-            )
-            .annotate(
-                attachment_count=IssueAttachment.objects.filter(
-                    issue=OuterRef("id")
-                )
-                .order_by()
-                .annotate(count=Func(F("id"), function="Count"))
-                .values("count")
-            )
         )
 
         # Priority Ordering
@@ -1197,6 +1233,8 @@ class IssueArchiveViewSet(BaseViewSet):
                 IssueSerializer(issue).data, cls=DjangoJSONEncoder
             ),
             epoch=int(timezone.now().timestamp()),
+            notification=True,
+            origin=request.META.get("HTTP_ORIGIN"),
         )
         issue.archived_at = None
         issue.save()
@@ -1342,6 +1380,8 @@ class IssueReactionViewSet(BaseViewSet):
                 project_id=str(project_id),
                 current_instance=None,
                 epoch=int(timezone.now().timestamp()),
+                notification=True,
+                origin=request.META.get("HTTP_ORIGIN"),
             )
             return Response(serializer.data, status=status.HTTP_201_CREATED)
         return Response(serializer.errors, status=status.HTTP_400_BAD_REQUEST)
@@ -1367,6 +1407,8 @@ class IssueReactionViewSet(BaseViewSet):
                 }
             ),
             epoch=int(timezone.now().timestamp()),
+            notification=True,
+            origin=request.META.get("HTTP_ORIGIN"),
         )
         issue_reaction.delete()
         return Response(status=status.HTTP_204_NO_CONTENT)
@@ -1407,6 +1449,8 @@ class CommentReactionViewSet(BaseViewSet):
                 project_id=str(project_id),
                 current_instance=None,
                 epoch=int(timezone.now().timestamp()),
+                notification=True,
+                origin=request.META.get("HTTP_ORIGIN"),
             )
             return Response(serializer.data, status=status.HTTP_201_CREATED)
         return Response(serializer.errors, status=status.HTTP_400_BAD_REQUEST)
@@ -1433,6 +1477,8 @@ class CommentReactionViewSet(BaseViewSet):
                 }
             ),
             epoch=int(timezone.now().timestamp()),
+            notification=True,
+            origin=request.META.get("HTTP_ORIGIN"),
         )
         comment_reaction.delete()
         return Response(status=status.HTTP_204_NO_CONTENT)
@@ -1561,6 +1607,8 @@ class IssueRelationViewSet(BaseViewSet):
             project_id=str(project_id),
             current_instance=None,
             epoch=int(timezone.now().timestamp()),
+            notification=True,
+            origin=request.META.get("HTTP_ORIGIN"),
         )
 
         if relation_type == "blocking":
@@ -1605,6 +1653,8 @@ class IssueRelationViewSet(BaseViewSet):
             project_id=str(project_id),
             current_instance=current_instance,
             epoch=int(timezone.now().timestamp()),
+            notification=True,
+            origin=request.META.get("HTTP_ORIGIN"),
         )
         return Response(status=status.HTTP_204_NO_CONTENT)
 
@@ -1629,18 +1679,37 @@ class IssueDraftViewSet(BaseViewSet):
             .filter(project_id=self.kwargs.get("project_id"))
             .filter(workspace__slug=self.kwargs.get("slug"))
             .filter(is_draft=True)
-            .select_related("project")
-            .select_related("workspace")
-            .select_related("state")
-            .select_related("parent")
-            .prefetch_related("assignees")
-            .prefetch_related("labels")
+            .select_related("workspace", "project", "state", "parent")
+            .prefetch_related("assignees", "labels", "issue_module__module")
             .prefetch_related(
                 Prefetch(
                     "issue_reactions",
                     queryset=IssueReaction.objects.select_related("actor"),
                 )
             )
+            .annotate(cycle_id=F("issue_cycle__cycle_id"))
+            .annotate(
+                link_count=IssueLink.objects.filter(issue=OuterRef("id"))
+                .order_by()
+                .annotate(count=Func(F("id"), function="Count"))
+                .values("count")
+            )
+            .annotate(
+                attachment_count=IssueAttachment.objects.filter(
+                    issue=OuterRef("id")
+                )
+                .order_by()
+                .annotate(count=Func(F("id"), function="Count"))
+                .values("count")
+            )
+            .annotate(
+                sub_issues_count=Issue.issue_objects.filter(
+                    parent=OuterRef("id")
+                )
+                .order_by()
+                .annotate(count=Func(F("id"), function="Count"))
+                .values("count")
+            )
         )
 
     @method_decorator(gzip_page)
@@ -1667,22 +1736,6 @@ class IssueDraftViewSet(BaseViewSet):
         issue_queryset = (
             self.get_queryset()
             .filter(**filters)
-            .annotate(cycle_id=F("issue_cycle__cycle_id"))
-            .annotate(module_id=F("issue_module__module_id"))
-            .annotate(
-                link_count=IssueLink.objects.filter(issue=OuterRef("id"))
-                .order_by()
-                .annotate(count=Func(F("id"), function="Count"))
-                .values("count")
-            )
-            .annotate(
-                attachment_count=IssueAttachment.objects.filter(
-                    issue=OuterRef("id")
-                )
-                .order_by()
-                .annotate(count=Func(F("id"), function="Count"))
-                .values("count")
-            )
         )
 
         # Priority Ordering
@@ -1776,6 +1829,8 @@ class IssueDraftViewSet(BaseViewSet):
                 project_id=str(project_id),
                 current_instance=None,
                 epoch=int(timezone.now().timestamp()),
+                notification=True,
+                origin=request.META.get("HTTP_ORIGIN"),
             )
             return Response(serializer.data, status=status.HTTP_201_CREATED)
         return Response(serializer.errors, status=status.HTTP_400_BAD_REQUEST)
@@ -1806,6 +1861,8 @@ class IssueDraftViewSet(BaseViewSet):
                     cls=DjangoJSONEncoder,
                 ),
                 epoch=int(timezone.now().timestamp()),
+                notification=True,
+                origin=request.META.get("HTTP_ORIGIN"),
             )
             return Response(serializer.data, status=status.HTTP_200_OK)
         return Response(serializer.errors, status=status.HTTP_400_BAD_REQUEST)
@@ -1832,5 +1889,7 @@ class IssueDraftViewSet(BaseViewSet):
             project_id=str(project_id),
             current_instance=current_instance,
             epoch=int(timezone.now().timestamp()),
+            notification=True,
+            origin=request.META.get("HTTP_ORIGIN"),
         )
         return Response(status=status.HTTP_204_NO_CONTENT)

apiserver/plane/app/views/module.py

@@ -7,6 +7,8 @@ from django.db.models import Prefetch, F, OuterRef, Func, Exists, Count, Q
 from django.core import serializers
 from django.utils.decorators import method_decorator
 from django.views.decorators.gzip import gzip_page
+from django.core.serializers.json import DjangoJSONEncoder
+
 
 # Third party imports
 from rest_framework.response import Response
@@ -296,21 +298,20 @@ class ModuleViewSet(WebhookMixin, BaseViewSet):
                 "issue", flat=True
             )
         )
-        issue_activity.delay(
-            type="module.activity.deleted",
-            requested_data=json.dumps(
-                {
-                    "module_id": str(pk),
-                    "module_name": str(module.name),
-                    "issues": [str(issue_id) for issue_id in module_issues],
-                }
-            ),
-            actor_id=str(request.user.id),
-            issue_id=str(pk),
-            project_id=str(project_id),
-            current_instance=None,
-            epoch=int(timezone.now().timestamp()),
-        )
+        _ = [
+            issue_activity.delay(
+                type="module.activity.deleted",
+                requested_data=json.dumps({"module_id": str(pk)}),
+                actor_id=str(request.user.id),
+                issue_id=str(issue),
+                project_id=project_id,
+                current_instance=json.dumps({"module_name": str(module.name)}),
+                epoch=int(timezone.now().timestamp()),
+                notification=True,
+                origin=request.META.get("HTTP_ORIGIN"),
+            )
+            for issue in module_issues
+        ]
         module.delete()
         return Response(status=status.HTTP_204_NO_CONTENT)
 
@@ -330,62 +331,18 @@ class ModuleIssueViewSet(WebhookMixin, BaseViewSet):
         ProjectEntityPermission,
     ]
 
-    def get_queryset(self):
-        return self.filter_queryset(
-            super()
-            .get_queryset()
-            .annotate(
-                sub_issues_count=Issue.issue_objects.filter(
-                    parent=OuterRef("issue")
-                )
-                .order_by()
-                .annotate(count=Func(F("id"), function="Count"))
-                .values("count")
-            )
-            .filter(workspace__slug=self.kwargs.get("slug"))
-            .filter(project_id=self.kwargs.get("project_id"))
-            .filter(module_id=self.kwargs.get("module_id"))
-            .filter(project__project_projectmember__member=self.request.user)
-            .select_related("project")
-            .select_related("workspace")
-            .select_related("module")
-            .select_related("issue", "issue__state", "issue__project")
-            .prefetch_related("issue__assignees", "issue__labels")
-            .prefetch_related("module__members")
-            .distinct()
-        )
 
-    @method_decorator(gzip_page)
-    def list(self, request, slug, project_id, module_id):
-        fields = [
-            field
-            for field in request.GET.get("fields", "").split(",")
-            if field
-        ]
-        order_by = request.GET.get("order_by", "created_at")
-        filters = issue_filters(request.query_params, "GET")
-        issues = (
-            Issue.issue_objects.filter(issue_module__module_id=module_id)
-            .annotate(
-                sub_issues_count=Issue.issue_objects.filter(
-                    parent=OuterRef("id")
-                )
-                .order_by()
-                .annotate(count=Func(F("id"), function="Count"))
-                .values("count")
+    def get_queryset(self):
+        return (
+            Issue.objects.filter(
+                project_id=self.kwargs.get("project_id"),
+                workspace__slug=self.kwargs.get("slug"),
+                issue_module__module_id=self.kwargs.get("module_id")
             )
-            .filter(project_id=project_id)
-            .filter(workspace__slug=slug)
-            .select_related("project")
-            .select_related("workspace")
-            .select_related("state")
-            .select_related("parent")
-            .prefetch_related("assignees")
-            .prefetch_related("labels")
-            .order_by(order_by)
-            .filter(**filters)
+            .select_related("workspace", "project", "state", "parent")
+            .prefetch_related("labels", "assignees")
+            .prefetch_related('issue_module__module')
             .annotate(cycle_id=F("issue_cycle__cycle_id"))
-            .annotate(module_id=F("issue_module__module_id"))
             .annotate(
                 link_count=IssueLink.objects.filter(issue=OuterRef("id"))
                 .order_by()
@@ -401,103 +358,118 @@ class ModuleIssueViewSet(WebhookMixin, BaseViewSet):
                 .values("count")
             )
             .annotate(
-                is_subscribed=Exists(
-                    IssueSubscriber.objects.filter(
-                        subscriber=self.request.user, issue_id=OuterRef("id")
-                    )
+                sub_issues_count=Issue.issue_objects.filter(
+                    parent=OuterRef("id")
                 )
+                .order_by()
+                .annotate(count=Func(F("id"), function="Count"))
+                .values("count")
             )
-        )
+        ).distinct()
+
+    @method_decorator(gzip_page)
+    def list(self, request, slug, project_id, module_id):
+        fields = [
+            field
+            for field in request.GET.get("fields", "").split(",")
+            if field
+        ]
+        filters = issue_filters(request.query_params, "GET")
+        issue_queryset = self.get_queryset().filter(**filters)
         serializer = IssueSerializer(
-            issues, many=True, fields=fields if fields else None
+            issue_queryset, many=True, fields=fields if fields else None
         )
         return Response(serializer.data, status=status.HTTP_200_OK)
 
-    def create(self, request, slug, project_id, module_id):
+    # create multiple issues inside a module
+    def create_module_issues(self, request, slug, project_id, module_id):
         issues = request.data.get("issues", [])
         if not len(issues):
             return Response(
                 {"error": "Issues are required"},
                 status=status.HTTP_400_BAD_REQUEST,
             )
-        module = Module.objects.get(
-            workspace__slug=slug, project_id=project_id, pk=module_id
-        )
-
-        module_issues = list(ModuleIssue.objects.filter(issue_id__in=issues))
-
-        update_module_issue_activity = []
-        records_to_update = []
-        record_to_create = []
-
-        for issue in issues:
-            module_issue = [
-                module_issue
-                for module_issue in module_issues
-                if str(module_issue.issue_id) in issues
-            ]
-
-            if len(module_issue):
-                if module_issue[0].module_id != module_id:
-                    update_module_issue_activity.append(
-                        {
-                            "old_module_id": str(module_issue[0].module_id),
-                            "new_module_id": str(module_id),
-                            "issue_id": str(module_issue[0].issue_id),
-                        }
-                    )
-                    module_issue[0].module_id = module_id
-                    records_to_update.append(module_issue[0])
-            else:
-                record_to_create.append(
-                    ModuleIssue(
-                        module=module,
-                        issue_id=issue,
-                        project_id=project_id,
-                        workspace=module.workspace,
-                        created_by=request.user,
-                        updated_by=request.user,
-                    )
+        project = Project.objects.get(pk=project_id)
+        _ = ModuleIssue.objects.bulk_create(
+            [
+                ModuleIssue(
+                    issue_id=str(issue),
+                    module_id=module_id,
+                    project_id=project_id,
+                    workspace_id=project.workspace_id,
+                    created_by=request.user,
+                    updated_by=request.user,
                 )
-
-        ModuleIssue.objects.bulk_create(
-            record_to_create,
+                for issue in issues
+            ],
             batch_size=10,
             ignore_conflicts=True,
         )
+        # Bulk Update the activity
+        _ = [
+            issue_activity.delay(
+                type="module.activity.created",
+                requested_data=json.dumps({"module_id": str(module_id)}),
+                actor_id=str(request.user.id),
+                issue_id=str(issue),
+                project_id=project_id,
+                current_instance=None,
+                epoch=int(timezone.now().timestamp()),
+                notification=True,
+                origin=request.META.get("HTTP_ORIGIN"),
+            )
+            for issue in issues
+        ]
+        issues = (self.get_queryset().filter(pk__in=issues))
+        serializer = IssueSerializer(issues , many=True)
+        return Response(serializer.data, status=status.HTTP_201_CREATED)
+    
 
-        ModuleIssue.objects.bulk_update(
-            records_to_update,
-            ["module"],
+    # create multiple module inside an issue
+    def create_issue_modules(self, request, slug, project_id, issue_id):
+        modules = request.data.get("modules", [])
+        if not len(modules):
+            return Response(
+                {"error": "Modules are required"},
+                status=status.HTTP_400_BAD_REQUEST,
+            )
+
+        project = Project.objects.get(pk=project_id)
+        _ = ModuleIssue.objects.bulk_create(
+            [
+                ModuleIssue(
+                    issue_id=issue_id,
+                    module_id=module,
+                    project_id=project_id,
+                    workspace_id=project.workspace_id,
+                    created_by=request.user,
+                    updated_by=request.user,
+                )
+                for module in modules
+            ],
             batch_size=10,
+            ignore_conflicts=True,
         )
+        # Bulk Update the activity
+        _ = [
+            issue_activity.delay(
+                type="module.activity.created",
+                requested_data=json.dumps({"module_id": module}),
+                actor_id=str(request.user.id),
+                issue_id=issue_id,
+                project_id=project_id,
+                current_instance=None,
+                epoch=int(timezone.now().timestamp()),
+                notification=True,
+                origin=request.META.get("HTTP_ORIGIN"),
+            )
+            for module in modules
+        ]
 
-        # Capture Issue Activity
-        issue_activity.delay(
-            type="module.activity.created",
-            requested_data=json.dumps({"modules_list": issues}),
-            actor_id=str(self.request.user.id),
-            issue_id=None,
-            project_id=str(self.kwargs.get("project_id", None)),
-            current_instance=json.dumps(
-                {
-                    "updated_module_issues": update_module_issue_activity,
-                    "created_module_issues": serializers.serialize(
-                        "json", record_to_create
-                    ),
-                }
-            ),
-            epoch=int(timezone.now().timestamp()),
-        )
+        issue = (self.get_queryset().filter(pk=issue_id).first())
+        serializer = IssueSerializer(issue)
+        return Response(serializer.data, status=status.HTTP_201_CREATED)
 
-        issues = self.get_queryset().values_list("issue_id", flat=True)
-
-        return Response(
-            IssueSerializer(
-                Issue.objects.filter(pk__in=issues), many=True
-            ).data,
-            status=status.HTTP_200_OK,
-        )
 
     def destroy(self, request, slug, project_id, module_id, issue_id):
         module_issue = ModuleIssue.objects.get(
@@ -508,17 +480,14 @@ class ModuleIssueViewSet(WebhookMixin, BaseViewSet):
         )
         issue_activity.delay(
             type="module.activity.deleted",
-            requested_data=json.dumps(
-                {
-                    "module_id": str(module_id),
-                    "issues": [str(issue_id)],
-                }
-            ),
+            requested_data=json.dumps({"module_id": str(module_id)}),
             actor_id=str(request.user.id),
             issue_id=str(issue_id),
             project_id=str(project_id),
-            current_instance=None,
+            current_instance=json.dumps({"module_name": module_issue.module.name}),
             epoch=int(timezone.now().timestamp()),
+            notification=True,
+            origin=request.META.get("HTTP_ORIGIN"),
         )
         module_issue.delete()
         return Response(status=status.HTTP_204_NO_CONTENT)

apiserver/plane/app/views/notification.py

@@ -1,5 +1,5 @@
 # Django imports
-from django.db.models import Q
+from django.db.models import Q, OuterRef, Exists
 from django.utils import timezone
 
 # Third party imports
@@ -15,8 +15,9 @@ from plane.db.models import (
     IssueSubscriber,
     Issue,
     WorkspaceMember,
+    UserNotificationPreference,
 )
-from plane.app.serializers import NotificationSerializer
+from plane.app.serializers import NotificationSerializer, UserNotificationPreferenceSerializer
 
 
 class NotificationViewSet(BaseViewSet, BasePaginator):
@@ -71,11 +72,29 @@ class NotificationViewSet(BaseViewSet, BasePaginator):
 
         # Subscribed issues
         if type == "watching":
-            issue_ids = IssueSubscriber.objects.filter(
-                workspace__slug=slug, subscriber_id=request.user.id
-            ).values_list("issue_id", flat=True)
+            issue_ids = (
+                IssueSubscriber.objects.filter(
+                    workspace__slug=slug, subscriber_id=request.user.id
+                )
+                .annotate(
+                    created=Exists(
+                        Issue.objects.filter(
+                            created_by=request.user, pk=OuterRef("issue_id")
+                        )
+                    )
+                )
+                .annotate(
+                    assigned=Exists(
+                        IssueAssignee.objects.filter(
+                            pk=OuterRef("issue_id"), assignee=request.user
+                        )
+                    )
+                )
+                .filter(created=False, assigned=False)
+                .values_list("issue_id", flat=True)
+            )
             notifications = notifications.filter(
-                entity_identifier__in=issue_ids
+                entity_identifier__in=issue_ids,
             )
 
         # Assigned Issues
@@ -295,3 +314,31 @@ class MarkAllReadNotificationViewSet(BaseViewSet):
             updated_notifications, ["read_at"], batch_size=100
         )
         return Response({"message": "Successful"}, status=status.HTTP_200_OK)
+
+
+class UserNotificationPreferenceEndpoint(BaseAPIView):
+    model = UserNotificationPreference
+    serializer_class = UserNotificationPreferenceSerializer
+
+    # request the object
+    def get(self, request):
+        user_notification_preference = UserNotificationPreference.objects.get(
+            user=request.user
+        )
+        serializer = UserNotificationPreferenceSerializer(
+            user_notification_preference
+        )
+        return Response(serializer.data, status=status.HTTP_200_OK)
+
+    # update the object
+    def patch(self, request):
+        user_notification_preference = UserNotificationPreference.objects.get(
+            user=request.user
+        )
+        serializer = UserNotificationPreferenceSerializer(
+            user_notification_preference, data=request.data, partial=True
+        )
+        if serializer.is_valid():
+            serializer.save()
+            return Response(serializer.data, status=status.HTTP_200_OK)
+        return Response(serializer.errors, status=status.HTTP_400_BAD_REQUEST)

apiserver/plane/app/views/page.py

@@ -158,18 +158,18 @@ class PageViewSet(BaseViewSet):
             pk=page_id, workspace__slug=slug, project_id=project_id
         )
 
-        # only the owner and admin can archive the page
+        # only the owner or admin can archive the page
         if (
             ProjectMember.objects.filter(
                 project_id=project_id,
                 member=request.user,
                 is_active=True,
-                role__gte=20,
+                role__lte=15,
             ).exists()
-            or request.user.id != page.owned_by_id
+            and request.user.id != page.owned_by_id
         ):
             return Response(
-                {"error": "Only the owner and admin can archive the page"},
+                {"error": "Only the owner or admin can archive the page"},
                 status=status.HTTP_400_BAD_REQUEST,
             )
 
@@ -182,18 +182,18 @@ class PageViewSet(BaseViewSet):
             pk=page_id, workspace__slug=slug, project_id=project_id
         )
 
-        # only the owner and admin can un archive the page
+        # only the owner or admin can un archive the page
         if (
             ProjectMember.objects.filter(
                 project_id=project_id,
                 member=request.user,
                 is_active=True,
-                role__gt=20,
+                role__lte=15,
             ).exists()
-            or request.user.id != page.owned_by_id
+            and request.user.id != page.owned_by_id
         ):
             return Response(
-                {"error": "Only the owner and admin can un archive the page"},
+                {"error": "Only the owner or admin can un archive the page"},
                 status=status.HTTP_400_BAD_REQUEST,
             )
 

apiserver/plane/app/views/project.py

@@ -68,7 +68,7 @@ from plane.bgtasks.project_invitation_task import project_invitation
 
 
 class ProjectViewSet(WebhookMixin, BaseViewSet):
-    serializer_class = ProjectSerializer
+    serializer_class = ProjectListSerializer
     model = Project
     webhook_event = "project"
 
@@ -76,11 +76,6 @@ class ProjectViewSet(WebhookMixin, BaseViewSet):
         ProjectBasePermission,
     ]
 
-    def get_serializer_class(self, *args, **kwargs):
-        if self.action in ["update", "partial_update"]:
-            return ProjectSerializer
-        return ProjectDetailSerializer
-
     def get_queryset(self):
         return self.filter_queryset(
             super()
@@ -690,6 +685,19 @@ class ProjectMemberViewSet(BaseViewSet):
             .order_by("sort_order")
         )
 
+        bulk_project_members = []
+        member_roles = {member.get("member_id"): member.get("role") for member in members}
+        # Update roles in the members array based on the member_roles dictionary
+        for project_member in  ProjectMember.objects.filter(project_id=project_id, member_id__in=[member.get("member_id") for member in members]):
+            project_member.role = member_roles[str(project_member.member_id)]
+            project_member.is_active = True
+            bulk_project_members.append(project_member)
+
+        # Update the roles of the existing members
+        ProjectMember.objects.bulk_update(
+            bulk_project_members, ["is_active", "role"], batch_size=100
+        )
+
         for member in members:
             sort_order = [
                 project_member.get("sort_order")
@@ -716,25 +724,6 @@ class ProjectMemberViewSet(BaseViewSet):
                 )
             )
 
-            # Check if the user is already a member of the project and is inactive
-            if ProjectMember.objects.filter(
-                workspace__slug=slug,
-                project_id=project_id,
-                member_id=member.get("member_id"),
-                is_active=False,
-            ).exists():
-                member_detail = ProjectMember.objects.get(
-                    workspace__slug=slug,
-                    project_id=project_id,
-                    member_id=member.get("member_id"),
-                    is_active=False,
-                )
-                # Check if the user has not deactivated the account
-                user = User.objects.filter(pk=member.get("member_id")).first()
-                if user.is_active:
-                    member_detail.is_active = True
-                    member_detail.save(update_fields=["is_active"])
-
         project_members = ProjectMember.objects.bulk_create(
             bulk_project_members,
             batch_size=10,
@@ -745,8 +734,8 @@ class ProjectMemberViewSet(BaseViewSet):
             bulk_issue_props, batch_size=10, ignore_conflicts=True
         )
 
-        serializer = ProjectMemberSerializer(project_members, many=True)
-
+        project_members = ProjectMember.objects.filter(project_id=project_id, member_id__in=[member.get("member_id") for member in members])
+        serializer = ProjectMemberRoleSerializer(project_members, many=True)
         return Response(serializer.data, status=status.HTTP_201_CREATED)
 
     def list(self, request, slug, project_id):

apiserver/plane/app/views/search.py

@@ -228,7 +228,7 @@ class IssueSearchEndpoint(BaseAPIView):
         parent = request.query_params.get("parent", "false")
         issue_relation = request.query_params.get("issue_relation", "false")
         cycle = request.query_params.get("cycle", "false")
-        module = request.query_params.get("module", "false")
+        module = request.query_params.get("module", False)
         sub_issue = request.query_params.get("sub_issue", "false")
 
         issue_id = request.query_params.get("issue_id", False)
@@ -269,8 +269,8 @@ class IssueSearchEndpoint(BaseAPIView):
         if cycle == "true":
             issues = issues.exclude(issue_cycle__isnull=False)
 
-        if module == "true":
-            issues = issues.exclude(issue_module__isnull=False)
+        if module:
+            issues = issues.exclude(issue_module__module=module)
 
         return Response(
             issues.values(

apiserver/plane/app/views/view.py

@@ -87,12 +87,8 @@ class GlobalViewIssuesViewSet(BaseViewSet):
                 .values("count")
             )
             .filter(workspace__slug=self.kwargs.get("slug"))
-            .select_related("project")
-            .select_related("workspace")
-            .select_related("state")
-            .select_related("parent")
-            .prefetch_related("assignees")
-            .prefetch_related("labels")
+            .select_related("workspace", "project", "state", "parent")
+            .prefetch_related("assignees", "labels", "issue_module__module")
             .prefetch_related(
                 Prefetch(
                     "issue_reactions",
@@ -127,7 +123,6 @@ class GlobalViewIssuesViewSet(BaseViewSet):
             .filter(**filters)
             .filter(project__project_projectmember__member=self.request.user)
             .annotate(cycle_id=F("issue_cycle__cycle_id"))
-            .annotate(module_id=F("issue_module__module_id"))
             .annotate(
                 link_count=IssueLink.objects.filter(issue=OuterRef("id"))
                 .order_by()
@@ -150,13 +145,6 @@ class GlobalViewIssuesViewSet(BaseViewSet):
                 .annotate(count=Func(F("id"), function="Count"))
                 .values("count")
             )
-            .annotate(
-                is_subscribed=Exists(
-                    IssueSubscriber.objects.filter(
-                        subscriber=self.request.user, issue_id=OuterRef("id")
-                    )
-                )
-            )
         )
 
         # Priority Ordering

apiserver/plane/app/views/workspace.py

@@ -1346,9 +1346,8 @@ class WorkspaceUserProfileIssuesEndpoint(BaseAPIView):
             )
             .filter(**filters)
             .select_related("workspace", "project", "state", "parent")
-            .prefetch_related("assignees", "labels")
+            .prefetch_related("assignees", "labels", "issue_module__module")
             .annotate(cycle_id=F("issue_cycle__cycle_id"))
-            .annotate(module_id=F("issue_module__module_id"))
             .annotate(
                 link_count=IssueLink.objects.filter(issue=OuterRef("id"))
                 .order_by()

apiserver/plane/bgtasks/email_notification_task.py

@@ -0,0 +1,242 @@
+import json
+from datetime import datetime
+
+# Third party imports
+from celery import shared_task
+
+# Django imports
+from django.utils import timezone
+from django.core.mail import EmailMultiAlternatives, get_connection
+from django.template.loader import render_to_string
+from django.utils.html import strip_tags
+from django.conf import settings
+
+# Module imports
+from plane.db.models import EmailNotificationLog, User, Issue
+from plane.license.utils.instance_value import get_email_configuration
+from plane.settings.redis import redis_instance
+
+@shared_task
+def stack_email_notification():
+    # get all email notifications
+    email_notifications = (
+        EmailNotificationLog.objects.filter(processed_at__isnull=True)
+        .order_by("receiver")
+        .values()
+    )
+
+    # Create the below format for each of the issues
+    # {"issue_id" : { "actor_id1": [ { data }, { data } ], "actor_id2": [ { data }, { data } ] }}
+
+    # Convert to unique receivers list
+    receivers = list(
+        set(
+            [
+                str(notification.get("receiver_id"))
+                for notification in email_notifications
+            ]
+        )
+    )
+    processed_notifications = []
+    # Loop through all the issues to create the emails
+    for receiver_id in receivers:
+        # Notifcation triggered for the receiver
+        receiver_notifications = [
+            notification
+            for notification in email_notifications
+            if str(notification.get("receiver_id")) == receiver_id
+        ]
+        # create payload for all issues
+        payload = {}
+        email_notification_ids = []
+        for receiver_notification in receiver_notifications:
+            payload.setdefault(
+                receiver_notification.get("entity_identifier"), {}
+            ).setdefault(
+                str(receiver_notification.get("triggered_by_id")), []
+            ).append(
+                receiver_notification.get("data")
+            )
+            # append processed notifications
+            processed_notifications.append(receiver_notification.get("id"))
+            email_notification_ids.append(receiver_notification.get("id"))
+
+        # Create emails for all the issues
+        for issue_id, notification_data in payload.items():
+            send_email_notification.delay(
+                issue_id=issue_id,
+                notification_data=notification_data,
+                receiver_id=receiver_id,
+                email_notification_ids=email_notification_ids,
+            )
+
+    # Update the email notification log
+    EmailNotificationLog.objects.filter(pk__in=processed_notifications).update(
+        processed_at=timezone.now()
+    )
+
+
+def create_payload(notification_data):
+    # return format {"actor_id":  { "key": { "old_value": [], "new_value": [] } }}
+    data = {}
+    for actor_id, changes in notification_data.items():
+        for change in changes:
+            issue_activity = change.get("issue_activity")
+            if issue_activity:  # Ensure issue_activity is not None
+                field = issue_activity.get("field")
+                old_value = str(issue_activity.get("old_value"))
+                new_value = str(issue_activity.get("new_value"))
+
+                # Append old_value if it's not empty and not already in the list
+                if old_value:
+                    data.setdefault(actor_id, {}).setdefault(
+                        field, {}
+                    ).setdefault("old_value", []).append(
+                        old_value
+                    ) if old_value not in data.setdefault(
+                        actor_id, {}
+                    ).setdefault(
+                        field, {}
+                    ).get(
+                        "old_value", []
+                    ) else None
+
+                # Append new_value if it's not empty and not already in the list
+                if new_value:
+                    data.setdefault(actor_id, {}).setdefault(
+                        field, {}
+                    ).setdefault("new_value", []).append(
+                        new_value
+                    ) if new_value not in data.setdefault(
+                        actor_id, {}
+                    ).setdefault(
+                        field, {}
+                    ).get(
+                        "new_value", []
+                    ) else None
+
+                if not data.get("actor_id", {}).get("activity_time", False):
+                    data[actor_id]["activity_time"] = str(
+                        datetime.fromisoformat(
+                            issue_activity.get("activity_time").rstrip("Z")
+                        ).strftime("%Y-%m-%d %H:%M:%S")
+                    )
+
+    return data
+
+
+@shared_task
+def send_email_notification(
+    issue_id, notification_data, receiver_id, email_notification_ids
+):
+    ri = redis_instance()
+    base_api = (ri.get(str(issue_id)).decode())
+    data = create_payload(notification_data=notification_data)
+
+    # Get email configurations
+    (
+        EMAIL_HOST,
+        EMAIL_HOST_USER,
+        EMAIL_HOST_PASSWORD,
+        EMAIL_PORT,
+        EMAIL_USE_TLS,
+        EMAIL_FROM,
+    ) = get_email_configuration()
+
+    receiver = User.objects.get(pk=receiver_id)
+    issue = Issue.objects.get(pk=issue_id)
+    template_data = []
+    total_changes = 0
+    comments = []
+    actors_involved = []
+    for actor_id, changes in data.items():
+        actor = User.objects.get(pk=actor_id)
+        total_changes = total_changes + len(changes)
+        comment = changes.pop("comment", False)
+        actors_involved.append(actor_id)
+        if comment:
+            comments.append(
+                {
+                    "actor_comments": comment,
+                    "actor_detail": {
+                        "avatar_url": actor.avatar,
+                        "first_name": actor.first_name,
+                        "last_name": actor.last_name,
+                    },
+                }
+            )
+        activity_time = changes.pop("activity_time")
+        # Parse the input string into a datetime object
+        formatted_time = datetime.strptime(activity_time, "%Y-%m-%d %H:%M:%S").strftime("%H:%M %p")
+
+        if changes:
+            template_data.append(
+                {
+                    "actor_detail": {
+                        "avatar_url": actor.avatar,
+                        "first_name": actor.first_name,
+                        "last_name": actor.last_name,
+                    },
+                    "changes": changes,
+                    "issue_details": {
+                        "name": issue.name,
+                        "identifier": f"{issue.project.identifier}-{issue.sequence_id}",
+                    },
+                    "activity_time": str(formatted_time),
+                }
+        )
+
+    summary = "Updates were made to the issue by"
+
+    # Send the mail
+    subject = f"{issue.project.identifier}-{issue.sequence_id} {issue.name}"
+    context = {
+        "data": template_data,
+        "summary": summary,
+        "actors_involved": len(set(actors_involved)),
+        "issue": {
+            "issue_identifier": f"{str(issue.project.identifier)}-{str(issue.sequence_id)}",
+            "name": issue.name,
+            "issue_url": f"{base_api}/{str(issue.project.workspace.slug)}/projects/{str(issue.project.id)}/issues/{str(issue.id)}",
+        },
+        "receiver": {
+            "email": receiver.email,
+        },
+        "issue_url": f"{base_api}/{str(issue.project.workspace.slug)}/projects/{str(issue.project.id)}/issues/{str(issue.id)}",
+        "project_url": f"{base_api}/{str(issue.project.workspace.slug)}/projects/{str(issue.project.id)}/issues/",
+        "workspace":str(issue.project.workspace.slug),
+        "project": str(issue.project.name),
+        "user_preference": f"{base_api}/profile/preferences/email",
+        "comments": comments,
+    }
+    html_content = render_to_string(
+        "emails/notifications/issue-updates.html", context
+    )
+    text_content = strip_tags(html_content)
+
+    try:
+        connection = get_connection(
+            host=EMAIL_HOST,
+            port=int(EMAIL_PORT),
+            username=EMAIL_HOST_USER,
+            password=EMAIL_HOST_PASSWORD,
+            use_tls=EMAIL_USE_TLS == "1",
+        )
+
+        msg = EmailMultiAlternatives(
+            subject=subject,
+            body=text_content,
+            from_email=EMAIL_FROM,
+            to=[receiver.email],
+            connection=connection,
+        )
+        msg.attach_alternative(html_content, "text/html")
+        msg.send()
+
+        EmailNotificationLog.objects.filter(
+            pk__in=email_notification_ids
+        ).update(sent_at=timezone.now())
+        return
+    except Exception as e:
+        print(e)
+        return

apiserver/plane/bgtasks/export_task.py

@@ -97,7 +97,7 @@ def upload_to_s3(zip_file, workspace_id, token_id, slug):
         )
         # Create the new url with updated domain and protocol
         presigned_url = presigned_url.replace(
-            "http://plane-minio:9000/uploads/",
+            f"{settings.AWS_S3_ENDPOINT_URL}/{settings.AWS_STORAGE_BUCKET_NAME}/",
             f"{settings.AWS_S3_URL_PROTOCOL}//{settings.AWS_S3_CUSTOM_DOMAIN}/",
         )
     else:

apiserver/plane/bgtasks/forgot_password_task.py

@@ -21,7 +21,7 @@ from plane.license.utils.instance_value import get_email_configuration
 def forgot_password(first_name, email, uidb64, token, current_site):
     try:
         relative_link = (
-            f"/accounts/password/?uidb64={uidb64}&token={token}&email={email}"
+            f"/accounts/reset-password/?uidb64={uidb64}&token={token}&email={email}"
         )
         abs_url = str(current_site) + relative_link
 

apiserver/plane/bgtasks/importer_task.py

@@ -24,6 +24,7 @@ from plane.db.models import (
     Label,
     User,
     IssueProperty,
+    UserNotificationPreference,
 )
 
 
@@ -50,10 +51,24 @@ def service_importer(service, importer_id):
                     for user in users
                     if user.get("import", False) == "invite"
                 ],
-                batch_size=10,
+                batch_size=100,
                 ignore_conflicts=True,
             )
 
+            _ = UserNotificationPreference.objects.bulk_create(
+                [UserNotificationPreference(user=user) for user in new_users],
+                batch_size=100,
+            )
+
+            _ = [
+                send_welcome_slack.delay(
+                    str(user.id),
+                    True,
+                    f"{user.email} was imported to Plane from {service}",
+                )
+                for user in new_users
+            ]
+
             workspace_users = User.objects.filter(
                 email__in=[
                     user.get("email").strip().lower()

apiserver/plane/bgtasks/issue_activites_task.py

@@ -24,9 +24,11 @@ from plane.db.models import (
     IssueReaction,
     CommentReaction,
     IssueComment,
+    IssueSubscriber,
 )
 from plane.app.serializers import IssueActivitySerializer
 from plane.bgtasks.notification_task import notifications
+from plane.settings.redis import redis_instance
 
 
 # Track Changes in name
@@ -111,15 +113,15 @@ def track_parent(
     issue_activities,
     epoch,
 ):
-    if current_instance.get("parent") != requested_data.get("parent"):
+    if current_instance.get("parent_id") != requested_data.get("parent_id"):
         old_parent = (
-            Issue.objects.filter(pk=current_instance.get("parent")).first()
-            if current_instance.get("parent") is not None
+            Issue.objects.filter(pk=current_instance.get("parent_id")).first()
+            if current_instance.get("parent_id") is not None
             else None
         )
         new_parent = (
-            Issue.objects.filter(pk=requested_data.get("parent")).first()
-            if requested_data.get("parent") is not None
+            Issue.objects.filter(pk=requested_data.get("parent_id")).first()
+            if requested_data.get("parent_id") is not None
             else None
         )
 
@@ -188,9 +190,11 @@ def track_state(
     issue_activities,
     epoch,
 ):
-    if current_instance.get("state") != requested_data.get("state"):
-        new_state = State.objects.get(pk=requested_data.get("state", None))
-        old_state = State.objects.get(pk=current_instance.get("state", None))
+    if current_instance.get("state_id") != requested_data.get("state_id"):
+        new_state = State.objects.get(pk=requested_data.get("state_id", None))
+        old_state = State.objects.get(
+            pk=current_instance.get("state_id", None)
+        )
 
         issue_activities.append(
             IssueActivity(
@@ -288,10 +292,10 @@ def track_labels(
     epoch,
 ):
     requested_labels = set(
-        [str(lab) for lab in requested_data.get("labels", [])]
+        [str(lab) for lab in requested_data.get("label_ids", [])]
     )
     current_labels = set(
-        [str(lab) for lab in current_instance.get("labels", [])]
+        [str(lab) for lab in current_instance.get("label_ids", [])]
     )
 
     added_labels = requested_labels - current_labels
@@ -350,15 +354,16 @@ def track_assignees(
     epoch,
 ):
     requested_assignees = set(
-        [str(asg) for asg in requested_data.get("assignees", [])]
+        [str(asg) for asg in requested_data.get("assignee_ids", [])]
     )
     current_assignees = set(
-        [str(asg) for asg in current_instance.get("assignees", [])]
+        [str(asg) for asg in current_instance.get("assignee_ids", [])]
     )
 
     added_assignees = requested_assignees - current_assignees
     dropped_assginees = current_assignees - requested_assignees
 
+    bulk_subscribers = []
     for added_asignee in added_assignees:
         assignee = User.objects.get(pk=added_asignee)
         issue_activities.append(
@@ -376,6 +381,21 @@ def track_assignees(
                 epoch=epoch,
             )
         )
+        bulk_subscribers.append(
+            IssueSubscriber(
+                subscriber_id=assignee.id,
+                issue_id=issue_id,
+                workspace_id=workspace_id,
+                project_id=project_id,
+                created_by_id=assignee.id,
+                updated_by_id=assignee.id,
+            )
+        )
+
+    # Create assignees subscribers to the issue and ignore if already
+    IssueSubscriber.objects.bulk_create(
+        bulk_subscribers, batch_size=10, ignore_conflicts=True
+    )
 
     for dropped_assignee in dropped_assginees:
         assignee = User.objects.get(pk=dropped_assignee)
@@ -541,14 +561,14 @@ def update_issue_activity(
 ):
     ISSUE_ACTIVITY_MAPPER = {
         "name": track_name,
-        "parent": track_parent,
+        "parent_id": track_parent,
         "priority": track_priority,
-        "state": track_state,
+        "state_id": track_state,
         "description_html": track_description,
         "target_date": track_target_date,
         "start_date": track_start_date,
-        "labels": track_labels,
-        "assignees": track_assignees,
+        "label_ids": track_labels,
+        "assignee_ids": track_assignees,
         "estimate_point": track_estimate_points,
         "archived_at": track_archive_at,
         "closed_to": track_closed_to,
@@ -833,70 +853,26 @@ def create_module_issue_activity(
     requested_data = (
         json.loads(requested_data) if requested_data is not None else None
     )
-    current_instance = (
-        json.loads(current_instance) if current_instance is not None else None
-    )
-
-    # Updated Records:
-    updated_records = current_instance.get("updated_module_issues", [])
-    created_records = json.loads(
-        current_instance.get("created_module_issues", [])
-    )
-
-    for updated_record in updated_records:
-        old_module = Module.objects.filter(
-            pk=updated_record.get("old_module_id", None)
-        ).first()
-        new_module = Module.objects.filter(
-            pk=updated_record.get("new_module_id", None)
-        ).first()
-        issue = Issue.objects.filter(pk=updated_record.get("issue_id")).first()
-        if issue:
-            issue.updated_at = timezone.now()
-            issue.save(update_fields=["updated_at"])
-
-        issue_activities.append(
-            IssueActivity(
-                issue_id=updated_record.get("issue_id"),
-                actor_id=actor_id,
-                verb="updated",
-                old_value=old_module.name,
-                new_value=new_module.name,
-                field="modules",
-                project_id=project_id,
-                workspace_id=workspace_id,
-                comment=f"updated module to ",
-                old_identifier=old_module.id,
-                new_identifier=new_module.id,
-                epoch=epoch,
-            )
-        )
-
-    for created_record in created_records:
-        module = Module.objects.filter(
-            pk=created_record.get("fields").get("module")
-        ).first()
-        issue = Issue.objects.filter(
-            pk=created_record.get("fields").get("issue")
-        ).first()
-        if issue:
-            issue.updated_at = timezone.now()
-            issue.save(update_fields=["updated_at"])
-        issue_activities.append(
-            IssueActivity(
-                issue_id=created_record.get("fields").get("issue"),
-                actor_id=actor_id,
-                verb="created",
-                old_value="",
-                new_value=module.name,
-                field="modules",
-                project_id=project_id,
-                workspace_id=workspace_id,
-                comment=f"added module {module.name}",
-                new_identifier=module.id,
-                epoch=epoch,
-            )
+    module = Module.objects.filter(pk=requested_data.get("module_id")).first()
+    issue = Issue.objects.filter(pk=issue_id).first()
+    if issue:
+        issue.updated_at = timezone.now()
+        issue.save(update_fields=["updated_at"])
+    issue_activities.append(
+        IssueActivity(
+            issue_id=issue_id,
+            actor_id=actor_id,
+            verb="created",
+            old_value="",
+            new_value=module.name,
+            field="modules",
+            project_id=project_id,
+            workspace_id=workspace_id,
+            comment=f"added module {module.name}",
+            new_identifier=requested_data.get("module_id"),
+            epoch=epoch,
         )
+    )
 
 
 def delete_module_issue_activity(
@@ -915,32 +891,26 @@ def delete_module_issue_activity(
     current_instance = (
         json.loads(current_instance) if current_instance is not None else None
     )
-
-    module_id = requested_data.get("module_id", "")
-    module_name = requested_data.get("module_name", "")
-    module = Module.objects.filter(pk=module_id).first()
-    issues = requested_data.get("issues")
-
-    for issue in issues:
-        current_issue = Issue.objects.filter(pk=issue).first()
-        if issue:
-            current_issue.updated_at = timezone.now()
-            current_issue.save(update_fields=["updated_at"])
-        issue_activities.append(
-            IssueActivity(
-                issue_id=issue,
-                actor_id=actor_id,
-                verb="deleted",
-                old_value=module.name if module is not None else module_name,
-                new_value="",
-                field="modules",
-                project_id=project_id,
-                workspace_id=workspace_id,
-                comment=f"removed this issue from {module.name if module is not None else module_name}",
-                old_identifier=module_id if module_id is not None else None,
-                epoch=epoch,
-            )
+    module_name = current_instance.get("module_name")
+    current_issue = Issue.objects.filter(pk=issue_id).first()
+    if current_issue:
+        current_issue.updated_at = timezone.now()
+        current_issue.save(update_fields=["updated_at"])
+    issue_activities.append(
+        IssueActivity(
+            issue_id=issue_id,
+            actor_id=actor_id,
+            verb="deleted",
+            old_value=module_name,
+            new_value="",
+            field="modules",
+            project_id=project_id,
+            workspace_id=workspace_id,
+            comment=f"removed this issue from {module_name}",
+            old_identifier=requested_data.get("module_id") if requested_data.get("module_id") is not None else None,
+            epoch=epoch,
         )
+    )
 
 
 def create_link_activity(
@@ -1543,6 +1513,8 @@ def issue_activity(
     project_id,
     epoch,
     subscriber=True,
+    notification=False,
+    origin=None,
 ):
     try:
         issue_activities = []
@@ -1551,6 +1523,10 @@ def issue_activity(
         workspace_id = project.workspace_id
 
         if issue_id is not None:
+            if origin:
+                ri = redis_instance()
+                # set the request origin in redis
+                ri.set(str(issue_id), origin, ex=600)
             issue = Issue.objects.filter(pk=issue_id).first()
             if issue:
                 try:
@@ -1624,21 +1600,22 @@ def issue_activity(
             except Exception as e:
                 capture_exception(e)
 
-        notifications.delay(
-            type=type,
-            issue_id=issue_id,
-            actor_id=actor_id,
-            project_id=project_id,
-            subscriber=subscriber,
-            issue_activities_created=json.dumps(
-                IssueActivitySerializer(
-                    issue_activities_created, many=True
-                ).data,
-                cls=DjangoJSONEncoder,
-            ),
-            requested_data=requested_data,
-            current_instance=current_instance,
-        )
+        if notification:
+            notifications.delay(
+                type=type,
+                issue_id=issue_id,
+                actor_id=actor_id,
+                project_id=project_id,
+                subscriber=subscriber,
+                issue_activities_created=json.dumps(
+                    IssueActivitySerializer(
+                        issue_activities_created, many=True
+                    ).data,
+                    cls=DjangoJSONEncoder,
+                ),
+                requested_data=requested_data,
+                current_instance=current_instance,
+            )
 
         return
     except Exception as e:

apiserver/plane/bgtasks/issue_automation_task.py

@@ -87,6 +87,7 @@ def archive_old_issues():
                             current_instance=json.dumps({"archived_at": None}),
                             subscriber=False,
                             epoch=int(timezone.now().timestamp()),
+                            notification=True,
                         )
                         for issue in issues_to_update
                     ]
@@ -169,6 +170,7 @@ def close_old_issues():
                             current_instance=None,
                             subscriber=False,
                             epoch=int(timezone.now().timestamp()),
+                            notification=True,
                         )
                         for issue in issues_to_update
                     ]

apiserver/plane/bgtasks/notification_task.py

@@ -10,9 +10,12 @@ from plane.db.models import (
     User,
     IssueAssignee,
     Issue,
+    State,
+    EmailNotificationLog,
     Notification,
     IssueComment,
     IssueActivity,
+    UserNotificationPreference,
 )
 
 # Third Party imports
@@ -20,7 +23,7 @@ from celery import shared_task
 from bs4 import BeautifulSoup
 
 
-# =========== Issue Description Html Parsing and Notification Functions ======================
+# =========== Issue Description Html Parsing and notification Functions ======================
 
 
 def update_mentions_for_issue(issue, project, new_mentions, removed_mention):
@@ -37,9 +40,7 @@ def update_mentions_for_issue(issue, project, new_mentions, removed_mention):
         )
 
     IssueMention.objects.bulk_create(aggregated_issue_mentions, batch_size=100)
-    IssueMention.objects.filter(
-        issue=issue, mention__in=removed_mention
-    ).delete()
+    IssueMention.objects.filter(issue=issue, mention__in=removed_mention).delete()
 
 
 def get_new_mentions(requested_instance, current_instance):
@@ -60,8 +61,6 @@ def get_new_mentions(requested_instance, current_instance):
 
 
 # Get Removed Mention
-
-
 def get_removed_mentions(requested_instance, current_instance):
     # requested_data is the newer instance of the current issue
     # current_instance is the older instance of the current issue, saved in the database
@@ -79,8 +78,6 @@ def get_removed_mentions(requested_instance, current_instance):
 
 
 # Adds mentions as subscribers
-
-
 def extract_mentions_as_subscribers(project_id, issue_id, mentions):
     # mentions is an array of User IDs representing the FILTERED set of mentioned users
 
@@ -95,9 +92,7 @@ def extract_mentions_as_subscribers(project_id, issue_id, mentions):
                 project_id=project_id,
             ).exists()
             and not IssueAssignee.objects.filter(
-                project_id=project_id,
-                issue_id=issue_id,
-                assignee_id=mention_id,
+                project_id=project_id, issue_id=issue_id, assignee_id=mention_id
             ).exists()
             and not Issue.objects.filter(
                 project_id=project_id, pk=issue_id, created_by_id=mention_id
@@ -125,9 +120,7 @@ def extract_mentions(issue_instance):
         data = json.loads(issue_instance)
         html = data.get("description_html")
         soup = BeautifulSoup(html, "html.parser")
-        mention_tags = soup.find_all(
-            "mention-component", attrs={"target": "users"}
-        )
+        mention_tags = soup.find_all("mention-component", attrs={"target": "users"})
 
         mentions = [mention_tag["id"] for mention_tag in mention_tags]
 
@@ -136,14 +129,12 @@ def extract_mentions(issue_instance):
         return []
 
 
-# =========== Comment Parsing and Notification Functions ======================
+# =========== Comment Parsing and notification Functions ======================
 def extract_comment_mentions(comment_value):
     try:
         mentions = []
         soup = BeautifulSoup(comment_value, "html.parser")
-        mentions_tags = soup.find_all(
-            "mention-component", attrs={"target": "users"}
-        )
+        mentions_tags = soup.find_all("mention-component", attrs={"target": "users"})
         for mention_tag in mentions_tags:
             mentions.append(mention_tag["id"])
         return list(set(mentions))
@@ -165,14 +156,8 @@ def get_new_comment_mentions(new_value, old_value):
     return new_mentions
 
 
-def createMentionNotification(
-    project,
-    notification_comment,
-    issue,
-    actor_id,
-    mention_id,
-    issue_id,
-    activity,
+def create_mention_notification(
+    project, notification_comment, issue, actor_id, mention_id, issue_id, activity
 ):
     return Notification(
         workspace=project.workspace,
@@ -215,244 +200,199 @@ def notifications(
     requested_data,
     current_instance,
 ):
-    issue_activities_created = (
-        json.loads(issue_activities_created)
-        if issue_activities_created is not None
-        else None
-    )
-    if type not in [
-        "issue.activity.deleted",
-        "cycle.activity.created",
-        "cycle.activity.deleted",
-        "module.activity.created",
-        "module.activity.deleted",
-        "issue_reaction.activity.created",
-        "issue_reaction.activity.deleted",
-        "comment_reaction.activity.created",
-        "comment_reaction.activity.deleted",
-        "issue_vote.activity.created",
-        "issue_vote.activity.deleted",
-        "issue_draft.activity.created",
-        "issue_draft.activity.updated",
-        "issue_draft.activity.deleted",
-    ]:
-        # Create Notifications
-        bulk_notifications = []
-
-        """
-        Mention Tasks
-        1. Perform Diffing and Extract the mentions, that mention notification needs to be sent
-        2. From the latest set of mentions, extract the users which are not a subscribers & make them subscribers
-        """
-
-        # Get new mentions from the newer instance
-        new_mentions = get_new_mentions(
-            requested_instance=requested_data,
-            current_instance=current_instance,
-        )
-        removed_mention = get_removed_mentions(
-            requested_instance=requested_data,
-            current_instance=current_instance,
+    try:
+        issue_activities_created = (
+            json.loads(issue_activities_created)
+            if issue_activities_created is not None
+            else None
         )
+        if type not in [
+            "issue.activity.deleted",
+            "cycle.activity.created",
+            "cycle.activity.deleted",
+            "module.activity.created",
+            "module.activity.deleted",
+            "issue_reaction.activity.created",
+            "issue_reaction.activity.deleted",
+            "comment_reaction.activity.created",
+            "comment_reaction.activity.deleted",
+            "issue_vote.activity.created",
+            "issue_vote.activity.deleted",
+            "issue_draft.activity.created",
+            "issue_draft.activity.updated",
+            "issue_draft.activity.deleted",
+        ]:
+            # Create Notifications
+            bulk_notifications = []
+            bulk_email_logs = []
 
-        comment_mentions = []
-        all_comment_mentions = []
+            """
+            Mention Tasks
+            1. Perform Diffing and Extract the mentions, that mention notification needs to be sent
+            2. From the latest set of mentions, extract the users which are not a subscribers & make them subscribers
+            """
 
-        # Get New Subscribers from the mentions of the newer instance
-        requested_mentions = extract_mentions(issue_instance=requested_data)
-        mention_subscribers = extract_mentions_as_subscribers(
-            project_id=project_id,
-            issue_id=issue_id,
-            mentions=requested_mentions,
-        )
-
-        for issue_activity in issue_activities_created:
-            issue_comment = issue_activity.get("issue_comment")
-            issue_comment_new_value = issue_activity.get("new_value")
-            issue_comment_old_value = issue_activity.get("old_value")
-            if issue_comment is not None:
-                # TODO: Maybe save the comment mentions, so that in future, we can filter out the issues based on comment mentions as well.
-
-                all_comment_mentions = (
-                    all_comment_mentions
-                    + extract_comment_mentions(issue_comment_new_value)
-                )
-
-                new_comment_mentions = get_new_comment_mentions(
-                    old_value=issue_comment_old_value,
-                    new_value=issue_comment_new_value,
-                )
-                comment_mentions = comment_mentions + new_comment_mentions
-
-        comment_mention_subscribers = extract_mentions_as_subscribers(
-            project_id=project_id,
-            issue_id=issue_id,
-            mentions=all_comment_mentions,
-        )
-        """
-        We will not send subscription activity notification to the below mentioned user sets
-        - Those who have been newly mentioned in the issue description, we will send mention notification to them.
-        - When the activity is a comment_created and there exist a mention in the comment, then we have to send the "mention_in_comment" notification
-        - When the activity is a comment_updated and there exist a mention change, then also we have to send the "mention_in_comment" notification
-        """
-
-        issue_assignees = list(
-            IssueAssignee.objects.filter(
-                project_id=project_id, issue_id=issue_id
+            # Get new mentions from the newer instance
+            new_mentions = get_new_mentions(
+                requested_instance=requested_data,
+                current_instance=current_instance,
             )
-            .exclude(assignee_id__in=list(new_mentions + comment_mentions))
-            .values_list("assignee", flat=True)
-        )
-
-        issue_subscribers = list(
-            IssueSubscriber.objects.filter(
-                project_id=project_id, issue_id=issue_id
+            removed_mention = get_removed_mentions(
+                requested_instance=requested_data,
+                current_instance=current_instance,
             )
-            .exclude(
-                subscriber_id__in=list(
-                    new_mentions + comment_mentions + [actor_id]
-                )
+
+            comment_mentions = []
+            all_comment_mentions = []
+
+            # Get New Subscribers from the mentions of the newer instance
+            requested_mentions = extract_mentions(
+                issue_instance=requested_data
+            )
+            mention_subscribers = extract_mentions_as_subscribers(
+                project_id=project_id,
+                issue_id=issue_id,
+                mentions=requested_mentions,
             )
-            .values_list("subscriber", flat=True)
-        )
-
-        issue = Issue.objects.filter(pk=issue_id).first()
-
-        if issue.created_by_id is not None and str(issue.created_by_id) != str(
-            actor_id
-        ):
-            issue_subscribers = issue_subscribers + [issue.created_by_id]
-
-        if subscriber:
-            # add the user to issue subscriber
-            try:
-                if (
-                    str(issue.created_by_id) != str(actor_id)
-                    and uuid.UUID(actor_id) not in issue_assignees
-                ):
-                    _ = IssueSubscriber.objects.get_or_create(
-                        project_id=project_id,
-                        issue_id=issue_id,
-                        subscriber_id=actor_id,
-                    )
-            except Exception as e:
-                pass
-
-        project = Project.objects.get(pk=project_id)
-
-        issue_subscribers = list(
-            set(issue_subscribers + issue_assignees) - {uuid.UUID(actor_id)}
-        )
-
-        for subscriber in issue_subscribers:
-            if subscriber in issue_subscribers:
-                sender = "in_app:issue_activities:subscribed"
-            if (
-                issue.created_by_id is not None
-                and subscriber == issue.created_by_id
-            ):
-                sender = "in_app:issue_activities:created"
-            if subscriber in issue_assignees:
-                sender = "in_app:issue_activities:assigned"
 
             for issue_activity in issue_activities_created:
-                # Do not send notification for description update
-                if issue_activity.get("field") == "description":
-                    continue
                 issue_comment = issue_activity.get("issue_comment")
+                issue_comment_new_value = issue_activity.get("new_value")
+                issue_comment_old_value = issue_activity.get("old_value")
                 if issue_comment is not None:
-                    issue_comment = IssueComment.objects.get(
-                        id=issue_comment,
-                        issue_id=issue_id,
-                        project_id=project_id,
-                        workspace_id=project.workspace_id,
+                    # TODO: Maybe save the comment mentions, so that in future, we can filter out the issues based on comment mentions as well.
+
+                    all_comment_mentions = (
+                        all_comment_mentions
+                        + extract_comment_mentions(issue_comment_new_value)
                     )
 
-                bulk_notifications.append(
-                    Notification(
-                        workspace=project.workspace,
-                        sender=sender,
-                        triggered_by_id=actor_id,
-                        receiver_id=subscriber,
-                        entity_identifier=issue_id,
-                        entity_name="issue",
-                        project=project,
-                        title=issue_activity.get("comment"),
-                        data={
-                            "issue": {
-                                "id": str(issue_id),
-                                "name": str(issue.name),
-                                "identifier": str(issue.project.identifier),
-                                "sequence_id": issue.sequence_id,
-                                "state_name": issue.state.name,
-                                "state_group": issue.state.group,
-                            },
-                            "issue_activity": {
-                                "id": str(issue_activity.get("id")),
-                                "verb": str(issue_activity.get("verb")),
-                                "field": str(issue_activity.get("field")),
-                                "actor": str(issue_activity.get("actor_id")),
-                                "new_value": str(
-                                    issue_activity.get("new_value")
-                                ),
-                                "old_value": str(
-                                    issue_activity.get("old_value")
-                                ),
-                                "issue_comment": str(
-                                    issue_comment.comment_stripped
-                                    if issue_activity.get("issue_comment")
-                                    is not None
-                                    else ""
-                                ),
-                            },
-                        },
+                    new_comment_mentions = get_new_comment_mentions(
+                        old_value=issue_comment_old_value,
+                        new_value=issue_comment_new_value,
+                    )
+                    comment_mentions = comment_mentions + new_comment_mentions
+
+            comment_mention_subscribers = extract_mentions_as_subscribers(
+                project_id=project_id,
+                issue_id=issue_id,
+                mentions=all_comment_mentions,
+            )
+            """
+            We will not send subscription activity notification to the below mentioned user sets
+            - Those who have been newly mentioned in the issue description, we will send mention notification to them.
+            - When the activity is a comment_created and there exist a mention in the comment, then we have to send the "mention_in_comment" notification
+            - When the activity is a comment_updated and there exist a mention change, then also we have to send the "mention_in_comment" notification
+            """
+
+            # ----------------------------------------------------------------------------------------------------------------------------------------------------------------------------- #
+            issue_subscribers = list(
+                IssueSubscriber.objects.filter(
+                    project_id=project_id, issue_id=issue_id
+                )
+                .exclude(
+                    subscriber_id__in=list(
+                        new_mentions + comment_mentions + [actor_id]
                     )
                 )
+                .values_list("subscriber", flat=True)
+            )
 
-        # Add Mentioned as Issue Subscribers
-        IssueSubscriber.objects.bulk_create(
-            mention_subscribers + comment_mention_subscribers, batch_size=100
-        )
+            issue = Issue.objects.filter(pk=issue_id).first()
 
-        last_activity = (
-            IssueActivity.objects.filter(issue_id=issue_id)
-            .order_by("-created_at")
-            .first()
-        )
-
-        actor = User.objects.get(pk=actor_id)
-
-        for mention_id in comment_mentions:
-            if mention_id != actor_id:
-                for issue_activity in issue_activities_created:
-                    notification = createMentionNotification(
-                        project=project,
-                        issue=issue,
-                        notification_comment=f"{actor.display_name} has mentioned you in a comment in issue {issue.name}",
-                        actor_id=actor_id,
-                        mention_id=mention_id,
-                        issue_id=issue_id,
-                        activity=issue_activity,
+            if subscriber:
+                # add the user to issue subscriber
+                try:
+                    _ = IssueSubscriber.objects.get_or_create(
+                        project_id=project_id, issue_id=issue_id, subscriber_id=actor_id
                     )
-                    bulk_notifications.append(notification)
+                except Exception as e:
+                    pass
 
-        for mention_id in new_mentions:
-            if mention_id != actor_id:
-                if (
-                    last_activity is not None
-                    and last_activity.field == "description"
-                    and actor_id == str(last_activity.actor_id)
+            project = Project.objects.get(pk=project_id)
+
+            issue_assignees = IssueAssignee.objects.filter(
+                issue_id=issue_id, project_id=project_id
+            ).values_list("assignee", flat=True)
+
+            issue_subscribers = list(
+                set(issue_subscribers) - {uuid.UUID(actor_id)}
+            )
+
+            for subscriber in issue_subscribers:
+                if issue.created_by_id and issue.created_by_id == subscriber:
+                    sender = "in_app:issue_activities:created"
+                elif (
+                    subscriber in issue_assignees
+                    and issue.created_by_id not in issue_assignees
                 ):
+                    sender = "in_app:issue_activities:assigned"
+                else:
+                    sender = "in_app:issue_activities:subscribed"
+
+                preference = UserNotificationPreference.objects.get(
+                    user_id=subscriber
+                )
+
+                for issue_activity in issue_activities_created:   
+                    # If activity done in blocking then blocked by email should not go
+                    if issue_activity.get("issue_detail").get("id") != issue_id:
+                        continue;
+                    
+                    # Do not send notification for description update
+                    if issue_activity.get("field") == "description":
+                        continue
+
+                    # Check if the value should be sent or not
+                    send_email = False
+                    if (
+                        issue_activity.get("field") == "state"
+                        and preference.state_change
+                    ):
+                        send_email = True
+                    elif (
+                        issue_activity.get("field") == "state"
+                        and preference.issue_completed
+                        and State.objects.filter(
+                            project_id=project_id,
+                            pk=issue_activity.get("new_identifier"),
+                            group="completed",
+                        ).exists()
+                    ):
+                        send_email = True
+                    elif (
+                        issue_activity.get("field") == "comment"
+                        and preference.comment
+                    ):
+                        send_email = True
+                    elif preference.property_change:
+                        send_email = True
+                    else:
+                        send_email = False
+
+                    # If activity is of issue comment fetch the comment
+                    issue_comment = (
+                        IssueComment.objects.filter(
+                            id=issue_activity.get("issue_comment"),
+                            issue_id=issue_id,
+                            project_id=project_id,
+                            workspace_id=project.workspace_id,
+                        ).first()
+                        if issue_activity.get("issue_comment")
+                        else None
+                    )
+
+                    # Create in app notification
                     bulk_notifications.append(
                         Notification(
                             workspace=project.workspace,
-                            sender="in_app:issue_activities:mentioned",
+                            sender=sender,
                             triggered_by_id=actor_id,
-                            receiver_id=mention_id,
+                            receiver_id=subscriber,
                             entity_identifier=issue_id,
                             entity_name="issue",
                             project=project,
-                            message=f"You have been mentioned in the issue {issue.name}",
+                            title=issue_activity.get("comment"),
                             data={
                                 "issue": {
                                     "id": str(issue_id),
@@ -465,36 +405,317 @@ def notifications(
                                     "state_group": issue.state.group,
                                 },
                                 "issue_activity": {
-                                    "id": str(last_activity.id),
-                                    "verb": str(last_activity.verb),
-                                    "field": str(last_activity.field),
-                                    "actor": str(last_activity.actor_id),
-                                    "new_value": str(last_activity.new_value),
-                                    "old_value": str(last_activity.old_value),
+                                    "id": str(issue_activity.get("id")),
+                                    "verb": str(issue_activity.get("verb")),
+                                    "field": str(issue_activity.get("field")),
+                                    "actor": str(
+                                        issue_activity.get("actor_id")
+                                    ),
+                                    "new_value": str(
+                                        issue_activity.get("new_value")
+                                    ),
+                                    "old_value": str(
+                                        issue_activity.get("old_value")
+                                    ),
+                                    "issue_comment": str(
+                                        issue_comment.comment_stripped
+                                        if issue_comment is not None
+                                        else ""
+                                    ),
                                 },
                             },
                         )
                     )
-                else:
+                    # Create email notification
+                    if send_email:
+                        bulk_email_logs.append(
+                            EmailNotificationLog(
+                                triggered_by_id=actor_id,
+                                receiver_id=subscriber,
+                                entity_identifier=issue_id,
+                                entity_name="issue",
+                                data={
+                                    "issue": {
+                                        "id": str(issue_id),
+                                        "name": str(issue.name),
+                                        "identifier": str(
+                                            issue.project.identifier
+                                        ),
+                                        "project_id": str(issue.project.id),
+                                        "workspace_slug": str(
+                                            issue.project.workspace.slug
+                                        ),
+                                        "sequence_id": issue.sequence_id,
+                                        "state_name": issue.state.name,
+                                        "state_group": issue.state.group,
+                                    },
+                                    "issue_activity": {
+                                        "id": str(issue_activity.get("id")),
+                                        "verb": str(
+                                            issue_activity.get("verb")
+                                        ),
+                                        "field": str(
+                                            issue_activity.get("field")
+                                        ),
+                                        "actor": str(
+                                            issue_activity.get("actor_id")
+                                        ),
+                                        "new_value": str(
+                                            issue_activity.get("new_value")
+                                        ),
+                                        "old_value": str(
+                                            issue_activity.get("old_value")
+                                        ),
+                                        "issue_comment": str(
+                                            issue_comment.comment_stripped
+                                            if issue_comment is not None
+                                            else ""
+                                        ),
+                                        "activity_time": issue_activity.get("created_at"),
+                                    },
+                                },
+                            )
+                        )
+
+            # ----------------------------------------------------------------------------------------------------------------- #
+
+            # Add Mentioned as Issue Subscribers
+            IssueSubscriber.objects.bulk_create(
+                mention_subscribers + comment_mention_subscribers,
+                batch_size=100,
+                ignore_conflicts=True,
+            )
+
+            last_activity = (
+                IssueActivity.objects.filter(issue_id=issue_id)
+                .order_by("-created_at")
+                .first()
+            )
+
+            actor = User.objects.get(pk=actor_id)
+
+            for mention_id in comment_mentions:
+                if mention_id != actor_id:
+                    preference = UserNotificationPreference.objects.get(
+                        user_id=mention_id
+                    )
                     for issue_activity in issue_activities_created:
-                        notification = createMentionNotification(
+                        notification = create_mention_notification(
                             project=project,
                             issue=issue,
-                            notification_comment=f"You have been mentioned in the issue {issue.name}",
+                            notification_comment=f"{actor.display_name} has mentioned you in a comment in issue {issue.name}",
                             actor_id=actor_id,
                             mention_id=mention_id,
                             issue_id=issue_id,
                             activity=issue_activity,
                         )
+
+                        # check for email notifications
+                        if preference.mention:
+                            bulk_email_logs.append(
+                                EmailNotificationLog(
+                                    triggered_by_id=actor_id,
+                                    receiver_id=subscriber,
+                                    entity_identifier=issue_id,
+                                    entity_name="issue",
+                                    data={
+                                        "issue": {
+                                            "id": str(issue_id),
+                                            "name": str(issue.name),
+                                            "identifier": str(
+                                                issue.project.identifier
+                                            ),
+                                            "sequence_id": issue.sequence_id,
+                                            "state_name": issue.state.name,
+                                            "state_group": issue.state.group,
+                                            "project_id": str(
+                                                issue.project.id
+                                            ),
+                                            "workspace_slug": str(
+                                                issue.project.workspace.slug
+                                            ),
+                                        },
+                                        "issue_activity": {
+                                            "id": str(
+                                                issue_activity.get("id")
+                                            ),
+                                            "verb": str(
+                                                issue_activity.get("verb")
+                                            ),
+                                            "field": str("mention"),
+                                            "actor": str(
+                                                issue_activity.get("actor_id")
+                                            ),
+                                            "new_value": str(
+                                                issue_activity.get("new_value")
+                                            ),
+                                            "old_value": str(
+                                                issue_activity.get("old_value")
+                                            ),
+                                        },
+                                    },
+                                )
+                            )
                         bulk_notifications.append(notification)
 
-        # save new mentions for the particular issue and remove the mentions that has been deleted from the description
-        update_mentions_for_issue(
-            issue=issue,
-            project=project,
-            new_mentions=new_mentions,
-            removed_mention=removed_mention,
-        )
+            for mention_id in new_mentions:
+                if mention_id != actor_id:
+                    preference = UserNotificationPreference.objects.get(
+                        user_id=mention_id
+                    )
+                    if (
+                        last_activity is not None
+                        and last_activity.field == "description"
+                        and actor_id == str(last_activity.actor_id)
+                    ):
+                        bulk_notifications.append(
+                            Notification(
+                                workspace=project.workspace,
+                                sender="in_app:issue_activities:mentioned",
+                                triggered_by_id=actor_id,
+                                receiver_id=mention_id,
+                                entity_identifier=issue_id,
+                                entity_name="issue",
+                                project=project,
+                                message=f"You have been mentioned in the issue {issue.name}",
+                                data={
+                                    "issue": {
+                                        "id": str(issue_id),
+                                        "name": str(issue.name),
+                                        "identifier": str(
+                                            issue.project.identifier
+                                        ),
+                                        "sequence_id": issue.sequence_id,
+                                        "state_name": issue.state.name,
+                                        "state_group": issue.state.group,
+                                        "project_id": str(issue.project.id),
+                                        "workspace_slug": str(
+                                            issue.project.workspace.slug
+                                        ),
+                                    },
+                                    "issue_activity": {
+                                        "id": str(last_activity.id),
+                                        "verb": str(last_activity.verb),
+                                        "field": str(last_activity.field),
+                                        "actor": str(last_activity.actor_id),
+                                        "new_value": str(
+                                            last_activity.new_value
+                                        ),
+                                        "old_value": str(
+                                            last_activity.old_value
+                                        ),
+                                    },
+                                },
+                            )
+                        )
+                        if preference.mention:
+                            bulk_email_logs.append(
+                                EmailNotificationLog(
+                                    triggered_by_id=actor_id,
+                                    receiver_id=subscriber,
+                                    entity_identifier=issue_id,
+                                    entity_name="issue",
+                                    data={
+                                        "issue": {
+                                            "id": str(issue_id),
+                                            "name": str(issue.name),
+                                            "identifier": str(
+                                                issue.project.identifier
+                                            ),
+                                            "sequence_id": issue.sequence_id,
+                                            "state_name": issue.state.name,
+                                            "state_group": issue.state.group,
+                                        },
+                                        "issue_activity": {
+                                            "id": str(last_activity.id),
+                                            "verb": str(last_activity.verb),
+                                            "field": "mention",
+                                            "actor": str(
+                                                last_activity.actor_id
+                                            ),
+                                            "new_value": str(
+                                                last_activity.new_value
+                                            ),
+                                            "old_value": str(
+                                                last_activity.old_value
+                                            ),
+                                        },
+                                    },
+                                )
+                            )
+                    else:
+                        for issue_activity in issue_activities_created:
+                            notification = create_mention_notification(
+                                project=project,
+                                issue=issue,
+                                notification_comment=f"You have been mentioned in the issue {issue.name}",
+                                actor_id=actor_id,
+                                mention_id=mention_id,
+                                issue_id=issue_id,
+                                activity=issue_activity,
+                            )
+                            if preference.mention:
+                                bulk_email_logs.append(
+                                    EmailNotificationLog(
+                                        triggered_by_id=actor_id,
+                                        receiver_id=subscriber,
+                                        entity_identifier=issue_id,
+                                        entity_name="issue",
+                                        data={
+                                            "issue": {
+                                                "id": str(issue_id),
+                                                "name": str(issue.name),
+                                                "identifier": str(
+                                                    issue.project.identifier
+                                                ),
+                                                "sequence_id": issue.sequence_id,
+                                                "state_name": issue.state.name,
+                                                "state_group": issue.state.group,
+                                            },
+                                            "issue_activity": {
+                                                "id": str(
+                                                    issue_activity.get("id")
+                                                ),
+                                                "verb": str(
+                                                    issue_activity.get("verb")
+                                                ),
+                                                "field": str("mention"),
+                                                "actor": str(
+                                                    issue_activity.get(
+                                                        "actor_id"
+                                                    )
+                                                ),
+                                                "new_value": str(
+                                                    issue_activity.get(
+                                                        "new_value"
+                                                    )
+                                                ),
+                                                "old_value": str(
+                                                    issue_activity.get(
+                                                        "old_value"
+                                                    )
+                                                ),
+                                            },
+                                        },
+                                    )
+                                )
+                            bulk_notifications.append(notification)
 
-        # Bulk create notifications
-        Notification.objects.bulk_create(bulk_notifications, batch_size=100)
+            # save new mentions for the particular issue and remove the mentions that has been deleted from the description
+            update_mentions_for_issue(
+                issue=issue,
+                project=project,
+                new_mentions=new_mentions,
+                removed_mention=removed_mention,
+            )
+            # Bulk create notifications
+            Notification.objects.bulk_create(
+                bulk_notifications, batch_size=100
+            )
+            EmailNotificationLog.objects.bulk_create(
+                bulk_email_logs, batch_size=100, ignore_conflicts=True
+            )
+        return
+    except Exception as e:
+        print(e)
+        return

apiserver/plane/celery.py

@@ -2,6 +2,7 @@ import os
 from celery import Celery
 from plane.settings.redis import redis_instance
 from celery.schedules import crontab
+from django.utils.timezone import timedelta
 
 # Set the default Django settings module for the 'celery' program.
 os.environ.setdefault("DJANGO_SETTINGS_MODULE", "plane.settings.production")
@@ -28,6 +29,10 @@ app.conf.beat_schedule = {
         "task": "plane.bgtasks.file_asset_task.delete_file_asset",
         "schedule": crontab(hour=0, minute=0),
     },
+    "check-every-five-minutes-to-send-email-notifications": {
+        "task": "plane.bgtasks.email_notification_task.stack_email_notification",
+        "schedule": crontab(minute='*/5')
+    },
 }
 
 # Load task modules from all registered Django app configs.

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

@@ -0,0 +1,21 @@
+# wait_for_migrations.py
+import time
+from django.core.management.base import BaseCommand
+from django.db.migrations.executor import MigrationExecutor
+from django.db import connections, DEFAULT_DB_ALIAS
+
+class Command(BaseCommand):
+    help = 'Wait for database migrations to complete before starting Celery worker/beat'
+
+    def handle(self, *args, **kwargs):
+        while self._pending_migrations():
+            self.stdout.write("Waiting for database migrations to complete...")
+            time.sleep(10)  # wait for 10 seconds before checking again
+
+        self.stdout.write(self.style.SUCCESS("No migrations Pending. Starting processes ..."))
+
+    def _pending_migrations(self):
+        connection = connections[DEFAULT_DB_ALIAS]
+        executor = MigrationExecutor(connection)
+        targets = executor.loader.graph.leaf_nodes()
+        return bool(executor.migration_plan(targets))

apiserver/plane/db/migrations/0056_usernotificationpreference_emailnotificationlog.py

@@ -0,0 +1,184 @@
+# Generated by Django 4.2.7 on 2024-01-22 08:55
+
+from django.conf import settings
+from django.db import migrations, models
+import django.db.models.deletion
+import uuid
+
+
+class Migration(migrations.Migration):
+    dependencies = [
+        ("db", "0055_auto_20240108_0648"),
+    ]
+
+    operations = [
+        migrations.CreateModel(
+            name="UserNotificationPreference",
+            fields=[
+                (
+                    "created_at",
+                    models.DateTimeField(
+                        auto_now_add=True, verbose_name="Created At"
+                    ),
+                ),
+                (
+                    "updated_at",
+                    models.DateTimeField(
+                        auto_now=True, verbose_name="Last Modified At"
+                    ),
+                ),
+                (
+                    "id",
+                    models.UUIDField(
+                        db_index=True,
+                        default=uuid.uuid4,
+                        editable=False,
+                        primary_key=True,
+                        serialize=False,
+                        unique=True,
+                    ),
+                ),
+                ("property_change", models.BooleanField(default=True)),
+                ("state_change", models.BooleanField(default=True)),
+                ("comment", models.BooleanField(default=True)),
+                ("mention", models.BooleanField(default=True)),
+                ("issue_completed", models.BooleanField(default=True)),
+                (
+                    "created_by",
+                    models.ForeignKey(
+                        null=True,
+                        on_delete=django.db.models.deletion.SET_NULL,
+                        related_name="%(class)s_created_by",
+                        to=settings.AUTH_USER_MODEL,
+                        verbose_name="Created By",
+                    ),
+                ),
+                (
+                    "project",
+                    models.ForeignKey(
+                        null=True,
+                        on_delete=django.db.models.deletion.CASCADE,
+                        related_name="project_notification_preferences",
+                        to="db.project",
+                    ),
+                ),
+                (
+                    "updated_by",
+                    models.ForeignKey(
+                        null=True,
+                        on_delete=django.db.models.deletion.SET_NULL,
+                        related_name="%(class)s_updated_by",
+                        to=settings.AUTH_USER_MODEL,
+                        verbose_name="Last Modified By",
+                    ),
+                ),
+                (
+                    "user",
+                    models.ForeignKey(
+                        on_delete=django.db.models.deletion.CASCADE,
+                        related_name="notification_preferences",
+                        to=settings.AUTH_USER_MODEL,
+                    ),
+                ),
+                (
+                    "workspace",
+                    models.ForeignKey(
+                        null=True,
+                        on_delete=django.db.models.deletion.CASCADE,
+                        related_name="workspace_notification_preferences",
+                        to="db.workspace",
+                    ),
+                ),
+            ],
+            options={
+                "verbose_name": "UserNotificationPreference",
+                "verbose_name_plural": "UserNotificationPreferences",
+                "db_table": "user_notification_preferences",
+                "ordering": ("-created_at",),
+            },
+        ),
+        migrations.CreateModel(
+            name="EmailNotificationLog",
+            fields=[
+                (
+                    "created_at",
+                    models.DateTimeField(
+                        auto_now_add=True, verbose_name="Created At"
+                    ),
+                ),
+                (
+                    "updated_at",
+                    models.DateTimeField(
+                        auto_now=True, verbose_name="Last Modified At"
+                    ),
+                ),
+                (
+                    "id",
+                    models.UUIDField(
+                        db_index=True,
+                        default=uuid.uuid4,
+                        editable=False,
+                        primary_key=True,
+                        serialize=False,
+                        unique=True,
+                    ),
+                ),
+                ("entity_identifier", models.UUIDField(null=True)),
+                ("entity_name", models.CharField(max_length=255)),
+                ("data", models.JSONField(null=True)),
+                ("processed_at", models.DateTimeField(null=True)),
+                ("sent_at", models.DateTimeField(null=True)),
+                ("entity", models.CharField(max_length=200)),
+                (
+                    "old_value",
+                    models.CharField(blank=True, max_length=300, null=True),
+                ),
+                (
+                    "new_value",
+                    models.CharField(blank=True, max_length=300, null=True),
+                ),
+                (
+                    "created_by",
+                    models.ForeignKey(
+                        null=True,
+                        on_delete=django.db.models.deletion.SET_NULL,
+                        related_name="%(class)s_created_by",
+                        to=settings.AUTH_USER_MODEL,
+                        verbose_name="Created By",
+                    ),
+                ),
+                (
+                    "receiver",
+                    models.ForeignKey(
+                        on_delete=django.db.models.deletion.CASCADE,
+                        related_name="email_notifications",
+                        to=settings.AUTH_USER_MODEL,
+                    ),
+                ),
+                (
+                    "triggered_by",
+                    models.ForeignKey(
+                        on_delete=django.db.models.deletion.CASCADE,
+                        related_name="triggered_emails",
+                        to=settings.AUTH_USER_MODEL,
+                    ),
+                ),
+                (
+                    "updated_by",
+                    models.ForeignKey(
+                        null=True,
+                        on_delete=django.db.models.deletion.SET_NULL,
+                        related_name="%(class)s_updated_by",
+                        to=settings.AUTH_USER_MODEL,
+                        verbose_name="Last Modified By",
+                    ),
+                ),
+            ],
+            options={
+                "verbose_name": "Email Notification Log",
+                "verbose_name_plural": "Email Notification Logs",
+                "db_table": "email_notification_logs",
+                "ordering": ("-created_at",),
+            },
+        ),
+    ]

apiserver/plane/db/migrations/0057_auto_20240122_0901.py

@@ -0,0 +1,28 @@
+# Generated by Django 4.2.7 on 2024-01-22 09:01
+
+from django.db import migrations
+
+def create_notification_preferences(apps, schema_editor):
+    UserNotificationPreference = apps.get_model("db", "UserNotificationPreference")
+    User = apps.get_model("db", "User")
+
+    bulk_notification_preferences = []
+    for user_id in User.objects.filter(is_bot=False).values_list("id", flat=True):
+        bulk_notification_preferences.append(
+            UserNotificationPreference(
+                user_id=user_id,
+                created_by_id=user_id,
+            )
+        )
+    UserNotificationPreference.objects.bulk_create(
+        bulk_notification_preferences, batch_size=1000, ignore_conflicts=True
+    )
+
+class Migration(migrations.Migration):
+    dependencies = [
+        ("db", "0056_usernotificationpreference_emailnotificationlog"),
+    ]
+
+    operations = [
+        migrations.RunPython(create_notification_preferences)
+    ]

apiserver/plane/db/migrations/0058_alter_moduleissue_issue_and_more.py

@@ -0,0 +1,23 @@
+# Generated by Django 4.2.7 on 2024-01-24 18:55
+
+from django.db import migrations, models
+import django.db.models.deletion
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('db', '0057_auto_20240122_0901'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='moduleissue',
+            name='issue',
+            field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='issue_module', to='db.issue'),
+        ),
+        migrations.AlterUniqueTogether(
+            name='moduleissue',
+            unique_together={('issue', 'module')},
+        ),
+    ]

apiserver/plane/db/models/__init__.py

@@ -85,7 +85,7 @@ from .inbox import Inbox, InboxIssue
 
 from .analytic import AnalyticView
 
-from .notification import Notification
+from .notification import Notification, UserNotificationPreference, EmailNotificationLog
 
 from .exporter import ExporterHistory
 

apiserver/plane/db/models/issue.py

@@ -9,6 +9,7 @@ from django.db.models.signals import post_save
 from django.dispatch import receiver
 from django.core.validators import MinValueValidator, MaxValueValidator
 from django.core.exceptions import ValidationError
+from django.utils import timezone
 
 # Module imports
 from . import ProjectBaseModel
@@ -183,6 +184,17 @@ class Issue(ProjectBaseModel):
                     self.state = default_state
             except ImportError:
                 pass
+        else:
+            try:
+                from plane.db.models import State
+
+                # Check if the current issue state group is completed or not
+                if self.state.group == "completed":
+                    self.completed_at = timezone.now()
+                else:
+                    self.completed_at = None
+            except ImportError:
+                pass
 
         if self._state.adding:
             # Get the maximum display_id value from the database

apiserver/plane/db/models/module.py

@@ -134,11 +134,12 @@ class ModuleIssue(ProjectBaseModel):
     module = models.ForeignKey(
         "db.Module", on_delete=models.CASCADE, related_name="issue_module"
     )
-    issue = models.OneToOneField(
+    issue = models.ForeignKey(
         "db.Issue", on_delete=models.CASCADE, related_name="issue_module"
     )
 
     class Meta:
+        unique_together = ["issue", "module"]
         verbose_name = "Module Issue"
         verbose_name_plural = "Module Issues"
         db_table = "module_issues"

apiserver/plane/db/models/notification.py

@@ -1,9 +1,9 @@
 # Django imports
 from django.db import models
+from django.conf import settings
 
-# Third party imports
-from .base import BaseModel
-
+# Module imports
+from . import BaseModel
 
 class Notification(BaseModel):
     workspace = models.ForeignKey(
@@ -47,3 +47,82 @@ class Notification(BaseModel):
     def __str__(self):
         """Return name of the notifications"""
         return f"{self.receiver.email} <{self.workspace.name}>"
+
+
+def get_default_preference():
+    return {
+        "property_change": {
+            "email": True,
+        },
+        "state": {
+            "email": True,
+        },
+        "comment": {
+            "email": True,
+        },
+        "mentions": {
+            "email": True,
+        },
+    }
+
+
+class UserNotificationPreference(BaseModel):
+    # user it is related to
+    user = models.ForeignKey(
+        settings.AUTH_USER_MODEL,
+        on_delete=models.CASCADE,
+        related_name="notification_preferences",
+    )
+    # workspace if it is applicable
+    workspace = models.ForeignKey(
+        "db.Workspace",
+        on_delete=models.CASCADE,
+        related_name="workspace_notification_preferences",
+        null=True,
+    )
+    # project
+    project = models.ForeignKey(
+        "db.Project",
+        on_delete=models.CASCADE,
+        related_name="project_notification_preferences",
+        null=True,
+    )
+
+    # preference fields
+    property_change = models.BooleanField(default=True)
+    state_change = models.BooleanField(default=True)
+    comment = models.BooleanField(default=True)
+    mention = models.BooleanField(default=True)
+    issue_completed = models.BooleanField(default=True)
+
+    class Meta:
+        verbose_name = "UserNotificationPreference"
+        verbose_name_plural = "UserNotificationPreferences"
+        db_table = "user_notification_preferences"
+        ordering = ("-created_at",)
+
+    def __str__(self):
+        """Return the user"""
+        return f"<{self.user}>"
+
+class EmailNotificationLog(BaseModel):
+    # receiver
+    receiver = models.ForeignKey(settings.AUTH_USER_MODEL, on_delete=models.CASCADE, related_name="email_notifications")
+    triggered_by = models.ForeignKey(settings.AUTH_USER_MODEL, on_delete=models.CASCADE, related_name="triggered_emails")
+    # entity - can be issues, pages, etc.
+    entity_identifier = models.UUIDField(null=True)
+    entity_name = models.CharField(max_length=255)
+    # data
+    data = models.JSONField(null=True)
+    # sent at
+    processed_at = models.DateTimeField(null=True)
+    sent_at = models.DateTimeField(null=True)
+    entity = models.CharField(max_length=200)
+    old_value = models.CharField(max_length=300, blank=True, null=True)
+    new_value = models.CharField(max_length=300, blank=True, null=True)
+
+    class Meta:
+        verbose_name = "Email Notification Log"
+        verbose_name_plural = "Email Notification Logs"
+        db_table = "email_notification_logs"
+        ordering = ("-created_at",)

apiserver/plane/db/models/user.py

@@ -11,8 +11,16 @@ from django.contrib.auth.models import (
     UserManager,
     PermissionsMixin,
 )
+from django.db.models.signals import post_save
+from django.conf import settings
+from django.dispatch import receiver
 from django.utils import timezone
 
+# Third party imports
+from sentry_sdk import capture_exception
+from slack_sdk import WebClient
+from slack_sdk.errors import SlackApiError
+
 
 def get_default_onboarding():
     return {
@@ -134,3 +142,34 @@ class User(AbstractBaseUser, PermissionsMixin):
             self.is_staff = True
 
         super(User, self).save(*args, **kwargs)
+
+
+@receiver(post_save, sender=User)
+def send_welcome_slack(sender, instance, created, **kwargs):
+    try:
+        if created and not instance.is_bot:
+            # Send message on slack as well
+            if settings.SLACK_BOT_TOKEN:
+                client = WebClient(token=settings.SLACK_BOT_TOKEN)
+                try:
+                    _ = client.chat_postMessage(
+                        channel="#trackers",
+                        text=f"New user {instance.email} has signed up and begun the onboarding journey.",
+                    )
+                except SlackApiError as e:
+                    print(f"Got an error: {e.response['error']}")
+        return
+    except Exception as e:
+        capture_exception(e)
+        return
+
+
+@receiver(post_save, sender=User)
+def create_user_notification(sender, instance, created, **kwargs):
+    # create preferences
+    if created and not instance.is_bot:
+        # Module imports
+        from plane.db.models import UserNotificationPreference
+        UserNotificationPreference.objects.create(
+            user=instance,
+        )

apiserver/plane/settings/common.py

@@ -291,6 +291,7 @@ CELERY_IMPORTS = (
     "plane.bgtasks.issue_automation_task",
     "plane.bgtasks.exporter_expired_task",
     "plane.bgtasks.file_asset_task",
+    "plane.bgtasks.email_notification_task",
 )
 
 # Sentry Settings

apiserver/plane/utils/analytics_plot.py

@@ -4,6 +4,7 @@ from datetime import timedelta
 
 # Django import
 from django.db import models
+from django.utils import timezone
 from django.db.models.functions import TruncDate
 from django.db.models import Count, F, Sum, Value, Case, When, CharField
 from django.db.models.functions import (
@@ -168,6 +169,9 @@ def burndown_plot(queryset, slug, project_id, cycle_id=None, module_id=None):
             if item["date"] is not None and item["date"] <= date
         )
         cumulative_pending_issues -= total_completed
-        chart_data[str(date)] = cumulative_pending_issues
+        if date > timezone.now().date():
+            chart_data[str(date)] = None
+        else:
+            chart_data[str(date)] = cumulative_pending_issues
 
     return chart_data

apiserver/requirements/base.txt

@@ -30,7 +30,7 @@ openpyxl==3.1.2
 beautifulsoup4==4.12.2
 dj-database-url==2.1.0
 posthog==3.0.2
-cryptography==41.0.5
+cryptography==41.0.6
 lxml==4.9.3
 boto3==1.28.40
 

apiserver/runtime.txt

@@ -1 +1 @@
-python-3.11.6
+python-3.11.7

deploy/1-click/install.sh

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

deploy/1-click/plane-app

@@ -0,0 +1,713 @@
+#!/bin/bash
+
+function print_header() {
+clear
+
+cat <<"EOF"
+---------------------------------------
+ ____  _                  
+|  _ \| | __ _ _ __   ___ 
+| |_) | |/ _` | '_ \ / _ \
+|  __/| | (_| | | | |  __/
+|_|   |_|\__,_|_| |_|\___|
+
+---------------------------------------
+Project management tool from the future
+---------------------------------------
+
+EOF
+}
+function update_env_files() {
+    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
+        touch "$config_file"
+    fi
+
+    # Check if the key already exists in the config file
+    if grep -q "^$key=" "$config_file"; then
+        awk -v key="$key" -v value="$value" -F '=' '{if ($1 == key) $2 = value} 1' OFS='=' "$config_file" > "$config_file.tmp" && mv "$config_file.tmp" "$config_file"
+    else
+        echo "$key=$value" >> "$config_file"
+    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
+        touch "$config_file"
+    fi
+
+    # Check if the key already exists in the config file
+    if grep -q "^$key=" "$config_file"; then
+        value=$(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_files "$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_files "$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 apt-get update -y &> /dev/null
+    sudo apt-get upgrade -y &> /dev/null
+
+    required_tools=("curl" "awk" "wget" "nano" "dialog" "git")
+
+    for tool in "${required_tools[@]}"; do
+        if ! command -v $tool &> /dev/null; then
+            sudo apt install -y $tool &> /dev/null
+        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
+        sudo curl -o- https://get.docker.com | bash - 
+
+        if [ "$EUID" -ne 0 ]; then
+            dockerd-rootless-setuptool.sh install &> /dev/null
+        fi
+        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
+    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 .env does not exists rename variables-upgrade.env to .env
+    if [ ! -f "$PLANE_INSTALL_DIR/.env" ]; then
+        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/makeplane/plane.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 $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
+    
+    update_env "DOCKERHUB_USER" "makeplane"
+    update_env "PULL_POLICY" "always"
+    CURR_DIR=$(pwd)
+    
+    if [ "$BRANCH" == "master" ]; then
+        update_env "APP_RELEASE" "latest"
+        export APP_RELEASE=latest
+    else
+        update_env "APP_RELEASE" "$BRANCH"
+        export APP_RELEASE=$BRANCH    
+    fi
+
+    if [ $CPU_ARCH == "amd64" ] || [ $CPU_ARCH == "x86_64" ]; then
+        # show_message "Building Plane Images for $CPU_ARCH is not required. Skipping... ✅" "replace_last_line" >&2
+        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" "myplane"
+        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
+    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_smtp_settings:   $save_smtp_settings
+            smtp_host:            $smtp_host
+            smtp_user:            $smtp_user
+            smtp_password:        $smtp_password
+            smtp_port:            $smtp_port
+            smtp_from:            $smtp_from
+            smtp_tls:             $smtp_tls
+            smtp_ssl:             $smtp_ssl
+
+            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=$(awk -F= '/^ID=/{print $2}' /etc/os-release)
+        # check the OS 
+        if [ "$OS_NAME" == "ubuntu" ]; 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
+                    printUsageInstructions
+
+                    update_config "INSTALLATION_DATE" "$(date)"
+                    
+                    show_message "Plane Installed Successfully ✅"
+                    show_message ""
+                else
+                    show_message "Download Failed ❌"
+                    exit 1
+                fi
+            else
+                show_message "Initialization Failed ❌"
+                exit 1
+            fi
+            
+        else
+            PROGRESS_MSG="❌❌❌ Unsupported OS Detected ❌❌❌"
+            show_message ""
+            exit 1
+        fi
+    else
+        PROGRESS_MSG="❌❌❌ Unsupported OS Detected : $(uname) ❌❌❌"
+        show_message ""
+        exit 1
+    fi
+}
+function upgrade() {
+    if [ "$(uname)" == "Linux" ]; then
+        OS="linux"
+        OS_NAME=$(awk -F= '/^ID=/{print $2}' /etc/os-release)
+        # check the OS 
+        if [ "$OS_NAME" == "ubuntu" ]; then
+            OS_SUPPORTED=true
+
+            prepare_environment
+
+            if [ $? -eq 0 ]; then
+                download_plane
+                if [ $? -eq 0 ]; then
+                    check_for_docker_images
+                    upgrade_configuration
+                    update_config "UPGRADE_DATE" "$(date)"
+                
+                    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 Detected"
+            show_message ""
+            exit 1
+        fi
+    else
+        PROGRESS_MSG="Unsupported OS Detected : $(uname)"
+        show_message ""
+        exit 1
+    fi
+}
+function uninstall() {
+    if [ "$(uname)" == "Linux" ]; then
+        OS="linux"
+        OS_NAME=$(awk -F= '/^ID=/{print $2}' /etc/os-release)
+        # check the OS 
+        if [ "$OS_NAME" == "ubuntu" ]; then
+            OS_SUPPORTED=true
+            show_message "******** Uninstalling Plane ********"
+            show_message ""
+
+            stop_server
+            # CHECK IF PLANE SERVICE EXISTS
+            # if [ -f "/etc/systemd/system/plane.service" ]; then
+            #     sudo systemctl stop plane.service &> /dev/null
+            #     sudo systemctl disable plane.service &> /dev/null
+            #     sudo rm /etc/systemd/system/plane.service &> /dev/null
+            #     sudo systemctl daemon-reload &> /dev/null
+            # fi
+            # show_message "- Plane Service removed ✅"
+
+            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" --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 apt-get purge -y docker-engine docker docker.io docker-ce docker-ce-cli docker-compose-plugin &> /dev/null
+                    sudo apt-get autoremove -y --purge docker-engine docker docker.io docker-ce docker-compose-plugin &> /dev/null
+                    show_message "- Docker Uninstalled ✅" "replace_last_line" >&2
+                fi
+            fi
+
+            rm $PLANE_INSTALL_DIR/.env &> /dev/null
+            rm $PLANE_INSTALL_DIR/variables-upgrade.env &> /dev/null
+            rm $PLANE_INSTALL_DIR/config.env &> /dev/null
+            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 Detected : $(uname) ❌"
+            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 ✋"
+        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 ! docker compose -f "$docker_compose_file" --env-file="$env_file" ps --services --filter "status=running" --quiet | grep -q "."; do
+            sleep 1
+        done
+        show_message "Plane Server Started ✅" "replace_last_line" >&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 ✋"
+        docker compose -f $docker_compose_file --env-file=$env_file down
+        show_message "Plane Server Stopped ✅" "replace_last_line" >&2
+    else
+        show_message "Plane Server not installed. Please install Plane first ❌" "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 ✋"
+        docker compose -f $docker_compose_file --env-file=$env_file restart
+        show_message "Plane Server Restarted ✅" "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
+    curl -H 'Cache-Control: no-cache, no-store' \
+        -s -o /usr/local/bin/plane-app  \
+        https://raw.githubusercontent.com/makeplane/plane/$BRANCH/deploy/1-click/install.sh?token=$(date +%s) 
+
+    chmod +x /usr/local/bin/plane-app > /dev/null&> /dev/null
+    show_message "Plane Installer Updated ✅" "replace_last_line" >&2
+}
+
+export BRANCH=${BRANCH:-master}
+export APP_RELEASE=$BRANCH
+export DOCKERHUB_USER=makeplane
+export PULL_POLICY=always
+
+PLANE_INSTALL_DIR=/opt/plane
+DATA_DIR=$PLANE_INSTALL_DIR/data
+LOG_DIR=$PLANE_INSTALL_DIR/log
+OS_SUPPORTED=false
+CPU_ARCH=$(uname -m)
+PROGRESS_MSG=""
+USE_GLOBAL_IMAGES=1
+
+mkdir -p $PLANE_INSTALL_DIR/{data,log}
+
+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
+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

@@ -122,6 +122,18 @@ services:
       - plane-db
       - plane-redis
 
+  migrator:
+    <<: *app-env
+    image: ${DOCKERHUB_USER:-makeplane}/plane-backend:${APP_RELEASE:-latest}
+    pull_policy: ${PULL_POLICY:-always}
+    restart: no
+    command: >
+        sh -c "python manage.py wait_for_db &&
+             python manage.py migrate"
+    depends_on:
+      - plane-db
+      - plane-redis
+
   plane-db:
     <<: *app-env
     image: postgres:15.2-alpine

docker-compose-local.yml

@@ -86,7 +86,7 @@ services:
       - dev_env
     volumes:
       - ./apiserver:/code
-    # command: /bin/sh -c "python manage.py migrate && python manage.py runserver 0.0.0.0:8000 --settings=plane.settings.local"
+    command: ./bin/takeoff.local
     env_file:
       - ./apiserver/.env
     depends_on:
@@ -104,7 +104,7 @@ services:
       - dev_env
     volumes:
       - ./apiserver:/code
-    command: /bin/sh -c "celery -A plane worker -l info"
+    command: ./bin/worker
     env_file:
       - ./apiserver/.env
     depends_on:
@@ -123,7 +123,7 @@ services:
       - dev_env
     volumes:
       - ./apiserver:/code
-    command: /bin/sh -c "celery -A plane beat -l info"
+    command: ./bin/beat
     env_file:
       - ./apiserver/.env
     depends_on:
@@ -131,6 +131,26 @@ services:
       - plane-db
       - plane-redis
 
+  migrator:
+    build:
+      context: ./apiserver
+      dockerfile: Dockerfile.dev
+      args:
+        DOCKER_BUILDKIT: 1
+    restart: no
+    networks:
+      - dev_env
+    volumes:
+      - ./apiserver:/code
+    command: >
+        sh -c "python manage.py wait_for_db --settings=plane.settings.local &&
+             python manage.py migrate --settings=plane.settings.local"
+    env_file:
+      - ./apiserver/.env
+    depends_on:
+      - plane-db
+      - plane-redis
+
   proxy:
     build:
       context: ./nginx

package.json

@@ -1,6 +1,6 @@
 {
   "repository": "https://github.com/makeplane/plane.git",
-  "version": "0.14.0",
+  "version": "0.15.0",
   "license": "AGPL-3.0",
   "private": true,
   "workspaces": [
@@ -15,7 +15,7 @@
   ],
   "scripts": {
     "build": "turbo run build",
-    "dev": "turbo run dev",
+    "dev": "turbo run dev --concurrency=13",
     "start": "turbo run start",
     "lint": "turbo run lint",
     "clean": "turbo run clean",
@@ -34,4 +34,4 @@
     "@types/react": "18.2.42"
   },
   "packageManager": "yarn@1.22.19"
-}
+}

packages/editor/core/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@plane/editor-core",
-  "version": "0.14.0",
+  "version": "0.15.0",
   "description": "Core Editor that powers Plane",
   "private": true,
   "main": "./dist/index.mjs",
@@ -30,7 +30,6 @@
   "dependencies": {
     "@tiptap/core": "^2.1.13",
     "@tiptap/extension-blockquote": "^2.1.13",
-    "@tiptap/extension-code": "^2.1.13",
     "@tiptap/extension-code-block-lowlight": "^2.1.13",
     "@tiptap/extension-color": "^2.1.13",
     "@tiptap/extension-image": "^2.1.13",

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

@@ -34,8 +34,32 @@ export const toggleUnderline = (editor: Editor, range?: Range) => {
 };
 
 export const toggleCodeBlock = (editor: Editor, range?: Range) => {
-  if (range) editor.chain().focus().deleteRange(range).toggleCodeBlock().run();
-  else editor.chain().focus().toggleCodeBlock().run();
+  // Check if code block is active then toggle code block
+  if (editor.isActive("codeBlock")) {
+    if (range) {
+      editor.chain().focus().deleteRange(range).toggleCodeBlock().run();
+      return;
+    }
+    editor.chain().focus().toggleCodeBlock().run();
+    return;
+  }
+
+  // Check if user hasn't selected any text
+  const isSelectionEmpty = editor.state.selection.empty;
+
+  if (isSelectionEmpty) {
+    if (range) {
+      editor.chain().focus().deleteRange(range).toggleCodeBlock().run();
+      return;
+    }
+    editor.chain().focus().toggleCodeBlock().run();
+  } else {
+    if (range) {
+      editor.chain().focus().deleteRange(range).toggleCode().run();
+      return;
+    }
+    editor.chain().focus().toggleCode().run();
+  }
 };
 
 export const toggleOrderedList = (editor: Editor, range?: Range) => {
@@ -59,8 +83,8 @@ export const toggleStrike = (editor: Editor, range?: Range) => {
 };
 
 export const toggleBlockquote = (editor: Editor, range?: Range) => {
-  if (range) editor.chain().focus().deleteRange(range).toggleNode("paragraph", "paragraph").toggleBlockquote().run();
-  else editor.chain().focus().toggleNode("paragraph", "paragraph").toggleBlockquote().run();
+  if (range) editor.chain().focus().deleteRange(range).toggleBlockquote().run();
+  else editor.chain().focus().toggleBlockquote().run();
 };
 
 export const insertTableCommand = (editor: Editor, range?: Range) => {

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

@@ -12,7 +12,7 @@ export const EditorContainer = ({ editor, editorClassNames, hideDragHandle, chil
   <div
     id="editor-container"
     onClick={() => {
-      editor?.chain().focus().run();
+      editor?.chain().focus(undefined, { scrollIntoView: false }).run();
     }}
     onMouseLeave={() => {
       hideDragHandle?.();

packages/editor/core/src/ui/extensions/code-inline/index.tsx

@@ -1,12 +1,80 @@
-import { markInputRule, markPasteRule } from "@tiptap/core";
-import Code from "@tiptap/extension-code";
+import { Mark, markInputRule, markPasteRule, mergeAttributes } from "@tiptap/core";
 
-export const inputRegex = /(?<!`)`([^`]*)`(?!`)/;
-export const pasteRegex = /(?<!`)`([^`]+)`(?!`)/g;
+export interface CodeOptions {
+  HTMLAttributes: Record<string, any>;
+}
+
+declare module "@tiptap/core" {
+  interface Commands<ReturnType> {
+    code: {
+      /**
+       * Set a code mark
+       */
+      setCode: () => ReturnType;
+      /**
+       * Toggle inline code
+       */
+      toggleCode: () => ReturnType;
+      /**
+       * Unset a code mark
+       */
+      unsetCode: () => ReturnType;
+    };
+  }
+}
+
+export const inputRegex = /(?:^|\s)((?:`)((?:[^`]+))(?:`))$/;
+export const pasteRegex = /(?:^|\s)((?:`)((?:[^`]+))(?:`))/g;
+
+export const CustomCodeInlineExtension = Mark.create<CodeOptions>({
+  name: "code",
+
+  addOptions() {
+    return {
+      HTMLAttributes: {
+        class: "rounded-md bg-custom-primary-30 mx-1 px-1 py-[2px] font-mono font-medium text-custom-text-1000",
+        spellcheck: "false",
+      },
+    };
+  },
+
+  excludes: "_",
+
+  code: true,
 
-export const CustomCodeInlineExtension = Code.extend({
   exitable: true,
-  inclusive: false,
+
+  parseHTML() {
+    return [{ tag: "code" }];
+  },
+
+  renderHTML({ HTMLAttributes }) {
+    return ["code", mergeAttributes(this.options.HTMLAttributes, HTMLAttributes), 0];
+  },
+
+  addCommands() {
+    return {
+      setCode:
+        () =>
+        ({ commands }) =>
+          commands.setMark(this.name),
+      toggleCode:
+        () =>
+        ({ commands }) =>
+          commands.toggleMark(this.name),
+      unsetCode:
+        () =>
+        ({ commands }) =>
+          commands.unsetMark(this.name),
+    };
+  },
+
+  addKeyboardShortcuts() {
+    return {
+      "Mod-e": () => this.editor.commands.toggleCode(),
+    };
+  },
+
   addInputRules() {
     return [
       markInputRule({
@@ -15,6 +83,7 @@ export const CustomCodeInlineExtension = Code.extend({
       }),
     ];
   },
+
   addPasteRules() {
     return [
       markPasteRule({
@@ -23,9 +92,4 @@ export const CustomCodeInlineExtension = Code.extend({
       }),
     ];
   },
-}).configure({
-  HTMLAttributes: {
-    class: "rounded-md bg-custom-primary-30 mx-1 px-1 py-[2px] font-mono font-medium text-custom-text-1000",
-    spellcheck: "false",
-  },
 });

packages/editor/core/src/ui/extensions/horizontal-rule.tsx

@@ -1,109 +0,0 @@
-import { TextSelection } from "prosemirror-state";
-
-import { InputRule, mergeAttributes, Node, nodeInputRule, wrappingInputRule } from "@tiptap/core";
-
-/**
- * Extension based on:
- * - Tiptap HorizontalRule extension (https://tiptap.dev/api/nodes/horizontal-rule)
- */
-
-export interface HorizontalRuleOptions {
-  HTMLAttributes: Record<string, any>;
-}
-
-declare module "@tiptap/core" {
-  interface Commands<ReturnType> {
-    horizontalRule: {
-      /**
-       * Add a horizontal rule
-       */
-      setHorizontalRule: () => ReturnType;
-    };
-  }
-}
-
-export const HorizontalRule = Node.create<HorizontalRuleOptions>({
-  name: "horizontalRule",
-
-  addOptions() {
-    return {
-      HTMLAttributes: {},
-    };
-  },
-
-  group: "block",
-
-  addAttributes() {
-    return {
-      color: {
-        default: "#dddddd",
-      },
-    };
-  },
-
-  parseHTML() {
-    return [
-      {
-        tag: `div[data-type="${this.name}"]`,
-      },
-    ];
-  },
-
-  renderHTML({ HTMLAttributes }) {
-    return [
-      "div",
-      mergeAttributes(this.options.HTMLAttributes, HTMLAttributes, {
-        "data-type": this.name,
-      }),
-      ["div", {}],
-    ];
-  },
-
-  addCommands() {
-    return {
-      setHorizontalRule:
-        () =>
-        ({ chain }) => {
-          return (
-            chain()
-              .insertContent({ type: this.name })
-              // set cursor after horizontal rule
-              .command(({ tr, dispatch }) => {
-                if (dispatch) {
-                  const { $to } = tr.selection;
-                  const posAfter = $to.end();
-
-                  if ($to.nodeAfter) {
-                    tr.setSelection(TextSelection.create(tr.doc, $to.pos));
-                  } else {
-                    // add node after horizontal rule if it’s the end of the document
-                    const node = $to.parent.type.contentMatch.defaultType?.create();
-
-                    if (node) {
-                      tr.insert(posAfter, node);
-                      tr.setSelection(TextSelection.create(tr.doc, posAfter));
-                    }
-                  }
-
-                  tr.scrollIntoView();
-                }
-
-                return true;
-              })
-              .run()
-          );
-        },
-    };
-  },
-
-  addInputRules() {
-    return [
-      new InputRule({
-        find: /^(?:---|—-|___\s|\*\*\*\s)$/,
-        handler: ({ state, range, match }) => {
-          state.tr.replaceRangeWith(range.from, range.to, this.type.create());
-        },
-      }),
-    ];
-  },
-});

packages/editor/core/src/ui/extensions/index.tsx

@@ -1,26 +1,25 @@
-import StarterKit from "@tiptap/starter-kit";
-import TiptapUnderline from "@tiptap/extension-underline";
-import TextStyle from "@tiptap/extension-text-style";
 import { Color } from "@tiptap/extension-color";
 import TaskItem from "@tiptap/extension-task-item";
 import TaskList from "@tiptap/extension-task-list";
+import TextStyle from "@tiptap/extension-text-style";
+import TiptapUnderline from "@tiptap/extension-underline";
+import StarterKit from "@tiptap/starter-kit";
 import { Markdown } from "tiptap-markdown";
 
-import { TableHeader } from "src/ui/extensions/table/table-header/table-header";
 import { Table } from "src/ui/extensions/table/table";
 import { TableCell } from "src/ui/extensions/table/table-cell/table-cell";
+import { TableHeader } from "src/ui/extensions/table/table-header/table-header";
 import { TableRow } from "src/ui/extensions/table/table-row/table-row";
-import { HorizontalRule } from "src/ui/extensions/horizontal-rule";
 
 import { ImageExtension } from "src/ui/extensions/image";
 
 import { isValidHttpUrl } from "src/lib/utils";
 import { Mentions } from "src/ui/mentions";
 
-import { CustomKeymap } from "src/ui/extensions/keymap";
 import { CustomCodeBlockExtension } from "src/ui/extensions/code";
-import { CustomQuoteExtension } from "src/ui/extensions/quote";
 import { ListKeymap } from "src/ui/extensions/custom-list-keymap";
+import { CustomKeymap } from "src/ui/extensions/keymap";
+import { CustomQuoteExtension } from "src/ui/extensions/quote";
 
 import { DeleteImage } from "src/types/delete-image";
 import { IMentionSuggestion } from "src/types/mention-suggestion";
@@ -55,7 +54,9 @@ export const CoreEditorExtensions = (
     },
     code: false,
     codeBlock: false,
-    horizontalRule: false,
+    horizontalRule: {
+      HTMLAttributes: { class: "mt-4 mb-4" },
+    },
     blockquote: false,
     dropcursor: {
       color: "rgba(var(--color-text-100))",
@@ -104,7 +105,6 @@ export const CoreEditorExtensions = (
     transformCopiedText: true,
     transformPastedText: true,
   }),
-  HorizontalRule,
   Table,
   TableHeader,
   TableCell,

packages/editor/core/src/ui/mentions/custom.tsx

@@ -10,6 +10,11 @@ export interface CustomMentionOptions extends MentionOptions {
 }
 
 export const CustomMention = Mention.extend<CustomMentionOptions>({
+  addStorage(this) {
+    return {
+      mentionsOpen: false,
+    };
+  },
   addAttributes() {
     return {
       id: {

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

@@ -14,6 +14,7 @@ export const Suggestion = (suggestions: IMentionSuggestion[]) => ({
 
     return {
       onStart: (props: { editor: Editor; clientRect: DOMRect }) => {
+        props.editor.storage.mentionsOpen = true;
         reactRenderer = new ReactRenderer(MentionList, {
           props,
           editor: props.editor,
@@ -45,10 +46,18 @@ export const Suggestion = (suggestions: IMentionSuggestion[]) => ({
           return true;
         }
 
-        // @ts-ignore
-        return reactRenderer?.ref?.onKeyDown(props);
+        const navigationKeys = ["ArrowUp", "ArrowDown", "Enter"];
+
+        if (navigationKeys.includes(props.event.key)) {
+          // @ts-ignore
+          reactRenderer?.ref?.onKeyDown(props);
+          event?.stopPropagation();
+          return true;
+        }
+        return false;
       },
-      onExit: () => {
+      onExit: (props: { editor: Editor; event: KeyboardEvent }) => {
+        props.editor.storage.mentionsOpen = false;
         popup?.[0].destroy();
         reactRenderer?.destroy();
       },

packages/editor/core/src/ui/menus/menu-items/index.tsx

@@ -106,7 +106,7 @@ export const TodoListItem = (editor: Editor): EditorMenuItem => ({
 
 export const CodeItem = (editor: Editor): EditorMenuItem => ({
   name: "code",
-  isActive: () => editor?.isActive("code"),
+  isActive: () => editor?.isActive("code") || editor?.isActive("codeBlock"),
   command: () => toggleCodeBlock(editor),
   icon: CodeIcon,
 });
@@ -120,7 +120,7 @@ export const NumberedListItem = (editor: Editor): EditorMenuItem => ({
 
 export const QuoteItem = (editor: Editor): EditorMenuItem => ({
   name: "quote",
-  isActive: () => editor?.isActive("quote"),
+  isActive: () => editor?.isActive("blockquote"),
   command: () => toggleBlockquote(editor),
   icon: QuoteIcon,
 });

packages/editor/core/src/ui/read-only/extensions.tsx

@@ -11,7 +11,6 @@ import { TableHeader } from "src/ui/extensions/table/table-header/table-header";
 import { Table } from "src/ui/extensions/table/table";
 import { TableCell } from "src/ui/extensions/table/table-cell/table-cell";
 import { TableRow } from "src/ui/extensions/table/table-row/table-row";
-import { HorizontalRule } from "src/ui/extensions/horizontal-rule";
 
 import { ReadOnlyImageExtension } from "src/ui/extensions/image/read-only-image";
 import { isValidHttpUrl } from "src/lib/utils";
@@ -51,7 +50,9 @@ export const CoreReadOnlyEditorExtensions = (mentionConfig: {
       },
     },
     codeBlock: false,
-    horizontalRule: false,
+    horizontalRule: {
+      HTMLAttributes: { class: "mt-4 mb-4" },
+    },
     dropcursor: {
       color: "rgba(var(--color-text-100))",
       width: 2,
@@ -72,7 +73,6 @@ export const CoreReadOnlyEditorExtensions = (mentionConfig: {
       class: "rounded-lg border border-custom-border-300",
     },
   }),
-  HorizontalRule,
   TiptapUnderline,
   TextStyle,
   Color,

packages/editor/document-editor/package.json

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

packages/editor/document-editor/src/ui/components/page-renderer.tsx

@@ -27,11 +27,20 @@ type IPageRenderer = {
   }) => void;
   editorClassNames: string;
   editorContentCustomClassNames?: string;
+  hideDragHandle?: () => void;
   readonly: boolean;
 };
 
 export const PageRenderer = (props: IPageRenderer) => {
-  const { documentDetails, editor, editorClassNames, editorContentCustomClassNames, updatePageTitle, readonly } = props;
+  const {
+    documentDetails,
+    editor,
+    editorClassNames,
+    editorContentCustomClassNames,
+    updatePageTitle,
+    readonly,
+    hideDragHandle,
+  } = props;
 
   const [pageTitle, setPagetitle] = useState(documentDetails.title);
 
@@ -65,14 +74,6 @@ export const PageRenderer = (props: IPageRenderer) => {
     setIsOpen(false);
   };
 
-  const switchLinkView = (view: "LinkPreview" | "LinkEditView" | "LinkInputView") => {
-    if (!linkViewProps) return;
-    setLinkViewProps({
-      ...linkViewProps,
-      view: view,
-    });
-  };
-
   const handleLinkHover = useCallback(
     (event: React.MouseEvent) => {
       if (!editor) return;
@@ -167,7 +168,7 @@ export const PageRenderer = (props: IPageRenderer) => {
         />
       )}
       <div className="flex relative h-full w-full flex-col pr-5 editor-renderer" onMouseOver={handleLinkHover}>
-        <EditorContainer editor={editor} editorClassNames={editorClassNames}>
+        <EditorContainer hideDragHandle={hideDragHandle} editor={editor} editorClassNames={editorClassNames}>
           <EditorContentWrapper editor={editor} editorContentCustomClassNames={editorContentCustomClassNames} />
         </EditorContainer>
       </div>

packages/editor/document-editor/src/ui/extensions/index.tsx

@@ -1,55 +1,29 @@
 import Placeholder from "@tiptap/extension-placeholder";
-import { IssueWidgetExtension } from "src/ui/extensions/widgets/issue-embed-widget";
-
-import { IIssueEmbedConfig } from "src/ui/extensions/widgets/issue-embed-widget/types";
+import { IssueWidgetPlaceholder } from "src/ui/extensions/widgets/issue-embed-widget";
 
 import { SlashCommand, DragAndDrop } from "@plane/editor-extensions";
-import { ISlashCommandItem, UploadImage } from "@plane/editor-core";
-import { IssueSuggestions } from "src/ui/extensions/widgets/issue-embed-suggestion-list";
-import { LayersIcon } from "@plane/ui";
+import { UploadImage } from "@plane/editor-core";
 
 export const DocumentEditorExtensions = (
   uploadFile: UploadImage,
-  issueEmbedConfig?: IIssueEmbedConfig,
+  setHideDragHandle?: (hideDragHandlerFromDragDrop: () => void) => void,
   setIsSubmitting?: (isSubmitting: "submitting" | "submitted" | "saved") => void
-) => {
-  const additionalOptions: ISlashCommandItem[] = [
-    {
-      key: "issue_embed",
-      title: "Issue embed",
-      description: "Embed an issue from the project.",
-      searchTerms: ["issue", "link", "embed"],
-      icon: <LayersIcon className="h-3.5 w-3.5" />,
-      command: ({ editor, range }) => {
-        editor
-          .chain()
-          .focus()
-          .insertContentAt(
-            range,
-            "<p class='text-sm bg-gray-300 w-fit pl-3 pr-3 pt-1 pb-1 rounded shadow-sm'>#issue_</p>\n"
-          )
-          .run();
-      },
+) => [
+  SlashCommand(uploadFile, setIsSubmitting),
+  DragAndDrop(setHideDragHandle),
+  Placeholder.configure({
+    placeholder: ({ node }) => {
+      if (node.type.name === "heading") {
+        return `Heading ${node.attrs.level}`;
+      }
+      if (node.type.name === "image" || node.type.name === "table") {
+        return "";
+      }
+
+      return "Press '/' for commands...";
     },
-  ];
+    includeChildren: true,
+  }),
+  IssueWidgetPlaceholder(),
+];
 
-  return [
-    SlashCommand(uploadFile, setIsSubmitting, additionalOptions),
-    DragAndDrop,
-    Placeholder.configure({
-      placeholder: ({ node }) => {
-        if (node.type.name === "heading") {
-          return `Heading ${node.attrs.level}`;
-        }
-        if (node.type.name === "image" || node.type.name === "table") {
-          return "";
-        }
-
-        return "Press '/' for commands...";
-      },
-      includeChildren: true,
-    }),
-    IssueWidgetExtension({ issueEmbedConfig }),
-    IssueSuggestions(issueEmbedConfig ? issueEmbedConfig.issues : []),
-  ];
-};

packages/editor/document-editor/src/ui/extensions/widgets/issue-embed-suggestion-list/issue-suggestion-renderer.tsx

@@ -78,7 +78,6 @@ const IssueSuggestionList = ({
     const navigationKeys = ["ArrowUp", "ArrowDown", "Enter", "Tab"];
     const onKeyDown = (e: KeyboardEvent) => {
       if (navigationKeys.includes(e.key)) {
-        e.preventDefault();
         // if (editor.isFocused) {
         //   editor.chain().blur();
         //   commandListContainer.current?.focus();
@@ -87,7 +86,6 @@ const IssueSuggestionList = ({
           setSelectedIndex(
             (selectedIndex + displayedItems[currentSection].length - 1) % displayedItems[currentSection].length
           );
-          e.stopPropagation();
           return true;
         }
         if (e.key === "ArrowDown") {
@@ -102,12 +100,10 @@ const IssueSuggestionList = ({
               [currentSection]: [...prevItems[currentSection], ...nextItems],
             }));
           }
-          e.stopPropagation();
           return true;
         }
         if (e.key === "Enter") {
           selectItem(currentSection, selectedIndex);
-          e.stopPropagation();
           return true;
         }
         if (e.key === "Tab") {
@@ -115,7 +111,6 @@ const IssueSuggestionList = ({
           const nextSectionIndex = (currentSectionIndex + 1) % sections.length;
           setCurrentSection(sections[nextSectionIndex]);
           setSelectedIndex(0);
-          e.stopPropagation();
           return true;
         }
         return false;
@@ -150,7 +145,7 @@ const IssueSuggestionList = ({
     <div
       id="issue-list-container"
       ref={commandListContainer}
-      className="fixed z-[10] max-h-80 w-60 overflow-y-auto overflow-x-hidden rounded-md border border-custom-border-100 bg-custom-background-100 px-1 shadow-custom-shadow-xs transition-all"
+      className=" fixed z-[10] max-h-80 w-60 overflow-y-auto overflow-x-hidden rounded-md border border-custom-border-100 bg-custom-background-100 px-1 shadow-custom-shadow-xs transition-all"
     >
       {sections.map((section) => {
         const sectionItems = displayedItems[section];
@@ -193,29 +188,35 @@ const IssueSuggestionList = ({
     </div>
   ) : null;
 };
-
 export const IssueListRenderer = () => {
   let component: ReactRenderer | null = null;
   let popup: any | null = null;
 
   return {
     onStart: (props: { editor: Editor; clientRect?: (() => DOMRect | null) | null }) => {
+      const container = document.querySelector(".frame-renderer") as HTMLElement;
       component = new ReactRenderer(IssueSuggestionList, {
         props,
         // @ts-ignore
         editor: props.editor,
       });
-
       // @ts-ignore
-      popup = tippy("body", {
+      popup = tippy(".frame-renderer", {
+        flipbehavior: ["bottom", "top"],
+        appendTo: () => document.querySelector(".frame-renderer") as HTMLElement,
+        flip: true,
+        flipOnUpdate: true,
         getReferenceClientRect: props.clientRect,
-        appendTo: () => document.querySelector("#editor-container"),
         content: component.element,
         showOnCreate: true,
         interactive: true,
         trigger: "manual",
         placement: "bottom-start",
       });
+
+      container.addEventListener("scroll", () => {
+        popup?.[0].destroy();
+      });
     },
     onUpdate: (props: { editor: Editor; clientRect?: (() => DOMRect | null) | null }) => {
       component?.updateProps(props);
@@ -230,10 +231,20 @@ export const IssueListRenderer = () => {
         popup?.[0].hide();
         return true;
       }
-      // @ts-ignore
-      return component?.ref?.onKeyDown(props);
+
+      const navigationKeys = ["ArrowUp", "ArrowDown", "Enter", "Tab"];
+      if (navigationKeys.includes(props.event.key)) {
+        // @ts-ignore
+        component?.ref?.onKeyDown(props);
+        return true;
+      }
+      return false;
     },
     onExit: (e) => {
+      const container = document.querySelector(".frame-renderer") as HTMLElement;
+      if (container) {
+        container.removeEventListener("scroll", () => {});
+      }
       popup?.[0].destroy();
       setTimeout(() => {
         component?.destroy();

packages/editor/document-editor/src/ui/extensions/widgets/issue-embed-widget/index.tsx

@@ -1,11 +1,3 @@
 import { IssueWidget } from "src/ui/extensions/widgets/issue-embed-widget/issue-widget-node";
-import { IIssueEmbedConfig } from "src/ui/extensions/widgets/issue-embed-widget/types";
 
-interface IssueWidgetExtensionProps {
-  issueEmbedConfig?: IIssueEmbedConfig;
-}
-
-export const IssueWidgetExtension = ({ issueEmbedConfig }: IssueWidgetExtensionProps) =>
-  IssueWidget.configure({
-    issueEmbedConfig,
-  });
+export const IssueWidgetPlaceholder = () => IssueWidget.configure({});

packages/editor/document-editor/src/ui/extensions/widgets/issue-embed-widget/issue-widget-card.tsx

@@ -1,77 +1,33 @@
 // @ts-nocheck
-import { useState, useEffect } from "react";
+import { Button } from "@plane/ui";
 import { NodeViewWrapper } from "@tiptap/react";
-import { Avatar, AvatarGroup, Loader, PriorityIcon } from "@plane/ui";
-import { Calendar, AlertTriangle } from "lucide-react";
+import { Crown } from "lucide-react";
 
-export const IssueWidgetCard = (props) => {
-  const [loading, setLoading] = useState<number>(1);
-  const [issueDetails, setIssueDetails] = useState();
-
-  useEffect(() => {
-    props.issueEmbedConfig
-      .fetchIssue(props.node.attrs.entity_identifier)
-      .then((issue) => {
-        setIssueDetails(issue);
-        setLoading(0);
-      })
-      .catch(() => {
-        setLoading(-1);
-      });
-  }, []);
-
-  const completeIssueEmbedAction = () => {
-    props.issueEmbedConfig.clickAction(issueDetails.id, props.node.attrs.title);
-  };
-
-  return (
-    <NodeViewWrapper className="issue-embed-component m-2">
-      {loading == 0 ? (
-        <div
-          onClick={completeIssueEmbedAction}
-          className={`${
-            props.selected ? "border-custom-primary-200 border-[2px]" : ""
-          } w-full cursor-pointer space-y-2 rounded-md border-[0.5px] border-custom-border-200 p-3 shadow-custom-shadow-2xs`}
-        >
-          <h5 className="text-xs text-custom-text-300">
-            {issueDetails.project_detail.identifier}-{issueDetails.sequence_id}
-          </h5>
-          <h4 className="break-words text-sm font-medium">{issueDetails.name}</h4>
-          <div className="flex flex-wrap items-center gap-x-3 gap-y-2">
-            <div>
-              <PriorityIcon priority={issueDetails.priority} />
+export const IssueWidgetCard = (props) => (
+  <NodeViewWrapper className="issue-embed-component m-2">
+    <div
+      className={`${
+        props.selected ? "border-custom-primary-200 border-[2px]" : ""
+      } w-full h-[100px] cursor-pointer space-y-2 rounded-md border-[0.5px] border-custom-border-200 shadow-custom-shadow-2xs`}
+    >
+      <h5 className="h-[20%] text-xs text-custom-text-300 p-2">
+        {props.node.attrs.project_identifier}-{props.node.attrs.sequence_id}
+      </h5>
+      <div className="relative h-[71%]">
+        <div className="h-full backdrop-filter backdrop-blur-[30px] bg-custom-background-80 bg-opacity-30 flex items-center w-full justify-between gap-5 mt-2.5 pl-4 pr-5 py-3 max-md:max-w-full max-md:flex-wrap relative">
+          <div className="flex gap-2 items-center">
+            <div className="rounded">
+              <Crown className="m-2" size={16} color="#FFBA18" />
             </div>
-            <div>
-              <AvatarGroup size="sm">
-                {issueDetails.assignee_details.map((assignee) => (
-                  <Avatar key={assignee.id} name={assignee.display_name} src={assignee.avatar} className={"m-0"} />
-                ))}
-              </AvatarGroup>
+            <div className="text-custom-text text-sm">
+              Embed and access issues in pages seamlessly, upgrade to plane pro now.
             </div>
-            {issueDetails.target_date && (
-              <div className="flex h-5 items-center gap-1 rounded border-[0.5px] border-custom-border-300 px-2.5 py-1 text-xs text-custom-text-100">
-                <Calendar className="h-3 w-3" strokeWidth={1.5} />
-                {new Date(issueDetails.target_date).toLocaleDateString()}
-              </div>
-            )}
           </div>
+          <a href="https://plane.so/pricing" target="_blank" rel="noreferrer">
+            <Button>Upgrade</Button>
+          </a>
         </div>
-      ) : loading == -1 ? (
-        <div className="flex items-center gap-[8px] rounded border-2 border-[#D97706] bg-[#FFFBEB] pb-[10px] pl-[13px] pt-[10px] text-[#D97706]">
-          <AlertTriangle color={"#D97706"} />
-          {"This Issue embed is not found in any project. It can no longer be updated or accessed from here."}
-        </div>
-      ) : (
-        <div className="w-full space-y-2 rounded-md border-[0.5px] border-custom-border-200 p-3 shadow-custom-shadow-2xs">
-          <Loader className={"px-6"}>
-            <Loader.Item height={"30px"} />
-            <div className={"mt-3 space-y-2"}>
-              <Loader.Item height={"20px"} width={"70%"} />
-              <Loader.Item height={"20px"} width={"60%"} />
-            </div>
-          </Loader>
-        </div>
-      )}
-    </NodeViewWrapper>
-  );
-};
+      </div>
+    </div>
+  </NodeViewWrapper>
+);

packages/editor/document-editor/src/ui/extensions/widgets/issue-embed-widget/issue-widget-node.tsx

@@ -34,9 +34,7 @@ export const IssueWidget = Node.create({
   },
 
   addNodeView() {
-    return ReactNodeViewRenderer((props: Object) => (
-      <IssueWidgetCard {...props} issueEmbedConfig={this.options.issueEmbedConfig} />
-    ));
+    return ReactNodeViewRenderer((props: Object) => <IssueWidgetCard {...props} />);
   },
 
   parseHTML() {

packages/editor/document-editor/src/ui/extensions/widgets/issue-embed-widget/types.ts

@@ -1,9 +0,0 @@
-export interface IEmbedConfig {
-  issueEmbedConfig: IIssueEmbedConfig;
-}
-
-export interface IIssueEmbedConfig {
-  fetchIssue: (issueId: string) => Promise<any>;
-  clickAction: (issueId: string, issueTitle: string) => void;
-  issues: Array<any>;
-}

packages/editor/document-editor/src/ui/index.tsx

@@ -10,7 +10,6 @@ import { DocumentDetails } from "src/types/editor-types";
 import { PageRenderer } from "src/ui/components/page-renderer";
 import { getMenuOptions } from "src/utils/menu-options";
 import { useRouter } from "next/router";
-import { IEmbedConfig } from "src/ui/extensions/widgets/issue-embed-widget/types";
 
 interface IDocumentEditor {
   // document info
@@ -47,7 +46,6 @@ interface IDocumentEditor {
   duplicationConfig?: IDuplicationConfig;
   pageLockConfig?: IPageLockConfig;
   pageArchiveConfig?: IPageArchiveConfig;
-  embedConfig?: IEmbedConfig;
 }
 interface DocumentEditorProps extends IDocumentEditor {
   forwardedRef?: React.Ref<EditorHandle>;
@@ -75,17 +73,23 @@ const DocumentEditor = ({
   duplicationConfig,
   pageLockConfig,
   pageArchiveConfig,
-  embedConfig,
   updatePageTitle,
   cancelUploadImage,
   onActionCompleteHandler,
   rerenderOnPropsChange,
 }: IDocumentEditor) => {
-  // const [alert, setAlert] = useState<string>("")
   const { markings, updateMarkings } = useEditorMarkings();
   const [sidePeekVisible, setSidePeekVisible] = useState(true);
   const router = useRouter();
 
+  const [hideDragHandleOnMouseLeave, setHideDragHandleOnMouseLeave] = React.useState<() => void>(() => {});
+
+  // this essentially sets the hideDragHandle function from the DragAndDrop extension as the Plugin
+  // loads such that we can invoke it from react when the cursor leaves the container
+  const setHideDragHandleFunction = (hideDragHandlerFromDragDrop: () => void) => {
+    setHideDragHandleOnMouseLeave(() => hideDragHandlerFromDragDrop);
+  };
+
   const editor = useEditor({
     onChange(json, html) {
       updateMarkings(json);
@@ -104,7 +108,7 @@ const DocumentEditor = ({
     cancelUploadImage,
     rerenderOnPropsChange,
     forwardedRef,
-    extensions: DocumentEditorExtensions(uploadFile, embedConfig?.issueEmbedConfig, setIsSubmitting),
+    extensions: DocumentEditorExtensions(uploadFile, setHideDragHandleFunction, setIsSubmitting),
   });
 
   if (!editor) {
@@ -145,13 +149,14 @@ const DocumentEditor = ({
         documentDetails={documentDetails}
         isSubmitting={isSubmitting}
       />
-      <div className="flex h-full w-full overflow-y-auto">
+      <div className="flex h-full w-full overflow-y-auto frame-renderer">
         <div className="sticky top-0 h-full w-56 flex-shrink-0 lg:w-72">
           <SummarySideBar editor={editor} markings={markings} sidePeekVisible={sidePeekVisible} />
         </div>
-        <div className="h-full w-[calc(100%-14rem)] lg:w-[calc(100%-18rem-18rem)]">
+        <div className="h-full w-[calc(100%-14rem)] lg:w-[calc(100%-18rem-18rem)] page-renderer">
           <PageRenderer
             onActionCompleteHandler={onActionCompleteHandler}
+            hideDragHandle={hideDragHandleOnMouseLeave}
             readonly={false}
             editor={editor}
             editorContentCustomClassNames={editorContentCustomClassNames}

packages/editor/document-editor/src/ui/readonly/index.tsx

@@ -4,12 +4,11 @@ import { useState, forwardRef, useEffect } from "react";
 import { EditorHeader } from "src/ui/components/editor-header";
 import { PageRenderer } from "src/ui/components/page-renderer";
 import { SummarySideBar } from "src/ui/components/summary-side-bar";
-import { IssueWidgetExtension } from "src/ui/extensions/widgets/issue-embed-widget";
-import { IEmbedConfig } from "src/ui/extensions/widgets/issue-embed-widget/types";
 import { useEditorMarkings } from "src/hooks/use-editor-markings";
 import { DocumentDetails } from "src/types/editor-types";
 import { IPageArchiveConfig, IPageLockConfig, IDuplicationConfig } from "src/types/menu-actions";
 import { getMenuOptions } from "src/utils/menu-options";
+import { IssueWidgetPlaceholder } from "../extensions/widgets/issue-embed-widget";
 
 interface IDocumentReadOnlyEditor {
   value: string;
@@ -29,7 +28,6 @@ interface IDocumentReadOnlyEditor {
     message: string;
     type: "success" | "error" | "warning" | "info";
   }) => void;
-  embedConfig?: IEmbedConfig;
 }
 
 interface DocumentReadOnlyEditorProps extends IDocumentReadOnlyEditor {
@@ -51,7 +49,6 @@ const DocumentReadOnlyEditor = ({
   pageDuplicationConfig,
   pageLockConfig,
   pageArchiveConfig,
-  embedConfig,
   rerenderOnPropsChange,
   onActionCompleteHandler,
 }: DocumentReadOnlyEditorProps) => {
@@ -63,7 +60,7 @@ const DocumentReadOnlyEditor = ({
     value,
     forwardedRef,
     rerenderOnPropsChange,
-    extensions: [IssueWidgetExtension({ issueEmbedConfig: embedConfig?.issueEmbedConfig })],
+    extensions: [IssueWidgetPlaceholder()],
   });
 
   useEffect(() => {
@@ -105,11 +102,11 @@ const DocumentReadOnlyEditor = ({
         documentDetails={documentDetails}
         archivedAt={pageArchiveConfig && pageArchiveConfig.archived_at}
       />
-      <div className="flex h-full w-full overflow-y-auto">
+      <div className="flex h-full w-full overflow-y-auto frame-renderer">
         <div className="sticky top-0 h-full w-56 flex-shrink-0 lg:w-80">
           <SummarySideBar editor={editor} markings={markings} sidePeekVisible={sidePeekVisible} />
         </div>
-        <div className="h-full w-[calc(100%-14rem)] lg:w-[calc(100%-18rem-18rem)]">
+        <div className="h-full w-[calc(100%-14rem)] lg:w-[calc(100%-18rem-18rem)] page-renderer">
           <PageRenderer
             onActionCompleteHandler={onActionCompleteHandler}
             updatePageTitle={() => Promise.resolve()}

packages/editor/extensions/package.json

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

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

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

packages/editor/lite-text-editor/src/ui/extensions/enter-key-extension.tsx

@@ -4,13 +4,16 @@ export const EnterKeyExtension = (onEnterKeyPress?: () => void) =>
   Extension.create({
     name: "enterKey",
 
-    addKeyboardShortcuts() {
+    addKeyboardShortcuts(this) {
       return {
         Enter: () => {
-          if (onEnterKeyPress) {
-            onEnterKeyPress();
+          if (!this.editor.storage.mentionsOpen) {
+            if (onEnterKeyPress) {
+              onEnterKeyPress();
+            }
+            return true;
           }
-          return true;
+          return false;
         },
         "Shift-Enter": ({ editor }) =>
           editor.commands.first(({ commands }) => [

packages/editor/lite-text-editor/src/ui/extensions/index.tsx

@@ -1,5 +1,3 @@
 import { EnterKeyExtension } from "src/ui/extensions/enter-key-extension";
 
-export const LiteTextEditorExtensions = (onEnterKeyPress?: () => void) => [
-  // EnterKeyExtension(onEnterKeyPress),
-];
+export const LiteTextEditorExtensions = (onEnterKeyPress?: () => void) => [EnterKeyExtension(onEnterKeyPress)];

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

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

packages/eslint-config-custom/package.json

@@ -1,7 +1,7 @@
 {
   "name": "eslint-config-custom",
   "private": true,
-  "version": "0.14.0",
+  "version": "0.15.0",
   "main": "index.js",
   "license": "MIT",
   "dependencies": {

packages/services/ai/ai.service.ts

@@ -0,0 +1,24 @@
+import { APIService } from "../api.service";
+// types
+import { GptApiResponse } from "@plane/types";
+
+export class AIService extends APIService {
+  constructor(BASE_URL: string) {
+    super(BASE_URL);
+  }
+
+  async createGptTask(
+    workspaceSlug: string,
+    projectId: string,
+    data: { prompt: string; task: string }
+  ): Promise<GptApiResponse> {
+    return this.post(
+      `/api/workspaces/${workspaceSlug}/projects/${projectId}/ai-assistant/`,
+      data
+    )
+      .then((response) => response?.data)
+      .catch((error) => {
+        throw error?.response;
+      });
+  }
+}

packages/services/analytics/analytics.service.ts

@@ -0,0 +1,63 @@
+// services
+import { APIService } from "services/api.service";
+// types
+import {
+  IAnalyticsParams,
+  IAnalyticsResponse,
+  IDefaultAnalyticsResponse,
+  IExportAnalyticsFormData,
+  ISaveAnalyticsFormData,
+} from "@plane/types";
+// helpers
+import { API_BASE_URL } from "helpers/common.helper";
+
+export class AnalyticsService extends APIService {
+  constructor() {
+    super(API_BASE_URL);
+  }
+
+  async getAnalytics(workspaceSlug: string, params: IAnalyticsParams): Promise<IAnalyticsResponse> {
+    return this.get(`/api/workspaces/${workspaceSlug}/analytics/`, {
+      params: {
+        ...params,
+        project: params?.project ? params.project.toString() : null,
+      },
+    })
+      .then((response) => response?.data)
+      .catch((error) => {
+        throw error?.response?.data;
+      });
+  }
+
+  async getDefaultAnalytics(
+    workspaceSlug: string,
+    params?: Partial<IAnalyticsParams>
+  ): Promise<IDefaultAnalyticsResponse> {
+    return this.get(`/api/workspaces/${workspaceSlug}/default-analytics/`, {
+      params: {
+        ...params,
+        project: params?.project ? params.project.toString() : null,
+      },
+    })
+      .then((response) => response?.data)
+      .catch((error) => {
+        throw error?.response?.data;
+      });
+  }
+
+  async saveAnalytics(workspaceSlug: string, data: ISaveAnalyticsFormData): Promise<any> {
+    return this.post(`/api/workspaces/${workspaceSlug}/analytic-view/`, data)
+      .then((response) => response?.data)
+      .catch((error) => {
+        throw error?.response?.data;
+      });
+  }
+
+  async exportAnalytics(workspaceSlug: string, data: IExportAnalyticsFormData): Promise<any> {
+    return this.post(`/api/workspaces/${workspaceSlug}/export-analytics/`, data)
+      .then((response) => response?.data)
+      .catch((error) => {
+        throw error?.response?.data;
+      });
+  }
+}

packages/services/api.service.ts

@@ -0,0 +1,94 @@
+import axios from "axios";
+import Cookies from "js-cookie";
+
+export abstract class APIService {
+  protected baseURL: string;
+  protected headers: any = {};
+
+  constructor(baseURL: string) {
+    this.baseURL = baseURL;
+  }
+
+  setRefreshToken(token: string) {
+    Cookies.set("refreshToken", token, { expires: 30 });
+  }
+
+  getRefreshToken() {
+    return Cookies.get("refreshToken");
+  }
+
+  purgeRefreshToken() {
+    Cookies.remove("refreshToken", { path: "/" });
+  }
+
+  setAccessToken(token: string) {
+    Cookies.set("accessToken", token, { expires: 30 });
+  }
+
+  getAccessToken() {
+    return Cookies.get("accessToken");
+  }
+
+  purgeAccessToken() {
+    Cookies.remove("accessToken", { path: "/" });
+  }
+
+  getHeaders() {
+    return {
+      Authorization: `Bearer ${this.getAccessToken()}`,
+    };
+  }
+
+  get(url: string, config = {}): Promise<any> {
+    return axios({
+      method: "get",
+      url: this.baseURL + url,
+      headers: this.getAccessToken() ? this.getHeaders() : {},
+      ...config,
+    });
+  }
+
+  post(url: string, data = {}, config = {}): Promise<any> {
+    return axios({
+      method: "post",
+      url: this.baseURL + url,
+      data,
+      headers: this.getAccessToken() ? this.getHeaders() : {},
+      ...config,
+    });
+  }
+
+  put(url: string, data = {}, config = {}): Promise<any> {
+    return axios({
+      method: "put",
+      url: this.baseURL + url,
+      data,
+      headers: this.getAccessToken() ? this.getHeaders() : {},
+      ...config,
+    });
+  }
+
+  patch(url: string, data = {}, config = {}): Promise<any> {
+    return axios({
+      method: "patch",
+      url: this.baseURL + url,
+      data,
+      headers: this.getAccessToken() ? this.getHeaders() : {},
+      ...config,
+    });
+  }
+
+  delete(url: string, data?: any, config = {}): Promise<any> {
+    return axios({
+      method: "delete",
+      url: this.baseURL + url,
+      data: data,
+      headers: this.getAccessToken() ? this.getHeaders() : {},
+      ...config,
+    });
+  }
+
+  request(config = {}) {
+    return axios(config);
+  }
+}

packages/services/client.ts

@@ -0,0 +1,15 @@
+import { AIService } from "./ai/ai.service";
+import { WorkspaceService } from "./workspace/workspace.service";
+
+export class Client {
+  ai;
+  workspace;
+
+  constructor(BASE_URL: string | undefined) {
+    this.user = new UserService(BASE_URL || "");
+    this.instance = new InstanceService(BASE_URL || "");
+
+    this.ai = new AIService(BASE_URL || "");
+    this.workspace = new WorkspaceService(BASE_URL || "");
+  }
+}

packages/services/cycle/cycle.service.ts

@@ -0,0 +1,124 @@
+// services
+import { APIService } from "services/api.service";
+// types
+import type { CycleDateCheckData, ICycle, TIssue, TIssueMap } from "@plane/types";
+// helpers
+import { API_BASE_URL } from "helpers/common.helper";
+
+export class CycleService extends APIService {
+  constructor() {
+    super(API_BASE_URL);
+  }
+
+  async createCycle(workspaceSlug: string, projectId: string, data: any): Promise<ICycle> {
+    return this.post(`/api/workspaces/${workspaceSlug}/projects/${projectId}/cycles/`, data)
+      .then((response) => response?.data)
+      .catch((error) => {
+        throw error?.response?.data;
+      });
+  }
+
+  async getCyclesWithParams(workspaceSlug: string, projectId: string, cycleType?: "current"): Promise<ICycle[]> {
+    return this.get(`/api/workspaces/${workspaceSlug}/projects/${projectId}/cycles/`, {
+      params: {
+        cycle_view: cycleType,
+      },
+    })
+      .then((response) => response?.data)
+      .catch((error) => {
+        throw error?.response?.data;
+      });
+  }
+
+  async getCycleDetails(workspaceSlug: string, projectId: string, cycleId: string): Promise<ICycle> {
+    return this.get(`/api/workspaces/${workspaceSlug}/projects/${projectId}/cycles/${cycleId}/`)
+      .then((res) => res?.data)
+      .catch((err) => {
+        throw err?.response?.data;
+      });
+  }
+
+  async getCycleIssues(workspaceSlug: string, projectId: string, cycleId: string): Promise<TIssue[]> {
+    return this.get(`/api/workspaces/${workspaceSlug}/projects/${projectId}/cycles/${cycleId}/cycle-issues/`)
+      .then((response) => response?.data)
+      .catch((error) => {
+        throw error?.response?.data;
+      });
+  }
+
+  async getCycleIssuesWithParams(
+    workspaceSlug: string,
+    projectId: string,
+    cycleId: string,
+    queries?: any
+  ): Promise<TIssue[]> {
+    return this.get(`/api/workspaces/${workspaceSlug}/projects/${projectId}/cycles/${cycleId}/cycle-issues/`, {
+      params: queries,
+    })
+      .then((response) => response?.data)
+      .catch((error) => {
+        throw error?.response?.data;
+      });
+  }
+
+  async patchCycle(workspaceSlug: string, projectId: string, cycleId: string, data: Partial<ICycle>): Promise<any> {
+    return this.patch(`/api/workspaces/${workspaceSlug}/projects/${projectId}/cycles/${cycleId}/`, data)
+      .then((response) => response?.data)
+      .catch((error) => {
+        throw error?.response?.data;
+      });
+  }
+
+  async deleteCycle(workspaceSlug: string, projectId: string, cycleId: string): Promise<any> {
+    return this.delete(`/api/workspaces/${workspaceSlug}/projects/${projectId}/cycles/${cycleId}/`)
+      .then((response) => response?.data)
+      .catch((error) => {
+        throw error?.response?.data;
+      });
+  }
+
+  async cycleDateCheck(workspaceSlug: string, projectId: string, data: CycleDateCheckData): Promise<any> {
+    return this.post(`/api/workspaces/${workspaceSlug}/projects/${projectId}/cycles/date-check/`, data)
+      .then((response) => response?.data)
+      .catch((error) => {
+        throw error?.response?.data;
+      });
+  }
+
+  async addCycleToFavorites(
+    workspaceSlug: string,
+    projectId: string,
+    data: {
+      cycle: string;
+    }
+  ): Promise<any> {
+    return this.post(`/api/workspaces/${workspaceSlug}/projects/${projectId}/user-favorite-cycles/`, data)
+      .then((response) => response?.data)
+      .catch((error) => {
+        throw error?.response?.data;
+      });
+  }
+
+  async transferIssues(
+    workspaceSlug: string,
+    projectId: string,
+    cycleId: string,
+    data: {
+      new_cycle_id: string;
+    }
+  ): Promise<any> {
+    return this.post(`/api/workspaces/${workspaceSlug}/projects/${projectId}/cycles/${cycleId}/transfer-issues/`, data)
+      .then((response) => response?.data)
+      .catch((error) => {
+        throw error?.response?.data;
+      });
+  }
+
+  async removeCycleFromFavorites(workspaceSlug: string, projectId: string, cycleId: string): Promise<any> {
+    return this.delete(`/api/workspaces/${workspaceSlug}/projects/${projectId}/user-favorite-cycles/${cycleId}/`)
+      .then((response) => response?.data)
+      .catch((error) => {
+        throw error?.response?.data;
+      });
+  }
+}

packages/services/inbox/inbox-issue.service.ts

@@ -0,0 +1,112 @@
+import { APIService } from "services/api.service";
+// helpers
+import { API_BASE_URL } from "helpers/common.helper";
+// types
+import type { TInboxIssueFilterOptions, TInboxIssueExtendedDetail, TIssue, TInboxDetailedStatus } from "@plane/types";
+
+export class InboxIssueService extends APIService {
+  constructor() {
+    super(API_BASE_URL);
+  }
+
+  async fetchInboxIssues(
+    workspaceSlug: string,
+    projectId: string,
+    inboxId: string,
+    params?: TInboxIssueFilterOptions | {}
+  ): Promise<TInboxIssueExtendedDetail[]> {
+    return this.get(
+      `/api/workspaces/${workspaceSlug}/projects/${projectId}/inboxes/${inboxId}/inbox-issues/?expand=issue_inbox`,
+      {
+        params,
+      }
+    )
+      .then((response) => response?.data)
+      .catch((error) => {
+        throw error?.response?.data;
+      });
+  }
+
+  async fetchInboxIssueById(
+    workspaceSlug: string,
+    projectId: string,
+    inboxId: string,
+    inboxIssueId: string
+  ): Promise<TInboxIssueExtendedDetail> {
+    return this.get(
+      `/api/workspaces/${workspaceSlug}/projects/${projectId}/inboxes/${inboxId}/inbox-issues/${inboxIssueId}/?expand=issue_inbox`
+    )
+      .then((response) => response?.data)
+      .catch((error) => {
+        throw error?.response?.data;
+      });
+  }
+
+  async createInboxIssue(
+    workspaceSlug: string,
+    projectId: string,
+    inboxId: string,
+    data: {
+      source: string;
+      issue: Partial<TIssue>;
+    }
+  ): Promise<TInboxIssueExtendedDetail> {
+    return this.post(
+      `/api/workspaces/${workspaceSlug}/projects/${projectId}/inboxes/${inboxId}/inbox-issues/?expand=issue_inbox`,
+      data
+    )
+      .then((response) => response?.data)
+      .catch((error) => {
+        throw error?.response?.data;
+      });
+  }
+
+  async updateInboxIssue(
+    workspaceSlug: string,
+    projectId: string,
+    inboxId: string,
+    inboxIssueId: string,
+    data: { issue: Partial<TIssue> }
+  ): Promise<TInboxIssueExtendedDetail> {
+    return this.patch(
+      `/api/workspaces/${workspaceSlug}/projects/${projectId}/inboxes/${inboxId}/inbox-issues/${inboxIssueId}/?expand=issue_inbox`,
+      data
+    )
+      .then((response) => response?.data)
+      .catch((error) => {
+        throw error?.response?.data;
+      });
+  }
+
+  async removeInboxIssue(
+    workspaceSlug: string,
+    projectId: string,
+    inboxId: string,
+    inboxIssueId: string
+  ): Promise<void> {
+    return this.delete(
+      `/api/workspaces/${workspaceSlug}/projects/${projectId}/inboxes/${inboxId}/inbox-issues/${inboxIssueId}/`
+    )
+      .then((response) => response?.data)
+      .catch((error) => {
+        throw error?.response?.data;
+      });
+  }
+
+  async updateInboxIssueStatus(
+    workspaceSlug: string,
+    projectId: string,
+    inboxId: string,
+    inboxIssueId: string,
+    data: TInboxDetailedStatus
+  ): Promise<TInboxIssueExtendedDetail> {
+    return this.patch(
+      `/api/workspaces/${workspaceSlug}/projects/${projectId}/inboxes/${inboxId}/inbox-issues/${inboxIssueId}/?expand=issue_inbox`,
+      data
+    )
+      .then((response) => response?.data)
+      .catch((error) => {
+        throw error?.response?.data;
+      });
+  }
+}

packages/services/inbox/inbox-legacy.service.ts

@@ -0,0 +1,122 @@
+import { APIService } from "services/api.service";
+// helpers
+import { API_BASE_URL } from "helpers/common.helper";
+// types
+import type { IInboxIssue, IInbox, TInboxStatus, IInboxQueryParams } from "@plane/types";
+
+export class InboxService extends APIService {
+  constructor() {
+    super(API_BASE_URL);
+  }
+
+  async getInboxes(workspaceSlug: string, projectId: string): Promise<IInbox[]> {
+    return this.get(`/api/workspaces/${workspaceSlug}/projects/${projectId}/inboxes/`)
+      .then((response) => response?.data)
+      .catch((error) => {
+        throw error?.response?.data;
+      });
+  }
+
+  async getInboxById(workspaceSlug: string, projectId: string, inboxId: string): Promise<IInbox> {
+    return this.get(`/api/workspaces/${workspaceSlug}/projects/${projectId}/inboxes/${inboxId}/`)
+      .then((response) => response?.data)
+      .catch((error) => {
+        throw error?.response?.data;
+      });
+  }
+
+  async patchInbox(workspaceSlug: string, projectId: string, inboxId: string, data: Partial<IInbox>): Promise<any> {
+    return this.patch(`/api/workspaces/${workspaceSlug}/projects/${projectId}/inboxes/${inboxId}/`, data)
+      .then((response) => response?.data)
+      .catch((error) => {
+        throw error?.response?.data;
+      });
+  }
+
+  async getInboxIssues(
+    workspaceSlug: string,
+    projectId: string,
+    inboxId: string,
+    params?: IInboxQueryParams
+  ): Promise<IInboxIssue[]> {
+    return this.get(`/api/workspaces/${workspaceSlug}/projects/${projectId}/inboxes/${inboxId}/inbox-issues/`, {
+      params,
+    })
+      .then((response) => response?.data)
+      .catch((error) => {
+        throw error?.response?.data;
+      });
+  }
+
+  async getInboxIssueById(
+    workspaceSlug: string,
+    projectId: string,
+    inboxId: string,
+    inboxIssueId: string
+  ): Promise<IInboxIssue> {
+    return this.get(
+      `/api/workspaces/${workspaceSlug}/projects/${projectId}/inboxes/${inboxId}/inbox-issues/${inboxIssueId}/`
+    )
+      .then((response) => response?.data)
+      .catch((error) => {
+        throw error?.response?.data;
+      });
+  }
+
+  async deleteInboxIssue(
+    workspaceSlug: string,
+    projectId: string,
+    inboxId: string,
+    inboxIssueId: string
+  ): Promise<any> {
+    return this.delete(
+      `/api/workspaces/${workspaceSlug}/projects/${projectId}/inboxes/${inboxId}/inbox-issues/${inboxIssueId}/`
+    )
+      .then((response) => response?.data)
+      .catch((error) => {
+        throw error?.response?.data;
+      });
+  }
+
+  async markInboxStatus(
+    workspaceSlug: string,
+    projectId: string,
+    inboxId: string,
+    inboxIssueId: string,
+    data: TInboxStatus
+  ): Promise<IInboxIssue> {
+    return this.patch(
+      `/api/workspaces/${workspaceSlug}/projects/${projectId}/inboxes/${inboxId}/inbox-issues/${inboxIssueId}/`,
+      data
+    )
+      .then((response) => response?.data)
+      .catch((error) => {
+        throw error?.response?.data;
+      });
+  }
+
+  async patchInboxIssue(
+    workspaceSlug: string,
+    projectId: string,
+    inboxId: string,
+    inboxIssueId: string,
+    data: { issue: Partial<IInboxIssue> }
+  ): Promise<any> {
+    return this.patch(
+      `/api/workspaces/${workspaceSlug}/projects/${projectId}/inboxes/${inboxId}/inbox-issues/${inboxIssueId}/`,
+      data
+    )
+      .then((response) => response?.data)
+      .catch((error) => {
+        throw error?.response?.data;
+      });
+  }
+
+  async createInboxIssue(workspaceSlug: string, projectId: string, inboxId: string, data: any): Promise<IInboxIssue> {
+    return this.post(`/api/workspaces/${workspaceSlug}/projects/${projectId}/inboxes/${inboxId}/inbox-issues/`, data)
+      .then((response) => response?.data)
+      .catch((error) => {
+        throw error?.response?.data;
+      });
+  }
+}

packages/services/inbox/inbox.service.ts

@@ -0,0 +1,35 @@
+import { APIService } from "services/api.service";
+// helpers
+import { API_BASE_URL } from "helpers/common.helper";
+// types
+import type { TInbox } from "@plane/types";
+
+export class InboxService extends APIService {
+  constructor() {
+    super(API_BASE_URL);
+  }
+
+  async fetchInboxes(workspaceSlug: string, projectId: string): Promise<TInbox[]> {
+    return this.get(`/api/workspaces/${workspaceSlug}/projects/${projectId}/inboxes/`)
+      .then((response) => response?.data)
+      .catch((error) => {
+        throw error?.response?.data;
+      });
+  }
+
+  async fetchInboxById(workspaceSlug: string, projectId: string, inboxId: string): Promise<TInbox> {
+    return this.get(`/api/workspaces/${workspaceSlug}/projects/${projectId}/inboxes/${inboxId}/`)
+      .then((response) => response?.data)
+      .catch((error) => {
+        throw error?.response?.data;
+      });
+  }
+
+  async updateInbox(workspaceSlug: string, projectId: string, inboxId: string, data: Partial<TInbox>): Promise<TInbox> {
+    return this.patch(`/api/workspaces/${workspaceSlug}/projects/${projectId}/inboxes/${inboxId}/`, data)
+      .then((response) => response?.data)
+      .catch((error) => {
+        throw error?.response?.data;
+      });
+  }
+}

packages/services/inbox/index.ts

@@ -0,0 +1,2 @@
+export * from "./inbox.service";
+export * from "./inbox-issue.service";

packages/services/instance/api_token.service.ts

@@ -0,0 +1,49 @@
+import { APIService } from "../api.service";
+import { IApiToken } from "@plane/types";
+
+export class APITokenService extends APIService {
+  constructor(BASE_URL) {
+    super(BASE_URL);
+  }
+
+  async getApiTokens(workspaceSlug: string): Promise<IApiToken[]> {
+    return this.get(`/api/workspaces/${workspaceSlug}/api-tokens/`)
+      .then((response) => response?.data)
+      .catch((error) => {
+        throw error?.response?.data;
+      });
+  }
+
+  async retrieveApiToken(
+    workspaceSlug: string,
+    tokenId: String
+  ): Promise<IApiToken> {
+    return this.get(`/api/workspaces/${workspaceSlug}/api-tokens/${tokenId}`)
+      .then((response) => response?.data)
+      .catch((error) => {
+        throw error?.response?.data;
+      });
+  }
+
+  async createApiToken(
+    workspaceSlug: string,
+    data: Partial<IApiToken>
+  ): Promise<IApiToken> {
+    return this.post(`/api/workspaces/${workspaceSlug}/api-tokens/`, data)
+      .then((response) => response?.data)
+      .catch((error) => {
+        throw error?.response?.data;
+      });
+  }
+
+  async deleteApiToken(
+    workspaceSlug: string,
+    tokenId: String
+  ): Promise<IApiToken> {
+    return this.delete(`/api/workspaces/${workspaceSlug}/api-tokens/${tokenId}`)
+      .then((response) => response?.data)
+      .catch((error) => {
+        throw error?.response?.data;
+      });
+  }
+}

packages/services/instance/config.service.ts

@@ -0,0 +1,24 @@
+// services
+import { APIService } from "services/api.service";
+// helper
+import { API_BASE_URL } from "helpers/common.helper";
+// types
+import { IAppConfig } from "@plane/types";
+
+export class AppConfigService extends APIService {
+  constructor() {
+    super(API_BASE_URL);
+  }
+
+  async envConfig(): Promise<IAppConfig> {
+    return this.get("/api/configs/", {
+      headers: {
+        "Content-Type": "application/json",
+      },
+    })
+      .then((response) => response.data)
+      .catch((error) => {
+        throw error?.response?.data;
+      });
+  }
+}

packages/services/instance/file.service.ts

@@ -0,0 +1,187 @@
+// services
+import { APIService } from "services/api.service";
+// helpers
+import { API_BASE_URL } from "helpers/common.helper";
+import axios from "axios";
+
+export interface UnSplashImage {
+  id: string;
+  created_at: Date;
+  updated_at: Date;
+  promoted_at: Date;
+  width: number;
+  height: number;
+  color: string;
+  blur_hash: string;
+  description: null;
+  alt_description: string;
+  urls: UnSplashImageUrls;
+  [key: string]: any;
+}
+
+export interface UnSplashImageUrls {
+  raw: string;
+  full: string;
+  regular: string;
+  small: string;
+  thumb: string;
+  small_s3: string;
+}
+
+export class FileService extends APIService {
+  private cancelSource: any;
+
+  constructor() {
+    super(API_BASE_URL);
+    this.uploadFile = this.uploadFile.bind(this);
+    this.deleteImage = this.deleteImage.bind(this);
+    this.restoreImage = this.restoreImage.bind(this);
+    this.cancelUpload = this.cancelUpload.bind(this);
+  }
+
+  async uploadFile(workspaceSlug: string, file: FormData): Promise<any> {
+    this.cancelSource = axios.CancelToken.source();
+    return this.post(`/api/workspaces/${workspaceSlug}/file-assets/`, file, {
+      headers: {
+        ...this.getHeaders(),
+        "Content-Type": "multipart/form-data",
+      },
+      cancelToken: this.cancelSource.token,
+    })
+      .then((response) => response?.data)
+      .catch((error) => {
+        if (axios.isCancel(error)) {
+          console.log(error.message);
+        } else {
+          console.log(error);
+          throw error?.response?.data;
+        }
+      });
+  }
+
+  cancelUpload() {
+    this.cancelSource.cancel("Upload cancelled");
+  }
+
+  getUploadFileFunction(workspaceSlug: string): (file: File) => Promise<string> {
+    return async (file: File) => {
+      try {
+        const formData = new FormData();
+        formData.append("asset", file);
+        formData.append("attributes", JSON.stringify({}));
+
+        const data = await this.uploadFile(workspaceSlug, formData);
+        return data.asset;
+      } catch (e) {
+        console.error(e);
+      }
+    };
+  }
+
+  getDeleteImageFunction(workspaceId: string) {
+    return async (src: string) => {
+      try {
+        const assetUrlWithWorkspaceId = `${workspaceId}/${this.extractAssetIdFromUrl(src, workspaceId)}`;
+        const data = await this.deleteImage(assetUrlWithWorkspaceId);
+        return data;
+      } catch (e) {
+        console.error(e);
+      }
+    };
+  }
+
+  getRestoreImageFunction(workspaceId: string) {
+    return async (src: string) => {
+      try {
+        const assetUrlWithWorkspaceId = `${workspaceId}/${this.extractAssetIdFromUrl(src, workspaceId)}`;
+        const data = await this.restoreImage(assetUrlWithWorkspaceId);
+        return data;
+      } catch (e) {
+        console.error(e);
+      }
+    };
+  }
+
+  extractAssetIdFromUrl(src: string, workspaceId: string): string {
+    const indexWhereAssetIdStarts = src.indexOf(workspaceId) + workspaceId.length + 1;
+    if (indexWhereAssetIdStarts === -1) {
+      throw new Error("Workspace ID not found in source string");
+    }
+    const assetUrl = src.substring(indexWhereAssetIdStarts);
+    return assetUrl;
+  }
+
+  async deleteImage(assetUrlWithWorkspaceId: string): Promise<any> {
+    return this.delete(`/api/workspaces/file-assets/${assetUrlWithWorkspaceId}/`)
+      .then((response) => response?.status)
+      .catch((error) => {
+        throw error?.response?.data;
+      });
+  }
+
+  async restoreImage(assetUrlWithWorkspaceId: string): Promise<any> {
+    return this.post(`/api/workspaces/file-assets/${assetUrlWithWorkspaceId}/restore/`, {
+      headers: this.getHeaders(),
+      "Content-Type": "application/json",
+    })
+      .then((response) => response?.status)
+      .catch((error) => {
+        throw error?.response?.data;
+      });
+  }
+
+  async deleteFile(workspaceId: string, assetUrl: string): Promise<any> {
+    const lastIndex = assetUrl.lastIndexOf("/");
+    const assetId = assetUrl.substring(lastIndex + 1);
+
+    return this.delete(`/api/workspaces/file-assets/${workspaceId}/${assetId}/`)
+      .then((response) => response?.data)
+      .catch((error) => {
+        throw error?.response?.data;
+      });
+  }
+
+  async uploadUserFile(file: FormData): Promise<any> {
+    return this.post(`/api/users/file-assets/`, file, {
+      headers: {
+        ...this.getHeaders(),
+        "Content-Type": "multipart/form-data",
+      },
+    })
+      .then((response) => response?.data)
+      .catch((error) => {
+        throw error?.response?.data;
+      });
+  }
+
+  async deleteUserFile(assetUrl: string): Promise<any> {
+    const lastIndex = assetUrl.lastIndexOf("/");
+    const assetId = assetUrl.substring(lastIndex + 1);
+
+    return this.delete(`/api/users/file-assets/${assetId}`)
+      .then((response) => response?.data)
+      .catch((error) => {
+        throw error?.response?.data;
+      });
+  }
+
+  async getUnsplashImages(query?: string): Promise<UnSplashImage[]> {
+    return this.get(`/api/unsplash/`, {
+      params: {
+        query,
+      },
+    })
+      .then((res) => res?.data?.results ?? res?.data)
+      .catch((err) => {
+        throw err?.response?.data;
+      });
+  }
+
+  async getProjectCoverImages(): Promise<string[]> {
+    return this.get(`/api/project-covers/`)
+      .then((res) => res?.data)
+      .catch((err) => {
+        throw err?.response?.data;
+      });
+  }
+}

packages/services/instance/instance.service.ts

@@ -0,0 +1,53 @@
+import { APIService } from "services/api.service";
+// helpers
+import { API_BASE_URL } from "helpers/common.helper";
+// types
+import type { IFormattedInstanceConfiguration, IInstance, IInstanceAdmin, IInstanceConfiguration } from "@plane/types";
+
+export class InstanceService extends APIService {
+  constructor() {
+    super(API_BASE_URL);
+  }
+
+  async getInstanceInfo(): Promise<IInstance> {
+    return this.get("/api/instances/", { headers: {} })
+      .then((response) => response.data)
+      .catch((error) => {
+        throw error;
+      });
+  }
+
+  async getInstanceAdmins(): Promise<IInstanceAdmin[]> {
+    return this.get("/api/instances/admins/")
+      .then((response) => response.data)
+      .catch((error) => {
+        throw error;
+      });
+  }
+
+  async updateInstanceInfo(data: Partial<IInstance>): Promise<IInstance> {
+    return this.patch("/api/instances/", data)
+      .then((response) => response?.data)
+      .catch((error) => {
+        throw error?.response?.data;
+      });
+  }
+
+  async getInstanceConfigurations() {
+    return this.get("/api/instances/configurations/")
+      .then((response) => response.data)
+      .catch((error) => {
+        throw error;
+      });
+  }
+
+  async updateInstanceConfigurations(
+    data: Partial<IFormattedInstanceConfiguration>
+  ): Promise<IInstanceConfiguration[]> {
+    return this.patch("/api/instances/configurations/", data)
+      .then((response) => response?.data)
+      .catch((error) => {
+        throw error?.response?.data;
+      });
+  }
+}