dev: update server configuration commands

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

@@ -2,7 +2,7 @@ name: Bug report
 description: Create a bug report to help us improve Plane
 title: "[bug]: "
 labels: [🐛bug]
-assignees: [srinivaspendem, pushya22]
+assignees: [srinivaspendem, pushya-plane]
 body:
 - type: markdown
   attributes:
@@ -45,7 +45,7 @@ body:
       - Deploy preview
   validations:
     required: true
-- type: dropdown
+  type: dropdown
   id: browser
   attributes:
     label: Browser

.github/ISSUE_TEMPLATE/--feature-request.yaml

@@ -2,7 +2,7 @@ name: Feature request
 description: Suggest a feature to improve Plane
 title: "[feature]: "
 labels: [✨feature]
-assignees: [srinivaspendem, pushya22]
+assignees: [srinivaspendem, pushya-plane]
 body:
 - type: markdown
   attributes:

.github/workflows/auto-merge.yml

@@ -1,97 +0,0 @@
-name: Auto Merge or Create PR on Push
-
-on:
-  workflow_dispatch:
-  push:
-    branches:
-      - "sync/**"
-
-env:
-  CURRENT_BRANCH: ${{ github.ref_name }}
-  SOURCE_BRANCH: ${{ secrets.SYNC_TARGET_BRANCH_NAME }} # The sync branch such as "sync/ce"
-  TARGET_BRANCH: ${{ secrets.TARGET_BRANCH }} # The target branch that you would like to merge changes like develop
-  GITHUB_TOKEN: ${{ secrets.ACCESS_TOKEN }} # Personal access token required to modify contents and workflows
-  REVIEWER: ${{ secrets.REVIEWER }}
-
-jobs:
-  Check_Branch: 
-    runs-on: ubuntu-latest
-    outputs:
-      BRANCH_MATCH: ${{ steps.check-branch.outputs.MATCH }}
-    steps:
-      - name: Check if current branch matches the secret
-        id: check-branch
-        run: |
-          if [ "$CURRENT_BRANCH" = "$SOURCE_BRANCH" ]; then
-            echo "MATCH=true" >> $GITHUB_OUTPUT
-          else
-            echo "MATCH=false" >> $GITHUB_OUTPUT
-          fi
-      
-  Auto_Merge:
-    if: ${{ needs.Check_Branch.outputs.BRANCH_MATCH == 'true' }}
-    needs: [Check_Branch]
-    runs-on: ubuntu-latest
-    permissions:
-      pull-requests: write
-      contents: write
-    steps:
-      - name: Checkout code
-        uses: actions/checkout@v4.1.1
-        with:
-          fetch-depth: 0 # Fetch all history for all branches and tags
-
-      - name: Setup GH CLI and Git Config
-        run: |
-          type -p curl >/dev/null || (sudo apt update && sudo apt install curl -y)
-          curl -fsSL https://cli.github.com/packages/githubcli-archive-keyring.gpg | sudo dd of=/usr/share/keyrings/githubcli-archive-keyring.gpg
-          sudo chmod go+r /usr/share/keyrings/githubcli-archive-keyring.gpg
-          echo "deb [arch=$(dpkg --print-architecture) signed-by=/usr/share/keyrings/githubcli-archive-keyring.gpg] https://cli.github.com/packages stable main" | sudo tee /etc/apt/sources.list.d/github-cli.list > /dev/null
-          sudo apt update
-          sudo apt install gh -y
-
-      - id: git-author
-        name: Setup Git CLI from Github Token
-        run: |
-          VIEWER_JSON=$(gh api graphql -f query='query { viewer { name login databaseId }}' --jq '.data.viewer')
-          VIEWER_NAME=$(jq --raw-output '.name | values' <<< "${VIEWER_JSON}")
-          VIEWER_LOGIN=$(jq --raw-output '.login' <<< "${VIEWER_JSON}")
-          VIEWER_DATABASE_ID=$(jq --raw-output '.databaseId' <<< "${VIEWER_JSON}")
-
-          USER_NAME="${VIEWER_NAME:-${VIEWER_LOGIN}}"
-          USER_EMAIL="${VIEWER_DATABASE_ID}+${VIEWER_LOGIN}@users.noreply.github.com"
-
-          git config --global user.name ${USER_NAME}
-          git config --global user.email ${USER_EMAIL}
-
-      - name: Check for merge conflicts
-        id: conflicts
-        run: |
-          git fetch origin $TARGET_BRANCH
-          git checkout $TARGET_BRANCH
-          # Attempt to merge the main branch into the current branch
-          if $(git merge --no-commit --no-ff $SOURCE_BRANCH); then
-            echo "No merge conflicts detected."
-            echo "HAS_CONFLICTS=false" >> $GITHUB_ENV
-          else
-            echo "Merge conflicts detected."
-            echo "HAS_CONFLICTS=true" >> $GITHUB_ENV
-            git merge --abort
-          fi
-
-      - name: Merge Change to Target Branch
-        if: env.HAS_CONFLICTS == 'false'
-        run: |
-          git commit -m "Merge branch '$SOURCE_BRANCH' into $TARGET_BRANCH"
-          git push origin $TARGET_BRANCH
-
-      - name: Create PR to Target Branch
-        if: env.HAS_CONFLICTS == 'true'
-        run: |
-          # Use GitHub CLI to create PR and specify author and committer
-          PR_URL=$(gh pr create --base $TARGET_BRANCH --head $SOURCE_BRANCH \
-            --title "sync: merge conflicts need to be resolved" \
-            --body "" \
-            --reviewer $REVIEWER )
-          echo "Pull Request created: $PR_URL"
-

.github/workflows/build-branch.yml

@@ -2,6 +2,11 @@ name: Branch Build
 
 on:
   workflow_dispatch:
+    inputs:
+      branch_name:
+        description: "Branch Name"
+        required: true
+        default: "preview"
   push:
     branches:
       - master
@@ -11,113 +16,58 @@ on:
     types: [released, prereleased]
 
 env:
-  TARGET_BRANCH: ${{ github.ref_name || github.event.release.target_commitish }}
+  TARGET_BRANCH: ${{ inputs.branch_name || github.ref_name || github.event.release.target_commitish }}
 
 jobs:
   branch_build_setup:
     name: Build-Push Web/Space/API/Proxy Docker Image
-    runs-on: ubuntu-latest
-    outputs:
-      gh_branch_name: ${{ steps.set_env_variables.outputs.TARGET_BRANCH }} 
-      gh_buildx_driver: ${{ steps.set_env_variables.outputs.BUILDX_DRIVER }}
-      gh_buildx_version: ${{ steps.set_env_variables.outputs.BUILDX_VERSION }}
-      gh_buildx_platforms: ${{ steps.set_env_variables.outputs.BUILDX_PLATFORMS }}
-      gh_buildx_endpoint: ${{ steps.set_env_variables.outputs.BUILDX_ENDPOINT }}
-      build_frontend: ${{ steps.changed_files.outputs.frontend_any_changed }}
-      build_space: ${{ steps.changed_files.outputs.space_any_changed }}
-      build_backend: ${{ steps.changed_files.outputs.backend_any_changed }}
-      build_proxy: ${{ steps.changed_files.outputs.proxy_any_changed }}
-
+    runs-on: ubuntu-20.04
     steps:
-      - id: set_env_variables
-        name: Set Environment Variables
-        run: |
-          if [ "${{ env.TARGET_BRANCH }}" == "master" ] || [ "${{ github.event_name }}" == "release" ]; then
-            echo "BUILDX_DRIVER=cloud" >> $GITHUB_OUTPUT
-            echo "BUILDX_VERSION=lab:latest" >> $GITHUB_OUTPUT
-            echo "BUILDX_PLATFORMS=linux/amd64,linux/arm64" >> $GITHUB_OUTPUT
-            echo "BUILDX_ENDPOINT=makeplane/plane-dev" >> $GITHUB_OUTPUT
-          else
-            echo "BUILDX_DRIVER=docker-container" >> $GITHUB_OUTPUT
-            echo "BUILDX_VERSION=latest" >> $GITHUB_OUTPUT
-            echo "BUILDX_PLATFORMS=linux/amd64" >> $GITHUB_OUTPUT
-            echo "BUILDX_ENDPOINT=" >> $GITHUB_OUTPUT
-          fi
-          echo "TARGET_BRANCH=${{ env.TARGET_BRANCH }}" >> $GITHUB_OUTPUT
-
-      - id: checkout_files
-        name: Checkout Files
-        uses: actions/checkout@v4
-
-      - name: Get changed files
-        id: changed_files
-        uses: tj-actions/changed-files@v42
-        with:
-          files_yaml: |
-            frontend:
-              - web/**
-              - packages/**
-              - 'package.json'
-              - 'yarn.lock'
-              - 'tsconfig.json'
-              - 'turbo.json'
-            space:
-              - space/**
-              - packages/**
-              - 'package.json'
-              - 'yarn.lock'
-              - 'tsconfig.json'
-              - 'turbo.json'
-            backend:
-              - apiserver/**
-            proxy:
-              - nginx/**
+      - name: Check out the repo
+        uses: actions/checkout@v3.3.0
+    outputs:
+      gh_branch_name: ${{ env.TARGET_BRANCH }}
 
   branch_build_push_frontend:
-    if: ${{ needs.branch_build_setup.outputs.build_frontend == 'true' || github.event_name == 'release' || needs.branch_build_setup.outputs.gh_branch_name == 'master' }}
     runs-on: ubuntu-20.04
     needs: [branch_build_setup]
     env:
       FRONTEND_TAG: ${{ secrets.DOCKERHUB_USERNAME }}/plane-frontend:${{ needs.branch_build_setup.outputs.gh_branch_name }}
-      TARGET_BRANCH: ${{ needs.branch_build_setup.outputs.gh_branch_name }}
-      BUILDX_DRIVER: ${{ needs.branch_build_setup.outputs.gh_buildx_driver }}
-      BUILDX_VERSION: ${{ needs.branch_build_setup.outputs.gh_buildx_version }}
-      BUILDX_PLATFORMS: ${{ needs.branch_build_setup.outputs.gh_buildx_platforms }}
-      BUILDX_ENDPOINT: ${{ needs.branch_build_setup.outputs.gh_buildx_endpoint }}
     steps:
       - name: Set Frontend Docker Tag
         run: |
-          if [ "${{ github.event_name }}" == "release" ]; then
-            TAG=${{ secrets.DOCKERHUB_USERNAME }}/plane-frontend:stable,${{ secrets.DOCKERHUB_USERNAME }}/plane-frontend:${{ github.event.release.tag_name }}
-          elif [ "${{ env.TARGET_BRANCH }}" == "master" ]; then
-            TAG=${{ secrets.DOCKERHUB_USERNAME }}/plane-frontend:latest
+          if [ "${{ needs.branch_build_setup.outputs.gh_branch_name }}" == "master" ] && [ "${{ github.event_name }}" == "release" ]; then
+            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: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@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@v3
+        uses: docker/login-action@v3.0.0
         with:
           username: ${{ secrets.DOCKERHUB_USERNAME }}
           password: ${{ secrets.DOCKERHUB_TOKEN }}
 
-      - name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v3
-        with:
-          driver: ${{ env.BUILDX_DRIVER }}
-          version: ${{ env.BUILDX_VERSION }}
-          endpoint: ${{ env.BUILDX_ENDPOINT }}
-
       - name: Check out the repo
-        uses: actions/checkout@v4
+        uses: actions/checkout@v4.1.1
 
       - name: Build and Push Frontend to Docker Container Registry
         uses: docker/build-push-action@v5.1.0
         with:
           context: .
           file: ./web/Dockerfile.web
-          platforms: ${{ env.BUILDX_PLATFORMS }}
+          platforms: linux/amd64
           tags: ${{ env.FRONTEND_TAG }}
           push: true
         env:
@@ -126,50 +76,46 @@ jobs:
           DOCKER_PASSWORD: ${{ secrets.DOCKERHUB_TOKEN }}
 
   branch_build_push_space:
-    if: ${{ needs.branch_build_setup.outputs.build_space == 'true' || github.event_name == 'release' || needs.branch_build_setup.outputs.gh_branch_name == 'master' }}
     runs-on: ubuntu-20.04
     needs: [branch_build_setup]
     env:
       SPACE_TAG: ${{ secrets.DOCKERHUB_USERNAME }}/plane-space:${{ needs.branch_build_setup.outputs.gh_branch_name }}
-      TARGET_BRANCH: ${{ needs.branch_build_setup.outputs.gh_branch_name }}
-      BUILDX_DRIVER: ${{ needs.branch_build_setup.outputs.gh_buildx_driver }}
-      BUILDX_VERSION: ${{ needs.branch_build_setup.outputs.gh_buildx_version }}
-      BUILDX_PLATFORMS: ${{ needs.branch_build_setup.outputs.gh_buildx_platforms }}
-      BUILDX_ENDPOINT: ${{ needs.branch_build_setup.outputs.gh_buildx_endpoint }}
     steps:
       - name: Set Space Docker Tag
         run: |
-          if [ "${{ github.event_name }}" == "release" ]; then
-            TAG=${{ secrets.DOCKERHUB_USERNAME }}/plane-space:stable,${{ secrets.DOCKERHUB_USERNAME }}/plane-space:${{ github.event.release.tag_name }}
-          elif [ "${{ env.TARGET_BRANCH }}" == "master" ]; then
-            TAG=${{ secrets.DOCKERHUB_USERNAME }}/plane-space:latest
+          if [ "${{ needs.branch_build_setup.outputs.gh_branch_name }}" == "master" ] && [ "${{ github.event_name }}" == "release" ]; then
+            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: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@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@v3
+        uses: docker/login-action@v3.0.0
         with:
           username: ${{ secrets.DOCKERHUB_USERNAME }}
           password: ${{ secrets.DOCKERHUB_TOKEN }}
 
-      - name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v3
-        with:
-          driver: ${{ env.BUILDX_DRIVER }}
-          version: ${{ env.BUILDX_VERSION }}
-          endpoint: ${{ env.BUILDX_ENDPOINT }}
-
       - name: Check out the repo
-        uses: actions/checkout@v4
+        uses: actions/checkout@v4.1.1
 
       - name: Build and Push Space to Docker Hub
         uses: docker/build-push-action@v5.1.0
         with:
           context: .
           file: ./space/Dockerfile.space
-          platforms: ${{ env.BUILDX_PLATFORMS }}
+          platforms: linux/amd64
           tags: ${{ env.SPACE_TAG }}
           push: true
         env:
@@ -178,50 +124,46 @@ jobs:
           DOCKER_PASSWORD: ${{ secrets.DOCKERHUB_TOKEN }}
 
   branch_build_push_backend:
-    if: ${{ needs.branch_build_setup.outputs.build_backend == 'true' || github.event_name == 'release' || needs.branch_build_setup.outputs.gh_branch_name == 'master' }}
     runs-on: ubuntu-20.04
     needs: [branch_build_setup]
     env:
       BACKEND_TAG: ${{ secrets.DOCKERHUB_USERNAME }}/plane-backend:${{ needs.branch_build_setup.outputs.gh_branch_name }}
-      TARGET_BRANCH: ${{ needs.branch_build_setup.outputs.gh_branch_name }}
-      BUILDX_DRIVER: ${{ needs.branch_build_setup.outputs.gh_buildx_driver }}
-      BUILDX_VERSION: ${{ needs.branch_build_setup.outputs.gh_buildx_version }}
-      BUILDX_PLATFORMS: ${{ needs.branch_build_setup.outputs.gh_buildx_platforms }}
-      BUILDX_ENDPOINT: ${{ needs.branch_build_setup.outputs.gh_buildx_endpoint }}
     steps:
       - name: Set Backend Docker Tag
         run: |
-          if [ "${{ github.event_name }}" == "release" ]; then
-            TAG=${{ secrets.DOCKERHUB_USERNAME }}/plane-backend:stable,${{ secrets.DOCKERHUB_USERNAME }}/plane-backend:${{ github.event.release.tag_name }}
-          elif [ "${{ env.TARGET_BRANCH }}" == "master" ]; then
-            TAG=${{ secrets.DOCKERHUB_USERNAME }}/plane-backend:latest
+          if [ "${{ needs.branch_build_setup.outputs.gh_branch_name }}" == "master" ] && [ "${{ github.event_name }}" == "release" ]; then
+            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: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@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@v3
+        uses: docker/login-action@v3.0.0
         with:
           username: ${{ secrets.DOCKERHUB_USERNAME }}
           password: ${{ secrets.DOCKERHUB_TOKEN }}
 
-      - name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v3
-        with:
-          driver: ${{ env.BUILDX_DRIVER }}
-          version: ${{ env.BUILDX_VERSION }}
-          endpoint: ${{ env.BUILDX_ENDPOINT }}
-
       - name: Check out the repo
-        uses: actions/checkout@v4
+        uses: actions/checkout@v4.1.1
 
       - name: Build and Push Backend to Docker Hub
         uses: docker/build-push-action@v5.1.0
         with:
           context: ./apiserver
           file: ./apiserver/Dockerfile.api
-          platforms: ${{ env.BUILDX_PLATFORMS }}
+          platforms: linux/amd64
           push: true
           tags: ${{ env.BACKEND_TAG }}
         env:
@@ -230,54 +172,49 @@ jobs:
           DOCKER_PASSWORD: ${{ secrets.DOCKERHUB_TOKEN }}
 
   branch_build_push_proxy:
-    if: ${{ needs.branch_build_setup.outputs.build_proxy == 'true' || github.event_name == 'release' || needs.branch_build_setup.outputs.gh_branch_name == 'master' }}
     runs-on: ubuntu-20.04
     needs: [branch_build_setup]
     env:
       PROXY_TAG: ${{ secrets.DOCKERHUB_USERNAME }}/plane-proxy:${{ needs.branch_build_setup.outputs.gh_branch_name }}
-      TARGET_BRANCH: ${{ needs.branch_build_setup.outputs.gh_branch_name }}
-      BUILDX_DRIVER: ${{ needs.branch_build_setup.outputs.gh_buildx_driver }}
-      BUILDX_VERSION: ${{ needs.branch_build_setup.outputs.gh_buildx_version }}
-      BUILDX_PLATFORMS: ${{ needs.branch_build_setup.outputs.gh_buildx_platforms }}
-      BUILDX_ENDPOINT: ${{ needs.branch_build_setup.outputs.gh_buildx_endpoint }}
     steps:
       - name: Set Proxy Docker Tag
         run: |
-          if [ "${{ github.event_name }}" == "release" ]; then
-            TAG=${{ secrets.DOCKERHUB_USERNAME }}/plane-proxy:stable,${{ secrets.DOCKERHUB_USERNAME }}/plane-proxy:${{ github.event.release.tag_name }}
-          elif [ "${{ env.TARGET_BRANCH }}" == "master" ]; then
-            TAG=${{ secrets.DOCKERHUB_USERNAME }}/plane-proxy:latest
+          if [ "${{ needs.branch_build_setup.outputs.gh_branch_name }}" == "master" ] && [ "${{ github.event_name }}" == "release" ]; then
+            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: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@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@v3
+        uses: docker/login-action@v3.0.0
         with:
           username: ${{ secrets.DOCKERHUB_USERNAME }}
           password: ${{ secrets.DOCKERHUB_TOKEN }}
 
-      - name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v3
-        with:
-          driver: ${{ env.BUILDX_DRIVER }}
-          version: ${{ env.BUILDX_VERSION }}
-          endpoint: ${{ env.BUILDX_ENDPOINT }}
-
       - name: Check out the repo
-        uses: actions/checkout@v4
+        uses: actions/checkout@v4.1.1
 
       - name: Build and Push Plane-Proxy to Docker Hub
         uses: docker/build-push-action@v5.1.0
         with:
           context: ./nginx
           file: ./nginx/Dockerfile
-          platforms: ${{ env.BUILDX_PLATFORMS }}
+          platforms: linux/amd64
           tags: ${{ env.PROXY_TAG }}
           push: true
         env:
           DOCKER_BUILDKIT: 1
           DOCKER_USERNAME: ${{ secrets.DOCKERHUB_USERNAME }}
           DOCKER_PASSWORD: ${{ secrets.DOCKERHUB_TOKEN }}
-

.github/workflows/build-test-pull-request.yml

@@ -1,19 +1,28 @@
-name: Build and Lint on Pull Request
+name: Build Pull Request Contents
 
 on:
-  workflow_dispatch:
   pull_request:
     types: ["opened", "synchronize"]
 
 jobs:
-  get-changed-files:
-    runs-on: ubuntu-latest
-    outputs:
-      apiserver_changed: ${{ steps.changed-files.outputs.apiserver_any_changed }}
-      web_changed: ${{ steps.changed-files.outputs.web_any_changed }}
-      space_changed: ${{ steps.changed-files.outputs.deploy_any_changed }}
+  build-pull-request-contents:
+    name: Build Pull Request Contents
+    runs-on: ubuntu-20.04
+    permissions:
+      pull-requests: read
+
     steps:
-      - uses: actions/checkout@v3
+      - name: Checkout Repository to Actions
+        uses: actions/checkout@v3.3.0
+        with:
+          token: ${{ secrets.ACCESS_TOKEN }}
+
+      - name: Setup Node.js 18.x
+        uses: actions/setup-node@v2
+        with:
+          node-version: 18.x
+          cache: "yarn"
+
       - name: Get changed files
         id: changed-files
         uses: tj-actions/changed-files@v41
@@ -23,82 +32,17 @@ jobs:
               - apiserver/**
             web:
               - web/**
-              - packages/**
-              - 'package.json'
-              - 'yarn.lock'
-              - 'tsconfig.json'
-              - 'turbo.json'
             deploy:
               - space/**
-              - packages/**
-              - 'package.json'
-              - 'yarn.lock'
-              - 'tsconfig.json'
-              - 'turbo.json'
 
-  lint-apiserver:
-    needs: get-changed-files
-    runs-on: ubuntu-latest
-    if: needs.get-changed-files.outputs.apiserver_changed == 'true'
-    steps:
-      - uses: actions/checkout@v3
-      - name: Set up Python
-        uses: actions/setup-python@v4
-        with:
-          python-version: '3.x' # Specify the Python version you need
-      - name: Install Pylint
-        run: python -m pip install ruff
-      - name: Install Apiserver Dependencies
-        run: cd apiserver && pip install -r requirements.txt
-      - name: Lint apiserver
-        run: ruff check --fix apiserver
+      - name: Build Plane's Main App
+        if: steps.changed-files.outputs.web_any_changed == 'true'
+        run: |
+          yarn
+          yarn build --filter=web
 
-  lint-web:
-    needs: get-changed-files
-    if: needs.get-changed-files.outputs.web_changed == 'true'
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v3
-      - name: Setup Node.js
-        uses: actions/setup-node@v2
-        with:
-          node-version: 18.x
-      - run: yarn install
-      - run: yarn lint --filter=web
-
-  lint-space:
-    needs: get-changed-files
-    if: needs.get-changed-files.outputs.space_changed == 'true'
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v3
-      - name: Setup Node.js
-        uses: actions/setup-node@v2
-        with:
-          node-version: 18.x
-      - run: yarn install
-      - run: yarn lint --filter=space
-
-  build-web:
-    needs: lint-web
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v3
-      - name: Setup Node.js
-        uses: actions/setup-node@v2
-        with:
-          node-version: 18.x
-      - run: yarn install
-      - run: yarn build --filter=web
-
-  build-space:
-    needs: lint-space
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v3
-      - name: Setup Node.js
-        uses: actions/setup-node@v2
-        with:
-          node-version: 18.x
-      - run: yarn install
-      - run: yarn build --filter=space
+      - name: Build Plane's Deploy App
+        if: steps.changed-files.outputs.deploy_any_changed == 'true'
+        run: |
+          yarn 
+          yarn build --filter=space

.github/workflows/check-version.yml

@@ -1,45 +0,0 @@
-name: Version Change Before Release
-
-on:
-  pull_request:
-    branches:
-      - master
-
-jobs:
-  check-version:
-    runs-on: ubuntu-latest
-    steps:
-      - name: Checkout repository
-        uses: actions/checkout@v4
-        with:
-          ref: ${{ github.head_ref }}
-          fetch-depth: 0
-
-      - name: Setup Node.js
-        uses: actions/setup-node@v4
-        with:
-          node-version: '18'
-
-      - name: Get PR Branch version
-        run: echo "PR_VERSION=$(node -p "require('./package.json').version")" >> $GITHUB_ENV
-
-      - name: Fetch base branch
-        run: git fetch origin master:master
-
-      - name: Get Master Branch version
-        run: |
-          git checkout master
-          echo "MASTER_VERSION=$(node -p "require('./package.json').version")" >> $GITHUB_ENV
-
-      - name: Get master branch version and compare
-        run: |
-          echo "Comparing versions: PR version is $PR_VERSION, Master version is $MASTER_VERSION"
-          if [ "$PR_VERSION" == "$MASTER_VERSION" ]; then
-            echo "Version in PR branch is the same as in master. Failing the CI."
-            exit 1
-          else
-            echo "Version check passed. Versions are different."
-          fi
-        env:
-          PR_VERSION: ${{ env.PR_VERSION }}
-          MASTER_VERSION: ${{ env.MASTER_VERSION }}

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

@@ -2,7 +2,7 @@ name: Create Sync Action
 
 on:
   workflow_dispatch:
-  push:
+  push: 
     branches:
       - preview
 
@@ -17,7 +17,7 @@ jobs:
       contents: read
     steps:
       - name: Checkout Code
-        uses: actions/checkout@v4.1.1
+        uses: actions/checkout@v4.1.1 
         with:
           persist-credentials: false
           fetch-depth: 0
@@ -31,25 +31,14 @@ jobs:
           sudo apt update
           sudo apt install gh -y
 
-      - name: Push Changes to Target Repo A
+      - name: Push Changes to Target Repo
         env:
           GH_TOKEN: ${{ secrets.ACCESS_TOKEN }}
         run: |
-          TARGET_REPO="${{ secrets.TARGET_REPO_A }}"
-          TARGET_BRANCH="${{ secrets.TARGET_REPO_A_BRANCH_NAME }}"
+          TARGET_REPO="${{ secrets.SYNC_TARGET_REPO_NAME }}"
+          TARGET_BRANCH="${{ secrets.SYNC_TARGET_BRANCH_NAME }}"
           SOURCE_BRANCH="${{ env.SOURCE_BRANCH_NAME }}"
 
           git checkout $SOURCE_BRANCH
-          git remote add target-origin-a "https://$GH_TOKEN@github.com/$TARGET_REPO.git"
-          git push target-origin-a $SOURCE_BRANCH:$TARGET_BRANCH
-
-      - name: Push Changes to Target Repo B
-        env:
-          GH_TOKEN: ${{ secrets.ACCESS_TOKEN }}
-        run: |
-          TARGET_REPO="${{ secrets.TARGET_REPO_B }}"
-          TARGET_BRANCH="${{ secrets.TARGET_REPO_B_BRANCH_NAME }}"
-          SOURCE_BRANCH="${{ env.SOURCE_BRANCH_NAME }}"
-
-          git remote add target-origin-b "https://$GH_TOKEN@github.com/$TARGET_REPO.git"
-          git push target-origin-b $SOURCE_BRANCH:$TARGET_BRANCH
+          git remote add target-origin "https://$GH_TOKEN@github.com/$TARGET_REPO.git"
+          git push target-origin $SOURCE_BRANCH:$TARGET_BRANCH

.github/workflows/feature-deployment.yml

@@ -1,73 +0,0 @@
-name: Feature Preview
-
-on:
-  workflow_dispatch:
-    inputs:
-      web-build:
-        required: true
-        type: boolean
-        default: true
-      space-build:
-        required: true
-        type: boolean
-        default: false
-
-jobs:
-  feature-deploy:
-    name: Feature Deploy
-    runs-on: ubuntu-latest
-    env:
-      KUBE_CONFIG_FILE: ${{ secrets.KUBE_CONFIG }}
-      BUILD_WEB: ${{ (github.event.inputs.web-build == '' && true) || github.event.inputs.web-build }}
-      BUILD_SPACE: ${{ (github.event.inputs.space-build == '' && false) || github.event.inputs.space-build }}
-
-    steps:
-      - name: Tailscale
-        uses: tailscale/github-action@v2
-        with:
-          oauth-client-id: ${{ secrets.TAILSCALE_OAUTH_CLIENT_ID }}
-          oauth-secret: ${{ secrets.TAILSCALE_OAUTH_SECRET }}
-          tags: tag:ci
-
-      - name: Kubectl Setup
-        run: |
-          curl -LO "https://dl.k8s.io/release/${{secrets.KUBE_VERSION}}/bin/linux/amd64/kubectl"
-          chmod +x kubectl
-
-          mkdir -p ~/.kube
-          echo "$KUBE_CONFIG_FILE" > ~/.kube/config
-          chmod 600 ~/.kube/config
-
-      - name: HELM Setup
-        run: |
-          curl -fsSL -o get_helm.sh https://raw.githubusercontent.com/helm/helm/main/scripts/get-helm-3
-          chmod 700 get_helm.sh
-          ./get_helm.sh
-
-      - name: App Deploy
-        run: |
-          helm --kube-insecure-skip-tls-verify repo add feature-preview ${{ secrets.FEATURE_PREVIEW_HELM_CHART_URL }} 
-          GIT_BRANCH=${{ github.ref_name }}
-          APP_NAMESPACE=${{ secrets.FEATURE_PREVIEW_NAMESPACE }}
-
-          METADATA=$(helm install feature-preview/${{ secrets.FEATURE_PREVIEW_HELM_CHART_NAME }} \
-              --kube-insecure-skip-tls-verify \
-              --generate-name \
-              --namespace $APP_NAMESPACE \
-              --set shared_config.git_repo=${{github.server_url}}/${{ github.repository }}.git \
-              --set shared_config.git_branch="$GIT_BRANCH" \
-              --set web.enabled=${{ env.BUILD_WEB }} \
-              --set space.enabled=${{ env.BUILD_SPACE }} \
-              --output json \
-              --timeout 1000s)
-
-          APP_NAME=$(echo $METADATA | jq -r '.name')
-
-          INGRESS_HOSTNAME=$(kubectl get ingress -n feature-builds --insecure-skip-tls-verify \
-              -o jsonpath='{.items[?(@.metadata.annotations.meta\.helm\.sh\/release-name=="'$APP_NAME'")]}' | \
-              jq -r '.spec.rules[0].host')
-
-          echo "****************************************"
-          echo "APP NAME ::: $APP_NAME"
-          echo "INGRESS HOSTNAME ::: $INGRESS_HOSTNAME"
-          echo "****************************************"

CONTRIBUTING.md

@@ -50,6 +50,7 @@ chmod +x setup.sh
 docker compose -f docker-compose-local.yml up
 ```
 
+
 ## Missing a Feature?
 
 If a feature is missing, you can directly _request_ a new one [here](https://github.com/makeplane/plane/issues/new?assignees=&labels=feature&template=feature_request.yml&title=%F0%9F%9A%80+Feature%3A+). You also can do the same by choosing "🚀 Feature" when raising a [New Issue](https://github.com/makeplane/plane/issues/new/choose) on our GitHub Repository.

ENV_SETUP.md

@@ -53,6 +53,7 @@ NGINX_PORT=80
 NEXT_PUBLIC_DEPLOY_URL="http://localhost/spaces"
 ```
 
+
 ## {PROJECT_FOLDER}/apiserver/.env
 
 ​

README.md

@@ -7,7 +7,7 @@
 </p>
 
 <h3 align="center"><b>Plane</b></h3>
-<p align="center"><b>Open-source project management that unlocks customer value.</b></p>
+<p align="center"><b>Flexible, extensible open-source project management</b></p>
 
 <p align="center">
 <a href="https://discord.com/invite/A92xrEGCge">
@@ -16,13 +16,6 @@
 <img alt="Commit activity per month" src="https://img.shields.io/github/commit-activity/m/makeplane/plane?style=for-the-badge" />
 </p>
 
-<p align="center">
-    <a href="http://www.plane.so"><b>Website</b></a> •
-    <a href="https://github.com/makeplane/plane/releases"><b>Releases</b></a> •
-    <a href="https://twitter.com/planepowers"><b>Twitter</b></a> •
-    <a href="https://docs.plane.so/"><b>Documentation</b></a>
-</p>
-
 <p>
     <a href="https://app.plane.so/#gh-light-mode-only" target="_blank">
       <img
@@ -40,90 +33,56 @@
     </a>
 </p>
 
-Meet [Plane](https://plane.so). An open-source software development tool to manage issues, sprints, and product roadmaps with peace of mind. 🧘‍♀️
+Meet [Plane](https://plane.so). An open-source software development tool to manage issues, sprints, and product roadmaps with peace of mind 🧘‍♀️.
 
 > Plane is still in its early days, not everything will be perfect yet, and hiccups may happen. Please let us know of any suggestions, ideas, or bugs that you encounter on our [Discord](https://discord.com/invite/A92xrEGCge) or GitHub issues, and we will use your feedback to improve on our upcoming releases.
 
-## ⚡ Installation
+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). 
 
-The easiest way to get started with Plane is by creating a [Plane Cloud](https://app.plane.so) account where we offer a hosted solution for users.
+## ⚡️ Contributors Quick Start
 
-If you want more control over your data prefer to self-host Plane, please refer to our [deployment documentation](https://docs.plane.so/docker-compose).
+### Prerequisite
 
-| Installation Methods | Documentation Link                                                                                                                                           |
-| -------------------- | ------------------------------------------------------------------------------------------------------------------------------------------------------------ |
-| Docker               | [![Docker](https://img.shields.io/badge/docker-%230db7ed.svg?style=for-the-badge&logo=docker&logoColor=white)](https://docs.plane.so/docker-compose)         |
-| Kubernetes           | [![Kubernetes](https://img.shields.io/badge/kubernetes-%23326ce5.svg?style=for-the-badge&logo=kubernetes&logoColor=white)](https://docs.plane.so/kubernetes) |
+Development system must have docker engine installed and running.
 
-`Instance admin` can configure instance settings using our [God-mode](https://docs.plane.so/instance-admin) feature.
-
-## 🚀 Features
-
-- **Issues**: Quickly create issues and add details using a powerful, rich text editor that supports file uploads. Add sub-properties and references to problems for better organization and tracking.
-
-- **Cycles**
-  Keep up your team's momentum with Cycles. Gain insights into your project's progress with burn-down charts and other valuable features.
-
-- **Modules**: Break down your large projects into smaller, more manageable modules. Assign modules between teams to track and plan your project's progress easily.
-
-- **Views**: Create custom filters to display only the issues that matter to you. Save and share your filters in just a few clicks.
-
-- **Pages**: Plane pages, equipped with AI and a rich text editor, let you jot down your thoughts on the fly. Format your text, upload images, hyperlink, or sync your existing ideas into an actionable item or issue.
-
-- **Analytics**: Get insights into all your Plane data in real-time. Visualize issue data to spot trends, remove blockers, and progress your work.
-
-- **Drive** (_coming soon_): The drive helps you share documents, images, videos, or any other files that make sense to you or your team and align on the problem/solution.
-
-## 🛠️ Contributors Quick Start
-
-> Development system must have docker engine installed and running.
+### Steps
 
 Setting up local environment is extremely easy and straight forward. Follow the below step and you will be ready to contribute
 
-1. Clone the code locally using:
-   ```
-   git clone https://github.com/makeplane/plane.git
-   ```
-2. Switch to the code folder:
-   ```
-   cd plane
-   ```
-3. Create your feature or fix branch you plan to work on using:
-   ```
-   git checkout -b <feature-branch-name>
-   ```
-4. Open terminal and run:
-   ```
-   ./setup.sh
-   ```
-5. Open the code on VSCode or similar equivalent IDE.
-6. Review the `.env` files available in various folders.
-   Visit [Environment Setup](./ENV_SETUP.md) to know about various environment variables used in system.
-7. Run the docker command to initiate services:
-   ```
-   docker compose -f docker-compose-local.yml up -d
-   ```
+1. Clone the code locally using `git clone https://github.com/makeplane/plane.git`
+1. Switch to the code folder `cd plane`
+1. Create your feature or fix branch you plan to work on using `git checkout -b <feature-branch-name>`
+1. Open terminal and run `./setup.sh`
+1. Open the code on VSCode or similar equivalent IDE
+1. Review the `.env` files available in various folders. Visit [Environment Setup](./ENV_SETUP.md) to know about various environment variables used in system
+1. Run the docker command to initiate various services `docker compose -f docker-compose-local.yml up -d`
 
-You are ready to make changes to the code. Do not forget to refresh the browser (in case it does not auto-reload).
+You are ready to make changes to the code. Do not forget to refresh the browser (in case id does not auto-reload)
 
 Thats it!
 
-## ❤️ Community
+## 🍙 Self Hosting
 
-The Plane community can be found on [GitHub Discussions](https://github.com/orgs/makeplane/discussions), and our [Discord server](https://discord.com/invite/A92xrEGCge). Our [Code of conduct](https://github.com/makeplane/plane/blob/master/CODE_OF_CONDUCT.md) applies to all Plane community chanels.
+For self hosting environment setup, visit the [Self Hosting](https://docs.plane.so/docker-compose) documentation page
 
-Ask questions, report bugs, join discussions, voice ideas, make feature requests, or share your projects.
+## 🚀 Features
 
-### Repo Activity
-
-![Plane Repo Activity](https://repobeats.axiom.co/api/embed/2523c6ed2f77c082b7908c33e2ab208981d76c39.svg "Repobeats analytics image")
+- **Issue Planning and Tracking**: Quickly create issues and add details using a powerful rich text editor that supports file uploads. Add sub-properties and references to issues for better organization and tracking.
+- **Issue Attachments**: Collaborate effectively by attaching files to issues, making it easy for your team to find and share important project-related documents.
+- **Layouts**: Customize your project view with your preferred layout - choose from List, Kanban, or Calendar to visualize your project in a way that makes sense to you.
+- **Cycles**: Plan sprints with Cycles to keep your team on track and productive. Gain insights into your project's progress with burn-down charts and other useful features.
+- **Modules**: Break down your large projects into smaller, more manageable modules. Assign modules between teams to easily track and plan your project's progress.
+- **Views**: Create custom filters to display only the issues that matter to you. Save and share your filters in just a few clicks.
+- **Pages**: Plane pages function as an AI-powered notepad, allowing you to easily document issues, cycle plans, and module details, and then synchronize them with your issues.
+- **Command K**: Enjoy a better user experience with the new Command + K menu. Easily manage and navigate through your projects from one convenient location.
+- **GitHub Sync**: Streamline your planning process by syncing your GitHub issues with Plane. Keep all your issues in one place for better tracking and collaboration.
 
 ## 📸 Screenshots
 
 <p>
     <a href="https://plane.so" target="_blank">
       <img
-        src="https://ik.imagekit.io/w2okwbtu2/Issues_rNZjrGgFl.png?updatedAt=1709298765880"
+        src="https://plane-marketing.s3.ap-south-1.amazonaws.com/plane-readme/plane_views_dark_mode.webp"
         alt="Plane Views"
         width="100%"
       />
@@ -132,7 +91,8 @@ Ask questions, report bugs, join discussions, voice ideas, make feature requests
 <p>
     <a href="https://plane.so" target="_blank">
       <img
-        src="https://ik.imagekit.io/w2okwbtu2/Cycles_jCDhqmTl9.png?updatedAt=1709298780697"
+        src="https://plane-marketing.s3.ap-south-1.amazonaws.com/plane-readme/plane_issue_detail_dark_mode.webp"
+        alt="Plane Issue Details"
         width="100%"
       />
     </a>
@@ -140,7 +100,7 @@ Ask questions, report bugs, join discussions, voice ideas, make feature requests
   <p>
     <a href="https://plane.so" target="_blank">
       <img
-        src="https://ik.imagekit.io/w2okwbtu2/Modules_PSCVsbSfI.png?updatedAt=1709298796783"
+        src="https://plane-marketing.s3.ap-south-1.amazonaws.com/plane-readme/plane_cycles_modules_dark_mode.webp"
         alt="Plane Cycles and Modules"
         width="100%"
       />
@@ -149,7 +109,7 @@ Ask questions, report bugs, join discussions, voice ideas, make feature requests
   <p>
     <a href="https://plane.so" target="_blank">
       <img
-        src="https://ik.imagekit.io/w2okwbtu2/Views_uxXsRatS4.png?updatedAt=1709298834522"
+        src="https://plane-marketing.s3.ap-south-1.amazonaws.com/plane-readme/plane_analytics_dark_mode.webp"
         alt="Plane Analytics"
         width="100%"
       />
@@ -158,7 +118,7 @@ Ask questions, report bugs, join discussions, voice ideas, make feature requests
    <p>
     <a href="https://plane.so" target="_blank">
       <img
-        src="https://ik.imagekit.io/w2okwbtu2/Analytics_0o22gLRtp.png?updatedAt=1709298834389"
+        src="https://plane-marketing.s3.ap-south-1.amazonaws.com/plane-readme/plane_pages_dark_mode.webp"
         alt="Plane Pages"
         width="100%"
       />
@@ -168,7 +128,7 @@ Ask questions, report bugs, join discussions, voice ideas, make feature requests
    <p>
     <a href="https://plane.so" target="_blank">
       <img
-        src="https://ik.imagekit.io/w2okwbtu2/Drive_LlfeY4xn3.png?updatedAt=1709298837917"
+        src="https://plane-marketing.s3.ap-south-1.amazonaws.com/plane-readme/plane_commad_k_dark_mode.webp"
         alt="Plane Command Menu"
         width="100%"
       />
@@ -176,23 +136,20 @@ Ask questions, report bugs, join discussions, voice ideas, make feature requests
   </p>
 </p>
 
+## 📚Documentation
+
+For full documentation, visit [docs.plane.so](https://docs.plane.so/)
+
+To see how to Contribute, visit [here](https://github.com/makeplane/plane/blob/master/CONTRIBUTING.md).
+
+## ❤️ Community
+
+The Plane community can be found on GitHub Discussions, where you can ask questions, voice ideas, and share your projects.
+
+To chat with other community members you can join the [Plane Discord](https://discord.com/invite/A92xrEGCge).
+
+Our [Code of Conduct](https://github.com/makeplane/plane/blob/master/CODE_OF_CONDUCT.md) applies to all Plane community channels.
+
 ## ⛓️ Security
 
-If you believe you have found a security vulnerability in Plane, we encourage you to responsibly disclose this and not open a public issue. We will investigate all legitimate reports.
-
-Email squawk@plane.so to disclose any security vulnerabilities.
-
-## ❤️ Contribute
-
-There are many ways to contribute to Plane, including:
-
-- Submitting [bugs](https://github.com/makeplane/plane/issues/new?assignees=srinivaspendem%2Cpushya22&labels=%F0%9F%90%9Bbug&projects=&template=--bug-report.yaml&title=%5Bbug%5D%3A+) and [feature requests](https://github.com/makeplane/plane/issues/new?assignees=srinivaspendem%2Cpushya22&labels=%E2%9C%A8feature&projects=&template=--feature-request.yaml&title=%5Bfeature%5D%3A+) for various components.
-- Reviewing [the documentation](https://docs.plane.so/) and submitting [pull requests](https://github.com/makeplane/plane), from fixing typos to adding new features.
-- Speaking or writing about Plane or any other ecosystem integration and [letting us know](https://discord.com/invite/A92xrEGCge)!
-- Upvoting [popular feature requests](https://github.com/makeplane/plane/issues) to show your support.
-
-### We couldn't have done this without you.
-
-<a href="https://github.com/makeplane/plane/graphs/contributors">
-  <img src="https://contrib.rocks/image?repo=makeplane/plane" />
-</a>
+If you believe you have found a security vulnerability in Plane, we encourage you to responsibly disclose this and not open a public issue. We will investigate all legitimate reports. Email engineering@plane.so to disclose any security vulnerabilities.

apiserver/Dockerfile.api

@@ -41,6 +41,7 @@ USER captain
 
 # Add in Django deps and generate Django's static files
 COPY manage.py manage.py
+COPY server.py server.py
 COPY plane plane/
 COPY templates templates/
 COPY package.json package.json

apiserver/bin/takeoff

@@ -28,4 +28,4 @@ python manage.py configure_instance
 # Create the default bucket
 python manage.py create_bucket
 
-exec gunicorn -w $GUNICORN_WORKERS -k uvicorn.workers.UvicornWorker plane.asgi:application --bind 0.0.0.0:${PORT:-8000} --max-requests 1200 --max-requests-jitter 1000 --access-logfile -
+python server.py

apiserver/package.json

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

apiserver/plane/api/serializers/issue.py

@@ -1,9 +1,8 @@
 from lxml import html
 
+
 # Django imports
 from django.utils import timezone
-from django.core.validators import URLValidator
-from django.core.exceptions import ValidationError
 
 #  Third party imports
 from rest_framework import serializers
@@ -285,20 +284,6 @@ class IssueLinkSerializer(BaseSerializer):
             "updated_at",
         ]
 
-    def validate_url(self, value):
-        # Check URL format
-        validate_url = URLValidator()
-        try:
-            validate_url(value)
-        except ValidationError:
-            raise serializers.ValidationError("Invalid URL format.")
-
-        # Check URL scheme
-        if not value.startswith(('http://', 'https://')):
-            raise serializers.ValidationError("Invalid URL scheme.")
-
-        return value
-
     # Validation if url already exists
     def create(self, validated_data):
         if IssueLink.objects.filter(
@@ -310,17 +295,6 @@ class IssueLinkSerializer(BaseSerializer):
             )
         return IssueLink.objects.create(**validated_data)
 
-    def update(self, instance, validated_data):
-        if IssueLink.objects.filter(
-            url=validated_data.get("url"),
-            issue_id=instance.issue_id,
-        ).exists():
-            raise serializers.ValidationError(
-                {"error": "URL already exists for this Issue"}
-            )
-
-        return super().update(instance, validated_data)
-
 
 class IssueAttachmentSerializer(BaseSerializer):
     class Meta:

apiserver/plane/api/views/base.py

@@ -1,8 +1,6 @@
 # Python imports
 import zoneinfo
 import json
-from urllib.parse import urlparse
-
 
 # Django imports
 from django.conf import settings
@@ -53,11 +51,6 @@ class WebhookMixin:
             and self.request.method in ["POST", "PATCH", "DELETE"]
             and response.status_code in [200, 201, 204]
         ):
-            url = request.build_absolute_uri()
-            parsed_url = urlparse(url)
-            # Extract the scheme and netloc
-            scheme = parsed_url.scheme
-            netloc = parsed_url.netloc
             # Push the object to delay
             send_webhook.delay(
                 event=self.webhook_event,
@@ -66,7 +59,6 @@ class WebhookMixin:
                 action=self.request.method,
                 slug=self.workspace_slug,
                 bulk=self.bulk,
-                current_site=f"{scheme}://{netloc}",
             )
 
         return response

apiserver/plane/api/views/cycle.py

@@ -45,10 +45,7 @@ class CycleAPIEndpoint(WebhookMixin, BaseAPIView):
         return (
             Cycle.objects.filter(workspace__slug=self.kwargs.get("slug"))
             .filter(project_id=self.kwargs.get("project_id"))
-            .filter(
-                project__project_projectmember__member=self.request.user,
-                project__project_projectmember__is_active=True,
-            )
+            .filter(project__project_projectmember__member=self.request.user)
             .select_related("project")
             .select_related("workspace")
             .select_related("owned_by")
@@ -393,10 +390,7 @@ class CycleIssueAPIEndpoint(WebhookMixin, BaseAPIView):
             )
             .filter(workspace__slug=self.kwargs.get("slug"))
             .filter(project_id=self.kwargs.get("project_id"))
-            .filter(
-                project__project_projectmember__member=self.request.user,
-                project__project_projectmember__is_active=True,
-            )
+            .filter(project__project_projectmember__member=self.request.user)
             .filter(cycle_id=self.kwargs.get("cycle_id"))
             .select_related("project")
             .select_related("workspace")

apiserver/plane/api/views/issue.py

@@ -352,10 +352,7 @@ class LabelAPIEndpoint(BaseAPIView):
         return (
             Label.objects.filter(workspace__slug=self.kwargs.get("slug"))
             .filter(project_id=self.kwargs.get("project_id"))
-            .filter(
-                project__project_projectmember__member=self.request.user,
-                project__project_projectmember__is_active=True,
-            )
+            .filter(project__project_projectmember__member=self.request.user)
             .select_related("project")
             .select_related("workspace")
             .select_related("parent")
@@ -484,10 +481,7 @@ class IssueLinkAPIEndpoint(BaseAPIView):
             IssueLink.objects.filter(workspace__slug=self.kwargs.get("slug"))
             .filter(project_id=self.kwargs.get("project_id"))
             .filter(issue_id=self.kwargs.get("issue_id"))
-            .filter(
-                project__project_projectmember__member=self.request.user,
-                project__project_projectmember__is_active=True,
-            )
+            .filter(project__project_projectmember__member=self.request.user)
             .order_by(self.kwargs.get("order_by", "-created_at"))
             .distinct()
         )
@@ -613,11 +607,11 @@ class IssueCommentAPIEndpoint(WebhookMixin, BaseAPIView):
             )
             .filter(project_id=self.kwargs.get("project_id"))
             .filter(issue_id=self.kwargs.get("issue_id"))
-            .filter(
-                project__project_projectmember__member=self.request.user,
-                project__project_projectmember__is_active=True,
-            )
-            .select_related("workspace", "project", "issue", "actor")
+            .filter(project__project_projectmember__member=self.request.user)
+            .select_related("project")
+            .select_related("workspace")
+            .select_related("issue")
+            .select_related("actor")
             .annotate(
                 is_member=Exists(
                     ProjectMember.objects.filter(
@@ -653,33 +647,6 @@ class IssueCommentAPIEndpoint(WebhookMixin, BaseAPIView):
         )
 
     def post(self, request, slug, project_id, issue_id):
-
-        # Validation check if the issue already exists
-        if (
-            request.data.get("external_id")
-            and request.data.get("external_source")
-            and IssueComment.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_comment = IssueComment.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 Comment with the same external id and external source already exists",
-                    "id": str(issue_comment.id),
-                },
-                status=status.HTTP_409_CONFLICT,
-            )
-
-
         serializer = IssueCommentSerializer(data=request.data)
         if serializer.is_valid():
             serializer.save(
@@ -713,29 +680,6 @@ class IssueCommentAPIEndpoint(WebhookMixin, BaseAPIView):
             IssueCommentSerializer(issue_comment).data,
             cls=DjangoJSONEncoder,
         )
-
-        # Validation check if the issue already exists
-        if (
-            request.data.get("external_id")
-            and (issue_comment.external_id != str(request.data.get("external_id")))
-            and IssueComment.objects.filter(
-                project_id=project_id,
-                workspace__slug=slug,
-                external_source=request.data.get(
-                    "external_source", issue_comment.external_source
-                ),
-                external_id=request.data.get("external_id"),
-            ).exists()
-        ):
-            return Response(
-                {
-                    "error": "Issue Comment with the same external id and external source already exists",
-                    "id": str(issue_comment.id),
-                },
-                status=status.HTTP_409_CONFLICT,
-            )
-
-
         serializer = IssueCommentSerializer(
             issue_comment, data=request.data, partial=True
         )
@@ -790,7 +734,6 @@ class IssueActivityAPIEndpoint(BaseAPIView):
             .filter(
                 ~Q(field__in=["comment", "vote", "reaction", "draft"]),
                 project__project_projectmember__member=self.request.user,
-                project__project_projectmember__is_active=True,
             )
             .select_related("actor", "workspace", "issue", "project")
         ).order_by(request.GET.get("order_by", "created_at"))

apiserver/plane/api/views/module.py

@@ -273,10 +273,7 @@ class ModuleIssueAPIEndpoint(WebhookMixin, BaseAPIView):
             .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,
-                project__project_projectmember__is_active=True,
-            )
+            .filter(project__project_projectmember__member=self.request.user)
             .select_related("project")
             .select_related("workspace")
             .select_related("module")

apiserver/plane/api/views/state.py

@@ -1,5 +1,7 @@
+# Python imports
+from itertools import groupby
+
 # Django imports
-from django.db import IntegrityError
 from django.db.models import Q
 
 # Third party imports
@@ -24,10 +26,7 @@ class StateAPIEndpoint(BaseAPIView):
         return (
             State.objects.filter(workspace__slug=self.kwargs.get("slug"))
             .filter(project_id=self.kwargs.get("project_id"))
-            .filter(
-                project__project_projectmember__member=self.request.user,
-                project__project_projectmember__is_active=True,
-            )
+            .filter(project__project_projectmember__member=self.request.user)
             .filter(~Q(name="Triage"))
             .select_related("project")
             .select_related("workspace")
@@ -35,51 +34,37 @@ class StateAPIEndpoint(BaseAPIView):
         )
 
     def post(self, request, slug, project_id):
-        try:
-            serializer = StateSerializer(
-                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",
-                            "id": str(state.id),
-                        },
-                        status=status.HTTP_409_CONFLICT,
-                    )
+        serializer = StateSerializer(
+            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",
+                        "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)
-        except IntegrityError as e:
-            state = State.objects.filter(
-                workspace__slug=slug,
-                project_id=project_id,
-                name=request.data.get("name"),
-            ).first()
-            return Response(
-                {
-                    "error": "State with the same name already exists in the project",
-                    "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)
 
     def get(self, request, slug, project_id, state_id=None):
         if state_id:

apiserver/plane/app/serializers/__init__.py

@@ -68,14 +68,9 @@ from .issue import (
     IssueRelationSerializer,
     RelatedIssueSerializer,
     IssuePublicSerializer,
-    IssueDetailSerializer,
-    IssueReactionLiteSerializer,
-    IssueAttachmentLiteSerializer,
-    IssueLinkLiteSerializer,
 )
 
 from .module import (
-    ModuleDetailSerializer,
     ModuleWriteSerializer,
     ModuleSerializer,
     ModuleIssueSerializer,

apiserver/plane/app/serializers/base.py

@@ -58,12 +58,9 @@ class DynamicBaseSerializer(BaseSerializer):
                     IssueSerializer,
                     LabelSerializer,
                     CycleIssueSerializer,
-                    IssueLiteSerializer,
+                    IssueFlatSerializer,
                     IssueRelationSerializer,
-                    InboxIssueLiteSerializer,
-                    IssueReactionLiteSerializer,
-                    IssueAttachmentLiteSerializer,
-                    IssueLinkLiteSerializer,
+                    InboxIssueLiteSerializer
                 )
 
                 # Expansion mapper
@@ -82,34 +79,12 @@ class DynamicBaseSerializer(BaseSerializer):
                     "assignees": UserLiteSerializer,
                     "labels": LabelSerializer,
                     "issue_cycle": CycleIssueSerializer,
-                    "parent": IssueLiteSerializer,
+                    "parent": IssueSerializer,
                     "issue_relation": IssueRelationSerializer,
-                    "issue_inbox": InboxIssueLiteSerializer,
-                    "issue_reactions": IssueReactionLiteSerializer,
-                    "issue_attachment": IssueAttachmentLiteSerializer,
-                    "issue_link": IssueLinkLiteSerializer,
-                    "sub_issues": IssueLiteSerializer,
+                    "issue_inbox" : InboxIssueLiteSerializer,
                 }
-
-                self.fields[field] = expansion[field](
-                    many=(
-                        True
-                        if field
-                        in [
-                            "members",
-                            "assignees",
-                            "labels",
-                            "issue_cycle",
-                            "issue_relation",
-                            "issue_inbox",
-                            "issue_reactions",
-                            "issue_attachment",
-                            "issue_link",
-                            "sub_issues",
-                        ]
-                        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
 
@@ -130,11 +105,7 @@ class DynamicBaseSerializer(BaseSerializer):
                         LabelSerializer,
                         CycleIssueSerializer,
                         IssueRelationSerializer,
-                        InboxIssueLiteSerializer,
-                        IssueLiteSerializer,
-                        IssueReactionLiteSerializer,
-                        IssueAttachmentLiteSerializer,
-                        IssueLinkLiteSerializer,
+                        InboxIssueLiteSerializer
                     )
 
                     # Expansion mapper
@@ -153,13 +124,9 @@ class DynamicBaseSerializer(BaseSerializer):
                         "assignees": UserLiteSerializer,
                         "labels": LabelSerializer,
                         "issue_cycle": CycleIssueSerializer,
-                        "parent": IssueLiteSerializer,
+                        "parent": IssueSerializer,
                         "issue_relation": IssueRelationSerializer,
-                        "issue_inbox": InboxIssueLiteSerializer,
-                        "issue_reactions": IssueReactionLiteSerializer,
-                        "issue_attachment": IssueAttachmentLiteSerializer,
-                        "issue_link": IssueLinkLiteSerializer,
-                        "sub_issues": IssueLiteSerializer,
+                        "issue_inbox" : InboxIssueLiteSerializer,
                     }
                     # Check if field in expansion then expand the field
                     if expand in expansion:

apiserver/plane/app/serializers/cycle.py

@@ -3,7 +3,10 @@ from rest_framework import serializers
 
 # Module imports
 from .base import BaseSerializer
+from .user import UserLiteSerializer
 from .issue import IssueStateSerializer
+from .workspace import WorkspaceLiteSerializer
+from .project import ProjectLiteSerializer
 from plane.db.models import (
     Cycle,
     CycleIssue,
@@ -11,6 +14,7 @@ from plane.db.models import (
     CycleUserProperties,
 )
 
+
 class CycleWriteSerializer(BaseSerializer):
     def validate(self, data):
         if (
@@ -26,57 +30,65 @@ class CycleWriteSerializer(BaseSerializer):
     class Meta:
         model = Cycle
         fields = "__all__"
-        read_only_fields = [
-            "workspace",
-            "project",
-            "owned_by",
-        ]
 
 
 class CycleSerializer(BaseSerializer):
-    # favorite
     is_favorite = serializers.BooleanField(read_only=True)
     total_issues = serializers.IntegerField(read_only=True)
-    # state group wise distribution
     cancelled_issues = serializers.IntegerField(read_only=True)
     completed_issues = serializers.IntegerField(read_only=True)
     started_issues = serializers.IntegerField(read_only=True)
     unstarted_issues = serializers.IntegerField(read_only=True)
     backlog_issues = serializers.IntegerField(read_only=True)
-
-    # active | draft | upcoming | completed
+    assignees = serializers.SerializerMethodField(read_only=True)
+    total_estimates = serializers.IntegerField(read_only=True)
+    completed_estimates = serializers.IntegerField(read_only=True)
+    started_estimates = serializers.IntegerField(read_only=True)
+    workspace_detail = WorkspaceLiteSerializer(
+        read_only=True, source="workspace"
+    )
+    project_detail = ProjectLiteSerializer(read_only=True, source="project")
     status = serializers.CharField(read_only=True)
 
+    def validate(self, data):
+        if (
+            data.get("start_date", None) is not None
+            and data.get("end_date", None) is not None
+            and data.get("start_date", None) > data.get("end_date", None)
+        ):
+            raise serializers.ValidationError(
+                "Start date cannot exceed end date"
+            )
+        return data
+
+    def get_assignees(self, obj):
+        members = [
+            {
+                "avatar": assignee.avatar,
+                "display_name": assignee.display_name,
+                "id": assignee.id,
+            }
+            for issue_cycle in obj.issue_cycle.prefetch_related(
+                "issue__assignees"
+            ).all()
+            for assignee in issue_cycle.issue.assignees.all()
+        ]
+        # Use a set comprehension to return only the unique objects
+        unique_objects = {frozenset(item.items()) for item in members}
+
+        # Convert the set back to a list of dictionaries
+        unique_list = [dict(item) for item in unique_objects]
+
+        return unique_list
 
     class Meta:
         model = Cycle
-        fields = [
-            # necessary fields
-            "id",
-            "workspace_id",
-            "project_id",
-            # model fields
-            "name",
-            "description",
-            "start_date",
-            "end_date",
-            "owned_by_id",
-            "view_props",
-            "sort_order",
-            "external_source",
-            "external_id",
-            "progress_snapshot",
-            # meta fields
-            "is_favorite",
-            "total_issues",
-            "cancelled_issues",
-            "completed_issues",
-            "started_issues",
-            "unstarted_issues",
-            "backlog_issues",
-            "status",
+        fields = "__all__"
+        read_only_fields = [
+            "workspace",
+            "project",
+            "owned_by",
         ]
-        read_only_fields = fields
 
 
 class CycleIssueSerializer(BaseSerializer):

apiserver/plane/app/serializers/issue.py

@@ -1,7 +1,5 @@
 # Django imports
 from django.utils import timezone
-from django.core.validators import URLValidator
-from django.core.exceptions import ValidationError
 
 # Third Party imports
 from rest_framework import serializers
@@ -434,20 +432,6 @@ class IssueLinkSerializer(BaseSerializer):
             "issue",
         ]
 
-    def validate_url(self, value):
-        # Check URL format
-        validate_url = URLValidator()
-        try:
-            validate_url(value)
-        except ValidationError:
-            raise serializers.ValidationError("Invalid URL format.")
-
-        # Check URL scheme
-        if not value.startswith(('http://', 'https://')):
-            raise serializers.ValidationError("Invalid URL scheme.")
-
-        return value
-
     # Validation if url already exists
     def create(self, validated_data):
         if IssueLink.objects.filter(
@@ -459,33 +443,6 @@ class IssueLinkSerializer(BaseSerializer):
             )
         return IssueLink.objects.create(**validated_data)
 
-    def update(self, instance, validated_data):
-        if IssueLink.objects.filter(
-            url=validated_data.get("url"),
-            issue_id=instance.issue_id,
-        ).exists():
-            raise serializers.ValidationError(
-                {"error": "URL already exists for this Issue"}
-            )
-
-        return super().update(instance, validated_data)
-
-
-class IssueLinkLiteSerializer(BaseSerializer):
-
-    class Meta:
-        model = IssueLink
-        fields = [
-            "id",
-            "issue_id",
-            "title",
-            "url",
-            "metadata",
-            "created_by_id",
-            "created_at",
-        ]
-        read_only_fields = fields
-
 
 class IssueAttachmentSerializer(BaseSerializer):
     class Meta:
@@ -502,21 +459,6 @@ class IssueAttachmentSerializer(BaseSerializer):
         ]
 
 
-class IssueAttachmentLiteSerializer(DynamicBaseSerializer):
-
-    class Meta:
-        model = IssueAttachment
-        fields = [
-            "id",
-            "asset",
-            "attributes",
-            "issue_id",
-            "updated_at",
-            "updated_by_id",
-        ]
-        read_only_fields = fields
-
-
 class IssueReactionSerializer(BaseSerializer):
     actor_detail = UserLiteSerializer(read_only=True, source="actor")
 
@@ -531,18 +473,6 @@ class IssueReactionSerializer(BaseSerializer):
         ]
 
 
-class IssueReactionLiteSerializer(DynamicBaseSerializer):
-
-    class Meta:
-        model = IssueReaction
-        fields = [
-            "id",
-            "actor_id",
-            "issue_id",
-            "reaction",
-        ]
-
-
 class CommentReactionSerializer(BaseSerializer):
     class Meta:
         model = CommentReaction
@@ -573,7 +503,9 @@ class IssueCommentSerializer(BaseSerializer):
     workspace_detail = WorkspaceLiteSerializer(
         read_only=True, source="workspace"
     )
-    comment_reactions = CommentReactionSerializer(read_only=True, many=True)
+    comment_reactions = CommentReactionSerializer(
+        read_only=True, many=True
+    )
     is_member = serializers.BooleanField(read_only=True)
 
     class Meta:
@@ -626,17 +558,18 @@ class IssueStateSerializer(DynamicBaseSerializer):
 
 class IssueSerializer(DynamicBaseSerializer):
     # ids
+    project_id = serializers.PrimaryKeyRelatedField(read_only=True)
+    state_id = serializers.PrimaryKeyRelatedField(read_only=True)
+    parent_id = serializers.PrimaryKeyRelatedField(read_only=True)
     cycle_id = serializers.PrimaryKeyRelatedField(read_only=True)
-    module_ids = serializers.ListField(
-        child=serializers.UUIDField(), required=False,
-    )
+    module_ids = serializers.SerializerMethodField()
 
     # Many to many
-    label_ids = serializers.ListField(
-        child=serializers.UUIDField(), required=False,
+    label_ids = serializers.PrimaryKeyRelatedField(
+        read_only=True, many=True, source="labels"
     )
-    assignee_ids = serializers.ListField(
-        child=serializers.UUIDField(), required=False,
+    assignee_ids = serializers.PrimaryKeyRelatedField(
+        read_only=True, many=True, source="assignees"
     )
 
     # Count items
@@ -644,12 +577,16 @@ class IssueSerializer(DynamicBaseSerializer):
     attachment_count = serializers.IntegerField(read_only=True)
     link_count = serializers.IntegerField(read_only=True)
 
+    # is_subscribed
+    is_subscribed = serializers.BooleanField(read_only=True)
+
     class Meta:
         model = Issue
         fields = [
             "id",
             "name",
             "state_id",
+            "description_html",
             "sort_order",
             "completed_at",
             "estimate_point",
@@ -670,45 +607,50 @@ class IssueSerializer(DynamicBaseSerializer):
             "updated_by",
             "attachment_count",
             "link_count",
+            "is_subscribed",
             "is_draft",
             "archived_at",
         ]
         read_only_fields = fields
 
-
-class IssueDetailSerializer(IssueSerializer):
-    description_html = serializers.CharField()
-    is_subscribed = serializers.BooleanField(read_only=True)
-
-    class Meta(IssueSerializer.Meta):
-        fields = IssueSerializer.Meta.fields + [
-            "description_html",
-            "is_subscribed",
-        ]
+    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(
+        read_only=True, source="workspace"
+    )
+    project_detail = ProjectLiteSerializer(read_only=True, source="project")
+    state_detail = StateLiteSerializer(read_only=True, source="state")
+    label_details = LabelLiteSerializer(
+        read_only=True, source="labels", many=True
+    )
+    assignee_details = UserLiteSerializer(
+        read_only=True, source="assignees", many=True
+    )
+    sub_issues_count = serializers.IntegerField(read_only=True)
+    cycle_id = serializers.UUIDField(read_only=True)
+    module_id = serializers.UUIDField(read_only=True)
+    attachment_count = serializers.IntegerField(read_only=True)
+    link_count = serializers.IntegerField(read_only=True)
+    issue_reactions = IssueReactionSerializer(read_only=True, many=True)
 
     class Meta:
         model = Issue
-        fields = [
-            "id",
-            "sequence_id",
-            "project_id",
+        fields = "__all__"
+        read_only_fields = [
+            "start_date",
+            "target_date",
+            "completed_at",
+            "workspace",
+            "project",
+            "created_by",
+            "updated_by",
+            "created_at",
+            "updated_at",
         ]
-        read_only_fields = fields
-
-
-class IssueDetailSerializer(IssueSerializer):
-    description_html = serializers.CharField()
-    is_subscribed = serializers.BooleanField()
-
-    class Meta(IssueSerializer.Meta):
-        fields = IssueSerializer.Meta.fields + [
-            "description_html",
-            "is_subscribed",
-        ]
-        read_only_fields = fields
 
 
 class IssuePublicSerializer(BaseSerializer):

apiserver/plane/app/serializers/module.py

@@ -5,6 +5,7 @@ from rest_framework import serializers
 from .base import BaseSerializer, DynamicBaseSerializer
 from .user import UserLiteSerializer
 from .project import ProjectLiteSerializer
+from .workspace import WorkspaceLiteSerializer
 
 from plane.db.models import (
     User,
@@ -18,18 +19,17 @@ from plane.db.models import (
 
 
 class ModuleWriteSerializer(BaseSerializer):
-    lead_id = serializers.PrimaryKeyRelatedField(
-        source="lead",
-        queryset=User.objects.all(),
-        required=False,
-        allow_null=True,
-    )
-    member_ids = serializers.ListField(
+    members = serializers.ListField(
         child=serializers.PrimaryKeyRelatedField(queryset=User.objects.all()),
         write_only=True,
         required=False,
     )
 
+    project_detail = ProjectLiteSerializer(source="project", read_only=True)
+    workspace_detail = WorkspaceLiteSerializer(
+        source="workspace", read_only=True
+    )
+
     class Meta:
         model = Module
         fields = "__all__"
@@ -44,9 +44,7 @@ class ModuleWriteSerializer(BaseSerializer):
 
     def to_representation(self, instance):
         data = super().to_representation(instance)
-        data["member_ids"] = [
-            str(member.id) for member in instance.members.all()
-        ]
+        data["members"] = [str(member.id) for member in instance.members.all()]
         return data
 
     def validate(self, data):
@@ -61,10 +59,12 @@ class ModuleWriteSerializer(BaseSerializer):
         return data
 
     def create(self, validated_data):
-        members = validated_data.pop("member_ids", None)
+        members = validated_data.pop("members", None)
+
         project = self.context["project"]
 
         module = Module.objects.create(**validated_data, project=project)
+
         if members is not None:
             ModuleMember.objects.bulk_create(
                 [
@@ -85,7 +85,7 @@ class ModuleWriteSerializer(BaseSerializer):
         return module
 
     def update(self, instance, validated_data):
-        members = validated_data.pop("member_ids", None)
+        members = validated_data.pop("members", None)
 
         if members is not None:
             ModuleMember.objects.filter(module=instance).delete()
@@ -142,6 +142,7 @@ class ModuleIssueSerializer(BaseSerializer):
 
 
 class ModuleLinkSerializer(BaseSerializer):
+    created_by_detail = UserLiteSerializer(read_only=True, source="created_by")
 
     class Meta:
         model = ModuleLink
@@ -169,9 +170,12 @@ class ModuleLinkSerializer(BaseSerializer):
 
 
 class ModuleSerializer(DynamicBaseSerializer):
-    member_ids = serializers.ListField(
-        child=serializers.UUIDField(), required=False, allow_null=True
+    project_detail = ProjectLiteSerializer(read_only=True, source="project")
+    lead_detail = UserLiteSerializer(read_only=True, source="lead")
+    members_detail = UserLiteSerializer(
+        read_only=True, many=True, source="members"
     )
+    link_module = ModuleLinkSerializer(read_only=True, many=True)
     is_favorite = serializers.BooleanField(read_only=True)
     total_issues = serializers.IntegerField(read_only=True)
     cancelled_issues = serializers.IntegerField(read_only=True)
@@ -182,46 +186,15 @@ class ModuleSerializer(DynamicBaseSerializer):
 
     class Meta:
         model = Module
-        fields = [
-            # Required fields
-            "id",
-            "workspace_id",
-            "project_id",
-            # Model fields
-            "name",
-            "description",
-            "description_text",
-            "description_html",
-            "start_date",
-            "target_date",
-            "status",
-            "lead_id",
-            "member_ids",
-            "view_props",
-            "sort_order",
-            "external_source",
-            "external_id",
-            # computed fields
-            "is_favorite",
-            "total_issues",
-            "cancelled_issues",
-            "completed_issues",
-            "started_issues",
-            "unstarted_issues",
-            "backlog_issues",
+        fields = "__all__"
+        read_only_fields = [
+            "workspace",
+            "project",
+            "created_by",
+            "updated_by",
             "created_at",
             "updated_at",
         ]
-        read_only_fields = fields
-
-
-
-class ModuleDetailSerializer(ModuleSerializer):
-
-    link_module = ModuleLinkSerializer(read_only=True, many=True)
-
-    class Meta(ModuleSerializer.Meta):
-        fields = ModuleSerializer.Meta.fields + ['link_module']
 
 
 class ModuleFavoriteSerializer(BaseSerializer):

apiserver/plane/app/serializers/project.py

@@ -95,7 +95,8 @@ class ProjectLiteSerializer(BaseSerializer):
             "identifier",
             "name",
             "cover_image",
-            "logo_props",
+            "icon_prop",
+            "emoji",
             "description",
         ]
         read_only_fields = fields

apiserver/plane/app/urls/issue.py

@@ -2,7 +2,6 @@ from django.urls import path
 
 
 from plane.app.views import (
-    IssueListEndpoint,
     IssueViewSet,
     LabelViewSet,
     BulkCreateIssueLabelsEndpoint,
@@ -26,11 +25,6 @@ from plane.app.views import (
 
 
 urlpatterns = [
-    path(
-        "workspaces/<str:slug>/projects/<uuid:project_id>/issues/list/",
-        IssueListEndpoint.as_view(),
-        name="project-issue",
-    ),
     path(
         "workspaces/<str:slug>/projects/<uuid:project_id>/issues/",
         IssueViewSet.as_view(
@@ -90,13 +84,11 @@ urlpatterns = [
         BulkImportIssuesEndpoint.as_view(),
         name="project-issues-bulk",
     ),
-    # deprecated endpoint TODO: remove once confirmed
     path(
         "workspaces/<str:slug>/my-issues/",
         UserWorkSpaceIssues.as_view(),
         name="workspace-issues",
     ),
-    ## 
     path(
         "workspaces/<str:slug>/projects/<uuid:project_id>/issues/<uuid:issue_id>/sub-issues/",
         SubIssuesEndpoint.as_view(),
@@ -259,15 +251,23 @@ urlpatterns = [
         name="project-issue-archive",
     ),
     path(
-        "workspaces/<str:slug>/projects/<uuid:project_id>/issues/<uuid:pk>/archive/",
+        "workspaces/<str:slug>/projects/<uuid:project_id>/archived-issues/<uuid:pk>/",
         IssueArchiveViewSet.as_view(
             {
                 "get": "retrieve",
-                "post": "archive",
-                "delete": "unarchive",
+                "delete": "destroy",
             }
         ),
-        name="project-issue-archive-unarchive",
+        name="project-issue-archive",
+    ),
+    path(
+        "workspaces/<str:slug>/projects/<uuid:project_id>/unarchive/<uuid:pk>/",
+        IssueArchiveViewSet.as_view(
+            {
+                "post": "unarchive",
+            }
+        ),
+        name="project-issue-archive",
     ),
     ## End Issue Archives
     ## Issue Relation

apiserver/plane/app/urls/workspace.py

@@ -22,9 +22,6 @@ from plane.app.views import (
     WorkspaceUserPropertiesEndpoint,
     WorkspaceStatesEndpoint,
     WorkspaceEstimatesEndpoint,
-    ExportWorkspaceUserActivityEndpoint,
-    WorkspaceModulesEndpoint,
-    WorkspaceCyclesEndpoint,
 )
 
 
@@ -192,11 +189,6 @@ urlpatterns = [
         WorkspaceUserActivityEndpoint.as_view(),
         name="workspace-user-activity",
     ),
-    path(
-        "workspaces/<str:slug>/user-activity/<uuid:user_id>/export/",
-        ExportWorkspaceUserActivityEndpoint.as_view(),
-        name="export-workspace-user-activity",
-    ),
     path(
         "workspaces/<str:slug>/user-profile/<uuid:user_id>/",
         WorkspaceUserProfileEndpoint.as_view(),
@@ -227,14 +219,4 @@ urlpatterns = [
         WorkspaceEstimatesEndpoint.as_view(),
         name="workspace-estimate",
     ),
-    path(
-        "workspaces/<str:slug>/modules/",
-        WorkspaceModulesEndpoint.as_view(),
-        name="workspace-modules",
-    ),
-    path(
-        "workspaces/<str:slug>/cycles/",
-        WorkspaceCyclesEndpoint.as_view(),
-        name="workspace-cycles",
-    ),
 ]

apiserver/plane/app/views/__init__.py

@@ -49,9 +49,6 @@ from .workspace import (
     WorkspaceUserPropertiesEndpoint,
     WorkspaceStatesEndpoint,
     WorkspaceEstimatesEndpoint,
-    ExportWorkspaceUserActivityEndpoint,
-    WorkspaceModulesEndpoint,
-    WorkspaceCyclesEndpoint,
 )
 from .state import StateViewSet
 from .view import (
@@ -70,7 +67,6 @@ from .cycle import (
 )
 from .asset import FileAssetEndpoint, UserAssetsEndpoint, FileAssetViewSet
 from .issue import (
-    IssueListEndpoint,
     IssueViewSet,
     WorkSpaceIssuesEndpoint,
     IssueActivityEndpoint,
@@ -187,6 +183,4 @@ from .webhook import (
 from .dashboard import (
     DashboardEndpoint,
     WidgetsEndpoint
-)
-
-from .error_404 import custom_404_view
+)

apiserver/plane/app/views/analytic.py

@@ -1,7 +1,6 @@
 # Django imports
 from django.db.models import Count, Sum, F, Q
 from django.db.models.functions import ExtractMonth
-from django.utils import timezone
 
 # Third party imports
 from rest_framework import status
@@ -332,9 +331,8 @@ class DefaultAnalyticsEndpoint(BaseAPIView):
             .order_by("state_group")
         )
 
-        current_year = timezone.now().year
         issue_completed_month_wise = (
-            base_issues.filter(completed_at__year=current_year)
+            base_issues.filter(completed_at__isnull=False)
             .annotate(month=ExtractMonth("completed_at"))
             .values("month")
             .annotate(count=Count("*"))

apiserver/plane/app/views/auth_extended.py

@@ -401,8 +401,8 @@ class EmailCheckEndpoint(BaseAPIView):
                 email=email,
                 user_agent=request.META.get("HTTP_USER_AGENT"),
                 ip=request.META.get("REMOTE_ADDR"),
-                event_name="Sign up",
-                medium="Magic link",
+                event_name="SIGN_IN",
+                medium="MAGIC_LINK",
                 first_time=True,
             )
             key, token, current_attempt = generate_magic_token(email=email)
@@ -438,8 +438,8 @@ class EmailCheckEndpoint(BaseAPIView):
                     email=email,
                     user_agent=request.META.get("HTTP_USER_AGENT"),
                     ip=request.META.get("REMOTE_ADDR"),
-                    event_name="Sign in",
-                    medium="Magic link",
+                    event_name="SIGN_IN",
+                    medium="MAGIC_LINK",
                     first_time=False,
                 )
 
@@ -468,8 +468,8 @@ class EmailCheckEndpoint(BaseAPIView):
                     email=email,
                     user_agent=request.META.get("HTTP_USER_AGENT"),
                     ip=request.META.get("REMOTE_ADDR"),
-                    event_name="Sign in",
-                    medium="Email",
+                    event_name="SIGN_IN",
+                    medium="EMAIL",
                     first_time=False,
                 )
 

apiserver/plane/app/views/authentication.py

@@ -274,8 +274,8 @@ class SignInEndpoint(BaseAPIView):
             email=email,
             user_agent=request.META.get("HTTP_USER_AGENT"),
             ip=request.META.get("REMOTE_ADDR"),
-            event_name="Sign in",
-            medium="Email",
+            event_name="SIGN_IN",
+            medium="EMAIL",
             first_time=False,
         )
 
@@ -349,8 +349,8 @@ class MagicSignInEndpoint(BaseAPIView):
                     email=email,
                     user_agent=request.META.get("HTTP_USER_AGENT"),
                     ip=request.META.get("REMOTE_ADDR"),
-                    event_name="Sign in",
-                    medium="Magic link",
+                    event_name="SIGN_IN",
+                    medium="MAGIC_LINK",
                     first_time=False,
                 )
 

apiserver/plane/app/views/base.py

@@ -64,7 +64,6 @@ class WebhookMixin:
                 action=self.request.method,
                 slug=self.workspace_slug,
                 bulk=self.bulk,
-                current_site=request.META.get("HTTP_ORIGIN"),
             )
 
         return response

apiserver/plane/app/views/config.py

@@ -66,15 +66,15 @@ class ConfigurationEndpoint(BaseAPIView):
                 },
                 {
                     "key": "SLACK_CLIENT_ID",
-                    "default": os.environ.get("SLACK_CLIENT_ID", None),
+                    "default": os.environ.get("SLACK_CLIENT_ID", "1"),
                 },
                 {
                     "key": "POSTHOG_API_KEY",
-                    "default": os.environ.get("POSTHOG_API_KEY", None),
+                    "default": os.environ.get("POSTHOG_API_KEY", "1"),
                 },
                 {
                     "key": "POSTHOG_HOST",
-                    "default": os.environ.get("POSTHOG_HOST", None),
+                    "default": os.environ.get("POSTHOG_HOST", "1"),
                 },
                 {
                     "key": "UNSPLASH_ACCESS_KEY",
@@ -181,11 +181,11 @@ class MobileConfigurationEndpoint(BaseAPIView):
                 },
                 {
                     "key": "POSTHOG_API_KEY",
-                    "default": os.environ.get("POSTHOG_API_KEY", None),
+                    "default": os.environ.get("POSTHOG_API_KEY", "1"),
                 },
                 {
                     "key": "POSTHOG_HOST",
-                    "default": os.environ.get("POSTHOG_HOST", None),
+                    "default": os.environ.get("POSTHOG_HOST", "1"),
                 },
                 {
                     "key": "UNSPLASH_ACCESS_KEY",

apiserver/plane/app/views/cycle.py

@@ -20,10 +20,6 @@ from django.core import serializers
 from django.utils import timezone
 from django.utils.decorators import method_decorator
 from django.views.decorators.gzip import gzip_page
-from django.contrib.postgres.aggregates import ArrayAgg
-from django.contrib.postgres.fields import ArrayField
-from django.db.models import Value, UUIDField
-from django.db.models.functions import Coalesce
 
 # Third party imports
 from rest_framework.response import Response
@@ -36,6 +32,7 @@ from plane.app.serializers import (
     CycleIssueSerializer,
     CycleFavoriteSerializer,
     IssueSerializer,
+    IssueStateSerializer,
     CycleWriteSerializer,
     CycleUserPropertiesSerializer,
 )
@@ -53,6 +50,7 @@ from plane.db.models import (
     IssueAttachment,
     Label,
     CycleUserProperties,
+    IssueSubscriber,
 )
 from plane.bgtasks.issue_activites_task import issue_activity
 from plane.utils.issue_filters import issue_filters
@@ -74,7 +72,7 @@ class CycleViewSet(WebhookMixin, BaseViewSet):
         )
 
     def get_queryset(self):
-        favorite_subquery = CycleFavorite.objects.filter(
+        subquery = CycleFavorite.objects.filter(
             user=self.request.user,
             cycle_id=OuterRef("pk"),
             project_id=self.kwargs.get("project_id"),
@@ -85,28 +83,11 @@ class CycleViewSet(WebhookMixin, BaseViewSet):
             .get_queryset()
             .filter(workspace__slug=self.kwargs.get("slug"))
             .filter(project_id=self.kwargs.get("project_id"))
-            .filter(
-                project__project_projectmember__member=self.request.user,
-                project__project_projectmember__is_active=True,
-            )
-            .select_related("project", "workspace", "owned_by")
-            .prefetch_related(
-                Prefetch(
-                    "issue_cycle__issue__assignees",
-                    queryset=User.objects.only(
-                        "avatar", "first_name", "id"
-                    ).distinct(),
-                )
-            )
-            .prefetch_related(
-                Prefetch(
-                    "issue_cycle__issue__labels",
-                    queryset=Label.objects.only(
-                        "name", "color", "id"
-                    ).distinct(),
-                )
-            )
-            .annotate(is_favorite=Exists(favorite_subquery))
+            .filter(project__project_projectmember__member=self.request.user)
+            .select_related("project")
+            .select_related("workspace")
+            .select_related("owned_by")
+            .annotate(is_favorite=Exists(subquery))
             .annotate(
                 total_issues=Count(
                     "issue_cycle",
@@ -166,6 +147,29 @@ class CycleViewSet(WebhookMixin, BaseViewSet):
                     ),
                 )
             )
+            .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(
@@ -185,16 +189,20 @@ class CycleViewSet(WebhookMixin, BaseViewSet):
                     output_field=CharField(),
                 )
             )
-            .annotate(
-                assignee_ids=Coalesce(
-                    ArrayAgg(
-                        "issue_cycle__issue__assignees__id",
-                        distinct=True,
-                        filter=~Q(
-                            issue_cycle__issue__assignees__id__isnull=True
-                        ),
-                    ),
-                    Value([], output_field=ArrayField(UUIDField())),
+            .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("-is_favorite", "name")
@@ -204,8 +212,12 @@ class CycleViewSet(WebhookMixin, BaseViewSet):
     def list(self, request, slug, project_id):
         queryset = self.get_queryset()
         cycle_view = request.GET.get("cycle_view", "all")
+        fields = [
+            field
+            for field in request.GET.get("fields", "").split(",")
+            if field
+        ]
 
-        # Update the order by
         queryset = queryset.order_by("-is_favorite", "-created_at")
 
         # Current Cycle
@@ -215,35 +227,9 @@ class CycleViewSet(WebhookMixin, BaseViewSet):
                 end_date__gte=timezone.now(),
             )
 
-            data = queryset.values(
-                # necessary fields
-                "id",
-                "workspace_id",
-                "project_id",
-                # model fields
-                "name",
-                "description",
-                "start_date",
-                "end_date",
-                "owned_by_id",
-                "view_props",
-                "sort_order",
-                "external_source",
-                "external_id",
-                "progress_snapshot",
-                # meta fields
-                "is_favorite",
-                "total_issues",
-                "cancelled_issues",
-                "completed_issues",
-                "started_issues",
-                "unstarted_issues",
-                "backlog_issues",
-                "assignee_ids",
-                "status",
-            )
+            data = CycleSerializer(queryset, many=True).data
 
-            if data:
+            if len(data):
                 assignee_distribution = (
                     Issue.objects.filter(
                         issue_cycle__cycle_id=data[0]["id"],
@@ -326,47 +312,20 @@ class CycleViewSet(WebhookMixin, BaseViewSet):
                     "labels": label_distribution,
                     "completion_chart": {},
                 }
-
                 if data[0]["start_date"] and data[0]["end_date"]:
-                    data[0]["distribution"]["completion_chart"] = (
-                        burndown_plot(
-                            queryset=queryset.first(),
-                            slug=slug,
-                            project_id=project_id,
-                            cycle_id=data[0]["id"],
-                        )
+                    data[0]["distribution"][
+                        "completion_chart"
+                    ] = burndown_plot(
+                        queryset=queryset.first(),
+                        slug=slug,
+                        project_id=project_id,
+                        cycle_id=data[0]["id"],
                     )
 
             return Response(data, status=status.HTTP_200_OK)
 
-        data = queryset.values(
-            # necessary fields
-            "id",
-            "workspace_id",
-            "project_id",
-            # model fields
-            "name",
-            "description",
-            "start_date",
-            "end_date",
-            "owned_by_id",
-            "view_props",
-            "sort_order",
-            "external_source",
-            "external_id",
-            "progress_snapshot",
-            # meta fields
-            "is_favorite",
-            "total_issues",
-            "cancelled_issues",
-            "completed_issues",
-            "started_issues",
-            "unstarted_issues",
-            "backlog_issues",
-            "assignee_ids",
-            "status",
-        )
-        return Response(data, status=status.HTTP_200_OK)
+        cycles = CycleSerializer(queryset, many=True).data
+        return Response(cycles, status=status.HTTP_200_OK)
 
     def create(self, request, slug, project_id):
         if (
@@ -376,7 +335,7 @@ class CycleViewSet(WebhookMixin, BaseViewSet):
             request.data.get("start_date", None) is not None
             and request.data.get("end_date", None) is not None
         ):
-            serializer = CycleWriteSerializer(data=request.data)
+            serializer = CycleSerializer(data=request.data)
             if serializer.is_valid():
                 serializer.save(
                     project_id=project_id,
@@ -385,36 +344,12 @@ class CycleViewSet(WebhookMixin, BaseViewSet):
                 cycle = (
                     self.get_queryset()
                     .filter(pk=serializer.data["id"])
-                    .values(
-                        # necessary fields
-                        "id",
-                        "workspace_id",
-                        "project_id",
-                        # model fields
-                        "name",
-                        "description",
-                        "start_date",
-                        "end_date",
-                        "owned_by_id",
-                        "view_props",
-                        "sort_order",
-                        "external_source",
-                        "external_id",
-                        "progress_snapshot",
-                        # meta fields
-                        "is_favorite",
-                        "total_issues",
-                        "cancelled_issues",
-                        "completed_issues",
-                        "started_issues",
-                        "unstarted_issues",
-                        "backlog_issues",
-                        "assignee_ids",
-                        "status",
-                    )
                     .first()
                 )
-                return Response(cycle, status=status.HTTP_201_CREATED)
+                serializer = CycleSerializer(cycle)
+                return Response(
+                    serializer.data, status=status.HTTP_201_CREATED
+                )
             return Response(
                 serializer.errors, status=status.HTTP_400_BAD_REQUEST
             )
@@ -427,11 +362,10 @@ class CycleViewSet(WebhookMixin, BaseViewSet):
             )
 
     def partial_update(self, request, slug, project_id, pk):
-        queryset = (
-            self.get_queryset()
-            .filter(workspace__slug=slug, project_id=project_id, pk=pk)
+        cycle = Cycle.objects.get(
+            workspace__slug=slug, project_id=project_id, pk=pk
         )
-        cycle = queryset.first()
+
         request_data = request.data
 
         if (
@@ -439,7 +373,7 @@ class CycleViewSet(WebhookMixin, BaseViewSet):
             and cycle.end_date < timezone.now().date()
         ):
             if "sort_order" in request_data:
-                # Can only change sort order for a completed cycle``
+                # Can only change sort order
                 request_data = {
                     "sort_order": request_data.get(
                         "sort_order", cycle.sort_order
@@ -458,71 +392,12 @@ class CycleViewSet(WebhookMixin, BaseViewSet):
         )
         if serializer.is_valid():
             serializer.save()
-            cycle = queryset.values(
-                # necessary fields
-                "id",
-                "workspace_id",
-                "project_id",
-                # model fields
-                "name",
-                "description",
-                "start_date",
-                "end_date",
-                "owned_by_id",
-                "view_props",
-                "sort_order",
-                "external_source",
-                "external_id",
-                "progress_snapshot",
-                # meta fields
-                "is_favorite",
-                "total_issues",
-                "cancelled_issues",
-                "completed_issues",
-                "started_issues",
-                "unstarted_issues",
-                "backlog_issues",
-                "assignee_ids",
-                "status",
-            ).first()
-            return Response(cycle, status=status.HTTP_200_OK)
+            return Response(serializer.data, status=status.HTTP_200_OK)
         return Response(serializer.errors, status=status.HTTP_400_BAD_REQUEST)
 
     def retrieve(self, request, slug, project_id, pk):
-        queryset = self.get_queryset().filter(pk=pk)
-        data = (
-            self.get_queryset()
-            .filter(pk=pk)
-            .values(
-                # necessary fields
-                "id",
-                "workspace_id",
-                "project_id",
-                # model fields
-                "name",
-                "description",
-                "start_date",
-                "end_date",
-                "owned_by_id",
-                "view_props",
-                "sort_order",
-                "external_source",
-                "external_id",
-                "progress_snapshot",
-                # meta fields
-                "is_favorite",
-                "total_issues",
-                "cancelled_issues",
-                "completed_issues",
-                "started_issues",
-                "unstarted_issues",
-                "backlog_issues",
-                "assignee_ids",
-                "status",
-            )
-            .first()
-        )
-        queryset = queryset.first()
+        queryset = self.get_queryset().get(pk=pk)
+
         # Assignee Distribution
         assignee_distribution = (
             Issue.objects.filter(
@@ -611,6 +486,7 @@ class CycleViewSet(WebhookMixin, BaseViewSet):
             .order_by("label_name")
         )
 
+        data = CycleSerializer(queryset).data
         data["distribution"] = {
             "assignees": assignee_distribution,
             "labels": label_distribution,
@@ -692,10 +568,7 @@ class CycleIssueViewSet(WebhookMixin, BaseViewSet):
             )
             .filter(workspace__slug=self.kwargs.get("slug"))
             .filter(project_id=self.kwargs.get("project_id"))
-            .filter(
-                project__project_projectmember__member=self.request.user,
-                project__project_projectmember__is_active=True,
-            )
+            .filter(project__project_projectmember__member=self.request.user)
             .filter(cycle_id=self.kwargs.get("cycle_id"))
             .select_related("project")
             .select_related("workspace")
@@ -714,18 +587,20 @@ class CycleIssueViewSet(WebhookMixin, BaseViewSet):
         ]
         order_by = request.GET.get("order_by", "created_at")
         filters = issue_filters(request.query_params, "GET")
-        queryset = (
+        issues = (
             Issue.issue_objects.filter(issue_cycle__cycle_id=cycle_id)
+            .annotate(
+                sub_issues_count=Issue.issue_objects.filter(
+                    parent=OuterRef("id")
+                )
+                .order_by()
+                .annotate(count=Func(F("id"), function="Count"))
+                .values("count")
+            )
             .filter(project_id=project_id)
             .filter(workspace__slug=slug)
-            .filter(**filters)
             .select_related("workspace", "project", "state", "parent")
-            .prefetch_related(
-                "assignees",
-                "labels",
-                "issue_module__module",
-                "issue_cycle__cycle",
-            )
+            .prefetch_related("assignees", "labels", "issue_module__module")
             .order_by(order_by)
             .filter(**filters)
             .annotate(cycle_id=F("issue_cycle__cycle_id"))
@@ -744,79 +619,22 @@ class CycleIssueViewSet(WebhookMixin, BaseViewSet):
                 .values("count")
             )
             .annotate(
-                sub_issues_count=Issue.issue_objects.filter(
-                    parent=OuterRef("id")
+                is_subscribed=Exists(
+                    IssueSubscriber.objects.filter(
+                        subscriber=self.request.user, issue_id=OuterRef("id")
+                    )
                 )
-                .order_by()
-                .annotate(count=Func(F("id"), function="Count"))
-                .values("count")
             )
-            .annotate(
-                label_ids=Coalesce(
-                    ArrayAgg(
-                        "labels__id",
-                        distinct=True,
-                        filter=~Q(labels__id__isnull=True),
-                    ),
-                    Value([], output_field=ArrayField(UUIDField())),
-                ),
-                assignee_ids=Coalesce(
-                    ArrayAgg(
-                        "assignees__id",
-                        distinct=True,
-                        filter=~Q(assignees__id__isnull=True),
-                    ),
-                    Value([], output_field=ArrayField(UUIDField())),
-                ),
-                module_ids=Coalesce(
-                    ArrayAgg(
-                        "issue_module__module_id",
-                        distinct=True,
-                        filter=~Q(issue_module__module_id__isnull=True),
-                    ),
-                    Value([], output_field=ArrayField(UUIDField())),
-                ),
-            )
-            .order_by(order_by)
         )
-        if self.fields:
-            issues = IssueSerializer(
-                queryset, many=True, fields=fields if fields else None
-            ).data
-        else:
-            issues = queryset.values(
-                "id",
-                "name",
-                "state_id",
-                "sort_order",
-                "completed_at",
-                "estimate_point",
-                "priority",
-                "start_date",
-                "target_date",
-                "sequence_id",
-                "project_id",
-                "parent_id",
-                "cycle_id",
-                "module_ids",
-                "label_ids",
-                "assignee_ids",
-                "sub_issues_count",
-                "created_at",
-                "updated_at",
-                "created_by",
-                "updated_by",
-                "attachment_count",
-                "link_count",
-                "is_draft",
-                "archived_at",
-            )
-        return Response(issues, status=status.HTTP_200_OK)
+        serializer = IssueSerializer(
+            issues, many=True, fields=fields if fields else None
+        )
+        return Response(serializer.data, status=status.HTTP_200_OK)
 
     def create(self, request, slug, project_id, cycle_id):
         issues = request.data.get("issues", [])
 
-        if not issues:
+        if not len(issues):
             return Response(
                 {"error": "Issues are required"},
                 status=status.HTTP_400_BAD_REQUEST,
@@ -838,52 +656,52 @@ class CycleIssueViewSet(WebhookMixin, BaseViewSet):
             )
 
         # Get all CycleIssues already created
-        cycle_issues = list(
-            CycleIssue.objects.filter(
-                ~Q(cycle_id=cycle_id), issue_id__in=issues
-            )
-        )
-        existing_issues = [
-            str(cycle_issue.issue_id) for cycle_issue in cycle_issues
-        ]
-        new_issues = list(set(issues) - set(existing_issues))
+        cycle_issues = list(CycleIssue.objects.filter(issue_id__in=issues))
+        update_cycle_issue_activity = []
+        record_to_create = []
+        records_to_update = []
 
-        # New issues to create
-        created_records = CycleIssue.objects.bulk_create(
-            [
-                CycleIssue(
-                    project_id=project_id,
-                    workspace_id=cycle.workspace_id,
-                    created_by_id=request.user.id,
-                    updated_by_id=request.user.id,
-                    cycle_id=cycle_id,
-                    issue_id=issue,
+        for issue in issues:
+            cycle_issue = [
+                cycle_issue
+                for cycle_issue in cycle_issues
+                if str(cycle_issue.issue_id) in issues
+            ]
+            # Update only when cycle changes
+            if len(cycle_issue):
+                if cycle_issue[0].cycle_id != cycle_id:
+                    update_cycle_issue_activity.append(
+                        {
+                            "old_cycle_id": str(cycle_issue[0].cycle_id),
+                            "new_cycle_id": str(cycle_id),
+                            "issue_id": str(cycle_issue[0].issue_id),
+                        }
+                    )
+                    cycle_issue[0].cycle_id = cycle_id
+                    records_to_update.append(cycle_issue[0])
+            else:
+                record_to_create.append(
+                    CycleIssue(
+                        project_id=project_id,
+                        workspace=cycle.workspace,
+                        created_by=request.user,
+                        updated_by=request.user,
+                        cycle=cycle,
+                        issue_id=issue,
+                    )
                 )
-                for issue in new_issues
-            ],
+
+        CycleIssue.objects.bulk_create(
+            record_to_create,
+            batch_size=10,
+            ignore_conflicts=True,
+        )
+        CycleIssue.objects.bulk_update(
+            records_to_update,
+            ["cycle"],
             batch_size=10,
         )
 
-        # Updated Issues
-        updated_records = []
-        update_cycle_issue_activity = []
-        # Iterate over each cycle_issue in cycle_issues
-        for cycle_issue in cycle_issues:
-            # Update the cycle_issue's cycle_id
-            cycle_issue.cycle_id = cycle_id
-            # Add the modified cycle_issue to the records_to_update list
-            updated_records.append(cycle_issue)
-            # Record the update activity
-            update_cycle_issue_activity.append(
-                {
-                    "old_cycle_id": str(cycle_issue.cycle_id),
-                    "new_cycle_id": str(cycle_id),
-                    "issue_id": str(cycle_issue.issue_id),
-                }
-            )
-
-        # Update the cycle issues
-        CycleIssue.objects.bulk_update(updated_records, ["cycle_id"], batch_size=100)
         # Capture Issue Activity
         issue_activity.delay(
             type="cycle.activity.created",
@@ -895,7 +713,7 @@ class CycleIssueViewSet(WebhookMixin, BaseViewSet):
                 {
                     "updated_cycle_issues": update_cycle_issue_activity,
                     "created_cycle_issues": serializers.serialize(
-                        "json", created_records
+                        "json", record_to_create
                     ),
                 }
             ),
@@ -903,7 +721,16 @@ class CycleIssueViewSet(WebhookMixin, BaseViewSet):
             notification=True,
             origin=request.META.get("HTTP_ORIGIN"),
         )
-        return Response({"message": "success"}, status=status.HTTP_201_CREATED)
+
+        # Return all Cycle Issues
+        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, cycle_id, issue_id):
         cycle_issue = CycleIssue.objects.get(
@@ -947,7 +774,6 @@ class CycleDateCheckEndpoint(BaseAPIView):
                 status=status.HTTP_400_BAD_REQUEST,
             )
 
-        # Check if any cycle intersects in the given interval
         cycles = Cycle.objects.filter(
             Q(workspace__slug=slug)
             & Q(project_id=project_id)
@@ -957,6 +783,7 @@ class CycleDateCheckEndpoint(BaseAPIView):
                 | Q(start_date__gte=start_date, end_date__lte=end_date)
             )
         ).exclude(pk=cycle_id)
+
         if cycles.exists():
             return Response(
                 {
@@ -1013,225 +840,10 @@ class TransferCycleIssueEndpoint(BaseAPIView):
                 status=status.HTTP_400_BAD_REQUEST,
             )
 
-        new_cycle = Cycle.objects.filter(
+        new_cycle = Cycle.objects.get(
             workspace__slug=slug, project_id=project_id, pk=new_cycle_id
-        ).first()
-
-        old_cycle = (
-            Cycle.objects.filter(
-                workspace__slug=slug, project_id=project_id, pk=cycle_id
-            )
-            .annotate(
-                total_issues=Count(
-                    "issue_cycle",
-                    filter=Q(
-                        issue_cycle__issue__archived_at__isnull=True,
-                        issue_cycle__issue__is_draft=False,
-                    ),
-                )
-            )
-            .annotate(
-                completed_issues=Count(
-                    "issue_cycle__issue__state__group",
-                    filter=Q(
-                        issue_cycle__issue__state__group="completed",
-                        issue_cycle__issue__archived_at__isnull=True,
-                        issue_cycle__issue__is_draft=False,
-                    ),
-                )
-            )
-            .annotate(
-                cancelled_issues=Count(
-                    "issue_cycle__issue__state__group",
-                    filter=Q(
-                        issue_cycle__issue__state__group="cancelled",
-                        issue_cycle__issue__archived_at__isnull=True,
-                        issue_cycle__issue__is_draft=False,
-                    ),
-                )
-            )
-            .annotate(
-                started_issues=Count(
-                    "issue_cycle__issue__state__group",
-                    filter=Q(
-                        issue_cycle__issue__state__group="started",
-                        issue_cycle__issue__archived_at__isnull=True,
-                        issue_cycle__issue__is_draft=False,
-                    ),
-                )
-            )
-            .annotate(
-                unstarted_issues=Count(
-                    "issue_cycle__issue__state__group",
-                    filter=Q(
-                        issue_cycle__issue__state__group="unstarted",
-                        issue_cycle__issue__archived_at__isnull=True,
-                        issue_cycle__issue__is_draft=False,
-                    ),
-                )
-            )
-            .annotate(
-                backlog_issues=Count(
-                    "issue_cycle__issue__state__group",
-                    filter=Q(
-                        issue_cycle__issue__state__group="backlog",
-                        issue_cycle__issue__archived_at__isnull=True,
-                        issue_cycle__issue__is_draft=False,
-                    ),
-                )
-            )
         )
 
-        # Pass the new_cycle queryset to burndown_plot
-        completion_chart = burndown_plot(
-            queryset=old_cycle.first(),
-            slug=slug,
-            project_id=project_id,
-            cycle_id=cycle_id,
-        )
-
-        # Get the assignee distribution
-        assignee_distribution = (
-            Issue.objects.filter(
-                issue_cycle__cycle_id=cycle_id,
-                workspace__slug=slug,
-                project_id=project_id,
-            )
-            .annotate(display_name=F("assignees__display_name"))
-            .annotate(assignee_id=F("assignees__id"))
-            .annotate(avatar=F("assignees__avatar"))
-            .values("display_name", "assignee_id", "avatar")
-            .annotate(
-                total_issues=Count(
-                    "id",
-                    filter=Q(archived_at__isnull=True, is_draft=False),
-                ),
-            )
-            .annotate(
-                completed_issues=Count(
-                    "id",
-                    filter=Q(
-                        completed_at__isnull=False,
-                        archived_at__isnull=True,
-                        is_draft=False,
-                    ),
-                )
-            )
-            .annotate(
-                pending_issues=Count(
-                    "id",
-                    filter=Q(
-                        completed_at__isnull=True,
-                        archived_at__isnull=True,
-                        is_draft=False,
-                    ),
-                )
-            )
-            .order_by("display_name")
-        )
-        # assignee distribution serialized
-        assignee_distribution_data = [
-            {
-                "display_name": item["display_name"],
-                "assignee_id": (
-                    str(item["assignee_id"]) if item["assignee_id"] else None
-                ),
-                "avatar": item["avatar"],
-                "total_issues": item["total_issues"],
-                "completed_issues": item["completed_issues"],
-                "pending_issues": item["pending_issues"],
-            }
-            for item in assignee_distribution
-        ]
-
-        # Get the label distribution
-        label_distribution = (
-            Issue.objects.filter(
-                issue_cycle__cycle_id=cycle_id,
-                workspace__slug=slug,
-                project_id=project_id,
-            )
-            .annotate(label_name=F("labels__name"))
-            .annotate(color=F("labels__color"))
-            .annotate(label_id=F("labels__id"))
-            .values("label_name", "color", "label_id")
-            .annotate(
-                total_issues=Count(
-                    "id",
-                    filter=Q(archived_at__isnull=True, is_draft=False),
-                )
-            )
-            .annotate(
-                completed_issues=Count(
-                    "id",
-                    filter=Q(
-                        completed_at__isnull=False,
-                        archived_at__isnull=True,
-                        is_draft=False,
-                    ),
-                )
-            )
-            .annotate(
-                pending_issues=Count(
-                    "id",
-                    filter=Q(
-                        completed_at__isnull=True,
-                        archived_at__isnull=True,
-                        is_draft=False,
-                    ),
-                )
-            )
-            .order_by("label_name")
-        )
-
-        assignee_distribution_data = [
-            {
-                "display_name": item["display_name"],
-                "assignee_id": (
-                    str(item["assignee_id"]) if item["assignee_id"] else None
-                ),
-                "avatar": item["avatar"],
-                "total_issues": item["total_issues"],
-                "completed_issues": item["completed_issues"],
-                "pending_issues": item["pending_issues"],
-            }
-            for item in assignee_distribution
-        ]
-
-        # Label distribution serilization
-        label_distribution_data = [
-            {
-                "label_name": item["label_name"],
-                "color": item["color"],
-                "label_id": (
-                    str(item["label_id"]) if item["label_id"] else None
-                ),
-                "total_issues": item["total_issues"],
-                "completed_issues": item["completed_issues"],
-                "pending_issues": item["pending_issues"],
-            }
-            for item in label_distribution
-        ]
-
-        current_cycle = Cycle.objects.filter(
-            workspace__slug=slug, project_id=project_id, pk=cycle_id
-        ).first()
-
-        current_cycle.progress_snapshot = {
-            "total_issues": old_cycle.first().total_issues,
-            "completed_issues": old_cycle.first().completed_issues,
-            "cancelled_issues": old_cycle.first().cancelled_issues,
-            "started_issues": old_cycle.first().started_issues,
-            "unstarted_issues": old_cycle.first().unstarted_issues,
-            "backlog_issues": old_cycle.first().backlog_issues,
-            "distribution": {
-                "labels": label_distribution_data,
-                "assignees": assignee_distribution_data,
-                "completion_chart": completion_chart,
-            },
-        }
-        current_cycle.save(update_fields=["progress_snapshot"])
-
         if (
             new_cycle.end_date is not None
             and new_cycle.end_date < timezone.now().date()

apiserver/plane/app/views/dashboard.py

@@ -14,12 +14,7 @@ from django.db.models import (
     JSONField,
     Func,
     Prefetch,
-    IntegerField,
 )
-from django.contrib.postgres.aggregates import ArrayAgg
-from django.contrib.postgres.fields import ArrayField
-from django.db.models import Value, UUIDField
-from django.db.models.functions import Coalesce
 from django.utils import timezone
 
 # Third Party imports
@@ -39,8 +34,6 @@ from plane.db.models import (
     IssueLink,
     IssueAttachment,
     IssueRelation,
-    IssueAssignee,
-    User,
 )
 from plane.app.serializers import (
     IssueActivitySerializer,
@@ -61,7 +54,6 @@ def dashboard_overview_stats(self, request, slug):
 
     pending_issues_count = Issue.issue_objects.filter(
         ~Q(state__group__in=["completed", "cancelled"]),
-        target_date__lt=timezone.now().date(),
         project__project_projectmember__is_active=True,
         project__project_projectmember__member=request.user,
         workspace__slug=slug,
@@ -138,32 +130,7 @@ def dashboard_assigned_issues(self, request, slug):
             .annotate(count=Func(F("id"), function="Count"))
             .values("count")
         )
-        .annotate(
-            label_ids=Coalesce(
-                ArrayAgg(
-                    "labels__id",
-                    distinct=True,
-                    filter=~Q(labels__id__isnull=True),
-                ),
-                Value([], output_field=ArrayField(UUIDField())),
-            ),
-            assignee_ids=Coalesce(
-                ArrayAgg(
-                    "assignees__id",
-                    distinct=True,
-                    filter=~Q(assignees__id__isnull=True),
-                ),
-                Value([], output_field=ArrayField(UUIDField())),
-            ),
-            module_ids=Coalesce(
-                ArrayAgg(
-                    "issue_module__module_id",
-                    distinct=True,
-                    filter=~Q(issue_module__module_id__isnull=True),
-                ),
-                Value([], output_field=ArrayField(UUIDField())),
-            ),
-        )
+        .order_by("created_at")
     )
 
     # Priority Ordering
@@ -215,11 +182,11 @@ def dashboard_assigned_issues(self, request, slug):
     if issue_type == "overdue":
         overdue_issues_count = assigned_issues.filter(
             state__group__in=["backlog", "unstarted", "started"],
-            target_date__lt=timezone.now(),
+            target_date__lt=timezone.now()
         ).count()
         overdue_issues = assigned_issues.filter(
             state__group__in=["backlog", "unstarted", "started"],
-            target_date__lt=timezone.now(),
+            target_date__lt=timezone.now()
         )[:5]
         return Response(
             {
@@ -234,11 +201,11 @@ def dashboard_assigned_issues(self, request, slug):
     if issue_type == "upcoming":
         upcoming_issues_count = assigned_issues.filter(
             state__group__in=["backlog", "unstarted", "started"],
-            target_date__gte=timezone.now(),
+            target_date__gte=timezone.now()
         ).count()
         upcoming_issues = assigned_issues.filter(
             state__group__in=["backlog", "unstarted", "started"],
-            target_date__gte=timezone.now(),
+            target_date__gte=timezone.now()
         )[:5]
         return Response(
             {
@@ -292,32 +259,6 @@ def dashboard_created_issues(self, request, slug):
             .annotate(count=Func(F("id"), function="Count"))
             .values("count")
         )
-        .annotate(
-            label_ids=Coalesce(
-                ArrayAgg(
-                    "labels__id",
-                    distinct=True,
-                    filter=~Q(labels__id__isnull=True),
-                ),
-                Value([], output_field=ArrayField(UUIDField())),
-            ),
-            assignee_ids=Coalesce(
-                ArrayAgg(
-                    "assignees__id",
-                    distinct=True,
-                    filter=~Q(assignees__id__isnull=True),
-                ),
-                Value([], output_field=ArrayField(UUIDField())),
-            ),
-            module_ids=Coalesce(
-                ArrayAgg(
-                    "issue_module__module_id",
-                    distinct=True,
-                    filter=~Q(issue_module__module_id__isnull=True),
-                ),
-                Value([], output_field=ArrayField(UUIDField())),
-            ),
-        )
         .order_by("created_at")
     )
 
@@ -368,11 +309,11 @@ def dashboard_created_issues(self, request, slug):
     if issue_type == "overdue":
         overdue_issues_count = created_issues.filter(
             state__group__in=["backlog", "unstarted", "started"],
-            target_date__lt=timezone.now(),
+            target_date__lt=timezone.now()
         ).count()
         overdue_issues = created_issues.filter(
             state__group__in=["backlog", "unstarted", "started"],
-            target_date__lt=timezone.now(),
+            target_date__lt=timezone.now()
         )[:5]
         return Response(
             {
@@ -385,11 +326,11 @@ def dashboard_created_issues(self, request, slug):
     if issue_type == "upcoming":
         upcoming_issues_count = created_issues.filter(
             state__group__in=["backlog", "unstarted", "started"],
-            target_date__gte=timezone.now(),
+            target_date__gte=timezone.now()
         ).count()
         upcoming_issues = created_issues.filter(
             state__group__in=["backlog", "unstarted", "started"],
-            target_date__gte=timezone.now(),
+            target_date__gte=timezone.now()
         )[:5]
         return Response(
             {
@@ -506,9 +447,7 @@ def dashboard_recent_projects(self, request, slug):
         ).exclude(id__in=unique_project_ids)
 
         # Append additional project IDs to the existing list
-        unique_project_ids.update(
-            additional_projects.values_list("id", flat=True)
-        )
+        unique_project_ids.update(additional_projects.values_list("id", flat=True))
 
     return Response(
         list(unique_project_ids)[:4],
@@ -517,97 +456,90 @@ def dashboard_recent_projects(self, request, slug):
 
 
 def dashboard_recent_collaborators(self, request, slug):
-    # Subquery to count activities for each project member
-    activity_count_subquery = (
+    # Fetch all project IDs where the user belongs to
+    user_projects = Project.objects.filter(
+        project_projectmember__member=request.user,
+        project_projectmember__is_active=True,
+        workspace__slug=slug,
+    ).values_list("id", flat=True)
+
+    # Fetch all users who have performed an activity in the projects where the user exists
+    users_with_activities = (
         IssueActivity.objects.filter(
             workspace__slug=slug,
-            actor=OuterRef("member"),
-            project__project_projectmember__member=request.user,
-            project__project_projectmember__is_active=True,
+            project_id__in=user_projects,
         )
         .values("actor")
-        .annotate(num_activities=Count("pk"))
-        .values("num_activities")
-    )
+        .exclude(actor=request.user)
+        .annotate(num_activities=Count("actor"))
+        .order_by("-num_activities")
+    )[:7]
 
-    # Get all project members and annotate them with activity counts
-    project_members_with_activities = (
-        ProjectMember.objects.filter(
-            workspace__slug=slug,
-            project__project_projectmember__member=request.user,
-            project__project_projectmember__is_active=True,
+    # Get the count of active issues for each user in users_with_activities
+    users_with_active_issues = []
+    for user_activity in users_with_activities:
+        user_id = user_activity["actor"]
+        active_issue_count = Issue.objects.filter(
+            assignees__in=[user_id],
+            state__group__in=["unstarted", "started"],
+        ).count()
+        users_with_active_issues.append(
+            {"user_id": user_id, "active_issue_count": active_issue_count}
         )
-        .annotate(
-            num_activities=Coalesce(
-                Subquery(activity_count_subquery),
-                Value(0),
-                output_field=IntegerField(),
-            ),
-            is_current_user=Case(
-                When(member=request.user, then=Value(0)),
-                default=Value(1),
-                output_field=IntegerField(),
-            ),
-        )
-        .values_list("member", flat=True)
-        .order_by("is_current_user", "-num_activities")
-        .distinct()
-    )
-    search = request.query_params.get("search", None)
-    if search:
-        project_members_with_activities = (
-            project_members_with_activities.filter(
-                Q(member__display_name__icontains=search)
-                | Q(member__first_name__icontains=search)
-                | Q(member__last_name__icontains=search)
+
+    # Insert the logged-in user's ID and their active issue count at the beginning
+    active_issue_count = Issue.objects.filter(
+        assignees__in=[request.user],
+        state__group__in=["unstarted", "started"],
+    ).count()
+
+    if users_with_activities.count() < 7:
+        # Calculate the additional collaborators needed
+        additional_collaborators_needed = 7 - users_with_activities.count()
+
+        # Fetch additional collaborators from the project_member table
+        additional_collaborators = list(
+            set(
+                ProjectMember.objects.filter(
+                    ~Q(member=request.user),
+                    project_id__in=user_projects,
+                    workspace__slug=slug,
+                )
+                .exclude(
+                    member__in=[
+                        user["actor"] for user in users_with_activities
+                    ]
+                )
+                .values_list("member", flat=True)
             )
         )
 
-    return self.paginate(
-        request=request,
-        queryset=project_members_with_activities,
-        controller=self.get_results_controller,
+        additional_collaborators = additional_collaborators[
+            :additional_collaborators_needed
+        ]
+
+        # Append additional collaborators to the list
+        for collaborator_id in additional_collaborators:
+            active_issue_count = Issue.objects.filter(
+                assignees__in=[collaborator_id],
+                state__group__in=["unstarted", "started"],
+            ).count()
+            users_with_active_issues.append(
+                {
+                    "user_id": str(collaborator_id),
+                    "active_issue_count": active_issue_count,
+                }
+            )
+
+    users_with_active_issues.insert(
+        0,
+        {"user_id": request.user.id, "active_issue_count": active_issue_count},
     )
 
+    return Response(users_with_active_issues, status=status.HTTP_200_OK)
+
 
 class DashboardEndpoint(BaseAPIView):
-    def get_results_controller(self, project_members_with_activities):
-        user_active_issue_counts = (
-            User.objects.filter(id__in=project_members_with_activities)
-            .annotate(
-                active_issue_count=Count(
-                    Case(
-                        When(
-                            issue_assignee__issue__state__group__in=[
-                                "unstarted",
-                                "started",
-                            ],
-                            then=1,
-                        ),
-                        output_field=IntegerField(),
-                    )
-                )
-            )
-            .values("active_issue_count", user_id=F("id"))
-        )
-        # Create a dictionary to store the active issue counts by user ID
-        active_issue_counts_dict = {
-            user["user_id"]: user["active_issue_count"]
-            for user in user_active_issue_counts
-        }
-
-        # Preserve the sequence of project members with activities
-        paginated_results = [
-            {
-                "user_id": member_id,
-                "active_issue_count": active_issue_counts_dict.get(
-                    member_id, 0
-                ),
-            }
-            for member_id in project_members_with_activities
-        ]
-        return paginated_results
-
     def create(self, request, slug):
         serializer = DashboardSerializer(data=request.data)
         if serializer.is_valid():
@@ -634,9 +566,7 @@ class DashboardEndpoint(BaseAPIView):
             dashboard_type = request.GET.get("dashboard_type", None)
             if dashboard_type == "home":
                 dashboard, created = Dashboard.objects.get_or_create(
-                    type_identifier=dashboard_type,
-                    owned_by=request.user,
-                    is_default=True,
+                    type_identifier=dashboard_type, owned_by=request.user, is_default=True
                 )
 
                 if created:
@@ -653,9 +583,7 @@ class DashboardEndpoint(BaseAPIView):
 
                     updated_dashboard_widgets = []
                     for widget_key in widgets_to_fetch:
-                        widget = Widget.objects.filter(
-                            key=widget_key
-                        ).values_list("id", flat=True)
+                        widget = Widget.objects.filter(key=widget_key).values_list("id", flat=True)
                         if widget:
                             updated_dashboard_widgets.append(
                                 DashboardWidget(

apiserver/plane/app/views/error_404.py

@@ -1,5 +0,0 @@
-# views.py
-from django.http import JsonResponse
-
-def custom_404_view(request, exception=None):
-    return JsonResponse({"error": "Page not found."}, status=404)

apiserver/plane/app/views/inbox.py

@@ -3,12 +3,8 @@ import json
 
 # Django import
 from django.utils import timezone
-from django.db.models import Q, Count, OuterRef, Func, F, Prefetch, Exists
+from django.db.models import Q, Count, OuterRef, Func, F, Prefetch
 from django.core.serializers.json import DjangoJSONEncoder
-from django.contrib.postgres.aggregates import ArrayAgg
-from django.contrib.postgres.fields import ArrayField
-from django.db.models import Value, UUIDField
-from django.db.models.functions import Coalesce
 
 # Third party imports
 from rest_framework import status
@@ -25,15 +21,13 @@ from plane.db.models import (
     IssueLink,
     IssueAttachment,
     ProjectMember,
-    IssueReaction,
-    IssueSubscriber,
 )
 from plane.app.serializers import (
-    IssueCreateSerializer,
     IssueSerializer,
     InboxSerializer,
     InboxIssueSerializer,
-    IssueDetailSerializer,
+    IssueCreateSerializer,
+    IssueStateInboxSerializer,
 )
 from plane.utils.issue_filters import issue_filters
 from plane.bgtasks.issue_activites_task import issue_activity
@@ -98,7 +92,7 @@ class InboxIssueViewSet(BaseViewSet):
             Issue.objects.filter(
                 project_id=self.kwargs.get("project_id"),
                 workspace__slug=self.kwargs.get("slug"),
-                issue_inbox__inbox_id=self.kwargs.get("inbox_id"),
+                issue_inbox__inbox_id=self.kwargs.get("inbox_id")
             )
             .select_related("workspace", "project", "state", "parent")
             .prefetch_related("assignees", "labels", "issue_module__module")
@@ -133,75 +127,14 @@ class InboxIssueViewSet(BaseViewSet):
                 .annotate(count=Func(F("id"), function="Count"))
                 .values("count")
             )
-            .annotate(
-                label_ids=Coalesce(
-                    ArrayAgg(
-                        "labels__id",
-                        distinct=True,
-                        filter=~Q(labels__id__isnull=True),
-                    ),
-                    Value([], output_field=ArrayField(UUIDField())),
-                ),
-                assignee_ids=Coalesce(
-                    ArrayAgg(
-                        "assignees__id",
-                        distinct=True,
-                        filter=~Q(assignees__id__isnull=True),
-                    ),
-                    Value([], output_field=ArrayField(UUIDField())),
-                ),
-                module_ids=Coalesce(
-                    ArrayAgg(
-                        "issue_module__module_id",
-                        distinct=True,
-                        filter=~Q(issue_module__module_id__isnull=True),
-                    ),
-                    Value([], output_field=ArrayField(UUIDField())),
-                ),
-            )
         ).distinct()
 
     def list(self, request, slug, project_id, inbox_id):
         filters = issue_filters(request.query_params, "GET")
-        issue_queryset = (
-            self.get_queryset()
-            .filter(**filters)
-            .order_by("issue_inbox__snoozed_till", "issue_inbox__status")
-        )
-        if self.expand:
-            issues = IssueSerializer(
-                issue_queryset, expand=self.expand, many=True
-            ).data
-        else:
-            issues = issue_queryset.values(
-                "id",
-                "name",
-                "state_id",
-                "sort_order",
-                "completed_at",
-                "estimate_point",
-                "priority",
-                "start_date",
-                "target_date",
-                "sequence_id",
-                "project_id",
-                "parent_id",
-                "cycle_id",
-                "module_ids",
-                "label_ids",
-                "assignee_ids",
-                "sub_issues_count",
-                "created_at",
-                "updated_at",
-                "created_by",
-                "updated_by",
-                "attachment_count",
-                "link_count",
-                "is_draft",
-                "archived_at",
-            )
+        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,
+            issues_data,
             status=status.HTTP_200_OK,
         )
 
@@ -266,8 +199,8 @@ class InboxIssueViewSet(BaseViewSet):
             source=request.data.get("source", "in-app"),
         )
 
-        issue = self.get_queryset().filter(pk=issue.id).first()
-        serializer = IssueSerializer(issue, expand=self.expand)
+        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):
@@ -297,7 +230,11 @@ class InboxIssueViewSet(BaseViewSet):
         issue_data = request.data.pop("issue", False)
 
         if bool(issue_data):
-            issue = self.get_queryset().filter(pk=inbox_issue.issue_id).first()
+            issue = Issue.objects.get(
+                pk=inbox_issue.issue_id,
+                workspace__slug=slug,
+                project_id=project_id,
+            )
             # Only allow guests and viewers to edit name and description
             if project_member.role <= 10:
                 # viewers and guests since only viewers and guests
@@ -383,54 +320,20 @@ class InboxIssueViewSet(BaseViewSet):
                         if state is not None:
                             issue.state = state
                             issue.save()
-                return Response(status=status.HTTP_204_NO_CONTENT)
+                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:
-            issue = self.get_queryset().filter(pk=issue_id).first()
-            serializer = IssueSerializer(issue, expand=self.expand)
+            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 = (
-            self.get_queryset()
-            .filter(pk=issue_id)
-            .prefetch_related(
-                Prefetch(
-                    "issue_reactions",
-                    queryset=IssueReaction.objects.select_related(
-                        "issue", "actor"
-                    ),
-                )
-            )
-            .prefetch_related(
-                Prefetch(
-                    "issue_attachment",
-                    queryset=IssueAttachment.objects.select_related("issue"),
-                )
-            )
-            .prefetch_related(
-                Prefetch(
-                    "issue_link",
-                    queryset=IssueLink.objects.select_related("created_by"),
-                )
-            )
-            .annotate(
-                is_subscribed=Exists(
-                    IssueSubscriber.objects.filter(
-                        workspace__slug=slug,
-                        project_id=project_id,
-                        issue_id=OuterRef("pk"),
-                        subscriber=request.user,
-                    )
-                )
-            )
-        ).first()
-        if issue is None:
-            return Response({"error": "Requested object was not found"}, status=status.HTTP_404_NOT_FOUND)
-        
-        serializer = IssueDetailSerializer(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/integration/slack.py

@@ -36,10 +36,7 @@ class SlackProjectSyncViewSet(BaseViewSet):
                 workspace__slug=self.kwargs.get("slug"),
                 project_id=self.kwargs.get("project_id"),
             )
-            .filter(
-                project__project_projectmember__member=self.request.user,
-                project__project_projectmember__is_active=True,
-            )
+            .filter(project__project_projectmember__member=self.request.user)
         )
 
     def create(self, request, slug, project_id, workspace_integration_id):

apiserver/plane/app/views/module.py

@@ -4,12 +4,11 @@ import json
 # Django Imports
 from django.utils import timezone
 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.contrib.postgres.aggregates import ArrayAgg
-from django.contrib.postgres.fields import ArrayField
-from django.db.models import Value, UUIDField
-from django.db.models.functions import Coalesce
+from django.core.serializers.json import DjangoJSONEncoder
+
 
 # Third party imports
 from rest_framework.response import Response
@@ -25,7 +24,6 @@ from plane.app.serializers import (
     ModuleFavoriteSerializer,
     IssueSerializer,
     ModuleUserPropertiesSerializer,
-    ModuleDetailSerializer,
 )
 from plane.app.permissions import (
     ProjectEntityPermission,
@@ -40,9 +38,11 @@ from plane.db.models import (
     ModuleFavorite,
     IssueLink,
     IssueAttachment,
+    IssueSubscriber,
     ModuleUserProperties,
 )
 from plane.bgtasks.issue_activites_task import issue_activity
+from plane.utils.grouper import group_results
 from plane.utils.issue_filters import issue_filters
 from plane.utils.analytics_plot import burndown_plot
 
@@ -62,7 +62,7 @@ class ModuleViewSet(WebhookMixin, BaseViewSet):
         )
 
     def get_queryset(self):
-        favorite_subquery = ModuleFavorite.objects.filter(
+        subquery = ModuleFavorite.objects.filter(
             user=self.request.user,
             module_id=OuterRef("pk"),
             project_id=self.kwargs.get("project_id"),
@@ -73,7 +73,7 @@ class ModuleViewSet(WebhookMixin, BaseViewSet):
             .get_queryset()
             .filter(project_id=self.kwargs.get("project_id"))
             .filter(workspace__slug=self.kwargs.get("slug"))
-            .annotate(is_favorite=Exists(favorite_subquery))
+            .annotate(is_favorite=Exists(subquery))
             .select_related("project")
             .select_related("workspace")
             .select_related("lead")
@@ -145,16 +145,6 @@ class ModuleViewSet(WebhookMixin, BaseViewSet):
                     ),
                 )
             )
-            .annotate(
-                member_ids=Coalesce(
-                    ArrayAgg(
-                        "members__id",
-                        distinct=True,
-                        filter=~Q(members__id__isnull=True),
-                    ),
-                    Value([], output_field=ArrayField(UUIDField())),
-                )
-            )
             .order_by("-is_favorite", "-created_at")
         )
 
@@ -167,84 +157,25 @@ class ModuleViewSet(WebhookMixin, BaseViewSet):
         if serializer.is_valid():
             serializer.save()
 
-            module = (
-                self.get_queryset()
-                .filter(pk=serializer.data["id"])
-                .values(  # Required fields
-                    "id",
-                    "workspace_id",
-                    "project_id",
-                    # Model fields
-                    "name",
-                    "description",
-                    "description_text",
-                    "description_html",
-                    "start_date",
-                    "target_date",
-                    "status",
-                    "lead_id",
-                    "member_ids",
-                    "view_props",
-                    "sort_order",
-                    "external_source",
-                    "external_id",
-                    # computed fields
-                    "is_favorite",
-                    "total_issues",
-                    "cancelled_issues",
-                    "completed_issues",
-                    "started_issues",
-                    "unstarted_issues",
-                    "backlog_issues",
-                    "created_at",
-                    "updated_at",
-                )
-            ).first()
-            return Response(module, status=status.HTTP_201_CREATED)
+            module = Module.objects.get(pk=serializer.data["id"])
+            serializer = ModuleSerializer(module)
+            return Response(serializer.data, status=status.HTTP_201_CREATED)
         return Response(serializer.errors, status=status.HTTP_400_BAD_REQUEST)
 
     def list(self, request, slug, project_id):
         queryset = self.get_queryset()
-        if self.fields:
-            modules = ModuleSerializer(
-                queryset,
-                many=True,
-                fields=self.fields,
-            ).data
-        else:
-            modules = queryset.values(  # Required fields
-                "id",
-                "workspace_id",
-                "project_id",
-                # Model fields
-                "name",
-                "description",
-                "description_text",
-                "description_html",
-                "start_date",
-                "target_date",
-                "status",
-                "lead_id",
-                "member_ids",
-                "view_props",
-                "sort_order",
-                "external_source",
-                "external_id",
-                # computed fields
-                "is_favorite",
-                "total_issues",
-                "cancelled_issues",
-                "completed_issues",
-                "started_issues",
-                "unstarted_issues",
-                "backlog_issues",
-                "created_at",
-                "updated_at",
-            )
+        fields = [
+            field
+            for field in request.GET.get("fields", "").split(",")
+            if field
+        ]
+        modules = ModuleSerializer(
+            queryset, many=True, fields=fields if fields else None
+        ).data
         return Response(modules, status=status.HTTP_200_OK)
 
     def retrieve(self, request, slug, project_id, pk):
-        queryset = self.get_queryset().filter(pk=pk)
+        queryset = self.get_queryset().get(pk=pk)
 
         assignee_distribution = (
             Issue.objects.filter(
@@ -338,16 +269,16 @@ class ModuleViewSet(WebhookMixin, BaseViewSet):
             .order_by("label_name")
         )
 
-        data = ModuleDetailSerializer(queryset.first()).data
+        data = ModuleSerializer(queryset).data
         data["distribution"] = {
             "assignees": assignee_distribution,
             "labels": label_distribution,
             "completion_chart": {},
         }
 
-        if queryset.first().start_date and queryset.first().target_date:
+        if queryset.start_date and queryset.target_date:
             data["distribution"]["completion_chart"] = burndown_plot(
-                queryset=queryset.first(),
+                queryset=queryset,
                 slug=slug,
                 project_id=project_id,
                 module_id=pk,
@@ -358,47 +289,6 @@ class ModuleViewSet(WebhookMixin, BaseViewSet):
             status=status.HTTP_200_OK,
         )
 
-    def partial_update(self, request, slug, project_id, pk):
-        queryset = self.get_queryset().filter(pk=pk)
-        serializer = ModuleWriteSerializer(
-            queryset.first(), data=request.data, partial=True
-        )
-
-        if serializer.is_valid():
-            serializer.save()
-            module = queryset.values(  
-                # Required fields
-                "id",
-                "workspace_id",
-                "project_id",
-                # Model fields
-                "name",
-                "description",
-                "description_text",
-                "description_html",
-                "start_date",
-                "target_date",
-                "status",
-                "lead_id",
-                "member_ids",
-                "view_props",
-                "sort_order",
-                "external_source",
-                "external_id",
-                # computed fields
-                "is_favorite",
-                "total_issues",
-                "cancelled_issues",
-                "completed_issues",
-                "started_issues",
-                "unstarted_issues",
-                "backlog_issues",
-                "created_at",
-                "updated_at",
-            ).first()
-            return Response(module, status=status.HTTP_200_OK)
-        return Response(serializer.errors, status=status.HTTP_400_BAD_REQUEST)
-
     def destroy(self, request, slug, project_id, pk):
         module = Module.objects.get(
             workspace__slug=slug, project_id=project_id, pk=pk
@@ -441,15 +331,17 @@ class ModuleIssueViewSet(WebhookMixin, BaseViewSet):
         ProjectEntityPermission,
     ]
 
+
     def get_queryset(self):
         return (
-            Issue.issue_objects.filter(
+            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"),
+                issue_module__module_id=self.kwargs.get("module_id")
             )
             .select_related("workspace", "project", "state", "parent")
-            .prefetch_related("assignees", "labels", "issue_module__module")
+            .prefetch_related("labels", "assignees")
+            .prefetch_related('issue_module__module')
             .annotate(cycle_id=F("issue_cycle__cycle_id"))
             .annotate(
                 link_count=IssueLink.objects.filter(issue=OuterRef("id"))
@@ -473,32 +365,6 @@ class ModuleIssueViewSet(WebhookMixin, BaseViewSet):
                 .annotate(count=Func(F("id"), function="Count"))
                 .values("count")
             )
-            .annotate(
-                label_ids=Coalesce(
-                    ArrayAgg(
-                        "labels__id",
-                        distinct=True,
-                        filter=~Q(labels__id__isnull=True),
-                    ),
-                    Value([], output_field=ArrayField(UUIDField())),
-                ),
-                assignee_ids=Coalesce(
-                    ArrayAgg(
-                        "assignees__id",
-                        distinct=True,
-                        filter=~Q(assignees__id__isnull=True),
-                    ),
-                    Value([], output_field=ArrayField(UUIDField())),
-                ),
-                module_ids=Coalesce(
-                    ArrayAgg(
-                        "issue_module__module_id",
-                        distinct=True,
-                        filter=~Q(issue_module__module_id__isnull=True),
-                    ),
-                    Value([], output_field=ArrayField(UUIDField())),
-                ),
-            )
         ).distinct()
 
     @method_decorator(gzip_page)
@@ -510,44 +376,15 @@ class ModuleIssueViewSet(WebhookMixin, BaseViewSet):
         ]
         filters = issue_filters(request.query_params, "GET")
         issue_queryset = self.get_queryset().filter(**filters)
-        if self.fields or self.expand:
-            issues = IssueSerializer(
-                issue_queryset, many=True, fields=fields if fields else None
-            ).data
-        else:
-            issues = issue_queryset.values(
-                "id",
-                "name",
-                "state_id",
-                "sort_order",
-                "completed_at",
-                "estimate_point",
-                "priority",
-                "start_date",
-                "target_date",
-                "sequence_id",
-                "project_id",
-                "parent_id",
-                "cycle_id",
-                "module_ids",
-                "label_ids",
-                "assignee_ids",
-                "sub_issues_count",
-                "created_at",
-                "updated_at",
-                "created_by",
-                "updated_by",
-                "attachment_count",
-                "link_count",
-                "is_draft",
-                "archived_at",
-            )
-        return Response(issues, status=status.HTTP_200_OK)
+        serializer = IssueSerializer(
+            issue_queryset, many=True, fields=fields if fields else None
+        )
+        return Response(serializer.data, status=status.HTTP_200_OK)
 
     # create multiple issues inside a module
     def create_module_issues(self, request, slug, project_id, module_id):
         issues = request.data.get("issues", [])
-        if not issues:
+        if not len(issues):
             return Response(
                 {"error": "Issues are required"},
                 status=status.HTTP_400_BAD_REQUEST,
@@ -583,12 +420,15 @@ class ModuleIssueViewSet(WebhookMixin, BaseViewSet):
             )
             for issue in issues
         ]
-        return Response({"message": "success"}, status=status.HTTP_201_CREATED)
+        issues = (self.get_queryset().filter(pk__in=issues))
+        serializer = IssueSerializer(issues , many=True)
+        return Response(serializer.data, status=status.HTTP_201_CREATED)
+    
 
     # create multiple module inside an issue
     def create_issue_modules(self, request, slug, project_id, issue_id):
         modules = request.data.get("modules", [])
-        if not modules:
+        if not len(modules):
             return Response(
                 {"error": "Modules are required"},
                 status=status.HTTP_400_BAD_REQUEST,
@@ -626,7 +466,10 @@ class ModuleIssueViewSet(WebhookMixin, BaseViewSet):
             for module in modules
         ]
 
-        return Response({"message": "success"}, status=status.HTTP_201_CREATED)
+        issue = (self.get_queryset().filter(pk=issue_id).first())
+        serializer = IssueSerializer(issue)
+        return Response(serializer.data, status=status.HTTP_201_CREATED)
+
 
     def destroy(self, request, slug, project_id, module_id, issue_id):
         module_issue = ModuleIssue.objects.get(
@@ -641,9 +484,7 @@ class ModuleIssueViewSet(WebhookMixin, BaseViewSet):
             actor_id=str(request.user.id),
             issue_id=str(issue_id),
             project_id=str(project_id),
-            current_instance=json.dumps(
-                {"module_name": module_issue.module.name}
-            ),
+            current_instance=json.dumps({"module_name": module_issue.module.name}),
             epoch=int(timezone.now().timestamp()),
             notification=True,
             origin=request.META.get("HTTP_ORIGIN"),
@@ -673,10 +514,7 @@ class ModuleLinkViewSet(BaseViewSet):
             .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,
-                project__project_projectmember__is_active=True,
-            )
+            .filter(project__project_projectmember__member=self.request.user)
             .order_by("-created_at")
             .distinct()
         )

apiserver/plane/app/views/oauth.py

@@ -296,7 +296,7 @@ class OauthEndpoint(BaseAPIView):
                 email=email,
                 user_agent=request.META.get("HTTP_USER_AGENT"),
                 ip=request.META.get("REMOTE_ADDR"),
-                event_name="Sign in",
+                event_name="SIGN_IN",
                 medium=medium.upper(),
                 first_time=False,
             )
@@ -427,7 +427,7 @@ class OauthEndpoint(BaseAPIView):
                 email=email,
                 user_agent=request.META.get("HTTP_USER_AGENT"),
                 ip=request.META.get("REMOTE_ADDR"),
-                event_name="Sign up",
+                event_name="SIGN_IN",
                 medium=medium.upper(),
                 first_time=True,
             )

apiserver/plane/app/views/page.py

@@ -60,10 +60,7 @@ class PageViewSet(BaseViewSet):
             .get_queryset()
             .filter(workspace__slug=self.kwargs.get("slug"))
             .filter(project_id=self.kwargs.get("project_id"))
-            .filter(
-                project__project_projectmember__member=self.request.user,
-                project__project_projectmember__is_active=True,
-            )
+            .filter(project__project_projectmember__member=self.request.user)
             .filter(parent__isnull=True)
             .filter(Q(owned_by=self.request.user) | Q(access=0))
             .select_related("project")

apiserver/plane/app/views/project.py

@@ -77,12 +77,6 @@ class ProjectViewSet(WebhookMixin, BaseViewSet):
     ]
 
     def get_queryset(self):
-        sort_order = ProjectMember.objects.filter(
-            member=self.request.user,
-            project_id=OuterRef("pk"),
-            workspace__slug=self.kwargs.get("slug"),
-            is_active=True,
-        ).values("sort_order")
         return self.filter_queryset(
             super()
             .get_queryset()
@@ -153,7 +147,6 @@ class ProjectViewSet(WebhookMixin, BaseViewSet):
                     )
                 )
             )
-            .annotate(sort_order=Subquery(sort_order))
             .prefetch_related(
                 Prefetch(
                     "project_projectmember",
@@ -173,8 +166,16 @@ class ProjectViewSet(WebhookMixin, BaseViewSet):
             for field in request.GET.get("fields", "").split(",")
             if field
         ]
+
+        sort_order_query = ProjectMember.objects.filter(
+            member=request.user,
+            project_id=OuterRef("pk"),
+            workspace__slug=self.kwargs.get("slug"),
+            is_active=True,
+        ).values("sort_order")
         projects = (
             self.get_queryset()
+            .annotate(sort_order=Subquery(sort_order_query))
             .order_by("sort_order", "name")
         )
         if request.GET.get("per_page", False) and request.GET.get(
@@ -203,7 +204,7 @@ class ProjectViewSet(WebhookMixin, BaseViewSet):
                 serializer.save()
 
                 # Add the user as Administrator to the project
-                _ = ProjectMember.objects.create(
+                project_member = ProjectMember.objects.create(
                     project_id=serializer.data["id"],
                     member=request.user,
                     role=20,

apiserver/plane/app/views/search.py

@@ -48,8 +48,8 @@ class GlobalSearchEndpoint(BaseAPIView):
         return (
             Project.objects.filter(
                 q,
-                project_projectmember__member=self.request.user,
-                project_projectmember__is_active=True,
+                Q(project_projectmember__member=self.request.user)
+                | Q(network=2),
                 workspace__slug=slug,
             )
             .distinct()
@@ -71,7 +71,6 @@ class GlobalSearchEndpoint(BaseAPIView):
         issues = Issue.issue_objects.filter(
             q,
             project__project_projectmember__member=self.request.user,
-            project__project_projectmember__is_active=True,
             workspace__slug=slug,
         )
 
@@ -96,7 +95,6 @@ class GlobalSearchEndpoint(BaseAPIView):
         cycles = Cycle.objects.filter(
             q,
             project__project_projectmember__member=self.request.user,
-            project__project_projectmember__is_active=True,
             workspace__slug=slug,
         )
 
@@ -120,7 +118,6 @@ class GlobalSearchEndpoint(BaseAPIView):
         modules = Module.objects.filter(
             q,
             project__project_projectmember__member=self.request.user,
-            project__project_projectmember__is_active=True,
             workspace__slug=slug,
         )
 
@@ -144,7 +141,6 @@ class GlobalSearchEndpoint(BaseAPIView):
         pages = Page.objects.filter(
             q,
             project__project_projectmember__member=self.request.user,
-            project__project_projectmember__is_active=True,
             workspace__slug=slug,
         )
 
@@ -168,7 +164,6 @@ class GlobalSearchEndpoint(BaseAPIView):
         issue_views = IssueView.objects.filter(
             q,
             project__project_projectmember__member=self.request.user,
-            project__project_projectmember__is_active=True,
             workspace__slug=slug,
         )
 
@@ -241,7 +236,6 @@ class IssueSearchEndpoint(BaseAPIView):
         issues = Issue.issue_objects.filter(
             workspace__slug=slug,
             project__project_projectmember__member=self.request.user,
-            project__project_projectmember__is_active=True,
         )
 
         if workspace_search == "false":
@@ -253,7 +247,12 @@ class IssueSearchEndpoint(BaseAPIView):
         if parent == "true" and issue_id:
             issue = Issue.issue_objects.get(pk=issue_id)
             issues = issues.filter(
-                ~Q(pk=issue_id), ~Q(pk=issue.parent_id), ~Q(parent_id=issue_id))
+                ~Q(pk=issue_id), ~Q(pk=issue.parent_id), parent__isnull=True
+            ).exclude(
+                pk__in=Issue.issue_objects.filter(
+                    parent__isnull=False
+                ).values_list("parent_id", flat=True)
+            )
         if issue_relation == "true" and issue_id:
             issue = Issue.issue_objects.get(pk=issue_id)
             issues = issues.filter(

apiserver/plane/app/views/state.py

@@ -31,10 +31,7 @@ class StateViewSet(BaseViewSet):
             .get_queryset()
             .filter(workspace__slug=self.kwargs.get("slug"))
             .filter(project_id=self.kwargs.get("project_id"))
-            .filter(
-                project__project_projectmember__member=self.request.user,
-                project__project_projectmember__is_active=True,
-            )
+            .filter(project__project_projectmember__member=self.request.user)
             .filter(~Q(name="Triage"))
             .select_related("project")
             .select_related("workspace")

apiserver/plane/app/views/view.py

@@ -1,6 +1,6 @@
 # Django imports
 from django.db.models import (
-    Q,
+    Prefetch,
     OuterRef,
     Func,
     F,
@@ -13,21 +13,16 @@ from django.db.models import (
 )
 from django.utils.decorators import method_decorator
 from django.views.decorators.gzip import gzip_page
-from django.contrib.postgres.aggregates import ArrayAgg
-from django.contrib.postgres.fields import ArrayField
-from django.db.models import Value, UUIDField
-from django.db.models.functions import Coalesce
-from django.contrib.postgres.aggregates import ArrayAgg
-from django.contrib.postgres.fields import ArrayField
-from django.db.models import Value, UUIDField
+from django.db.models import Prefetch, OuterRef, Exists
 
 # Third party imports
 from rest_framework.response import Response
 from rest_framework import status
 
 # Module imports
-from . import BaseViewSet
+from . import BaseViewSet, BaseAPIView
 from plane.app.serializers import (
+    GlobalViewSerializer,
     IssueViewSerializer,
     IssueSerializer,
     IssueViewFavoriteSerializer,
@@ -35,16 +30,22 @@ from plane.app.serializers import (
 from plane.app.permissions import (
     WorkspaceEntityPermission,
     ProjectEntityPermission,
+    WorkspaceViewerPermission,
+    ProjectLitePermission,
 )
 from plane.db.models import (
     Workspace,
+    GlobalView,
     IssueView,
     Issue,
     IssueViewFavorite,
+    IssueReaction,
     IssueLink,
     IssueAttachment,
+    IssueSubscriber,
 )
 from plane.utils.issue_filters import issue_filters
+from plane.utils.grouper import group_results
 
 
 class GlobalViewViewSet(BaseViewSet):
@@ -86,60 +87,13 @@ class GlobalViewIssuesViewSet(BaseViewSet):
                 .values("count")
             )
             .filter(workspace__slug=self.kwargs.get("slug"))
-            .filter(
-                project__project_projectmember__member=self.request.user,
-                project__project_projectmember__is_active=True,
-            )
             .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")
+            .prefetch_related(
+                Prefetch(
+                    "issue_reactions",
+                    queryset=IssueReaction.objects.select_related("actor"),
                 )
-                .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")
-            )
-            .annotate(
-                label_ids=Coalesce(
-                    ArrayAgg(
-                        "labels__id",
-                        distinct=True,
-                        filter=~Q(labels__id__isnull=True),
-                    ),
-                    Value([], output_field=ArrayField(UUIDField())),
-                ),
-                assignee_ids=Coalesce(
-                    ArrayAgg(
-                        "assignees__id",
-                        distinct=True,
-                        filter=~Q(assignees__id__isnull=True),
-                    ),
-                    Value([], output_field=ArrayField(UUIDField())),
-                ),
-                module_ids=Coalesce(
-                    ArrayAgg(
-                        "issue_module__module_id",
-                        distinct=True,
-                        filter=~Q(issue_module__module_id__isnull=True),
-                    ),
-                    Value([], output_field=ArrayField(UUIDField())),
-                ),
             )
         )
 
@@ -167,7 +121,30 @@ class GlobalViewIssuesViewSet(BaseViewSet):
         issue_queryset = (
             self.get_queryset()
             .filter(**filters)
+            .filter(project__project_projectmember__member=self.request.user)
             .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")
+            )
         )
 
         # Priority Ordering
@@ -230,39 +207,10 @@ class GlobalViewIssuesViewSet(BaseViewSet):
         else:
             issue_queryset = issue_queryset.order_by(order_by_param)
 
-        if self.fields:
-            issues = IssueSerializer(
-                issue_queryset, many=True, fields=self.fields
-            ).data
-        else:
-            issues = issue_queryset.values(
-                "id",
-                "name",
-                "state_id",
-                "sort_order",
-                "completed_at",
-                "estimate_point",
-                "priority",
-                "start_date",
-                "target_date",
-                "sequence_id",
-                "project_id",
-                "parent_id",
-                "cycle_id",
-                "module_ids",
-                "label_ids",
-                "assignee_ids",
-                "sub_issues_count",
-                "created_at",
-                "updated_at",
-                "created_by",
-                "updated_by",
-                "attachment_count",
-                "link_count",
-                "is_draft",
-                "archived_at",
-            )
-        return Response(issues, status=status.HTTP_200_OK)
+        serializer = IssueSerializer(
+            issue_queryset, many=True, fields=fields if fields else None
+        )
+        return Response(serializer.data, status=status.HTTP_200_OK)
 
 
 class IssueViewViewSet(BaseViewSet):
@@ -287,10 +235,7 @@ class IssueViewViewSet(BaseViewSet):
             .get_queryset()
             .filter(workspace__slug=self.kwargs.get("slug"))
             .filter(project_id=self.kwargs.get("project_id"))
-            .filter(
-                project__project_projectmember__member=self.request.user,
-                project__project_projectmember__is_active=True,
-            )
+            .filter(project__project_projectmember__member=self.request.user)
             .select_related("project")
             .select_related("workspace")
             .annotate(is_favorite=Exists(subquery))

apiserver/plane/app/views/workspace.py

@@ -1,12 +1,9 @@
 # Python imports
 import jwt
-import csv
-import io
 from datetime import date, datetime
 from dateutil.relativedelta import relativedelta
 
 # Django imports
-from django.http import HttpResponse
 from django.db import IntegrityError
 from django.conf import settings
 from django.utils import timezone
@@ -25,14 +22,9 @@ from django.db.models import (
     When,
     Max,
     IntegerField,
-    Sum,
 )
 from django.db.models.functions import ExtractWeek, Cast, ExtractDay
 from django.db.models.fields import DateField
-from django.contrib.postgres.aggregates import ArrayAgg
-from django.contrib.postgres.fields import ArrayField
-from django.db.models import Value, UUIDField
-from django.db.models.functions import Coalesce
 
 # Third party modules
 from rest_framework import status
@@ -81,9 +73,6 @@ from plane.db.models import (
     WorkspaceUserProperties,
     Estimate,
     EstimatePoint,
-    Module,
-    ModuleLink,
-    Cycle,
 )
 from plane.app.permissions import (
     WorkSpaceBasePermission,
@@ -96,12 +85,6 @@ from plane.app.permissions import (
 from plane.bgtasks.workspace_invitation_task import workspace_invitation
 from plane.utils.issue_filters import issue_filters
 from plane.bgtasks.event_tracking_task import workspace_invite_event
-from plane.app.serializers.module import (
-    ModuleSerializer,
-)
-from plane.app.serializers.cycle import (
-    CycleSerializer,
-)
 
 
 class WorkSpaceViewSet(BaseViewSet):
@@ -563,6 +546,7 @@ class WorkSpaceMemberViewSet(BaseViewSet):
             .get_queryset()
             .filter(
                 workspace__slug=self.kwargs.get("slug"),
+                member__is_bot=False,
                 is_active=True,
             )
             .select_related("workspace", "workspace__owner")
@@ -770,6 +754,7 @@ class WorkspaceProjectMemberEndpoint(BaseAPIView):
         project_ids = (
             ProjectMember.objects.filter(
                 member=request.user,
+                member__is_bot=False,
                 is_active=True,
             )
             .values_list("project_id", flat=True)
@@ -779,6 +764,7 @@ class WorkspaceProjectMemberEndpoint(BaseAPIView):
         # Get all the project members in which the user is involved
         project_members = ProjectMember.objects.filter(
             workspace__slug=slug,
+            member__is_bot=False,
             project_id__in=project_ids,
             is_active=True,
         ).select_related("project", "member", "workspace")
@@ -1089,7 +1075,6 @@ class WorkspaceUserProfileStatsEndpoint(BaseAPIView):
                 workspace__slug=slug,
                 assignees__in=[user_id],
                 project__project_projectmember__member=request.user,
-                project__project_projectmember__is_active=True
             )
             .filter(**filters)
             .annotate(state_group=F("state__group"))
@@ -1105,7 +1090,6 @@ class WorkspaceUserProfileStatsEndpoint(BaseAPIView):
                 workspace__slug=slug,
                 assignees__in=[user_id],
                 project__project_projectmember__member=request.user,
-                project__project_projectmember__is_active=True
             )
             .filter(**filters)
             .values("priority")
@@ -1128,7 +1112,6 @@ class WorkspaceUserProfileStatsEndpoint(BaseAPIView):
             Issue.issue_objects.filter(
                 workspace__slug=slug,
                 project__project_projectmember__member=request.user,
-                project__project_projectmember__is_active=True,
                 created_by_id=user_id,
             )
             .filter(**filters)
@@ -1140,7 +1123,6 @@ class WorkspaceUserProfileStatsEndpoint(BaseAPIView):
                 workspace__slug=slug,
                 assignees__in=[user_id],
                 project__project_projectmember__member=request.user,
-                project__project_projectmember__is_active=True,
             )
             .filter(**filters)
             .count()
@@ -1152,7 +1134,6 @@ class WorkspaceUserProfileStatsEndpoint(BaseAPIView):
                 workspace__slug=slug,
                 assignees__in=[user_id],
                 project__project_projectmember__member=request.user,
-                project__project_projectmember__is_active=True,
             )
             .filter(**filters)
             .count()
@@ -1164,7 +1145,6 @@ class WorkspaceUserProfileStatsEndpoint(BaseAPIView):
                 assignees__in=[user_id],
                 state__group="completed",
                 project__project_projectmember__member=request.user,
-                project__project_projectmember__is_active=True
             )
             .filter(**filters)
             .count()
@@ -1175,7 +1155,6 @@ class WorkspaceUserProfileStatsEndpoint(BaseAPIView):
                 workspace__slug=slug,
                 subscriber_id=user_id,
                 project__project_projectmember__member=request.user,
-                project__project_projectmember__is_active=True
             )
             .filter(**filters)
             .count()
@@ -1225,7 +1204,6 @@ class WorkspaceUserActivityEndpoint(BaseAPIView):
             ~Q(field__in=["comment", "vote", "reaction", "draft"]),
             workspace__slug=slug,
             project__project_projectmember__member=request.user,
-            project__project_projectmember__is_active=True,
             actor=user_id,
         ).select_related("actor", "workspace", "issue", "project")
 
@@ -1241,66 +1219,6 @@ class WorkspaceUserActivityEndpoint(BaseAPIView):
         )
 
 
-class ExportWorkspaceUserActivityEndpoint(BaseAPIView):
-    permission_classes = [
-        WorkspaceEntityPermission,
-    ]
-
-    def generate_csv_from_rows(self, rows):
-        """Generate CSV buffer from rows."""
-        csv_buffer = io.StringIO()
-        writer = csv.writer(csv_buffer, delimiter=",", quoting=csv.QUOTE_ALL)
-        [writer.writerow(row) for row in rows]
-        csv_buffer.seek(0)
-        return csv_buffer
-
-    def post(self, request, slug, user_id):
-
-        if not request.data.get("date"):
-            return Response(
-                {"error": "Date is required"},
-                status=status.HTTP_400_BAD_REQUEST,
-            )
-        
-        user_activities = IssueActivity.objects.filter(
-            ~Q(field__in=["comment", "vote", "reaction", "draft"]),
-            workspace__slug=slug,
-            created_at__date=request.data.get("date"),
-            project__project_projectmember__member=request.user,
-            actor_id=user_id,
-        ).select_related("actor", "workspace", "issue", "project")[:10000]
-
-        header = [
-            "Actor name",
-            "Issue ID",
-            "Project",
-            "Created at",
-            "Updated at",
-            "Action",
-            "Field",
-            "Old value",
-            "New value",
-        ]
-        rows = [
-            (
-                activity.actor.display_name,
-                f"{activity.project.identifier} - {activity.issue.sequence_id if activity.issue else ''}",
-                activity.project.name,
-                activity.created_at,
-                activity.updated_at,
-                activity.verb,
-                activity.field,
-                activity.old_value,
-                activity.new_value,
-            )
-            for activity in user_activities
-        ]
-        csv_buffer = self.generate_csv_from_rows([header] + rows)
-        response = HttpResponse(csv_buffer.getvalue(), content_type="text/csv")
-        response["Content-Disposition"] = 'attachment; filename="workspace-user-activity.csv"'
-        return response
-
-
 class WorkspaceUserProfileEndpoint(BaseAPIView):
     def get(self, request, slug, user_id):
         user_data = User.objects.get(pk=user_id)
@@ -1316,7 +1234,6 @@ class WorkspaceUserProfileEndpoint(BaseAPIView):
                 Project.objects.filter(
                     workspace__slug=slug,
                     project_projectmember__member=request.user,
-                    project_projectmember__is_active=True,
                 )
                 .annotate(
                     created_issues=Count(
@@ -1366,6 +1283,10 @@ class WorkspaceUserProfileEndpoint(BaseAPIView):
                 )
                 .values(
                     "id",
+                    "name",
+                    "identifier",
+                    "emoji",
+                    "icon_prop",
                     "created_issues",
                     "assigned_issues",
                     "completed_issues",
@@ -1422,7 +1343,6 @@ class WorkspaceUserProfileIssuesEndpoint(BaseAPIView):
                 | Q(issue_subscribers__subscriber_id=user_id),
                 workspace__slug=slug,
                 project__project_projectmember__member=request.user,
-                project__project_projectmember__is_active=True
             )
             .filter(**filters)
             .select_related("workspace", "project", "state", "parent")
@@ -1450,32 +1370,6 @@ class WorkspaceUserProfileIssuesEndpoint(BaseAPIView):
                 .annotate(count=Func(F("id"), function="Count"))
                 .values("count")
             )
-            .annotate(
-                label_ids=Coalesce(
-                    ArrayAgg(
-                        "labels__id",
-                        distinct=True,
-                        filter=~Q(labels__id__isnull=True),
-                    ),
-                    Value([], output_field=ArrayField(UUIDField())),
-                ),
-                assignee_ids=Coalesce(
-                    ArrayAgg(
-                        "assignees__id",
-                        distinct=True,
-                        filter=~Q(assignees__id__isnull=True),
-                    ),
-                    Value([], output_field=ArrayField(UUIDField())),
-                ),
-                module_ids=Coalesce(
-                    ArrayAgg(
-                        "issue_module__module_id",
-                        distinct=True,
-                        filter=~Q(issue_module__module_id__isnull=True),
-                    ),
-                    Value([], output_field=ArrayField(UUIDField())),
-                ),
-            )
             .order_by("created_at")
         ).distinct()
 
@@ -1554,7 +1448,6 @@ class WorkspaceLabelsEndpoint(BaseAPIView):
         labels = Label.objects.filter(
             workspace__slug=slug,
             project__project_projectmember__member=request.user,
-            project__project_projectmember__is_active=True
         )
         serializer = LabelSerializer(labels, many=True).data
         return Response(serializer, status=status.HTTP_200_OK)
@@ -1569,7 +1462,6 @@ class WorkspaceStatesEndpoint(BaseAPIView):
         states = State.objects.filter(
             workspace__slug=slug,
             project__project_projectmember__member=request.user,
-            project__project_projectmember__is_active=True
         )
         serializer = StateSerializer(states, many=True).data
         return Response(serializer, status=status.HTTP_200_OK)
@@ -1598,192 +1490,6 @@ class WorkspaceEstimatesEndpoint(BaseAPIView):
         return Response(serializer.data, status=status.HTTP_200_OK)
 
 
-class WorkspaceModulesEndpoint(BaseAPIView):
-    permission_classes = [
-        WorkspaceViewerPermission,
-    ]
-
-    def get(self, request, slug):
-        modules = (
-            Module.objects.filter(workspace__slug=slug)
-            .select_related("project")
-            .select_related("workspace")
-            .select_related("lead")
-            .prefetch_related("members")
-            .prefetch_related(
-                Prefetch(
-                    "link_module",
-                    queryset=ModuleLink.objects.select_related(
-                        "module", "created_by"
-                    ),
-                )
-            )
-            .annotate(
-                total_issues=Count(
-                    "issue_module",
-                    filter=Q(
-                        issue_module__issue__archived_at__isnull=True,
-                        issue_module__issue__is_draft=False,
-                    ),
-                ),
-            )
-            .annotate(
-                completed_issues=Count(
-                    "issue_module__issue__state__group",
-                    filter=Q(
-                        issue_module__issue__state__group="completed",
-                        issue_module__issue__archived_at__isnull=True,
-                        issue_module__issue__is_draft=False,
-                    ),
-                )
-            )
-            .annotate(
-                cancelled_issues=Count(
-                    "issue_module__issue__state__group",
-                    filter=Q(
-                        issue_module__issue__state__group="cancelled",
-                        issue_module__issue__archived_at__isnull=True,
-                        issue_module__issue__is_draft=False,
-                    ),
-                )
-            )
-            .annotate(
-                started_issues=Count(
-                    "issue_module__issue__state__group",
-                    filter=Q(
-                        issue_module__issue__state__group="started",
-                        issue_module__issue__archived_at__isnull=True,
-                        issue_module__issue__is_draft=False,
-                    ),
-                )
-            )
-            .annotate(
-                unstarted_issues=Count(
-                    "issue_module__issue__state__group",
-                    filter=Q(
-                        issue_module__issue__state__group="unstarted",
-                        issue_module__issue__archived_at__isnull=True,
-                        issue_module__issue__is_draft=False,
-                    ),
-                )
-            )
-            .annotate(
-                backlog_issues=Count(
-                    "issue_module__issue__state__group",
-                    filter=Q(
-                        issue_module__issue__state__group="backlog",
-                        issue_module__issue__archived_at__isnull=True,
-                        issue_module__issue__is_draft=False,
-                    ),
-                )
-            )
-            .order_by(self.kwargs.get("order_by", "-created_at"))
-        )
-
-        serializer = ModuleSerializer(modules, many=True).data
-        return Response(serializer, status=status.HTTP_200_OK)
-
-
-class WorkspaceCyclesEndpoint(BaseAPIView):
-    permission_classes = [
-        WorkspaceViewerPermission,
-    ]
-
-    def get(self, request, slug):
-        cycles = (
-            Cycle.objects.filter(workspace__slug=slug)
-            .select_related("project")
-            .select_related("workspace")
-            .select_related("owned_by")
-            .annotate(
-                total_issues=Count(
-                    "issue_cycle",
-                    filter=Q(
-                        issue_cycle__issue__archived_at__isnull=True,
-                        issue_cycle__issue__is_draft=False,
-                    ),
-                )
-            )
-            .annotate(
-                completed_issues=Count(
-                    "issue_cycle__issue__state__group",
-                    filter=Q(
-                        issue_cycle__issue__state__group="completed",
-                        issue_cycle__issue__archived_at__isnull=True,
-                        issue_cycle__issue__is_draft=False,
-                    ),
-                )
-            )
-            .annotate(
-                cancelled_issues=Count(
-                    "issue_cycle__issue__state__group",
-                    filter=Q(
-                        issue_cycle__issue__state__group="cancelled",
-                        issue_cycle__issue__archived_at__isnull=True,
-                        issue_cycle__issue__is_draft=False,
-                    ),
-                )
-            )
-            .annotate(
-                started_issues=Count(
-                    "issue_cycle__issue__state__group",
-                    filter=Q(
-                        issue_cycle__issue__state__group="started",
-                        issue_cycle__issue__archived_at__isnull=True,
-                        issue_cycle__issue__is_draft=False,
-                    ),
-                )
-            )
-            .annotate(
-                unstarted_issues=Count(
-                    "issue_cycle__issue__state__group",
-                    filter=Q(
-                        issue_cycle__issue__state__group="unstarted",
-                        issue_cycle__issue__archived_at__isnull=True,
-                        issue_cycle__issue__is_draft=False,
-                    ),
-                )
-            )
-            .annotate(
-                backlog_issues=Count(
-                    "issue_cycle__issue__state__group",
-                    filter=Q(
-                        issue_cycle__issue__state__group="backlog",
-                        issue_cycle__issue__archived_at__isnull=True,
-                        issue_cycle__issue__is_draft=False,
-                    ),
-                )
-            )
-            .annotate(
-                total_estimates=Sum("issue_cycle__issue__estimate_point")
-            )
-            .annotate(
-                completed_estimates=Sum(
-                    "issue_cycle__issue__estimate_point",
-                    filter=Q(
-                        issue_cycle__issue__state__group="completed",
-                        issue_cycle__issue__archived_at__isnull=True,
-                        issue_cycle__issue__is_draft=False,
-                    ),
-                )
-            )
-            .annotate(
-                started_estimates=Sum(
-                    "issue_cycle__issue__estimate_point",
-                    filter=Q(
-                        issue_cycle__issue__state__group="started",
-                        issue_cycle__issue__archived_at__isnull=True,
-                        issue_cycle__issue__is_draft=False,
-                    ),
-                )
-            )
-            .order_by(self.kwargs.get("order_by", "-created_at"))
-            .distinct()
-        )
-        serializer = CycleSerializer(cycles, many=True).data
-        return Response(serializer, status=status.HTTP_200_OK)
-
-
 class WorkspaceUserPropertiesEndpoint(BaseAPIView):
     permission_classes = [
         WorkspaceViewerPermission,

apiserver/plane/bgtasks/email_notification_task.py

@@ -1,9 +1,8 @@
+import json
 from datetime import datetime
-from bs4 import BeautifulSoup
 
 # Third party imports
 from celery import shared_task
-from sentry_sdk import capture_exception
 
 # Django imports
 from django.utils import timezone
@@ -17,17 +16,6 @@ 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
 
-# acquire and delete redis lock
-def acquire_lock(lock_id, expire_time=300):
-    redis_client = redis_instance()
-    """Attempt to acquire a lock with a specified expiration time."""
-    return redis_client.set(lock_id, 'true', nx=True, ex=expire_time)
-
-def release_lock(lock_id):
-    """Release a lock."""
-    redis_client = redis_instance()
-    redis_client.delete(lock_id)
-
 @shared_task
 def stack_email_notification():
     # get all email notifications
@@ -52,7 +40,7 @@ def stack_email_notification():
     processed_notifications = []
     # Loop through all the issues to create the emails
     for receiver_id in receivers:
-        # Notification triggered for the receiver
+        # Notifcation triggered for the receiver
         receiver_notifications = [
             notification
             for notification in email_notifications
@@ -136,173 +124,119 @@ def create_payload(notification_data):
 
     return data
 
-def process_mention(mention_component):
-    soup = BeautifulSoup(mention_component, 'html.parser')
-    mentions = soup.find_all('mention-component')
-    for mention in mentions:
-        user_id = mention['id']
-        user = User.objects.get(pk=user_id)
-        user_name = user.display_name
-        highlighted_name = f"@{user_name}"
-        mention.replace_with(highlighted_name)
-    return str(soup)
-
-def process_html_content(content):
-    processed_content_list = []
-    for html_content in content:
-        processed_content = process_mention(html_content)
-        processed_content_list.append(processed_content)  
-    return processed_content_list
-
 
 @shared_task
 def send_email_notification(
     issue_id, notification_data, receiver_id, email_notification_ids
 ):
-    # Convert UUIDs to a sorted, concatenated string
-    sorted_ids = sorted(email_notification_ids)
-    ids_str = "_".join(str(id) for id in sorted_ids)
-    lock_id = f"send_email_notif_{issue_id}_{receiver_id}_{ids_str}"
+    ri = redis_instance()
+    base_api = (ri.get(str(issue_id)).decode())
+    data = create_payload(notification_data=notification_data)
 
-    # acquire the lock for sending emails
-    try:
-        if acquire_lock(lock_id=lock_id):
-            # get the redis instance
-            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()
 
-            # 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)
-                mention = changes.pop("mention", 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,
-                            },
-                        }
-                    )
-                if mention:
-                    mention["new_value"] = process_html_content(mention.get("new_value"))
-                    mention["old_value"] = process_html_content(mention.get("old_value"))
-                    comments.append(
-                        {
-                            "actor_comments": mention,
-                            "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
+    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,
+                    },
+                }
             )
-            text_content = strip_tags(html_content)
+        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")
 
-            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",
-                )
+        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),
+                }
+        )
 
-                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()
+    summary = "Updates were made to the issue by"
 
-                EmailNotificationLog.objects.filter(
-                    pk__in=email_notification_ids
-                ).update(sent_at=timezone.now())
+    # 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)
 
-                # release the lock
-                release_lock(lock_id=lock_id)
-                return
-            except Exception as e:
-                capture_exception(e)
-                # release the lock
-                release_lock(lock_id=lock_id)
-                return
-        else:
-            print("Duplicate task recived. Skipping...")
-            return
-    except (Issue.DoesNotExist, User.DoesNotExist) as e:
-        if settings.DEBUG:
-            print(e)
-        release_lock(lock_id=lock_id)
+    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

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

apiserver/plane/bgtasks/importer_task.py

@@ -60,6 +60,15 @@ def service_importer(service, importer_id):
                 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

@@ -483,23 +483,17 @@ def track_archive_at(
                 )
             )
         else:
-            if requested_data.get("automation"):
-                comment = "Plane has archived the issue"
-                new_value = "archive"
-            else:
-                comment = "Actor has archived the issue"
-                new_value = "manual_archive"
             issue_activities.append(
                 IssueActivity(
                     issue_id=issue_id,
                     project_id=project_id,
                     workspace_id=workspace_id,
-                    comment=comment,
+                    comment="Plane has archived the issue",
                     verb="updated",
                     actor_id=actor_id,
                     field="archived_at",
                     old_value=None,
-                    new_value=new_value,
+                    new_value="archive",
                     epoch=epoch,
                 )
             )

apiserver/plane/bgtasks/issue_automation_task.py

@@ -79,7 +79,7 @@ def archive_old_issues():
                         issue_activity.delay(
                             type="issue.activity.updated",
                             requested_data=json.dumps(
-                                {"archived_at": str(archive_at), "automation": True}
+                                {"archived_at": str(archive_at)}
                             ),
                             actor_id=str(project.created_by_id),
                             issue_id=issue.id,

apiserver/plane/bgtasks/notification_task.py

@@ -515,7 +515,7 @@ def notifications(
                             bulk_email_logs.append(
                                 EmailNotificationLog(
                                     triggered_by_id=actor_id,
-                                    receiver_id=mention_id,
+                                    receiver_id=subscriber,
                                     entity_identifier=issue_id,
                                     entity_name="issue",
                                     data={
@@ -552,7 +552,6 @@ def notifications(
                                             "old_value": str(
                                                 issue_activity.get("old_value")
                                             ),
-                                            "activity_time": issue_activity.get("created_at"),
                                         },
                                     },
                                 )
@@ -640,7 +639,6 @@ def notifications(
                                             "old_value": str(
                                                 last_activity.old_value
                                             ),
-                                            "activity_time": issue_activity.get("created_at"),
                                         },
                                     },
                                 )
@@ -697,7 +695,6 @@ def notifications(
                                                         "old_value"
                                                     )
                                                 ),
-                                                "activity_time": issue_activity.get("created_at"),
                                             },
                                         },
                                     )

apiserver/plane/bgtasks/webhook_task.py

@@ -7,9 +7,6 @@ import hmac
 # Django imports
 from django.conf import settings
 from django.core.serializers.json import DjangoJSONEncoder
-from django.core.mail import EmailMultiAlternatives, get_connection
-from django.template.loader import render_to_string
-from django.utils.html import strip_tags
 
 # Third party imports
 from celery import shared_task
@@ -25,10 +22,10 @@ from plane.db.models import (
     ModuleIssue,
     CycleIssue,
     IssueComment,
-    User,
 )
 from plane.api.serializers import (
     ProjectSerializer,
+    IssueSerializer,
     CycleSerializer,
     ModuleSerializer,
     CycleIssueSerializer,
@@ -37,9 +34,6 @@ from plane.api.serializers import (
     IssueExpandSerializer,
 )
 
-# Module imports
-from plane.license.utils.instance_value import get_email_configuration
-
 SERIALIZER_MAPPER = {
     "project": ProjectSerializer,
     "issue": IssueExpandSerializer,
@@ -78,7 +72,7 @@ def get_model_data(event, event_id, many=False):
     max_retries=5,
     retry_jitter=True,
 )
-def webhook_task(self, webhook, slug, event, event_data, action, current_site):
+def webhook_task(self, webhook, slug, event, event_data, action):
     try:
         webhook = Webhook.objects.get(id=webhook, workspace__slug=slug)
 
@@ -157,18 +151,7 @@ def webhook_task(self, webhook, slug, event, event_data, action, current_site):
             response_body=str(e),
             retry_count=str(self.request.retries),
         )
-        # Retry logic
-        if self.request.retries >= self.max_retries:
-            Webhook.objects.filter(pk=webhook.id).update(is_active=False)   
-            if webhook:
-                # send email for the deactivation of the webhook
-                send_webhook_deactivation_email(
-                    webhook_id=webhook.id,
-                    receiver_id=webhook.created_by_id,
-                    reason=str(e),
-                    current_site=current_site,
-                )
-            return
+
         raise requests.RequestException()
 
     except Exception as e:
@@ -179,7 +162,7 @@ def webhook_task(self, webhook, slug, event, event_data, action, current_site):
 
 
 @shared_task()
-def send_webhook(event, payload, kw, action, slug, bulk, current_site):
+def send_webhook(event, payload, kw, action, slug, bulk):
     try:
         webhooks = Webhook.objects.filter(workspace__slug=slug, is_active=True)
 
@@ -233,7 +216,6 @@ def send_webhook(event, payload, kw, action, slug, bulk, current_site):
                         event=event,
                         event_data=data,
                         action=action,
-                        current_site=current_site,
                     )
 
     except Exception as e:
@@ -241,56 +223,3 @@ def send_webhook(event, payload, kw, action, slug, bulk, current_site):
             print(e)
         capture_exception(e)
         return
-
-
-@shared_task
-def send_webhook_deactivation_email(webhook_id, receiver_id, current_site, reason):
-    # 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)
-    webhook = Webhook.objects.get(pk=webhook_id) 
-    subject="Webhook Deactivated"
-    message=f"Webhook {webhook.url} has been deactivated due to failed requests."
-
-    # Send the mail
-    context = {
-        "email": receiver.email,
-        "message": message,
-        "webhook_url":f"{current_site}/{str(webhook.workspace.slug)}/settings/webhooks/{str(webhook.id)}",
-    }
-    html_content = render_to_string(
-        "emails/notifications/webhook-deactivate.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()
-
-        return
-    except Exception as e:
-        print(e)
-        return

apiserver/plane/db/migrations/0059_auto_20240208_0957.py

@@ -1,33 +0,0 @@
-# Generated by Django 4.2.7 on 2024-02-08 09:57
-
-from django.db import migrations
-
-
-def widgets_filter_change(apps, schema_editor):
-    Widget = apps.get_model("db", "Widget")
-    widgets_to_update = []
-
-    # Define the filter dictionaries for each widget key
-    filters_mapping = {
-        "assigned_issues": {"duration": "none", "tab": "pending"},
-        "created_issues": {"duration": "none", "tab": "pending"},
-        "issues_by_state_groups": {"duration": "none"},
-        "issues_by_priority": {"duration": "none"},
-    }
-
-    # Iterate over widgets and update filters if applicable
-    for widget in Widget.objects.all():
-        if widget.key in filters_mapping:
-            widget.filters = filters_mapping[widget.key]
-            widgets_to_update.append(widget)
-
-    # Bulk update the widgets
-    Widget.objects.bulk_update(widgets_to_update, ["filters"], batch_size=10)
-
-class Migration(migrations.Migration):
-    dependencies = [
-        ('db', '0058_alter_moduleissue_issue_and_more'),
-    ]
-    operations = [
-        migrations.RunPython(widgets_filter_change)
-    ]

apiserver/plane/db/migrations/0060_cycle_progress_snapshot.py

@@ -1,18 +0,0 @@
-# Generated by Django 4.2.7 on 2024-02-08 09:18
-
-from django.db import migrations, models
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('db', '0059_auto_20240208_0957'),
-    ]
-
-    operations = [
-        migrations.AddField(
-            model_name='cycle',
-            name='progress_snapshot',
-            field=models.JSONField(default=dict),
-        ),
-    ]

apiserver/plane/db/migrations/0061_project_logo_props.py

@@ -1,54 +0,0 @@
-# Generated by Django 4.2.7 on 2024-03-03 16:25
-
-from django.db import migrations, models
-
-
-class Migration(migrations.Migration):
-
-    def update_project_logo_props(apps, schema_editor):
-        Project = apps.get_model("db", "Project")
-
-        bulk_update_project_logo = []
-        # Iterate through projects and update logo_props
-        for project in Project.objects.all():
-            project.logo_props["in_use"] = "emoji" if project.emoji else "icon"
-            project.logo_props["emoji"] = {
-                "value": project.emoji if project.emoji else "",
-                "url": "",
-            }
-            project.logo_props["icon"] = {
-                "name": (
-                    project.icon_prop.get("name", "")
-                    if project.icon_prop
-                    else ""
-                ),
-                "color": (
-                    project.icon_prop.get("color", "")
-                    if project.icon_prop
-                    else ""
-                ),
-            }
-            bulk_update_project_logo.append(project)
-
-        # Bulk update logo_props for all projects
-        Project.objects.bulk_update(
-            bulk_update_project_logo, ["logo_props"], batch_size=1000
-        )
-
-    dependencies = [
-        ("db", "0060_cycle_progress_snapshot"),
-    ]
-
-    operations = [
-        migrations.AlterField(
-            model_name="issuelink",
-            name="url",
-            field=models.TextField(),
-        ),
-        migrations.AddField(
-            model_name="project",
-            name="logo_props",
-            field=models.JSONField(default=dict),
-        ),
-        migrations.RunPython(update_project_logo_props),
-    ]

apiserver/plane/db/models/cycle.py

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

apiserver/plane/db/models/issue.py

@@ -320,7 +320,7 @@ class IssueAssignee(ProjectBaseModel):
 
 class IssueLink(ProjectBaseModel):
     title = models.CharField(max_length=255, null=True, blank=True)
-    url = models.TextField()
+    url = models.URLField()
     issue = models.ForeignKey(
         "db.Issue", on_delete=models.CASCADE, related_name="issue_link"
     )

apiserver/plane/db/models/project.py

@@ -107,7 +107,6 @@ class Project(BaseModel):
     close_in = models.IntegerField(
         default=0, validators=[MinValueValidator(0), MaxValueValidator(12)]
     )
-    logo_props = models.JSONField(default=dict)
     default_state = models.ForeignKey(
         "db.State",
         on_delete=models.SET_NULL,

apiserver/plane/db/models/user.py

@@ -12,9 +12,15 @@ from django.contrib.auth.models import (
     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 {
@@ -138,6 +144,25 @@ class User(AbstractBaseUser, PermissionsMixin):
         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):

apiserver/plane/settings/common.py

@@ -1,5 +1,4 @@
 """Global Settings"""
-
 # Python imports
 import os
 import ssl
@@ -283,8 +282,10 @@ if REDIS_SSL:
     redis_url = os.environ.get("REDIS_URL")
     broker_url = f"{redis_url}?ssl_cert_reqs={ssl.CERT_NONE.name}&ssl_ca_certs={certifi.where()}"
     CELERY_BROKER_URL = broker_url
+    CELERY_RESULT_BACKEND = broker_url
 else:
     CELERY_BROKER_URL = REDIS_URL
+    CELERY_RESULT_BACKEND = REDIS_URL
 
 CELERY_IMPORTS = (
     "plane.bgtasks.issue_automation_task",
@@ -308,9 +309,7 @@ if bool(os.environ.get("SENTRY_DSN", False)) and os.environ.get(
         traces_sample_rate=1,
         send_default_pii=True,
         environment=os.environ.get("SENTRY_ENVIRONMENT", "development"),
-        profiles_sample_rate=float(
-            os.environ.get("SENTRY_PROFILE_SAMPLE_RATE", 0.5)
-        ),
+        profiles_sample_rate=1.0,
     )
 
 

apiserver/plane/urls.py

@@ -7,7 +7,6 @@ from django.views.generic import TemplateView
 
 from django.conf import settings
 
-handler404 = "plane.app.views.error_404.custom_404_view"
 
 urlpatterns = [
     path("", TemplateView.as_view(template_name="index.html")),

apiserver/plane/utils/issue_search.py

@@ -9,11 +9,11 @@ from plane.db.models import Issue
 
 
 def search_issues(query, queryset):
-    fields = ["name", "sequence_id", "project__identifier"]
+    fields = ["name", "sequence_id"]
     q = Q()
     for field in fields:
         if field == "sequence_id" and len(query) <= 20:
-            sequences = re.findall(r"\b\d+\b", query)
+            sequences = re.findall(r"[A-Za-z0-9]{1,12}-\d+", query)
             for sequence_id in sequences:
                 q |= Q(**{"sequence_id": sequence_id})
         else:

apiserver/requirements/base.txt

@@ -1,6 +1,6 @@
 # base requirements
 
-Django==4.2.10
+Django==4.2.7
 psycopg==3.1.12
 djangorestframework==3.14.0
 redis==4.6.0
@@ -30,7 +30,7 @@ openpyxl==3.1.2
 beautifulsoup4==4.12.2
 dj-database-url==2.1.0
 posthog==3.0.2
-cryptography==42.0.4
+cryptography==41.0.6
 lxml==4.9.3
 boto3==1.28.40
 

apiserver/runtime.txt

@@ -1 +1 @@
-python-3.11.8
+python-3.11.7

apiserver/server.py

@@ -0,0 +1,17 @@
+import os
+import uvicorn
+
+if __name__ == "__main__":
+    os.environ.setdefault(
+        "DJANGO_SETTINGS_MODULE", "plane.settings.production"
+    )
+    uvicorn.run(
+        "plane.asgi:application",
+        host=os.environ.get("HOST", "0.0.0.0"),
+        port=os.environ.get("PORT", 8000),
+        ws="auto",
+        workers=int(os.environ.get("GUNICORN_WORKERS", 1)),
+        log_level=os.environ.get("LOG_LEVEL", "info"),
+        lifespan="off",
+        access_log="on",
+    )

apiserver/templates/emails/notifications/issue-updates.html

@@ -66,7 +66,7 @@
                         style="margin-left: 30px; margin-bottom: 20px; margin-top: 20px"
                         >
                         <img
-                           src="https://plane-marketing.s3.ap-south-1.amazonaws.com/plane-assets/emails/plane-logo.png"
+                           src="https://plane-marketing.s3.ap-south-1.amazonaws.com/plane-assets/emails/plane-logo.webp"
                            width="130"
                            height="40"
                            border="0"
@@ -108,33 +108,25 @@
                   margin-bottom: 15px;
                   "
                   />
-                  {% if actors_involved == 1 %}
-                  <p style="font-size: 1rem;color: #1f2d5c; line-height: 28px">
-                     {{summary}}
-                     <span style="font-size: 1rem; font-weight: 700; line-height: 28px">
-                     {% if data|length > 0 %}
-                     {{ data.0.actor_detail.first_name}}
-                     {{data.0.actor_detail.last_name}}
-                     {% else %}
-                     {{ comments.0.actor_detail.first_name}}
-                     {{comments.0.actor_detail.last_name}}
-                     {% endif %}
-                     </span>.
-                  </p>
-                  {% else %}
-                  <p style="font-size: 1rem;color: #1f2d5c; line-height: 28px">
-                     {{summary}}
-                     <span style="font-size: 1rem; font-weight: 700; line-height: 28px">
-                     {% if data|length > 0 %}
-                     {{ data.0.actor_detail.first_name}}
-                     {{data.0.actor_detail.last_name}}
-                     {% else %}
-                     {{ comments.0.actor_detail.first_name}}
-                     {{comments.0.actor_detail.last_name}}
-                     {% endif %}
-                     </span>and others.
-                  </p>
-                  {% endif %}
+               {% if actors_involved == 1 %}
+               <p style="font-size: 1rem;color: #1f2d5c; line-height: 28px">
+                  {{summary}}
+                  <span style="font-size: 1rem; font-weight: 700; line-height: 28px">
+                  {{ data.0.actor_detail.first_name}}
+                  {{data.0.actor_detail.last_name}}
+                  </span>.
+               </p>
+               {% else %}
+               <p style="font-size: 1rem;color: #1f2d5c; line-height: 28px">
+                  {{summary}}
+                  <span style="font-size: 1rem; font-weight: 700; line-height: 28px">
+                  {{ data.0.actor_detail.first_name}}
+                  {{data.0.actor_detail.last_name }}
+                  </span>and others.
+               </p>
+               {% endif %}
+
+
                <!-- {% if actors_involved == 1 %}
                {% if data|length > 0 and comments|length == 0 %}
                <p style="font-size: 1rem;color: #1f2d5c; line-height: 28px">
@@ -280,7 +272,7 @@
                         <tr>
                            <td>
                               <img
-                                 src="https://plane-marketing.s3.ap-south-1.amazonaws.com/plane-assets/emails/due-date.png"
+                                 src="https://plane-marketing.s3.ap-south-1.amazonaws.com/plane-assets/emails/due-date.webp"
                                  width="12"
                                  height="12"
                                  border="0"
@@ -341,7 +333,7 @@
                         <tr>
                            <td>
                               <img
-                                 src="https://plane-marketing.s3.ap-south-1.amazonaws.com/plane-assets/emails/duplicate.png"
+                                 src="https://plane-marketing.s3.ap-south-1.amazonaws.com/plane-assets/emails/duplicate.webp"
                                  width="12"
                                  height="12"
                                  border="0"
@@ -436,7 +428,7 @@
                         <tr>
                            <td valign="top" style="white-space: nowrap; padding: 0px;">
                               <img
-                                 src="https://plane-marketing.s3.ap-south-1.amazonaws.com/plane-assets/emails/assignee.png"
+                                 src="https://plane-marketing.s3.ap-south-1.amazonaws.com/plane-assets/emails/assignee.webp"
                                  width="12"
                                  height="12"
                                  border="0"
@@ -532,7 +524,7 @@
                         <tr>
                            <td valign="top" style="white-space: nowrap; padding: 0px;">
                               <img
-                                 src="https://plane-marketing.s3.ap-south-1.amazonaws.com/plane-assets/emails/labels.png"
+                                 src="https://plane-marketing.s3.ap-south-1.amazonaws.com/plane-assets/emails/labels.webp"
                                  width="12"
                                  height="12"
                                  border="0"
@@ -629,7 +621,7 @@
                         <tr>
                            <td>
                               <img
-                                 src="https://plane-marketing.s3.ap-south-1.amazonaws.com/plane-assets/emails/state.png"
+                                 src="https://plane-marketing.s3.ap-south-1.amazonaws.com/plane-assets/emails/state.webp"
                                  width="12"
                                  height="12"
                                  border="0"
@@ -647,17 +639,15 @@
                                  State:
                               </p>
                            </td>
-                           {% if update.changes.state.old_value.0 == 'Backlog' or  update.changes.state.old_value.0 == 'In Progress' or update.changes.state.old_value.0 == 'Done' or update.changes.state.old_value.0 == 'Cancelled' %}
-                           <td>
+                           <td >
                               <img
-                                 src="{% if update.changes.state.old_value.0 == 'Backlog' %}https://plane-marketing.s3.ap-south-1.amazonaws.com/plane-assets/emails/backlog.png{% endif %}{% if update.changes.state.old_value.0 == 'In Progress' %}https://plane-marketing.s3.ap-south-1.amazonaws.com/plane-assets/emails/in-progress.png{% endif %}{% if update.changes.state.old_value.0 == 'Done' %}https://plane-marketing.s3.ap-south-1.amazonaws.com/plane-assets/emails/done.png{% endif %}{% if update.changes.state.old_value.0 == 'Cancelled' %}https://plane-marketing.s3.ap-south-1.amazonaws.com/plane-assets/emails/cancelled.png{% endif %}"
+                                 src="{% if update.changes.state.old_value.0 == 'Backlog' %}https://plane-marketing.s3.ap-south-1.amazonaws.com/plane-assets/emails/backlog.webp{% endif %}{% if update.changes.state.old_value.0 == 'In Progress' %}https://plane-marketing.s3.ap-south-1.amazonaws.com/plane-assets/emails/in-progress.webp{% endif %}{% if update.changes.state.old_value.0 == 'Done' %}https://plane-marketing.s3.ap-south-1.amazonaws.com/plane-assets/emails/done.webp{% endif %}{% if update.changes.state.old_value.0 == 'Cancelled' %}https://plane-marketing.s3.ap-south-1.amazonaws.com/plane-assets/emails/cancelled.webp{% endif %}"
                                  width="12"
                                  height="12"
                                  border="0"
                                  style="display: block; margin-left: 5px;"
                                  />
                            </td>
-                           {% endif %}
                            <td>
                               <p
                                  style="
@@ -671,24 +661,22 @@
                            </td>
                            <td style="padding-left: 10px; padding-right: 10px;">
                               <img
-                                 src="https://plane-marketing.s3.ap-south-1.amazonaws.com/plane-assets/emails/forward-arrow.png"
+                                 src="https://plane-marketing.s3.ap-south-1.amazonaws.com/plane-assets/emails/forward-arrow.webp"
                                  width="16"
                                  height="16"
                                  border="0"
                                  style="display: block;"
                                  />
                            </td>
-                           {% if update.changes.state.new_value|last == 'Backlog' or  update.changes.state.new_value|last == 'In Progress' or update.changes.state.new_value|last == 'Done' or update.changes.state.new_value|last == 'Cancelled' %}
-                           <td>
+                           <td >
                               <img
-                                 src="{% if update.changes.state.new_value|last == 'Backlog' %}https://plane-marketing.s3.ap-south-1.amazonaws.com/plane-assets/emails/backlog.png{% elif update.changes.state.new_value|last == 'In Progress' %}https://plane-marketing.s3.ap-south-1.amazonaws.com/plane-assets/emails/in-progress.png{% elif update.changes.state.new_value|last == 'Todo' %}https://plane-marketing.s3.ap-south-1.amazonaws.com/plane-assets/emails/todo.png{% elif update.changes.state.new_value|last == 'Done' %}https://plane-marketing.s3.ap-south-1.amazonaws.com/plane-assets/emails/done.png{% elif update.changes.state.new_value|last == 'Cancelled' %}https://plane-marketing.s3.ap-south-1.amazonaws.com/plane-assets/emails/cancelled.png{% endif %}"
+                                 src="{% if update.changes.state.new_value|last == 'Backlog' %}https://plane-marketing.s3.ap-south-1.amazonaws.com/plane-assets/emails/backlog.webp{% elif update.changes.state.new_value|last == 'In Progress' %}https://plane-marketing.s3.ap-south-1.amazonaws.com/plane-assets/emails/in-progress.webp{% elif update.changes.state.new_value|last == 'Todo' %}https://plane-marketing.s3.ap-south-1.amazonaws.com/plane-assets/emails/todo.webp{% elif update.changes.state.new_value|last == 'Done' %}https://plane-marketing.s3.ap-south-1.amazonaws.com/plane-assets/emails/done.webp{% elif update.changes.state.new_value|last == 'Cancelled' %}https://plane-marketing.s3.ap-south-1.amazonaws.com/plane-assets/emails/cancelled.webp{% endif %}"
                                  width="12"
                                  height="12"
                                  border="0"
                                  style="display: block;"
                                  />
                            </td>
-                           {% endif %}
                            <td>
                               <p
                                  style="
@@ -711,7 +699,7 @@
                         <tr>
                            <td valign="top">
                               <img
-                                 src="https://plane-marketing.s3.ap-south-1.amazonaws.com/plane-assets/emails/link.png"
+                                 src="https://plane-marketing.s3.ap-south-1.amazonaws.com/plane-assets/emails/link.webp"
                                  width="12"
                                  height="12"
                                  border="0"
@@ -772,7 +760,7 @@
                         <tr>
                            <td>
                               <img
-                                 src="https://plane-marketing.s3.ap-south-1.amazonaws.com/plane-assets/emails/priority.png"
+                                 src="https://plane-marketing.s3.ap-south-1.amazonaws.com/plane-assets/emails/priority.webp"
                                  width="12"
                                  height="12"
                                  border="0"
@@ -812,7 +800,7 @@
                            </td>
                            <td style="padding-left: 10px; padding-right: 10px;">
                               <img
-                                 src="https://plane-marketing.s3.ap-south-1.amazonaws.com/plane-assets/emails/forward-arrow.png"
+                                 src="https://plane-marketing.s3.ap-south-1.amazonaws.com/plane-assets/emails/forward-arrow.webp"
                                  width="16"
                                  height="16"
                                  border="0"
@@ -850,7 +838,7 @@
                         <tr style="overflow-wrap: break-word;">
                            <td> 
                               <img
-                                 src="https://plane-marketing.s3.ap-south-1.amazonaws.com/plane-assets/emails/blocking.png"
+                                 src="https://plane-marketing.s3.ap-south-1.amazonaws.com/plane-assets/emails/blocking.webp"
                                  width="12"
                                  height="12"
                                  border="0"

deploy/1-click/README.md

@@ -1,82 +0,0 @@
-# 1-Click Self-Hosting
-
-In this guide, we will walk you through the process of setting up a 1-click self-hosted environment. Self-hosting allows you to have full control over your applications and data. It's a great way to ensure privacy, control, and customization.
-
-Let's get started!
-
-## Installing Plane
-
-Installing Plane is a very easy and minimal step process.
-
-### Prerequisite
-
-- Operating System (latest): Debian / Ubuntu / Centos
-- Supported CPU Architechture: AMD64 / ARM64 / x86_64 / aarch64
-
-### Downloading Latest Stable Release
-
-```
-curl -fsSL https://raw.githubusercontent.com/makeplane/plane/master/deploy/1-click/install.sh | sh -
-
-```
-
-<details>
-    <summary>Downloading Preview Release</summary>
-
-```
-export BRANCH=preview
-
-curl -fsSL https://raw.githubusercontent.com/makeplane/plane/preview/deploy/1-click/install.sh | sh -
-
-```
-
-NOTE: `Preview` builds do not support ARM64/AARCH64 CPU architecture
-
-</details>
-
---
-
-Expect this after a successful install
-
-![Install Output](images/install.png)
-
-Access the application on a browser via http://server-ip-address
-
----
-
-### Get Control of your Plane Server Setup
-
-Plane App is available via the command `plane-app`. Running the command `plane-app --help` helps you to manage Plane
-
-![Plane Help](images/help.png)
-
-<ins>Basic Operations</ins>:
-
-1. Start Server using `plane-app start`
-1. Stop Server using `plane-app stop`
-1. Restart Server using `plane-app restart`
-
-<ins>Advanced Operations</ins>:
-
-1. Configure Plane using `plane-app --configure`. This will give you options to modify
-
-   - NGINX Port (default 80)
-   - Domain Name (default is the local server public IP address)
-   - File Upload Size (default 5MB)
-   - External Postgres DB Url (optional - default empty)
-   - External Redis URL (optional - default empty)
-   - AWS S3 Bucket (optional - to be configured only in case the user wants to use an S3 Bucket)
-
-1. Upgrade Plane using `plane-app --upgrade`. This will get the latest stable version of Plane files (docker-compose.yaml, .env, and docker images)
-
-1. Updating Plane App installer using `plane-app --update-installer` will update the `plane-app` utility.
-
-1. Uninstall Plane using `plane-app --uninstall`. This will uninstall the Plane application from the server and all docker containers but do not remove the data stored in Postgres, Redis, and Minio.
-
-1. Plane App can be reinstalled using `plane-app --install`.
-
-<ins>Application Data is stored in the mentioned folders</ins>:
-
-1. DB Data: /opt/plane/data/postgres
-1. Redis Data: /opt/plane/data/redis
-1. Minio Data: /opt/plane/data/minio

deploy/1-click/install.sh

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

deploy/1-click/plane-app

@@ -17,7 +17,7 @@ Project management tool from the future
 
 EOF
 }
-function update_env_file() {
+function update_env_files() {
     config_file=$1
     key=$2
     value=$3
@@ -25,16 +25,14 @@ function update_env_file() {
     # Check if the config file exists
     if [ ! -f "$config_file" ]; then
         echo "Config file not found. Creating a new one..." >&2
-        sudo touch "$config_file"
+        touch "$config_file"
     fi
 
     # Check if the key already exists in the config file
-    if sudo grep "^$key=" "$config_file"; then
-        sudo awk -v key="$key" -v value="$value" -F '=' '{if ($1 == key) $2 = value} 1' OFS='=' "$config_file" | sudo tee "$config_file.tmp" > /dev/null
-        sudo mv "$config_file.tmp" "$config_file" &> /dev/null
+    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
-        # sudo echo "$key=$value" >> "$config_file"
-        echo -e "$key=$value" | sudo tee -a "$config_file" > /dev/null
+        echo "$key=$value" >> "$config_file"
     fi
 }
 function read_env_file() {
@@ -44,12 +42,12 @@ function read_env_file() {
     # Check if the config file exists
     if [ ! -f "$config_file" ]; then
         echo "Config file not found. Creating a new one..." >&2
-        sudo touch "$config_file"
+        touch "$config_file"
     fi
 
     # Check if the key already exists in the config file
-    if sudo grep -q "^$key=" "$config_file"; then
-        value=$(sudo awk -v key="$key" -F '=' '{if ($1 == key) print $2}' "$config_file")
+    if grep -q "^$key=" "$config_file"; then
+        value=$(awk -v key="$key" -F '=' '{if ($1 == key) print $2}' "$config_file")
         echo "$value"
     else
         echo ""
@@ -57,19 +55,19 @@ function read_env_file() {
 }
 function update_config() {
     config_file="$PLANE_INSTALL_DIR/config.env"
-    update_env_file $config_file $1 $2
+    update_env_files "$config_file" "$1" "$2"
 }
 function read_config() {
     config_file="$PLANE_INSTALL_DIR/config.env"
-    read_env_file $config_file $1
+    read_env_file "$config_file" "$1"
 }
 function update_env() {
     config_file="$PLANE_INSTALL_DIR/.env"
-    update_env_file $config_file $1 $2
+    update_env_files "$config_file" "$1" "$2"
 }
 function read_env() {
     config_file="$PLANE_INSTALL_DIR/.env"
-    read_env_file $config_file $1
+    read_env_file "$config_file" "$1"
 }
 function show_message() {
     print_header
@@ -89,14 +87,14 @@ function prepare_environment() {
     show_message "Prepare Environment..." >&2
 
     show_message "- Updating OS with required tools ✋"  >&2
-    sudo "$PACKAGE_MANAGER" update -y
-    # sudo "$PACKAGE_MANAGER" upgrade -y
+    sudo apt-get update -y &> /dev/null
+    sudo apt-get upgrade -y &> /dev/null
 
-    local required_tools=("curl" "awk" "wget" "nano" "dialog" "git" "uidmap" "jq")
+    required_tools=("curl" "awk" "wget" "nano" "dialog" "git")
 
     for tool in "${required_tools[@]}"; do
         if ! command -v $tool &> /dev/null; then
-            sudo "$PACKAGE_MANAGER" install -y $tool
+            sudo apt install -y $tool &> /dev/null
         fi
     done
 
@@ -105,30 +103,11 @@ function prepare_environment() {
     # Install Docker if not installed
     if ! command -v docker &> /dev/null; then
         show_message "- Installing Docker ✋"  >&2
-        # curl -o- https://get.docker.com | bash - 
+        sudo curl -o- https://get.docker.com | bash - 
 
-        if [ "$PACKAGE_MANAGER" == "yum" ]; then
-            sudo $PACKAGE_MANAGER install -y yum-utils
-            sudo yum-config-manager --add-repo https://download.docker.com/linux/centos/docker-ce.repo &> /dev/null
-        elif [ "$PACKAGE_MANAGER" == "apt-get" ]; then
-            # Add Docker's official GPG key:
-            sudo $PACKAGE_MANAGER update 
-            sudo $PACKAGE_MANAGER install ca-certificates curl &> /dev/null
-            sudo install -m 0755 -d /etc/apt/keyrings &> /dev/null
-            sudo curl -fsSL https://download.docker.com/linux/ubuntu/gpg -o /etc/apt/keyrings/docker.asc &> /dev/null
-            sudo chmod a+r /etc/apt/keyrings/docker.asc &> /dev/null
-
-            # Add the repository to Apt sources:
-            echo \
-                "deb [arch=$(dpkg --print-architecture) signed-by=/etc/apt/keyrings/docker.asc] https://download.docker.com/linux/ubuntu \
-                $(. /etc/os-release && echo "$VERSION_CODENAME") stable" | \
-                sudo tee /etc/apt/sources.list.d/docker.list > /dev/null
-            
-            sudo $PACKAGE_MANAGER update
+        if [ "$EUID" -ne 0 ]; then
+            dockerd-rootless-setuptool.sh install &> /dev/null
         fi
-
-        sudo $PACKAGE_MANAGER install docker-ce docker-ce-cli containerd.io docker-buildx-plugin docker-compose-plugin -y
-
         show_message "- Docker Installed ✅" "replace_last_line"  >&2
     else
         show_message "- Docker is already installed ✅"  >&2
@@ -148,17 +127,17 @@ function prepare_environment() {
 function download_plane() {
     # Download Docker Compose File from github url 
     show_message "Downloading Plane Setup Files ✋"  >&2
-    sudo curl -H 'Cache-Control: no-cache, no-store' \
+    curl -H 'Cache-Control: no-cache, no-store' \
         -s -o $PLANE_INSTALL_DIR/docker-compose.yaml  \
-        https://raw.githubusercontent.com/$CODE_REPO/$DEPLOY_BRANCH/deploy/selfhost/docker-compose.yml?token=$(date +%s) 
+        https://raw.githubusercontent.com/makeplane/plane/$BRANCH/deploy/selfhost/docker-compose.yml?$(date +%s) 
 
-    sudo curl -H 'Cache-Control: no-cache, no-store' \
+    curl -H 'Cache-Control: no-cache, no-store' \
         -s -o $PLANE_INSTALL_DIR/variables-upgrade.env \
-        https://raw.githubusercontent.com/$CODE_REPO/$DEPLOY_BRANCH/deploy/selfhost/variables.env?token=$(date +%s) 
+        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
-        sudo mv $PLANE_INSTALL_DIR/variables-upgrade.env $PLANE_INSTALL_DIR/.env
+        mv $PLANE_INSTALL_DIR/variables-upgrade.env $PLANE_INSTALL_DIR/.env
     fi
 
     show_message "Plane Setup Files Downloaded ✅" "replace_last_line"  >&2
@@ -202,12 +181,12 @@ function printUsageInstructions() {
 }
 function build_local_image() {
     show_message "- Downloading Plane Source Code ✋" >&2
-    REPO=https://github.com/$CODE_REPO.git
+    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 $DEPLOY_BRANCH --single-branch -q > /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
 
@@ -220,26 +199,25 @@ 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 [ "$DEPLOY_BRANCH" == "master" ]; then
+    if [ "$BRANCH" == "master" ]; then
         update_env "APP_RELEASE" "latest"
         export APP_RELEASE=latest
     else
-        update_env "APP_RELEASE" "$DEPLOY_BRANCH"
-        export APP_RELEASE=$DEPLOY_BRANCH    
+        update_env "APP_RELEASE" "$BRANCH"
+        export APP_RELEASE=$BRANCH    
     fi
 
-    if [ $USE_GLOBAL_IMAGES == 1 ]; then
+    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
-        export DOCKERHUB_USER=makeplane
-        update_env "DOCKERHUB_USER" "$DOCKERHUB_USER"
-        update_env "PULL_POLICY" "always"
         echo "Building Plane Images for $CPU_ARCH is not required. Skipping..."
     else
         export DOCKERHUB_USER=myplane
         show_message "Building Plane Images for $CPU_ARCH " >&2
-        update_env "DOCKERHUB_USER" "$DOCKERHUB_USER"
+        update_env "DOCKERHUB_USER" "myplane"
         update_env "PULL_POLICY" "never"
 
         build_local_image
@@ -255,7 +233,7 @@ function check_for_docker_images() {
     sudo sed -i "s|- uploads:|- $DATA_DIR/minio:|g" $PLANE_INSTALL_DIR/docker-compose.yaml
 
     show_message "Downloading Plane Images for $CPU_ARCH ✋" >&2
-    sudo docker compose -f $PLANE_INSTALL_DIR/docker-compose.yaml --env-file=$PLANE_INSTALL_DIR/.env pull
+    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() {
@@ -290,40 +268,40 @@ function configure_plane() {
     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_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)
+    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
+    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 ?" \
@@ -383,6 +361,15 @@ function configure_plane() {
             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
@@ -404,15 +391,15 @@ function configure_plane() {
         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
+        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
@@ -466,11 +453,9 @@ function install() {
     show_message ""
     if [ "$(uname)" == "Linux" ]; then
         OS="linux"
-        OS_NAME=$(sudo awk -F= '/^ID=/{print $2}' /etc/os-release)
-        OS_NAME=$(echo "$OS_NAME" | tr -d '"')
-        print_header
-        if [ "$OS_NAME" == "ubuntu" ] || [ "$OS_NAME" == "debian" ] || 
-                [ "$OS_NAME" == "centos" ] || [ "$OS_NAME" == "amazon" ]; then
+        OS_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 ""
@@ -484,24 +469,13 @@ function install() {
                     check_for_docker_images
 
                     last_installed_on=$(read_config "INSTALLATION_DATE")
-                    # if [ "$last_installed_on" == "" ]; then
-                    #     configure_plane
-                    # fi
-                    
-                    update_env "NGINX_PORT" "80"
-                    update_env "DOMAIN_NAME" "$MY_IP"
-                    update_env "WEB_URL" "http://$MY_IP"
-                    update_env "CORS_ALLOWED_ORIGINS" "http://$MY_IP"
-
-                    update_config "INSTALLATION_DATE" "$(date '+%Y-%m-%d')"
-                    
-                    if command -v crontab &> /dev/null; then
-                        sudo touch /etc/cron.daily/makeplane
-                        sudo chmod +x /etc/cron.daily/makeplane
-                        sudo echo "0 2 * * * root /usr/local/bin/plane-app --upgrade" > /etc/cron.daily/makeplane
-                        sudo crontab /etc/cron.daily/makeplane 
+                    if [ "$last_installed_on" == "" ]; then
+                        configure_plane
                     fi
+                    printUsageInstructions
 
+                    update_config "INSTALLATION_DATE" "$(date)"
+                    
                     show_message "Plane Installed Successfully ✅"
                     show_message ""
                 else
@@ -514,8 +488,7 @@ function install() {
             fi
             
         else
-            OS_SUPPORTED=false
-            PROGRESS_MSG="❌❌ Unsupported OS Varient Detected : $OS_NAME ❌❌"
+            PROGRESS_MSG="❌❌❌ Unsupported OS Detected ❌❌❌"
             show_message ""
             exit 1
         fi
@@ -526,30 +499,22 @@ function install() {
     fi
 }
 function upgrade() {
-    print_header
     if [ "$(uname)" == "Linux" ]; then
         OS="linux"
-        OS_NAME=$(sudo awk -F= '/^ID=/{print $2}' /etc/os-release)
-        OS_NAME=$(echo "$OS_NAME" | tr -d '"')
-        if [ "$OS_NAME" == "ubuntu" ] || [ "$OS_NAME" == "debian" ] || 
-                [ "$OS_NAME" == "centos" ] || [ "$OS_NAME" == "amazon" ]; then
-
+        OS_NAME=$(awk -F= '/^ID=/{print $2}' /etc/os-release)
+        # check the OS 
+        if [ "$OS_NAME" == "ubuntu" ]; then
             OS_SUPPORTED=true
-            show_message "******** Upgrading Plane ********"
-            show_message ""
 
             prepare_environment
 
             if [ $? -eq 0 ]; then
-                stop_server
                 download_plane
                 if [ $? -eq 0 ]; then
                     check_for_docker_images
                     upgrade_configuration
                     update_config "UPGRADE_DATE" "$(date)"
-
-                    start_server
-
+                
                     show_message ""
                     show_message "Plane Upgraded Successfully ✅"
                     show_message ""
@@ -563,54 +528,53 @@ function upgrade() {
                 exit 1
             fi
         else
-            PROGRESS_MSG="❌❌ Unsupported OS Varient Detected : $OS_NAME ❌❌"
+            PROGRESS_MSG="Unsupported OS Detected"
             show_message ""
             exit 1
         fi
     else
-        PROGRESS_MSG="❌❌❌ Unsupported OS Detected : $(uname) ❌❌❌"
+        PROGRESS_MSG="Unsupported OS Detected : $(uname)"
         show_message ""
         exit 1
     fi
 }
 function uninstall() {
-    print_header
     if [ "$(uname)" == "Linux" ]; then
         OS="linux"
         OS_NAME=$(awk -F= '/^ID=/{print $2}' /etc/os-release)
-        OS_NAME=$(echo "$OS_NAME" | tr -d '"')
-        if [ "$OS_NAME" == "ubuntu" ] || [ "$OS_NAME" == "debian" ] || 
-                [ "$OS_NAME" == "centos" ] || [ "$OS_NAME" == "amazon" ]; then
-
+        # 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" --defaultno --yesno "Are you sure you want to uninstall docker ?" 8 60 3>&1 1>&2 2>&3)
+                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 docker images -q | xargs -r sudo docker rmi -f &> /dev/null
-                    sudo "$PACKAGE_MANAGER" remove -y docker-engine docker docker.io docker-ce docker-ce-cli docker-compose-plugin &> /dev/null
-                    sudo "$PACKAGE_MANAGER" autoremove -y docker-engine docker docker.io docker-ce docker-compose-plugin &> /dev/null
+                    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
 
-            sudo rm $PLANE_INSTALL_DIR/.env &> /dev/null
-            sudo rm $PLANE_INSTALL_DIR/variables-upgrade.env &> /dev/null
-            sudo rm $PLANE_INSTALL_DIR/config.env &> /dev/null
-            sudo rm $PLANE_INSTALL_DIR/docker-compose.yaml &> /dev/null
-
-            if command -v crontab &> /dev/null; then
-                sudo crontab -r &> /dev/null
-                sudo rm /etc/cron.daily/makeplane &> /dev/null
-            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 ✅"
@@ -629,12 +593,12 @@ function uninstall() {
             show_message ""
             show_message ""
         else
-            PROGRESS_MSG="❌❌ Unsupported OS Varient Detected : $OS_NAME ❌❌"
+            PROGRESS_MSG="Unsupported OS Detected : $(uname) ❌"
             show_message ""
             exit 1
         fi
     else
-        PROGRESS_MSG="❌❌❌ Unsupported OS Detected : $(uname) ❌❌❌"
+        PROGRESS_MSG="Unsupported OS Detected : $(uname) ❌"
         show_message ""
         exit 1
     fi
@@ -644,47 +608,15 @@ function start_server() {
     env_file="$PLANE_INSTALL_DIR/.env"
     # check if both the files exits 
     if [ -f "$docker_compose_file" ] && [ -f "$env_file" ]; then
-        show_message "Starting Plane Server ($APP_RELEASE) ✋"
-        sudo docker compose -f $docker_compose_file --env-file=$env_file up -d
+        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 ! sudo docker compose -f "$docker_compose_file" --env-file="$env_file" ps --services --filter "status=running" --quiet | grep -q "."; do
+        while ! docker compose -f "$docker_compose_file" --env-file="$env_file" ps --services --filter "status=running" --quiet | grep -q "."; do
             sleep 1
         done
-        # wait for migrator container to exit with status 0 before starting the application
-        migrator_container_id=$(sudo docker container ls -aq -f "name=plane-migrator")
-
-        # if migrator container is running, wait for it to exit
-        if [ -n "$migrator_container_id" ]; then
-            while sudo docker inspect --format='{{.State.Status}}' $migrator_container_id | grep -q "running"; do
-                show_message "Waiting for Plane Server ($APP_RELEASE) to start...✋ (Migrator in progress)" "replace_last_line" >&2
-                sleep 1
-            done
-        fi
-
-        # if migrator exit status is not 0, show error message and exit
-        if [ -n "$migrator_container_id" ]; then
-            migrator_exit_code=$(sudo docker inspect --format='{{.State.ExitCode}}' $migrator_container_id)
-            if [ $migrator_exit_code -ne 0 ]; then
-                # show_message "Migrator failed with exit code $migrator_exit_code ❌" "replace_last_line" >&2
-                show_message "Plane Server failed to start ❌" "replace_last_line" >&2
-                stop_server
-                exit 1
-            fi
-        fi
-
-        api_container_id=$(sudo docker container ls -q -f "name=plane-api")
-        while ! sudo docker logs $api_container_id 2>&1 | grep -i "Application startup complete";
-        do
-            show_message "Waiting for Plane Server ($APP_RELEASE) to start...✋ (API starting)" "replace_last_line" >&2
-            sleep 1
-        done
-        show_message "Plane Server Started ($APP_RELEASE) ✅" "replace_last_line" >&2
-        show_message "---------------------------------------------------------------" >&2
-        show_message "Access the Plane application at http://$MY_IP" >&2
-        show_message "---------------------------------------------------------------" >&2
-
+        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
@@ -694,11 +626,11 @@ function stop_server() {
     env_file="$PLANE_INSTALL_DIR/.env"
     # check if both the files exits 
     if [ -f "$docker_compose_file" ] && [ -f "$env_file" ]; then
-        show_message "Stopping Plane Server ($APP_RELEASE) ✋"
-        sudo docker compose -f $docker_compose_file --env-file=$env_file down
-        show_message "Plane Server Stopped ($APP_RELEASE) ✅" "replace_last_line" >&2
+        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 [Skipping] ✅" "replace_last_line" >&2
+        show_message "Plane Server not installed. Please install Plane first ❌" "replace_last_line" >&2
     fi
 }
 function restart_server() {
@@ -706,9 +638,9 @@ function restart_server() {
     env_file="$PLANE_INSTALL_DIR/.env"
     # check if both the files exits 
     if [ -f "$docker_compose_file" ] && [ -f "$env_file" ]; then
-        show_message "Restarting Plane Server ($APP_RELEASE) ✋"
-        sudo docker compose -f $docker_compose_file --env-file=$env_file restart
-        show_message "Plane Server Restarted ($APP_RELEASE) ✅" "replace_last_line" >&2
+        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
@@ -734,47 +666,28 @@ function show_help() {
 }
 function update_installer() {
     show_message "Updating Plane Installer ✋" >&2
-    sudo curl -H 'Cache-Control: no-cache, no-store' \
+    curl -H 'Cache-Control: no-cache, no-store' \
         -s -o /usr/local/bin/plane-app  \
-        https://raw.githubusercontent.com/$CODE_REPO/$DEPLOY_BRANCH/deploy/1-click/plane-app?token=$(date +%s) 
+        https://raw.githubusercontent.com/makeplane/plane/$BRANCH/deploy/1-click/install.sh?token=$(date +%s) 
 
-    sudo chmod +x /usr/local/bin/plane-app > /dev/null&> /dev/null
+    chmod +x /usr/local/bin/plane-app > /dev/null&> /dev/null
     show_message "Plane Installer Updated ✅" "replace_last_line" >&2
 }
 
-export DEPLOY_BRANCH=${BRANCH:-master}
-export APP_RELEASE=$DEPLOY_BRANCH
+export BRANCH=${BRANCH:-master}
+export APP_RELEASE=$BRANCH
 export DOCKERHUB_USER=makeplane
 export PULL_POLICY=always
 
-if [ "$DEPLOY_BRANCH" == "master" ]; then
-    export APP_RELEASE=latest
-fi
-
 PLANE_INSTALL_DIR=/opt/plane
 DATA_DIR=$PLANE_INSTALL_DIR/data
-LOG_DIR=$PLANE_INSTALL_DIR/logs
-CODE_REPO=${GIT_REPO:-makeplane/plane}
+LOG_DIR=$PLANE_INSTALL_DIR/log
 OS_SUPPORTED=false
 CPU_ARCH=$(uname -m)
 PROGRESS_MSG=""
-USE_GLOBAL_IMAGES=0
-PACKAGE_MANAGER=""
-MY_IP=$(curl -s ifconfig.me)
+USE_GLOBAL_IMAGES=1
 
-if [[ $CPU_ARCH == "amd64" || $CPU_ARCH == "x86_64" || ( $DEPLOY_BRANCH == "master" && ( $CPU_ARCH == "arm64" || $CPU_ARCH == "aarch64" ) ) ]]; then
-    USE_GLOBAL_IMAGES=1
-fi
-
-sudo mkdir -p $PLANE_INSTALL_DIR/{data,log}
-
-if command -v apt-get &> /dev/null; then
-    PACKAGE_MANAGER="apt-get"
-elif command -v yum &> /dev/null; then
-    PACKAGE_MANAGER="yum"
-elif command -v apk &> /dev/null; then
-    PACKAGE_MANAGER="apk"
-fi
+mkdir -p $PLANE_INSTALL_DIR/{data,log}
 
 if [ "$1" == "start" ]; then
     start_server
@@ -784,9 +697,6 @@ elif [ "$1" == "restart" ]; then
     restart_server
 elif [ "$1" == "--install" ] || [ "$1" == "-i" ]; then
     install
-    start_server
-    show_message "" >&2
-    show_message "To view help, use plane-app --help " >&2
 elif [ "$1" == "--configure" ] || [ "$1" == "-c" ]; then
     configure_plane
     printUsageInstructions
@@ -794,7 +704,7 @@ elif [ "$1" == "--upgrade" ] || [ "$1" == "-up" ]; then
     upgrade
 elif [ "$1" == "--uninstall" ] || [ "$1" == "-un" ]; then
     uninstall
-elif [ "$1" == "--update-installer" ] || [ "$1" == "-ui" ]; then
+elif [ "$1" == "--update-installer" ] || [ "$1" == "-ui" ] ; then
     update_installer
 elif [ "$1" == "--help" ] || [ "$1" == "-h" ]; then
     show_help

deploy/selfhost/docker-compose.yml

@@ -38,6 +38,10 @@ x-app-env : &app-env
     - EMAIL_USE_SSL=${EMAIL_USE_SSL:-0}
     - DEFAULT_EMAIL=${DEFAULT_EMAIL:-captain@plane.so}
     - DEFAULT_PASSWORD=${DEFAULT_PASSWORD:-password123}
+    # OPENAI SETTINGS - Deprecated can be configured through admin panel
+    - OPENAI_API_BASE=${OPENAI_API_BASE:-https://api.openai.com/v1}
+    - OPENAI_API_KEY=${OPENAI_API_KEY:-""}
+    - GPT_ENGINE=${GPT_ENGINE:-"gpt-3.5-turbo"}
     # LOGIN/SIGNUP SETTINGS - Deprecated can be configured through admin panel
     - ENABLE_SIGNUP=${ENABLE_SIGNUP:-1}
     - ENABLE_EMAIL_PASSWORD=${ENABLE_EMAIL_PASSWORD:-1}
@@ -56,6 +60,8 @@ x-app-env : &app-env
     - BUCKET_NAME=${BUCKET_NAME:-uploads}
     - FILE_SIZE_LIMIT=${FILE_SIZE_LIMIT:-5242880}
 
+
+
 services:
   web:
     <<: *app-env
@@ -136,6 +142,7 @@ services:
     command: postgres -c 'max_connections=1000'
     volumes:
       - pgdata:/var/lib/postgresql/data
+    
   plane-redis:
     <<: *app-env
     image: redis:6.2.7-alpine

deploy/selfhost/install.sh

@@ -13,23 +13,6 @@ YELLOW='\033[1;33m'
 GREEN='\033[0;32m'
 NC='\033[0m' # No Color
 
-function print_header() {
-clear
-
-cat <<"EOF"
----------------------------------------
- ____  _                  
-|  _ \| | __ _ _ __   ___ 
-| |_) | |/ _` | '_ \ / _ \
-|  __/| | (_| | | | |  __/
-|_|   |_|\__,_|_| |_|\___|    
-
----------------------------------------
-Project management tool from the future
----------------------------------------
-EOF
-}
-
 function buildLocalImage() {
     if [ "$1" == "--force-build" ]; then
         DO_BUILD="1"
@@ -37,8 +20,8 @@ function buildLocalImage() {
         DO_BUILD="2"
     else 
         printf "\n" >&2
-        printf "${YELLOW}You are on ${CPU_ARCH} cpu architecture. ${NC}\n" >&2
-        printf "${YELLOW}Since the prebuilt ${CPU_ARCH} compatible docker images are not available for, we will be running the docker build on this system. ${NC} \n" >&2
+        printf "${YELLOW}You are on ${ARCH} cpu architecture. ${NC}\n" >&2
+        printf "${YELLOW}Since the prebuilt ${ARCH} compatible docker images are not available for, we will be running the docker build on this system. ${NC} \n" >&2
         printf "${YELLOW}This might take ${YELLOW}5-30 min based on your system's hardware configuration. \n ${NC} \n" >&2
         printf "\n" >&2
         printf "${GREEN}Select an option to proceed: ${NC}\n" >&2
@@ -127,7 +110,7 @@ function download() {
             exit 0
         fi
     else
-        docker compose -f $DOCKER_FILE_PATH --env-file=$DOCKER_ENV_PATH pull
+        docker compose -f $PLANE_INSTALL_DIR/docker-compose.yaml pull
     fi
     
     echo ""
@@ -138,48 +121,19 @@ function download() {
 
 }
 function startServices() {
-    docker compose -f $DOCKER_FILE_PATH --env-file=$DOCKER_ENV_PATH up -d --quiet-pull
-
-    local migrator_container_id=$(docker container ls -aq -f "name=plane-app-migrator")
-    if [ -n "$migrator_container_id" ]; then
-        local idx=0
-        while docker inspect --format='{{.State.Status}}' $migrator_container_id | grep -q "running"; do
-            local message=">>> Waiting for Data Migration to finish"
-            local dots=$(printf '%*s' $idx | tr ' ' '.')
-            echo -ne "\r$message$dots"
-            ((idx++))
-            sleep 1
-        done
-    fi
-    printf "\r\033[K"
-
-    # if migrator exit status is not 0, show error message and exit
-    if [ -n "$migrator_container_id" ]; then
-        local migrator_exit_code=$(docker inspect --format='{{.State.ExitCode}}' $migrator_container_id)
-        if [ $migrator_exit_code -ne 0 ]; then
-            echo "Plane Server failed to start ❌"
-            stopServices
-            exit 1
-        fi
-    fi
-
-    local api_container_id=$(docker container ls -q -f "name=plane-app-api")
-    local idx2=0
-    while ! docker logs $api_container_id 2>&1 | grep -m 1 -i "Application startup complete" | grep -q ".";
-    do
-        local message=">>> Waiting for API Service to Start"
-        local dots=$(printf '%*s' $idx2 | tr ' ' '.')    
-        echo -ne "\r$message$dots"
-        ((idx2++))
-        sleep 1
-    done
-    printf "\r\033[K"
+    cd $PLANE_INSTALL_DIR
+    docker compose up -d --quiet-pull
+    cd $SCRIPT_DIR
 }
 function stopServices() {
-    docker compose -f $DOCKER_FILE_PATH --env-file=$DOCKER_ENV_PATH down
+    cd $PLANE_INSTALL_DIR
+    docker compose down
+    cd $SCRIPT_DIR
 }
 function restartServices() {
-    docker compose -f $DOCKER_FILE_PATH --env-file=$DOCKER_ENV_PATH restart
+    cd $PLANE_INSTALL_DIR
+    docker compose restart
+    cd $SCRIPT_DIR
 }
 function upgrade() {
     echo "***** STOPPING SERVICES ****"
@@ -190,137 +144,47 @@ function upgrade() {
     download
 
     echo "***** PLEASE VALIDATE AND START SERVICES ****"
-}
-function viewSpecificLogs(){
-    local SERVICE_NAME=$1
 
-    if docker-compose -f $DOCKER_FILE_PATH ps | grep -q "$SERVICE_NAME"; then
-        echo "Service '$SERVICE_NAME' is running."
-    else
-        echo "Service '$SERVICE_NAME' is not running."
-    fi
-
-    docker compose -f $DOCKER_FILE_PATH logs -f $SERVICE_NAME
-}
-function viewLogs(){
-    
-    ARG_SERVICE_NAME=$2
-
-    if [ -z "$ARG_SERVICE_NAME" ];
-    then
-        echo
-        echo "Select a Service you want to view the logs for:"
-        echo "   1) Web"
-        echo "   2) Space"
-        echo "   3) API"
-        echo "   4) Worker"
-        echo "   5) Beat-Worker"
-        echo "   6) Migrator"
-        echo "   7) Proxy"
-        echo "   8) Redis"
-        echo "   9) Postgres"
-        echo "   10) Minio"
-        echo "   0) Back to Main Menu"
-        echo 
-        read -p "Service: " DOCKER_SERVICE_NAME
-
-        until (( DOCKER_SERVICE_NAME >= 0 && DOCKER_SERVICE_NAME <= 10 )); do
-            echo "Invalid selection. Please enter a number between 1 and 11."
-            read -p "Service: " DOCKER_SERVICE_NAME
-        done
-
-        if [ -z "$DOCKER_SERVICE_NAME" ];
-        then
-            echo "INVALID SERVICE NAME SUPPLIED"
-        else
-            case $DOCKER_SERVICE_NAME in
-                1) viewSpecificLogs "web";;
-                2) viewSpecificLogs "space";;
-                3) viewSpecificLogs "api";;
-                4) viewSpecificLogs "worker";;
-                5) viewSpecificLogs "beat-worker";;
-                6) viewSpecificLogs "migrator";;
-                7) viewSpecificLogs "proxy";;
-                8) viewSpecificLogs "plane-redis";;
-                9) viewSpecificLogs "plane-db";;
-                10) viewSpecificLogs "plane-minio";;
-                0) askForAction;;
-                *) echo "INVALID SERVICE NAME SUPPLIED";;
-            esac
-        fi
-    elif [ -n "$ARG_SERVICE_NAME" ];
-    then
-        ARG_SERVICE_NAME=$(echo "$ARG_SERVICE_NAME" | tr '[:upper:]' '[:lower:]')
-        case $ARG_SERVICE_NAME in
-            web) viewSpecificLogs "web";;
-            space) viewSpecificLogs "space";;
-            api) viewSpecificLogs "api";;
-            worker) viewSpecificLogs "worker";;
-            beat-worker) viewSpecificLogs "beat-worker";;
-            migrator) viewSpecificLogs "migrator";;
-            proxy) viewSpecificLogs "proxy";;
-            redis) viewSpecificLogs "plane-redis";;
-            postgres) viewSpecificLogs "plane-db";;
-            minio) viewSpecificLogs "plane-minio";;
-            *) echo "INVALID SERVICE NAME SUPPLIED";;
-        esac
-    else
-        echo "INVALID SERVICE NAME SUPPLIED"
-    fi
 }
 function askForAction() {
-    local DEFAULT_ACTION=$1
-
-    if [ -z "$DEFAULT_ACTION" ];
-    then
-        echo
-        echo "Select a Action you want to perform:"
-        echo "   1) Install (${CPU_ARCH})"
-        echo "   2) Start"
-        echo "   3) Stop"
-        echo "   4) Restart"
-        echo "   5) Upgrade"
-        echo "   6) View Logs"
-        echo "   7) Exit"
-        echo 
+    echo
+    echo "Select a Action you want to perform:"
+    echo "   1) Install (${ARCH})"
+    echo "   2) Start"
+    echo "   3) Stop"
+    echo "   4) Restart"
+    echo "   5) Upgrade"
+    echo "   6) Exit"
+    echo 
+    read -p "Action [2]: " ACTION
+    until [[ -z "$ACTION" || "$ACTION" =~ ^[1-6]$ ]]; do
+        echo "$ACTION: invalid selection."
         read -p "Action [2]: " ACTION
-        until [[ -z "$ACTION" || "$ACTION" =~ ^[1-7]$ ]]; do
-            echo "$ACTION: invalid selection."
-            read -p "Action [2]: " ACTION
-        done
+    done
+    echo
 
-        if [ -z "$ACTION" ];
-        then
-            ACTION=2
-        fi
-        echo
-    fi
 
-    if [ "$ACTION" == "1" ] || [ "$DEFAULT_ACTION" == "install" ]
+    if [ "$ACTION" == "1" ]
     then
         install
         askForAction
-    elif [ "$ACTION" == "2" ] || [ "$DEFAULT_ACTION" == "start" ]
+    elif [ "$ACTION" == "2" ] || [ "$ACTION" == "" ]
     then
         startServices
         askForAction
-    elif [ "$ACTION" == "3" ] || [ "$DEFAULT_ACTION" == "stop" ]
+    elif [ "$ACTION" == "3" ] 
     then
         stopServices
         askForAction
-    elif [ "$ACTION" == "4" ] || [ "$DEFAULT_ACTION" == "restart" ]
+    elif [ "$ACTION" == "4" ] 
     then
         restartServices
         askForAction
-    elif [ "$ACTION" == "5" ]  || [ "$DEFAULT_ACTION" == "upgrade" ]
+    elif [ "$ACTION" == "5" ] 
     then
         upgrade
         askForAction
-    elif [ "$ACTION" == "6" ]  || [ "$DEFAULT_ACTION" == "logs" ]
-    then
-        viewLogs $@
-        askForAction
-    elif [ "$ACTION" == "7" ]
+    elif [ "$ACTION" == "6" ] 
     then
         exit 0
     else
@@ -329,8 +193,8 @@ function askForAction() {
 }
 
 # CPU ARCHITECHTURE BASED SETTINGS
-CPU_ARCH=$(uname -m)
-if [[ $CPU_ARCH == "amd64" || $CPU_ARCH == "x86_64" || ( $BRANCH == "master" && ( $CPU_ARCH == "arm64" || $CPU_ARCH == "aarch64" ) ) ]]; 
+ARCH=$(uname -m)
+if [ $ARCH == "amd64" ] || [ $ARCH == "x86_64" ];
 then
     USE_GLOBAL_IMAGES=1
     DOCKERHUB_USER=makeplane
@@ -353,8 +217,4 @@ then
 fi
 mkdir -p $PLANE_INSTALL_DIR/archive
 
-DOCKER_FILE_PATH=$PLANE_INSTALL_DIR/docker-compose.yaml
-DOCKER_ENV_PATH=$PLANE_INSTALL_DIR/.env
-
-print_header
-askForAction $@
+askForAction

deploy/selfhost/variables.env

@@ -8,13 +8,13 @@ NGINX_PORT=80
 WEB_URL=http://localhost
 DEBUG=0
 NEXT_PUBLIC_DEPLOY_URL=http://localhost/spaces
-SENTRY_DSN=
-SENTRY_ENVIRONMENT=production
-GOOGLE_CLIENT_ID=
-GITHUB_CLIENT_ID=
-GITHUB_CLIENT_SECRET=
+SENTRY_DSN=""
+SENTRY_ENVIRONMENT="production"
+GOOGLE_CLIENT_ID=""
+GITHUB_CLIENT_ID=""
+GITHUB_CLIENT_SECRET=""
 DOCKERIZED=1 # deprecated
-CORS_ALLOWED_ORIGINS=http://localhost
+CORS_ALLOWED_ORIGINS="http://localhost"
 
 #DB SETTINGS
 PGHOST=plane-db
@@ -31,14 +31,19 @@ REDIS_PORT=6379
 REDIS_URL=redis://${REDIS_HOST}:6379/
 
 # EMAIL SETTINGS
-EMAIL_HOST=
-EMAIL_HOST_USER=
-EMAIL_HOST_PASSWORD=
+EMAIL_HOST=""
+EMAIL_HOST_USER=""
+EMAIL_HOST_PASSWORD=""
 EMAIL_PORT=587
-EMAIL_FROM=Team Plane <team@mailer.plane.so>
+EMAIL_FROM="Team Plane <team@mailer.plane.so>"
 EMAIL_USE_TLS=1
 EMAIL_USE_SSL=0
 
+# OPENAI SETTINGS
+OPENAI_API_BASE=https://api.openai.com/v1 # deprecated
+OPENAI_API_KEY="sk-" # deprecated
+GPT_ENGINE="gpt-3.5-turbo" # deprecated
+
 # LOGIN/SIGNUP SETTINGS
 ENABLE_SIGNUP=1
 ENABLE_EMAIL_PASSWORD=1
@@ -47,13 +52,13 @@ SECRET_KEY=60gp0byfz2dvffa45cxl20p1scy9xbpf6d8c5y0geejgkyp1b5
 
 # DATA STORE SETTINGS
 USE_MINIO=1
-AWS_REGION=
-AWS_ACCESS_KEY_ID=access-key
-AWS_SECRET_ACCESS_KEY=secret-key
+AWS_REGION=""
+AWS_ACCESS_KEY_ID="access-key"
+AWS_SECRET_ACCESS_KEY="secret-key"
 AWS_S3_ENDPOINT_URL=http://plane-minio:9000
 AWS_S3_BUCKET_NAME=uploads
-MINIO_ROOT_USER=access-key
-MINIO_ROOT_PASSWORD=secret-key
+MINIO_ROOT_USER="access-key"
+MINIO_ROOT_PASSWORD="secret-key"
 BUCKET_NAME=uploads
 FILE_SIZE_LIMIT=5242880
 

docker-compose-local.yml

@@ -137,7 +137,7 @@ services:
       dockerfile: Dockerfile.dev
       args:
         DOCKER_BUILDKIT: 1
-    restart: "no"
+    restart: no
     networks:
       - dev_env
     volumes:

package.json

@@ -1,6 +1,6 @@
 {
   "repository": "https://github.com/makeplane/plane.git",
-  "version": "0.16.0",
+  "version": "0.15.0",
   "license": "AGPL-3.0",
   "private": true,
   "workspaces": [
@@ -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.16.0",
+  "version": "0.15.0",
   "description": "Core Editor that powers Plane",
   "private": true,
   "main": "./dist/index.mjs",
@@ -59,7 +59,8 @@
     "@types/node": "18.15.3",
     "@types/react": "^18.2.42",
     "@types/react-dom": "^18.2.17",
-    "eslint-config-custom": "*",
+    "eslint": "^7.32.0",
+    "eslint-config-next": "13.2.4",
     "postcss": "^8.4.29",
     "tailwind-config-custom": "*",
     "tsconfig": "*",

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

@@ -97,8 +97,8 @@ export const insertTableCommand = (editor: Editor, range?: Range) => {
       }
     }
   }
-  if (range) editor.chain().focus().deleteRange(range).insertTable({ rows: 3, cols: 3 }).run();
-  else editor.chain().focus().insertTable({ rows: 3, cols: 3 }).run();
+  if (range) editor.chain().focus().deleteRange(range).insertTable({ rows: 3, cols: 3, withHeaderRow: true }).run();
+  else editor.chain().focus().insertTable({ rows: 3, cols: 3, withHeaderRow: true }).run();
 };
 
 export const unsetLinkEditor = (editor: Editor) => {

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

@@ -170,6 +170,68 @@ ul[data-type="taskList"] li[data-checked="true"] > div > p {
   }
 }
 
+#editor-container {
+  table {
+    border-collapse: collapse;
+    table-layout: fixed;
+    margin: 0.5em 0 0.5em 0;
+
+    border: 1px solid rgb(var(--color-border-200));
+    width: 100%;
+
+    td,
+    th {
+      min-width: 1em;
+      border: 1px solid rgb(var(--color-border-200));
+      padding: 10px 15px;
+      vertical-align: top;
+      box-sizing: border-box;
+      position: relative;
+      transition: background-color 0.3s ease;
+
+      > * {
+        margin-bottom: 0;
+      }
+    }
+
+    th {
+      font-weight: bold;
+      text-align: left;
+      background-color: rgb(var(--color-primary-100));
+    }
+
+    td:hover {
+      background-color: rgba(var(--color-primary-300), 0.1);
+    }
+
+    .selectedCell:after {
+      z-index: 2;
+      position: absolute;
+      content: "";
+      left: 0;
+      right: 0;
+      top: 0;
+      bottom: 0;
+      background-color: rgba(var(--color-primary-300), 0.1);
+      pointer-events: none;
+    }
+
+    .column-resize-handle {
+      position: absolute;
+      right: -2px;
+      top: 0;
+      bottom: -2px;
+      width: 2px;
+      background-color: rgb(var(--color-primary-400));
+      pointer-events: none;
+    }
+  }
+}
+
+.tableWrapper {
+  overflow-x: auto;
+}
+
 .resize-cursor {
   cursor: ew-resize;
   cursor: col-resize;

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

@@ -9,15 +9,15 @@
   border-collapse: collapse;
   table-layout: fixed;
   margin: 0;
-  margin-bottom: 1rem;
-  border: 2px solid rgba(var(--color-border-300));
+  margin-bottom: 3rem;
+  border: 1px solid rgba(var(--color-border-200));
   width: 100%;
 }
 
 .tableWrapper table td,
 .tableWrapper table th {
   min-width: 1em;
-  border: 1px solid rgba(var(--color-border-300));
+  border: 1px solid rgba(var(--color-border-200));
   padding: 10px 15px;
   vertical-align: top;
   box-sizing: border-box;
@@ -43,8 +43,7 @@
 .tableWrapper table th {
   font-weight: bold;
   text-align: left;
-  background-color: #d9e4ff;
-  color: #171717;
+  background-color: rgba(var(--color-primary-100));
 }
 
 .tableWrapper table th * {
@@ -63,43 +62,14 @@
   pointer-events: none;
 }
 
-.colorPicker {
-  display: grid;
-  padding: 8px 8px;
-  grid-template-columns: repeat(6, 1fr);
-  gap: 5px;
-}
-
-.colorPickerLabel {
-  font-size: 0.85rem;
-  color: #6b7280;
-  padding: 8px 8px;
-  padding-bottom: 0px;
-}
-
-.colorPickerItem {
-  margin: 2px 0px;
-  width: 24px;
-  height: 24px;
-  border-radius: 4px;
-  border: none;
-  cursor: pointer;
-}
-
-.divider {
-  background-color: #e5e7eb;
-  height: 1px;
-  margin: 3px 0;
-}
-
 .tableWrapper table .column-resize-handle {
   position: absolute;
   right: -2px;
   top: 0;
   bottom: -2px;
   width: 4px;
-  z-index: 5;
-  background-color: #d9e4ff;
+  z-index: 99;
+  background-color: rgba(var(--color-primary-400));
   pointer-events: none;
 }
 
@@ -111,7 +81,7 @@
 .tableWrapper .tableControls .rowsControl {
   transition: opacity ease-in 100ms;
   position: absolute;
-  z-index: 5;
+  z-index: 99;
   display: flex;
   justify-content: center;
   align-items: center;
@@ -142,7 +112,7 @@
 }
 
 .tableWrapper .tableControls .rowsControlDiv {
-  background-color: #d9e4ff;
+  background-color: rgba(var(--color-primary-100));
   border: 1px solid rgba(var(--color-border-200));
   border-radius: 2px;
   background-size: 1.25rem;
@@ -157,7 +127,7 @@
 }
 
 .tableWrapper .tableControls .columnsControlDiv {
-  background-color: #d9e4ff;
+  background-color: rgba(var(--color-primary-100));
   border: 1px solid rgba(var(--color-border-200));
   border-radius: 2px;
   background-size: 1.25rem;
@@ -174,12 +144,10 @@
 .tableWrapper .tableControls .tableColorPickerToolbox {
   border: 1px solid rgba(var(--color-border-300));
   background-color: rgba(var(--color-background-100));
-  border-radius: 5px;
-  box-shadow: 0px 2px 4px rgba(0, 0, 0, 0.1);
   padding: 0.25rem;
   display: flex;
   flex-direction: column;
-  width: max-content;
+  width: 200px;
   gap: 0.25rem;
 }
 
@@ -190,7 +158,7 @@
   align-items: center;
   gap: 0.5rem;
   border: none;
-  padding: 0.3rem 0.5rem 0.1rem 0.1rem;
+  padding: 0.1rem;
   border-radius: 4px;
   cursor: pointer;
   transition: all 0.2s;
@@ -198,14 +166,16 @@
 
 .tableWrapper .tableControls .tableToolbox .toolboxItem:hover,
 .tableWrapper .tableControls .tableColorPickerToolbox .toolboxItem:hover {
-  background-color: rgba(var(--color-background-80), 0.6);
+  background-color: rgba(var(--color-background-100), 0.5);
 }
 
 .tableWrapper .tableControls .tableToolbox .toolboxItem .iconContainer,
 .tableWrapper .tableControls .tableColorPickerToolbox .toolboxItem .iconContainer,
 .tableWrapper .tableControls .tableToolbox .toolboxItem .colorContainer,
 .tableWrapper .tableControls .tableColorPickerToolbox .toolboxItem .colorContainer {
-  padding: 4px 0px;
+  border: 1px solid rgba(var(--color-border-300));
+  border-radius: 3px;
+  padding: 4px;
   display: flex;
   align-items: center;
   justify-content: center;
@@ -217,8 +187,8 @@
 .tableWrapper .tableControls .tableColorPickerToolbox .toolboxItem .iconContainer svg,
 .tableWrapper .tableControls .tableToolbox .toolboxItem .colorContainer svg,
 .tableWrapper .tableControls .tableColorPickerToolbox .toolboxItem .colorContainer svg {
-  width: 1rem;
-  height: 1rem;
+  width: 2rem;
+  height: 2rem;
 }
 
 .tableToolbox {

packages/editor/core/src/ui/extensions/custom-link/helpers/clickHandler.ts

@@ -15,15 +15,9 @@ export function clickHandler(options: ClickHandlerOptions): Plugin {
           return false;
         }
 
-        let a = event.target as HTMLElement;
-        const els = [];
+        const eventTarget = event.target as HTMLElement;
 
-        while (a.nodeName !== "DIV") {
-          els.push(a);
-          a = a.parentNode as HTMLElement;
-        }
-
-        if (!els.find((value) => value.nodeName === "A")) {
+        if (eventTarget.nodeName !== "A") {
           return false;
         }
 
@@ -34,7 +28,9 @@ export function clickHandler(options: ClickHandlerOptions): Plugin {
         const target = link?.target ?? attrs.target;
 
         if (link && href) {
-          window.open(href, target);
+          if (view.editable) {
+            window.open(href, target);
+          }
 
           return true;
         }

packages/editor/core/src/ui/extensions/custom-link/helpers/pasteHandler.ts

@@ -33,8 +33,16 @@ export function pasteHandler(options: PasteHandlerOptions): Plugin {
           return false;
         }
 
+        const html = event.clipboardData?.getData("text/html");
+
+        const hrefRegex = /href="([^"]*)"/;
+
+        const existingLink = html?.match(hrefRegex);
+
+        const url = existingLink ? existingLink[1] : link.href;
+
         options.editor.commands.setMark(options.type, {
-          href: link.href,
+          href: url,
         });
 
         return true;

packages/editor/core/src/ui/extensions/custom-link/index.tsx

@@ -1,76 +1,41 @@
-import { Mark, markPasteRule, mergeAttributes, PasteRuleMatch } from "@tiptap/core";
+import { Mark, markPasteRule, mergeAttributes } from "@tiptap/core";
 import { Plugin } from "@tiptap/pm/state";
 import { find, registerCustomProtocol, reset } from "linkifyjs";
-import { autolink } from "./helpers/autolink";
-import { clickHandler } from "./helpers/clickHandler";
-import { pasteHandler } from "./helpers/pasteHandler";
+
+import { autolink } from "src/ui/extensions/custom-link/helpers/autolink";
+import { clickHandler } from "src/ui/extensions/custom-link/helpers/clickHandler";
+import { pasteHandler } from "src/ui/extensions/custom-link/helpers/pasteHandler";
 
 export interface LinkProtocolOptions {
   scheme: string;
   optionalSlashes?: boolean;
 }
 
-export const pasteRegex =
-  /https?:\/\/(?:www\.)?[-a-zA-Z0-9@:%._+~#=]{1,256}\.[a-zA-Z]{2,}\b(?:[-a-zA-Z0-9@:%._+~#=?!&/]*)(?:[-a-zA-Z0-9@:%._+~#=?!&/]*)/gi;
-
 export interface LinkOptions {
-  /**
-   * If enabled, it adds links as you type.
-   */
   autolink: boolean;
-  /**
-   * An array of custom protocols to be registered with linkifyjs.
-   */
-  protocols: Array<LinkProtocolOptions | string>;
-  /**
-   * If enabled, links will be opened on click.
-   */
-  openOnClick: boolean;
-  /**
-   * If enabled, links will be inclusive i.e. if you move your cursor to the
-   * link text, and start typing, it'll be a part of the link itself.
-   */
   inclusive: boolean;
-  /**
-   * Adds a link to the current selection if the pasted content only contains an url.
-   */
+  protocols: Array<LinkProtocolOptions | string>;
+  openOnClick: boolean;
   linkOnPaste: boolean;
-  /**
-   * A list of HTML attributes to be rendered.
-   */
   HTMLAttributes: Record<string, any>;
-  /**
-   * A validation function that modifies link verification for the auto linker.
-   * @param url - The url to be validated.
-   * @returns - True if the url is valid, false otherwise.
-   */
   validate?: (url: string) => boolean;
 }
 
 declare module "@tiptap/core" {
   interface Commands<ReturnType> {
     link: {
-      /**
-       * Set a link mark
-       */
       setLink: (attributes: {
         href: string;
         target?: string | null;
         rel?: string | null;
         class?: string | null;
       }) => ReturnType;
-      /**
-       * Toggle a link mark
-       */
       toggleLink: (attributes: {
         href: string;
         target?: string | null;
         rel?: string | null;
         class?: string | null;
       }) => ReturnType;
-      /**
-       * Unset a link mark
-       */
       unsetLink: () => ReturnType;
     };
   }
@@ -185,31 +150,37 @@ export const CustomLinkExtension = Mark.create<LinkOptions>({
   addPasteRules() {
     return [
       markPasteRule({
-        find: (text) => {
-          const foundLinks: PasteRuleMatch[] = [];
+        find: (text) =>
+          find(text)
+            .filter((link) => {
+              if (this.options.validate) {
+                return this.options.validate(link.value);
+              }
+              return true;
+            })
+            .filter((link) => link.isLink)
+            .map((link) => ({
+              text: link.value,
+              index: link.start,
+              data: link,
+            })),
+        type: this.type,
+        getAttributes: (match, pasteEvent) => {
+          const html = pasteEvent?.clipboardData?.getData("text/html");
+          const hrefRegex = /href="([^"]*)"/;
 
-          if (text) {
-            const links = find(text).filter((item) => item.isLink);
+          const existingLink = html?.match(hrefRegex);
 
-            if (links.length) {
-              links.forEach((link) =>
-                foundLinks.push({
-                  text: link.value,
-                  data: {
-                    href: link.href,
-                  },
-                  index: link.start,
-                })
-              );
-            }
+          if (existingLink) {
+            return {
+              href: existingLink[1],
+            };
           }
 
-          return foundLinks;
+          return {
+            href: match.data?.href,
+          };
         },
-        type: this.type,
-        getAttributes: (match) => ({
-          href: match.data?.href,
-        }),
       }),
     ];
   },

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

@@ -1,111 +0,0 @@
-import { isNodeSelection, mergeAttributes, Node, nodeInputRule } from "@tiptap/core";
-import { NodeSelection, TextSelection } from "@tiptap/pm/state";
-
-export interface HorizontalRuleOptions {
-  HTMLAttributes: Record<string, any>;
-}
-
-declare module "@tiptap/core" {
-  interface Commands<ReturnType> {
-    horizontalRule: {
-      /**
-       * Add a horizontal rule
-       */
-      setHorizontalRule: () => ReturnType;
-    };
-  }
-}
-
-export const CustomHorizontalRule = Node.create<HorizontalRuleOptions>({
-  name: "horizontalRule",
-
-  addOptions() {
-    return {
-      HTMLAttributes: {},
-    };
-  },
-
-  group: "block",
-
-  parseHTML() {
-    return [{ tag: "hr" }];
-  },
-
-  renderHTML({ HTMLAttributes }) {
-    return ["hr", mergeAttributes(this.options.HTMLAttributes, HTMLAttributes)];
-  },
-
-  addCommands() {
-    return {
-      setHorizontalRule:
-        () =>
-        ({ chain, state }) => {
-          const { selection } = state;
-          const { $from: $originFrom, $to: $originTo } = selection;
-
-          const currentChain = chain();
-
-          if ($originFrom.parentOffset === 0) {
-            currentChain.insertContentAt(
-              {
-                from: Math.max($originFrom.pos - 1, 0),
-                to: $originTo.pos,
-              },
-              {
-                type: this.name,
-              }
-            );
-          } else if (isNodeSelection(selection)) {
-            currentChain.insertContentAt($originTo.pos, {
-              type: this.name,
-            });
-          } else {
-            currentChain.insertContent({ type: this.name });
-          }
-
-          return (
-            currentChain
-              // set cursor after horizontal rule
-              .command(({ tr, dispatch }) => {
-                if (dispatch) {
-                  const { $to } = tr.selection;
-                  const posAfter = $to.end();
-
-                  if ($to.nodeAfter) {
-                    if ($to.nodeAfter.isTextblock) {
-                      tr.setSelection(TextSelection.create(tr.doc, $to.pos + 1));
-                    } else if ($to.nodeAfter.isBlock) {
-                      tr.setSelection(NodeSelection.create(tr.doc, $to.pos));
-                    } else {
-                      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 + 1));
-                    }
-                  }
-
-                  tr.scrollIntoView();
-                }
-
-                return true;
-              })
-              .run()
-          );
-        },
-    };
-  },
-
-  addInputRules() {
-    return [
-      nodeInputRule({
-        find: /^(?:---|—-|___\s|\*\*\*\s)$/,
-        type: this.type,
-      }),
-    ];
-  },
-});

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

@@ -25,9 +25,7 @@ import { DeleteImage } from "src/types/delete-image";
 import { IMentionSuggestion } from "src/types/mention-suggestion";
 import { RestoreImage } from "src/types/restore-image";
 import { CustomLinkExtension } from "src/ui/extensions/custom-link";
-import { CustomCodeInlineExtension } from "src/ui/extensions/code-inline";
-import { CustomTypographyExtension } from "src/ui/extensions/typography";
-import { CustomHorizontalRule } from "./horizontal-rule/horizontal-rule";
+import { CustomCodeInlineExtension } from "./code-inline";
 
 export const CoreEditorExtensions = (
   mentionConfig: {
@@ -56,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))",
@@ -66,10 +66,6 @@ export const CoreEditorExtensions = (
   CustomQuoteExtension.configure({
     HTMLAttributes: { className: "border-l-4 border-custom-border-300" },
   }),
-
-  CustomHorizontalRule.configure({
-    HTMLAttributes: { class: "mt-4 mb-4" },
-  }),
   CustomKeymap,
   ListKeymap,
   CustomLinkExtension.configure({
@@ -83,7 +79,6 @@ export const CoreEditorExtensions = (
         "text-custom-primary-300 underline underline-offset-[3px] hover:text-custom-primary-500 transition-colors cursor-pointer",
     },
   }),
-  CustomTypographyExtension,
   ImageExtension(deleteFile, restoreFile, cancelUploadImage).configure({
     HTMLAttributes: {
       class: "rounded-lg border border-custom-border-300",

packages/editor/core/src/ui/extensions/table/table-cell/table-cell.ts

@@ -13,7 +13,7 @@ export const TableCell = Node.create<TableCellOptions>({
     };
   },
 
-  content: "block+",
+  content: "paragraph+",
 
   addAttributes() {
     return {
@@ -33,10 +33,7 @@ export const TableCell = Node.create<TableCellOptions>({
         },
       },
       background: {
-        default: null,
-      },
-      textColor: {
-        default: null,
+        default: "none",
       },
     };
   },
@@ -53,7 +50,7 @@ export const TableCell = Node.create<TableCellOptions>({
     return [
       "td",
       mergeAttributes(this.options.HTMLAttributes, HTMLAttributes, {
-        style: `background-color: ${node.attrs.background}; color: ${node.attrs.textColor}`,
+        style: `background-color: ${node.attrs.background}`,
       }),
       0,
     ];

packages/editor/core/src/ui/extensions/table/table-header/table-header.ts

@@ -33,7 +33,7 @@ export const TableHeader = Node.create<TableHeaderOptions>({
         },
       },
       background: {
-        default: "none",
+        default: "rgb(var(--color-primary-100))",
       },
     };
   },

packages/editor/core/src/ui/extensions/table/table-row/table-row.ts

@@ -13,17 +13,6 @@ export const TableRow = Node.create<TableRowOptions>({
     };
   },
 
-  addAttributes() {
-    return {
-      background: {
-        default: null,
-      },
-      textColor: {
-        default: null,
-      },
-    };
-  },
-
   content: "(tableCell | tableHeader)*",
 
   tableRole: "row",
@@ -33,12 +22,6 @@ export const TableRow = Node.create<TableRowOptions>({
   },
 
   renderHTML({ HTMLAttributes }) {
-    const style = HTMLAttributes.background
-      ? `background-color: ${HTMLAttributes.background}; color: ${HTMLAttributes.textColor}`
-      : "";
-
-    const attributes = mergeAttributes(this.options.HTMLAttributes, HTMLAttributes, { style });
-
-    return ["tr", attributes, 0];
+    return ["tr", mergeAttributes(this.options.HTMLAttributes, HTMLAttributes), 0];
   },
 });

packages/editor/core/src/ui/extensions/table/table/icons.ts

@@ -1,7 +1,7 @@
 export const icons = {
   colorPicker: `<svg xmlns="http://www.w3.org/2000/svg" length="24" viewBox="0 0 24 24" style="transform: ;msFilter:;"><path fill="rgb(var(--color-text-300))" d="M20 14c-.092.064-2 2.083-2 3.5 0 1.494.949 2.448 2 2.5.906.044 2-.891 2-2.5 0-1.5-1.908-3.436-2-3.5zM9.586 20c.378.378.88.586 1.414.586s1.036-.208 1.414-.586l7-7-.707-.707L11 4.586 8.707 2.293 7.293 3.707 9.586 6 4 11.586c-.378.378-.586.88-.586 1.414s.208 1.036.586 1.414L9.586 20zM11 7.414 16.586 13H5.414L11 7.414z"></path></svg>`,
-  deleteColumn: `<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" class="lucide lucide-trash-2"><path d="M3 6h18"/><path d="M19 6v14c0 1-1 2-2 2H7c-1 0-2-1-2-2V6"/><path d="M8 6V4c0-1 1-2 2-2h4c1 0 2 1 2 2v2"/><line x1="10" x2="10" y1="11" y2="17"/><line x1="14" x2="14" y1="11" y2="17"/></svg>`,
-  deleteRow: `<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" class="lucide lucide-trash-2"><path d="M3 6h18"/><path d="M19 6v14c0 1-1 2-2 2H7c-1 0-2-1-2-2V6"/><path d="M8 6V4c0-1 1-2 2-2h4c1 0 2 1 2 2v2"/><line x1="10" x2="10" y1="11" y2="17"/><line x1="14" x2="14" y1="11" y2="17"/></svg>`,
+  deleteColumn: `<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" length="24"><path fill="#e53e3e" d="M0 0H24V24H0z"/><path d="M12 3c.552 0 1 .448 1 1v8c.835-.628 1.874-1 3-1 2.761 0 5 2.239 5 5s-2.239 5-5 5c-1.032 0-1.99-.313-2.787-.848L13 20c0 .552-.448 1-1 1H6c-.552 0-1-.448-1-1V4c0-.552.448-1 1-1h6zm-1 2H7v14h4V5zm8 10h-6v2h6v-2z"/></svg>`,
+  deleteRow: `<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" length="24"><path fill="#e53e3e" d="M0 0H24V24H0z"/><path d="M20 5c.552 0 1 .448 1 1v6c0 .552-.448 1-1 1 .628.835 1 1.874 1 3 0 2.761-2.239 5-5 5s-5-2.239-5-5c0-1.126.372-2.165 1-3H4c-.552 0-1-.448-1-1V6c0-.552.448-1 1-1h16zm-7 10v2h6v-2h-6zm6-8H5v4h14V7z"/></svg>`,
   insertLeftTableIcon: `<svg
     xmlns="http://www.w3.org/2000/svg"
     length={24}
@@ -35,8 +35,6 @@ export const icons = {
     />
   </svg>
 `,
-  toggleColumnHeader: `<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24" fill="none" stroke="rgb(var(--color-text-300))" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" class="lucide lucide-toggle-right"><rect width="20" height="12" x="2" y="6" rx="6" ry="6"/><circle cx="16" cy="12" r="2"/></svg>`,
-  toggleRowHeader: `<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24" fill="none" stroke="rgb(var(--color-text-300))" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" class="lucide lucide-toggle-right"><rect width="20" height="12" x="2" y="6" rx="6" ry="6"/><circle cx="16" cy="12" r="2"/></svg>`,
   insertBottomTableIcon: `<svg
     xmlns="http://www.w3.org/2000/svg"
     length={24}

packages/editor/core/src/ui/extensions/table/table/table-view.tsx

@@ -81,75 +81,53 @@ const defaultTippyOptions: Partial<Props> = {
   placement: "right",
 };
 
-function setCellsBackgroundColor(editor: Editor, color: { backgroundColor: string; textColor: string }) {
+function setCellsBackgroundColor(editor: Editor, backgroundColor: string) {
   return editor
     .chain()
     .focus()
     .updateAttributes("tableCell", {
-      background: color.backgroundColor,
-      textColor: color.textColor,
+      background: backgroundColor,
+    })
+    .updateAttributes("tableHeader", {
+      background: backgroundColor,
     })
     .run();
 }
 
-function setTableRowBackgroundColor(editor: Editor, color: { backgroundColor: string; textColor: string }) {
-  const { state, dispatch } = editor.view;
-  const { selection } = state;
-  if (!(selection instanceof CellSelection)) {
-    return false;
-  }
-
-  // Get the position of the hovered cell in the selection to determine the row.
-  const hoveredCell = selection.$headCell || selection.$anchorCell;
-
-  // Find the depth of the table row node
-  let rowDepth = hoveredCell.depth;
-  while (rowDepth > 0 && hoveredCell.node(rowDepth).type.name !== "tableRow") {
-    rowDepth--;
-  }
-
-  // If we couldn't find a tableRow node, we can't set the background color
-  if (hoveredCell.node(rowDepth).type.name !== "tableRow") {
-    return false;
-  }
-
-  // Get the position where the table row starts
-  const rowStartPos = hoveredCell.start(rowDepth);
-
-  // Create a transaction that sets the background color on the tableRow node.
-  const tr = state.tr.setNodeMarkup(rowStartPos - 1, null, {
-    ...hoveredCell.node(rowDepth).attrs,
-    background: color.backgroundColor,
-    textColor: color.textColor,
-  });
-
-  dispatch(tr);
-  return true;
-}
-
 const columnsToolboxItems: ToolboxItem[] = [
   {
-    label: "Toggle column header",
-    icon: icons.toggleColumnHeader,
-    action: ({ editor }: { editor: Editor }) => editor.chain().focus().toggleHeaderColumn().run(),
-  },
-  {
-    label: "Add column before",
+    label: "Add Column Before",
     icon: icons.insertLeftTableIcon,
     action: ({ editor }: { editor: Editor }) => editor.chain().focus().addColumnBefore().run(),
   },
   {
-    label: "Add column after",
+    label: "Add Column After",
     icon: icons.insertRightTableIcon,
     action: ({ editor }: { editor: Editor }) => editor.chain().focus().addColumnAfter().run(),
   },
   {
-    label: "Pick color",
-    icon: "", // No icon needed for color picker
-    action: (args: any) => {}, // Placeholder action; actual color picking is handled in `createToolbox`
+    label: "Pick Column Color",
+    icon: icons.colorPicker,
+    action: ({
+      editor,
+      triggerButton,
+      controlsContainer,
+    }: {
+      editor: Editor;
+      triggerButton: HTMLElement;
+      controlsContainer: Element;
+    }) => {
+      createColorPickerToolbox({
+        triggerButton,
+        tippyOptions: {
+          appendTo: controlsContainer,
+        },
+        onSelectColor: (color) => setCellsBackgroundColor(editor, color),
+      });
+    },
   },
   {
-    label: "Delete column",
+    label: "Delete Column",
     icon: icons.deleteColumn,
     action: ({ editor }: { editor: Editor }) => editor.chain().focus().deleteColumn().run(),
   },
@@ -157,24 +135,35 @@ const columnsToolboxItems: ToolboxItem[] = [
 
 const rowsToolboxItems: ToolboxItem[] = [
   {
-    label: "Toggle row header",
-    icon: icons.toggleRowHeader,
-    action: ({ editor }: { editor: Editor }) => editor.chain().focus().toggleHeaderRow().run(),
-  },
-  {
-    label: "Add row above",
+    label: "Add Row Above",
     icon: icons.insertTopTableIcon,
     action: ({ editor }: { editor: Editor }) => editor.chain().focus().addRowBefore().run(),
   },
   {
-    label: "Add row below",
+    label: "Add Row Below",
     icon: icons.insertBottomTableIcon,
     action: ({ editor }: { editor: Editor }) => editor.chain().focus().addRowAfter().run(),
   },
   {
-    label: "Pick color",
-    icon: "",
-    action: (args: any) => {}, // Placeholder action; actual color picking is handled in `createToolbox`
+    label: "Pick Row Color",
+    icon: icons.colorPicker,
+    action: ({
+      editor,
+      triggerButton,
+      controlsContainer,
+    }: {
+      editor: Editor;
+      triggerButton: HTMLButtonElement;
+      controlsContainer: Element | "parent" | ((ref: Element) => Element) | undefined;
+    }) => {
+      createColorPickerToolbox({
+        triggerButton,
+        tippyOptions: {
+          appendTo: controlsContainer,
+        },
+        onSelectColor: (color) => setCellsBackgroundColor(editor, color),
+      });
+    },
   },
   {
     label: "Delete Row",
@@ -187,58 +176,37 @@ function createToolbox({
   triggerButton,
   items,
   tippyOptions,
-  onSelectColor,
   onClickItem,
-  colors,
 }: {
   triggerButton: Element | null;
   items: ToolboxItem[];
   tippyOptions: any;
   onClickItem: (item: ToolboxItem) => void;
-  onSelectColor: (color: { backgroundColor: string; textColor: string }) => void;
-  colors: { [key: string]: { backgroundColor: string; textColor: string; icon?: string } };
 }): Instance<Props> {
   // @ts-expect-error
   const toolbox = tippy(triggerButton, {
     content: h(
       "div",
       { className: "tableToolbox" },
-      items.map((item, index) => {
-        if (item.label === "Pick color") {
-          return h("div", { className: "flex flex-col" }, [
-            h("div", { className: "divider" }),
-            h("div", { className: "colorPickerLabel" }, item.label),
-            h(
-              "div",
-              { className: "colorPicker grid" },
-              Object.entries(colors).map(([colorName, colorValue]) =>
-                h("div", {
-                  className: "colorPickerItem flex items-center justify-center",
-                  style: `background-color: ${colorValue.backgroundColor}; 
-          color: ${colorValue.textColor || "inherit"};`,
-                  innerHTML:
-                    colorValue.icon ?? `<span class="text-md" style:"color: ${colorValue.backgroundColor}>A</span>`,
-                  onClick: () => onSelectColor(colorValue),
-                })
-              )
-            ),
-            h("div", { className: "divider" }),
-          ]);
-        } else {
-          return h(
-            "div",
-            {
-              className: "toolboxItem",
-              itemType: "div",
-              onClick: () => onClickItem(item),
+      items.map((item) =>
+        h(
+          "div",
+          {
+            className: "toolboxItem",
+            itemType: "button",
+            onClick() {
+              onClickItem(item);
             },
-            [
-              h("div", { className: "iconContainer", innerHTML: item.icon }),
-              h("div", { className: "label" }, item.label),
-            ]
-          );
-        }
-      })
+          },
+          [
+            h("div", {
+              className: "iconContainer",
+              innerHTML: item.icon,
+            }),
+            h("div", { className: "label" }, item.label),
+          ]
+        )
+      )
     ),
     ...tippyOptions,
   });
@@ -246,6 +214,71 @@ function createToolbox({
   return Array.isArray(toolbox) ? toolbox[0] : toolbox;
 }
 
+function createColorPickerToolbox({
+  triggerButton,
+  tippyOptions,
+  onSelectColor = () => {},
+}: {
+  triggerButton: HTMLElement;
+  tippyOptions: Partial<Props>;
+  onSelectColor?: (color: string) => void;
+}) {
+  const items = {
+    Default: "rgb(var(--color-primary-100))",
+    Orange: "#FFE5D1",
+    Grey: "#F1F1F1",
+    Yellow: "#FEF3C7",
+    Green: "#DCFCE7",
+    Red: "#FFDDDD",
+    Blue: "#D9E4FF",
+    Pink: "#FFE8FA",
+    Purple: "#E8DAFB",
+  };
+
+  const colorPicker = tippy(triggerButton, {
+    ...defaultTippyOptions,
+    content: h(
+      "div",
+      { className: "tableColorPickerToolbox" },
+      Object.entries(items).map(([key, value]) =>
+        h(
+          "div",
+          {
+            className: "toolboxItem",
+            itemType: "button",
+            onClick: () => {
+              onSelectColor(value);
+              colorPicker.hide();
+            },
+          },
+          [
+            h("div", {
+              className: "colorContainer",
+              style: {
+                backgroundColor: value,
+              },
+            }),
+            h(
+              "div",
+              {
+                className: "label",
+              },
+              key
+            ),
+          ]
+        )
+      )
+    ),
+    onHidden: (instance) => {
+      instance.destroy();
+    },
+    showOnCreate: true,
+    ...tippyOptions,
+  });
+
+  return colorPicker;
+}
+
 export class TableView implements NodeView {
   node: ProseMirrorNode;
   cellMinWidth: number;
@@ -314,27 +347,10 @@ export class TableView implements NodeView {
         this.rowsControl,
         this.columnsControl
       );
-      const columnColors = {
-        Blue: { backgroundColor: "#D9E4FF", textColor: "#171717" },
-        Orange: { backgroundColor: "#FFEDD5", textColor: "#171717" },
-        Grey: { backgroundColor: "#F1F1F1", textColor: "#171717" },
-        Yellow: { backgroundColor: "#FEF3C7", textColor: "#171717" },
-        Green: { backgroundColor: "#DCFCE7", textColor: "#171717" },
-        Red: { backgroundColor: "#FFDDDD", textColor: "#171717" },
-        Pink: { backgroundColor: "#FFE8FA", textColor: "#171717" },
-        Purple: { backgroundColor: "#E8DAFB", textColor: "#171717" },
-        None: {
-          backgroundColor: "none",
-          textColor: "none",
-          icon: `<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24" fill="none" stroke="gray" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" class="lucide lucide-ban"><circle cx="12" cy="12" r="10"/><path d="m4.9 4.9 14.2 14.2"/></svg>`,
-        },
-      };
 
       this.columnsToolbox = createToolbox({
         triggerButton: this.columnsControl.querySelector(".columnsControlDiv"),
         items: columnsToolboxItems,
-        colors: columnColors,
-        onSelectColor: (color) => setCellsBackgroundColor(this.editor, color),
         tippyOptions: {
           ...defaultTippyOptions,
           appendTo: this.controls,
@@ -352,12 +368,10 @@ export class TableView implements NodeView {
       this.rowsToolbox = createToolbox({
         triggerButton: this.rowsControl.firstElementChild,
         items: rowsToolboxItems,
-        colors: columnColors,
         tippyOptions: {
           ...defaultTippyOptions,
           appendTo: this.controls,
         },
-        onSelectColor: (color) => setTableRowBackgroundColor(editor, color),
         onClickItem: (item) => {
           item.action({
             editor: this.editor,
@@ -369,6 +383,8 @@ export class TableView implements NodeView {
       });
     }
 
+    // Table
+
     this.colgroup = h(
       "colgroup",
       null,
@@ -421,19 +437,16 @@ export class TableView implements NodeView {
   }
 
   updateControls() {
-    const { hoveredTable: table, hoveredCell: cell } = Object.values(this.decorations).reduce(
-      (acc, curr) => {
-        if (curr.spec.hoveredCell !== undefined) {
-          acc["hoveredCell"] = curr.spec.hoveredCell;
-        }
+    const { hoveredTable: table, hoveredCell: cell } = Object.values(this.decorations).reduce((acc, curr) => {
+      if (curr.spec.hoveredCell !== undefined) {
+        acc["hoveredCell"] = curr.spec.hoveredCell;
+      }
 
-        if (curr.spec.hoveredTable !== undefined) {
-          acc["hoveredTable"] = curr.spec.hoveredTable;
-        }
-        return acc;
-      },
-      {} as Record<string, HTMLElement>
-    ) as any;
+      if (curr.spec.hoveredTable !== undefined) {
+        acc["hoveredTable"] = curr.spec.hoveredTable;
+      }
+      return acc;
+    }, {} as Record<string, HTMLElement>) as any;
 
     if (table === undefined || cell === undefined) {
       return this.root.classList.add("controls--disabled");
@@ -444,12 +457,12 @@ export class TableView implements NodeView {
 
     const cellDom = this.editor.view.nodeDOM(cell.pos) as HTMLElement;
 
-    if (!this.table || !cellDom) {
+    if (!this.table) {
       return;
     }
 
-    const tableRect = this.table?.getBoundingClientRect();
-    const cellRect = cellDom?.getBoundingClientRect();
+    const tableRect = this.table.getBoundingClientRect();
+    const cellRect = cellDom.getBoundingClientRect();
 
     if (this.columnsControl) {
       this.columnsControl.style.left = `${cellRect.left - tableRect.left - this.table.parentElement!.scrollLeft}px`;

packages/editor/core/src/ui/extensions/table/table/table.ts

@@ -107,9 +107,10 @@ export const Table = Node.create({
   addCommands() {
     return {
       insertTable:
-        ({ rows = 3, cols = 3, withHeaderRow = false } = {}) =>
+        ({ rows = 3, cols = 3, withHeaderRow = true } = {}) =>
         ({ tr, dispatch, editor }) => {
           const node = createTable(editor.schema, rows, cols, withHeaderRow);
+
           if (dispatch) {
             const offset = tr.selection.anchor + 1;
 

packages/editor/core/src/ui/extensions/typography/index.ts

@@ -1,109 +0,0 @@
-import { Extension } from "@tiptap/core";
-import {
-  TypographyOptions,
-  emDash,
-  ellipsis,
-  leftArrow,
-  rightArrow,
-  copyright,
-  trademark,
-  servicemark,
-  registeredTrademark,
-  oneHalf,
-  plusMinus,
-  notEqual,
-  laquo,
-  raquo,
-  multiplication,
-  superscriptTwo,
-  superscriptThree,
-  oneQuarter,
-  threeQuarters,
-  impliesArrowRight,
-} from "src/ui/extensions/typography/inputRules";
-
-export const CustomTypographyExtension = Extension.create<TypographyOptions>({
-  name: "typography",
-
-  addInputRules() {
-    const rules = [];
-
-    if (this.options.emDash !== false) {
-      rules.push(emDash(this.options.emDash));
-    }
-
-    if (this.options.impliesArrowRight !== false) {
-      rules.push(impliesArrowRight(this.options.impliesArrowRight));
-    }
-
-    if (this.options.ellipsis !== false) {
-      rules.push(ellipsis(this.options.ellipsis));
-    }
-
-    if (this.options.leftArrow !== false) {
-      rules.push(leftArrow(this.options.leftArrow));
-    }
-
-    if (this.options.rightArrow !== false) {
-      rules.push(rightArrow(this.options.rightArrow));
-    }
-
-    if (this.options.copyright !== false) {
-      rules.push(copyright(this.options.copyright));
-    }
-
-    if (this.options.trademark !== false) {
-      rules.push(trademark(this.options.trademark));
-    }
-
-    if (this.options.servicemark !== false) {
-      rules.push(servicemark(this.options.servicemark));
-    }
-
-    if (this.options.registeredTrademark !== false) {
-      rules.push(registeredTrademark(this.options.registeredTrademark));
-    }
-
-    if (this.options.oneHalf !== false) {
-      rules.push(oneHalf(this.options.oneHalf));
-    }
-
-    if (this.options.plusMinus !== false) {
-      rules.push(plusMinus(this.options.plusMinus));
-    }
-
-    if (this.options.notEqual !== false) {
-      rules.push(notEqual(this.options.notEqual));
-    }
-
-    if (this.options.laquo !== false) {
-      rules.push(laquo(this.options.laquo));
-    }
-
-    if (this.options.raquo !== false) {
-      rules.push(raquo(this.options.raquo));
-    }
-
-    if (this.options.multiplication !== false) {
-      rules.push(multiplication(this.options.multiplication));
-    }
-
-    if (this.options.superscriptTwo !== false) {
-      rules.push(superscriptTwo(this.options.superscriptTwo));
-    }
-
-    if (this.options.superscriptThree !== false) {
-      rules.push(superscriptThree(this.options.superscriptThree));
-    }
-
-    if (this.options.oneQuarter !== false) {
-      rules.push(oneQuarter(this.options.oneQuarter));
-    }
-
-    if (this.options.threeQuarters !== false) {
-      rules.push(threeQuarters(this.options.threeQuarters));
-    }
-
-    return rules;
-  },
-});

packages/editor/core/src/ui/extensions/typography/inputRules.ts

@@ -1,137 +0,0 @@
-import { textInputRule } from "@tiptap/core";
-
-export interface TypographyOptions {
-  emDash: false | string;
-  ellipsis: false | string;
-  leftArrow: false | string;
-  rightArrow: false | string;
-  copyright: false | string;
-  trademark: false | string;
-  servicemark: false | string;
-  registeredTrademark: false | string;
-  oneHalf: false | string;
-  plusMinus: false | string;
-  notEqual: false | string;
-  laquo: false | string;
-  raquo: false | string;
-  multiplication: false | string;
-  superscriptTwo: false | string;
-  superscriptThree: false | string;
-  oneQuarter: false | string;
-  threeQuarters: false | string;
-  impliesArrowRight: false | string;
-}
-
-export const emDash = (override?: string) =>
-  textInputRule({
-    find: /--$/,
-    replace: override ?? "—",
-  });
-
-export const impliesArrowRight = (override?: string) =>
-  textInputRule({
-    find: /=>$/,
-    replace: override ?? "⇒",
-  });
-
-export const leftArrow = (override?: string) =>
-  textInputRule({
-    find: /<-$/,
-    replace: override ?? "←",
-  });
-
-export const rightArrow = (override?: string) =>
-  textInputRule({
-    find: /->$/,
-    replace: override ?? "→",
-  });
-
-export const ellipsis = (override?: string) =>
-  textInputRule({
-    find: /\.\.\.$/,
-    replace: override ?? "…",
-  });
-
-export const copyright = (override?: string) =>
-  textInputRule({
-    find: /\(c\)$/,
-    replace: override ?? "©",
-  });
-
-export const trademark = (override?: string) =>
-  textInputRule({
-    find: /\(tm\)$/,
-    replace: override ?? "™",
-  });
-
-export const servicemark = (override?: string) =>
-  textInputRule({
-    find: /\(sm\)$/,
-    replace: override ?? "℠",
-  });
-
-export const registeredTrademark = (override?: string) =>
-  textInputRule({
-    find: /\(r\)$/,
-    replace: override ?? "®",
-  });
-
-export const oneHalf = (override?: string) =>
-  textInputRule({
-    find: /(?:^|\s)(1\/2)\s$/,
-    replace: override ?? "½",
-  });
-
-export const plusMinus = (override?: string) =>
-  textInputRule({
-    find: /\+\/-$/,
-    replace: override ?? "±",
-  });
-
-export const notEqual = (override?: string) =>
-  textInputRule({
-    find: /!=$/,
-    replace: override ?? "≠",
-  });
-
-export const laquo = (override?: string) =>
-  textInputRule({
-    find: /<<$/,
-    replace: override ?? "«",
-  });
-
-export const raquo = (override?: string) =>
-  textInputRule({
-    find: />>$/,
-    replace: override ?? "»",
-  });
-
-export const multiplication = (override?: string) =>
-  textInputRule({
-    find: /\d+\s?([*x])\s?\d+$/,
-    replace: override ?? "×",
-  });
-
-export const superscriptTwo = (override?: string) =>
-  textInputRule({
-    find: /\^2$/,
-    replace: override ?? "²",
-  });
-
-export const superscriptThree = (override?: string) =>
-  textInputRule({
-    find: /\^3$/,
-    replace: override ?? "³",
-  });
-
-export const oneQuarter = (override?: string) =>
-  textInputRule({
-    find: /(?:^|\s)(1\/4)\s$/,
-    replace: override ?? "¼",
-  });
-
-export const threeQuarters = (override?: string) =>
-  textInputRule({
-    find: /(?:^|\s)(3\/4)\s$/,
-    replace: override ?? "¾",
-  });

packages/editor/core/src/ui/props.tsx

@@ -42,6 +42,15 @@ export function CoreEditorProps(
       return false;
     },
     handleDrop: (view, event, _slice, moved) => {
+      if (typeof window !== "undefined") {
+        const selection: any = window?.getSelection();
+        if (selection.rangeCount !== 0) {
+          const range = selection.getRangeAt(0);
+          if (findTableAncestor(range.startContainer)) {
+            return;
+          }
+        }
+      }
       if (!moved && event.dataTransfer && event.dataTransfer.files && event.dataTransfer.files[0]) {
         event.preventDefault();
         const file = event.dataTransfer.files[0];

packages/editor/document-editor/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@plane/document-editor",
-  "version": "0.16.0",
+  "version": "0.15.0",
   "description": "Package that powers Plane's Pages Editor",
   "main": "./dist/index.mjs",
   "module": "./dist/index.mjs",
@@ -37,6 +37,7 @@
     "@tiptap/extension-placeholder": "^2.1.13",
     "@tiptap/pm": "^2.1.13",
     "@tiptap/suggestion": "^2.1.13",
+    "eslint-config-next": "13.2.4",
     "lucide-react": "^0.309.0",
     "react-popper": "^2.3.0",
     "tippy.js": "^6.3.7",
@@ -46,7 +47,7 @@
     "@types/node": "18.15.3",
     "@types/react": "^18.2.42",
     "@types/react-dom": "^18.2.17",
-    "eslint-config-custom": "*",
+    "eslint": "8.36.0",
     "postcss": "^8.4.29",
     "tailwind-config-custom": "*",
     "tsconfig": "*",

packages/editor/document-editor/src/ui/components/content-browser.tsx

@@ -6,16 +6,10 @@ import { scrollSummary } from "src/utils/editor-summary-utils";
 interface ContentBrowserProps {
   editor: Editor;
   markings: IMarking[];
-  setSidePeekVisible?: (sidePeekState: boolean) => void;
 }
 
 export const ContentBrowser = (props: ContentBrowserProps) => {
-  const { editor, markings, setSidePeekVisible } = props;
-
-  const handleOnClick = (marking: IMarking) => {
-    scrollSummary(editor, marking);
-    if (setSidePeekVisible) setSidePeekVisible(false);
-  };
+  const { editor, markings } = props;
 
   return (
     <div className="flex h-full flex-col overflow-hidden">
@@ -24,11 +18,11 @@ export const ContentBrowser = (props: ContentBrowserProps) => {
         {markings.length !== 0 ? (
           markings.map((marking) =>
             marking.level === 1 ? (
-              <HeadingComp onClick={() => handleOnClick(marking)} heading={marking.text} />
+              <HeadingComp onClick={() => scrollSummary(editor, marking)} heading={marking.text} />
             ) : marking.level === 2 ? (
-              <SubheadingComp onClick={() => handleOnClick(marking)} subHeading={marking.text} />
+              <SubheadingComp onClick={() => scrollSummary(editor, marking)} subHeading={marking.text} />
             ) : (
-              <HeadingThreeComp heading={marking.text} onClick={() => handleOnClick(marking)} />
+              <HeadingThreeComp heading={marking.text} onClick={() => scrollSummary(editor, marking)} />
             )
           )
         ) : (