dev: update the presigned url function

.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: [vihar, pushya22]
+assignees: [srinivaspendem, pushya22]
 body:
 - type: markdown
   attributes:

.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: [vihar, pushya22]
+assignees: [srinivaspendem, pushya22]
 body:
 - type: markdown
   attributes:

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

@@ -2,11 +2,6 @@ name: Build AIO Base Image
 
 on:
   workflow_dispatch:
-    inputs:
-      base_tag_name:
-        description: 'Base Tag Name'
-        required: false
-        default: ''
 
 env:
   TARGET_BRANCH: ${{ github.ref_name }}
@@ -21,46 +16,37 @@ jobs:
       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 }}
-      image_tag: ${{ steps.set_env_variables.outputs.IMAGE_TAG }}
+      build_base: ${{ steps.changed_files.outputs.base_any_changed }}
 
     steps:
       - id: set_env_variables
         name: Set Environment Variables
         run: |
+          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
           echo "TARGET_BRANCH=${{ env.TARGET_BRANCH }}" >> $GITHUB_OUTPUT
 
-          if [ "${{ github.event.inputs.base_tag_name }}" != "" ]; then
-            echo "IMAGE_TAG=${{ github.event.inputs.base_tag_name }}" >> $GITHUB_OUTPUT
-          elif [ "${{ env.TARGET_BRANCH }}" == "master" ]; then
-            echo "IMAGE_TAG=latest" >> $GITHUB_OUTPUT
-          elif [ "${{ env.TARGET_BRANCH }}" == "preview" ]; then
-              echo "IMAGE_TAG=preview" >> $GITHUB_OUTPUT
-          else
-            echo "IMAGE_TAG=develop" >> $GITHUB_OUTPUT
-          fi
-
-
-          if [ "${{ env.TARGET_BRANCH }}" == "master" ]; 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
-
       - id: checkout_files
         name: Checkout Files
         uses: actions/checkout@v4
 
-  full_base_build_push:
+      - name: Get changed files
+        id: changed_files
+        uses: tj-actions/changed-files@v42
+        with:
+          files_yaml: |
+            base: 
+              - aio/Dockerfile.base
+
+  base_build_push:
+    if: ${{ needs.base_build_setup.outputs.build_base == 'true' || github.event_name == 'workflow_dispatch' || needs.base_build_setup.outputs.gh_branch_name == 'master' }}
     runs-on: ubuntu-latest
     needs: [base_build_setup]
     env:
-      BASE_IMG_TAG: makeplane/plane-aio-base:full-${{ needs.base_build_setup.outputs.image_tag }}
+      BASE_IMG_TAG: makeplane/plane-aio-base:${{ needs.base_build_setup.outputs.gh_branch_name }}
+      TARGET_BRANCH: ${{ needs.base_build_setup.outputs.gh_branch_name }}
       BUILDX_DRIVER: ${{ needs.base_build_setup.outputs.gh_buildx_driver }}
       BUILDX_VERSION: ${{ needs.base_build_setup.outputs.gh_buildx_version }}
       BUILDX_PLATFORMS: ${{ needs.base_build_setup.outputs.gh_buildx_platforms }}
@@ -69,6 +55,15 @@ jobs:
       - name: Check out the repo
         uses: actions/checkout@v4
 
+      - name: Set Docker Tag
+        run: |
+          if [ "${{ env.TARGET_BRANCH }}" == "master" ]; then
+            TAG=makeplane/plane-aio-base:latest
+          else
+            TAG=${{ env.BASE_IMG_TAG }}
+          fi
+          echo "BASE_IMG_TAG=${TAG}" >> $GITHUB_ENV
+
       - name: Login to Docker Hub
         uses: docker/login-action@v3
         with:
@@ -86,53 +81,10 @@ jobs:
         uses: docker/build-push-action@v5.1.0
         with:
           context: ./aio
-          file: ./aio/Dockerfile-base-full
+          file: ./aio/Dockerfile.base
           platforms: ${{ env.BUILDX_PLATFORMS }}
           tags: ${{ env.BASE_IMG_TAG }}
           push: true
-          cache-from: type=gha
-          cache-to: type=gha,mode=max
-        env:
-          DOCKER_BUILDKIT: 1
-          DOCKER_USERNAME: ${{ secrets.DOCKERHUB_USERNAME }}
-          DOCKER_PASSWORD: ${{ secrets.DOCKERHUB_TOKEN }}
-
-  slim_base_build_push:
-    runs-on: ubuntu-latest
-    needs: [base_build_setup]
-    env:
-      BASE_IMG_TAG: makeplane/plane-aio-base:slim-${{ needs.base_build_setup.outputs.image_tag }}
-      BUILDX_DRIVER: ${{ needs.base_build_setup.outputs.gh_buildx_driver }}
-      BUILDX_VERSION: ${{ needs.base_build_setup.outputs.gh_buildx_version }}
-      BUILDX_PLATFORMS: ${{ needs.base_build_setup.outputs.gh_buildx_platforms }}
-      BUILDX_ENDPOINT: ${{ needs.base_build_setup.outputs.gh_buildx_endpoint }}
-    steps:
-      - name: Check out the repo
-        uses: actions/checkout@v4
-
-      - name: Login to Docker Hub
-        uses: docker/login-action@v3
-        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: Build and Push to Docker Hub
-        uses: docker/build-push-action@v5.1.0
-        with:
-          context: ./aio
-          file: ./aio/Dockerfile-base-slim
-          platforms: ${{ env.BUILDX_PLATFORMS }}
-          tags: ${{ env.BASE_IMG_TAG }}
-          push: true
-          cache-from: type=gha
-          cache-to: type=gha,mode=max
         env:
           DOCKER_BUILDKIT: 1
           DOCKER_USERNAME: ${{ secrets.DOCKERHUB_USERNAME }}

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

@@ -1,207 +0,0 @@
-name: Branch Build AIO
-
-on:
-  workflow_dispatch:
-    inputs:
-      full:
-        description: 'Run full build'
-        type: boolean
-        required: false
-        default: false
-      slim:
-        description: 'Run slim build'
-        type: boolean
-        required: false
-        default: false
-      base_tag_name:
-        description: 'Base Tag Name'
-        required: false
-        default: ''
-  release:
-    types: [released, prereleased]
-
-env:
-  TARGET_BRANCH: ${{ github.ref_name || github.event.release.target_commitish }}
-  FULL_BUILD_INPUT: ${{ github.event.inputs.full }}
-  SLIM_BUILD_INPUT: ${{ github.event.inputs.slim }}
-
-jobs:
-  branch_build_setup:
-    name: Build Setup
-    runs-on: ubuntu-latest
-    outputs:
-      gh_branch_name: ${{ steps.set_env_variables.outputs.TARGET_BRANCH }}
-      flat_branch_name: ${{ steps.set_env_variables.outputs.FLAT_BRANCH_NAME }}
-      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 }}
-      aio_base_tag: ${{ steps.set_env_variables.outputs.AIO_BASE_TAG }}
-      do_full_build: ${{ steps.set_env_variables.outputs.DO_FULL_BUILD }}
-      do_slim_build: ${{ steps.set_env_variables.outputs.DO_SLIM_BUILD }}
-
-    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
-
-            echo "AIO_BASE_TAG=latest" >> $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
-
-            if [ "${{ github.event_name}}" == "workflow_dispatch" ] && [ "${{ github.event.inputs.base_tag_name }}" != "" ]; then
-              echo "AIO_BASE_TAG=${{ github.event.inputs.base_tag_name }}" >> $GITHUB_OUTPUT
-            elif [ "${{ env.TARGET_BRANCH }}" == "preview" ]; then
-              echo "AIO_BASE_TAG=preview" >> $GITHUB_OUTPUT
-            else
-              echo "AIO_BASE_TAG=develop" >> $GITHUB_OUTPUT
-            fi
-          fi
-          echo "TARGET_BRANCH=${{ env.TARGET_BRANCH }}" >> $GITHUB_OUTPUT
-
-          if [ "${{ env.FULL_BUILD_INPUT }}" == "true" ] || [ "${{github.event_name}}" == "push" ] || [ "${{github.event_name}}" == "release" ]; then
-            echo "DO_FULL_BUILD=true" >> $GITHUB_OUTPUT
-          else
-            echo "DO_FULL_BUILD=false" >> $GITHUB_OUTPUT
-          fi
-
-          if [ "${{ env.SLIM_BUILD_INPUT }}" == "true" ] || [ "${{github.event_name}}" == "push" ] || [ "${{github.event_name}}" == "release" ]; then
-            echo "DO_SLIM_BUILD=true" >> $GITHUB_OUTPUT
-          else
-            echo "DO_SLIM_BUILD=false" >> $GITHUB_OUTPUT
-          fi
-
-          FLAT_BRANCH_NAME=$(echo "${{ env.TARGET_BRANCH }}" | sed 's/[^a-zA-Z0-9]/-/g')
-          echo "FLAT_BRANCH_NAME=$FLAT_BRANCH_NAME" >> $GITHUB_OUTPUT
-
-      - id: checkout_files
-        name: Checkout Files
-        uses: actions/checkout@v4
-
-  full_build_push:
-    if: ${{ needs.branch_build_setup.outputs.do_full_build == 'true' }}
-    runs-on: ubuntu-20.04
-    needs: [branch_build_setup]
-    env:
-      BUILD_TYPE: full
-      AIO_BASE_TAG: ${{ needs.branch_build_setup.outputs.aio_base_tag }}
-      AIO_IMAGE_TAGS: makeplane/plane-aio:full-${{ needs.branch_build_setup.outputs.flat_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 Docker Tag
-        run: |
-          if [ "${{ github.event_name }}" == "release" ]; then
-            TAG=makeplane/plane-aio:${{env.BUILD_TYPE}}-stable,makeplane/plane-aio:${{env.BUILD_TYPE}}-${{ github.event.release.tag_name }}
-          elif [ "${{ env.TARGET_BRANCH }}" == "master" ]; then
-            TAG=makeplane/plane-aio:${{env.BUILD_TYPE}}-latest
-          else
-            TAG=${{ env.AIO_IMAGE_TAGS }}
-          fi
-          echo "AIO_IMAGE_TAGS=${TAG}" >> $GITHUB_ENV
-
-      - name: Login to Docker Hub
-        uses: docker/login-action@v3
-        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
-
-      - name: Build and Push to Docker Hub
-        uses: docker/build-push-action@v5.1.0
-        with:
-          context: .
-          file: ./aio/Dockerfile-app
-          platforms: ${{ env.BUILDX_PLATFORMS }}
-          tags: ${{ env.AIO_IMAGE_TAGS }}
-          push: true
-          build-args: |
-            BASE_TAG=${{ env.AIO_BASE_TAG }}
-            BUILD_TYPE=${{env.BUILD_TYPE}}
-          cache-from: type=gha
-          cache-to: type=gha,mode=max
-
-        env:
-          DOCKER_BUILDKIT: 1
-          DOCKER_USERNAME: ${{ secrets.DOCKERHUB_USERNAME }}
-          DOCKER_PASSWORD: ${{ secrets.DOCKERHUB_TOKEN }}
-
-  slim_build_push:
-    if: ${{ needs.branch_build_setup.outputs.do_slim_build == 'true' }}
-    runs-on: ubuntu-20.04
-    needs: [branch_build_setup]
-    env:
-      BUILD_TYPE: slim
-      AIO_BASE_TAG: ${{ needs.branch_build_setup.outputs.aio_base_tag }}
-      AIO_IMAGE_TAGS: makeplane/plane-aio:slim-${{ needs.branch_build_setup.outputs.flat_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 Docker Tag
-        run: |
-          if [ "${{ github.event_name }}" == "release" ]; then
-            TAG=makeplane/plane-aio:${{env.BUILD_TYPE}}-stable,makeplane/plane-aio:${{env.BUILD_TYPE}}-${{ github.event.release.tag_name }}
-          elif [ "${{ env.TARGET_BRANCH }}" == "master" ]; then
-            TAG=makeplane/plane-aio:${{env.BUILD_TYPE}}-latest
-          else
-            TAG=${{ env.AIO_IMAGE_TAGS }}
-          fi
-          echo "AIO_IMAGE_TAGS=${TAG}" >> $GITHUB_ENV
-
-      - name: Login to Docker Hub
-        uses: docker/login-action@v3
-        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
-
-      - name: Build and Push to Docker Hub
-        uses: docker/build-push-action@v5.1.0
-        with:
-          context: .
-          file: ./aio/Dockerfile-app
-          platforms: ${{ env.BUILDX_PLATFORMS }}
-          tags: ${{ env.AIO_IMAGE_TAGS }}
-          push: true
-          build-args: |
-            BASE_TAG=${{ env.AIO_BASE_TAG }}
-            BUILD_TYPE=${{env.BUILD_TYPE}}
-          cache-from: type=gha
-          cache-to: type=gha,mode=max
-
-        env:
-          DOCKER_BUILDKIT: 1
-          DOCKER_USERNAME: ${{ secrets.DOCKERHUB_USERNAME }}
-          DOCKER_PASSWORD: ${{ secrets.DOCKERHUB_TOKEN }}

.github/workflows/feature-deployment.yml

@@ -3,108 +3,189 @@ name: Feature Preview
 on:
   workflow_dispatch:
     inputs:
-      base_tag_name:
-        description: 'Base Tag Name'
+      web-build:
         required: false
-        default: 'preview'
+        description: "Build Web"
+        type: boolean
+        default: true
+      space-build:
+        required: false
+        description: "Build Space"
+        type: boolean
+        default: false
+      admin-build:
+        required: false
+        description: "Build Admin"
+        type: boolean
+        default: false
 
 env:
-  TARGET_BRANCH: ${{ github.ref_name }}
+  BUILD_WEB: ${{ github.event.inputs.web-build }}
+  BUILD_SPACE: ${{ github.event.inputs.space-build }}
+  BUILD_ADMIN: ${{ github.event.inputs.admin-build }}
 
 jobs:
-  branch_build_setup:
-    name: Build Setup
+  setup-feature-build:
+    name: Feature Build Setup
     runs-on: ubuntu-latest
-    outputs:
-      gh_branch_name: ${{ steps.set_env_variables.outputs.TARGET_BRANCH }}
-      flat_branch_name: ${{ steps.set_env_variables.outputs.FLAT_BRANCH_NAME }}
-      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 }}
-      aio_base_tag: ${{ steps.set_env_variables.outputs.AIO_BASE_TAG }}
-      do_full_build: ${{ steps.set_env_variables.outputs.DO_FULL_BUILD }}
-      do_slim_build: ${{ steps.set_env_variables.outputs.DO_SLIM_BUILD }}
-
     steps:
-      - id: set_env_variables
-        name: Set Environment Variables
+      - name: Checkout
         run: |
-          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
-
-          if [ "${{ github.event.inputs.base_tag_name }}" != "" ]; then
-            echo "AIO_BASE_TAG=${{ github.event.inputs.base_tag_name }}" >> $GITHUB_OUTPUT
-          else
-            echo "AIO_BASE_TAG=develop" >> $GITHUB_OUTPUT
-          fi
-
-          echo "TARGET_BRANCH=${{ env.TARGET_BRANCH }}" >> $GITHUB_OUTPUT
-
-          FLAT_BRANCH_NAME=$(echo "${{ env.TARGET_BRANCH }}" | sed 's/[^a-zA-Z0-9]/-/g')
-          echo "FLAT_BRANCH_NAME=$FLAT_BRANCH_NAME" >> $GITHUB_OUTPUT
-
-      - id: checkout_files
-        name: Checkout Files
-        uses: actions/checkout@v4
-
-  full_build_push:
-    runs-on: ubuntu-20.04
-    needs: [branch_build_setup]
-    env:
-      BUILD_TYPE: full
-      AIO_BASE_TAG: ${{ needs.branch_build_setup.outputs.aio_base_tag }}
-      AIO_IMAGE_TAGS: makeplane/plane-aio-feature:${{ needs.branch_build_setup.outputs.flat_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: Login to Docker Hub
-        uses: docker/login-action@v3
-        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
-
-      - name: Build and Push to Docker Hub
-        uses: docker/build-push-action@v5.1.0
-        with:
-          context: .
-          file: ./aio/Dockerfile-app
-          platforms: ${{ env.BUILDX_PLATFORMS }}
-          tags: ${{ env.AIO_IMAGE_TAGS }}
-          push: true
-          build-args: 
-            BUILD_TAG=${{ env.AIO_BASE_TAG }}
-            BUILD_TYPE=${{env.BUILD_TYPE}}
-          # cache-from: type=gha
-          # cache-to: type=gha,mode=max
-        env:
-          DOCKER_BUILDKIT: 1
-          DOCKER_USERNAME: ${{ secrets.DOCKERHUB_USERNAME }}
-          DOCKER_PASSWORD: ${{ secrets.DOCKERHUB_TOKEN }}
+          echo "BUILD_WEB=$BUILD_WEB" 
+          echo "BUILD_SPACE=$BUILD_SPACE"
+          echo "BUILD_ADMIN=$BUILD_ADMIN"
     outputs:
-      AIO_IMAGE_TAGS: ${{ env.AIO_IMAGE_TAGS }}
+      web-build: ${{ env.BUILD_WEB}}
+      space-build: ${{env.BUILD_SPACE}}
+      admin-build: ${{env.BUILD_ADMIN}}
+
+  feature-build-web:
+    if: ${{ needs.setup-feature-build.outputs.web-build == 'true' }}
+    needs: setup-feature-build
+    name: Feature Build Web
+    runs-on: ubuntu-latest
+    env:
+      AWS_ACCESS_KEY_ID: ${{ vars.FEATURE_PREVIEW_AWS_ACCESS_KEY_ID }}
+      AWS_SECRET_ACCESS_KEY: ${{ secrets.FEATURE_PREVIEW_AWS_SECRET_ACCESS_KEY }}
+      AWS_BUCKET: ${{ vars.FEATURE_PREVIEW_AWS_BUCKET }}
+      NEXT_PUBLIC_API_BASE_URL: ${{ vars.FEATURE_PREVIEW_NEXT_PUBLIC_API_BASE_URL }}
+    steps:
+      - name: Set up Node.js
+        uses: actions/setup-node@v4
+        with:
+          node-version: "18"
+      - name: Install AWS cli
+        run: |
+          sudo apt-get update
+          sudo apt-get install -y python3-pip
+          pip3 install awscli
+      - name: Checkout
+        uses: actions/checkout@v4
+        with:
+          path: plane
+      - name: Install Dependencies
+        run: |
+          cd $GITHUB_WORKSPACE/plane
+          yarn install
+      - name: Build Web
+        id: build-web
+        run: |
+          cd $GITHUB_WORKSPACE/plane
+          yarn build --filter=web
+          cd $GITHUB_WORKSPACE
+
+          TAR_NAME="web.tar.gz"
+          tar -czf $TAR_NAME ./plane
+
+          FILE_EXPIRY=$(date -u -d "+2 days" +"%Y-%m-%dT%H:%M:%SZ")
+          aws s3 cp $TAR_NAME s3://${{ env.AWS_BUCKET }}/${{github.sha}}/$TAR_NAME --expires $FILE_EXPIRY
+
+  feature-build-space:
+    if: ${{ needs.setup-feature-build.outputs.space-build == 'true' }}
+    needs: setup-feature-build
+    name: Feature Build Space
+    runs-on: ubuntu-latest
+    env:
+      AWS_ACCESS_KEY_ID: ${{ vars.FEATURE_PREVIEW_AWS_ACCESS_KEY_ID }}
+      AWS_SECRET_ACCESS_KEY: ${{ secrets.FEATURE_PREVIEW_AWS_SECRET_ACCESS_KEY }}
+      AWS_BUCKET: ${{ vars.FEATURE_PREVIEW_AWS_BUCKET }}
+      NEXT_PUBLIC_SPACE_BASE_PATH: "/spaces"
+      NEXT_PUBLIC_API_BASE_URL: ${{ vars.FEATURE_PREVIEW_NEXT_PUBLIC_API_BASE_URL }}
+    outputs:
+      do-build: ${{ needs.setup-feature-build.outputs.space-build }}
+      s3-url: ${{ steps.build-space.outputs.S3_PRESIGNED_URL }}
+    steps:
+      - name: Set up Node.js
+        uses: actions/setup-node@v4
+        with:
+          node-version: "18"
+      - name: Install AWS cli
+        run: |
+          sudo apt-get update
+          sudo apt-get install -y python3-pip
+          pip3 install awscli
+      - name: Checkout
+        uses: actions/checkout@v4
+        with:
+          path: plane
+      - name: Install Dependencies
+        run: |
+          cd $GITHUB_WORKSPACE/plane
+          yarn install
+      - name: Build Space
+        id: build-space
+        run: |
+          cd $GITHUB_WORKSPACE/plane
+          yarn build --filter=space
+          cd $GITHUB_WORKSPACE
+
+          TAR_NAME="space.tar.gz"
+          tar -czf $TAR_NAME ./plane
+
+          FILE_EXPIRY=$(date -u -d "+2 days" +"%Y-%m-%dT%H:%M:%SZ")
+          aws s3 cp $TAR_NAME s3://${{ env.AWS_BUCKET }}/${{github.sha}}/$TAR_NAME --expires $FILE_EXPIRY
+
+  feature-build-admin:
+    if: ${{ needs.setup-feature-build.outputs.admin-build == 'true' }}
+    needs: setup-feature-build
+    name: Feature Build Admin
+    runs-on: ubuntu-latest
+    env:
+      AWS_ACCESS_KEY_ID: ${{ vars.FEATURE_PREVIEW_AWS_ACCESS_KEY_ID }}
+      AWS_SECRET_ACCESS_KEY: ${{ secrets.FEATURE_PREVIEW_AWS_SECRET_ACCESS_KEY }}
+      AWS_BUCKET: ${{ vars.FEATURE_PREVIEW_AWS_BUCKET }}
+      NEXT_PUBLIC_ADMIN_BASE_PATH: "/god-mode"
+      NEXT_PUBLIC_API_BASE_URL: ${{ vars.FEATURE_PREVIEW_NEXT_PUBLIC_API_BASE_URL }}
+    outputs:
+      do-build: ${{ needs.setup-feature-build.outputs.admin-build }}
+      s3-url: ${{ steps.build-admin.outputs.S3_PRESIGNED_URL }}
+    steps:
+      - name: Set up Node.js
+        uses: actions/setup-node@v4
+        with:
+          node-version: "18"
+      - name: Install AWS cli
+        run: |
+          sudo apt-get update
+          sudo apt-get install -y python3-pip
+          pip3 install awscli
+      - name: Checkout
+        uses: actions/checkout@v4
+        with:
+          path: plane
+      - name: Install Dependencies
+        run: |
+          cd $GITHUB_WORKSPACE/plane
+          yarn install
+      - name: Build Admin
+        id: build-admin
+        run: |
+          cd $GITHUB_WORKSPACE/plane
+          yarn build --filter=admin
+          cd $GITHUB_WORKSPACE
+
+          TAR_NAME="admin.tar.gz"
+          tar -czf $TAR_NAME ./plane
+
+          FILE_EXPIRY=$(date -u -d "+2 days" +"%Y-%m-%dT%H:%M:%SZ")
+          aws s3 cp $TAR_NAME s3://${{ env.AWS_BUCKET }}/${{github.sha}}/$TAR_NAME --expires $FILE_EXPIRY
 
   feature-deploy:
-    needs: [branch_build_setup, full_build_push]
+    if: ${{ always() && (needs.setup-feature-build.outputs.web-build == 'true' || needs.setup-feature-build.outputs.space-build == 'true' || needs.setup-feature-build.outputs.admin-build == 'true') }}
+    needs:
+      [
+        setup-feature-build,
+        feature-build-web,
+        feature-build-space,
+        feature-build-admin,
+      ]
     name: Feature Deploy
     runs-on: ubuntu-latest
     env:
+      AWS_ACCESS_KEY_ID: ${{ vars.FEATURE_PREVIEW_AWS_ACCESS_KEY_ID }}
+      AWS_SECRET_ACCESS_KEY: ${{ secrets.FEATURE_PREVIEW_AWS_SECRET_ACCESS_KEY }}
+      AWS_BUCKET: ${{ vars.FEATURE_PREVIEW_AWS_BUCKET }}
       KUBE_CONFIG_FILE: ${{ secrets.FEATURE_PREVIEW_KUBE_CONFIG }}
-      DEPLOYMENT_NAME: ${{ needs.branch_build_setup.outputs.flat_branch_name }}
     steps:
       - name: Install AWS cli
         run: |
@@ -132,37 +213,54 @@ jobs:
           ./get_helm.sh
       - name: App Deploy
         run: |
-          helm --kube-insecure-skip-tls-verify repo add feature-preview ${{ vars.FEATURE_PREVIEW_HELM_CHART_URL }} 
+          WEB_S3_URL=""
+          if [ ${{ env.BUILD_WEB }} == true ]; then
+            WEB_S3_URL=$(aws s3 presign s3://${{ vars.FEATURE_PREVIEW_AWS_BUCKET }}/${{github.sha}}/web.tar.gz --expires-in 3600)
+          fi
 
-          APP_NAMESPACE="${{ vars.FEATURE_PREVIEW_NAMESPACE }}"
+          SPACE_S3_URL=""
+          if [ ${{ env.BUILD_SPACE }} == true ]; then
+            SPACE_S3_URL=$(aws s3 presign s3://${{ vars.FEATURE_PREVIEW_AWS_BUCKET }}/${{github.sha}}/space.tar.gz --expires-in 3600)
+          fi
 
-          helm --kube-insecure-skip-tls-verify  uninstall \
-            ${{ env.DEPLOYMENT_NAME }} \
-            --namespace $APP_NAMESPACE \
-            --timeout 10m0s \
-            --wait \
-            --ignore-not-found
+          ADMIN_S3_URL=""
+          if [ ${{ env.BUILD_ADMIN }} == true ]; then
+            ADMIN_S3_URL=$(aws s3 presign s3://${{ vars.FEATURE_PREVIEW_AWS_BUCKET }}/${{github.sha}}/admin.tar.gz --expires-in 3600)
+          fi
 
-          METADATA=$(helm --kube-insecure-skip-tls-verify upgrade \
-              --install=true \
-              --namespace $APP_NAMESPACE \
-              --set dockerhub.loginid=${{ secrets.DOCKERHUB_USERNAME }} \
-              --set dockerhub.password=${{ secrets.DOCKERHUB_TOKEN_RO}} \
-              --set config.feature_branch=${{ env.DEPLOYMENT_NAME }} \
-              --set ingress.primaryDomain=${{vars.FEATURE_PREVIEW_PRIMARY_DOMAIN || 'feature.plane.tools' }} \
-              --set ingress.tls_secret=${{vars.FEATURE_PREVIEW_INGRESS_TLS_SECRET || '' }} \
-              --output json \
-              --timeout 10m0s \
-              --wait \
-              ${{ env.DEPLOYMENT_NAME }}  feature-preview/${{ vars.FEATURE_PREVIEW_HELM_CHART_NAME }} )
+          if [ ${{ env.BUILD_WEB }} == true ] || [ ${{ env.BUILD_SPACE }} == true ] || [ ${{ env.BUILD_ADMIN }} == true ]; then
 
-          APP_NAME=$(echo $METADATA | jq -r '.name')
+            helm --kube-insecure-skip-tls-verify repo add feature-preview ${{ vars.FEATURE_PREVIEW_HELM_CHART_URL }} 
 
-          INGRESS_HOSTNAME=$(kubectl get ingress -n $APP_NAMESPACE --insecure-skip-tls-verify \
-              -o jsonpath='{.items[?(@.metadata.annotations.meta\.helm\.sh\/release-name=="'$APP_NAME'")]}' | \
-              jq -r '.spec.rules[0].host')
+            APP_NAMESPACE="${{ vars.FEATURE_PREVIEW_NAMESPACE }}"
+            DEPLOY_SCRIPT_URL="${{ vars.FEATURE_PREVIEW_DEPLOY_SCRIPT_URL }}"
 
-          echo "****************************************"
-          echo "APP NAME ::: $APP_NAME"
-          echo "INGRESS HOSTNAME ::: $INGRESS_HOSTNAME"
-          echo "****************************************"
+            METADATA=$(helm --kube-insecure-skip-tls-verify install feature-preview/${{ vars.FEATURE_PREVIEW_HELM_CHART_NAME }} \
+                --generate-name \
+                --namespace $APP_NAMESPACE \
+                --set ingress.primaryDomain=${{vars.FEATURE_PREVIEW_PRIMARY_DOMAIN || 'feature.plane.tools' }} \
+                --set web.image=${{vars.FEATURE_PREVIEW_DOCKER_BASE}} \
+                --set web.enabled=${{ env.BUILD_WEB || false }} \
+                --set web.artifact_url=$WEB_S3_URL \
+                --set space.image=${{vars.FEATURE_PREVIEW_DOCKER_BASE}} \
+                --set space.enabled=${{ env.BUILD_SPACE || false }} \
+                --set space.artifact_url=$SPACE_S3_URL \
+                --set admin.image=${{vars.FEATURE_PREVIEW_DOCKER_BASE}} \
+                --set admin.enabled=${{ env.BUILD_ADMIN || false }} \
+                --set admin.artifact_url=$ADMIN_S3_URL \
+                --set shared_config.deploy_script_url=$DEPLOY_SCRIPT_URL \
+                --set shared_config.api_base_url=${{vars.FEATURE_PREVIEW_NEXT_PUBLIC_API_BASE_URL}} \
+                --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 "****************************************"
+          fi

ENV_SETUP.md

@@ -1,5 +1,6 @@
 # Environment Variables
 
+​
 Environment variables are distributed in various files. Please refer them carefully.
 
 ## {PROJECT_FOLDER}/.env
@@ -8,13 +9,17 @@ File is available in the project root folder​
 
 ```
 # Database Settings
-POSTGRES_USER="plane"
-POSTGRES_PASSWORD="plane"
-POSTGRES_DB="plane"
-PGDATA="/var/lib/postgresql/data"
+PGUSER="plane"
+PGPASSWORD="plane"
+PGHOST="plane-db"
+PGDATABASE="plane"
+DATABASE_URL=postgresql://${PGUSER}:${PGPASSWORD}@${PGHOST}/${PGDATABASE}
+​
 # Redis Settings
 REDIS_HOST="plane-redis"
 REDIS_PORT="6379"
+REDIS_URL="redis://${REDIS_HOST}:6379/"
+​
 # AWS Settings
 AWS_REGION=""
 AWS_ACCESS_KEY_ID="access-key"
@@ -24,39 +29,63 @@ AWS_S3_ENDPOINT_URL="http://plane-minio:9000"
 AWS_S3_BUCKET_NAME="uploads"
 # Maximum file upload limit
 FILE_SIZE_LIMIT=5242880
+​
 # GPT settings
 OPENAI_API_BASE="https://api.openai.com/v1" # deprecated
 OPENAI_API_KEY="sk-" # deprecated
 GPT_ENGINE="gpt-3.5-turbo" # deprecated
-# Settings related to Docker
-DOCKERIZED=1  # deprecated
+​
 # set to 1 If using the pre-configured minio setup
 USE_MINIO=1
+​
 # Nginx Configuration
 NGINX_PORT=80
 ```
 
+​
+
+## {PROJECT_FOLDER}/web/.env.example
+
+​
+
+```
+# Public boards deploy URL
+NEXT_PUBLIC_DEPLOY_URL="http://localhost/spaces"
+```
+
 ## {PROJECT_FOLDER}/apiserver/.env
 
+​
+
 ```
 # Backend
 # Debug value for api server use it as 0 for production use
 DEBUG=0
-CORS_ALLOWED_ORIGINS="http://localhost"
+​
 # Error logs
 SENTRY_DSN=""
-SENTRY_ENVIRONMENT="development"
+​
 # Database Settings
-POSTGRES_USER="plane"
-POSTGRES_PASSWORD="plane"
-POSTGRES_HOST="plane-db"
-POSTGRES_DB="plane"
-POSTGRES_PORT=5432
-DATABASE_URL=postgresql://${POSTGRES_USER}:${POSTGRES_PASSWORD}@${POSTGRES_HOST}:${POSTGRES_PORT}/${POSTGRES_DB}
+PGUSER="plane"
+PGPASSWORD="plane"
+PGHOST="plane-db"
+PGDATABASE="plane"
+DATABASE_URL=postgresql://${PGUSER}:${PGPASSWORD}@${PGHOST}/${PGDATABASE}
+​
 # Redis Settings
 REDIS_HOST="plane-redis"
 REDIS_PORT="6379"
 REDIS_URL="redis://${REDIS_HOST}:6379/"
+​
+# Email Settings
+EMAIL_HOST=""
+EMAIL_HOST_USER=""
+EMAIL_HOST_PASSWORD=""
+EMAIL_PORT=587
+EMAIL_FROM="Team Plane <team@mailer.plane.so>"
+EMAIL_USE_TLS="1"
+EMAIL_USE_SSL="0"
+​
 # AWS Settings
 AWS_REGION=""
 AWS_ACCESS_KEY_ID="access-key"
@@ -66,25 +95,35 @@ AWS_S3_ENDPOINT_URL="http://plane-minio:9000"
 AWS_S3_BUCKET_NAME="uploads"
 # Maximum file upload limit
 FILE_SIZE_LIMIT=5242880
+​
+# GPT settings
+OPENAI_API_BASE="https://api.openai.com/v1" # deprecated
+OPENAI_API_KEY="sk-" # deprecated
+GPT_ENGINE="gpt-3.5-turbo" # deprecated
+​
 # Settings related to Docker
-DOCKERIZED=1 # deprecated
+DOCKERIZED=1  # Deprecated
+
+# Github
+GITHUB_CLIENT_SECRET="" # For fetching release notes
+​
 # set to 1 If using the pre-configured minio setup
 USE_MINIO=1
+​
 # Nginx Configuration
 NGINX_PORT=80
-# Email redirections and minio domain settings
+​
+​
+# SignUps
+ENABLE_SIGNUP="1"
+​
+# Email Redirection URL
 WEB_URL="http://localhost"
-# Gunicorn Workers
-GUNICORN_WORKERS=2
-# Base URLs
-ADMIN_BASE_URL=
-SPACE_BASE_URL=
-APP_BASE_URL=
-SECRET_KEY="gxoytl7dmnc1y37zahah820z5iq3iozu38cnfjtu3yaau9cd9z"
 ```
 
 ## Updates​
 
+- The environment variable NEXT_PUBLIC_API_BASE_URL has been removed from both the web and space projects.
 - The naming convention for containers and images has been updated.
 - The plane-worker image will no longer be maintained, as it has been merged with plane-backend.
 - The Tiptap pro-extension dependency has been removed, eliminating the need for Tiptap API keys.

admin/app/ai/layout.tsx

@@ -3,7 +3,7 @@ import { Metadata } from "next";
 import { AdminLayout } from "@/layouts/admin-layout";
 
 export const metadata: Metadata = {
-  title: "Artificial Intelligence Settings - Plane Web",
+  title: "AI Settings - God Mode",
 };
 
 export default function AILayout({ children }: { children: ReactNode }) {

admin/app/ai/page.tsx

@@ -3,6 +3,8 @@
 import { observer } from "mobx-react";
 import useSWR from "swr";
 import { Loader } from "@plane/ui";
+// components
+import { PageHeader } from "@/components/common";
 // hooks
 import { useInstance } from "@/hooks/store";
 // components
@@ -16,6 +18,7 @@ const InstanceAIPage = observer(() => {
 
   return (
     <>
+      <PageHeader title="Artificial Intelligence - God Mode" />
       <div className="relative container mx-auto w-full h-full p-4 py-4 space-y-6 flex flex-col">
         <div className="border-b border-custom-border-100 mx-4 py-4 space-y-1 flex-shrink-0">
           <div className="text-xl font-medium text-custom-text-100">AI features for all your workspaces</div>

admin/app/authentication/github/form.tsx

@@ -10,7 +10,6 @@ import { IFormattedInstanceConfiguration, TInstanceGithubAuthenticationConfigura
 import { Button, TOAST_TYPE, getButtonStyling, setToast } from "@plane/ui";
 // components
 import {
-  CodeBlock,
   ConfirmDiscardModal,
   ControllerInput,
   CopyField,
@@ -103,8 +102,7 @@ export const InstanceGithubConfigForm: FC<Props> = (props) => {
       url: originURL,
       description: (
         <>
-          We will auto-generate this. Paste this into the{" "}
-          <CodeBlock darkerShade>Authorized origin URL</CodeBlock> field{" "}
+          We will auto-generate this. Paste this into the Authorized origin URL field{" "}
           <a
             tabIndex={-1}
             href="https://github.com/settings/applications/new"
@@ -123,8 +121,7 @@ export const InstanceGithubConfigForm: FC<Props> = (props) => {
       url: `${originURL}/auth/github/callback/`,
       description: (
         <>
-          We will auto-generate this. Paste this into your{" "}
-          <CodeBlock darkerShade>Authorized Callback URI</CodeBlock> field{" "}
+          We will auto-generate this. Paste this into your Authorized Callback URI field{" "}
           <a
             tabIndex={-1}
             href="https://github.com/settings/applications/new"
@@ -146,8 +143,8 @@ export const InstanceGithubConfigForm: FC<Props> = (props) => {
       .then((response = []) => {
         setToast({
           type: TOAST_TYPE.SUCCESS,
-          title: "Done!",
-          message: "Your GitHub authentication is configured. You should test it now.",
+          title: "Success",
+          message: "Github Configuration Settings updated successfully",
         });
         reset({
           GITHUB_CLIENT_ID: response.find((item) => item.key === "GITHUB_CLIENT_ID")?.value,
@@ -173,8 +170,8 @@ export const InstanceGithubConfigForm: FC<Props> = (props) => {
       />
       <div className="flex flex-col gap-8">
         <div className="grid grid-cols-2 gap-x-12 gap-y-8 w-full">
-          <div className="flex flex-col gap-y-4 col-span-2 md:col-span-1 pt-1">
-            <div className="pt-2.5 text-xl font-medium">GitHub-provided details for Plane</div>
+          <div className="flex flex-col gap-y-4 col-span-2 md:col-span-1">
+            <div className="pt-2 text-xl font-medium">Configuration</div>
             {GITHUB_FORM_FIELDS.map((field) => (
               <ControllerInput
                 key={field.key}
@@ -204,8 +201,8 @@ export const InstanceGithubConfigForm: FC<Props> = (props) => {
             </div>
           </div>
           <div className="col-span-2 md:col-span-1">
-            <div className="flex flex-col gap-y-4 px-6 pt-1.5 pb-4 bg-custom-background-80/60 rounded-lg">
-              <div className="pt-2 text-xl font-medium">Plane-provided details for GitHub</div>
+            <div className="flex flex-col gap-y-4 px-6 py-4 my-2 bg-custom-background-80/60 rounded-lg">
+              <div className="pt-2 text-xl font-medium">Service provider details</div>
               {GITHUB_SERVICE_FIELD.map((field) => (
                 <CopyField key={field.key} label={field.label} url={field.url} description={field.description} />
               ))}

admin/app/authentication/github/page.tsx

@@ -63,7 +63,7 @@ const InstanceGithubAuthenticationPage = observer(() => {
   };
   return (
     <>
-      <PageHeader title="GitHub Authentication - Plane Web" />
+      <PageHeader title="Authentication - God Mode" />
       <div className="relative container mx-auto w-full h-full p-4 py-4 space-y-6 flex flex-col">
         <div className="border-b border-custom-border-100 mx-4 py-4 space-y-1 flex-shrink-0">
           <AuthenticationMethodCard
@@ -93,7 +93,7 @@ const InstanceGithubAuthenticationPage = observer(() => {
             withBorder={false}
           />
         </div>
-        <div className="flex-grow overflow-hidden overflow-y-scroll vertical-scrollbar scrollbar-md px-4">
+        <div className="flex-grow overflow-hidden overflow-y-scroll vertical-scrollbar scrollbar-md p-4">
           {formattedConfig ? (
             <InstanceGithubConfigForm config={formattedConfig} />
           ) : (

admin/app/authentication/gitlab/form.tsx

@@ -8,7 +8,6 @@ import { IFormattedInstanceConfiguration, TInstanceGitlabAuthenticationConfigura
 import { Button, TOAST_TYPE, getButtonStyling, setToast } from "@plane/ui";
 // components
 import {
-  CodeBlock,
   ConfirmDiscardModal,
   ControllerInput,
   CopyField,
@@ -55,7 +54,7 @@ export const InstanceGitlabConfigForm: FC<Props> = (props) => {
       label: "Host",
       description: (
         <>
-          This is either https://gitlab.com or the <CodeBlock>domain.tld</CodeBlock> where you host GitLab.
+          This is the <b>GitLab host</b> to use for login, <b>including scheme</b>.
         </>
       ),
       placeholder: "https://gitlab.com",
@@ -117,8 +116,7 @@ export const InstanceGitlabConfigForm: FC<Props> = (props) => {
       url: `${originURL}/auth/gitlab/callback/`,
       description: (
         <>
-          We will auto-generate this. Paste this into the{" "}
-          <CodeBlock darkerShade>Redirect URI</CodeBlock> field of your{" "}
+          We will auto-generate this. Paste this into the <b>Redirect URI</b> field of your{" "}
           <a
             tabIndex={-1}
             href="https://docs.gitlab.com/ee/integration/oauth_provider.html"
@@ -141,8 +139,8 @@ export const InstanceGitlabConfigForm: FC<Props> = (props) => {
       .then((response = []) => {
         setToast({
           type: TOAST_TYPE.SUCCESS,
-          title: "Done!",
-          message: "Your GitLab authentication is configured. You should test it now.",
+          title: "Success",
+          message: "GitLab Configuration Settings updated successfully",
         });
         reset({
           GITLAB_HOST: response.find((item) => item.key === "GITLAB_HOST")?.value,
@@ -169,8 +167,8 @@ export const InstanceGitlabConfigForm: FC<Props> = (props) => {
       />
       <div className="flex flex-col gap-8">
         <div className="grid grid-cols-2 gap-x-12 gap-y-8 w-full">
-          <div className="flex flex-col gap-y-4 col-span-2 md:col-span-1 pt-1">
-            <div className="pt-2.5 text-xl font-medium">GitLab-provided details for Plane</div>
+          <div className="flex flex-col gap-y-4 col-span-2 md:col-span-1">
+            <div className="pt-2 text-xl font-medium">Configuration</div>
             {GITLAB_FORM_FIELDS.map((field) => (
               <ControllerInput
                 key={field.key}
@@ -200,8 +198,8 @@ export const InstanceGitlabConfigForm: FC<Props> = (props) => {
             </div>
           </div>
           <div className="col-span-2 md:col-span-1">
-            <div className="flex flex-col gap-y-4 px-6 pt-1.5 pb-4 bg-custom-background-80/60 rounded-lg">
-              <div className="pt-2 text-xl font-medium">Plane-provided details for GitLab</div>
+            <div className="flex flex-col gap-y-4 px-6 py-4 my-2 bg-custom-background-80/60 rounded-lg">
+              <div className="pt-2 text-xl font-medium">Service provider details</div>
               {GITLAB_SERVICE_FIELD.map((field) => (
                 <CopyField key={field.key} label={field.label} url={field.url} description={field.description} />
               ))}

admin/app/authentication/gitlab/page.tsx

@@ -57,7 +57,7 @@ const InstanceGitlabAuthenticationPage = observer(() => {
   };
   return (
     <>
-      <PageHeader title="GitLab Authentication - Plane Web" />
+      <PageHeader title="Authentication - God Mode" />
       <div className="relative container mx-auto w-full h-full p-4 py-4 space-y-6 flex flex-col">
         <div className="border-b border-custom-border-100 mx-4 py-4 space-y-1 flex-shrink-0">
           <AuthenticationMethodCard
@@ -80,7 +80,7 @@ const InstanceGitlabAuthenticationPage = observer(() => {
             withBorder={false}
           />
         </div>
-        <div className="flex-grow overflow-hidden overflow-y-scroll vertical-scrollbar scrollbar-md px-4">
+        <div className="flex-grow overflow-hidden overflow-y-scroll vertical-scrollbar scrollbar-md p-4">
           {formattedConfig ? (
             <InstanceGitlabConfigForm config={formattedConfig} />
           ) : (

admin/app/authentication/google/form.tsx

@@ -9,7 +9,6 @@ import { IFormattedInstanceConfiguration, TInstanceGoogleAuthenticationConfigura
 import { Button, TOAST_TYPE, getButtonStyling, setToast } from "@plane/ui";
 // components
 import {
-  CodeBlock,
   ConfirmDiscardModal,
   ControllerInput,
   CopyField,
@@ -102,8 +101,7 @@ export const InstanceGoogleConfigForm: FC<Props> = (props) => {
       url: originURL,
       description: (
         <p>
-          We will auto-generate this. Paste this into your{" "}
-          <CodeBlock darkerShade>Authorized JavaScript origins</CodeBlock> field. For this OAuth client{" "}
+          We will auto-generate this. Paste this into your Authorized JavaScript origins field. For this OAuth client{" "}
           <a
             href="https://console.cloud.google.com/apis/credentials/oauthclient"
             target="_blank"
@@ -121,8 +119,7 @@ export const InstanceGoogleConfigForm: FC<Props> = (props) => {
       url: `${originURL}/auth/google/callback/`,
       description: (
         <p>
-          We will auto-generate this. Paste this into your <CodeBlock darkerShade>Authorized Redirect URI</CodeBlock>{" "}
-          field. For this OAuth client{" "}
+          We will auto-generate this. Paste this into your Authorized Redirect URI field. For this OAuth client{" "}
           <a
             href="https://console.cloud.google.com/apis/credentials/oauthclient"
             target="_blank"
@@ -143,8 +140,8 @@ export const InstanceGoogleConfigForm: FC<Props> = (props) => {
       .then((response = []) => {
         setToast({
           type: TOAST_TYPE.SUCCESS,
-          title: "Done!",
-          message: "Your Google authentication is configured. You should test it now.",
+          title: "Success",
+          message: "Google Configuration Settings updated successfully",
         });
         reset({
           GOOGLE_CLIENT_ID: response.find((item) => item.key === "GOOGLE_CLIENT_ID")?.value,
@@ -170,8 +167,8 @@ export const InstanceGoogleConfigForm: FC<Props> = (props) => {
       />
       <div className="flex flex-col gap-8">
         <div className="grid grid-cols-2 gap-x-12 gap-y-8 w-full">
-          <div className="flex flex-col gap-y-4 col-span-2 md:col-span-1 pt-1">
-            <div className="pt-2.5 text-xl font-medium">Google-provided details for Plane</div>
+          <div className="flex flex-col gap-y-4 col-span-2 md:col-span-1">
+            <div className="pt-2 text-xl font-medium">Configuration</div>
             {GOOGLE_FORM_FIELDS.map((field) => (
               <ControllerInput
                 key={field.key}
@@ -201,8 +198,8 @@ export const InstanceGoogleConfigForm: FC<Props> = (props) => {
             </div>
           </div>
           <div className="col-span-2 md:col-span-1">
-            <div className="flex flex-col gap-y-4 px-6 pt-1.5 pb-4 bg-custom-background-80/60 rounded-lg">
-              <div className="pt-2 text-xl font-medium">Plane-provided details for Google</div>
+            <div className="flex flex-col gap-y-4 px-6 py-4 my-2 bg-custom-background-80/60 rounded-lg">
+              <div className="pt-2 text-xl font-medium">Service provider details</div>
               {GOOGLE_SERVICE_DETAILS.map((field) => (
                 <CopyField key={field.key} label={field.label} url={field.url} description={field.description} />
               ))}

admin/app/authentication/google/page.tsx

@@ -57,7 +57,7 @@ const InstanceGoogleAuthenticationPage = observer(() => {
   };
   return (
     <>
-      <PageHeader title="Google Authentication - Plane Web" />
+      <PageHeader title="Authentication - God Mode" />
       <div className="relative container mx-auto w-full h-full p-4 py-4 space-y-6 flex flex-col">
         <div className="border-b border-custom-border-100 mx-4 py-4 space-y-1 flex-shrink-0">
           <AuthenticationMethodCard
@@ -81,7 +81,7 @@ const InstanceGoogleAuthenticationPage = observer(() => {
             withBorder={false}
           />
         </div>
-        <div className="flex-grow overflow-hidden overflow-y-scroll vertical-scrollbar scrollbar-md px-4">
+        <div className="flex-grow overflow-hidden overflow-y-scroll vertical-scrollbar scrollbar-md p-4">
           {formattedConfig ? (
             <InstanceGoogleConfigForm config={formattedConfig} />
           ) : (

admin/app/authentication/layout.tsx

@@ -3,7 +3,7 @@ import { Metadata } from "next";
 import { AdminLayout } from "@/layouts/admin-layout";
 
 export const metadata: Metadata = {
-  title: "Authentication Settings - Plane Web",
+  title: "Authentication Settings - God Mode",
 };
 
 export default function AuthenticationLayout({ children }: { children: ReactNode }) {

admin/app/authentication/page.tsx

@@ -5,6 +5,7 @@ import { observer } from "mobx-react";
 import useSWR from "swr";
 import { TInstanceConfigurationKeys } from "@plane/types";
 import { Loader, ToggleSwitch, setPromiseToast } from "@plane/ui";
+import { PageHeader } from "@/components/common";
 // helpers
 import { cn } from "@/helpers/common.helper";
 // hooks
@@ -33,7 +34,7 @@ const InstanceAuthenticationPage = observer(() => {
     const updateConfigPromise = updateInstanceConfigurations(payload);
 
     setPromiseToast(updateConfigPromise, {
-      loading: "Saving configuration",
+      loading: "Saving Configuration...",
       success: {
         title: "Success",
         message: () => "Configuration saved successfully",
@@ -56,9 +57,10 @@ const InstanceAuthenticationPage = observer(() => {
 
   return (
     <>
+      <PageHeader title="Authentication - God Mode" />
       <div className="relative container mx-auto w-full h-full p-4 py-4 space-y-6 flex flex-col">
         <div className="border-b border-custom-border-100 mx-4 py-4 space-y-1 flex-shrink-0">
-          <div className="text-xl font-medium text-custom-text-100">Manage authentication modes for your instance</div>
+          <div className="text-xl font-medium text-custom-text-100">Manage authentication for your instance</div>
           <div className="text-sm font-normal text-custom-text-300">
             Configure authentication modes for your team and restrict sign ups to be invite only.
           </div>
@@ -66,12 +68,15 @@ const InstanceAuthenticationPage = observer(() => {
         <div className="flex-grow overflow-hidden overflow-y-scroll vertical-scrollbar scrollbar-md px-4">
           {formattedConfig ? (
             <div className="space-y-3">
+              <div className="text-lg font-medium pb-1">Sign-up configuration</div>
               <div className={cn("w-full flex items-center gap-14 rounded")}>
                 <div className="flex grow items-center gap-4">
                   <div className="grow">
-                    <div className="text-lg font-medium pb-1">Allow anyone to sign up even without an invite</div>
+                    <div className={cn("font-medium leading-5 text-custom-text-100 text-sm")}>
+                      Allow anyone to sign up without invite
+                    </div>
                     <div className={cn("font-normal leading-5 text-custom-text-300 text-xs")}>
-                      Toggling this off will only let users sign up when they are invited.
+                      Toggling this off will disable self sign ups.
                     </div>
                   </div>
                 </div>

admin/app/email/layout.tsx

@@ -7,7 +7,7 @@ interface EmailLayoutProps {
 }
 
 export const metadata: Metadata = {
-  title: "Email Settings - Plane Web",
+  title: "Email Settings - God Mode",
 };
 
 export default function EmailLayout({ children }: EmailLayoutProps) {

admin/app/email/page.tsx

@@ -3,6 +3,8 @@
 import { observer } from "mobx-react";
 import useSWR from "swr";
 import { Loader } from "@plane/ui";
+// components
+import { PageHeader } from "@/components/common";
 // hooks
 import { useInstance } from "@/hooks/store";
 // components
@@ -16,6 +18,7 @@ const InstanceEmailPage = observer(() => {
 
   return (
     <>
+      <PageHeader title="Email - God Mode" />
       <div className="relative container mx-auto w-full h-full p-4 py-4 space-y-6 flex flex-col">
         <div className="border-b border-custom-border-100 mx-4 py-4 space-y-1 flex-shrink-0">
           <div className="text-xl font-medium text-custom-text-100">Secure emails from your own instance</div>

admin/app/general/form.tsx

@@ -9,9 +9,8 @@ import { IInstance, IInstanceAdmin } from "@plane/types";
 import { Button, Input, TOAST_TYPE, ToggleSwitch, setToast } from "@plane/ui";
 // components
 import { ControllerInput } from "@/components/common";
-import { useInstance } from "@/hooks/store";
-import { IntercomConfig } from "./intercom";
 // hooks
+import { useInstance } from "@/hooks/store";
 
 export interface IGeneralConfigurationForm {
   instance: IInstance;
@@ -21,13 +20,11 @@ export interface IGeneralConfigurationForm {
 export const GeneralConfigurationForm: FC<IGeneralConfigurationForm> = observer((props) => {
   const { instance, instanceAdmins } = props;
   // hooks
-  const { instanceConfigurations, updateInstanceInfo, updateInstanceConfigurations } = useInstance();
-
+  const { updateInstanceInfo } = useInstance();
   // form data
   const {
     handleSubmit,
     control,
-    watch,
     formState: { errors, isSubmitting },
   } = useForm<Partial<IInstance>>({
     defaultValues: {
@@ -39,16 +36,7 @@ export const GeneralConfigurationForm: FC<IGeneralConfigurationForm> = observer(
   const onSubmit = async (formData: Partial<IInstance>) => {
     const payload: Partial<IInstance> = { ...formData };
 
-    // update the intercom configuration
-    const isIntercomEnabled =
-      instanceConfigurations?.find((config) => config.key === "IS_INTERCOM_ENABLED")?.value === "1";
-    if (!payload.is_telemetry_enabled && isIntercomEnabled) {
-      try {
-        await updateInstanceConfigurations({ IS_INTERCOM_ENABLED: "0" });
-      } catch (error) {
-        console.error(error);
-      }
-    }
+    console.log("payload", payload);
 
     await updateInstanceInfo(payload)
       .then(() =>
@@ -86,7 +74,6 @@ export const GeneralConfigurationForm: FC<IGeneralConfigurationForm> = observer(
               value={instanceAdmins[0]?.user_detail?.email ?? ""}
               placeholder="Admin email"
               className="w-full cursor-not-allowed !text-custom-text-400"
-              autoComplete="on"
               disabled
             />
           </div>
@@ -106,8 +93,7 @@ export const GeneralConfigurationForm: FC<IGeneralConfigurationForm> = observer(
       </div>
 
       <div className="space-y-3">
-        <div className="text-lg font-medium">Chat + telemetry</div>
-        <IntercomConfig isTelemetryEnabled={watch("is_telemetry_enabled") ?? false} />
+        <div className="text-lg font-medium">Telemetry</div>
         <div className="flex items-center gap-14 px-4 py-3 border border-custom-border-200 rounded">
           <div className="grow flex items-center gap-4">
             <div className="shrink-0">

admin/app/general/intercom.tsx

@@ -1,82 +0,0 @@
-"use client";
-
-import { FC, useState } from "react";
-import { observer } from "mobx-react";
-import useSWR from "swr";
-import { MessageSquare } from "lucide-react";
-import { IFormattedInstanceConfiguration } from "@plane/types";
-import { ToggleSwitch } from "@plane/ui";
-// hooks
-import { useInstance } from "@/hooks/store";
-
-type TIntercomConfig = {
-  isTelemetryEnabled: boolean;
-};
-
-export const IntercomConfig: FC<TIntercomConfig> = observer((props) => {
-  const { isTelemetryEnabled } = props;
-  // hooks
-  const { instanceConfigurations, updateInstanceConfigurations, fetchInstanceConfigurations } = useInstance();
-  // states
-  const [isSubmitting, setIsSubmitting] = useState<boolean>(false);
-
-  // derived values
-  const isIntercomEnabled = isTelemetryEnabled
-    ? instanceConfigurations
-      ? instanceConfigurations?.find((config) => config.key === "IS_INTERCOM_ENABLED")?.value === "1"
-        ? true
-        : false
-      : undefined
-    : false;
-
-  const { isLoading } = useSWR(isTelemetryEnabled ? "INSTANCE_CONFIGURATIONS" : null, () =>
-    isTelemetryEnabled ? fetchInstanceConfigurations() : null
-  );
-
-  const initialLoader = isLoading && isIntercomEnabled === undefined;
-
-  const submitInstanceConfigurations = async (payload: Partial<IFormattedInstanceConfiguration>) => {
-    try {
-      await updateInstanceConfigurations(payload);
-    } catch (error) {
-      console.error(error);
-    } finally {
-      setIsSubmitting(false);
-    }
-  };
-
-  const enableIntercomConfig = () => {
-    submitInstanceConfigurations({ IS_INTERCOM_ENABLED: isIntercomEnabled ? "0" : "1" });
-  };
-
-  return (
-    <>
-      <div className="flex items-center gap-14 px-4 py-3 border border-custom-border-200 rounded">
-        <div className="grow flex items-center gap-4">
-          <div className="shrink-0">
-            <div className="flex items-center justify-center w-10 h-10 bg-custom-background-80 rounded-full">
-              <MessageSquare className="w-6 h-6 text-custom-text-300/80 p-0.5" />
-            </div>
-          </div>
-
-          <div className="grow">
-            <div className="text-sm font-medium text-custom-text-100 leading-5">Talk to Plane</div>
-            <div className="text-xs font-normal text-custom-text-300 leading-5">
-              Let your members chat with us via Intercom or another service. Toggling Telemetry off turns this off
-              automatically.
-            </div>
-          </div>
-
-          <div className="ml-auto">
-            <ToggleSwitch
-              value={isIntercomEnabled ? true : false}
-              onChange={enableIntercomConfig}
-              size="sm"
-              disabled={!isTelemetryEnabled || isSubmitting || initialLoader}
-            />
-          </div>
-        </div>
-      </div>
-    </>
-  );
-});

admin/app/general/layout.tsx

@@ -3,7 +3,7 @@ import { Metadata } from "next";
 import { AdminLayout } from "@/layouts/admin-layout";
 
 export const metadata: Metadata = {
-  title: "General Settings - Plane Web",
+  title: "General Settings - God Mode",
 };
 
 export default function GeneralLayout({ children }: { children: ReactNode }) {

admin/app/general/page.tsx

@@ -7,7 +7,7 @@ import { GeneralConfigurationForm } from "./form";
 
 function GeneralPage() {
   const { instance, instanceAdmins } = useInstance();
-
+  console.log("instance", instance);
   return (
     <>
       <div className="relative container mx-auto w-full h-full p-4 py-4 space-y-6 flex flex-col">

admin/app/image/layout.tsx

@@ -7,7 +7,7 @@ interface ImageLayoutProps {
 }
 
 export const metadata: Metadata = {
-  title: "Images Settings - Plane Web",
+  title: "Images Settings - God Mode",
 };
 
 export default function ImageLayout({ children }: ImageLayoutProps) {

admin/app/image/page.tsx

@@ -3,6 +3,8 @@
 import { observer } from "mobx-react";
 import useSWR from "swr";
 import { Loader } from "@plane/ui";
+// components
+import { PageHeader } from "@/components/common";
 // hooks
 import { useInstance } from "@/hooks/store";
 // local
@@ -16,6 +18,7 @@ const InstanceImagePage = observer(() => {
 
   return (
     <>
+      <PageHeader title="Image - God Mode" />
       <div className="relative container mx-auto w-full h-full p-4 py-4 space-y-6 flex flex-col">
         <div className="border-b border-custom-border-100 mx-4 py-4 space-y-1 flex-shrink-0">
           <div className="text-xl font-medium text-custom-text-100">Third-party image libraries</div>

admin/ce/components/authentication/authentication-modes.tsx

@@ -1,48 +1,84 @@
 import { observer } from "mobx-react";
 import Image from "next/image";
 import { useTheme } from "next-themes";
+import { KeyRound, Mails } from "lucide-react";
 // types
-import {
-  TGetBaseAuthenticationModeProps,
-  TInstanceAuthenticationMethodKeys,
-  TInstanceAuthenticationModes,
-} from "@plane/types";
+import { TInstanceAuthenticationMethodKeys, TInstanceAuthenticationModes } from "@plane/types";
 // components
-import { AuthenticationMethodCard } from "@/components/authentication";
+import {
+  AuthenticationMethodCard,
+  EmailCodesConfiguration,
+  GithubConfiguration,
+  GitlabConfiguration,
+  GoogleConfiguration,
+  PasswordLoginConfiguration,
+} from "@/components/authentication";
 // helpers
-import { UpgradeButton } from "@/components/common/upgrade-button";
-import { getBaseAuthenticationModes } from "@/helpers/authentication.helper";
+import { resolveGeneralTheme } from "@/helpers/common.helper";
 // images
-import OIDCLogo from "@/public/logos/oidc-logo.svg";
-import SAMLLogo from "@/public/logos/saml-logo.svg";
+import githubLightModeImage from "@/public/logos/github-black.png";
+import githubDarkModeImage from "@/public/logos/github-white.png";
+import GitlabLogo from "@/public/logos/gitlab-logo.svg";
+import GoogleLogo from "@/public/logos/google-logo.svg";
 
 export type TAuthenticationModeProps = {
   disabled: boolean;
   updateConfig: (key: TInstanceAuthenticationMethodKeys, value: string) => void;
 };
 
+export type TGetAuthenticationModeProps = {
+  disabled: boolean;
+  updateConfig: (key: TInstanceAuthenticationMethodKeys, value: string) => void;
+  resolvedTheme: string | undefined;
+};
+
 // Authentication methods
-export const getAuthenticationModes: (props: TGetBaseAuthenticationModeProps) => TInstanceAuthenticationModes[] = ({
+export const getAuthenticationModes: (props: TGetAuthenticationModeProps) => TInstanceAuthenticationModes[] = ({
   disabled,
   updateConfig,
   resolvedTheme,
 }) => [
-    ...getBaseAuthenticationModes({ disabled, updateConfig, resolvedTheme }),
     {
-      key: "oidc",
-      name: "OIDC",
-      description: "Authenticate your users via the OpenID Connect protocol.",
-      icon: <Image src={OIDCLogo} height={22} width={22} alt="OIDC Logo" />,
-      config: <UpgradeButton />,
-      unavailable: true,
+      key: "email-codes",
+      name: "Email codes",
+      description: "Login or sign up using codes sent via emails. You need to have email setup here and enabled.",
+      icon: <Mails className="h-6 w-6 p-0.5 text-custom-text-300/80" />,
+      config: <EmailCodesConfiguration disabled={disabled} updateConfig={updateConfig} />,
     },
     {
-      key: "saml",
-      name: "SAML",
-      description: "Authenticate your users via the Security Assertion Markup Language protocol.",
-      icon: <Image src={SAMLLogo} height={22} width={22} alt="SAML Logo" className="pl-0.5" />,
-      config: <UpgradeButton />,
-      unavailable: true,
+      key: "password-login",
+      name: "Password based login",
+      description: "Allow members to create accounts with passwords for emails to sign in.",
+      icon: <KeyRound className="h-6 w-6 p-0.5 text-custom-text-300/80" />,
+      config: <PasswordLoginConfiguration disabled={disabled} updateConfig={updateConfig} />,
+    },
+    {
+      key: "google",
+      name: "Google",
+      description: "Allow members to login or sign up to plane with their Google accounts.",
+      icon: <Image src={GoogleLogo} height={20} width={20} alt="Google Logo" />,
+      config: <GoogleConfiguration disabled={disabled} updateConfig={updateConfig} />,
+    },
+    {
+      key: "github",
+      name: "Github",
+      description: "Allow members to login or sign up to plane with their Github accounts.",
+      icon: (
+        <Image
+          src={resolveGeneralTheme(resolvedTheme) === "dark" ? githubDarkModeImage : githubLightModeImage}
+          height={20}
+          width={20}
+          alt="GitHub Logo"
+        />
+      ),
+      config: <GithubConfiguration disabled={disabled} updateConfig={updateConfig} />,
+    },
+    {
+      key: "gitlab",
+      name: "GitLab",
+      description: "Allow members to login or sign up to plane with their GitLab accounts.",
+      icon: <Image src={GitlabLogo} height={20} width={20} alt="GitLab Logo" />,
+      config: <GitlabConfiguration disabled={disabled} updateConfig={updateConfig} />,
     },
   ];
 
@@ -61,7 +97,6 @@ export const AuthenticationModes: React.FC<TAuthenticationModeProps> = observer(
           icon={method.icon}
           config={method.config}
           disabled={disabled}
-          unavailable={method.unavailable}
         />
       ))}
     </>

admin/core/components/admin-sidebar/help-section.tsx

@@ -96,7 +96,7 @@ export const HelpSection: FC = observer(() => {
           leaveTo="transform opacity-0 scale-95"
         >
           <div
-            className={`absolute bottom-2 min-w-[10rem] z-[15] ${
+            className={`absolute bottom-2 min-w-[10rem] ${
               isSidebarCollapsed ? "left-full" : "-left-[75px]"
             } divide-y divide-custom-border-200 whitespace-nowrap rounded bg-custom-background-100 p-1 shadow-custom-shadow-xs`}
             ref={helpOptionsRef}

admin/core/components/admin-sidebar/root.tsx

@@ -8,7 +8,7 @@ import { useTheme } from "@/hooks/store";
 import useOutsideClickDetector from "@/hooks/use-outside-click-detector";
 // components
 
-export interface IInstanceSidebar {}
+export interface IInstanceSidebar { }
 
 export const InstanceSidebar: FC<IInstanceSidebar> = observer(() => {
   // store
@@ -41,10 +41,10 @@ export const InstanceSidebar: FC<IInstanceSidebar> = observer(() => {
     <div
       className={`inset-y-0 z-20 flex h-full flex-shrink-0 flex-grow-0 flex-col border-r border-custom-sidebar-border-200 bg-custom-sidebar-background-100 duration-300
         fixed md:relative
-        ${isSidebarCollapsed ? "-ml-[290px]" : ""}
-        sm:${isSidebarCollapsed ? "-ml-[290px]" : ""}
-        md:ml-0 ${isSidebarCollapsed ? "w-[70px]" : "w-[290px]"}
-        lg:ml-0 ${isSidebarCollapsed ? "w-[70px]" : "w-[290px]"}
+        ${isSidebarCollapsed ? "-ml-[250px]" : ""}
+        sm:${isSidebarCollapsed ? "-ml-[250px]" : ""}
+        md:ml-0 ${isSidebarCollapsed ? "w-[70px]" : "w-[250px]"}
+        lg:ml-0 ${isSidebarCollapsed ? "w-[70px]" : "w-[250px]"}
       `}
     >
       <div ref={ref} className="flex h-full w-full flex-1 flex-col">

admin/core/components/authentication/authentication-method-card.tsx

@@ -11,11 +11,10 @@ type Props = {
   config: JSX.Element;
   disabled?: boolean;
   withBorder?: boolean;
-  unavailable?: boolean;
 };
 
 export const AuthenticationMethodCard: FC<Props> = (props) => {
-  const { name, description, icon, config, disabled = false, withBorder = true, unavailable = false } = props;
+  const { name, description, icon, config, disabled = false, withBorder = true } = props;
 
   return (
     <div
@@ -23,11 +22,7 @@ export const AuthenticationMethodCard: FC<Props> = (props) => {
         "px-4 py-3 border border-custom-border-200": withBorder,
       })}
     >
-      <div
-        className={cn("flex grow items-center gap-4", {
-          "opacity-50": unavailable,
-        })}
-      >
+      <div className="flex grow items-center gap-4">
         <div className="shrink-0">
           <div className="flex h-10 w-10 items-center justify-center rounded-full bg-custom-background-80">{icon}</div>
         </div>

admin/core/components/common/code-block.tsx

@@ -1,21 +0,0 @@
-import { cn } from "@/helpers/common.helper";
-
-type TProps = {
-  children: React.ReactNode;
-  className?: string;
-  darkerShade?: boolean;
-};
-
-export const CodeBlock = ({ children, className, darkerShade }: TProps) => (
-  <span
-    className={cn(
-      "px-0.5 text-xs text-custom-text-300 bg-custom-background-90 font-semibold rounded-md border border-custom-border-100",
-      {
-        "text-custom-text-200 bg-custom-background-80 border-custom-border-200": darkerShade,
-      },
-      className
-    )}
-  >
-    {children}
-  </span>
-);

admin/core/components/common/controller-input.tsx

@@ -38,7 +38,7 @@ export const ControllerInput: React.FC<Props> = (props) => {
   return (
     <div className="flex flex-col gap-1">
       <h4 className="text-sm text-custom-text-300">
-        {label}
+        {label} {!required && "(optional)"}
       </h4>
       <div className="relative">
         <Controller
@@ -80,7 +80,7 @@ export const ControllerInput: React.FC<Props> = (props) => {
             </button>
           ))}
       </div>
-      {description && <p className="pt-0.5 text-xs text-custom-text-300">{description}</p>}
+      {description && <p className="text-xs text-custom-text-300">{description}</p>}
     </div>
   );
 };

admin/core/components/common/index.ts

@@ -7,5 +7,3 @@ export * from "./banner";
 export * from "./empty-state";
 export * from "./logo-spinner";
 export * from "./page-header";
-export * from "./code-block";
-export * from "./upgrade-button";

admin/core/components/common/upgrade-button.tsx

@@ -1,16 +0,0 @@
-"use client";
-
-import React from "react";
-// icons
-import { SquareArrowOutUpRight } from "lucide-react";
-// ui
-import { getButtonStyling } from "@plane/ui";
-// helpers
-import { cn } from "@/helpers/common.helper";
-
-export const UpgradeButton: React.FC = () => (
-  <a href="https://plane.so/one" target="_blank" className={cn(getButtonStyling("primary", "sm"))}>
-    Available on One
-    <SquareArrowOutUpRight className="h-3.5 w-3.5 p-0.5" />
-  </a>
-);

admin/core/components/instance/setup-form.tsx

@@ -174,7 +174,6 @@ export const InstanceSetupForm: FC = (props) => {
                 placeholder="Wilber"
                 value={formData.first_name}
                 onChange={(e) => handleFormChange("first_name", e.target.value)}
-                autoComplete="on"
                 autoFocus
               />
             </div>
@@ -191,7 +190,6 @@ export const InstanceSetupForm: FC = (props) => {
                 placeholder="Wright"
                 value={formData.last_name}
                 onChange={(e) => handleFormChange("last_name", e.target.value)}
-                autoComplete="on"
               />
             </div>
           </div>
@@ -210,7 +208,6 @@ export const InstanceSetupForm: FC = (props) => {
               value={formData.email}
               onChange={(e) => handleFormChange("email", e.target.value)}
               hasError={errorData.type && errorData.type === EErrorCodes.INVALID_EMAIL ? true : false}
-              autoComplete="on"
             />
             {errorData.type && errorData.type === EErrorCodes.INVALID_EMAIL && errorData.message && (
               <p className="px-1 text-xs text-red-500">{errorData.message}</p>
@@ -250,7 +247,6 @@ export const InstanceSetupForm: FC = (props) => {
                 hasError={errorData.type && errorData.type === EErrorCodes.INVALID_PASSWORD ? true : false}
                 onFocus={() => setIsPasswordInputFocused(true)}
                 onBlur={() => setIsPasswordInputFocused(false)}
-                autoComplete="on"
               />
               {showPassword.password ? (
                 <button

admin/core/components/login/sign-in-form.tsx

@@ -57,6 +57,8 @@ export const InstanceSignInForm: FC = (props) => {
   const handleFormChange = (key: keyof TFormData, value: string | boolean) =>
     setFormData((prev) => ({ ...prev, [key]: value }));
 
+  console.log("csrfToken", csrfToken);
+
   useEffect(() => {
     if (csrfToken === undefined)
       authService.requestCSRFToken().then((data) => data?.csrf_token && setCsrfToken(data.csrf_token));
@@ -127,7 +129,6 @@ export const InstanceSignInForm: FC = (props) => {
               placeholder="name@company.com"
               value={formData.email}
               onChange={(e) => handleFormChange("email", e.target.value)}
-              autoComplete="on"
               autoFocus
             />
           </div>
@@ -146,7 +147,6 @@ export const InstanceSignInForm: FC = (props) => {
                 placeholder="Enter your password"
                 value={formData.password}
                 onChange={(e) => handleFormChange("password", e.target.value)}
-                autoComplete="on"
               />
               {showPassword ? (
                 <button

admin/helpers/authentication.helper.tsx

@@ -1,24 +1,7 @@
 import { ReactNode } from "react";
-import Image from "next/image";
 import Link from "next/link";
-import { KeyRound, Mails } from "lucide-react";
-// types
-import { TGetBaseAuthenticationModeProps, TInstanceAuthenticationModes } from "@plane/types";
-// components
-import {
-  EmailCodesConfiguration,
-  GithubConfiguration,
-  GitlabConfiguration,
-  GoogleConfiguration,
-  PasswordLoginConfiguration,
-} from "@/components/authentication";
 // helpers
-import { SUPPORT_EMAIL, resolveGeneralTheme } from "@/helpers/common.helper";
-// images
-import githubLightModeImage from "@/public/logos/github-black.png";
-import githubDarkModeImage from "@/public/logos/github-white.png";
-import GitlabLogo from "@/public/logos/gitlab-logo.svg";
-import GoogleLogo from "@/public/logos/google-logo.svg";
+import { SUPPORT_EMAIL } from "./common.helper";
 
 export enum EPageTypes {
   PUBLIC = "PUBLIC",
@@ -151,53 +134,3 @@ export const authErrorHandler = (
 
   return undefined;
 };
-
-export const getBaseAuthenticationModes: (props: TGetBaseAuthenticationModeProps) => TInstanceAuthenticationModes[] = ({
-  disabled,
-  updateConfig,
-  resolvedTheme,
-}) => [
-    {
-      key: "unique-codes",
-      name: "Unique codes",
-      description:
-        "Log in or sign up for Plane using codes sent via email. You need to have set up SMTP to use this method.",
-      icon: <Mails className="h-6 w-6 p-0.5 text-custom-text-300/80" />,
-      config: <EmailCodesConfiguration disabled={disabled} updateConfig={updateConfig} />,
-    },
-    {
-      key: "passwords-login",
-      name: "Passwords",
-      description: "Allow members to create accounts with passwords and use it with their email addresses to sign in.",
-      icon: <KeyRound className="h-6 w-6 p-0.5 text-custom-text-300/80" />,
-      config: <PasswordLoginConfiguration disabled={disabled} updateConfig={updateConfig} />,
-    },
-    {
-      key: "google",
-      name: "Google",
-      description: "Allow members to log in or sign up for Plane with their Google accounts.",
-      icon: <Image src={GoogleLogo} height={20} width={20} alt="Google Logo" />,
-      config: <GoogleConfiguration disabled={disabled} updateConfig={updateConfig} />,
-    },
-    {
-      key: "github",
-      name: "GitHub",
-      description: "Allow members to log in or sign up for Plane with their GitHub accounts.",
-      icon: (
-        <Image
-          src={resolveGeneralTheme(resolvedTheme) === "dark" ? githubDarkModeImage : githubLightModeImage}
-          height={20}
-          width={20}
-          alt="GitHub Logo"
-        />
-      ),
-      config: <GithubConfiguration disabled={disabled} updateConfig={updateConfig} />,
-    },
-    {
-      key: "gitlab",
-      name: "GitLab",
-      description: "Allow members to log in or sign up to plane with their GitLab accounts.",
-      icon: <Image src={GitlabLogo} height={20} width={20} alt="GitLab Logo" />,
-      config: <GitlabConfiguration disabled={disabled} updateConfig={updateConfig} />,
-    },
-  ];

admin/package.json

@@ -1,6 +1,6 @@
 {
   "name": "admin",
-  "version": "0.22.0",
+  "version": "0.21.0",
   "private": true,
   "scripts": {
     "dev": "turbo run develop",
@@ -14,11 +14,10 @@
     "@headlessui/react": "^1.7.19",
     "@plane/types": "*",
     "@plane/ui": "*",
-    "@plane/constants": "*",
     "@tailwindcss/typography": "^0.5.9",
     "@types/lodash": "^4.17.0",
     "autoprefixer": "10.4.14",
-    "axios": "^1.7.4",
+    "axios": "^1.6.7",
     "js-cookie": "^3.0.5",
     "lodash": "^4.17.21",
     "lucide-react": "^0.356.0",
@@ -47,4 +46,4 @@
     "tsconfig": "*",
     "typescript": "^5.4.2"
   }
-}
+}

admin/public/logos/oidc-logo.svg

@@ -1,11 +0,0 @@
-<svg width="92" height="84" viewBox="0 0 92 84" fill="none" xmlns="http://www.w3.org/2000/svg">
-<g clip-path="url(#clip0_3695_11896)">
-<path d="M83.0398 32.6876C74.2901 27.2397 62.0735 23.8553 48.7013 23.8553C21.7918 23.8553 0 37.3101 0 53.9016C0 69.0898 18.1598 81.554 41.685 83.7001V74.9504C25.8364 72.9693 13.95 64.3022 13.95 53.9016C13.95 42.0977 29.4684 32.44 48.7013 32.44C58.2765 32.44 66.9436 34.8338 73.217 38.7134L64.3022 44.2439H92.1197V27.0746L83.0398 32.6876Z" fill="#CCCCCC"/>
-<path d="M41.6846 8.99736V74.9504V83.7002L55.6346 74.9504V0L41.6846 8.99736Z" fill="#FF6200"/>
-</g>
-<defs>
-<clipPath id="clip0_3695_11896">
-<rect width="92" height="84" fill="white"/>
-</clipPath>
-</defs>
-</svg>

admin/public/logos/saml-logo.svg

@@ -1,17 +0,0 @@
-<svg width="700" height="650" viewBox="0 0 700 650" fill="none" xmlns="http://www.w3.org/2000/svg">
-<g clip-path="url(#clip0_3262_5767)">
-<mask id="mask0_3262_5767" style="mask-type:luminance" maskUnits="userSpaceOnUse" x="0" y="0" width="700" height="650">
-<path d="M700 0H0V650H700V0Z" fill="white"/>
-</mask>
-<g mask="url(#mask0_3262_5767)">
-<path d="M337.682 0L360.832 20.5C377.982 35.7 395.182 50.85 412.132 66.25C521.982 166 614.982 278.25 684.982 407.45C688.582 414.05 691.832 420.85 695.082 427.6L699.982 437.75L694.582 440.6L690.532 434.85L680.032 419.9L672.682 409.2C621.732 335.25 570.682 261.2 500.582 201.95C479.373 183.995 455.969 168.807 430.932 156.75C380.232 132.5 335.132 142.2 296.432 182C259.632 219.85 240.532 266.85 223.282 314.65C221.032 320.8 218.682 326.9 216.332 333L212.232 343.75L203.632 341C208.632 323.6 213.232 306.1 217.832 288.55C228.332 248.8 238.832 209.05 253.432 170.75C268.932 129.95 288.532 90.6 308.082 51.25C316.532 34.2 324.982 17.15 333.082 0H337.682Z" fill="#C22E33"/>
-<path d="M372.382 491.1C291.082 529.6 94.3829 569.3 1.08287 559.1C-14.1671 478.8 135.482 102.5 208.982 45.5L204.232 56.4C202.115 61.531 199.813 66.5842 197.332 71.55L194.032 78C156.032 151.1 118.082 224.3 98.6329 304.5C91.6287 332.124 87.8038 360.458 87.2328 388.95C86.7328 455.95 128.432 501.55 198.082 504.4C231.582 505.75 265.432 502.25 299.232 498.7C313.932 497.2 328.582 495.65 343.232 494.5C348.632 494.1 353.932 493.45 360.832 492.55L372.382 491.15V491.1Z" fill="#C22E33"/>
-<path d="M141.233 639.05C118.983 640.75 96.733 642.45 74.583 644.45C279.433 663.95 476.083 630.6 670.083 562.25C606.833 450.75 521.583 362.7 422.483 286.15C423.783 291.05 426.683 294.6 429.533 298.1L431.933 301.1C440.433 312.4 449.333 323.5 458.283 334.6C478.733 360.05 499.183 385.5 514.583 413.5C553.483 484.5 532.383 545.9 456.183 578.3C406.083 599.65 351.333 614.2 297.183 622.9C245.683 631.1 193.433 635.05 141.233 639.05Z" fill="#C22E33"/>
-</g>
-</g>
-<defs>
-<clipPath id="clip0_3262_5767">
-<rect width="700" height="650" fill="white"/>
-</clipPath>
-</defs>
-</svg>

aio/Dockerfile

@@ -1,5 +1,3 @@
-ARG BASE_TAG=develop
-ARG BUILD_TYPE=full
 # *****************************************************************************
 # STAGE 1: Build the project
 # *****************************************************************************
@@ -7,6 +5,7 @@ FROM node:18-alpine AS builder
 RUN apk add --no-cache libc6-compat
 # Set working directory
 WORKDIR /app
+ENV NEXT_PUBLIC_API_BASE_URL=http://NEXT_PUBLIC_API_BASE_URL_PLACEHOLDER
 
 RUN yarn global add turbo
 COPY . .
@@ -47,18 +46,16 @@ ENV NEXT_PUBLIC_SPACE_BASE_URL=$NEXT_PUBLIC_SPACE_BASE_URL
 ARG NEXT_PUBLIC_SPACE_BASE_PATH="/spaces"
 ENV NEXT_PUBLIC_SPACE_BASE_PATH=$NEXT_PUBLIC_SPACE_BASE_PATH
 
-ARG NEXT_PUBLIC_WEB_BASE_URL=""
-ENV NEXT_PUBLIC_WEB_BASE_URL=$NEXT_PUBLIC_WEB_BASE_URL
+ENV NEXT_TELEMETRY_DISABLED 1
+ENV TURBO_TELEMETRY_DISABLED 1
 
-ENV NEXT_TELEMETRY_DISABLED=1
-ENV TURBO_TELEMETRY_DISABLED=1
-
-RUN yarn turbo run build --filter=web --filter=space --filter=admin
+RUN yarn turbo run build
 
 # *****************************************************************************
 # STAGE 3: Copy the project and start it
 # *****************************************************************************
-FROM makeplane/plane-aio-base:${BUILD_TYPE}-${BASE_TAG} AS runner
+# FROM makeplane/plane-aio-base AS runner
+FROM makeplane/plane-aio-base:develop AS runner
 
 WORKDIR /app
 
@@ -66,14 +63,17 @@ SHELL [ "/bin/bash", "-c" ]
 
 # PYTHON APPLICATION SETUP
 
-ENV PYTHONDONTWRITEBYTECODE=1
-ENV PYTHONUNBUFFERED=1
+ENV PYTHONDONTWRITEBYTECODE 1
+ENV PYTHONUNBUFFERED 1
 ENV PIP_DISABLE_PIP_VERSION_CHECK=1 
 
 COPY apiserver/requirements.txt ./api/
 COPY apiserver/requirements ./api/requirements
 
-RUN pip install -r ./api/requirements.txt --compile --no-cache-dir
+RUN python3.12 -m venv /app/venv && \
+    source /app/venv/bin/activate && \
+    /app/venv/bin/pip install --upgrade pip && \
+    /app/venv/bin/pip install -r ./api/requirements.txt --compile --no-cache-dir
 
 # Add in Django deps and generate Django's static files
 COPY apiserver/manage.py ./api/manage.py
@@ -87,6 +87,7 @@ RUN chmod +x ./api/bin/*
 RUN chmod -R 777 ./api/
 
 # NEXTJS BUILDS
+
 COPY --from=installer /app/web/next.config.js ./web/
 COPY --from=installer /app/web/package.json ./web/
 COPY --from=installer /app/web/.next/standalone ./web
@@ -123,63 +124,26 @@ ENV NEXT_PUBLIC_SPACE_BASE_PATH=$NEXT_PUBLIC_SPACE_BASE_PATH
 ARG NEXT_PUBLIC_WEB_BASE_URL=""
 ENV NEXT_PUBLIC_WEB_BASE_URL=$NEXT_PUBLIC_WEB_BASE_URL
 
-ENV NEXT_TELEMETRY_DISABLED=1
-ENV TURBO_TELEMETRY_DISABLED=1
+ENV NEXT_TELEMETRY_DISABLED 1
+ENV TURBO_TELEMETRY_DISABLED 1
 
-ARG BUILD_TYPE=full
-ENV BUILD_TYPE=$BUILD_TYPE
+COPY aio/supervisord.conf /app/supervisord.conf
 
-COPY aio/supervisord-${BUILD_TYPE}-base /app/supervisord.conf
-COPY aio/supervisord-app /app/supervisord-app
-RUN cat /app/supervisord-app >> /app/supervisord.conf && \
-    rm /app/supervisord-app
+COPY aio/aio.sh /app/aio.sh
+RUN chmod +x /app/aio.sh
 
-COPY ./aio/nginx.conf /etc/nginx/nginx.conf.template
-
-# if build type is full, run the below copy pg-setup.sh
-COPY aio/postgresql.conf /etc/postgresql/postgresql.conf
 COPY aio/pg-setup.sh /app/pg-setup.sh
 RUN chmod +x /app/pg-setup.sh 
 
-# *****************************************************************************
-#  APPLICATION ENVIRONMENT SETTINGS
-# *****************************************************************************
-ENV APP_DOMAIN=localhost
+COPY deploy/selfhost/variables.env /app/plane.env
 
-ENV WEB_URL=http://${APP_DOMAIN}
-ENV DEBUG=0
-ENV SENTRY_DSN=
-ENV SENTRY_ENVIRONMENT=production
-ENV CORS_ALLOWED_ORIGINS=http://${APP_DOMAIN},https://${APP_DOMAIN}
-# Secret Key
-ENV SECRET_KEY=60gp0byfz2dvffa45cxl20p1scy9xbpf6d8c5y0geejgkyp1b5
-# Gunicorn Workers
-ENV GUNICORN_WORKERS=1
+# NGINX Conf Copy
+COPY ./aio/nginx.conf.aio /etc/nginx/nginx.conf.template
+COPY ./nginx/env.sh /app/nginx-start.sh
+RUN chmod +x /app/nginx-start.sh
 
-ENV POSTGRES_USER="plane"
-ENV POSTGRES_PASSWORD="plane"
-ENV POSTGRES_DB="plane"
-ENV POSTGRES_HOST="localhost"
-ENV POSTGRES_PORT="5432"
-ENV DATABASE_URL="postgresql://plane:plane@localhost:5432/plane"
+RUN  ./pg-setup.sh
 
-ENV REDIS_HOST="localhost"
-ENV REDIS_PORT="6379"
-ENV REDIS_URL="redis://localhost:6379"
-
-ENV USE_MINIO="1"
-ENV AWS_REGION=""
-ENV AWS_ACCESS_KEY_ID="access-key"
-ENV AWS_SECRET_ACCESS_KEY="secret-key"
-ENV AWS_S3_ENDPOINT_URL="http://localhost:9000"
-ENV AWS_S3_BUCKET_NAME="uploads"
-ENV MINIO_ROOT_USER="access-key"
-ENV MINIO_ROOT_PASSWORD="secret-key"
-ENV BUCKET_NAME="uploads"
-ENV FILE_SIZE_LIMIT="5242880"
-
-# *****************************************************************************
-
-RUN /app/pg-setup.sh
+VOLUME [ "/app/data/minio/uploads", "/var/lib/postgresql/data" ]
 
 CMD ["/usr/bin/supervisord", "-c", "/app/supervisord.conf"]

aio/Dockerfile-base-slim

@@ -1,45 +0,0 @@
-FROM --platform=$BUILDPLATFORM tonistiigi/binfmt AS binfmt
-
-FROM python:3.12-slim
-
-# Set environment variables to non-interactive for apt
-ENV DEBIAN_FRONTEND=noninteractive
-ENV BUILD_TYPE=slim
-
-SHELL [ "/bin/bash", "-c" ]
-
-WORKDIR /app
-
-RUN mkdir -p /app/{data,logs} && \
-    mkdir -p /app/data/{nginx} && \
-    mkdir -p /app/logs/{access,error} && \
-    mkdir -p /etc/supervisor/conf.d
-
-# Update the package list and install prerequisites
-RUN apt-get update && \
-    apt-get install -y \
-    gnupg2 curl ca-certificates lsb-release software-properties-common \
-    build-essential libssl-dev zlib1g-dev libbz2-dev libreadline-dev \
-    libsqlite3-dev wget llvm libncurses5-dev libncursesw5-dev xz-utils \
-    tk-dev libffi-dev liblzma-dev supervisor nginx nano vim ncdu \
-    sudo lsof net-tools libpq-dev procps gettext
-
-# Install Node.js 18
-RUN curl -fsSL https://deb.nodesource.com/setup_18.x | bash - && \
-    apt-get install -y nodejs
-
-RUN python -m pip install --upgrade pip && \
-    apt-get clean && \
-    rm -rf /var/lib/apt/lists/*
-    
-# Create Supervisor configuration file
-COPY supervisord-slim-base /app/supervisord.conf
-COPY nginx.conf /etc/nginx/nginx.conf.template
-COPY env.sh /app/nginx-start.sh
-RUN chmod +x /app/nginx-start.sh
-
-# Expose ports for Redis, PostgreSQL, and MinIO
-EXPOSE 80 443
-
-# Start Supervisor
-CMD ["/usr/bin/supervisord", "-c", "/app/supervisord.conf"]

aio/Dockerfile.base

@@ -1,28 +1,19 @@
-FROM --platform=$BUILDPLATFORM tonistiigi/binfmt AS binfmt
+FROM --platform=$BUILDPLATFORM tonistiigi/binfmt as binfmt
 
-FROM python:3.12-slim
+FROM debian:12-slim
 
 # Set environment variables to non-interactive for apt
 ENV DEBIAN_FRONTEND=noninteractive
-ENV BUILD_TYPE=full
 
 SHELL [ "/bin/bash", "-c" ]
 
-WORKDIR /app
-
-RUN mkdir -p /app/{data,logs} && \
-    mkdir -p /app/data/{redis,pg,minio,nginx} && \
-    mkdir -p /app/logs/{access,error} && \
-    mkdir -p /etc/supervisor/conf.d
-
 # Update the package list and install prerequisites
 RUN apt-get update && \
     apt-get install -y \
     gnupg2 curl ca-certificates lsb-release software-properties-common \
     build-essential libssl-dev zlib1g-dev libbz2-dev libreadline-dev \
     libsqlite3-dev wget llvm libncurses5-dev libncursesw5-dev xz-utils \
-    tk-dev libffi-dev liblzma-dev supervisor nginx nano vim ncdu \
-    sudo lsof net-tools libpq-dev procps gettext
+    tk-dev libffi-dev liblzma-dev supervisor nginx nano vim ncdu
 
 # Install Redis 7.2
 RUN echo "deb http://deb.debian.org/debian $(lsb_release -cs)-backports main" > /etc/apt/sources.list.d/backports.list && \
@@ -32,15 +23,13 @@ RUN echo "deb http://deb.debian.org/debian $(lsb_release -cs)-backports main" >
     apt-get install -y redis-server
 
 # Install PostgreSQL 15
-ENV POSTGRES_VERSION=15
+ENV POSTGRES_VERSION 15
 RUN curl -fsSL https://www.postgresql.org/media/keys/ACCC4CF8.asc | gpg --dearmor -o /usr/share/keyrings/pgdg-archive-keyring.gpg && \
     echo "deb [signed-by=/usr/share/keyrings/pgdg-archive-keyring.gpg] http://apt.postgresql.org/pub/repos/apt $(lsb_release -cs)-pgdg main" > /etc/apt/sources.list.d/pgdg.list && \
     apt-get update && \
     apt-get install -y postgresql-$POSTGRES_VERSION postgresql-client-$POSTGRES_VERSION && \
     mkdir -p /var/lib/postgresql/data && \
     chown -R postgres:postgres /var/lib/postgresql
-COPY postgresql.conf /etc/postgresql/postgresql.conf
-RUN sudo -u postgres /usr/lib/postgresql/$POSTGRES_VERSION/bin/initdb -D /var/lib/postgresql/data
 
 # Install MinIO
 ARG TARGETARCH
@@ -53,21 +42,51 @@ RUN if [ "$TARGETARCH" = "amd64" ]; then \
     fi && \
     chmod +x /usr/local/bin/minio
 
+
 # Install Node.js 18
 RUN curl -fsSL https://deb.nodesource.com/setup_18.x | bash - && \
-    apt-get install -y nodejs && \
-    python -m pip install --upgrade pip && \
-    apt-get clean && \
-    rm -rf /var/lib/apt/lists/*
+    apt-get install -y nodejs
+
+# Install Python 3.12 from source
+RUN cd /usr/src && \
+    wget https://www.python.org/ftp/python/3.12.0/Python-3.12.0.tgz && \
+    tar xzf Python-3.12.0.tgz && \
+    cd Python-3.12.0 && \
+    ./configure --enable-optimizations && \
+    make altinstall && \
+    rm -f /usr/src/Python-3.12.0.tgz
+
+RUN python3.12 -m pip install --upgrade pip
+
+RUN echo "alias python=/usr/local/bin/python3.12" >> ~/.bashrc && \
+    echo "alias pip=/usr/local/bin/pip3.12" >> ~/.bashrc
+    
+# Clean up
+RUN apt-get clean && \
+    rm -rf /var/lib/apt/lists/* /usr/src/Python-3.12.0
+    
+WORKDIR /app
+
+RUN mkdir -p /app/{data,logs} && \
+    mkdir -p /app/data/{redis,pg,minio,nginx} && \
+    mkdir -p /app/logs/{access,error} && \
+    mkdir -p /etc/supervisor/conf.d
 
 # Create Supervisor configuration file
-COPY supervisord-full-base /app/supervisord.conf
-COPY nginx.conf /etc/nginx/nginx.conf.template
-COPY env.sh /app/nginx-start.sh
-RUN chmod +x /app/nginx-start.sh
+COPY supervisord.base /app/supervisord.conf
+
+RUN apt-get update && \
+    apt-get install -y sudo lsof net-tools libpq-dev procps gettext && \
+    apt-get clean
+
+RUN sudo -u postgres /usr/lib/postgresql/$POSTGRES_VERSION/bin/initdb -D /var/lib/postgresql/data
+COPY postgresql.conf /etc/postgresql/postgresql.conf
+
+RUN echo "alias python=/usr/local/bin/python3.12" >> ~/.bashrc && \
+    echo "alias pip=/usr/local/bin/pip3.12" >> ~/.bashrc
 
 # Expose ports for Redis, PostgreSQL, and MinIO
-EXPOSE 6379 5432 9000 80 443
+EXPOSE 6379 5432 9000 80
 
 # Start Supervisor
 CMD ["/usr/bin/supervisord", "-c", "/app/supervisord.conf"]

aio/aio.sh

@@ -0,0 +1,30 @@
+#!/bin/bash
+set -e
+
+
+if [ "$1" = 'api' ]; then
+    source /app/venv/bin/activate
+    cd /app/api
+    exec ./bin/docker-entrypoint-api.sh
+elif [ "$1" = 'worker' ]; then
+    source /app/venv/bin/activate
+    cd /app/api
+    exec ./bin/docker-entrypoint-worker.sh
+elif [ "$1" = 'beat' ]; then
+    source /app/venv/bin/activate
+    cd /app/api
+    exec ./bin/docker-entrypoint-beat.sh
+elif [ "$1" = 'migrator' ]; then
+    source /app/venv/bin/activate
+    cd /app/api
+    exec ./bin/docker-entrypoint-migrator.sh
+elif [ "$1" = 'web' ]; then
+    node /app/web/web/server.js
+elif [ "$1" = 'space' ]; then
+    node /app/space/space/server.js
+elif [ "$1" = 'admin' ]; then
+    node /app/admin/admin/server.js
+else
+    echo "Command not found"
+    exit 1
+fi

aio/env.sh

@@ -1,7 +0,0 @@
-#!/bin/bash
-
-export dollar="$"
-export http_upgrade="http_upgrade"
-export scheme="scheme"
-envsubst < /etc/nginx/nginx.conf.template > /etc/nginx/nginx.conf
-exec nginx -g 'daemon off;'

aio/nginx.conf.aio

@@ -37,6 +37,7 @@ http {
             proxy_pass http://localhost:3002/spaces/;
         }
 
+
         location /god-mode/ {
             proxy_http_version 1.1;
             proxy_set_header Upgrade ${dollar}http_upgrade;

aio/pg-setup.sh

@@ -1,14 +1,14 @@
 #!/bin/bash
 
-if [ "$BUILD_TYPE" == "full" ]; then 
 
-    export PGHOST=localhost
+# Variables
+set -o allexport
+source plane.env set
+set +o allexport
 
-    sudo -u postgres "/usr/lib/postgresql/${POSTGRES_VERSION}/bin/pg_ctl" -D /var/lib/postgresql/data start
-    sudo -u postgres "/usr/lib/postgresql/${POSTGRES_VERSION}/bin/psql" --command "CREATE USER $POSTGRES_USER WITH SUPERUSER PASSWORD '$POSTGRES_PASSWORD';" && \
-    sudo -u postgres "/usr/lib/postgresql/${POSTGRES_VERSION}/bin/createdb" -O "$POSTGRES_USER" "$POSTGRES_DB" && \
-    sudo -u postgres "/usr/lib/postgresql/${POSTGRES_VERSION}/bin/psql" --command "GRANT ALL PRIVILEGES ON DATABASE $POSTGRES_DB TO $POSTGRES_USER;" && \
-    sudo -u postgres "/usr/lib/postgresql/${POSTGRES_VERSION}/bin/pg_ctl" -D /var/lib/postgresql/data stop
-
-fi
+export PGHOST=localhost
 
+sudo -u postgres "/usr/lib/postgresql/${POSTGRES_VERSION}/bin/pg_ctl" -D /var/lib/postgresql/data start
+sudo -u postgres "/usr/lib/postgresql/${POSTGRES_VERSION}/bin/psql" --command "CREATE USER $POSTGRES_USER WITH SUPERUSER PASSWORD '$POSTGRES_PASSWORD';" && \
+sudo -u postgres "/usr/lib/postgresql/${POSTGRES_VERSION}/bin/createdb" -O "$POSTGRES_USER" "$POSTGRES_DB" && \
+sudo -u postgres "/usr/lib/postgresql/${POSTGRES_VERSION}/bin/pg_ctl" -D /var/lib/postgresql/data stop

aio/postgresql.conf

@@ -1,815 +1,12 @@
-# -----------------------------
 # PostgreSQL configuration file
-# -----------------------------
-#
-# This file consists of lines of the form:
-#
-#   name = value
-#
-# (The "=" is optional.)  Whitespace may be used.  Comments are introduced with
-# "#" anywhere on a line.  The complete list of parameter names and allowed
-# values can be found in the PostgreSQL documentation.
-#
-# The commented-out settings shown in this file represent the default values.
-# Re-commenting a setting is NOT sufficient to revert it to the default value;
-# you need to reload the server.
-#
-# This file is read on server startup and when the server receives a SIGHUP
-# signal.  If you edit the file on a running system, you have to SIGHUP the
-# server for the changes to take effect, run "pg_ctl reload", or execute
-# "SELECT pg_reload_conf()".  Some parameters, which are marked below,
-# require a server shutdown and restart to take effect.
-#
-# Any parameter can also be given as a command-line option to the server, e.g.,
-# "postgres -c log_connections=on".  Some parameters can be changed at run time
-# with the "SET" SQL command.
-#
-# Memory units:  B  = bytes            Time units:  us  = microseconds
-#                kB = kilobytes                     ms  = milliseconds
-#                MB = megabytes                     s   = seconds
-#                GB = gigabytes                     min = minutes
-#                TB = terabytes                     h   = hours
-#                                                   d   = days
 
+# Allow connections from any IP address
+listen_addresses = '*'
 
-#------------------------------------------------------------------------------
-# FILE LOCATIONS
-#------------------------------------------------------------------------------
+# Set the maximum number of connections
+max_connections = 100
 
-# The default values of these variables are driven from the -D command-line
-# option or PGDATA environment variable, represented here as ConfigDir.
+# Set the shared buffers size
+shared_buffers = 128MB
 
-data_directory = '/var/lib/postgresql/data'		# use data in another directory
-					# (change requires restart)
-hba_file = '/etc/postgresql/15/main/pg_hba.conf'	# host-based authentication file
-					# (change requires restart)
-ident_file = '/etc/postgresql/15/main/pg_ident.conf'	# ident configuration file
-					# (change requires restart)
-
-# If external_pid_file is not explicitly set, no extra PID file is written.
-external_pid_file = '/var/run/postgresql/15-main.pid'			# write an extra PID file
-					# (change requires restart)
-
-
-#------------------------------------------------------------------------------
-# CONNECTIONS AND AUTHENTICATION
-#------------------------------------------------------------------------------
-
-# - Connection Settings -
-
-listen_addresses = 'localhost'		# what IP address(es) to listen on;
-					# comma-separated list of addresses;
-					# defaults to 'localhost'; use '*' for all
-					# (change requires restart)
-port = 5432				# (change requires restart)
-max_connections = 200			# (change requires restart)
-#superuser_reserved_connections = 3	# (change requires restart)
-unix_socket_directories = '/var/run/postgresql'	# comma-separated list of directories
-					# (change requires restart)
-#unix_socket_group = ''			# (change requires restart)
-#unix_socket_permissions = 0777		# begin with 0 to use octal notation
-					# (change requires restart)
-#bonjour = off				# advertise server via Bonjour
-					# (change requires restart)
-#bonjour_name = ''			# defaults to the computer name
-					# (change requires restart)
-
-# - TCP settings -
-# see "man tcp" for details
-
-#tcp_keepalives_idle = 0		# TCP_KEEPIDLE, in seconds;
-					# 0 selects the system default
-#tcp_keepalives_interval = 0		# TCP_KEEPINTVL, in seconds;
-					# 0 selects the system default
-#tcp_keepalives_count = 0		# TCP_KEEPCNT;
-					# 0 selects the system default
-#tcp_user_timeout = 0			# TCP_USER_TIMEOUT, in milliseconds;
-					# 0 selects the system default
-
-#client_connection_check_interval = 0	# time between checks for client
-					# disconnection while running queries;
-					# 0 for never
-
-# - Authentication -
-
-#authentication_timeout = 1min		# 1s-600s
-#password_encryption = scram-sha-256	# scram-sha-256 or md5
-#db_user_namespace = off
-
-# GSSAPI using Kerberos
-#krb_server_keyfile = 'FILE:${sysconfdir}/krb5.keytab'
-#krb_caseins_users = off
-
-# - SSL -
-
-ssl = on
-#ssl_ca_file = ''
-ssl_cert_file = '/etc/ssl/certs/ssl-cert-snakeoil.pem'
-#ssl_crl_file = ''
-#ssl_crl_dir = ''
-ssl_key_file = '/etc/ssl/private/ssl-cert-snakeoil.key'
-#ssl_ciphers = 'HIGH:MEDIUM:+3DES:!aNULL' # allowed SSL ciphers
-#ssl_prefer_server_ciphers = on
-#ssl_ecdh_curve = 'prime256v1'
-#ssl_min_protocol_version = 'TLSv1.2'
-#ssl_max_protocol_version = ''
-#ssl_dh_params_file = ''
-#ssl_passphrase_command = ''
-#ssl_passphrase_command_supports_reload = off
-
-
-#------------------------------------------------------------------------------
-# RESOURCE USAGE (except WAL)
-#------------------------------------------------------------------------------
-
-# - Memory -
-
-shared_buffers = 256MB			# min 128kB
-					# (change requires restart)
-#huge_pages = try			# on, off, or try
-					# (change requires restart)
-#huge_page_size = 0			# zero for system default
-					# (change requires restart)
-#temp_buffers = 8MB			# min 800kB
-#max_prepared_transactions = 0		# zero disables the feature
-					# (change requires restart)
-# Caution: it is not advisable to set max_prepared_transactions nonzero unless
-# you actively intend to use prepared transactions.
-#work_mem = 4MB				# min 64kB
-#hash_mem_multiplier = 2.0		# 1-1000.0 multiplier on hash table work_mem
-#maintenance_work_mem = 64MB		# min 1MB
-#autovacuum_work_mem = -1		# min 1MB, or -1 to use maintenance_work_mem
-#logical_decoding_work_mem = 64MB	# min 64kB
-#max_stack_depth = 2MB			# min 100kB
-#shared_memory_type = mmap		# the default is the first option
-					# supported by the operating system:
-					#   mmap
-					#   sysv
-					#   windows
-					# (change requires restart)
-dynamic_shared_memory_type = posix	# the default is usually the first option
-					# supported by the operating system:
-					#   posix
-					#   sysv
-					#   windows
-					#   mmap
-					# (change requires restart)
-#min_dynamic_shared_memory = 0MB	# (change requires restart)
-
-# - Disk -
-
-#temp_file_limit = -1			# limits per-process temp file space
-					# in kilobytes, or -1 for no limit
-
-# - Kernel Resources -
-
-#max_files_per_process = 1000		# min 64
-					# (change requires restart)
-
-# - Cost-Based Vacuum Delay -
-
-#vacuum_cost_delay = 0			# 0-100 milliseconds (0 disables)
-#vacuum_cost_page_hit = 1		# 0-10000 credits
-#vacuum_cost_page_miss = 2		# 0-10000 credits
-#vacuum_cost_page_dirty = 20		# 0-10000 credits
-#vacuum_cost_limit = 200		# 1-10000 credits
-
-# - Background Writer -
-
-#bgwriter_delay = 200ms			# 10-10000ms between rounds
-#bgwriter_lru_maxpages = 100		# max buffers written/round, 0 disables
-#bgwriter_lru_multiplier = 2.0		# 0-10.0 multiplier on buffers scanned/round
-#bgwriter_flush_after = 512kB		# measured in pages, 0 disables
-
-# - Asynchronous Behavior -
-
-#backend_flush_after = 0		# measured in pages, 0 disables
-#effective_io_concurrency = 1		# 1-1000; 0 disables prefetching
-#maintenance_io_concurrency = 10	# 1-1000; 0 disables prefetching
-#max_worker_processes = 8		# (change requires restart)
-#max_parallel_workers_per_gather = 2	# limited by max_parallel_workers
-#max_parallel_maintenance_workers = 2	# limited by max_parallel_workers
-#max_parallel_workers = 8		# number of max_worker_processes that
-					# can be used in parallel operations
-#parallel_leader_participation = on
-#old_snapshot_threshold = -1		# 1min-60d; -1 disables; 0 is immediate
-					# (change requires restart)
-
-
-#------------------------------------------------------------------------------
-# WRITE-AHEAD LOG
-#------------------------------------------------------------------------------
-
-# - Settings -
-
-#wal_level = replica			# minimal, replica, or logical
-					# (change requires restart)
-#fsync = on				# flush data to disk for crash safety
-					# (turning this off can cause
-					# unrecoverable data corruption)
-#synchronous_commit = on		# synchronization level;
-					# off, local, remote_write, remote_apply, or on
-#wal_sync_method = fsync		# the default is the first option
-					# supported by the operating system:
-					#   open_datasync
-					#   fdatasync (default on Linux and FreeBSD)
-					#   fsync
-					#   fsync_writethrough
-					#   open_sync
-#full_page_writes = on			# recover from partial page writes
-#wal_log_hints = off			# also do full page writes of non-critical updates
-					# (change requires restart)
-#wal_compression = off			# enables compression of full-page writes;
-					# off, pglz, lz4, zstd, or on
-#wal_init_zero = on			# zero-fill new WAL files
-#wal_recycle = on			# recycle WAL files
-#wal_buffers = -1			# min 32kB, -1 sets based on shared_buffers
-					# (change requires restart)
-#wal_writer_delay = 200ms		# 1-10000 milliseconds
-#wal_writer_flush_after = 1MB		# measured in pages, 0 disables
-#wal_skip_threshold = 2MB
-
-#commit_delay = 0			# range 0-100000, in microseconds
-#commit_siblings = 5			# range 1-1000
-
-# - Checkpoints -
-
-#checkpoint_timeout = 5min		# range 30s-1d
-#checkpoint_completion_target = 0.9	# checkpoint target duration, 0.0 - 1.0
-#checkpoint_flush_after = 256kB		# measured in pages, 0 disables
-#checkpoint_warning = 30s		# 0 disables
-max_wal_size = 1GB
-min_wal_size = 80MB
-
-# - Prefetching during recovery -
-
-#recovery_prefetch = try		# prefetch pages referenced in the WAL?
-#wal_decode_buffer_size = 512kB		# lookahead window used for prefetching
-					# (change requires restart)
-
-# - Archiving -
-
-#archive_mode = off		# enables archiving; off, on, or always
-				# (change requires restart)
-#archive_library = ''		# library to use to archive a logfile segment
-				# (empty string indicates archive_command should
-				# be used)
-#archive_command = ''		# command to use to archive a logfile segment
-				# placeholders: %p = path of file to archive
-				#               %f = file name only
-				# e.g. 'test ! -f /mnt/server/archivedir/%f && cp %p /mnt/server/archivedir/%f'
-#archive_timeout = 0		# force a logfile segment switch after this
-				# number of seconds; 0 disables
-
-# - Archive Recovery -
-
-# These are only used in recovery mode.
-
-#restore_command = ''		# command to use to restore an archived logfile segment
-				# placeholders: %p = path of file to restore
-				#               %f = file name only
-				# e.g. 'cp /mnt/server/archivedir/%f %p'
-#archive_cleanup_command = ''	# command to execute at every restartpoint
-#recovery_end_command = ''	# command to execute at completion of recovery
-
-# - Recovery Target -
-
-# Set these only when performing a targeted recovery.
-
-#recovery_target = ''		# 'immediate' to end recovery as soon as a
-                                # consistent state is reached
-				# (change requires restart)
-#recovery_target_name = ''	# the named restore point to which recovery will proceed
-				# (change requires restart)
-#recovery_target_time = ''	# the time stamp up to which recovery will proceed
-				# (change requires restart)
-#recovery_target_xid = ''	# the transaction ID up to which recovery will proceed
-				# (change requires restart)
-#recovery_target_lsn = ''	# the WAL LSN up to which recovery will proceed
-				# (change requires restart)
-#recovery_target_inclusive = on # Specifies whether to stop:
-				# just after the specified recovery target (on)
-				# just before the recovery target (off)
-				# (change requires restart)
-#recovery_target_timeline = 'latest'	# 'current', 'latest', or timeline ID
-				# (change requires restart)
-#recovery_target_action = 'pause'	# 'pause', 'promote', 'shutdown'
-				# (change requires restart)
-
-
-#------------------------------------------------------------------------------
-# REPLICATION
-#------------------------------------------------------------------------------
-
-# - Sending Servers -
-
-# Set these on the primary and on any standby that will send replication data.
-
-#max_wal_senders = 10		# max number of walsender processes
-				# (change requires restart)
-#max_replication_slots = 10	# max number of replication slots
-				# (change requires restart)
-#wal_keep_size = 0		# in megabytes; 0 disables
-#max_slot_wal_keep_size = -1	# in megabytes; -1 disables
-#wal_sender_timeout = 60s	# in milliseconds; 0 disables
-#track_commit_timestamp = off	# collect timestamp of transaction commit
-				# (change requires restart)
-
-# - Primary Server -
-
-# These settings are ignored on a standby server.
-
-#synchronous_standby_names = ''	# standby servers that provide sync rep
-				# method to choose sync standbys, number of sync standbys,
-				# and comma-separated list of application_name
-				# from standby(s); '*' = all
-#vacuum_defer_cleanup_age = 0	# number of xacts by which cleanup is delayed
-
-# - Standby Servers -
-
-# These settings are ignored on a primary server.
-
-#primary_conninfo = ''			# connection string to sending server
-#primary_slot_name = ''			# replication slot on sending server
-#promote_trigger_file = ''		# file name whose presence ends recovery
-#hot_standby = on			# "off" disallows queries during recovery
-					# (change requires restart)
-#max_standby_archive_delay = 30s	# max delay before canceling queries
-					# when reading WAL from archive;
-					# -1 allows indefinite delay
-#max_standby_streaming_delay = 30s	# max delay before canceling queries
-					# when reading streaming WAL;
-					# -1 allows indefinite delay
-#wal_receiver_create_temp_slot = off	# create temp slot if primary_slot_name
-					# is not set
-#wal_receiver_status_interval = 10s	# send replies at least this often
-					# 0 disables
-#hot_standby_feedback = off		# send info from standby to prevent
-					# query conflicts
-#wal_receiver_timeout = 60s		# time that receiver waits for
-					# communication from primary
-					# in milliseconds; 0 disables
-#wal_retrieve_retry_interval = 5s	# time to wait before retrying to
-					# retrieve WAL after a failed attempt
-#recovery_min_apply_delay = 0		# minimum delay for applying changes during recovery
-
-# - Subscribers -
-
-# These settings are ignored on a publisher.
-
-#max_logical_replication_workers = 4	# taken from max_worker_processes
-					# (change requires restart)
-#max_sync_workers_per_subscription = 2	# taken from max_logical_replication_workers
-
-
-#------------------------------------------------------------------------------
-# QUERY TUNING
-#------------------------------------------------------------------------------
-
-# - Planner Method Configuration -
-
-#enable_async_append = on
-#enable_bitmapscan = on
-#enable_gathermerge = on
-#enable_hashagg = on
-#enable_hashjoin = on
-#enable_incremental_sort = on
-#enable_indexscan = on
-#enable_indexonlyscan = on
-#enable_material = on
-#enable_memoize = on
-#enable_mergejoin = on
-#enable_nestloop = on
-#enable_parallel_append = on
-#enable_parallel_hash = on
-#enable_partition_pruning = on
-#enable_partitionwise_join = off
-#enable_partitionwise_aggregate = off
-#enable_seqscan = on
-#enable_sort = on
-#enable_tidscan = on
-
-# - Planner Cost Constants -
-
-#seq_page_cost = 1.0			# measured on an arbitrary scale
-#random_page_cost = 4.0			# same scale as above
-#cpu_tuple_cost = 0.01			# same scale as above
-#cpu_index_tuple_cost = 0.005		# same scale as above
-#cpu_operator_cost = 0.0025		# same scale as above
-#parallel_setup_cost = 1000.0	# same scale as above
-#parallel_tuple_cost = 0.1		# same scale as above
-#min_parallel_table_scan_size = 8MB
-#min_parallel_index_scan_size = 512kB
-#effective_cache_size = 4GB
-
-#jit_above_cost = 100000		# perform JIT compilation if available
-					# and query more expensive than this;
-					# -1 disables
-#jit_inline_above_cost = 500000		# inline small functions if query is
-					# more expensive than this; -1 disables
-#jit_optimize_above_cost = 500000	# use expensive JIT optimizations if
-					# query is more expensive than this;
-					# -1 disables
-
-# - Genetic Query Optimizer -
-
-#geqo = on
-#geqo_threshold = 12
-#geqo_effort = 5			# range 1-10
-#geqo_pool_size = 0			# selects default based on effort
-#geqo_generations = 0			# selects default based on effort
-#geqo_selection_bias = 2.0		# range 1.5-2.0
-#geqo_seed = 0.0			# range 0.0-1.0
-
-# - Other Planner Options -
-
-#default_statistics_target = 100	# range 1-10000
-#constraint_exclusion = partition	# on, off, or partition
-#cursor_tuple_fraction = 0.1		# range 0.0-1.0
-#from_collapse_limit = 8
-#jit = on				# allow JIT compilation
-#join_collapse_limit = 8		# 1 disables collapsing of explicit
-					# JOIN clauses
-#plan_cache_mode = auto			# auto, force_generic_plan or
-					# force_custom_plan
-#recursive_worktable_factor = 10.0	# range 0.001-1000000
-
-
-#------------------------------------------------------------------------------
-# REPORTING AND LOGGING
-#------------------------------------------------------------------------------
-
-# - Where to Log -
-
-#log_destination = 'stderr'		# Valid values are combinations of
-					# stderr, csvlog, jsonlog, syslog, and
-					# eventlog, depending on platform.
-					# csvlog and jsonlog require
-					# logging_collector to be on.
-
-# This is used when logging to stderr:
-#logging_collector = off		# Enable capturing of stderr, jsonlog,
-					# and csvlog into log files. Required
-					# to be on for csvlogs and jsonlogs.
-					# (change requires restart)
-
-# These are only used if logging_collector is on:
-#log_directory = 'log'			# directory where log files are written,
-					# can be absolute or relative to PGDATA
-#log_filename = 'postgresql-%Y-%m-%d_%H%M%S.log'	# log file name pattern,
-					# can include strftime() escapes
-#log_file_mode = 0600			# creation mode for log files,
-					# begin with 0 to use octal notation
-#log_rotation_age = 1d			# Automatic rotation of logfiles will
-					# happen after that time.  0 disables.
-#log_rotation_size = 10MB		# Automatic rotation of logfiles will
-					# happen after that much log output.
-					# 0 disables.
-#log_truncate_on_rotation = off		# If on, an existing log file with the
-					# same name as the new log file will be
-					# truncated rather than appended to.
-					# But such truncation only occurs on
-					# time-driven rotation, not on restarts
-					# or size-driven rotation.  Default is
-					# off, meaning append to existing files
-					# in all cases.
-
-# These are relevant when logging to syslog:
-#syslog_facility = 'LOCAL0'
-#syslog_ident = 'postgres'
-#syslog_sequence_numbers = on
-#syslog_split_messages = on
-
-# This is only relevant when logging to eventlog (Windows):
-# (change requires restart)
-#event_source = 'PostgreSQL'
-
-# - When to Log -
-
-#log_min_messages = warning		# values in order of decreasing detail:
-					#   debug5
-					#   debug4
-					#   debug3
-					#   debug2
-					#   debug1
-					#   info
-					#   notice
-					#   warning
-					#   error
-					#   log
-					#   fatal
-					#   panic
-
-#log_min_error_statement = error	# values in order of decreasing detail:
-					#   debug5
-					#   debug4
-					#   debug3
-					#   debug2
-					#   debug1
-					#   info
-					#   notice
-					#   warning
-					#   error
-					#   log
-					#   fatal
-					#   panic (effectively off)
-
-#log_min_duration_statement = -1	# -1 is disabled, 0 logs all statements
-					# and their durations, > 0 logs only
-					# statements running at least this number
-					# of milliseconds
-
-#log_min_duration_sample = -1		# -1 is disabled, 0 logs a sample of statements
-					# and their durations, > 0 logs only a sample of
-					# statements running at least this number
-					# of milliseconds;
-					# sample fraction is determined by log_statement_sample_rate
-
-#log_statement_sample_rate = 1.0	# fraction of logged statements exceeding
-					# log_min_duration_sample to be logged;
-					# 1.0 logs all such statements, 0.0 never logs
-
-
-#log_transaction_sample_rate = 0.0	# fraction of transactions whose statements
-					# are logged regardless of their duration; 1.0 logs all
-					# statements from all transactions, 0.0 never logs
-
-#log_startup_progress_interval = 10s	# Time between progress updates for
-					# long-running startup operations.
-					# 0 disables the feature, > 0 indicates
-					# the interval in milliseconds.
-
-# - What to Log -
-
-#debug_print_parse = off
-#debug_print_rewritten = off
-#debug_print_plan = off
-#debug_pretty_print = on
-#log_autovacuum_min_duration = 10min	# log autovacuum activity;
-					# -1 disables, 0 logs all actions and
-					# their durations, > 0 logs only
-					# actions running at least this number
-					# of milliseconds.
-#log_checkpoints = on
-#log_connections = off
-#log_disconnections = off
-#log_duration = off
-#log_error_verbosity = default		# terse, default, or verbose messages
-#log_hostname = off
-log_line_prefix = '%m [%p] %q%u@%d '		# special values:
-					#   %a = application name
-					#   %u = user name
-					#   %d = database name
-					#   %r = remote host and port
-					#   %h = remote host
-					#   %b = backend type
-					#   %p = process ID
-					#   %P = process ID of parallel group leader
-					#   %t = timestamp without milliseconds
-					#   %m = timestamp with milliseconds
-					#   %n = timestamp with milliseconds (as a Unix epoch)
-					#   %Q = query ID (0 if none or not computed)
-					#   %i = command tag
-					#   %e = SQL state
-					#   %c = session ID
-					#   %l = session line number
-					#   %s = session start timestamp
-					#   %v = virtual transaction ID
-					#   %x = transaction ID (0 if none)
-					#   %q = stop here in non-session
-					#        processes
-					#   %% = '%'
-					# e.g. '<%u%%%d> '
-#log_lock_waits = off			# log lock waits >= deadlock_timeout
-#log_recovery_conflict_waits = off	# log standby recovery conflict waits
-					# >= deadlock_timeout
-#log_parameter_max_length = -1		# when logging statements, limit logged
-					# bind-parameter values to N bytes;
-					# -1 means print in full, 0 disables
-#log_parameter_max_length_on_error = 0	# when logging an error, limit logged
-					# bind-parameter values to N bytes;
-					# -1 means print in full, 0 disables
-#log_statement = 'none'			# none, ddl, mod, all
-#log_replication_commands = off
-#log_temp_files = -1			# log temporary files equal or larger
-					# than the specified size in kilobytes;
-					# -1 disables, 0 logs all temp files
-log_timezone = 'Etc/UTC'
-
-
-#------------------------------------------------------------------------------
-# PROCESS TITLE
-#------------------------------------------------------------------------------
-
-cluster_name = '15/main'			# added to process titles if nonempty
-					# (change requires restart)
-#update_process_title = on
-
-
-#------------------------------------------------------------------------------
-# STATISTICS
-#------------------------------------------------------------------------------
-
-# - Cumulative Query and Index Statistics -
-
-#track_activities = on
-#track_activity_query_size = 1024	# (change requires restart)
-#track_counts = on
-#track_io_timing = off
-#track_wal_io_timing = off
-#track_functions = none			# none, pl, all
-#stats_fetch_consistency = cache
-
-
-# - Monitoring -
-
-#compute_query_id = auto
-#log_statement_stats = off
-#log_parser_stats = off
-#log_planner_stats = off
-#log_executor_stats = off
-
-
-#------------------------------------------------------------------------------
-# AUTOVACUUM
-#------------------------------------------------------------------------------
-
-#autovacuum = on			# Enable autovacuum subprocess?  'on'
-					# requires track_counts to also be on.
-#autovacuum_max_workers = 3		# max number of autovacuum subprocesses
-					# (change requires restart)
-#autovacuum_naptime = 1min		# time between autovacuum runs
-#autovacuum_vacuum_threshold = 50	# min number of row updates before
-					# vacuum
-#autovacuum_vacuum_insert_threshold = 1000	# min number of row inserts
-					# before vacuum; -1 disables insert
-					# vacuums
-#autovacuum_analyze_threshold = 50	# min number of row updates before
-					# analyze
-#autovacuum_vacuum_scale_factor = 0.2	# fraction of table size before vacuum
-#autovacuum_vacuum_insert_scale_factor = 0.2	# fraction of inserts over table
-					# size before insert vacuum
-#autovacuum_analyze_scale_factor = 0.1	# fraction of table size before analyze
-#autovacuum_freeze_max_age = 200000000	# maximum XID age before forced vacuum
-					# (change requires restart)
-#autovacuum_multixact_freeze_max_age = 400000000	# maximum multixact age
-					# before forced vacuum
-					# (change requires restart)
-#autovacuum_vacuum_cost_delay = 2ms	# default vacuum cost delay for
-					# autovacuum, in milliseconds;
-					# -1 means use vacuum_cost_delay
-#autovacuum_vacuum_cost_limit = -1	# default vacuum cost limit for
-					# autovacuum, -1 means use
-					# vacuum_cost_limit
-
-
-#------------------------------------------------------------------------------
-# CLIENT CONNECTION DEFAULTS
-#------------------------------------------------------------------------------
-
-# - Statement Behavior -
-
-#client_min_messages = notice		# values in order of decreasing detail:
-					#   debug5
-					#   debug4
-					#   debug3
-					#   debug2
-					#   debug1
-					#   log
-					#   notice
-					#   warning
-					#   error
-#search_path = '"$user", public'	# schema names
-#row_security = on
-#default_table_access_method = 'heap'
-#default_tablespace = ''		# a tablespace name, '' uses the default
-#default_toast_compression = 'pglz'	# 'pglz' or 'lz4'
-#temp_tablespaces = ''			# a list of tablespace names, '' uses
-					# only default tablespace
-#check_function_bodies = on
-#default_transaction_isolation = 'read committed'
-#default_transaction_read_only = off
-#default_transaction_deferrable = off
-#session_replication_role = 'origin'
-#statement_timeout = 0			# in milliseconds, 0 is disabled
-#lock_timeout = 0			# in milliseconds, 0 is disabled
-#idle_in_transaction_session_timeout = 0	# in milliseconds, 0 is disabled
-#idle_session_timeout = 0		# in milliseconds, 0 is disabled
-#vacuum_freeze_table_age = 150000000
-#vacuum_freeze_min_age = 50000000
-#vacuum_failsafe_age = 1600000000
-#vacuum_multixact_freeze_table_age = 150000000
-#vacuum_multixact_freeze_min_age = 5000000
-#vacuum_multixact_failsafe_age = 1600000000
-#bytea_output = 'hex'			# hex, escape
-#xmlbinary = 'base64'
-#xmloption = 'content'
-#gin_pending_list_limit = 4MB
-
-# - Locale and Formatting -
-
-datestyle = 'iso, mdy'
-#intervalstyle = 'postgres'
-timezone = 'Etc/UTC'
-#timezone_abbreviations = 'Default'     # Select the set of available time zone
-					# abbreviations.  Currently, there are
-					#   Default
-					#   Australia (historical usage)
-					#   India
-					# You can create your own file in
-					# share/timezonesets/.
-#extra_float_digits = 1			# min -15, max 3; any value >0 actually
-					# selects precise output mode
-#client_encoding = sql_ascii		# actually, defaults to database
-					# encoding
-
-# These settings are initialized by initdb, but they can be changed.
-lc_messages = 'C.UTF-8'			# locale for system error message
-					# strings
-lc_monetary = 'C.UTF-8'			# locale for monetary formatting
-lc_numeric = 'C.UTF-8'			# locale for number formatting
-lc_time = 'C.UTF-8'				# locale for time formatting
-
-# default configuration for text search
-default_text_search_config = 'pg_catalog.english'
-
-# - Shared Library Preloading -
-
-#local_preload_libraries = ''
-#session_preload_libraries = ''
-#shared_preload_libraries = ''	# (change requires restart)
-#jit_provider = 'llvmjit'		# JIT library to use
-
-# - Other Defaults -
-
-#dynamic_library_path = '$libdir'
-#extension_destdir = ''			# prepend path when loading extensions
-					# and shared objects (added by Debian)
-#gin_fuzzy_search_limit = 0
-
-
-#------------------------------------------------------------------------------
-# LOCK MANAGEMENT
-#------------------------------------------------------------------------------
-
-#deadlock_timeout = 1s
-#max_locks_per_transaction = 64		# min 10
-					# (change requires restart)
-#max_pred_locks_per_transaction = 64	# min 10
-					# (change requires restart)
-#max_pred_locks_per_relation = -2	# negative values mean
-					# (max_pred_locks_per_transaction
-					#  / -max_pred_locks_per_relation) - 1
-#max_pred_locks_per_page = 2            # min 0
-
-
-#------------------------------------------------------------------------------
-# VERSION AND PLATFORM COMPATIBILITY
-#------------------------------------------------------------------------------
-
-# - Previous PostgreSQL Versions -
-
-#array_nulls = on
-#backslash_quote = safe_encoding	# on, off, or safe_encoding
-#escape_string_warning = on
-#lo_compat_privileges = off
-#quote_all_identifiers = off
-#standard_conforming_strings = on
-#synchronize_seqscans = on
-
-# - Other Platforms and Clients -
-
-#transform_null_equals = off
-
-
-#------------------------------------------------------------------------------
-# ERROR HANDLING
-#------------------------------------------------------------------------------
-
-#exit_on_error = off			# terminate session on any error?
-#restart_after_crash = on		# reinitialize after backend crash?
-#data_sync_retry = off			# retry or panic on failure to fsync
-					# data?
-					# (change requires restart)
-#recovery_init_sync_method = fsync	# fsync, syncfs (Linux 5.8+)
-
-
-#------------------------------------------------------------------------------
-# CONFIG FILE INCLUDES
-#------------------------------------------------------------------------------
-
-# These options allow settings to be loaded from files other than the
-# default postgresql.conf.  Note that these are directives, not variable
-# assignments, so they can usefully be given more than once.
-
-# include_dir = 'conf.d'			# include files ending in '.conf' from
-					# a directory, e.g., 'conf.d'
-#include_if_exists = '...'		# include file only if it exists
-#include = '...'			# include file
-
-
-#------------------------------------------------------------------------------
-# CUSTOMIZED OPTIONS
-#------------------------------------------------------------------------------
-
-# Add settings for extensions here
+# Other custom configurations can be added here

aio/supervisord-app

@@ -1,71 +0,0 @@
-
-[program:web]
-command=node /app/web/web/server.js
-autostart=true
-autorestart=true
-stdout_logfile=/dev/stdout
-stdout_logfile_maxbytes=0
-stderr_logfile=/dev/stdout
-stderr_logfile_maxbytes=0
-environment=PORT=3001,HOSTNAME=0.0.0.0
-
-[program:space]
-command=node /app/space/space/server.js
-autostart=true
-autorestart=true
-stdout_logfile=/dev/stdout
-stdout_logfile_maxbytes=0
-stderr_logfile=/dev/stdout
-stderr_logfile_maxbytes=0
-environment=PORT=3002,HOSTNAME=0.0.0.0
-
-[program:admin]
-command=node /app/admin/admin/server.js
-autostart=true
-autorestart=true
-stdout_logfile=/dev/stdout
-stdout_logfile_maxbytes=0
-stderr_logfile=/dev/stdout
-stderr_logfile_maxbytes=0
-environment=PORT=3003,HOSTNAME=0.0.0.0
-
-[program:migrator]
-directory=/app/api
-command=sh -c "./bin/docker-entrypoint-migrator.sh"
-autostart=true
-autorestart=false
-stdout_logfile=/dev/stdout
-stdout_logfile_maxbytes=0
-stderr_logfile=/dev/stdout
-stderr_logfile_maxbytes=0
-
-[program:api]
-directory=/app/api
-command=sh -c "./bin/docker-entrypoint-api.sh"
-autostart=true
-autorestart=true
-stdout_logfile=/dev/stdout
-stdout_logfile_maxbytes=0
-stderr_logfile=/dev/stdout
-stderr_logfile_maxbytes=0
-
-[program:worker]
-directory=/app/api
-command=sh -c "./bin/docker-entrypoint-worker.sh"
-autostart=true
-autorestart=true
-stdout_logfile=/dev/stdout
-stdout_logfile_maxbytes=0
-stderr_logfile=/dev/stdout
-stderr_logfile_maxbytes=0
-
-[program:beat]
-directory=/app/api
-command=sh -c "./bin/docker-entrypoint-beat.sh"
-autostart=true
-autorestart=true
-stdout_logfile=/dev/stdout
-stdout_logfile_maxbytes=0
-stderr_logfile=/dev/stdout
-stderr_logfile_maxbytes=0
-

aio/supervisord-slim-base

@@ -1,14 +0,0 @@
-[supervisord]
-user=root
-nodaemon=true
-stderr_logfile=/app/logs/error/supervisor.err.log
-stdout_logfile=/app/logs/access/supervisor.log
-
-[program:nginx]
-directory=/app/data/nginx
-command=/app/nginx-start.sh
-autostart=true
-autorestart=true
-stderr_logfile=/app/logs/error/nginx.err.log
-stdout_logfile=/app/logs/access/nginx.log
-

aio/supervisord.base

@@ -2,7 +2,7 @@
 user=root
 nodaemon=true
 stderr_logfile=/app/logs/error/supervisor.err.log
-stdout_logfile=/app/logs/access/supervisor.log
+stdout_logfile=/app/logs/access/supervisor.out.log
 
 [program:redis]
 directory=/app/data/redis
@@ -10,15 +10,15 @@ command=redis-server
 autostart=true
 autorestart=true
 stderr_logfile=/app/logs/error/redis.err.log
-stdout_logfile=/app/logs/access/redis.log
+stdout_logfile=/app/logs/access/redis.out.log
 
 [program:postgresql]
 user=postgres
-command=/usr/lib/postgresql/15/bin/postgres --config-file=/etc/postgresql/postgresql.conf
+command=/usr/lib/postgresql/15/bin/postgres --config-file=/etc/postgresql/15/main/postgresql.conf
 autostart=true
 autorestart=true
 stderr_logfile=/app/logs/error/postgresql.err.log
-stdout_logfile=/app/logs/access/postgresql.log
+stdout_logfile=/app/logs/access/postgresql.out.log
 
 [program:minio]
 directory=/app/data/minio
@@ -26,13 +26,12 @@ command=minio server /app/data/minio
 autostart=true
 autorestart=true
 stderr_logfile=/app/logs/error/minio.err.log
-stdout_logfile=/app/logs/access/minio.log
+stdout_logfile=/app/logs/access/minio.out.log
 
 [program:nginx]
 directory=/app/data/nginx
-command=/app/nginx-start.sh
+command=/usr/sbin/nginx -g 'daemon off;'
 autostart=true
 autorestart=true
 stderr_logfile=/app/logs/error/nginx.err.log
-stdout_logfile=/app/logs/access/nginx.log
-
+stdout_logfile=/app/logs/access/nginx.out.log

aio/supervisord.conf

@@ -0,0 +1,115 @@
+[supervisord]
+user=root
+nodaemon=true
+priority=1
+stdout_logfile=/dev/stdout
+stdout_logfile_maxbytes=0
+stderr_logfile=/dev/stdout
+stderr_logfile_maxbytes=0
+
+[program:redis]
+directory=/app/data/redis
+command=redis-server
+autostart=true
+autorestart=true
+priority=1
+stdout_logfile=/dev/stdout
+stdout_logfile_maxbytes=0
+stderr_logfile=/dev/stdout
+stderr_logfile_maxbytes=0
+
+[program:postgresql]
+user=postgres
+command=/usr/lib/postgresql/15/bin/postgres -D /var/lib/postgresql/data --config-file=/etc/postgresql/postgresql.conf
+autostart=true
+autorestart=true
+priority=1
+stdout_logfile=/dev/stdout
+stdout_logfile_maxbytes=0
+stderr_logfile=/dev/stdout
+stderr_logfile_maxbytes=0
+
+[program:minio]
+directory=/app/data/minio
+command=minio server /app/data/minio
+autostart=true
+autorestart=true
+priority=1
+stdout_logfile=/app/logs/access/minio.log
+stderr_logfile=/app/logs/error/minio.err.log
+
+[program:nginx]
+command=/app/nginx-start.sh
+autostart=true
+autorestart=true
+priority=1
+stdout_logfile=/app/logs/access/nginx.log
+stderr_logfile=/app/logs/error/nginx.err.log
+
+
+[program:web]
+command=/app/aio.sh web
+autostart=true
+autorestart=true
+stdout_logfile=/dev/stdout
+stdout_logfile_maxbytes=0
+stderr_logfile=/dev/stdout
+stderr_logfile_maxbytes=0
+environment=PORT=3001,HOSTNAME=0.0.0.0
+
+[program:space]
+command=/app/aio.sh space
+autostart=true
+autorestart=true
+stdout_logfile=/dev/stdout
+stdout_logfile_maxbytes=0
+stderr_logfile=/dev/stdout
+stderr_logfile_maxbytes=0
+environment=PORT=3002,HOSTNAME=0.0.0.0
+
+[program:admin]
+command=/app/aio.sh admin
+autostart=true
+autorestart=true
+stdout_logfile=/dev/stdout
+stdout_logfile_maxbytes=0
+stderr_logfile=/dev/stdout
+stderr_logfile_maxbytes=0
+environment=PORT=3003,HOSTNAME=0.0.0.0
+
+[program:migrator]
+command=/app/aio.sh migrator
+autostart=true
+autorestart=false
+stdout_logfile=/dev/stdout
+stdout_logfile_maxbytes=0
+stderr_logfile=/dev/stdout
+stderr_logfile_maxbytes=0
+
+[program:api]
+command=/app/aio.sh api
+autostart=true
+autorestart=true
+stdout_logfile=/dev/stdout
+stdout_logfile_maxbytes=0
+stderr_logfile=/dev/stdout
+stderr_logfile_maxbytes=0
+
+[program:worker]
+command=/app/aio.sh worker
+autostart=true
+autorestart=true
+stdout_logfile=/dev/stdout
+stdout_logfile_maxbytes=0
+stderr_logfile=/dev/stdout
+stderr_logfile_maxbytes=0
+
+[program:beat]
+command=/app/aio.sh beat
+autostart=true
+autorestart=true
+stdout_logfile=/dev/stdout
+stdout_logfile_maxbytes=0
+stderr_logfile=/dev/stdout
+stderr_logfile_maxbytes=0
+

apiserver/.env.example

@@ -50,6 +50,3 @@ GUNICORN_WORKERS=2
 ADMIN_BASE_URL=
 SPACE_BASE_URL=
 APP_BASE_URL=
-
-# Hard delete files after days
-HARD_DELETE_AFTER_DAYS=60

apiserver/Dockerfile.api

@@ -1,4 +1,4 @@
-FROM python:3.12.5-alpine AS backend
+FROM python:3.11.1-alpine3.17 AS backend
 
 # set environment variables
 ENV PYTHONDONTWRITEBYTECODE 1
@@ -7,23 +7,23 @@ ENV PIP_DISABLE_PIP_VERSION_CHECK=1
 
 WORKDIR /code
 
-RUN apk add --no-cache \
-    "libpq" \
-    "libxslt" \
-    "nodejs-current" \
-    "xmlsec"
+RUN apk --no-cache add \
+    "libpq~=15" \
+    "libxslt~=1.1" \
+    "nodejs-current~=19" \
+    "xmlsec~=1.2"
 
 COPY requirements.txt ./
 COPY requirements ./requirements
 RUN apk add --no-cache libffi-dev
 RUN apk add --no-cache --virtual .build-deps \
     "bash~=5.2" \
-    "g++" \
-    "gcc" \
-    "cargo" \
-    "git" \
-    "make" \
-    "postgresql-dev" \
+    "g++~=12.2" \
+    "gcc~=12.2" \
+    "cargo~=1.64" \
+    "git~=2" \
+    "make~=4.3" \
+    "postgresql13-dev~=13" \
     "libc-dev" \
     "linux-headers" \
     && \

apiserver/Dockerfile.dev

@@ -1,4 +1,4 @@
-FROM python:3.12.5-alpine AS backend
+FROM python:3.11.1-alpine3.17 AS backend
 
 # set environment variables
 ENV PYTHONDONTWRITEBYTECODE 1
@@ -7,18 +7,18 @@ ENV PIP_DISABLE_PIP_VERSION_CHECK=1
 
 RUN apk --no-cache add \
     "bash~=5.2" \
-    "libpq" \
-    "libxslt" \
-    "nodejs-current" \
-    "xmlsec" \
+    "libpq~=15" \
+    "libxslt~=1.1" \
+    "nodejs-current~=19" \
+    "xmlsec~=1.2" \
     "libffi-dev" \
     "bash~=5.2" \
-    "g++" \
-    "gcc" \
-    "cargo" \
-    "git" \
-    "make" \
-    "postgresql-dev" \
+    "g++~=12.2" \
+    "gcc~=12.2" \
+    "cargo~=1.64" \
+    "git~=2" \
+    "make~=4.3" \
+    "postgresql13-dev~=13" \
     "libc-dev" \
     "linux-headers"
 

apiserver/bin/docker-entrypoint-api-local.sh

@@ -32,3 +32,4 @@ python manage.py create_bucket
 python manage.py clear_cache
 
 python manage.py runserver 0.0.0.0:8000 --settings=plane.settings.local
+

apiserver/package.json

@@ -1,4 +1,4 @@
 {
   "name": "plane-api",
-  "version": "0.22.0"
+  "version": "0.21.0"
 }

apiserver/plane/api/rate_limit.py

@@ -40,44 +40,3 @@ class ApiKeyRateThrottle(SimpleRateThrottle):
             request.META["X-RateLimit-Reset"] = reset_time
 
         return allowed
-
-
-class ServiceTokenRateThrottle(SimpleRateThrottle):
-    scope = "service_token"
-    rate = "300/minute"
-
-    def get_cache_key(self, request, view):
-        # Retrieve the API key from the request header
-        api_key = request.headers.get("X-Api-Key")
-        if not api_key:
-            return None  # Allow the request if there's no API key
-
-        # Use the API key as part of the cache key
-        return f"{self.scope}:{api_key}"
-
-    def allow_request(self, request, view):
-        allowed = super().allow_request(request, view)
-
-        if allowed:
-            now = self.timer()
-            # Calculate the remaining limit and reset time
-            history = self.cache.get(self.key, [])
-
-            # Remove old histories
-            while history and history[-1] <= now - self.duration:
-                history.pop()
-
-            # Calculate the requests
-            num_requests = len(history)
-
-            # Check available requests
-            available = self.num_requests - num_requests
-
-            # Unix timestamp for when the rate limit will reset
-            reset_time = int(now + self.duration)
-
-            # Add headers
-            request.META["X-RateLimit-Remaining"] = max(0, available)
-            request.META["X-RateLimit-Reset"] = reset_time
-
-        return allowed

apiserver/plane/api/serializers/cycle.py

@@ -13,9 +13,9 @@ class CycleSerializer(BaseSerializer):
     started_issues = serializers.IntegerField(read_only=True)
     unstarted_issues = serializers.IntegerField(read_only=True)
     backlog_issues = serializers.IntegerField(read_only=True)
-    total_estimates = serializers.FloatField(read_only=True)
-    completed_estimates = serializers.FloatField(read_only=True)
-    started_estimates = serializers.FloatField(read_only=True)
+    total_estimates = serializers.IntegerField(read_only=True)
+    completed_estimates = serializers.IntegerField(read_only=True)
+    started_estimates = serializers.IntegerField(read_only=True)
 
     def validate(self, data):
         if (
@@ -40,7 +40,6 @@ class CycleSerializer(BaseSerializer):
             "workspace",
             "project",
             "owned_by",
-            "deleted_at",
         ]
 
 

apiserver/plane/api/serializers/issue.py

@@ -11,7 +11,6 @@ from rest_framework import serializers
 # Module imports
 from plane.db.models import (
     Issue,
-    IssueType,
     IssueActivity,
     IssueAssignee,
     IssueAttachment,
@@ -22,6 +21,7 @@ from plane.db.models import (
     ProjectMember,
     State,
     User,
+    Project,
 )
 
 from .base import BaseSerializer
@@ -29,6 +29,8 @@ from .cycle import CycleLiteSerializer, CycleSerializer
 from .module import ModuleLiteSerializer, ModuleSerializer
 from .state import StateLiteSerializer
 from .user import UserLiteSerializer
+from plane.utils.metadata import get_metadata
+from plane.utils.presigned_url_generator import generate_download_presigned_url
 
 
 class IssueSerializer(BaseSerializer):
@@ -47,12 +49,6 @@ class IssueSerializer(BaseSerializer):
         write_only=True,
         required=False,
     )
-    type_id = serializers.PrimaryKeyRelatedField(
-        source="type",
-        queryset=IssueType.objects.all(),
-        required=False,
-        allow_null=True,
-    )
 
     class Meta:
         model = Issue
@@ -60,7 +56,9 @@ class IssueSerializer(BaseSerializer):
             "id",
             "workspace",
             "project",
+            "created_by",
             "updated_by",
+            "created_at",
             "updated_at",
         ]
         exclude = [
@@ -136,20 +134,7 @@ class IssueSerializer(BaseSerializer):
         workspace_id = self.context["workspace_id"]
         default_assignee_id = self.context["default_assignee_id"]
 
-        issue_type = validated_data.pop("type", None)
-
-        if not issue_type:
-            # Get default issue type
-            issue_type = IssueType.objects.filter(
-                project_issue_types__project_id=project_id, is_default=True
-            ).first()
-            issue_type = issue_type
-
-        issue = Issue.objects.create(
-            **validated_data,
-            project_id=project_id,
-            type=issue_type,
-        )
+        issue = Issue.objects.create(**validated_data, project_id=project_id)
 
         # Issue Audit Users
         created_by_id = issue.created_by_id
@@ -286,11 +271,12 @@ class LabelSerializer(BaseSerializer):
             "updated_by",
             "created_at",
             "updated_at",
-            "deleted_at",
         ]
 
 
 class IssueLinkSerializer(BaseSerializer):
+    metadata = serializers.SerializerMethodField()
+
     class Meta:
         model = IssueLink
         fields = "__all__"
@@ -305,6 +291,12 @@ class IssueLinkSerializer(BaseSerializer):
             "updated_at",
         ]
 
+    def get_metadata(self, obj):
+        logo = obj.metadata.get("logo", None)
+        if logo:
+            obj.metadata["logo"] = generate_download_presigned_url(logo)
+        return obj.metadata
+
     def validate_url(self, value):
         # Check URL format
         validate_url = URLValidator()
@@ -328,6 +320,14 @@ class IssueLinkSerializer(BaseSerializer):
             raise serializers.ValidationError(
                 {"error": "URL already exists for this Issue"}
             )
+
+        # Workspace
+        project = Project.objects.get(pk=validated_data.get("project_id"))
+        # Fetch metadata from URL
+        validated_data["metadata"] = get_metadata(
+            validated_data.get("url"), project.workspace_id
+        )
+
         return IssueLink.objects.create(**validated_data)
 
     def update(self, instance, validated_data):
@@ -343,6 +343,10 @@ class IssueLinkSerializer(BaseSerializer):
                 {"error": "URL already exists for this Issue"}
             )
 
+        validated_data["metadata"] = get_metadata(
+            validated_data.get("url"), instance.workspace_id
+        )
+
         return super().update(instance, validated_data)
 
 
@@ -355,7 +359,9 @@ class IssueAttachmentSerializer(BaseSerializer):
             "workspace",
             "project",
             "issue",
+            "created_by",
             "updated_by",
+            "created_at",
             "updated_at",
         ]
 

apiserver/plane/api/serializers/module.py

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

apiserver/plane/api/serializers/project.py

@@ -31,7 +31,6 @@ class ProjectSerializer(BaseSerializer):
             "updated_at",
             "created_by",
             "updated_by",
-            "deleted_at",
         ]
 
     def validate(self, data):

apiserver/plane/api/serializers/state.py

@@ -23,7 +23,6 @@ class StateSerializer(BaseSerializer):
             "updated_at",
             "workspace",
             "project",
-            "deleted_at",
         ]
 
 

apiserver/plane/api/urls/__init__.py

@@ -4,7 +4,6 @@ from .issue import urlpatterns as issue_patterns
 from .cycle import urlpatterns as cycle_patterns
 from .module import urlpatterns as module_patterns
 from .inbox import urlpatterns as inbox_patterns
-from .member import urlpatterns as member_patterns
 
 urlpatterns = [
     *project_patterns,
@@ -13,5 +12,4 @@ urlpatterns = [
     *cycle_patterns,
     *module_patterns,
     *inbox_patterns,
-    *member_patterns,
 ]

apiserver/plane/api/urls/issue.py

@@ -7,7 +7,6 @@ from plane.api.views import (
     IssueCommentAPIEndpoint,
     IssueActivityAPIEndpoint,
     WorkspaceIssueAPIEndpoint,
-    IssueAttachmentEndpoint,
 )
 
 urlpatterns = [
@@ -66,9 +65,4 @@ urlpatterns = [
         IssueActivityAPIEndpoint.as_view(),
         name="activity",
     ),
-    path(
-        "workspaces/<str:slug>/projects/<uuid:project_id>/issues/<uuid:issue_id>/issue-attachments/",
-        IssueAttachmentEndpoint.as_view(),
-        name="attachment",
-    ),
 ]

apiserver/plane/api/urls/member.py

@@ -1,13 +0,0 @@
-from django.urls import path
-
-from plane.api.views import (
-    ProjectMemberAPIEndpoint,
-)
-
-urlpatterns = [
-    path(
-        "workspaces/<str:slug>/projects/<str:project_id>/members/",
-        ProjectMemberAPIEndpoint.as_view(),
-        name="users",
-    ),
-]

apiserver/plane/api/views/__init__.py

@@ -9,7 +9,6 @@ from .issue import (
     IssueLinkAPIEndpoint,
     IssueCommentAPIEndpoint,
     IssueActivityAPIEndpoint,
-    IssueAttachmentEndpoint,
 )
 
 from .cycle import (
@@ -25,7 +24,4 @@ from .module import (
     ModuleArchiveUnarchiveAPIEndpoint,
 )
 
-from .member import ProjectMemberAPIEndpoint
-
 from .inbox import InboxIssueAPIEndpoint
-

apiserver/plane/api/views/base.py

@@ -7,7 +7,6 @@ from django.core.exceptions import ObjectDoesNotExist, ValidationError
 from django.db import IntegrityError
 from django.urls import resolve
 from django.utils import timezone
-from plane.db.models.api import APIToken
 from rest_framework import status
 from rest_framework.permissions import IsAuthenticated
 from rest_framework.response import Response
@@ -17,7 +16,7 @@ from rest_framework.views import APIView
 
 # Module imports
 from plane.api.middleware.api_authentication import APIKeyAuthentication
-from plane.api.rate_limit import ApiKeyRateThrottle, ServiceTokenRateThrottle
+from plane.api.rate_limit import ApiKeyRateThrottle
 from plane.utils.exception_logger import log_exception
 from plane.utils.paginator import BasePaginator
 
@@ -45,29 +44,15 @@ class BaseAPIView(TimezoneMixin, APIView, BasePaginator):
         IsAuthenticated,
     ]
 
+    throttle_classes = [
+        ApiKeyRateThrottle,
+    ]
+
     def filter_queryset(self, queryset):
         for backend in list(self.filter_backends):
             queryset = backend().filter_queryset(self.request, queryset, self)
         return queryset
 
-    def get_throttles(self):
-        throttle_classes = []
-        api_key = self.request.headers.get("X-Api-Key")
-
-        if api_key:
-            service_token = APIToken.objects.filter(
-                token=api_key,
-                is_service=True,
-            ).first()
-
-            if service_token:
-                throttle_classes.append(ServiceTokenRateThrottle())
-                return throttle_classes
-
-        throttle_classes.append(ApiKeyRateThrottle())
-
-        return throttle_classes
-
     def handle_exception(self, exc):
         """
         Handle any exception that occurs, by returning an appropriate response,
@@ -167,4 +152,4 @@ class BaseAPIView(TimezoneMixin, APIView, BasePaginator):
             for expand in self.request.GET.get("expand", "").split(",")
             if expand
         ]
-        return expand if expand else None
+        return expand if expand else None

apiserver/plane/api/views/cycle.py

@@ -3,18 +3,9 @@ import json
 
 # Django imports
 from django.core import serializers
+from django.db.models import Count, F, Func, OuterRef, Q, Sum
 from django.utils import timezone
 from django.core.serializers.json import DjangoJSONEncoder
-from django.db.models import (
-    Count,
-    F,
-    Func,
-    OuterRef,
-    Q,
-    Sum,
-    FloatField,
-)
-from django.db.models.functions import Cast
 
 # Third party imports
 from rest_framework import status
@@ -26,16 +17,13 @@ from plane.api.serializers import (
     CycleSerializer,
 )
 from plane.app.permissions import ProjectEntityPermission
-from plane.bgtasks.issue_activities_task import issue_activity
+from plane.bgtasks.issue_activites_task import issue_activity
 from plane.db.models import (
     Cycle,
     CycleIssue,
     Issue,
-    Project,
     IssueAttachment,
     IssueLink,
-    ProjectMember,
-    UserFavorite,
 )
 from plane.utils.analytics_plot import burndown_plot
 
@@ -127,6 +115,29 @@ class CycleAPIEndpoint(BaseAPIView):
                     ),
                 )
             )
+            .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()
         )
@@ -365,28 +376,14 @@ class CycleAPIEndpoint(BaseAPIView):
         return Response(serializer.errors, status=status.HTTP_400_BAD_REQUEST)
 
     def delete(self, request, slug, project_id, pk):
-        cycle = Cycle.objects.get(
-            workspace__slug=slug, project_id=project_id, pk=pk
-        )
-        if cycle.owned_by_id != request.user.id and (
-            not ProjectMember.objects.filter(
-                workspace__slug=slug,
-                member=request.user,
-                role=20,
-                project_id=project_id,
-                is_active=True,
-            ).exists()
-        ):
-            return Response(
-                {"error": "Only admin or creator can delete the cycle"},
-                status=status.HTTP_403_FORBIDDEN,
-            )
-
         cycle_issues = list(
             CycleIssue.objects.filter(
                 cycle_id=self.kwargs.get("pk")
             ).values_list("issue", flat=True)
         )
+        cycle = Cycle.objects.get(
+            workspace__slug=slug, project_id=project_id, pk=pk
+        )
 
         issue_activity.delay(
             type="cycle.activity.deleted",
@@ -405,20 +402,11 @@ class CycleAPIEndpoint(BaseAPIView):
         )
         # Delete the cycle
         cycle.delete()
-        # Delete the cycle issues
-        CycleIssue.objects.filter(
-            cycle_id=self.kwargs.get("pk"),
-        ).delete()
-        # Delete the user favorite cycle
-        UserFavorite.objects.filter(
-            entity_type="cycle",
-            entity_identifier=pk,
-            project_id=project_id,
-        ).delete()
         return Response(status=status.HTTP_204_NO_CONTENT)
 
 
 class CycleArchiveUnarchiveAPIEndpoint(BaseAPIView):
+
     permission_classes = [
         ProjectEntityPermission,
     ]
@@ -544,12 +532,6 @@ class CycleArchiveUnarchiveAPIEndpoint(BaseAPIView):
             )
         cycle.archived_at = timezone.now()
         cycle.save()
-        UserFavorite.objects.filter(
-            entity_type="cycle",
-            entity_identifier=cycle_id,
-            project_id=project_id,
-            workspace__slug=slug,
-        ).delete()
         return Response(status=status.HTTP_204_NO_CONTENT)
 
     def delete(self, request, slug, project_id, cycle_id):
@@ -678,63 +660,72 @@ class CycleIssueAPIEndpoint(BaseAPIView):
             workspace__slug=slug, project_id=project_id, pk=cycle_id
         )
 
-        # 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
-            if str(cycle_issue.issue_id) in issues
-        ]
-        new_issues = list(set(issues) - set(existing_issues))
-
-        # New issues to create
-        created_records = CycleIssue.objects.bulk_create(
-            [
-                CycleIssue(
-                    project_id=project_id,
-                    workspace_id=cycle.workspace_id,
-                    cycle_id=cycle_id,
-                    issue_id=issue,
-                )
-                for issue in new_issues
-            ],
-            ignore_conflicts=True,
-            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:
-            old_cycle_id = cycle_issue.cycle_id
-            # 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(
+        if (
+            cycle.end_date is not None
+            and cycle.end_date < timezone.now().date()
+        ):
+            return Response(
                 {
-                    "old_cycle_id": str(old_cycle_id),
-                    "new_cycle_id": str(cycle_id),
-                    "issue_id": str(cycle_issue.issue_id),
-                }
+                    "error": "The Cycle has already been completed so no new issues can be added"
+                },
+                status=status.HTTP_400_BAD_REQUEST,
             )
 
-        # Update the cycle issues
+        issues = Issue.objects.filter(
+            pk__in=issues, workspace__slug=slug, project_id=project_id
+        ).values_list("id", flat=True)
+
+        # Get all CycleIssues already created
+        cycle_issues = list(CycleIssue.objects.filter(issue_id__in=issues))
+        update_cycle_issue_activity = []
+        record_to_create = []
+        records_to_update = []
+
+        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,
+                    )
+                )
+
+        CycleIssue.objects.bulk_create(
+            record_to_create,
+            batch_size=10,
+            ignore_conflicts=True,
+        )
         CycleIssue.objects.bulk_update(
-            updated_records, ["cycle_id"], batch_size=100
+            records_to_update,
+            ["cycle"],
+            batch_size=10,
         )
 
         # Capture Issue Activity
         issue_activity.delay(
             type="cycle.activity.created",
-            requested_data=json.dumps({"cycles_list": issues}),
+            requested_data=json.dumps({"cycles_list": str(issues)}),
             actor_id=str(self.request.user.id),
             issue_id=None,
             project_id=str(self.kwargs.get("project_id", None)),
@@ -742,14 +733,13 @@ class CycleIssueAPIEndpoint(BaseAPIView):
                 {
                     "updated_cycle_issues": update_cycle_issue_activity,
                     "created_cycle_issues": serializers.serialize(
-                        "json", created_records
+                        "json", record_to_create
                     ),
                 }
             ),
             epoch=int(timezone.now().timestamp()),
-            notification=True,
-            origin=request.META.get("HTTP_ORIGIN"),
         )
+
         # Return all Cycle Issues
         return Response(
             CycleIssueSerializer(self.get_queryset(), many=True).data,
@@ -794,6 +784,7 @@ class TransferCycleIssueAPIEndpoint(BaseAPIView):
 
     def post(self, request, slug, project_id, cycle_id):
         new_cycle_id = request.data.get("new_cycle_id", False)
+        plot_type = request.GET.get("plot_type", "issues")
 
         if not new_cycle_id:
             return Response(
@@ -801,9 +792,9 @@ class TransferCycleIssueAPIEndpoint(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(
@@ -870,131 +861,18 @@ class TransferCycleIssueAPIEndpoint(BaseAPIView):
             )
         )
 
-        estimate_type = Project.objects.filter(
-            workspace__slug=slug,
-            pk=project_id,
-            estimate__isnull=False,
-            estimate__type="points",
-        ).exists()
-
-        if estimate_type:
-            assignee_estimate_data = (
-                Issue.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_estimates=Sum(
-                        Cast("estimate_point__value", FloatField())
-                    )
-                )
-                .annotate(
-                    completed_estimates=Sum(
-                        Cast("estimate_point__value", FloatField()),
-                        filter=Q(
-                            completed_at__isnull=False,
-                            archived_at__isnull=True,
-                            is_draft=False,
-                        ),
-                    )
-                )
-                .annotate(
-                    pending_estimates=Sum(
-                        Cast("estimate_point__value", FloatField()),
-                        filter=Q(
-                            completed_at__isnull=True,
-                            archived_at__isnull=True,
-                            is_draft=False,
-                        ),
-                    )
-                )
-                .order_by("display_name")
-            )
-            # assignee distribution serialization
-            assignee_estimate_distribution = [
-                {
-                    "display_name": item["display_name"],
-                    "assignee_id": (
-                        str(item["assignee_id"])
-                        if item["assignee_id"]
-                        else None
-                    ),
-                    "avatar": item["avatar"],
-                    "total_estimates": item["total_estimates"],
-                    "completed_estimates": item["completed_estimates"],
-                    "pending_estimates": item["pending_estimates"],
-                }
-                for item in assignee_estimate_data
-            ]
-
-            label_distribution_data = (
-                Issue.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_estimates=Sum(
-                        Cast("estimate_point__value", FloatField())
-                    )
-                )
-                .annotate(
-                    completed_estimates=Sum(
-                        Cast("estimate_point__value", FloatField()),
-                        filter=Q(
-                            completed_at__isnull=False,
-                            archived_at__isnull=True,
-                            is_draft=False,
-                        ),
-                    )
-                )
-                .annotate(
-                    pending_estimates=Sum(
-                        Cast("estimate_point__value", FloatField()),
-                        filter=Q(
-                            completed_at__isnull=True,
-                            archived_at__isnull=True,
-                            is_draft=False,
-                        ),
-                    )
-                )
-                .order_by("label_name")
-            )
-
-            estimate_completion_chart = burndown_plot(
-                queryset=old_cycle.first(),
-                slug=slug,
-                project_id=project_id,
-                plot_type="points",
-                cycle_id=cycle_id,
-            )
-            # Label distribution serialization
-            label_estimate_distribution = [
-                {
-                    "label_name": item["label_name"],
-                    "color": item["color"],
-                    "label_id": (
-                        str(item["label_id"]) if item["label_id"] else None
-                    ),
-                    "total_estimates": item["total_estimates"],
-                    "completed_estimates": item["completed_estimates"],
-                    "pending_estimates": item["pending_estimates"],
-                }
-                for item in label_distribution_data
-            ]
+        # Pass the new_cycle queryset to burndown_plot
+        completion_chart = burndown_plot(
+            queryset=old_cycle.first(),
+            slug=slug,
+            project_id=project_id,
+            plot_type=plot_type,
+            cycle_id=cycle_id,
+        )
 
         # Get the assignee distribution
         assignee_distribution = (
-            Issue.issue_objects.filter(
+            Issue.objects.filter(
                 issue_cycle__cycle_id=cycle_id,
                 workspace__slug=slug,
                 project_id=project_id,
@@ -1006,10 +884,7 @@ class TransferCycleIssueAPIEndpoint(BaseAPIView):
             .annotate(
                 total_issues=Count(
                     "id",
-                    filter=Q(
-                        archived_at__isnull=True,
-                        is_draft=False,
-                    ),
+                    filter=Q(archived_at__isnull=True, is_draft=False),
                 ),
             )
             .annotate(
@@ -1051,7 +926,7 @@ class TransferCycleIssueAPIEndpoint(BaseAPIView):
 
         # Get the label distribution
         label_distribution = (
-            Issue.issue_objects.filter(
+            Issue.objects.filter(
                 issue_cycle__cycle_id=cycle_id,
                 workspace__slug=slug,
                 project_id=project_id,
@@ -1063,11 +938,8 @@ class TransferCycleIssueAPIEndpoint(BaseAPIView):
             .annotate(
                 total_issues=Count(
                     "id",
-                    filter=Q(
-                        archived_at__isnull=True,
-                        is_draft=False,
-                    ),
-                ),
+                    filter=Q(archived_at__isnull=True, is_draft=False),
+                )
             )
             .annotate(
                 completed_issues=Count(
@@ -1107,42 +979,26 @@ class TransferCycleIssueAPIEndpoint(BaseAPIView):
             for item in label_distribution
         ]
 
-        # Pass the new_cycle queryset to burndown_plot
-        completion_chart = burndown_plot(
-            queryset=old_cycle.first(),
-            slug=slug,
-            project_id=project_id,
-            plot_type="issues",
-            cycle_id=cycle_id,
-        )
-
         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,
-            },
-            "estimate_distribution": (
-                {}
-                if not estimate_type
-                else {
-                    "labels": label_estimate_distribution,
-                    "assignees": assignee_estimate_distribution,
-                    "completion_chart": estimate_completion_chart,
-                }
-            ),
-        }
-        current_cycle.save(update_fields=["progress_snapshot"])
+        if current_cycle:
+            current_cycle.progress_snapshot = {
+                "total_issues": old_cycle.first().total_issues,
+                "completed_issues": old_cycle.first().completed_issues,
+                "cancelled_issues": old_cycle.first().cancelled_issues,
+                "started_issues": old_cycle.first().started_issues,
+                "unstarted_issues": old_cycle.first().unstarted_issues,
+                "backlog_issues": old_cycle.first().backlog_issues,
+                "distribution": {
+                    "labels": label_distribution_data,
+                    "assignees": assignee_distribution_data,
+                    "completion_chart": completion_chart,
+                },
+            }
+            # Save the snapshot of the current cycle
+            current_cycle.save(update_fields=["progress_snapshot"])
 
         if (
             new_cycle.end_date is not None
@@ -1163,38 +1019,12 @@ class TransferCycleIssueAPIEndpoint(BaseAPIView):
         )
 
         updated_cycles = []
-        update_cycle_issue_activity = []
         for cycle_issue in cycle_issues:
             cycle_issue.cycle_id = new_cycle_id
             updated_cycles.append(cycle_issue)
-            update_cycle_issue_activity.append(
-                {
-                    "old_cycle_id": str(cycle_id),
-                    "new_cycle_id": str(new_cycle_id),
-                    "issue_id": str(cycle_issue.issue_id),
-                }
-            )
 
         cycle_issues = CycleIssue.objects.bulk_update(
             updated_cycles, ["cycle_id"], batch_size=100
         )
 
-        # Capture Issue Activity
-        issue_activity.delay(
-            type="cycle.activity.created",
-            requested_data=json.dumps({"cycles_list": []}),
-            actor_id=str(self.request.user.id),
-            issue_id=None,
-            project_id=str(self.kwargs.get("project_id", None)),
-            current_instance=json.dumps(
-                {
-                    "updated_cycle_issues": update_cycle_issue_activity,
-                    "created_cycle_issues": "[]",
-                }
-            ),
-            epoch=int(timezone.now().timestamp()),
-            notification=True,
-            origin=request.META.get("HTTP_ORIGIN"),
-        )
-
         return Response({"message": "Success"}, status=status.HTTP_200_OK)

apiserver/plane/api/views/inbox.py

@@ -3,11 +3,8 @@ import json
 
 # Django improts
 from django.core.serializers.json import DjangoJSONEncoder
+from django.db.models import Q
 from django.utils import timezone
-from django.db.models import Q, Value, UUIDField
-from django.db.models.functions import Coalesce
-from django.contrib.postgres.aggregates import ArrayAgg
-from django.contrib.postgres.fields import ArrayField
 
 # Third party imports
 from rest_framework import status
@@ -16,7 +13,7 @@ from rest_framework.response import Response
 # Module imports
 from plane.api.serializers import InboxIssueSerializer, IssueSerializer
 from plane.app.permissions import ProjectLitePermission
-from plane.bgtasks.issue_activities_task import issue_activity
+from plane.bgtasks.issue_activites_task import issue_activity
 from plane.db.models import (
     Inbox,
     InboxIssue,
@@ -152,7 +149,7 @@ class InboxIssueAPIEndpoint(BaseAPIView):
             description_html=request.data.get("issue", {}).get(
                 "description_html", "<p></p>"
             ),
-            priority=request.data.get("issue", {}).get("priority", "none"),
+            priority=request.data.get("issue", {}).get("priority", "low"),
             project_id=project_id,
             state=state,
         )
@@ -227,27 +224,8 @@ class InboxIssueAPIEndpoint(BaseAPIView):
         issue_data = request.data.pop("issue", False)
 
         if bool(issue_data):
-            issue = Issue.objects.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())),
-                ),
-            ).get(
-                pk=issue_id,
-                workspace__slug=slug,
-                project_id=project_id,
+            issue = Issue.objects.get(
+                pk=issue_id, workspace__slug=slug, project_id=project_id
             )
             # Only allow guests and viewers to edit name and description
             if project_member.role <= 10:
@@ -390,26 +368,29 @@ class InboxIssueAPIEndpoint(BaseAPIView):
             inbox_id=inbox.id,
         )
 
+        # Get the project member
+        project_member = ProjectMember.objects.get(
+            workspace__slug=slug,
+            project_id=project_id,
+            member=request.user,
+            is_active=True,
+        )
+
+        # Check the inbox issue created
+        if project_member.role <= 10 and str(inbox_issue.created_by_id) != str(
+            request.user.id
+        ):
+            return Response(
+                {"error": "You cannot delete inbox issue"},
+                status=status.HTTP_400_BAD_REQUEST,
+            )
+
         # Check the issue status
         if inbox_issue.status in [-2, -1, 0, 2]:
             # Delete the issue also
-            issue = Issue.objects.filter(
+            Issue.objects.filter(
                 workspace__slug=slug, project_id=project_id, pk=issue_id
-            ).first()
-            if issue.created_by_id != request.user.id and (
-                not ProjectMember.objects.filter(
-                    workspace__slug=slug,
-                    member=request.user,
-                    role=20,
-                    project_id=project_id,
-                    is_active=True,
-                ).exists()
-            ):
-                return Response(
-                    {"error": "Only admin or creator can delete the issue"},
-                    status=status.HTTP_403_FORBIDDEN,
-                )
-            issue.delete()
+            ).delete()
 
         inbox_issue.delete()
         return Response(status=status.HTTP_204_NO_CONTENT)

apiserver/plane/api/views/issue.py

@@ -22,11 +22,9 @@ from django.utils import timezone
 # Third party imports
 from rest_framework import status
 from rest_framework.response import Response
-from rest_framework.parsers import MultiPartParser, FormParser
 
 # Module imports
 from plane.api.serializers import (
-    IssueAttachmentSerializer,
     IssueActivitySerializer,
     IssueCommentSerializer,
     IssueLinkSerializer,
@@ -38,7 +36,7 @@ from plane.app.permissions import (
     ProjectLitePermission,
     ProjectMemberPermission,
 )
-from plane.bgtasks.issue_activities_task import issue_activity
+from plane.bgtasks.issue_activites_task import issue_activity
 from plane.db.models import (
     Issue,
     IssueActivity,
@@ -151,25 +149,6 @@ class IssueAPIEndpoint(BaseAPIView):
         ).distinct()
 
     def get(self, request, slug, project_id, pk=None):
-        external_id = request.GET.get("external_id")
-        external_source = request.GET.get("external_source")
-
-        if external_id and external_source:
-            issue = Issue.objects.get(
-                external_id=external_id,
-                external_source=external_source,
-                workspace__slug=slug,
-                project_id=project_id,
-            )
-            return Response(
-                IssueSerializer(
-                    issue,
-                    fields=self.fields,
-                    expand=self.expand,
-                ).data,
-                status=status.HTTP_200_OK,
-            )
-
         if pk:
             issue = Issue.issue_objects.annotate(
                 sub_issues_count=Issue.issue_objects.filter(
@@ -328,17 +307,6 @@ class IssueAPIEndpoint(BaseAPIView):
                 )
 
             serializer.save()
-            # Refetch the issue
-            issue = Issue.objects.filter(
-                workspace__slug=slug,
-                project_id=project_id,
-                pk=serializer.data["id"],
-            ).first()
-            issue.created_at = request.data.get("created_at", timezone.now())
-            issue.created_by_id = request.data.get(
-                "created_by", request.user.id
-            )
-            issue.save(update_fields=["created_at", "created_by"])
 
             # Track the issue
             issue_activity.delay(
@@ -355,124 +323,6 @@ class IssueAPIEndpoint(BaseAPIView):
             return Response(serializer.data, status=status.HTTP_201_CREATED)
         return Response(serializer.errors, status=status.HTTP_400_BAD_REQUEST)
 
-    def put(self, request, slug, project_id):
-        # Get the entities required for putting the issue, external_id and
-        # external_source are must to identify the issue here
-        project = Project.objects.get(pk=project_id)
-        external_id = request.data.get("external_id")
-        external_source = request.data.get("external_source")
-
-        # If the external_id and source are present, we need to find the exact
-        # issue that needs to be updated with the provided external_id and
-        # external_source
-        if external_id and external_source:
-            try:
-                issue = Issue.objects.get(
-                    project_id=project_id,
-                    workspace__slug=slug,
-                    external_id=external_id,
-                    external_source=external_source,
-                )
-
-                # Get the current instance of the issue in order to track
-                # changes and dispatch the issue activity
-                current_instance = json.dumps(
-                    IssueSerializer(issue).data, cls=DjangoJSONEncoder
-                )
-
-                # Get the requested data, encode it as django object and pass it
-                # to serializer to validation
-                requested_data = json.dumps(
-                    self.request.data, cls=DjangoJSONEncoder
-                )
-                serializer = IssueSerializer(
-                    issue,
-                    data=request.data,
-                    context={
-                        "project_id": project_id,
-                        "workspace_id": project.workspace_id,
-                    },
-                    partial=True,
-                )
-                if serializer.is_valid():
-                    # If the serializer is valid, save the issue and dispatch
-                    # the update issue activity worker event.
-                    serializer.save()
-                    issue_activity.delay(
-                        type="issue.activity.updated",
-                        requested_data=requested_data,
-                        actor_id=str(request.user.id),
-                        issue_id=str(issue.id),
-                        project_id=str(project_id),
-                        current_instance=current_instance,
-                        epoch=int(timezone.now().timestamp()),
-                    )
-                    return Response(serializer.data, status=status.HTTP_200_OK)
-                return Response(
-                    # If the serializer is not valid, respond with 400 bad
-                    # request
-                    serializer.errors,
-                    status=status.HTTP_400_BAD_REQUEST,
-                )
-            except Issue.DoesNotExist:
-                # If the issue does not exist, a new record needs to be created
-                # for the requested data.
-                # Serialize the data with the context of the project and
-                # workspace
-                serializer = IssueSerializer(
-                    data=request.data,
-                    context={
-                        "project_id": project_id,
-                        "workspace_id": project.workspace_id,
-                        "default_assignee_id": project.default_assignee_id,
-                    },
-                )
-
-                # If the serializer is valid, save the issue and dispatch the
-                # issue activity worker event as created
-                if serializer.is_valid():
-                    serializer.save()
-                    # Refetch the issue
-                    issue = Issue.objects.filter(
-                        workspace__slug=slug,
-                        project_id=project_id,
-                        pk=serializer.data["id"],
-                    ).first()
-
-                    # If any of the created_at or created_by is present, update
-                    # the issue with the provided data, else return with the
-                    # default states given.
-                    issue.created_at = request.data.get(
-                        "created_at", timezone.now()
-                    )
-                    issue.created_by_id = request.data.get(
-                        "created_by", request.user.id
-                    )
-                    issue.save(update_fields=["created_at", "created_by"])
-
-                    issue_activity.delay(
-                        type="issue.activity.created",
-                        requested_data=json.dumps(
-                            self.request.data, cls=DjangoJSONEncoder
-                        ),
-                        actor_id=str(request.user.id),
-                        issue_id=str(serializer.data.get("id", None)),
-                        project_id=str(project_id),
-                        current_instance=None,
-                        epoch=int(timezone.now().timestamp()),
-                    )
-                    return Response(
-                        serializer.data, status=status.HTTP_201_CREATED
-                    )
-                return Response(
-                    serializer.errors, status=status.HTTP_400_BAD_REQUEST
-                )
-        else:
-            return Response(
-                {"error": "external_id and external_source are required"},
-                status=status.HTTP_400_BAD_REQUEST,
-            )
-
     def patch(self, request, slug, project_id, pk=None):
         issue = Issue.objects.get(
             workspace__slug=slug, project_id=project_id, pk=pk
@@ -529,19 +379,6 @@ class IssueAPIEndpoint(BaseAPIView):
         issue = Issue.objects.get(
             workspace__slug=slug, project_id=project_id, pk=pk
         )
-        if issue.created_by_id != request.user.id and (
-            not ProjectMember.objects.filter(
-                workspace__slug=slug,
-                member=request.user,
-                role=20,
-                project_id=project_id,
-                is_active=True,
-            ).exists()
-        ):
-            return Response(
-                {"error": "Only admin or creator can delete the issue"},
-                status=status.HTTP_403_FORBIDDEN,
-            )
         current_instance = json.dumps(
             IssueSerializer(issue).data, cls=DjangoJSONEncoder
         )
@@ -750,20 +587,14 @@ class IssueLinkAPIEndpoint(BaseAPIView):
                 project_id=project_id,
                 issue_id=issue_id,
             )
-
-            link = IssueLink.objects.get(pk=serializer.data["id"])
-            link.created_by_id = request.data.get(
-                "created_by", request.user.id
-            )
-            link.save(update_fields=["created_by"])
             issue_activity.delay(
                 type="link.activity.created",
                 requested_data=json.dumps(
                     serializer.data, cls=DjangoJSONEncoder
                 ),
+                actor_id=str(self.request.user.id),
                 issue_id=str(self.kwargs.get("issue_id")),
                 project_id=str(self.kwargs.get("project_id")),
-                actor_id=str(link.created_by_id),
                 current_instance=None,
                 epoch=int(timezone.now().timestamp()),
             )
@@ -917,24 +748,12 @@ class IssueCommentAPIEndpoint(BaseAPIView):
                 issue_id=issue_id,
                 actor=request.user,
             )
-            issue_comment = IssueComment.objects.get(
-                pk=serializer.data.get("id")
-            )
-            # Update the created_at and the created_by and save the comment
-            issue_comment.created_at = request.data.get(
-                "created_at", timezone.now()
-            )
-            issue_comment.created_by_id = request.data.get(
-                "created_by", request.user.id
-            )
-            issue_comment.save(update_fields=["created_at", "created_by"])
-
             issue_activity.delay(
                 type="comment.activity.created",
                 requested_data=json.dumps(
                     serializer.data, cls=DjangoJSONEncoder
                 ),
-                actor_id=str(issue_comment.created_by_id),
+                actor_id=str(self.request.user.id),
                 issue_id=str(self.kwargs.get("issue_id")),
                 project_id=str(self.kwargs.get("project_id")),
                 current_instance=None,
@@ -1055,83 +874,3 @@ class IssueActivityAPIEndpoint(BaseAPIView):
                 expand=self.expand,
             ).data,
         )
-
-
-class IssueAttachmentEndpoint(BaseAPIView):
-    serializer_class = IssueAttachmentSerializer
-    permission_classes = [
-        ProjectEntityPermission,
-    ]
-    model = IssueAttachment
-    parser_classes = (MultiPartParser, FormParser)
-
-    def post(self, request, slug, project_id, issue_id):
-        serializer = IssueAttachmentSerializer(data=request.data)
-        if (
-            request.data.get("external_id")
-            and request.data.get("external_source")
-            and IssueAttachment.objects.filter(
-                project_id=project_id,
-                workspace__slug=slug,
-                issue_id=issue_id,
-                external_source=request.data.get("external_source"),
-                external_id=request.data.get("external_id"),
-            ).exists()
-        ):
-            issue_attachment = IssueAttachment.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 attachment with the same external id and external source already exists",
-                    "id": str(issue_attachment.id),
-                },
-                status=status.HTTP_409_CONFLICT,
-            )
-
-        if serializer.is_valid():
-            serializer.save(project_id=project_id, issue_id=issue_id)
-            issue_activity.delay(
-                type="attachment.activity.created",
-                requested_data=None,
-                actor_id=str(self.request.user.id),
-                issue_id=str(self.kwargs.get("issue_id", None)),
-                project_id=str(self.kwargs.get("project_id", None)),
-                current_instance=json.dumps(
-                    serializer.data,
-                    cls=DjangoJSONEncoder,
-                ),
-                epoch=int(timezone.now().timestamp()),
-                notification=True,
-                origin=request.META.get("HTTP_ORIGIN"),
-            )
-            return Response(serializer.data, status=status.HTTP_201_CREATED)
-        return Response(serializer.errors, status=status.HTTP_400_BAD_REQUEST)
-
-    def delete(self, request, slug, project_id, issue_id, pk):
-        issue_attachment = IssueAttachment.objects.get(pk=pk)
-        issue_attachment.asset.delete(save=False)
-        issue_attachment.delete()
-        issue_activity.delay(
-            type="attachment.activity.deleted",
-            requested_data=None,
-            actor_id=str(self.request.user.id),
-            issue_id=str(self.kwargs.get("issue_id", None)),
-            project_id=str(self.kwargs.get("project_id", None)),
-            current_instance=None,
-            epoch=int(timezone.now().timestamp()),
-            notification=True,
-            origin=request.META.get("HTTP_ORIGIN"),
-        )
-
-        return Response(status=status.HTTP_204_NO_CONTENT)
-
-    def get(self, request, slug, project_id, issue_id):
-        issue_attachments = IssueAttachment.objects.filter(
-            issue_id=issue_id, workspace__slug=slug, project_id=project_id
-        )
-        serializer = IssueAttachmentSerializer(issue_attachments, many=True)
-        return Response(serializer.data, status=status.HTTP_200_OK)

apiserver/plane/api/views/member.py

@@ -1,153 +0,0 @@
-# Python imports
-import uuid
-
-# Django imports
-from django.contrib.auth.hashers import make_password
-from django.core.validators import validate_email
-from django.core.exceptions import ValidationError
-
-# Third Party imports
-from rest_framework.response import Response
-from rest_framework import status
-
-# Module imports
-from .base import BaseAPIView
-from plane.api.serializers import UserLiteSerializer
-from plane.db.models import (
-    User,
-    Workspace,
-    Project,
-    WorkspaceMember,
-    ProjectMember,
-)
-
-from plane.app.permissions import (
-    ProjectMemberPermission,
-)
-
-
-# API endpoint to get and insert users inside the workspace
-class ProjectMemberAPIEndpoint(BaseAPIView):
-    permission_classes = [
-        ProjectMemberPermission,
-    ]
-
-    # Get all the users that are present inside the workspace
-    def get(self, request, slug, project_id):
-        # Check if the workspace exists
-        if not Workspace.objects.filter(slug=slug).exists():
-            return Response(
-                {"error": "Provided workspace does not exist"},
-                status=status.HTTP_400_BAD_REQUEST,
-            )
-
-        # Get the workspace members that are present inside the workspace
-        project_members = ProjectMember.objects.filter(
-            project_id=project_id, workspace__slug=slug
-        ).values_list("member_id", flat=True)
-
-        # Get all the users that are present inside the workspace
-        users = UserLiteSerializer(
-            User.objects.filter(
-                id__in=project_members,
-            ),
-            many=True,
-        ).data
-
-        return Response(users, status=status.HTTP_200_OK)
-
-    # Insert a new user inside the workspace, and assign the user to the project
-    def post(self, request, slug, project_id):
-        # Check if user with email already exists, and send bad request if it's
-        # not present, check for workspace and valid project mandat
-        # ------------------- Validation -------------------
-        if (
-            request.data.get("email") is None
-            or request.data.get("display_name") is None
-        ):
-            return Response(
-                {
-                    "error": "Expected email, display_name, workspace_slug, project_id, one or more of the fields are missing."
-                },
-                status=status.HTTP_400_BAD_REQUEST,
-            )
-
-        email = request.data.get("email")
-
-        try:
-            validate_email(email)
-        except ValidationError:
-            return Response(
-                {"error": "Invalid email provided"},
-                status=status.HTTP_400_BAD_REQUEST,
-            )
-
-        workspace = Workspace.objects.filter(slug=slug).first()
-        project = Project.objects.filter(pk=project_id).first()
-
-        if not all([workspace, project]):
-            return Response(
-                {"error": "Provided workspace or project does not exist"},
-                status=status.HTTP_400_BAD_REQUEST,
-            )
-
-        # Check if user exists
-        user = User.objects.filter(email=email).first()
-        workspace_member = None
-        project_member = None
-
-        if user:
-            # Check if user is part of the workspace
-            workspace_member = WorkspaceMember.objects.filter(
-                workspace=workspace, member=user
-            ).first()
-            if workspace_member:
-                # Check if user is part of the project
-                project_member = ProjectMember.objects.filter(
-                    project=project, member=user
-                ).first()
-                if project_member:
-                    return Response(
-                        {
-                            "error": "User is already part of the workspace and project"
-                        },
-                        status=status.HTTP_400_BAD_REQUEST,
-                    )
-
-        # If user does not exist, create the user
-        if not user:
-            user = User.objects.create(
-                email=email,
-                display_name=request.data.get("display_name"),
-                first_name=request.data.get("first_name", ""),
-                last_name=request.data.get("last_name", ""),
-                username=uuid.uuid4().hex,
-                password=make_password(uuid.uuid4().hex),
-                is_password_autoset=True,
-                is_active=False,
-            )
-            user.save()
-
-        # Create a workspace member for the user if not already a member
-        if not workspace_member:
-            workspace_member = WorkspaceMember.objects.create(
-                workspace=workspace,
-                member=user,
-                role=request.data.get("role", 10),
-            )
-            workspace_member.save()
-
-        # Create a project member for the user if not already a member
-        if not project_member:
-            project_member = ProjectMember.objects.create(
-                project=project,
-                member=user,
-                role=request.data.get("role", 10),
-            )
-            project_member.save()
-
-        # Serialize the user and return the response
-        user_data = UserLiteSerializer(user).data
-
-        return Response(user_data, status=status.HTTP_201_CREATED)
-

apiserver/plane/api/views/module.py

@@ -18,7 +18,7 @@ from plane.api.serializers import (
     ModuleSerializer,
 )
 from plane.app.permissions import ProjectEntityPermission
-from plane.bgtasks.issue_activities_task import issue_activity
+from plane.bgtasks.issue_activites_task import issue_activity
 from plane.db.models import (
     Issue,
     IssueAttachment,
@@ -27,8 +27,6 @@ from plane.db.models import (
     ModuleIssue,
     ModuleLink,
     Project,
-    ProjectMember,
-    UserFavorite,
 )
 
 from .base import BaseAPIView
@@ -267,20 +265,6 @@ class ModuleAPIEndpoint(BaseAPIView):
         module = Module.objects.get(
             workspace__slug=slug, project_id=project_id, pk=pk
         )
-        if module.created_by_id != request.user.id and (
-            not ProjectMember.objects.filter(
-                workspace__slug=slug,
-                member=request.user,
-                role=20,
-                project_id=project_id,
-                is_active=True,
-            ).exists()
-        ):
-            return Response(
-                {"error": "Only admin or creator can delete the module"},
-                status=status.HTTP_403_FORBIDDEN,
-            )
-
         module_issues = list(
             ModuleIssue.objects.filter(module_id=pk).values_list(
                 "issue", flat=True
@@ -302,17 +286,6 @@ class ModuleAPIEndpoint(BaseAPIView):
             epoch=int(timezone.now().timestamp()),
         )
         module.delete()
-        # Delete the module issues
-        ModuleIssue.objects.filter(
-            module=pk,
-            project_id=project_id,
-        ).delete()
-        # Delete the user favorite module
-        UserFavorite.objects.filter(
-            entity_type="module",
-            entity_identifier=pk,
-            project_id=project_id,
-        ).delete()
         return Response(status=status.HTTP_204_NO_CONTENT)
 
 
@@ -520,6 +493,7 @@ class ModuleIssueAPIEndpoint(BaseAPIView):
 
 
 class ModuleArchiveUnarchiveAPIEndpoint(BaseAPIView):
+
     permission_classes = [
         ProjectEntityPermission,
     ]
@@ -634,12 +608,6 @@ class ModuleArchiveUnarchiveAPIEndpoint(BaseAPIView):
             )
         module.archived_at = timezone.now()
         module.save()
-        UserFavorite.objects.filter(
-            entity_type="module",
-            entity_identifier=pk,
-            project_id=project_id,
-            workspace__slug=slug,
-        ).delete()
         return Response(status=status.HTTP_204_NO_CONTENT)
 
     def delete(self, request, slug, project_id, pk):

apiserver/plane/api/views/project.py

@@ -19,14 +19,13 @@ from plane.app.permissions import ProjectBasePermission
 from plane.db.models import (
     Cycle,
     Inbox,
-    IssueUserProperty,
+    IssueProperty,
     Module,
     Project,
     DeployBoard,
     ProjectMember,
     State,
     Workspace,
-    UserFavorite,
 )
 from plane.bgtasks.webhook_task import model_activity
 from .base import BaseAPIView
@@ -166,7 +165,7 @@ class ProjectAPIEndpoint(BaseAPIView):
                     role=20,
                 )
                 # Also create the issue property for the user
-                _ = IssueUserProperty.objects.create(
+                _ = IssueProperty.objects.create(
                     project_id=serializer.data["id"],
                     user=request.user,
                 )
@@ -180,7 +179,7 @@ class ProjectAPIEndpoint(BaseAPIView):
                         role=20,
                     )
                     # Also create the issue property for the user
-                    IssueUserProperty.objects.create(
+                    IssueProperty.objects.create(
                         project_id=serializer.data["id"],
                         user_id=serializer.data["project_lead"],
                     )
@@ -241,7 +240,6 @@ class ProjectAPIEndpoint(BaseAPIView):
                     .filter(pk=serializer.data["id"])
                     .first()
                 )
-
                 # Model activity
                 model_activity.delay(
                     model_name="project",
@@ -357,12 +355,6 @@ class ProjectAPIEndpoint(BaseAPIView):
 
     def delete(self, request, slug, pk):
         project = Project.objects.get(pk=pk, workspace__slug=slug)
-        # Delete the user favorite cycle
-        UserFavorite.objects.filter(
-            entity_type="project",
-            entity_identifier=pk,
-            project_id=pk,
-        ).delete()
         project.delete()
         return Response(status=status.HTTP_204_NO_CONTENT)
 
@@ -377,10 +369,6 @@ class ProjectArchiveUnarchiveAPIEndpoint(BaseAPIView):
         project = Project.objects.get(pk=project_id, workspace__slug=slug)
         project.archived_at = timezone.now()
         project.save()
-        UserFavorite.objects.filter(
-            workspace__slug=slug,
-            project=project_id,
-        ).delete()
         return Response(status=status.HTTP_204_NO_CONTENT)
 
     def delete(self, request, slug, project_id):

apiserver/plane/app/permissions/__init__.py

@@ -12,4 +12,3 @@ from .project import (
     ProjectMemberPermission,
     ProjectLitePermission,
 )
-from .base import allow_permission, ROLE

apiserver/plane/app/permissions/base.py

@@ -1,61 +0,0 @@
-from plane.db.models import WorkspaceMember, ProjectMember
-from functools import wraps
-from rest_framework.response import Response
-from rest_framework import status
-
-from enum import Enum
-
-class ROLE(Enum):
-    ADMIN = 20
-    MEMBER = 15
-    VIEWER = 10
-    GUEST = 5
-
-
-def allow_permission(allowed_roles, level="PROJECT", creator=False, model=None):
-    def decorator(view_func):
-        @wraps(view_func)
-        def _wrapped_view(instance, request, *args, **kwargs):
-
-            # Check for creator if required
-            if creator and model:
-                obj = model.objects.filter(
-                    id=kwargs["pk"], created_by=request.user
-                ).exists()
-                if obj:
-                    return view_func(instance, request, *args, **kwargs)
-
-            # Convert allowed_roles to their values if they are enum members
-            allowed_role_values = [
-                role.value if isinstance(role, ROLE) else role
-                for role in allowed_roles
-            ]
-
-            # Check role permissions
-            if level == "WORKSPACE":
-                if WorkspaceMember.objects.filter(
-                    member=request.user,
-                    workspace__slug=kwargs["slug"],
-                    role__in=allowed_role_values,
-                    is_active=True,
-                ).exists():
-                    return view_func(instance, request, *args, **kwargs)
-            else:
-                if ProjectMember.objects.filter(
-                    member=request.user,
-                    workspace__slug=kwargs["slug"],
-                    project_id=kwargs["project_id"],
-                    role__in=allowed_role_values,
-                    is_active=True,
-                ).exists():
-                    return view_func(instance, request, *args, **kwargs)
-
-            # Return permission denied if no conditions are met
-            return Response(
-                {"error": "You don't have the required permissions."},
-                status=status.HTTP_403_FORBIDDEN,
-            )
-
-        return _wrapped_view
-
-    return decorator

apiserver/plane/app/serializers/__init__.py

@@ -50,7 +50,7 @@ from .issue import (
     IssueCreateSerializer,
     IssueActivitySerializer,
     IssueCommentSerializer,
-    IssueUserPropertySerializer,
+    IssuePropertySerializer,
     IssueAssigneeSerializer,
     LabelSerializer,
     IssueSerializer,
@@ -91,7 +91,6 @@ from .page import (
     PageLogSerializer,
     SubPageSerializer,
     PageDetailSerializer,
-    PageVersionSerializer,
 )
 
 from .estimate import (
@@ -121,5 +120,3 @@ from .exporter import ExporterHistorySerializer
 from .webhook import WebhookSerializer, WebhookLogSerializer
 
 from .dashboard import DashboardSerializer, WidgetSerializer
-
-from .favorite import UserFavoriteSerializer

apiserver/plane/app/serializers/favorite.py

@@ -1,101 +0,0 @@
-from rest_framework import serializers
-
-from plane.db.models import (
-    UserFavorite,
-    Cycle,
-    Module,
-    Issue,
-    IssueView,
-    Page,
-    Project,
-)
-
-
-class ProjectFavoriteLiteSerializer(serializers.ModelSerializer):
-
-    class Meta:
-        model = Project
-        fields = ["id", "name", "logo_props"]
-
-
-class PageFavoriteLiteSerializer(serializers.ModelSerializer):
-    project_id = serializers.SerializerMethodField()
-
-    class Meta:
-        model = Page
-        fields = ["id", "name", "logo_props", "project_id"]
-
-    def get_project_id(self, obj):
-        project = (
-            obj.projects.first()
-        )  # This gets the first project related to the Page
-        return project.id if project else None
-
-
-class CycleFavoriteLiteSerializer(serializers.ModelSerializer):
-
-    class Meta:
-        model = Cycle
-        fields = ["id", "name", "logo_props", "project_id"]
-
-
-class ModuleFavoriteLiteSerializer(serializers.ModelSerializer):
-
-    class Meta:
-        model = Module
-        fields = ["id", "name", "logo_props", "project_id"]
-
-
-class ViewFavoriteSerializer(serializers.ModelSerializer):
-
-    class Meta:
-        model = IssueView
-        fields = ["id", "name", "logo_props", "project_id"]
-
-
-def get_entity_model_and_serializer(entity_type):
-    entity_map = {
-        "cycle": (Cycle, CycleFavoriteLiteSerializer),
-        "issue": (Issue, None),
-        "module": (Module, ModuleFavoriteLiteSerializer),
-        "view": (IssueView, ViewFavoriteSerializer),
-        "page": (Page, PageFavoriteLiteSerializer),
-        "project": (Project, ProjectFavoriteLiteSerializer),
-        "folder": (None, None),
-    }
-    return entity_map.get(entity_type, (None, None))
-
-
-class UserFavoriteSerializer(serializers.ModelSerializer):
-    entity_data = serializers.SerializerMethodField()
-
-    class Meta:
-        model = UserFavorite
-        fields = [
-            "id",
-            "entity_type",
-            "entity_identifier",
-            "entity_data",
-            "name",
-            "is_folder",
-            "sequence",
-            "parent",
-            "workspace_id",
-            "project_id",
-        ]
-        read_only_fields = ["workspace", "created_by", "updated_by"]
-
-    def get_entity_data(self, obj):
-        entity_type = obj.entity_type
-        entity_identifier = obj.entity_identifier
-
-        entity_model, entity_serializer = get_entity_model_and_serializer(
-            entity_type
-        )
-        if entity_model and entity_serializer:
-            try:
-                entity = entity_model.objects.get(pk=entity_identifier)
-                return entity_serializer(entity).data
-            except entity_model.DoesNotExist:
-                return None
-        return None

apiserver/plane/app/serializers/issue.py

@@ -17,7 +17,7 @@ from plane.db.models import (
     Issue,
     IssueActivity,
     IssueComment,
-    IssueUserProperty,
+    IssueProperty,
     IssueAssignee,
     IssueSubscriber,
     IssueLabel,
@@ -33,7 +33,10 @@ from plane.db.models import (
     IssueVote,
     IssueRelation,
     State,
+    Project,
 )
+from plane.utils.metadata import get_metadata
+from plane.utils.presigned_url_generator import generate_download_presigned_url
 
 
 class IssueFlatSerializer(BaseSerializer):
@@ -135,11 +138,7 @@ class IssueCreateSerializer(BaseSerializer):
         workspace_id = self.context["workspace_id"]
         default_assignee_id = self.context["default_assignee_id"]
 
-        # Create Issue
-        issue = Issue.objects.create(
-            **validated_data,
-            project_id=project_id,
-        )
+        issue = Issue.objects.create(**validated_data, project_id=project_id)
 
         # Issue Audit Users
         created_by_id = issue.created_by_id
@@ -252,9 +251,9 @@ class IssueActivitySerializer(BaseSerializer):
         fields = "__all__"
 
 
-class IssueUserPropertySerializer(BaseSerializer):
+class IssuePropertySerializer(BaseSerializer):
     class Meta:
-        model = IssueUserProperty
+        model = IssueProperty
         fields = "__all__"
         read_only_fields = [
             "user",
@@ -423,6 +422,7 @@ class IssueModuleDetailSerializer(BaseSerializer):
 
 class IssueLinkSerializer(BaseSerializer):
     created_by_detail = UserLiteSerializer(read_only=True, source="created_by")
+    metadata = serializers.SerializerMethodField()
 
     class Meta:
         model = IssueLink
@@ -437,6 +437,12 @@ class IssueLinkSerializer(BaseSerializer):
             "issue",
         ]
 
+    def get_metadata(self, obj):
+        logo = obj.metadata.get("logo", None)
+        if logo:
+            obj.metadata["logo"] = generate_download_presigned_url(logo)
+        return obj.metadata
+
     def validate_url(self, value):
         # Check URL format
         validate_url = URLValidator()
@@ -453,6 +459,7 @@ class IssueLinkSerializer(BaseSerializer):
 
     # Validation if url already exists
     def create(self, validated_data):
+        # Check if URL already exists for this Issue
         if IssueLink.objects.filter(
             url=validated_data.get("url"),
             issue_id=validated_data.get("issue_id"),
@@ -460,6 +467,14 @@ class IssueLinkSerializer(BaseSerializer):
             raise serializers.ValidationError(
                 {"error": "URL already exists for this Issue"}
             )
+
+        # Workspace
+        project = Project.objects.get(pk=validated_data.get("project_id"))
+        # Fetch metadata from URL
+        validated_data["metadata"] = get_metadata(
+            validated_data.get("url"), project.workspace_id
+        )
+
         return IssueLink.objects.create(**validated_data)
 
     def update(self, instance, validated_data):
@@ -475,6 +490,9 @@ class IssueLinkSerializer(BaseSerializer):
                 {"error": "URL already exists for this Issue"}
             )
 
+        validated_data["metadata"] = get_metadata(
+            validated_data.get("url"), instance.workspace_id
+        )
         return super().update(instance, validated_data)
 
 
@@ -517,7 +535,7 @@ class IssueAttachmentLiteSerializer(DynamicBaseSerializer):
             "attributes",
             "issue_id",
             "updated_at",
-            "updated_by",
+            "updated_by_id",
         ]
         read_only_fields = fields
 
@@ -533,7 +551,6 @@ class IssueReactionSerializer(BaseSerializer):
             "project",
             "issue",
             "actor",
-            "deleted_at"
         ]
 
 
@@ -552,7 +569,7 @@ class CommentReactionSerializer(BaseSerializer):
     class Meta:
         model = CommentReaction
         fields = "__all__"
-        read_only_fields = ["workspace", "project", "comment", "actor", "deleted_at"]
+        read_only_fields = ["workspace", "project", "comment", "actor"]
 
 
 class IssueVoteSerializer(BaseSerializer):

apiserver/plane/app/serializers/module.py

@@ -39,7 +39,6 @@ class ModuleWriteSerializer(BaseSerializer):
             "created_at",
             "updated_at",
             "archived_at",
-            "deleted_at",
         ]
 
     def to_representation(self, instance):
@@ -178,8 +177,8 @@ class ModuleSerializer(DynamicBaseSerializer):
     started_issues = serializers.IntegerField(read_only=True)
     unstarted_issues = serializers.IntegerField(read_only=True)
     backlog_issues = serializers.IntegerField(read_only=True)
-    total_estimate_points = serializers.FloatField(read_only=True)
-    completed_estimate_points = serializers.FloatField(read_only=True)
+    total_estimate_points = serializers.IntegerField(read_only=True)
+    completed_estimate_points = serializers.IntegerField(read_only=True)
 
     class Meta:
         model = Module
@@ -223,10 +222,10 @@ class ModuleSerializer(DynamicBaseSerializer):
 class ModuleDetailSerializer(ModuleSerializer):
     link_module = ModuleLinkSerializer(read_only=True, many=True)
     sub_issues = serializers.IntegerField(read_only=True)
-    backlog_estimate_points = serializers.FloatField(read_only=True)
-    unstarted_estimate_points = serializers.FloatField(read_only=True)
-    started_estimate_points = serializers.FloatField(read_only=True)
-    cancelled_estimate_points = serializers.FloatField(read_only=True)
+    backlog_estimate_points = serializers.IntegerField(read_only=True)
+    unstarted_estimate_points = serializers.IntegerField(read_only=True)
+    started_estimate_points = serializers.IntegerField(read_only=True)
+    cancelled_estimate_points = serializers.IntegerField(read_only=True)
 
     class Meta(ModuleSerializer.Meta):
         fields = ModuleSerializer.Meta.fields + ["link_module", "sub_issues", "backlog_estimate_points", "unstarted_estimate_points", "started_estimate_points", "cancelled_estimate_points"]

apiserver/plane/app/serializers/notification.py

@@ -3,16 +3,11 @@ from .base import BaseSerializer
 from .user import UserLiteSerializer
 from plane.db.models import Notification, UserNotificationPreference
 
-# Third Party imports
-from rest_framework import serializers
-
 
 class NotificationSerializer(BaseSerializer):
     triggered_by_details = UserLiteSerializer(
         read_only=True, source="triggered_by"
     )
-    is_inbox_issue = serializers.BooleanField(read_only=True)
-    is_mentioned_notification = serializers.BooleanField(read_only=True)
 
     class Meta:
         model = Notification

apiserver/plane/app/serializers/page.py

@@ -10,7 +10,6 @@ from plane.db.models import (
     Label,
     ProjectPage,
     Project,
-    PageVersion,
 )
 
 
@@ -162,13 +161,3 @@ class PageLogSerializer(BaseSerializer):
             "workspace",
             "page",
         ]
-
-
-class PageVersionSerializer(BaseSerializer):
-    class Meta:
-        model = PageVersion
-        fields = "__all__"
-        read_only_fields = [
-            "workspace",
-            "page",
-        ]

apiserver/plane/app/serializers/project.py

@@ -28,7 +28,6 @@ class ProjectSerializer(BaseSerializer):
         fields = "__all__"
         read_only_fields = [
             "workspace",
-            "deleted_at",
         ]
 
     def create(self, validated_data):

apiserver/plane/app/serializers/view.py

@@ -23,7 +23,7 @@ class IssueViewSerializer(DynamicBaseSerializer):
         ]
 
     def create(self, validated_data):
-        query_params = validated_data.get("filters", {})
+        query_params = validated_data.get("query_data", {})
         if bool(query_params):
             validated_data["query"] = issue_filters(query_params, "POST")
         else:
@@ -31,7 +31,7 @@ class IssueViewSerializer(DynamicBaseSerializer):
         return IssueView.objects.create(**validated_data)
 
     def update(self, instance, validated_data):
-        query_params = validated_data.get("filters", {})
+        query_params = validated_data.get("query_data", {})
         if bool(query_params):
             validated_data["query"] = issue_filters(query_params, "POST")
         else:

apiserver/plane/app/serializers/workspace.py

@@ -15,7 +15,6 @@ from plane.db.models import (
     WorkspaceTheme,
     WorkspaceUserProperties,
 )
-from plane.utils.constants import RESTRICTED_WORKSPACE_SLUGS
 
 
 class WorkSpaceSerializer(DynamicBaseSerializer):
@@ -23,11 +22,22 @@ class WorkSpaceSerializer(DynamicBaseSerializer):
     total_members = serializers.IntegerField(read_only=True)
     total_issues = serializers.IntegerField(read_only=True)
 
-    def validate_slug(self, value):
-        # Check if the slug is restricted
-        if value in RESTRICTED_WORKSPACE_SLUGS:
-            raise serializers.ValidationError("Slug is not valid")
-        return value
+    def validated(self, data):
+        if data.get("slug") in [
+            "404",
+            "accounts",
+            "api",
+            "create-workspace",
+            "god-mode",
+            "installations",
+            "invitations",
+            "onboarding",
+            "profile",
+            "spaces",
+            "workspace-invitations",
+            "password",
+        ]:
+            raise serializers.ValidationError({"slug": "Slug is not valid"})
 
     class Meta:
         model = Workspace

apiserver/plane/app/urls/api.py

@@ -1,5 +1,5 @@
 from django.urls import path
-from plane.app.views import ApiTokenEndpoint, ServiceApiTokenEndpoint
+from plane.app.views import ApiTokenEndpoint
 
 urlpatterns = [
     # API Tokens
@@ -13,10 +13,5 @@ urlpatterns = [
         ApiTokenEndpoint.as_view(),
         name="api-tokens",
     ),
-    path(
-        "workspaces/<str:slug>/service-api-tokens/",
-        ServiceApiTokenEndpoint.as_view(),
-        name="service-api-tokens",
-    ),
     ## End API Tokens
 ]

apiserver/plane/app/urls/inbox.py

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

apiserver/plane/app/urls/issue.py

@@ -19,6 +19,7 @@ from plane.app.views import (
     IssueUserDisplayPropertyEndpoint,
     IssueViewSet,
     LabelViewSet,
+    BulkIssueOperationsEndpoint,
     BulkArchiveIssuesEndpoint,
 )
 
@@ -232,13 +233,13 @@ urlpatterns = [
         name="project-issue-comment-reactions",
     ),
     ## End Comment Reactions
-    ## IssueUserProperty
+    ## IssueProperty
     path(
         "workspaces/<str:slug>/projects/<uuid:project_id>/user-properties/",
         IssueUserDisplayPropertyEndpoint.as_view(),
         name="project-issue-display-properties",
     ),
-    ## IssueUserProperty End
+    ## IssueProperty End
     ## Issue Archives
     path(
         "workspaces/<str:slug>/projects/<uuid:project_id>/archived-issues/",
@@ -303,5 +304,10 @@ urlpatterns = [
             }
         ),
         name="project-issue-draft",
-    )
+    ),
+    path(
+        "workspaces/<str:slug>/projects/<uuid:project_id>/bulk-operation-issues/",
+        BulkIssueOperationsEndpoint.as_view(),
+        name="bulk-operations-issues",
+    ),
 ]

apiserver/plane/app/urls/page.py

@@ -7,7 +7,6 @@ from plane.app.views import (
     PageLogEndpoint,
     SubPagesEndpoint,
     PagesDescriptionViewSet,
-    PageVersionEndpoint,
 )
 
 
@@ -66,16 +65,6 @@ urlpatterns = [
         ),
         name="project-pages-lock-unlock",
     ),
-    # private and public page
-    path(
-        "workspaces/<str:slug>/projects/<uuid:project_id>/pages/<uuid:pk>/access/",
-        PageViewSet.as_view(
-            {
-                "post": "access",
-            }
-        ),
-        name="project-pages-access",
-    ),
     path(
         "workspaces/<str:slug>/projects/<uuid:project_id>/pages/<uuid:pk>/transactions/",
         PageLogEndpoint.as_view(),
@@ -101,14 +90,4 @@ urlpatterns = [
         ),
         name="page-description",
     ),
-    path(
-        "workspaces/<str:slug>/projects/<uuid:project_id>/pages/<uuid:page_id>/versions/",
-        PageVersionEndpoint.as_view(),
-        name="page-versions",
-    ),
-    path(
-        "workspaces/<str:slug>/projects/<uuid:project_id>/pages/<uuid:page_id>/versions/<uuid:pk>/",
-        PageVersionEndpoint.as_view(),
-        name="page-versions",
-    ),
 ]

apiserver/plane/app/urls/workspace.py

@@ -25,8 +25,6 @@ from plane.app.views import (
     ExportWorkspaceUserActivityEndpoint,
     WorkspaceModulesEndpoint,
     WorkspaceCyclesEndpoint,
-    WorkspaceFavoriteEndpoint,
-    WorkspaceFavoriteGroupEndpoint,
 )
 
 
@@ -239,19 +237,4 @@ urlpatterns = [
         WorkspaceCyclesEndpoint.as_view(),
         name="workspace-cycles",
     ),
-    path(
-        "workspaces/<str:slug>/user-favorites/",
-        WorkspaceFavoriteEndpoint.as_view(),
-        name="workspace-user-favorites",
-    ),
-    path(
-        "workspaces/<str:slug>/user-favorites/<uuid:favorite_id>/",
-        WorkspaceFavoriteEndpoint.as_view(),
-        name="workspace-user-favorites",
-    ),
-    path(
-        "workspaces/<str:slug>/user-favorites/<uuid:favorite_id>/group/",
-        WorkspaceFavoriteGroupEndpoint.as_view(),
-        name="workspace-user-favorites-groups",
-    ),
 ]

apiserver/plane/app/views/__init__.py

@@ -40,11 +40,6 @@ from .workspace.base import (
     ExportWorkspaceUserActivityEndpoint,
 )
 
-from .workspace.favorite import (
-    WorkspaceFavoriteEndpoint,
-    WorkspaceFavoriteGroupEndpoint,
-)
-
 from .workspace.member import (
     WorkSpaceMemberViewSet,
     TeamMemberViewSet,
@@ -156,6 +151,9 @@ from .issue.subscriber import (
     IssueSubscriberViewSet,
 )
 
+
+from .issue.bulk_operations import BulkIssueOperationsEndpoint
+
 from .module.base import (
     ModuleViewSet,
     ModuleLinkViewSet,
@@ -171,10 +169,8 @@ from .module.archive import (
     ModuleArchiveUnarchiveEndpoint,
 )
 
-from .api import (
-    ApiTokenEndpoint,
-    ServiceApiTokenEndpoint,
-)
+from .api import ApiTokenEndpoint
+
 
 from .page.base import (
     PageViewSet,
@@ -183,7 +179,6 @@ from .page.base import (
     SubPagesEndpoint,
     PagesDescriptionViewSet,
 )
-from .page.version import PageVersionEndpoint
 
 from .search.base import GlobalSearchEndpoint
 from .search.issue import IssueSearchEndpoint

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

@@ -7,22 +7,22 @@ from django.utils import timezone
 from rest_framework import status
 from rest_framework.response import Response
 
-# Module imports
 from plane.app.permissions import WorkSpaceAdminPermission
 from plane.app.serializers import AnalyticViewSerializer
+
+# Module imports
 from plane.app.views.base import BaseAPIView, BaseViewSet
 from plane.bgtasks.analytic_plot_export import analytic_export_task
 from plane.db.models import AnalyticView, Issue, Workspace
 from plane.utils.analytics_plot import build_graph_plot
 from plane.utils.issue_filters import issue_filters
-from plane.app.permissions import allow_permission, ROLE
 
 
 class AnalyticsEndpoint(BaseAPIView):
+    permission_classes = [
+        WorkSpaceAdminPermission,
+    ]
 
-    @allow_permission(
-        [ROLE.ADMIN, ROLE.MEMBER, ROLE.VIEWER], level="WORKSPACE"
-    )
     def get(self, request, slug):
         x_axis = request.GET.get("x_axis", False)
         y_axis = request.GET.get("y_axis", False)
@@ -201,10 +201,10 @@ class AnalyticViewViewset(BaseViewSet):
 
 
 class SavedAnalyticEndpoint(BaseAPIView):
+    permission_classes = [
+        WorkSpaceAdminPermission,
+    ]
 
-    @allow_permission(
-        [ROLE.ADMIN, ROLE.MEMBER, ROLE.VIEWER], level="WORKSPACE"
-    )
     def get(self, request, slug, analytic_id):
         analytic_view = AnalyticView.objects.get(
             pk=analytic_id, workspace__slug=slug
@@ -234,10 +234,10 @@ class SavedAnalyticEndpoint(BaseAPIView):
 
 
 class ExportAnalyticsEndpoint(BaseAPIView):
+    permission_classes = [
+        WorkSpaceAdminPermission,
+    ]
 
-    @allow_permission(
-        [ROLE.ADMIN, ROLE.MEMBER, ROLE.VIEWER], level="WORKSPACE"
-    )
     def post(self, request, slug):
         x_axis = request.data.get("x_axis", False)
         y_axis = request.data.get("y_axis", False)
@@ -301,10 +301,10 @@ class ExportAnalyticsEndpoint(BaseAPIView):
 
 
 class DefaultAnalyticsEndpoint(BaseAPIView):
+    permission_classes = [
+        WorkSpaceAdminPermission,
+    ]
 
-    @allow_permission(
-        [ROLE.ADMIN, ROLE.MEMBER, ROLE.VIEWER, ROLE.GUEST], level="WORKSPACE"
-    )
     def get(self, request, slug):
         filters = issue_filters(request.GET, "GET")
         base_issues = Issue.issue_objects.filter(
@@ -380,10 +380,12 @@ class DefaultAnalyticsEndpoint(BaseAPIView):
             .order_by("-count")
         )
 
-        open_estimate_sum = open_issues_queryset.aggregate(sum=Sum("point"))[
+        open_estimate_sum = open_issues_queryset.aggregate(
+            sum=Sum("point")
+        )["sum"]
+        total_estimate_sum = base_issues.aggregate(sum=Sum("point"))[
             "sum"
         ]
-        total_estimate_sum = base_issues.aggregate(sum=Sum("point"))["sum"]
 
         return Response(
             {

apiserver/plane/app/views/api.py

@@ -45,7 +45,7 @@ class ApiTokenEndpoint(BaseAPIView):
     def get(self, request, slug, pk=None):
         if pk is None:
             api_tokens = APIToken.objects.filter(
-                user=request.user, workspace__slug=slug, is_service=False
+                user=request.user, workspace__slug=slug
             )
             serializer = APITokenReadSerializer(api_tokens, many=True)
             return Response(serializer.data, status=status.HTTP_200_OK)
@@ -61,7 +61,6 @@ class ApiTokenEndpoint(BaseAPIView):
             workspace__slug=slug,
             user=request.user,
             pk=pk,
-            is_service=False,
         )
         api_token.delete()
         return Response(status=status.HTTP_204_NO_CONTENT)
@@ -79,44 +78,3 @@ class ApiTokenEndpoint(BaseAPIView):
             serializer.save()
             return Response(serializer.data, status=status.HTTP_200_OK)
         return Response(serializer.errors, status=status.HTTP_400_BAD_REQUEST)
-
-
-class ServiceApiTokenEndpoint(BaseAPIView):
-    permission_classes = [
-        WorkspaceOwnerPermission,
-    ]
-
-    def post(self, request, slug):
-        workspace = Workspace.objects.get(slug=slug)
-
-        api_token = APIToken.objects.filter(
-            workspace=workspace,
-            is_service=True,
-        ).first()
-
-        if api_token:
-            return Response(
-                {
-                    "token": str(api_token.token),
-                },
-                status=status.HTTP_200_OK,
-            )
-        else:
-            # Check the user type
-            user_type = 1 if request.user.is_bot else 0
-
-            api_token = APIToken.objects.create(
-                label=str(uuid4().hex),
-                description="Service Token",
-                user=request.user,
-                workspace=workspace,
-                user_type=user_type,
-                is_service=True,
-            )
-            return Response(
-                {
-                    "token": str(api_token.token),
-                },
-                status=status.HTTP_201_CREATED,
-            )
-

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

@@ -14,18 +14,21 @@ from django.db.models import (
     UUIDField,
     Value,
     When,
-    Subquery,
-    Sum,
-    FloatField,
 )
-from django.db.models.functions import Coalesce, Cast
+from django.db.models.functions import Coalesce
 from django.utils import timezone
 
 # Third party imports
 from rest_framework import status
 from rest_framework.response import Response
-from plane.app.permissions import allow_permission, ROLE
-from plane.db.models import Cycle, UserFavorite, Issue, Label, User, Project
+from plane.app.permissions import ProjectEntityPermission
+from plane.db.models import (
+    Cycle,
+    UserFavorite,
+    Issue,
+    Label,
+    User,
+)
 from plane.utils.analytics_plot import burndown_plot
 
 # Module imports
@@ -34,6 +37,10 @@ from .. import BaseAPIView
 
 class CycleArchiveUnarchiveEndpoint(BaseAPIView):
 
+    permission_classes = [
+        ProjectEntityPermission,
+    ]
+
     def get_queryset(self):
         favorite_subquery = UserFavorite.objects.filter(
             user=self.request.user,
@@ -42,89 +49,6 @@ class CycleArchiveUnarchiveEndpoint(BaseAPIView):
             project_id=self.kwargs.get("project_id"),
             workspace__slug=self.kwargs.get("slug"),
         )
-        backlog_estimate_point = (
-            Issue.issue_objects.filter(
-                estimate_point__estimate__type="points",
-                state__group="backlog",
-                issue_cycle__cycle_id=OuterRef("pk"),
-            )
-            .values("issue_cycle__cycle_id")
-            .annotate(
-                backlog_estimate_point=Sum(
-                    Cast("estimate_point__value", FloatField())
-                )
-            )
-            .values("backlog_estimate_point")[:1]
-        )
-        unstarted_estimate_point = (
-            Issue.issue_objects.filter(
-                estimate_point__estimate__type="points",
-                state__group="unstarted",
-                issue_cycle__cycle_id=OuterRef("pk"),
-            )
-            .values("issue_cycle__cycle_id")
-            .annotate(
-                unstarted_estimate_point=Sum(
-                    Cast("estimate_point__value", FloatField())
-                )
-            )
-            .values("unstarted_estimate_point")[:1]
-        )
-        started_estimate_point = (
-            Issue.issue_objects.filter(
-                estimate_point__estimate__type="points",
-                state__group="started",
-                issue_cycle__cycle_id=OuterRef("pk"),
-            )
-            .values("issue_cycle__cycle_id")
-            .annotate(
-                started_estimate_point=Sum(
-                    Cast("estimate_point__value", FloatField())
-                )
-            )
-            .values("started_estimate_point")[:1]
-        )
-        cancelled_estimate_point = (
-            Issue.issue_objects.filter(
-                estimate_point__estimate__type="points",
-                state__group="cancelled",
-                issue_cycle__cycle_id=OuterRef("pk"),
-            )
-            .values("issue_cycle__cycle_id")
-            .annotate(
-                cancelled_estimate_point=Sum(
-                    Cast("estimate_point__value", FloatField())
-                )
-            )
-            .values("cancelled_estimate_point")[:1]
-        )
-        completed_estimate_point = (
-            Issue.issue_objects.filter(
-                estimate_point__estimate__type="points",
-                state__group="completed",
-                issue_cycle__cycle_id=OuterRef("pk"),
-            )
-            .values("issue_cycle__cycle_id")
-            .annotate(
-                completed_estimate_points=Sum(
-                    Cast("estimate_point__value", FloatField())
-                )
-            )
-            .values("completed_estimate_points")[:1]
-        )
-        total_estimate_point = (
-            Issue.issue_objects.filter(
-                estimate_point__estimate__type="points",
-                issue_cycle__cycle_id=OuterRef("pk"),
-            )
-            .values("issue_cycle__cycle_id")
-            .annotate(
-                total_estimate_points=Sum(
-                    Cast("estimate_point__value", FloatField())
-                )
-            )
-            .values("total_estimate_points")[:1]
-        )
         return (
             Cycle.objects.filter(workspace__slug=self.kwargs.get("slug"))
             .filter(project_id=self.kwargs.get("project_id"))
@@ -248,51 +172,25 @@ class CycleArchiveUnarchiveEndpoint(BaseAPIView):
                     Value([], output_field=ArrayField(UUIDField())),
                 )
             )
-            .annotate(
-                backlog_estimate_points=Coalesce(
-                    Subquery(backlog_estimate_point),
-                    Value(0, output_field=FloatField()),
-                ),
-            )
-            .annotate(
-                unstarted_estimate_points=Coalesce(
-                    Subquery(unstarted_estimate_point),
-                    Value(0, output_field=FloatField()),
-                ),
-            )
-            .annotate(
-                started_estimate_points=Coalesce(
-                    Subquery(started_estimate_point),
-                    Value(0, output_field=FloatField()),
-                ),
-            )
-            .annotate(
-                cancelled_estimate_points=Coalesce(
-                    Subquery(cancelled_estimate_point),
-                    Value(0, output_field=FloatField()),
-                ),
-            )
-            .annotate(
-                completed_estimate_points=Coalesce(
-                    Subquery(completed_estimate_point),
-                    Value(0, output_field=FloatField()),
-                ),
-            )
-            .annotate(
-                total_estimate_points=Coalesce(
-                    Subquery(total_estimate_point),
-                    Value(0, output_field=FloatField()),
-                ),
-            )
             .order_by("-is_favorite", "name")
             .distinct()
         )
 
-    @allow_permission([ROLE.ADMIN, ROLE.MEMBER, ROLE.VIEWER])
     def get(self, request, slug, project_id, pk=None):
+        plot_type = request.GET.get("plot_type", "issues")
         if pk is None:
             queryset = (
-                self.get_queryset().values(
+                self.get_queryset()
+                .annotate(
+                    total_issues=Count(
+                        "issue_cycle",
+                        filter=Q(
+                            issue_cycle__issue__archived_at__isnull=True,
+                            issue_cycle__issue__is_draft=False,
+                        ),
+                    )
+                )
+                .values(
                     # necessary fields
                     "id",
                     "workspace_id",
@@ -358,10 +256,7 @@ class CycleArchiveUnarchiveEndpoint(BaseAPIView):
                     "external_id",
                     "progress_snapshot",
                     "sub_issues",
-                    "logo_props",
                     # meta fields
-                    "completed_estimate_points",
-                    "total_estimate_points",
                     "is_favorite",
                     "total_issues",
                     "cancelled_issues",
@@ -371,117 +266,20 @@ class CycleArchiveUnarchiveEndpoint(BaseAPIView):
                     "backlog_issues",
                     "assignee_ids",
                     "status",
-                    "created_by",
-                    "archived_at",
                 )
                 .first()
             )
             queryset = queryset.first()
 
-            estimate_type = Project.objects.filter(
-                workspace__slug=slug,
-                pk=project_id,
-                estimate__isnull=False,
-                estimate__type="points",
-            ).exists()
-
-            data["estimate_distribution"] = {}
-            if estimate_type:
-                assignee_distribution = (
-                    Issue.issue_objects.filter(
-                        issue_cycle__cycle_id=pk,
-                        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_estimates=Sum(
-                            Cast("estimate_point__value", FloatField())
-                        )
-                    )
-                    .annotate(
-                        completed_estimates=Sum(
-                            Cast("estimate_point__value", FloatField()),
-                            filter=Q(
-                                completed_at__isnull=False,
-                                archived_at__isnull=True,
-                                is_draft=False,
-                            ),
-                        )
-                    )
-                    .annotate(
-                        pending_estimates=Sum(
-                            Cast("estimate_point__value", FloatField()),
-                            filter=Q(
-                                completed_at__isnull=True,
-                                archived_at__isnull=True,
-                                is_draft=False,
-                            ),
-                        )
-                    )
-                    .order_by("display_name")
+            if data is None:
+                return Response(
+                    {"error": "Cycle does not exist"},
+                    status=status.HTTP_400_BAD_REQUEST,
                 )
 
-                label_distribution = (
-                    Issue.issue_objects.filter(
-                        issue_cycle__cycle_id=pk,
-                        workspace__slug=slug,
-                        project_id=project_id,
-                    )
-                    .annotate(label_name=F("labels__name"))
-                    .annotate(color=F("labels__color"))
-                    .annotate(label_id=F("labels__id"))
-                    .values("label_name", "color", "label_id")
-                    .annotate(
-                        total_estimates=Sum(
-                            Cast("estimate_point__value", FloatField())
-                        )
-                    )
-                    .annotate(
-                        completed_estimates=Sum(
-                            Cast("estimate_point__value", FloatField()),
-                            filter=Q(
-                                completed_at__isnull=False,
-                                archived_at__isnull=True,
-                                is_draft=False,
-                            ),
-                        )
-                    )
-                    .annotate(
-                        pending_estimates=Sum(
-                            Cast("estimate_point__value", FloatField()),
-                            filter=Q(
-                                completed_at__isnull=True,
-                                archived_at__isnull=True,
-                                is_draft=False,
-                            ),
-                        )
-                    )
-                    .order_by("label_name")
-                )
-                data["estimate_distribution"] = {
-                    "assignees": assignee_distribution,
-                    "labels": label_distribution,
-                    "completion_chart": {},
-                }
-
-                if data["start_date"] and data["end_date"]:
-                    data["estimate_distribution"]["completion_chart"] = (
-                        burndown_plot(
-                            queryset=queryset,
-                            slug=slug,
-                            project_id=project_id,
-                            plot_type="points",
-                            cycle_id=pk,
-                        )
-                    )
-
             # Assignee Distribution
             assignee_distribution = (
-                Issue.issue_objects.filter(
+                Issue.objects.filter(
                     issue_cycle__cycle_id=pk,
                     workspace__slug=slug,
                     project_id=project_id,
@@ -501,10 +299,7 @@ class CycleArchiveUnarchiveEndpoint(BaseAPIView):
                 .annotate(
                     total_issues=Count(
                         "id",
-                        filter=Q(
-                            archived_at__isnull=True,
-                            is_draft=False,
-                        ),
+                        filter=Q(archived_at__isnull=True, is_draft=False),
                     ),
                 )
                 .annotate(
@@ -532,7 +327,7 @@ class CycleArchiveUnarchiveEndpoint(BaseAPIView):
 
             # Label Distribution
             label_distribution = (
-                Issue.issue_objects.filter(
+                Issue.objects.filter(
                     issue_cycle__cycle_id=pk,
                     workspace__slug=slug,
                     project_id=project_id,
@@ -544,10 +339,7 @@ class CycleArchiveUnarchiveEndpoint(BaseAPIView):
                 .annotate(
                     total_issues=Count(
                         "id",
-                        filter=Q(
-                            archived_at__isnull=True,
-                            is_draft=False,
-                        ),
+                        filter=Q(archived_at__isnull=True, is_draft=False),
                     ),
                 )
                 .annotate(
@@ -584,7 +376,7 @@ class CycleArchiveUnarchiveEndpoint(BaseAPIView):
                     queryset=queryset,
                     slug=slug,
                     project_id=project_id,
-                    plot_type="issues",
+                    plot_type=plot_type,
                     cycle_id=pk,
                 )
 
@@ -593,7 +385,6 @@ class CycleArchiveUnarchiveEndpoint(BaseAPIView):
                 status=status.HTTP_200_OK,
             )
 
-    @allow_permission([ROLE.ADMIN, ROLE.MEMBER])
     def post(self, request, slug, project_id, cycle_id):
         cycle = Cycle.objects.get(
             pk=cycle_id, project_id=project_id, workspace__slug=slug
@@ -607,18 +398,11 @@ class CycleArchiveUnarchiveEndpoint(BaseAPIView):
 
         cycle.archived_at = timezone.now()
         cycle.save()
-        UserFavorite.objects.filter(
-            entity_type="cycle",
-            entity_identifier=cycle_id,
-            project_id=project_id,
-            workspace__slug=slug,
-        ).delete()
         return Response(
             {"archived_at": str(cycle.archived_at)},
             status=status.HTTP_200_OK,
         )
 
-    @allow_permission([ROLE.ADMIN, ROLE.MEMBER])
     def delete(self, request, slug, project_id, cycle_id):
         cycle = Cycle.objects.get(
             pk=cycle_id, project_id=project_id, workspace__slug=slug

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

@@ -19,7 +19,7 @@ from django.db.models import (
     When,
     Subquery,
     Sum,
-    FloatField,
+    IntegerField,
 )
 from django.db.models.functions import Coalesce, Cast
 from django.utils import timezone
@@ -29,14 +29,15 @@ from django.core.serializers.json import DjangoJSONEncoder
 from rest_framework import status
 from rest_framework.response import Response
 from plane.app.permissions import (
-    allow_permission, ROLE
+    ProjectEntityPermission,
+    ProjectLitePermission,
 )
 from plane.app.serializers import (
     CycleSerializer,
     CycleUserPropertiesSerializer,
     CycleWriteSerializer,
 )
-from plane.bgtasks.issue_activities_task import issue_activity
+from plane.bgtasks.issue_activites_task import issue_activity
 from plane.db.models import (
     Cycle,
     CycleIssue,
@@ -46,10 +47,8 @@ from plane.db.models import (
     Label,
     User,
     Project,
-    ProjectMember,
 )
 from plane.utils.analytics_plot import burndown_plot
-from plane.bgtasks.recent_visited_task import recent_visited_task
 
 # Module imports
 from .. import BaseAPIView, BaseViewSet
@@ -60,6 +59,15 @@ class CycleViewSet(BaseViewSet):
     serializer_class = CycleSerializer
     model = Cycle
     webhook_event = "cycle"
+    permission_classes = [
+        ProjectEntityPermission,
+    ]
+
+    def perform_create(self, serializer):
+        serializer.save(
+            project_id=self.kwargs.get("project_id"),
+            owned_by=self.request.user,
+        )
 
     def get_queryset(self):
         favorite_subquery = UserFavorite.objects.filter(
@@ -78,7 +86,7 @@ class CycleViewSet(BaseViewSet):
             .values("issue_cycle__cycle_id")
             .annotate(
                 backlog_estimate_point=Sum(
-                    Cast("estimate_point__value", FloatField())
+                    Cast("estimate_point__value", IntegerField())
                 )
             )
             .values("backlog_estimate_point")[:1]
@@ -92,7 +100,7 @@ class CycleViewSet(BaseViewSet):
             .values("issue_cycle__cycle_id")
             .annotate(
                 unstarted_estimate_point=Sum(
-                    Cast("estimate_point__value", FloatField())
+                    Cast("estimate_point__value", IntegerField())
                 )
             )
             .values("unstarted_estimate_point")[:1]
@@ -106,7 +114,7 @@ class CycleViewSet(BaseViewSet):
             .values("issue_cycle__cycle_id")
             .annotate(
                 started_estimate_point=Sum(
-                    Cast("estimate_point__value", FloatField())
+                    Cast("estimate_point__value", IntegerField())
                 )
             )
             .values("started_estimate_point")[:1]
@@ -120,7 +128,7 @@ class CycleViewSet(BaseViewSet):
             .values("issue_cycle__cycle_id")
             .annotate(
                 cancelled_estimate_point=Sum(
-                    Cast("estimate_point__value", FloatField())
+                    Cast("estimate_point__value", IntegerField())
                 )
             )
             .values("cancelled_estimate_point")[:1]
@@ -134,7 +142,7 @@ class CycleViewSet(BaseViewSet):
             .values("issue_cycle__cycle_id")
             .annotate(
                 completed_estimate_points=Sum(
-                    Cast("estimate_point__value", FloatField())
+                    Cast("estimate_point__value", IntegerField())
                 )
             )
             .values("completed_estimate_points")[:1]
@@ -147,7 +155,7 @@ class CycleViewSet(BaseViewSet):
             .values("issue_cycle__cycle_id")
             .annotate(
                 total_estimate_points=Sum(
-                    Cast("estimate_point__value", FloatField())
+                    Cast("estimate_point__value", IntegerField())
                 )
             )
             .values("total_estimate_points")[:1]
@@ -279,44 +287,43 @@ class CycleViewSet(BaseViewSet):
             .annotate(
                 backlog_estimate_points=Coalesce(
                     Subquery(backlog_estimate_point),
-                    Value(0, output_field=FloatField()),
+                    Value(0, output_field=IntegerField()),
                 ),
             )
             .annotate(
                 unstarted_estimate_points=Coalesce(
                     Subquery(unstarted_estimate_point),
-                    Value(0, output_field=FloatField()),
+                    Value(0, output_field=IntegerField()),
                 ),
             )
             .annotate(
                 started_estimate_points=Coalesce(
                     Subquery(started_estimate_point),
-                    Value(0, output_field=FloatField()),
+                    Value(0, output_field=IntegerField()),
                 ),
             )
             .annotate(
                 cancelled_estimate_points=Coalesce(
                     Subquery(cancelled_estimate_point),
-                    Value(0, output_field=FloatField()),
+                    Value(0, output_field=IntegerField()),
                 ),
             )
             .annotate(
                 completed_estimate_points=Coalesce(
                     Subquery(completed_estimate_point),
-                    Value(0, output_field=FloatField()),
+                    Value(0, output_field=IntegerField()),
                 ),
             )
             .annotate(
                 total_estimate_points=Coalesce(
                     Subquery(total_estimate_point),
-                    Value(0, output_field=FloatField()),
+                    Value(0, output_field=IntegerField()),
                 ),
             )
             .order_by("-is_favorite", "name")
             .distinct()
         )
 
-    @allow_permission([ROLE.ADMIN, ROLE.MEMBER, ROLE.VIEWER, ROLE.GUEST])
     def list(self, request, slug, project_id):
         queryset = self.get_queryset().filter(archived_at__isnull=True)
         cycle_view = request.GET.get("cycle_view", "all")
@@ -377,7 +384,7 @@ class CycleViewSet(BaseViewSet):
                 data[0]["estimate_distribution"] = {}
                 if estimate_type:
                     assignee_distribution = (
-                        Issue.issue_objects.filter(
+                        Issue.objects.filter(
                             issue_cycle__cycle_id=data[0]["id"],
                             workspace__slug=slug,
                             project_id=project_id,
@@ -388,12 +395,12 @@ class CycleViewSet(BaseViewSet):
                         .values("display_name", "assignee_id", "avatar")
                         .annotate(
                             total_estimates=Sum(
-                                Cast("estimate_point__value", FloatField())
+                                Cast("estimate_point__value", IntegerField())
                             )
                         )
                         .annotate(
                             completed_estimates=Sum(
-                                Cast("estimate_point__value", FloatField()),
+                                Cast("estimate_point__value", IntegerField()),
                                 filter=Q(
                                     completed_at__isnull=False,
                                     archived_at__isnull=True,
@@ -403,7 +410,7 @@ class CycleViewSet(BaseViewSet):
                         )
                         .annotate(
                             pending_estimates=Sum(
-                                Cast("estimate_point__value", FloatField()),
+                                Cast("estimate_point__value", IntegerField()),
                                 filter=Q(
                                     completed_at__isnull=True,
                                     archived_at__isnull=True,
@@ -415,7 +422,7 @@ class CycleViewSet(BaseViewSet):
                     )
 
                     label_distribution = (
-                        Issue.issue_objects.filter(
+                        Issue.objects.filter(
                             issue_cycle__cycle_id=data[0]["id"],
                             workspace__slug=slug,
                             project_id=project_id,
@@ -426,12 +433,12 @@ class CycleViewSet(BaseViewSet):
                         .values("label_name", "color", "label_id")
                         .annotate(
                             total_estimates=Sum(
-                                Cast("estimate_point__value", FloatField())
+                                Cast("estimate_point__value", IntegerField())
                             )
                         )
                         .annotate(
                             completed_estimates=Sum(
-                                Cast("estimate_point__value", FloatField()),
+                                Cast("estimate_point__value", IntegerField()),
                                 filter=Q(
                                     completed_at__isnull=False,
                                     archived_at__isnull=True,
@@ -441,7 +448,7 @@ class CycleViewSet(BaseViewSet):
                         )
                         .annotate(
                             pending_estimates=Sum(
-                                Cast("estimate_point__value", FloatField()),
+                                Cast("estimate_point__value", IntegerField()),
                                 filter=Q(
                                     completed_at__isnull=True,
                                     archived_at__isnull=True,
@@ -458,18 +465,18 @@ class CycleViewSet(BaseViewSet):
                     }
 
                     if data[0]["start_date"] and data[0]["end_date"]:
-                        data[0]["estimate_distribution"][
-                            "completion_chart"
-                        ] = burndown_plot(
-                            queryset=queryset.first(),
-                            slug=slug,
-                            project_id=project_id,
-                            plot_type="points",
-                            cycle_id=data[0]["id"],
+                        data[0]["estimate_distribution"]["completion_chart"] = (
+                            burndown_plot(
+                                queryset=queryset.first(),
+                                slug=slug,
+                                project_id=project_id,
+                                plot_type="points",
+                                cycle_id=data[0]["id"],
+                            )
                         )
 
                 assignee_distribution = (
-                    Issue.issue_objects.filter(
+                    Issue.objects.filter(
                         issue_cycle__cycle_id=data[0]["id"],
                         workspace__slug=slug,
                         project_id=project_id,
@@ -511,7 +518,7 @@ class CycleViewSet(BaseViewSet):
                 )
 
                 label_distribution = (
-                    Issue.issue_objects.filter(
+                    Issue.objects.filter(
                         issue_cycle__cycle_id=data[0]["id"],
                         workspace__slug=slug,
                         project_id=project_id,
@@ -603,7 +610,6 @@ class CycleViewSet(BaseViewSet):
         )
         return Response(data, status=status.HTTP_200_OK)
 
-    @allow_permission([ROLE.ADMIN, ROLE.MEMBER])
     def create(self, request, slug, project_id):
         if (
             request.data.get("start_date", None) is None
@@ -639,8 +645,6 @@ class CycleViewSet(BaseViewSet):
                         "progress_snapshot",
                         "logo_props",
                         # meta fields
-                        "completed_estimate_points",
-                        "total_estimate_points",
                         "is_favorite",
                         "cancelled_issues",
                         "total_issues",
@@ -650,7 +654,6 @@ class CycleViewSet(BaseViewSet):
                         "backlog_issues",
                         "assignee_ids",
                         "status",
-                        "created_by",
                     )
                     .first()
                 )
@@ -677,7 +680,6 @@ class CycleViewSet(BaseViewSet):
                 status=status.HTTP_400_BAD_REQUEST,
             )
 
-    @allow_permission([ROLE.ADMIN, ROLE.MEMBER])
     def partial_update(self, request, slug, project_id, pk):
         queryset = self.get_queryset().filter(
             workspace__slug=slug, project_id=project_id, pk=pk
@@ -737,8 +739,6 @@ class CycleViewSet(BaseViewSet):
                 "progress_snapshot",
                 "logo_props",
                 # meta fields
-                "completed_estimate_points",
-                "total_estimate_points",
                 "is_favorite",
                 "total_issues",
                 "cancelled_issues",
@@ -748,7 +748,6 @@ class CycleViewSet(BaseViewSet):
                 "backlog_issues",
                 "assignee_ids",
                 "status",
-                "created_by",
             ).first()
 
             # Send the model activity
@@ -765,7 +764,6 @@ class CycleViewSet(BaseViewSet):
             return Response(cycle, status=status.HTTP_200_OK)
         return Response(serializer.errors, status=status.HTTP_400_BAD_REQUEST)
 
-    @allow_permission([ROLE.ADMIN, ROLE.MEMBER, ROLE.VIEWER])
     def retrieve(self, request, slug, project_id, pk):
         queryset = (
             self.get_queryset().filter(archived_at__isnull=True).filter(pk=pk)
@@ -802,8 +800,6 @@ class CycleViewSet(BaseViewSet):
                 "sub_issues",
                 "logo_props",
                 # meta fields
-                "completed_estimate_points",
-                "total_estimate_points",
                 "is_favorite",
                 "total_issues",
                 "cancelled_issues",
@@ -829,7 +825,7 @@ class CycleViewSet(BaseViewSet):
         data["estimate_distribution"] = {}
         if estimate_type:
             assignee_distribution = (
-                Issue.issue_objects.filter(
+                Issue.objects.filter(
                     issue_cycle__cycle_id=pk,
                     workspace__slug=slug,
                     project_id=project_id,
@@ -840,12 +836,12 @@ class CycleViewSet(BaseViewSet):
                 .values("display_name", "assignee_id", "avatar")
                 .annotate(
                     total_estimates=Sum(
-                        Cast("estimate_point__value", FloatField())
+                        Cast("estimate_point__value", IntegerField())
                     )
                 )
                 .annotate(
                     completed_estimates=Sum(
-                        Cast("estimate_point__value", FloatField()),
+                        Cast("estimate_point__value", IntegerField()),
                         filter=Q(
                             completed_at__isnull=False,
                             archived_at__isnull=True,
@@ -855,7 +851,7 @@ class CycleViewSet(BaseViewSet):
                 )
                 .annotate(
                     pending_estimates=Sum(
-                        Cast("estimate_point__value", FloatField()),
+                        Cast("estimate_point__value", IntegerField()),
                         filter=Q(
                             completed_at__isnull=True,
                             archived_at__isnull=True,
@@ -867,7 +863,7 @@ class CycleViewSet(BaseViewSet):
             )
 
             label_distribution = (
-                Issue.issue_objects.filter(
+                Issue.objects.filter(
                     issue_cycle__cycle_id=pk,
                     workspace__slug=slug,
                     project_id=project_id,
@@ -878,12 +874,12 @@ class CycleViewSet(BaseViewSet):
                 .values("label_name", "color", "label_id")
                 .annotate(
                     total_estimates=Sum(
-                        Cast("estimate_point__value", FloatField())
+                        Cast("estimate_point__value", IntegerField())
                     )
                 )
                 .annotate(
                     completed_estimates=Sum(
-                        Cast("estimate_point__value", FloatField()),
+                        Cast("estimate_point__value", IntegerField()),
                         filter=Q(
                             completed_at__isnull=False,
                             archived_at__isnull=True,
@@ -893,7 +889,7 @@ class CycleViewSet(BaseViewSet):
                 )
                 .annotate(
                     pending_estimates=Sum(
-                        Cast("estimate_point__value", FloatField()),
+                        Cast("estimate_point__value", IntegerField()),
                         filter=Q(
                             completed_at__isnull=True,
                             archived_at__isnull=True,
@@ -922,7 +918,7 @@ class CycleViewSet(BaseViewSet):
 
         # Assignee Distribution
         assignee_distribution = (
-            Issue.issue_objects.filter(
+            Issue.objects.filter(
                 issue_cycle__cycle_id=pk,
                 workspace__slug=slug,
                 project_id=project_id,
@@ -973,7 +969,7 @@ class CycleViewSet(BaseViewSet):
 
         # Label Distribution
         label_distribution = (
-            Issue.issue_objects.filter(
+            Issue.objects.filter(
                 issue_cycle__cycle_id=pk,
                 workspace__slug=slug,
                 project_id=project_id,
@@ -1029,42 +1025,20 @@ class CycleViewSet(BaseViewSet):
                 cycle_id=pk,
             )
 
-        recent_visited_task.delay(
-            slug=slug,
-            entity_name="cycle",
-            entity_identifier=pk,
-            user_id=request.user.id,
-            project_id=project_id,
-        )
         return Response(
             data,
             status=status.HTTP_200_OK,
         )
 
-    @allow_permission([ROLE.ADMIN], creator=True, model=Cycle)
     def destroy(self, request, slug, project_id, pk):
-        cycle = Cycle.objects.get(
-            workspace__slug=slug, project_id=project_id, pk=pk
-        )
-        if cycle.owned_by_id != request.user.id and not (
-            ProjectMember.objects.filter(
-                workspace__slug=slug,
-                member=request.user,
-                role=20,
-                project_id=project_id,
-                is_active=True,
-            ).exists()
-        ):
-            return Response(
-                {"error": "Only admin or owner can delete the cycle"},
-                status=status.HTTP_403_FORBIDDEN,
-            )
-
         cycle_issues = list(
             CycleIssue.objects.filter(
                 cycle_id=self.kwargs.get("pk")
             ).values_list("issue", flat=True)
         )
+        cycle = Cycle.objects.get(
+            workspace__slug=slug, project_id=project_id, pk=pk
+        )
 
         issue_activity.delay(
             type="cycle.activity.deleted",
@@ -1085,23 +1059,14 @@ class CycleViewSet(BaseViewSet):
         )
         # Delete the cycle
         cycle.delete()
-        # Delete the cycle issues
-        CycleIssue.objects.filter(
-            cycle_id=self.kwargs.get("pk"),
-        ).delete()
-        # Delete the user favorite cycle
-        UserFavorite.objects.filter(
-            user=request.user,
-            entity_type="cycle",
-            entity_identifier=pk,
-            project_id=project_id,
-        ).delete()
         return Response(status=status.HTTP_204_NO_CONTENT)
 
 
 class CycleDateCheckEndpoint(BaseAPIView):
+    permission_classes = [
+        ProjectEntityPermission,
+    ]
 
-    @allow_permission([ROLE.ADMIN, ROLE.MEMBER])
     def post(self, request, slug, project_id):
         start_date = request.data.get("start_date", False)
         end_date = request.data.get("end_date", False)
@@ -1145,7 +1110,6 @@ class CycleFavoriteViewSet(BaseViewSet):
             .select_related("cycle", "cycle__owned_by")
         )
 
-    @allow_permission([ROLE.ADMIN, ROLE.MEMBER])
     def create(self, request, slug, project_id):
         _ = UserFavorite.objects.create(
             project_id=project_id,
@@ -1155,7 +1119,6 @@ class CycleFavoriteViewSet(BaseViewSet):
         )
         return Response(status=status.HTTP_204_NO_CONTENT)
 
-    @allow_permission([ROLE.ADMIN, ROLE.MEMBER])
     def destroy(self, request, slug, project_id, cycle_id):
         cycle_favorite = UserFavorite.objects.get(
             project=project_id,
@@ -1164,13 +1127,15 @@ class CycleFavoriteViewSet(BaseViewSet):
             workspace__slug=slug,
             entity_identifier=cycle_id,
         )
-        cycle_favorite.delete(soft=False)
+        cycle_favorite.delete()
         return Response(status=status.HTTP_204_NO_CONTENT)
 
 
 class TransferCycleIssueEndpoint(BaseAPIView):
+    permission_classes = [
+        ProjectEntityPermission,
+    ]
 
-    @allow_permission([ROLE.ADMIN, ROLE.MEMBER])
     def post(self, request, slug, project_id, cycle_id):
         new_cycle_id = request.data.get("new_cycle_id", False)
 
@@ -1258,7 +1223,7 @@ class TransferCycleIssueEndpoint(BaseAPIView):
 
         if estimate_type:
             assignee_estimate_data = (
-                Issue.issue_objects.filter(
+                Issue.objects.filter(
                     issue_cycle__cycle_id=cycle_id,
                     workspace__slug=slug,
                     project_id=project_id,
@@ -1269,12 +1234,12 @@ class TransferCycleIssueEndpoint(BaseAPIView):
                 .values("display_name", "assignee_id", "avatar")
                 .annotate(
                     total_estimates=Sum(
-                        Cast("estimate_point__value", FloatField())
+                        Cast("estimate_point__value", IntegerField())
                     )
                 )
                 .annotate(
                     completed_estimates=Sum(
-                        Cast("estimate_point__value", FloatField()),
+                        Cast("estimate_point__value", IntegerField()),
                         filter=Q(
                             completed_at__isnull=False,
                             archived_at__isnull=True,
@@ -1284,7 +1249,7 @@ class TransferCycleIssueEndpoint(BaseAPIView):
                 )
                 .annotate(
                     pending_estimates=Sum(
-                        Cast("estimate_point__value", FloatField()),
+                        Cast("estimate_point__value", IntegerField()),
                         filter=Q(
                             completed_at__isnull=True,
                             archived_at__isnull=True,
@@ -1312,7 +1277,7 @@ class TransferCycleIssueEndpoint(BaseAPIView):
             ]
 
             label_distribution_data = (
-                Issue.issue_objects.filter(
+                Issue.objects.filter(
                     issue_cycle__cycle_id=cycle_id,
                     workspace__slug=slug,
                     project_id=project_id,
@@ -1323,12 +1288,12 @@ class TransferCycleIssueEndpoint(BaseAPIView):
                 .values("label_name", "color", "label_id")
                 .annotate(
                     total_estimates=Sum(
-                        Cast("estimate_point__value", FloatField())
+                        Cast("estimate_point__value", IntegerField())
                     )
                 )
                 .annotate(
                     completed_estimates=Sum(
-                        Cast("estimate_point__value", FloatField()),
+                        Cast("estimate_point__value", IntegerField()),
                         filter=Q(
                             completed_at__isnull=False,
                             archived_at__isnull=True,
@@ -1338,7 +1303,7 @@ class TransferCycleIssueEndpoint(BaseAPIView):
                 )
                 .annotate(
                     pending_estimates=Sum(
-                        Cast("estimate_point__value", FloatField()),
+                        Cast("estimate_point__value", IntegerField()),
                         filter=Q(
                             completed_at__isnull=True,
                             archived_at__isnull=True,
@@ -1373,7 +1338,7 @@ class TransferCycleIssueEndpoint(BaseAPIView):
 
         # Get the assignee distribution
         assignee_distribution = (
-            Issue.issue_objects.filter(
+            Issue.objects.filter(
                 issue_cycle__cycle_id=cycle_id,
                 workspace__slug=slug,
                 project_id=project_id,
@@ -1430,7 +1395,7 @@ class TransferCycleIssueEndpoint(BaseAPIView):
 
         # Get the label distribution
         label_distribution = (
-            Issue.issue_objects.filter(
+            Issue.objects.filter(
                 issue_cycle__cycle_id=cycle_id,
                 workspace__slug=slug,
                 project_id=project_id,
@@ -1542,46 +1507,22 @@ class TransferCycleIssueEndpoint(BaseAPIView):
         )
 
         updated_cycles = []
-        update_cycle_issue_activity = []
         for cycle_issue in cycle_issues:
             cycle_issue.cycle_id = new_cycle_id
             updated_cycles.append(cycle_issue)
-            update_cycle_issue_activity.append(
-                {
-                    "old_cycle_id": str(cycle_id),
-                    "new_cycle_id": str(new_cycle_id),
-                    "issue_id": str(cycle_issue.issue_id),
-                }
-            )
 
         cycle_issues = CycleIssue.objects.bulk_update(
             updated_cycles, ["cycle_id"], batch_size=100
         )
 
-        # Capture Issue Activity
-        issue_activity.delay(
-            type="cycle.activity.created",
-            requested_data=json.dumps({"cycles_list": []}),
-            actor_id=str(self.request.user.id),
-            issue_id=None,
-            project_id=str(self.kwargs.get("project_id", None)),
-            current_instance=json.dumps(
-                {
-                    "updated_cycle_issues": update_cycle_issue_activity,
-                    "created_cycle_issues": "[]",
-                }
-            ),
-            epoch=int(timezone.now().timestamp()),
-            notification=True,
-            origin=request.META.get("HTTP_ORIGIN"),
-        )
-
         return Response({"message": "Success"}, status=status.HTTP_200_OK)
 
 
 class CycleUserPropertiesEndpoint(BaseAPIView):
+    permission_classes = [
+        ProjectLitePermission,
+    ]
 
-    @allow_permission([ROLE.ADMIN, ROLE.MEMBER, ROLE.VIEWER, ROLE.GUEST])
     def patch(self, request, slug, project_id, cycle_id):
         cycle_properties = CycleUserProperties.objects.get(
             user=request.user,
@@ -1604,7 +1545,6 @@ class CycleUserPropertiesEndpoint(BaseAPIView):
         serializer = CycleUserPropertiesSerializer(cycle_properties)
         return Response(serializer.data, status=status.HTTP_201_CREATED)
 
-    @allow_permission([ROLE.ADMIN, ROLE.MEMBER, ROLE.VIEWER, ROLE.GUEST])
     def get(self, request, slug, project_id, cycle_id):
         cycle_properties, _ = CycleUserProperties.objects.get_or_create(
             user=request.user,

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

@@ -3,7 +3,12 @@ import json
 
 # Django imports
 from django.core import serializers
-from django.db.models import F, Func, OuterRef, Q
+from django.db.models import (
+    F,
+    Func,
+    OuterRef,
+    Q,
+)
 from django.utils import timezone
 from django.utils.decorators import method_decorator
 from django.views.decorators.gzip import gzip_page
@@ -12,12 +17,15 @@ from django.views.decorators.gzip import gzip_page
 from rest_framework import status
 from rest_framework.response import Response
 
+from plane.app.permissions import (
+    ProjectEntityPermission,
+)
 # Module imports
 from .. import BaseViewSet
 from plane.app.serializers import (
     CycleIssueSerializer,
 )
-from plane.bgtasks.issue_activities_task import issue_activity
+from plane.bgtasks.issue_activites_task import issue_activity
 from plane.db.models import (
     Cycle,
     CycleIssue,
@@ -36,8 +44,8 @@ from plane.utils.paginator import (
     GroupedOffsetPaginator,
     SubGroupedOffsetPaginator,
 )
-from plane.app.permissions import allow_permission, ROLE
 
+# Module imports
 
 class CycleIssueViewSet(BaseViewSet):
     serializer_class = CycleIssueSerializer
@@ -46,6 +54,10 @@ class CycleIssueViewSet(BaseViewSet):
     webhook_event = "cycle_issue"
     bulk = True
 
+    permission_classes = [
+        ProjectEntityPermission,
+    ]
+
     filterset_fields = [
         "issue__labels__id",
         "issue__assignees__id",
@@ -80,7 +92,6 @@ class CycleIssueViewSet(BaseViewSet):
         )
 
     @method_decorator(gzip_page)
-    @allow_permission([ROLE.ADMIN, ROLE.MEMBER, ROLE.VIEWER])
     def list(self, request, slug, project_id, cycle_id):
         order_by_param = request.GET.get("order_by", "created_at")
         filters = issue_filters(request.query_params, "GET")
@@ -227,7 +238,6 @@ class CycleIssueViewSet(BaseViewSet):
                 ),
             )
 
-    @allow_permission([ROLE.ADMIN, ROLE.MEMBER])
     def create(self, request, slug, project_id, cycle_id):
         issues = request.data.get("issues", [])
 
@@ -323,9 +333,8 @@ class CycleIssueViewSet(BaseViewSet):
         )
         return Response({"message": "success"}, status=status.HTTP_201_CREATED)
 
-    @allow_permission([ROLE.ADMIN, ROLE.MEMBER])
     def destroy(self, request, slug, project_id, cycle_id, issue_id):
-        cycle_issue = CycleIssue.objects.filter(
+        cycle_issue = CycleIssue.objects.get(
             issue_id=issue_id,
             workspace__slug=slug,
             project_id=project_id,

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

@@ -43,7 +43,6 @@ from plane.db.models import (
     ProjectMember,
     User,
     Widget,
-    WorkspaceMember,
 )
 from plane.utils.issue_filters import issue_filters
 
@@ -52,61 +51,36 @@ from .. import BaseAPIView
 
 
 def dashboard_overview_stats(self, request, slug):
-    extra_filters = {}
-    if WorkspaceMember.objects.filter(
+    assigned_issues = Issue.issue_objects.filter(
+        project__project_projectmember__is_active=True,
+        project__project_projectmember__member=request.user,
         workspace__slug=slug,
-        member=request.user,
-        role=5,
-        is_active=True,
-    ).exists():
-        extra_filters = {"created_by": request.user}
+        assignees__in=[request.user],
+    ).count()
 
-    assigned_issues = (
-        Issue.issue_objects.filter(
-            project__project_projectmember__is_active=True,
-            project__project_projectmember__member=request.user,
-            workspace__slug=slug,
-            assignees__in=[request.user],
-        )
-        .filter(**extra_filters)
-        .count()
-    )
+    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,
+        assignees__in=[request.user],
+    ).count()
 
-    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,
-            assignees__in=[request.user],
-        )
-        .filter(**extra_filters)
-        .count()
-    )
+    created_issues_count = Issue.issue_objects.filter(
+        workspace__slug=slug,
+        project__project_projectmember__is_active=True,
+        project__project_projectmember__member=request.user,
+        created_by_id=request.user.id,
+    ).count()
 
-    created_issues_count = (
-        Issue.issue_objects.filter(
-            workspace__slug=slug,
-            project__project_projectmember__is_active=True,
-            project__project_projectmember__member=request.user,
-            created_by_id=request.user.id,
-        )
-        .filter(**extra_filters)
-        .count()
-    )
-
-    completed_issues_count = (
-        Issue.issue_objects.filter(
-            workspace__slug=slug,
-            project__project_projectmember__is_active=True,
-            project__project_projectmember__member=request.user,
-            assignees__in=[request.user],
-            state__group="completed",
-        )
-        .filter(**extra_filters)
-        .count()
-    )
+    completed_issues_count = Issue.issue_objects.filter(
+        workspace__slug=slug,
+        project__project_projectmember__is_active=True,
+        project__project_projectmember__member=request.user,
+        assignees__in=[request.user],
+        state__group="completed",
+    ).count()
 
     return Response(
         {
@@ -192,14 +166,6 @@ def dashboard_assigned_issues(self, request, slug):
         )
     )
 
-    if WorkspaceMember.objects.filter(
-        workspace__slug=slug,
-        member=request.user,
-        role=5,
-        is_active=True,
-    ).exists():
-        assigned_issues = assigned_issues.filter(created_by=request.user)
-
     # Priority Ordering
     priority_order = ["urgent", "high", "medium", "low", "none"]
     assigned_issues = assigned_issues.annotate(
@@ -443,16 +409,6 @@ def dashboard_created_issues(self, request, slug):
 def dashboard_issues_by_state_groups(self, request, slug):
     filters = issue_filters(request.query_params, "GET")
     state_order = ["backlog", "unstarted", "started", "completed", "cancelled"]
-    extra_filters = {}
-
-    if WorkspaceMember.objects.filter(
-        workspace__slug=slug,
-        member=request.user,
-        role=5,
-        is_active=True,
-    ).exists():
-        extra_filters = {"created_by": request.user}
-
     issues_by_state_groups = (
         Issue.issue_objects.filter(
             workspace__slug=slug,
@@ -460,7 +416,7 @@ def dashboard_issues_by_state_groups(self, request, slug):
             project__project_projectmember__member=request.user,
             assignees__in=[request.user],
         )
-        .filter(**filters, **extra_filters)
+        .filter(**filters)
         .values("state__group")
         .annotate(count=Count("id"))
     )
@@ -483,15 +439,6 @@ def dashboard_issues_by_state_groups(self, request, slug):
 def dashboard_issues_by_priority(self, request, slug):
     filters = issue_filters(request.query_params, "GET")
     priority_order = ["urgent", "high", "medium", "low", "none"]
-    extra_filters = {}
-
-    if WorkspaceMember.objects.filter(
-        workspace__slug=slug,
-        member=request.user,
-        role=5,
-        is_active=True,
-    ).exists():
-        extra_filters = {"created_by": request.user}
 
     issues_by_priority = (
         Issue.issue_objects.filter(
@@ -500,7 +447,7 @@ def dashboard_issues_by_priority(self, request, slug):
             project__project_projectmember__member=request.user,
             assignees__in=[request.user],
         )
-        .filter(**filters, **extra_filters)
+        .filter(**filters)
         .values("priority")
         .annotate(count=Count("id"))
     )
@@ -595,7 +542,6 @@ def dashboard_recent_collaborators(self, request, slug):
             project__project_projectmember__member=request.user,
             project__project_projectmember__is_active=True,
             project__archived_at__isnull=True,
-            is_active=True,
         )
         .annotate(
             num_activities=Coalesce(

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

@@ -7,11 +7,7 @@ from rest_framework import status
 
 # Module imports
 from ..base import BaseViewSet, BaseAPIView
-from plane.app.permissions import (
-    ProjectEntityPermission,
-    allow_permission,
-    ROLE,
-)
+from plane.app.permissions import ProjectEntityPermission
 from plane.db.models import Project, Estimate, EstimatePoint, Issue
 from plane.app.serializers import (
     EstimateSerializer,
@@ -27,8 +23,10 @@ def generate_random_name(length=10):
 
 
 class ProjectEstimatePointEndpoint(BaseAPIView):
+    permission_classes = [
+        ProjectEntityPermission,
+    ]
 
-    @allow_permission([ROLE.ADMIN, ROLE.MEMBER, ROLE.VIEWER])
     def get(self, request, slug, project_id):
         project = Project.objects.get(workspace__slug=slug, pk=project_id)
         if project.estimate_id is not None:
@@ -191,8 +189,10 @@ class BulkEstimatePointEndpoint(BaseViewSet):
 
 
 class EstimatePointEndpoint(BaseViewSet):
+    permission_classes = [
+        ProjectEntityPermission,
+    ]
 
-    @allow_permission([ROLE.ADMIN, ROLE.MEMBER])
     def create(self, request, slug, project_id, estimate_id):
         #  TODO: add a key validation if the same key already exists
         if not request.data.get("key") or not request.data.get("value"):
@@ -211,7 +211,6 @@ class EstimatePointEndpoint(BaseViewSet):
         serializer = EstimatePointSerializer(estimate_point).data
         return Response(serializer, status=status.HTTP_200_OK)
 
-    @allow_permission([ROLE.ADMIN, ROLE.MEMBER])
     def partial_update(
         self, request, slug, project_id, estimate_id, estimate_point_id
     ):
@@ -232,7 +231,6 @@ class EstimatePointEndpoint(BaseViewSet):
         serializer.save()
         return Response(serializer.data, status=status.HTTP_200_OK)
 
-    @allow_permission([ROLE.ADMIN, ROLE.MEMBER])
     def destroy(
         self, request, slug, project_id, estimate_id, estimate_point_id
     ):

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

@@ -2,7 +2,7 @@
 from rest_framework import status
 from rest_framework.response import Response
 
-from plane.app.permissions import allow_permission, ROLE
+from plane.app.permissions import WorkSpaceAdminPermission
 from plane.app.serializers import ExporterHistorySerializer
 from plane.bgtasks.export_task import issue_export_task
 from plane.db.models import ExporterHistory, Project, Workspace
@@ -12,10 +12,12 @@ from .. import BaseAPIView
 
 
 class ExportIssuesEndpoint(BaseAPIView):
+    permission_classes = [
+        WorkSpaceAdminPermission,
+    ]
     model = ExporterHistory
     serializer_class = ExporterHistorySerializer
 
-    @allow_permission(allowed_roles=[ROLE.ADMIN, ROLE.MEMBER], level="WORKSPACE")
     def post(self, request, slug):
         # Get the workspace
         workspace = Workspace.objects.get(slug=slug)
@@ -39,7 +41,6 @@ class ExportIssuesEndpoint(BaseAPIView):
                 project=project_ids,
                 initiated_by=request.user,
                 provider=provider,
-                type="issue_exports",
             )
 
             issue_export_task.delay(
@@ -62,13 +63,9 @@ class ExportIssuesEndpoint(BaseAPIView):
                 status=status.HTTP_400_BAD_REQUEST,
             )
 
-    @allow_permission(
-        allowed_roles=[ROLE.ADMIN, ROLE.MEMBER], level="WORKSPACE"
-    )
     def get(self, request, slug):
         exporter_history = ExporterHistory.objects.filter(
-            workspace__slug=slug,
-            type="issue_exports",
+            workspace__slug=slug
         ).select_related("workspace", "initiated_by")
 
         if request.GET.get("per_page", False) and request.GET.get(

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

@@ -11,7 +11,7 @@ from rest_framework import status
 
 # Module imports
 from ..base import BaseAPIView
-from plane.app.permissions import allow_permission, ROLE
+from plane.app.permissions import ProjectEntityPermission, WorkspaceEntityPermission
 from plane.db.models import Workspace, Project
 from plane.app.serializers import (
     ProjectLiteSerializer,
@@ -21,8 +21,10 @@ from plane.license.utils.instance_value import get_configuration_value
 
 
 class GPTIntegrationEndpoint(BaseAPIView):
+    permission_classes = [
+        ProjectEntityPermission,
+    ]
 
-    @allow_permission([ROLE.ADMIN, ROLE.MEMBER])
     def post(self, request, slug, project_id):
         OPENAI_API_KEY, GPT_ENGINE = get_configuration_value(
             [
@@ -82,10 +84,10 @@ class GPTIntegrationEndpoint(BaseAPIView):
 
 
 class WorkspaceGPTIntegrationEndpoint(BaseAPIView):
+    permission_classes = [
+        WorkspaceEntityPermission,
+    ]
 
-    @allow_permission(
-        allowed_roles=[ROLE.ADMIN, ROLE.MEMBER], level="WORKSPACE"
-    )
     def post(self, request, slug):
         OPENAI_API_KEY, GPT_ENGINE = get_configuration_value(
             [

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

@@ -16,9 +16,7 @@ from rest_framework.response import Response
 
 # Module imports
 from ..base import BaseViewSet
-from plane.app.permissions import (
-    allow_permission, ROLE
-)
+from plane.app.permissions import ProjectBasePermission, ProjectLitePermission
 from plane.db.models import (
     Inbox,
     InboxIssue,
@@ -37,10 +35,13 @@ from plane.app.serializers import (
     InboxIssueDetailSerializer,
 )
 from plane.utils.issue_filters import issue_filters
-from plane.bgtasks.issue_activities_task import issue_activity
+from plane.bgtasks.issue_activites_task import issue_activity
 
 
 class InboxViewSet(BaseViewSet):
+    permission_classes = [
+        ProjectBasePermission,
+    ]
 
     serializer_class = InboxSerializer
     model = Inbox
@@ -62,7 +63,6 @@ class InboxViewSet(BaseViewSet):
             .select_related("workspace", "project")
         )
 
-    @allow_permission([ROLE.ADMIN, ROLE.MEMBER])
     def list(self, request, slug, project_id):
         inbox = self.get_queryset().first()
         return Response(
@@ -70,11 +70,9 @@ class InboxViewSet(BaseViewSet):
             status=status.HTTP_200_OK,
         )
 
-    @allow_permission([ROLE.ADMIN, ROLE.MEMBER])
     def perform_create(self, serializer):
         serializer.save(project_id=self.kwargs.get("project_id"))
 
-    @allow_permission([ROLE.ADMIN, ROLE.MEMBER])
     def destroy(self, request, slug, project_id, pk):
         inbox = Inbox.objects.filter(
             workspace__slug=slug, project_id=project_id, pk=pk
@@ -90,6 +88,9 @@ class InboxViewSet(BaseViewSet):
 
 
 class InboxIssueViewSet(BaseViewSet):
+    permission_classes = [
+        ProjectLitePermission,
+    ]
 
     serializer_class = InboxIssueSerializer
     model = InboxIssue
@@ -159,15 +160,13 @@ class InboxIssueViewSet(BaseViewSet):
                     ArrayAgg(
                         "issue_module__module_id",
                         distinct=True,
-                        filter=~Q(issue_module__module_id__isnull=True)
-                        & Q(issue_module__module__archived_at__isnull=True),
+                        filter=~Q(issue_module__module_id__isnull=True),
                     ),
                     Value([], output_field=ArrayField(UUIDField())),
                 ),
             )
         ).distinct()
 
-    @allow_permission([ROLE.ADMIN, ROLE.MEMBER, ROLE.VIEWER, ROLE.GUEST])
     def list(self, request, slug, project_id):
         inbox_id = Inbox.objects.filter(
             workspace__slug=slug, project_id=project_id
@@ -201,14 +200,6 @@ class InboxIssueViewSet(BaseViewSet):
         if inbox_status:
             inbox_issue = inbox_issue.filter(status__in=inbox_status)
 
-        if ProjectMember.objects.filter(
-            workspace__slug=slug,
-            project_id=project_id,
-            member=request.user,
-            role=5,
-            is_active=True,
-        ).exists():
-            inbox_issue = inbox_issue.filter(created_by=request.user)
         return self.paginate(
             request=request,
             queryset=(inbox_issue),
@@ -218,7 +209,6 @@ class InboxIssueViewSet(BaseViewSet):
             ).data,
         )
 
-    @allow_permission([ROLE.ADMIN, ROLE.MEMBER, ROLE.GUEST])
     def create(self, request, slug, project_id):
         if not request.data.get("issue", {}).get("name", False):
             return Response(
@@ -321,13 +311,12 @@ class InboxIssueViewSet(BaseViewSet):
                 serializer.errors, status=status.HTTP_400_BAD_REQUEST
             )
 
-    @allow_permission([ROLE.ADMIN, ROLE.MEMBER, ROLE.GUEST])
-    def partial_update(self, request, slug, project_id, pk):
+    def partial_update(self, request, slug, project_id, issue_id):
         inbox_id = Inbox.objects.filter(
             workspace__slug=slug, project_id=project_id
         ).first()
         inbox_issue = InboxIssue.objects.get(
-            issue_id=pk,
+            issue_id=issue_id,
             workspace__slug=slug,
             project_id=project_id,
             inbox_id=inbox_id,
@@ -468,7 +457,7 @@ class InboxIssueViewSet(BaseViewSet):
                         request.data, cls=DjangoJSONEncoder
                     ),
                     actor_id=str(request.user.id),
-                    issue_id=str(pk),
+                    issue_id=str(issue_id),
                     project_id=str(project_id),
                     current_instance=current_instance,
                     epoch=int(timezone.now().timestamp()),
@@ -503,7 +492,7 @@ class InboxIssueViewSet(BaseViewSet):
                     )
                     .get(
                         inbox_id=inbox_id.id,
-                        issue_id=pk,
+                        issue_id=issue_id,
                         project_id=project_id,
                     )
                 )
@@ -516,12 +505,7 @@ class InboxIssueViewSet(BaseViewSet):
             serializer = InboxIssueDetailSerializer(inbox_issue).data
             return Response(serializer, status=status.HTTP_200_OK)
 
-    @allow_permission(
-        allowed_roles=[ROLE.ADMIN, ROLE.MEMBER, ROLE.VIEWER],
-        creator=True,
-        model=Issue,
-    )
-    def retrieve(self, request, slug, project_id, pk):
+    def retrieve(self, request, slug, project_id, issue_id):
         inbox_id = Inbox.objects.filter(
             workspace__slug=slug, project_id=project_id
         ).first()
@@ -549,7 +533,9 @@ class InboxIssueViewSet(BaseViewSet):
                     Value([], output_field=ArrayField(UUIDField())),
                 ),
             )
-            .get(inbox_id=inbox_id.id, issue_id=pk, project_id=project_id)
+            .get(
+                inbox_id=inbox_id.id, issue_id=issue_id, project_id=project_id
+            )
         )
         issue = InboxIssueDetailSerializer(inbox_issue).data
         return Response(
@@ -557,25 +543,38 @@ class InboxIssueViewSet(BaseViewSet):
             status=status.HTTP_200_OK,
         )
 
-    @allow_permission(allowed_roles=[ROLE.ADMIN], creator=True, model=Issue)
-    def destroy(self, request, slug, project_id, pk):
+    def destroy(self, request, slug, project_id, issue_id):
         inbox_id = Inbox.objects.filter(
             workspace__slug=slug, project_id=project_id
         ).first()
         inbox_issue = InboxIssue.objects.get(
-            issue_id=pk,
+            issue_id=issue_id,
             workspace__slug=slug,
             project_id=project_id,
             inbox_id=inbox_id,
         )
+        # Get the project member
+        project_member = ProjectMember.objects.get(
+            workspace__slug=slug,
+            project_id=project_id,
+            member=request.user,
+            is_active=True,
+        )
+
+        if project_member.role <= 10 and str(inbox_issue.created_by_id) != str(
+            request.user.id
+        ):
+            return Response(
+                {"error": "You cannot delete inbox issue"},
+                status=status.HTTP_400_BAD_REQUEST,
+            )
 
         # Check the issue status
         if inbox_issue.status in [-2, -1, 0, 2]:
             # Delete the issue also
-            issue = Issue.objects.filter(
-                workspace__slug=slug, project_id=project_id, pk=pk
-            ).first()
-            issue.delete()
+            Issue.objects.filter(
+                workspace__slug=slug, project_id=project_id, pk=issue_id
+            ).delete()
 
         inbox_issue.delete()
         return Response(status=status.HTTP_204_NO_CONTENT)

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

@@ -19,7 +19,7 @@ from plane.app.serializers import (
     IssueActivitySerializer,
     IssueCommentSerializer,
 )
-from plane.app.permissions import ProjectEntityPermission, allow_permission, ROLE
+from plane.app.permissions import ProjectEntityPermission
 from plane.db.models import (
     IssueActivity,
     IssueComment,
@@ -33,7 +33,6 @@ class IssueActivityEndpoint(BaseAPIView):
     ]
 
     @method_decorator(gzip_page)
-    @allow_permission([ROLE.ADMIN, ROLE.MEMBER, ROLE.GUEST, ROLE.VIEWER])
     def get(self, request, slug, project_id, issue_id):
         filters = {}
         if request.GET.get("created_at__gt", None) is not None: