chore: generalize page root component

* fix: removing readonly editor

* fix: sync state

* fix: indexeddb sync loader added

* fix: remove node error fixed

* style: page title and checkbox

* chore: removing the syncing logic

* revert: is editable check removed in display message

* fix: editable field optional

* fix: editable removed as optional prop

* fix: extra options import fix

---------

Co-authored-by: Aaryan Khandelwal <aaryankhandu123@gmail.com>

.env.example

@@ -26,10 +26,9 @@ AWS_S3_BUCKET_NAME="uploads"
 FILE_SIZE_LIMIT=5242880
 
 # GPT settings
-SILO_BASE_URL=
 OPENAI_API_BASE="https://api.openai.com/v1" # deprecated
 OPENAI_API_KEY="sk-" # deprecated
-GPT_ENGINE="gpt-4o-mini" # deprecated
+GPT_ENGINE="gpt-3.5-turbo" # deprecated
 
 # Settings related to Docker
 DOCKERIZED=1  # deprecated
@@ -39,11 +38,3 @@ USE_MINIO=1
 
 # Nginx Configuration
 NGINX_PORT=80
-
-# Imports Config
-SILO_BASE_URL=
-
-MONGO_DB_URL="mongodb://plane-mongodb:27017/"
-
-SILO_DB=silo
-SILO_DB_URL=postgresql://plane:plane@plane-db/silo

.github/actions/build-push-cloud/action.yml

@@ -1,127 +0,0 @@
-name: "Build and Push Docker Image"
-description: "Reusable action for building and pushing Docker images"
-inputs:
-  docker-username:
-    description: "The Dockerhub username"
-    required: true
-  dockerhub-token:
-    description: "The Dockerhub Token"
-    required: true
-
-  # Docker Image Options
-  docker-image-owner:
-    description: "The owner of the Docker image"
-    required: true
-  docker-image-name:
-    description: "The name of the Docker image"
-    required: true
-  build-context:
-    description: "The build context"
-    required: true
-    default: "."
-  dockerfile-path:
-    description: "The path to the Dockerfile"
-    required: true
-  build-args:
-    description: "The build arguments"
-    required: false
-    default: ""
-
-  # Buildx Options
-  buildx-driver:
-    description: "Buildx driver"
-    required: true
-    default: "docker-container"
-  buildx-version:
-    description: "Buildx version"
-    required: true
-    default: "latest"
-  buildx-platforms:
-    description: "Buildx platforms"
-    required: true
-    default: "linux/amd64"
-  buildx-endpoint:
-    description: "Buildx endpoint"
-    required: true
-    default: "default"
-
-  # Release Build Options
-  build-release:
-    description: "Flag to publish release"
-    required: false
-    default: "false"
-  build-prerelease:
-    description: "Flag to publish prerelease"
-    required: false
-    default: "false"
-  release-version:
-    description: "The release version"
-    required: false
-    default: "latest"
-
-runs:
-  using: "composite"
-  steps:
-  - name: Set Docker Tag
-    shell: bash
-    env:
-      IMG_OWNER: ${{ inputs.docker-image-owner }}
-      IMG_NAME: ${{ inputs.docker-image-name }}
-      BUILD_RELEASE: ${{ inputs.build-release }}
-      IS_PRERELEASE: ${{ inputs.build-prerelease }}
-      REL_VERSION: ${{ inputs.release-version }}
-    run: |
-      FLAT_BRANCH_VERSION=$(echo "${{ github.ref_name }}" | sed 's/[^a-zA-Z0-9.-]//g')
-
-      if [ "${{ env.BUILD_RELEASE }}" == "true" ]; then
-        semver_regex="^v([0-9]+)\.([0-9]+)\.([0-9]+)(-[a-zA-Z0-9]+(-[a-zA-Z0-9]+)*)?$"
-        if [[ ! ${{ env.REL_VERSION }} =~ $semver_regex ]]; then
-          echo "Invalid Release Version Format : ${{ env.REL_VERSION }}"
-          echo "Please provide a valid SemVer version"
-          echo "e.g. v1.2.3 or v1.2.3-alpha-1"
-          echo "Exiting the build process"
-          exit 1  # Exit with status 1 to fail the step
-        fi
-
-        TAG=${{ env.IMG_OWNER }}/${{ env.IMG_NAME }}:${{ env.REL_VERSION }}
-
-        if [ "${{ env.IS_PRERELEASE }}" != "true" ]; then
-          TAG=${TAG},${{ env.IMG_OWNER }}/${{ env.IMG_NAME }}:stable
-        fi
-      elif [ "${{ env.TARGET_BRANCH }}" == "master" ]; then
-        TAG=${{ env.IMG_OWNER }}/${{ env.IMG_NAME }}:latest
-      else
-        TAG=${{ env.IMG_OWNER }}/${{ env.IMG_NAME }}:${FLAT_BRANCH_VERSION}
-      fi
-
-      echo "DOCKER_TAGS=${TAG}" >> $GITHUB_ENV
-
-  - name: Login to Docker Hub
-    uses: docker/login-action@v3
-    with:
-      username: ${{ inputs.docker-username }}
-      password: ${{ inputs.dockerhub-token}}
-
-  - name: Set up Docker Buildx
-    uses: docker/setup-buildx-action@v3
-    with:
-      driver: ${{ inputs.buildx-driver }}
-      version: ${{ inputs.buildx-version }}
-      endpoint: ${{ inputs.buildx-endpoint }}
-
-  - name: Check out the repo
-    uses: actions/checkout@v4
-
-  - name: Build and Push Docker Image
-    uses: docker/build-push-action@v5.1.0
-    with:
-      context: ${{ inputs.build-context }}
-      file: ${{ inputs.dockerfile-path }}
-      platforms: ${{ inputs.buildx-platforms }}
-      tags: ${{ env.DOCKER_TAGS }}
-      push: true
-      build-args: ${{ inputs.build-args }}
-    env:
-      DOCKER_BUILDKIT: 1
-      DOCKER_USERNAME: ${{ inputs.docker-username }}
-      DOCKER_PASSWORD: ${{ inputs.dockerhub-token }}

.github/actions/build-push-ee/action.yml

@@ -1,168 +0,0 @@
-name: "Build and Push Docker Image"
-description: "Reusable action for building and pushing Docker images"
-inputs:
-  docker-username:
-    description: "The Dockerhub username"
-    required: true
-  dockerhub-token:
-    description: "The Dockerhub Token"
-    required: true
-
-  # Harbor Options
-  harbor-push:
-    description: "Flag to push to Harbor"
-    required: false
-    default: "false"
-  harbor-username:
-    description: "The Harbor username"
-    required: false
-  harbor-token:
-    description: "The Harbor token"
-    required: false
-  harbor-registry:
-    description: "The Harbor registry"
-    required: false
-    default: "registry.plane.tools"
-  harbor-project:
-    description: "The Harbor project"
-    required: false
-
-  # Docker Image Options
-  docker-image-owner:
-    description: "The owner of the Docker image"
-    required: true
-  docker-image-name:
-    description: "The name of the Docker image"
-    required: true
-  build-context:
-    description: "The build context"
-    required: true
-    default: "."
-  dockerfile-path:
-    description: "The path to the Dockerfile"
-    required: true
-  build-args:
-    description: "The build arguments"
-    required: false
-    default: ""
-  
-  # Buildx Options
-  buildx-driver:
-    description: "Buildx driver"
-    required: true
-    default: "docker-container"
-  buildx-version:
-    description: "Buildx version"
-    required: true
-    default: "latest"
-  buildx-platforms:
-    description: "Buildx platforms"
-    required: true
-    default: "linux/amd64"
-  buildx-endpoint:
-    description: "Buildx endpoint"
-    required: true
-    default: "default"
-
-  # Release Build Options
-  build-release:
-    description: "Flag to publish release"
-    required: false
-    default: "false"
-  build-prerelease:
-    description: "Flag to publish prerelease"
-    required: false
-    default: "false"
-  release-version:
-    description: "The release version"
-    required: false
-    default: "latest"
-
-runs:
-  using: "composite"
-  steps:
-    - name: Set Docker Tag
-      shell: bash
-      env:
-        IMG_OWNER: ${{ inputs.docker-image-owner }}
-        IMG_NAME: ${{ inputs.docker-image-name }}
-        HARBOR_PUSH: ${{ inputs.harbor-push }}
-        HARBOR_REGISTRY: ${{ inputs.harbor-registry }}
-        HARBOR_PROJECT: ${{ inputs.harbor-project }}
-        BUILD_RELEASE: ${{ inputs.build-release }}
-        IS_PRERELEASE: ${{ inputs.build-prerelease }}
-        REL_VERSION: ${{ inputs.release-version }}
-      run: |
-        FLAT_BRANCH_VERSION=$(echo "${{ github.ref_name }}" | sed 's/[^a-zA-Z0-9.-]//g')
-
-        if [ "${{ env.BUILD_RELEASE }}" == "true" ]; then
-          semver_regex="^v([0-9]+)\.([0-9]+)\.([0-9]+)(-[a-zA-Z0-9]+(-[a-zA-Z0-9]+)*)?$"
-          if [[ ! ${{ env.REL_VERSION }} =~ $semver_regex ]]; then
-            echo "Invalid Release Version Format : ${{ env.REL_VERSION }}"
-            echo "Please provide a valid SemVer version"
-            echo "e.g. v1.2.3 or v1.2.3-alpha-1"
-            echo "Exiting the build process"
-            exit 1  # Exit with status 1 to fail the step
-          fi
-
-          TAG=${{ env.IMG_OWNER }}/${{ env.IMG_NAME }}:${{ env.REL_VERSION }}
-
-          if [ "${{ env.HARBOR_PUSH }}" == "true" ]; then
-            TAG=${TAG},${{ env.HARBOR_REGISTRY }}/${{ env.HARBOR_PROJECT }}/${{ env.IMG_NAME }}:${{ env.REL_VERSION }}
-          fi
-
-          if [ "${{ env.IS_PRERELEASE }}" != "true" ]; then
-            TAG=${TAG},${{ env.IMG_OWNER }}/${{ env.IMG_NAME }}:stable
-            if [ "${{ env.HARBOR_PUSH }}" == "true" ]; then
-              TAG=${TAG},${{ env.HARBOR_REGISTRY }}/${{ env.HARBOR_PROJECT }}/${{ env.IMG_NAME }}:stable
-            fi
-          fi
-        elif [ "${{ env.TARGET_BRANCH }}" == "master" ]; then
-          TAG=${{ env.IMG_OWNER }}/${{ env.IMG_NAME }}:latest
-          if [ "${{ env.HARBOR_PUSH }}" == "true" ]; then
-            TAG=${TAG},${{ env.HARBOR_REGISTRY }}/${{ env.HARBOR_PROJECT }}/${{ env.IMG_NAME }}:latest
-          fi
-        else
-          TAG=${{ env.IMG_OWNER }}/${{ env.IMG_NAME }}:${FLAT_BRANCH_VERSION}
-          if [ "${{ env.HARBOR_PUSH }}" == "true" ]; then
-            TAG=${TAG},${{ env.HARBOR_REGISTRY }}/${{ env.HARBOR_PROJECT }}/${{ env.IMG_NAME }}:${FLAT_BRANCH_VERSION}
-          fi
-        fi
-        
-        echo "DOCKER_TAGS=${TAG}" >> $GITHUB_ENV
-    - name: Login to Docker Hub
-      uses: docker/login-action@v3
-      with:
-        username: ${{ inputs.docker-username }}
-        password: ${{ inputs.dockerhub-token}}
-    - name: Login to Harbor
-      if: ${{ inputs.harbor-push }} == "true"
-      uses: docker/login-action@v3
-      with:
-        username: ${{ inputs.harbor-username }}
-        password: ${{ inputs.harbor-token }}
-        registry: ${{ inputs.harbor-registry }}
-
-    - name: Set up Docker Buildx
-      uses: docker/setup-buildx-action@v3
-      with:
-        driver: ${{ inputs.buildx-driver }}
-        version: ${{ inputs.buildx-version }}
-        endpoint: ${{ inputs.buildx-endpoint }}
-
-    - name: Check out the repo
-      uses: actions/checkout@v4
-
-    - name: Build and Push Docker Image
-      uses: docker/build-push-action@v5.1.0
-      with:
-        context: ${{ inputs.build-context }}
-        file: ${{ inputs.dockerfile-path }}
-        platforms: ${{ inputs.buildx-platforms }}
-        tags: ${{ env.DOCKER_TAGS }}
-        push: true
-        build-args: ${{ inputs.build-args }}
-      env:
-        DOCKER_BUILDKIT: 1
-        DOCKER_USERNAME: ${{ inputs.docker-username }}
-        DOCKER_PASSWORD: ${{ inputs.dockerhub-token }}

.github/dependabot.yml

@@ -1,11 +0,0 @@
-# To get started with Dependabot version updates, you'll need to specify which
-# package ecosystems to update and where the package manifests are located.
-# Please see the documentation for all configuration options:
-# https://docs.github.com/code-security/dependabot/dependabot-version-updates/configuration-options-for-the-dependabot.yml-file
-
-version: 2
-updates:
-  - package-ecosystem: "" # See documentation for possible values
-    directory: "/" # Location of package manifests
-    schedule:
-      interval: "weekly"

.github/pull_request_template.md

@@ -0,0 +1,20 @@
+### Description
+<!-- Provide a detailed description of the changes in this PR -->
+
+### Type of Change
+<!-- Put an 'x' in the boxes that apply -->
+- [ ] Bug fix (non-breaking change which fixes an issue)
+- [ ] Feature (non-breaking change which adds functionality)
+- [ ] Improvement (change that would cause existing functionality to not work as expected)
+- [ ] Code refactoring
+- [ ] Performance improvements
+- [ ] Documentation update
+
+### Screenshots and Media (if applicable)
+<!-- Add screenshots to help explain your changes, ideally showcasing before and after -->
+
+### Test Scenarios 
+<!-- Please describe the tests that you ran to verify your changes -->
+
+### References
+<!-- Link related issues if there are any -->

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

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

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

@@ -1,204 +0,0 @@
-name: Branch Build AIO
-
-on:
-  workflow_dispatch:
-    inputs:
-      full:
-        description: 'Run full build'
-        type: boolean
-        required: false
-        default: true
-      slim:
-        description: 'Run slim build'
-        type: boolean
-        required: false
-        default: true
-      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 }}
-  IS_PRERELEASE: ${{ github.event.release.prerelease }}
-  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 }}
-      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 [ [ "${{ github.event_name }}" == "release" ] && [ "${{ env.IS_PRERELEASE }}" != "true" ] ; 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.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
-
-      - 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-enterprise:full-${{ needs.branch_build_setup.outputs.gh_branch_name }}
-      TARGET_BRANCH: ${{ needs.branch_build_setup.outputs.gh_branch_name }}
-      BUILDX_DRIVER: ${{ needs.branch_build_setup.outputs.gh_buildx_driver }}
-      BUILDX_VERSION: ${{ needs.branch_build_setup.outputs.gh_buildx_version }}
-      BUILDX_PLATFORMS: ${{ needs.branch_build_setup.outputs.gh_buildx_platforms }}
-      BUILDX_ENDPOINT: ${{ needs.branch_build_setup.outputs.gh_buildx_endpoint }}
-    steps:
-      - name: Set Docker Tag
-        run: |
-          if [ "${{ github.event_name }}" == "release" ]; then
-            TAG=makeplane/plane-aio-enterprise:${{env.BUILD_TYPE}}-stable,makeplane/plane-aio-enterprise:${{env.BUILD_TYPE}}-${{ github.event.release.tag_name }}
-          elif [ "${{ env.TARGET_BRANCH }}" == "master" ]; then
-            TAG=makeplane/plane-aio-enterprise:${{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: |
-            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 }}
-
-  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-enterprise:slim-${{ needs.branch_build_setup.outputs.gh_branch_name }}
-      TARGET_BRANCH: ${{ needs.branch_build_setup.outputs.gh_branch_name }}
-      BUILDX_DRIVER: ${{ needs.branch_build_setup.outputs.gh_buildx_driver }}
-      BUILDX_VERSION: ${{ needs.branch_build_setup.outputs.gh_buildx_version }}
-      BUILDX_PLATFORMS: ${{ needs.branch_build_setup.outputs.gh_buildx_platforms }}
-      BUILDX_ENDPOINT: ${{ needs.branch_build_setup.outputs.gh_buildx_endpoint }}
-    steps:
-      - name: Set Docker Tag
-        run: |
-          if [ "${{ github.event_name }}" == "release" ]; then
-            TAG=makeplane/plane-aio-enterprise:${{env.BUILD_TYPE}}-stable,makeplane/plane-aio-enterprise:${{env.BUILD_TYPE}}-${{ github.event.release.tag_name }}
-          elif [ "${{ env.TARGET_BRANCH }}" == "master" ]; then
-            TAG=makeplane/plane-aio-enterprise:${{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: |
-            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 }}

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

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

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

@@ -1,421 +0,0 @@
-name: Branch Build Enterprise Cloud
-
-on:
-  workflow_dispatch:
-    inputs:
-      build_type:
-        description: "Type of build to run"
-        required: true
-        type: choice
-        default: "Build"
-        options:
-          - "Build"
-          - "Release"
-      releaseVersion:
-        description: "Release Version"
-        type: string
-        default: v0.0.0-cloud
-      useVaultSecrets:
-        description: "Use Vault Secrets"
-        type: boolean
-        default: false
-        required: true
-      isPrerelease:
-        description: "Is Pre-release"
-        type: boolean
-        default: false
-        required: true
-
-  push:
-    branches:
-      - master
-
-env:
-  TARGET_BRANCH: ${{ github.ref_name }}
-  VAULT_KP_PREFIX: plane-ee-cloud-builds
-  BUILD_TYPE: ${{ github.event.inputs.build_type }}
-  RELEASE_VERSION: ${{ github.event.inputs.releaseVersion }}
-  IS_PRERELEASE: ${{ github.event.inputs.isPrerelease }}
-
-jobs:
-  branch_build_setup:
-    name: Build Setup
-    runs-on: ubuntu-20.04
-    outputs:
-      gh_branch_name: ${{ steps.set_env_variables.outputs.TARGET_BRANCH }}
-      gh_buildx_driver: ${{ steps.set_env_variables.outputs.BUILDX_DRIVER }}
-      gh_buildx_version: ${{ steps.set_env_variables.outputs.BUILDX_VERSION }}
-      gh_buildx_platforms: ${{ steps.set_env_variables.outputs.BUILDX_PLATFORMS }}
-      gh_buildx_endpoint: ${{ steps.set_env_variables.outputs.BUILDX_ENDPOINT }}
-
-      build_web: ${{ steps.changed_files.outputs.web_any_changed }}
-      build_admin: ${{ steps.changed_files.outputs.admin_any_changed }}
-      build_space: ${{ steps.changed_files.outputs.space_any_changed }}
-      build_live: ${{ steps.changed_files.outputs.live_any_changed }}
-      build_silo: ${{ steps.changed_files.outputs.silo_any_changed }}
-      build_apiserver: ${{ steps.changed_files.outputs.apiserver_any_changed }}
-
-      dh_img_web: ${{ steps.set_env_variables.outputs.DH_IMG_WEB }}
-      dh_img_space: ${{ steps.set_env_variables.outputs.DH_IMG_SPACE }}
-      dh_img_admin: ${{ steps.set_env_variables.outputs.DH_IMG_ADMIN }}
-      dh_img_live: ${{ steps.set_env_variables.outputs.DH_IMG_LIVE }}
-      dh_img_silo: ${{ steps.set_env_variables.outputs.DH_IMG_SILO }}
-      dh_img_backend: ${{ steps.set_env_variables.outputs.DH_IMG_BACKEND }}
-
-      build_type: ${{steps.set_env_variables.outputs.BUILD_TYPE}}
-      build_release: ${{ steps.set_env_variables.outputs.BUILD_RELEASE }}
-      build_prerelease: ${{ steps.set_env_variables.outputs.BUILD_PRERELEASE }}
-      release_version: ${{ steps.set_env_variables.outputs.RELEASE_VERSION }}
-      vault_secrets: ${{ steps.get_vault_secrets.outputs.VAULT_SECRETS }}
-      build_args: ${{ steps.prepare_build_args.outputs.BUILD_ARGS }}
-    steps:
-      - id: set_env_variables
-        name: Set Environment Variables
-        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
-
-          BR_NAME=$( echo "${{ env.TARGET_BRANCH }}" | sed 's/[^a-zA-Z0-9.-]//g')
-          echo "TARGET_BRANCH=$BR_NAME" >> $GITHUB_OUTPUT
-
-          echo "DH_IMG_WEB=web-cloud" >> $GITHUB_OUTPUT
-          echo "DH_IMG_SPACE=space-cloud" >> $GITHUB_OUTPUT
-          echo "DH_IMG_ADMIN=admin-cloud" >> $GITHUB_OUTPUT
-          echo "DH_IMG_LIVE=live-cloud" >> $GITHUB_OUTPUT
-          echo "DH_IMG_SILO=silo-cloud" >> $GITHUB_OUTPUT
-          echo "DH_IMG_BACKEND=backend-cloud" >> $GITHUB_OUTPUT
-
-          echo "BUILD_TYPE=${{env.BUILD_TYPE}}" >> $GITHUB_OUTPUT
-          BUILD_RELEASE=false
-          BUILD_PRERELEASE=false
-          RELVERSION="latest"
-
-          if [ "${{ env.BUILD_TYPE }}" == "Release" ]; then
-            FLAT_RELEASE_VERSION=$(echo "${{ env.RELEASE_VERSION }}" | sed 's/[^a-zA-Z0-9.-]//g')
-            echo "FLAT_RELEASE_VERSION=${FLAT_RELEASE_VERSION}" >> $GITHUB_OUTPUT
-
-            semver_regex="^v([0-9]+)\.([0-9]+)\.([0-9]+)(-[a-zA-Z0-9]+(-[a-zA-Z0-9]+)*)?$"
-            if [[ ! $FLAT_RELEASE_VERSION =~ $semver_regex ]]; then
-              echo "Invalid Release Version Format : $FLAT_RELEASE_VERSION"
-              echo "Please provide a valid SemVer version"
-              echo "e.g. v1.2.3 or v1.2.3-alpha-1"
-              echo "Exiting the build process"
-              exit 1  # Exit with status 1 to fail the step
-            fi
-            BUILD_RELEASE=true
-            RELVERSION=$FLAT_RELEASE_VERSION
-
-            if [ "${{ env.IS_PRERELEASE }}" == "true" ]; then
-              BUILD_PRERELEASE=true
-            fi
-          fi
-          echo "BUILD_RELEASE=${BUILD_RELEASE}" >> $GITHUB_OUTPUT
-          echo "BUILD_PRERELEASE=${BUILD_PRERELEASE}" >> $GITHUB_OUTPUT
-          echo "RELEASE_VERSION=${RELVERSION}" >> $GITHUB_OUTPUT
-
-      - name: Tailscale
-        uses: tailscale/github-action@v2
-        if: ${{github.event.inputs.useVaultSecrets == 'true'}}
-        with:
-          oauth-client-id: ${{ secrets.TAILSCALE_OAUTH_CLIENT_ID }}
-          oauth-secret: ${{ secrets.TAILSCALE_OAUTH_CLIENT_SECRET }}
-          tags: tag:ci
-
-      - name: Get the ENV values from Vault
-        id: get_vault_secrets
-        if: ${{github.event.inputs.useVaultSecrets == 'true'}}
-        run: |
-          if [ "${{ env.TARGET_BRANCH }}" == "master" ]; then
-            ENV_NAME="prod"
-          else
-            ENV_NAME="stage"
-          fi
-
-          curl -fsSL \
-            --header "X-Vault-Token: ${{ secrets.VAULT_TOKEN }}" \
-            --request GET \
-            ${{ vars.VAULT_HOST }}/v1/kv/git-builds/data/${{ env.VAULT_KP_PREFIX }}-${ENV_NAME} | jq .data.data > vault_secrets.json
-
-          if [ $? != 0 ]; then
-            echo "Failed to get the ENV values from Vault"
-            exit 1
-          fi
-
-          VAULT_SECRETS=$(cat vault_secrets.json | base64 -w 0)
-          echo "VAULT_SECRETS=${VAULT_SECRETS}" >> $GITHUB_OUTPUT
-
-      - name: Prepare Docker Build Args
-        id: prepare_build_args
-        if: ${{github.event.inputs.useVaultSecrets == 'true'}}
-        run: |
-          BUILD_ARGS=""
-          add_build_arg() {
-            if [ -n "$2" ]; then
-              BUILD_ARGS="$BUILD_ARGS $1=$2"
-            fi
-          }
-          add_build_arg "NEXT_PUBLIC_API_BASE_URL" "${{ env.NEXT_PUBLIC_API_BASE_URL }}"
-          add_build_arg "NEXT_PUBLIC_API_BASE_PATH" "${{ env.NEXT_PUBLIC_API_BASE_PATH }}"
-
-          add_build_arg "NEXT_PUBLIC_ADMIN_BASE_URL" "${{ env.NEXT_PUBLIC_ADMIN_BASE_URL }}"
-          add_build_arg "NEXT_PUBLIC_ADMIN_BASE_PATH" "${{ env.NEXT_PUBLIC_ADMIN_BASE_PATH }}"
-
-          add_build_arg "NEXT_PUBLIC_SPACE_BASE_URL" "${{ env.NEXT_PUBLIC_SPACE_BASE_URL }}"
-          add_build_arg "NEXT_PUBLIC_SPACE_BASE_PATH" "${{ env.NEXT_PUBLIC_SPACE_BASE_PATH }}"
-
-          add_build_arg "NEXT_PUBLIC_LIVE_BASE_URL" "${{ env.NEXT_PUBLIC_LIVE_BASE_URL }}"
-          add_build_arg "NEXT_PUBLIC_LIVE_BASE_PATH" "${{ env.NEXT_PUBLIC_LIVE_BASE_PATH }}"
-
-          add_build_arg "NEXT_PUBLIC_SILO_BASE_URL" "${{ env.NEXT_PUBLIC_SILO_BASE_URL }}"
-          add_build_arg "NEXT_PUBLIC_SILO_BASE_PATH" "${{ env.NEXT_PUBLIC_SILO_BASE_PATH }}"
-
-          add_build_arg "NEXT_PUBLIC_WEB_BASE_URL" "${{ env.NEXT_PUBLIC_WEB_BASE_URL }}"
-
-          echo "BUILD_ARGS=$BUILD_ARGS" >> $GITHUB_OUTPUT
-
-      - id: checkout_files
-        name: Checkout Files
-        uses: actions/checkout@v4
-
-      - name: Get changed files
-        id: changed_files
-        uses: tj-actions/changed-files@v42
-        with:
-          files_yaml: |
-            apiserver:
-              - apiserver/**
-            admin:
-              - admin/**
-              - packages/**
-              - "package.json"
-              - "yarn.lock"
-              - "turbo.json"
-            space:
-              - space/**
-              - packages/**
-              - "package.json"
-              - "yarn.lock"
-              - "turbo.json"
-            web:
-              - web/**
-              - packages/**
-              - "package.json"
-              - "yarn.lock"
-              - "turbo.json"
-            live:
-              - live/**
-              - packages/**
-              - 'package.json'
-              - 'yarn.lock'
-              - 'turbo.json'
-            silo:
-              - silo/**
-              - packages/**
-              - 'package.json'
-              - 'yarn.lock'
-              - 'turbo.json'
-
-  branch_build_push_admin:
-    if: ${{ needs.branch_build_setup.outputs.build_admin == 'true' || github.event_name == 'workflow_dispatch' || needs.branch_build_setup.outputs.gh_branch_name == 'master' }}
-    name: Build-Push Admin Docker Image
-    runs-on: ubuntu-20.04
-    needs: [branch_build_setup]
-    steps:
-      - id: checkout_files
-        name: Checkout Files
-        uses: actions/checkout@v4
-
-      - name: Admin Build and Push
-        uses: ./.github/actions/build-push-cloud
-        with:
-          build-release: ${{ needs.branch_build_setup.outputs.build_release }}
-          build-prerelease: ${{ needs.branch_build_setup.outputs.build_prerelease }}
-          release-version: ${{ needs.branch_build_setup.outputs.release_version }}
-          docker-username: ${{ secrets.DOCKERHUB_USERNAME }}
-          dockerhub-token: ${{ secrets.DOCKERHUB_TOKEN }}
-          docker-image-owner: makeplane
-          docker-image-name: ${{ needs.branch_build_setup.outputs.dh_img_admin }}
-          build-context: .
-          dockerfile-path: ./admin/Dockerfile.admin
-          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 }}
-          build-args: ${{ needs.branch_build_setup.outputs.build_args }}
-
-  branch_build_push_web:
-    if: ${{ needs.branch_build_setup.outputs.build_web == 'true' || github.event_name == 'workflow_dispatch' || needs.branch_build_setup.outputs.gh_branch_name == 'master' }}
-    name: Build-Push Web Docker Image
-    runs-on: ubuntu-20.04
-    needs: [branch_build_setup]
-    steps:
-      - name: Load Vault Secrets
-        run: |
-          echo ${{ needs.branch_build_setup.outputs.vault_secrets }} | base64 -d > vault_secrets.json
-          jq -r 'to_entries|map("\(.key)=\(.value|tostring)")|.[]' vault_secrets.json >> $GITHUB_ENV
-
-      - id: checkout_files
-        name: Checkout Files
-        uses: actions/checkout@v4
-
-      - name: Web Build and Push
-        uses: ./.github/actions/build-push-cloud
-        with:
-          build-release: ${{ needs.branch_build_setup.outputs.build_release }}
-          build-prerelease: ${{ needs.branch_build_setup.outputs.build_prerelease }}
-          release-version: ${{ needs.branch_build_setup.outputs.release_version }}
-          docker-username: ${{ secrets.DOCKERHUB_USERNAME }}
-          dockerhub-token: ${{ secrets.DOCKERHUB_TOKEN }}
-          docker-image-owner: makeplane
-          docker-image-name: ${{ needs.branch_build_setup.outputs.dh_img_web }}
-          build-context: .
-          dockerfile-path: ./web/Dockerfile.web
-          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 }}
-          build-args: ${{ needs.branch_build_setup.outputs.build_args }}
-
-  branch_build_push_space:
-    if: ${{ needs.branch_build_setup.outputs.build_space == 'true' || github.event_name == 'workflow_dispatch' || needs.branch_build_setup.outputs.gh_branch_name == 'master' }}
-    name: Build-Push Space Docker Image
-    runs-on: ubuntu-20.04
-    needs: [branch_build_setup]
-    steps:
-      - name: Load Vault Secrets
-        run: |
-          echo ${{ needs.branch_build_setup.outputs.vault_secrets }} | base64 -d > vault_secrets.json
-          jq -r 'to_entries|map("\(.key)=\(.value|tostring)")|.[]' vault_secrets.json >> $GITHUB_ENV
-
-      - id: checkout_files
-        name: Checkout Files
-        uses: actions/checkout@v4
-
-      - name: Space Build and Push
-        uses: ./.github/actions/build-push-cloud
-        with:
-          build-release: ${{ needs.branch_build_setup.outputs.build_release }}
-          build-prerelease: ${{ needs.branch_build_setup.outputs.build_prerelease }}
-          release-version: ${{ needs.branch_build_setup.outputs.release_version }}
-          docker-username: ${{ secrets.DOCKERHUB_USERNAME }}
-          dockerhub-token: ${{ secrets.DOCKERHUB_TOKEN }}
-          docker-image-owner: makeplane
-          docker-image-name: ${{ needs.branch_build_setup.outputs.dh_img_space }}
-          build-context: .
-          dockerfile-path: ./space/Dockerfile.space
-          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 }}
-          build-args: ${{ needs.branch_build_setup.outputs.build_args }}
-
-  branch_build_push_live:
-    if: ${{ needs.branch_build_setup.outputs.build_live == 'true' || github.event_name == 'workflow_dispatch' || needs.branch_build_setup.outputs.gh_branch_name == 'master' }}
-    name: Build-Push Live Collaboration Docker Image
-    runs-on: ubuntu-20.04
-    needs: [branch_build_setup]
-    steps:
-      - id: checkout_files
-        name: Checkout Files
-        uses: actions/checkout@v4
-
-      - name: Live Build and Push
-        uses: ./.github/actions/build-push-cloud
-        with:
-          build-release: ${{ needs.branch_build_setup.outputs.build_release }}
-          build-prerelease: ${{ needs.branch_build_setup.outputs.build_prerelease }}
-          release-version: ${{ needs.branch_build_setup.outputs.release_version }}
-          docker-username: ${{ secrets.DOCKERHUB_USERNAME }}
-          dockerhub-token: ${{ secrets.DOCKERHUB_TOKEN }}
-          docker-image-owner: makeplane
-          docker-image-name: ${{ needs.branch_build_setup.outputs.dh_img_live }}
-          build-context: .
-          dockerfile-path: ./live/Dockerfile.live
-          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 }}
-
-  branch_build_push_silo:
-    if: ${{ needs.branch_build_setup.outputs.build_silo == 'true' || github.event_name == 'workflow_dispatch' || needs.branch_build_setup.outputs.gh_branch_name == 'master' }}
-    name: Build-Push Silo Docker Image
-    runs-on: ubuntu-20.04
-    needs: [branch_build_setup]
-    steps:
-      - id: checkout_files
-        name: Checkout Files
-        uses: actions/checkout@v4
-
-      - name: Silo Build and Push
-        uses: ./.github/actions/build-push-cloud
-        with:
-          build-release: ${{ needs.branch_build_setup.outputs.build_release }}
-          build-prerelease: ${{ needs.branch_build_setup.outputs.build_prerelease }}
-          release-version: ${{ needs.branch_build_setup.outputs.release_version }}
-          docker-username: ${{ secrets.DOCKERHUB_USERNAME }}
-          dockerhub-token: ${{ secrets.DOCKERHUB_TOKEN }}
-          docker-image-owner: makeplane
-          docker-image-name: ${{ needs.branch_build_setup.outputs.dh_img_silo }}
-          build-context: .
-          dockerfile-path: ./silo/Dockerfile.silo
-
-  branch_build_push_apiserver:
-    if: ${{ needs.branch_build_setup.outputs.build_apiserver == 'true' || github.event_name == 'workflow_dispatch' || needs.branch_build_setup.outputs.gh_branch_name == 'master' }}
-    name: Build-Push API Server Docker Image
-    runs-on: ubuntu-20.04
-    needs: [branch_build_setup]
-    steps:
-      - id: checkout_files
-        name: Checkout Files
-        uses: actions/checkout@v4
-
-      - name: Backend Build and Push
-        uses: ./.github/actions/build-push-cloud
-        with:
-          build-release: ${{ needs.branch_build_setup.outputs.build_release }}
-          build-prerelease: ${{ needs.branch_build_setup.outputs.build_prerelease }}
-          release-version: ${{ needs.branch_build_setup.outputs.release_version }}
-          docker-username: ${{ secrets.DOCKERHUB_USERNAME }}
-          dockerhub-token: ${{ secrets.DOCKERHUB_TOKEN }}
-          docker-image-owner: makeplane
-          docker-image-name: ${{ needs.branch_build_setup.outputs.dh_img_backend }}
-          build-context: ./apiserver
-          dockerfile-path: ./apiserver/Dockerfile.api
-          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 }}
-
-  publish_release:
-    if: ${{ needs.branch_build_setup.outputs.build_type == 'Release' }}
-    name: Build Release
-    runs-on: ubuntu-20.04
-    needs:
-      [
-        branch_build_setup,
-        branch_build_push_admin,
-        branch_build_push_web,
-        branch_build_push_space,
-        branch_build_push_live,
-        branch_build_push_silo,
-        branch_build_push_apiserver,
-      ]
-    env:
-      REL_VERSION: ${{ needs.branch_build_setup.outputs.release_version }}
-    steps:
-      - name: Checkout
-        uses: actions/checkout@v4
-
-      - name: Create Release
-        id: create_release
-        uses: softprops/action-gh-release@v2.0.8
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} # This token is provided by Actions, you do not need to create your own token
-        with:
-          tag_name: ${{ env.REL_VERSION }}
-          name: ${{ env.REL_VERSION }}
-          draft: false
-          prerelease: ${{ env.IS_PRERELEASE }}
-          generate_release_notes: true

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

@@ -1,532 +0,0 @@
-name: Branch Build Enterprise
-
-on:
-  workflow_dispatch:
-    inputs:
-      build_type:
-        description: "Type of build to run"
-        required: true
-        type: choice
-        default: "Build"
-        options:
-          - "Build"
-          - "Release"
-      releaseVersion:
-        description: "Release Version"
-        type: string
-        default: v0.0.0
-      isPrerelease:
-        description: "Is Pre-release"
-        type: boolean
-        default: false
-        required: true
-      arm64:
-        description: "Build for ARM64 architecture"
-        required: false
-        default: false
-        type: boolean
-  push:
-    branches:
-      - master
-
-env:
-  TARGET_BRANCH: ${{ github.ref_name }}
-  ARM64_BUILD: ${{ github.event.inputs.arm64 }}
-  BUILD_TYPE: ${{ github.event.inputs.build_type }}
-  RELEASE_VERSION: ${{ github.event.inputs.releaseVersion }}
-  IS_PRERELEASE: ${{ github.event.inputs.isPrerelease }}
-
-jobs:
-  branch_build_setup:
-    name: Build Setup
-    runs-on: ubuntu-20.04
-    outputs:
-      gh_branch_name: ${{ steps.set_env_variables.outputs.TARGET_BRANCH }}
-      gh_buildx_driver: ${{ steps.set_env_variables.outputs.BUILDX_DRIVER }}
-      gh_buildx_version: ${{ steps.set_env_variables.outputs.BUILDX_VERSION }}
-      gh_buildx_platforms: ${{ steps.set_env_variables.outputs.BUILDX_PLATFORMS }}
-      gh_buildx_endpoint: ${{ steps.set_env_variables.outputs.BUILDX_ENDPOINT }}
-      build_web: ${{ steps.changed_files.outputs.web_any_changed }}
-      build_admin: ${{ steps.changed_files.outputs.admin_any_changed }}
-      build_space: ${{ steps.changed_files.outputs.space_any_changed }}
-      build_live: ${{ steps.changed_files.outputs.live_any_changed }}
-      build_apiserver: ${{ steps.changed_files.outputs.apiserver_any_changed }}
-      build_proxy: ${{ steps.changed_files.outputs.proxy_any_changed }}
-      build_monitor: ${{ steps.changed_files.outputs.monitor_any_changed }}
-      build_silo: ${{ steps.changed_files.outputs.silo_any_changed }}
-      artifact_upload_to_s3: ${{ steps.set_env_variables.outputs.artifact_upload_to_s3 }}
-      artifact_s3_suffix: ${{ steps.set_env_variables.outputs.artifact_s3_suffix }}
-
-      dh_img_web: ${{ steps.set_env_variables.outputs.DH_IMG_WEB }}
-      dh_img_space: ${{ steps.set_env_variables.outputs.DH_IMG_SPACE }}
-      dh_img_admin: ${{ steps.set_env_variables.outputs.DH_IMG_ADMIN }}
-      dh_img_live: ${{ steps.set_env_variables.outputs.DH_IMG_LIVE }}
-      dh_img_backend: ${{ steps.set_env_variables.outputs.DH_IMG_BACKEND }}
-      dh_img_proxy: ${{ steps.set_env_variables.outputs.DH_IMG_PROXY }}
-      dh_img_monitor: ${{ steps.set_env_variables.outputs.DH_IMG_MONITOR }}
-      dh_img_silo: ${{ steps.set_env_variables.outputs.DH_IMG_SILO }}
-      harbor_push: ${{ steps.set_env_variables.outputs.HARBOR_PUSH }}
-      build_type: ${{steps.set_env_variables.outputs.BUILD_TYPE}}
-      build_release: ${{ steps.set_env_variables.outputs.BUILD_RELEASE }}
-      build_prerelease: ${{ steps.set_env_variables.outputs.BUILD_PRERELEASE }}
-      release_version: ${{ steps.set_env_variables.outputs.RELEASE_VERSION }}
-
-    steps:
-      - id: set_env_variables
-        name: Set Environment Variables
-        run: |
-          if [ "${{ env.ARM64_BUILD }}" == "true" ] || ([ "${{ env.BUILD_TYPE }}" == "Release" ] && [ "${{ env.IS_PRERELEASE }}" != "true" ]); 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
-          BR_NAME=$( echo "${{ env.TARGET_BRANCH }}" |sed 's/[^a-zA-Z0-9.-]//g')
-          echo "TARGET_BRANCH=$BR_NAME" >> $GITHUB_OUTPUT
-
-          echo "DH_IMG_WEB=web-enterprise" >> $GITHUB_OUTPUT
-          echo "DH_IMG_SPACE=space-enterprise" >> $GITHUB_OUTPUT
-          echo "DH_IMG_ADMIN=admin-enterprise" >> $GITHUB_OUTPUT
-          echo "DH_IMG_LIVE=live-enterprise" >> $GITHUB_OUTPUT
-          echo "DH_IMG_BACKEND=backend-enterprise" >> $GITHUB_OUTPUT
-          echo "DH_IMG_PROXY=proxy-enterprise" >> $GITHUB_OUTPUT
-          echo "DH_IMG_MONITOR=monitor-enterprise" >> $GITHUB_OUTPUT
-          echo "DH_IMG_SILO=silo-enterprise" >> $GITHUB_OUTPUT
-
-          echo "BUILD_TYPE=${{env.BUILD_TYPE}}" >> $GITHUB_OUTPUT
-          BUILD_RELEASE=false
-          BUILD_PRERELEASE=false
-          RELVERSION="latest"
-          HARBOR_PUSH=false
-
-          if [ "${{ env.BUILD_TYPE }}" == "Release" ]; then
-            FLAT_RELEASE_VERSION=$(echo "${{ env.RELEASE_VERSION }}" | sed 's/[^a-zA-Z0-9.-]//g')
-            echo "FLAT_RELEASE_VERSION=${FLAT_RELEASE_VERSION}" >> $GITHUB_OUTPUT
-            HARBOR_PUSH=true
-
-            semver_regex="^v([0-9]+)\.([0-9]+)\.([0-9]+)(-[a-zA-Z0-9]+(-[a-zA-Z0-9]+)*)?$"
-            if [[ ! $FLAT_RELEASE_VERSION =~ $semver_regex ]]; then
-              echo "Invalid Release Version Format : $FLAT_RELEASE_VERSION"
-              echo "Please provide a valid SemVer version"
-              echo "e.g. v1.2.3 or v1.2.3-alpha-1"
-              echo "Exiting the build process"
-              exit 1  # Exit with status 1 to fail the step
-            fi
-            BUILD_RELEASE=true
-            RELVERSION=$FLAT_RELEASE_VERSION
-
-            if [ "${{ env.IS_PRERELEASE }}" == "true" ]; then
-              BUILD_PRERELEASE=true
-            fi
-          fi
-          echo "BUILD_RELEASE=${BUILD_RELEASE}" >> $GITHUB_OUTPUT
-          echo "BUILD_PRERELEASE=${BUILD_PRERELEASE}" >> $GITHUB_OUTPUT
-          echo "RELEASE_VERSION=${RELVERSION}" >> $GITHUB_OUTPUT
-          echo "HARBOR_PUSH=${HARBOR_PUSH}" >> $GITHUB_OUTPUT
-
-          if [ "${{ env.BUILD_TYPE }}" == "Release" ]; then
-            echo "artifact_upload_to_s3=true" >> $GITHUB_OUTPUT
-            echo "artifact_s3_suffix=${{ env.RELEASE_VERSION }}" >> $GITHUB_OUTPUT
-          elif [ "${{ env.TARGET_BRANCH }}" == "master" ]; then
-            echo "artifact_upload_to_s3=true" >> $GITHUB_OUTPUT
-            echo "artifact_s3_suffix=latest" >> $GITHUB_OUTPUT
-          elif [ "${{ env.TARGET_BRANCH }}" == "preview" ] || [ "${{ env.TARGET_BRANCH }}" == "develop" ] || [ "${{ env.TARGET_BRANCH }}" == "uat" ]; then
-            echo "artifact_upload_to_s3=true" >> $GITHUB_OUTPUT
-            echo "artifact_s3_suffix=${{ env.TARGET_BRANCH }}" >> $GITHUB_OUTPUT
-          else
-            echo "artifact_upload_to_s3=false" >> $GITHUB_OUTPUT
-            echo "artifact_s3_suffix=$BR_NAME" >> $GITHUB_OUTPUT
-          fi
-
-      - id: checkout_files
-        name: Checkout Files
-        uses: actions/checkout@v4
-
-      - name: Get changed files
-        id: changed_files
-        uses: tj-actions/changed-files@v42
-        with:
-          files_yaml: |
-            apiserver:
-              - apiserver/**
-            proxy:
-              - nginx/**
-            admin:
-              - admin/**
-              - packages/**
-              - "package.json"
-              - "yarn.lock"
-              - "tsconfig.json"
-              - "turbo.json"
-            space:
-              - space/**
-              - packages/**
-              - "package.json"
-              - "yarn.lock"
-              - "tsconfig.json"
-              - "turbo.json"
-            web:
-              - web/**
-              - packages/**
-              - "package.json"
-              - "yarn.lock"
-              - "tsconfig.json"
-              - "turbo.json"
-            silo:
-              - silo/**
-              - packages/**
-              - 'package.json'
-              - 'yarn.lock'
-              - 'tsconfig.json'
-              - 'turbo.json'
-            live:
-              - live/**
-              - packages/**
-              - 'package.json'
-              - 'yarn.lock'
-              - 'tsconfig.json'
-              - 'turbo.json'
-            monitor:
-              - monitor/**
-
-  branch_build_push_admin:
-    if: ${{ needs.branch_build_setup.outputs.build_admin == 'true' || github.event_name == 'workflow_dispatch' || needs.branch_build_setup.outputs.gh_branch_name == 'master' }}
-    name: Build-Push Admin Docker Image
-    runs-on: ubuntu-20.04
-    needs: [branch_build_setup]
-    steps:
-      - id: checkout_files
-        name: Checkout Files
-        uses: actions/checkout@v4
-      - name: Admin Build and Push
-        uses: ./.github/actions/build-push-ee
-        with:
-          build-release: ${{ needs.branch_build_setup.outputs.build_release }}
-          build-prerelease: ${{ needs.branch_build_setup.outputs.build_prerelease }}
-          release-version: ${{ needs.branch_build_setup.outputs.release_version }}
-          docker-username: ${{ secrets.DOCKERHUB_USERNAME }}
-          dockerhub-token: ${{ secrets.DOCKERHUB_TOKEN }}
-          harbor-push: ${{ needs.branch_build_setup.outputs.harbor_push }}
-          harbor-username: ${{ secrets.HARBOR_USERNAME }}
-          harbor-token: ${{ secrets.HARBOR_TOKEN }}
-          harbor-registry: ${{ vars.HARBOR_REGISTRY }}
-          harbor-project: ${{ vars.HARBOR_PROJECT }}
-          docker-image-owner: makeplane
-          docker-image-name: ${{ needs.branch_build_setup.outputs.dh_img_admin }}
-          build-context: .
-          dockerfile-path: ./admin/Dockerfile.admin
-          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 }}
-
-  branch_build_push_web:
-    if: ${{ needs.branch_build_setup.outputs.build_web == 'true' || github.event_name == 'workflow_dispatch' || needs.branch_build_setup.outputs.gh_branch_name == 'master' }}
-    name: Build-Push Web Docker Image
-    runs-on: ubuntu-20.04
-    needs: [branch_build_setup]
-    steps:
-      - id: checkout_files
-        name: Checkout Files
-        uses: actions/checkout@v4
-      - name: Web Build and Push
-        uses: ./.github/actions/build-push-ee
-        with:
-          build-release: ${{ needs.branch_build_setup.outputs.build_release }}
-          build-prerelease: ${{ needs.branch_build_setup.outputs.build_prerelease }}
-          release-version: ${{ needs.branch_build_setup.outputs.release_version }}
-          docker-username: ${{ secrets.DOCKERHUB_USERNAME }}
-          dockerhub-token: ${{ secrets.DOCKERHUB_TOKEN }}
-          harbor-push: ${{ needs.branch_build_setup.outputs.harbor_push }}
-          harbor-username: ${{ secrets.HARBOR_USERNAME }}
-          harbor-token: ${{ secrets.HARBOR_TOKEN }}
-          harbor-registry: ${{ vars.HARBOR_REGISTRY }}
-          harbor-project: ${{ vars.HARBOR_PROJECT }}
-          docker-image-owner: makeplane
-          docker-image-name: ${{ needs.branch_build_setup.outputs.dh_img_web }}
-          build-context: .
-          dockerfile-path: ./web/Dockerfile.web
-          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 }}
-
-  branch_build_push_space:
-    if: ${{ needs.branch_build_setup.outputs.build_space == 'true' || github.event_name == 'workflow_dispatch' || needs.branch_build_setup.outputs.gh_branch_name == 'master' }}
-    name: Build-Push Space Docker Image
-    runs-on: ubuntu-20.04
-    needs: [branch_build_setup]
-    steps:
-      - id: checkout_files
-        name: Checkout Files
-        uses: actions/checkout@v4
-      - name: Space Build and Push
-        uses: ./.github/actions/build-push-ee
-        with:
-          build-release: ${{ needs.branch_build_setup.outputs.build_release }}
-          build-prerelease: ${{ needs.branch_build_setup.outputs.build_prerelease }}
-          release-version: ${{ needs.branch_build_setup.outputs.release_version }}
-          docker-username: ${{ secrets.DOCKERHUB_USERNAME }}
-          dockerhub-token: ${{ secrets.DOCKERHUB_TOKEN }}
-          harbor-push: ${{ needs.branch_build_setup.outputs.harbor_push }}
-          harbor-username: ${{ secrets.HARBOR_USERNAME }}
-          harbor-token: ${{ secrets.HARBOR_TOKEN }}
-          harbor-registry: ${{ vars.HARBOR_REGISTRY }}
-          harbor-project: ${{ vars.HARBOR_PROJECT }}
-          docker-image-owner: makeplane
-          docker-image-name: ${{ needs.branch_build_setup.outputs.dh_img_space }}
-          build-context: .
-          dockerfile-path: ./space/Dockerfile.space
-          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 }}
-
-  branch_build_push_live:
-    if: ${{ needs.branch_build_setup.outputs.build_live == 'true' || github.event_name == 'workflow_dispatch' || needs.branch_build_setup.outputs.gh_branch_name == 'master' }}
-    name: Build-Push Live Collaboration Docker Image
-    runs-on: ubuntu-20.04
-    needs: [branch_build_setup]
-    steps:
-      - id: checkout_files
-        name: Checkout Files
-        uses: actions/checkout@v4
-      - name: Live Build and Push
-        uses: ./.github/actions/build-push-ee
-        with:
-          build-release: ${{ needs.branch_build_setup.outputs.build_release }}
-          build-prerelease: ${{ needs.branch_build_setup.outputs.build_prerelease }}
-          release-version: ${{ needs.branch_build_setup.outputs.release_version }}
-          docker-username: ${{ secrets.DOCKERHUB_USERNAME }}
-          dockerhub-token: ${{ secrets.DOCKERHUB_TOKEN }}
-          harbor-push: ${{ needs.branch_build_setup.outputs.harbor_push }}
-          harbor-username: ${{ secrets.HARBOR_USERNAME }}
-          harbor-token: ${{ secrets.HARBOR_TOKEN }}
-          harbor-registry: ${{ vars.HARBOR_REGISTRY }}
-          harbor-project: ${{ vars.HARBOR_PROJECT }}
-          docker-image-owner: makeplane
-          docker-image-name: ${{ needs.branch_build_setup.outputs.dh_img_live }}
-          build-context: .
-          dockerfile-path: ./live/Dockerfile.live
-          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 }}
-
-  branch_build_push_silo:
-    if: ${{ needs.branch_build_setup.outputs.build_silo == 'true' || github.event_name == 'workflow_dispatch' || needs.branch_build_setup.outputs.gh_branch_name == 'master' }}
-    name: Build-Push Silo Docker Image
-    runs-on: ubuntu-20.04
-    needs: [branch_build_setup]
-    steps:
-      - id: checkout_files
-        name: Checkout Files
-        uses: actions/checkout@v4
-      - name: Silo Build and Push
-        uses: ./.github/actions/build-push-ee
-        with:
-          build-release: ${{ needs.branch_build_setup.outputs.build_release }}
-          build-prerelease: ${{ needs.branch_build_setup.outputs.build_prerelease }}
-          release-version: ${{ needs.branch_build_setup.outputs.release_version }}
-          docker-username: ${{ secrets.DOCKERHUB_USERNAME }}
-          dockerhub-token: ${{ secrets.DOCKERHUB_TOKEN }}
-          harbor-push: ${{ needs.branch_build_setup.outputs.harbor_push }}
-          harbor-username: ${{ secrets.HARBOR_USERNAME }}
-          harbor-token: ${{ secrets.HARBOR_TOKEN }}
-          harbor-registry: ${{ vars.HARBOR_REGISTRY }}
-          harbor-project: ${{ vars.HARBOR_PROJECT }}
-          docker-image-owner: makeplane
-          docker-image-name: ${{ needs.branch_build_setup.outputs.dh_img_silo }}
-          build-context: .
-          dockerfile-path: ./silo/Dockerfile.silo
-          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 }}
-
-  branch_build_push_apiserver:
-    if: ${{ needs.branch_build_setup.outputs.build_apiserver == 'true' || github.event_name == 'workflow_dispatch' || needs.branch_build_setup.outputs.gh_branch_name == 'master' }}
-    name: Build-Push API Server Docker Image
-    runs-on: ubuntu-20.04
-    needs: [branch_build_setup]
-    steps:
-      - id: checkout_files
-        name: Checkout Files
-        uses: actions/checkout@v4
-      - name: Backend Build and Push
-        uses: ./.github/actions/build-push-ee
-        with:
-          build-release: ${{ needs.branch_build_setup.outputs.build_release }}
-          build-prerelease: ${{ needs.branch_build_setup.outputs.build_prerelease }}
-          release-version: ${{ needs.branch_build_setup.outputs.release_version }}
-          docker-username: ${{ secrets.DOCKERHUB_USERNAME }}
-          dockerhub-token: ${{ secrets.DOCKERHUB_TOKEN }}
-          harbor-push: ${{ needs.branch_build_setup.outputs.harbor_push }}
-          harbor-username: ${{ secrets.HARBOR_USERNAME }}
-          harbor-token: ${{ secrets.HARBOR_TOKEN }}
-          harbor-registry: ${{ vars.HARBOR_REGISTRY }}
-          harbor-project: ${{ vars.HARBOR_PROJECT }}
-          docker-image-owner: makeplane
-          docker-image-name: ${{ needs.branch_build_setup.outputs.dh_img_backend }}
-          build-context: ./apiserver
-          dockerfile-path: ./apiserver/Dockerfile.api
-          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 }}
-
-  branch_build_push_proxy:
-    if: ${{ needs.branch_build_setup.outputs.build_proxy == 'true' || github.event_name == 'workflow_dispatch' || needs.branch_build_setup.outputs.gh_branch_name == 'master' }}
-    name: Build-Push Proxy Docker Image
-    runs-on: ubuntu-20.04
-    needs: [branch_build_setup]
-    steps:
-      - id: checkout_files
-        name: Checkout Files
-        uses: actions/checkout@v4
-      - name: Proxy Build and Push
-        uses: ./.github/actions/build-push-ee
-        with:
-          build-release: ${{ needs.branch_build_setup.outputs.build_release }}
-          build-prerelease: ${{ needs.branch_build_setup.outputs.build_prerelease }}
-          release-version: ${{ needs.branch_build_setup.outputs.release_version }}
-          docker-username: ${{ secrets.DOCKERHUB_USERNAME }}
-          dockerhub-token: ${{ secrets.DOCKERHUB_TOKEN }}
-          harbor-push: ${{ needs.branch_build_setup.outputs.harbor_push }}
-          harbor-username: ${{ secrets.HARBOR_USERNAME }}
-          harbor-token: ${{ secrets.HARBOR_TOKEN }}
-          harbor-registry: ${{ vars.HARBOR_REGISTRY }}
-          harbor-project: ${{ vars.HARBOR_PROJECT }}
-          docker-image-owner: makeplane
-          docker-image-name: ${{ needs.branch_build_setup.outputs.dh_img_proxy }}
-          build-context: ./nginx
-          dockerfile-path: ./nginx/Dockerfile
-          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 }}
-
-  branch_build_push_monitor:
-    if: ${{ needs.branch_build_setup.outputs.build_monitor == 'true' || github.event_name == 'workflow_dispatch' || needs.branch_build_setup.outputs.gh_branch_name == 'master' }}
-    name: Build-Push Monitor Docker Image
-    runs-on: ubuntu-20.04
-    needs: [branch_build_setup]
-    steps:
-      - id: checkout_files
-        name: Checkout Files
-        uses: actions/checkout@v4
-      - name: Generate Keypair
-        run: |
-          if [ "${{ env.TARGET_BRANCH }}" == "master" ] || [ "${{ env.BUILD_TYPE }}" == "Release" ]; then 
-            openssl genrsa -out private_key.pem 2048
-          else
-            echo "${{ secrets.DEFAULT_PRIME_PRIVATE_KEY }}" > private_key.pem
-          fi
-          openssl rsa -in private_key.pem -pubout -out public_key.pem
-          cat public_key.pem
-
-          # Generating the private key env for the generated keys
-          PRIVATE_KEY=$(cat private_key.pem | base64 -w 0)
-          echo "PRIVATE_KEY=${PRIVATE_KEY}" >> $GITHUB_ENV
-
-      - name: Monitor Build and Push
-        uses: ./.github/actions/build-push-ee
-        with:
-          build-release: ${{ needs.branch_build_setup.outputs.build_release }}
-          build-prerelease: ${{ needs.branch_build_setup.outputs.build_prerelease }}
-          release-version: ${{ needs.branch_build_setup.outputs.release_version }}
-          docker-username: ${{ secrets.DOCKERHUB_USERNAME }}
-          dockerhub-token: ${{ secrets.DOCKERHUB_TOKEN }}
-          harbor-push: ${{ needs.branch_build_setup.outputs.harbor_push }}
-          harbor-username: ${{ secrets.HARBOR_USERNAME }}
-          harbor-token: ${{ secrets.HARBOR_TOKEN }}
-          harbor-registry: ${{ vars.HARBOR_REGISTRY }}
-          harbor-project: ${{ vars.HARBOR_PROJECT }}
-          docker-image-owner: makeplane
-          docker-image-name: ${{ needs.branch_build_setup.outputs.dh_img_monitor }}
-          build-context: ./monitor
-          dockerfile-path: ./monitor/Dockerfile
-          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 }}
-          build-args: |
-            PRIVATE_KEY=${{ env.PRIVATE_KEY }}
-
-  upload_artifacts_s3:
-    if: ${{ needs.branch_build_setup.outputs.artifact_upload_to_s3 == 'true' }}
-    name: Upload artifacts to S3 Bucket
-    runs-on: ubuntu-20.04
-    needs: [branch_build_setup]
-    container:
-      image: docker:20.10.7
-      credentials:
-        username: ${{ secrets.DOCKERHUB_USERNAME }}
-        password: ${{ secrets.DOCKERHUB_TOKEN }}
-    env:
-      ARTIFACT_SUFFIX: ${{ needs.branch_build_setup.outputs.artifact_s3_suffix }}
-      AWS_ACCESS_KEY_ID: ${{ secrets.SELF_HOST_BUCKET_ACCESS_KEY }}
-      AWS_SECRET_ACCESS_KEY: ${{ secrets.SELF_HOST_BUCKET_SECRET_KEY }}
-    steps:
-      - id: checkout_files
-        name: Checkout Files
-        uses: actions/checkout@v4
-
-      - name: Upload artifacts
-        run: |
-          apk update
-          apk add --no-cache aws-cli
-
-          mkdir -p ~/${{ env.ARTIFACT_SUFFIX }}
-
-          cp deploy/cli-install/variables.env ~/${{ env.ARTIFACT_SUFFIX }}/variables.env
-          cp deploy/cli-install/Caddyfile ~/${{ env.ARTIFACT_SUFFIX }}/Caddyfile
-          sed -e 's@${APP_RELEASE_VERSION}@'${{ env.ARTIFACT_SUFFIX }}'@' deploy/cli-install/docker-compose.yml > ~/${{ env.ARTIFACT_SUFFIX }}/docker-compose.yml
-          sed -e 's@${APP_RELEASE_VERSION}@'${{ env.ARTIFACT_SUFFIX }}'@' deploy/cli-install/docker-compose-caddy.yml > ~/${{ env.ARTIFACT_SUFFIX }}/docker-compose-caddy.yml
-
-          aws s3 cp ~/${{ env.ARTIFACT_SUFFIX }} s3://${{ vars.SELF_HOST_BUCKET_NAME }}/plane-enterprise/${{ env.ARTIFACT_SUFFIX }} --recursive
-
-  publish_release:
-    if: ${{ needs.branch_build_setup.outputs.build_type == 'Release' }}
-    name: Build Release
-    runs-on: ubuntu-20.04
-    needs:
-      [
-        branch_build_setup,
-        branch_build_push_admin,
-        branch_build_push_web,
-        branch_build_push_space,
-        branch_build_push_live,
-        branch_build_push_apiserver,
-        branch_build_push_proxy,
-        branch_build_push_monitor,
-        branch_build_push_silo,
-        upload_artifacts_s3,
-      ]
-    env:
-      REL_VERSION: ${{ needs.branch_build_setup.outputs.release_version }}
-    steps:
-      - name: Checkout
-        uses: actions/checkout@v4
-
-      - name: Create Release
-        id: create_release
-        uses: softprops/action-gh-release@v2.0.8
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} # This token is provided by Actions, you do not need to create your own token
-        with:
-          tag_name: ${{ env.REL_VERSION }}
-          name: ${{ env.REL_VERSION }}
-          draft: false
-          prerelease: ${{ env.IS_PRERELEASE }}
-          generate_release_notes: true
-          files: |
-            ${{ github.workspace }}/deploy/cli-install/variables.env
-            ${{ github.workspace }}/deploy/cli-install/Caddyfile
-            ${{ github.workspace }}/deploy/cli-install/docker-compose.yml
-            ${{ github.workspace }}/deploy/cli-install/docker-compose-caddy.yml

.github/workflows/build-branch.yml

@@ -25,9 +25,6 @@ on:
         required: false
         default: false
         type: boolean
-  # push:
-  #   branches:
-  #     - master
 
 env:
   TARGET_BRANCH: ${{ github.ref_name }}
@@ -317,8 +314,8 @@ jobs:
           buildx-endpoint: ${{ needs.branch_build_setup.outputs.gh_buildx_endpoint }}
 
   attach_assets_to_build:
-    if: ${{ needs.branch_build_setup.outputs.build_type == 'Build' }}
-    name: Attach Assets to Build
+    if: ${{ needs.branch_build_setup.outputs.build_type == 'Release' }}
+    name: Attach Assets to Release
     runs-on: ubuntu-20.04
     needs: [branch_build_setup]
     steps:
@@ -354,6 +351,7 @@ jobs:
         branch_build_push_live,
         branch_build_push_apiserver,
         branch_build_push_proxy,
+        attach_assets_to_build,
       ]
     env:
       REL_VERSION: ${{ needs.branch_build_setup.outputs.release_version }}
@@ -367,7 +365,7 @@ jobs:
 
       - name: Create Release
         id: create_release
-        uses: softprops/action-gh-release@v2.0.8
+        uses: softprops/action-gh-release@v2.1.0
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} # This token is provided by Actions, you do not need to create your own token
         with:

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

@@ -1,162 +0,0 @@
-name: Build and Lint on Pull Request EE
-
-on:
-  workflow_dispatch:
-  issue_comment:
-    types: [created]
-
-jobs:
-  get-changed-files:
-    if: github.event.issue.pull_request != '' && github.event.comment.body == 'build-test-pr'
-    runs-on: ubuntu-latest
-    outputs:
-      apiserver_changed: ${{ steps.changed-files.outputs.apiserver_any_changed }}
-      admin_changed: ${{ steps.changed-files.outputs.admin_any_changed }}
-      space_changed: ${{ steps.changed-files.outputs.space_any_changed }}
-      web_changed: ${{ steps.changed-files.outputs.web_any_changed }}
-      monitor_changed: ${{ steps.changed-files.outputs.monitor_any_changed }}
-    steps:
-      - uses: actions/checkout@v4
-      - name: Get changed files
-        id: changed-files
-        uses: tj-actions/changed-files@v44
-        with:
-          files_yaml: |
-            apiserver:
-              - apiserver/**
-            admin:
-              - admin/**
-              - packages/**
-              - 'package.json'
-              - 'yarn.lock'
-              - 'tsconfig.json'
-              - 'turbo.json'
-            space:
-              - space/**
-              - packages/**
-              - 'package.json'
-              - 'yarn.lock'
-              - 'tsconfig.json'
-              - 'turbo.json'
-            web:
-              - web/**
-              - packages/**
-              - 'package.json'
-              - 'yarn.lock'
-              - 'tsconfig.json'
-              - 'turbo.json'
-            monitor:
-              - monitor/**
-
-  lint-apiserver:
-    needs: get-changed-files
-    runs-on: ubuntu-latest
-    if: needs.get-changed-files.outputs.apiserver_changed == 'true'
-    steps:
-      - uses: actions/checkout@v4
-      - name: Set up Python
-        uses: actions/setup-python@v5
-        with:
-          python-version: "3.x" # Specify the Python version you need
-      - name: Install Pylint
-        run: python -m pip install ruff
-      - name: Install Apiserver Dependencies
-        run: cd apiserver && pip install -r requirements.txt
-      - name: Lint apiserver
-        run: ruff check --fix apiserver
-
-  lint-admin:
-    needs: get-changed-files
-    if: needs.get-changed-files.outputs.admin_changed == 'true'
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v4
-      - name: Setup Node.js
-        uses: actions/setup-node@v4
-        with:
-          node-version: 18.x
-      - run: yarn install
-      - run: yarn lint --filter=admin
-
-  lint-space:
-    needs: get-changed-files
-    if: needs.get-changed-files.outputs.space_changed == 'true'
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v4
-      - name: Setup Node.js
-        uses: actions/setup-node@v4
-        with:
-          node-version: 18.x
-      - run: yarn install
-      - run: yarn lint --filter=space
-
-  lint-web:
-    needs: get-changed-files
-    if: needs.get-changed-files.outputs.web_changed == 'true'
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v4
-      - name: Setup Node.js
-        uses: actions/setup-node@v4
-        with:
-          node-version: 18.x
-      - run: yarn install
-      - run: yarn lint --filter=web
-
-  test-monitor:
-    needs: get-changed-files
-    if: needs.get-changed-files.outputs.monitor_changed == 'true'
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v4
-      - uses: actions/setup-go@v5
-        with:
-          go-version: "1.22.2"
-      - run: cd ./monitor && make test
-
-  build-admin:
-    needs: lint-admin
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v4
-      - name: Setup Node.js
-        uses: actions/setup-node@v4
-        with:
-          node-version: 18.x
-      - run: yarn install
-      - run: yarn build --filter=admin
-
-  build-space:
-    needs: lint-space
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v4
-      - name: Setup Node.js
-        uses: actions/setup-node@v4
-        with:
-          node-version: 18.x
-      - run: yarn install
-      - run: yarn build --filter=space
-
-  build-web:
-    needs: lint-web
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v4
-      - name: Setup Node.js
-        uses: actions/setup-node@v4
-        with:
-          node-version: 18.x
-      - run: yarn install
-      - run: yarn build --filter=web
-
-  build-monitor:
-    needs: test-monitor
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v4
-      - uses: actions/setup-go@v5
-        with:
-          go-version: "1.22.2"
-      - run: cd ./monitor && make build

.github/workflows/codeql.yml

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

.github/workflows/create-release.yml

@@ -1,70 +0,0 @@
-name: Manual Release Workflow
-
-on:
-  workflow_dispatch:
-    inputs:
-      release_tag:
-        description: 'Release Tag (e.g., v0.16-cannary-1)'
-        required: true
-      prerelease:
-        description: 'Pre-Release'
-        required: true
-        default: true
-        type: boolean
-      draft:
-        description: 'Draft'
-        required: true
-        default: true
-        type: boolean
-
-permissions:
-  contents: write
-
-jobs:
-  create-release:
-    runs-on: ubuntu-latest
-    steps:
-      - name: Checkout code
-        uses: actions/checkout@v2
-        with:
-          fetch-depth: 0  # Necessary to fetch all history for tags
-
-      - name: Set up Git
-        run: |
-          git config user.name "github-actions"
-          git config user.email "github-actions@github.com"
-
-      - name: Check for the Prerelease
-        run: |
-            echo ${{ github.event.release.prerelease }}
-
-      - name: Generate Release Notes
-        id: generate_notes
-        run: |
-          bash ./generate_release_notes.sh
-          # Directly use the content of RELEASE_NOTES.md for the release body
-          RELEASE_NOTES=$(cat RELEASE_NOTES.md)
-          echo "RELEASE_NOTES<<EOF" >> $GITHUB_ENV
-          echo "$RELEASE_NOTES" >> $GITHUB_ENV
-          echo "EOF" >> $GITHUB_ENV
-
-      - name: Create Tag
-        run: |
-          git tag ${{ github.event.inputs.release_tag }}
-          git push origin ${{ github.event.inputs.release_tag }}
-
-      - name: Create GitHub Release
-        uses: softprops/action-gh-release@v1
-        with:
-          tag_name: ${{ github.event.inputs.release_tag }}
-          body_path: RELEASE_NOTES.md
-          draft: ${{ github.event.inputs.draft }}
-          prerelease: ${{ github.event.inputs.prerelease }}
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-
-
-
-
-
-

.github/workflows/feature-deployment.yml

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

.github/workflows/sync-community.yml

@@ -1,55 +0,0 @@
-name: Sync from Community Repo
-
-on:
-  #   schedule:
-  #     - cron: "*/30 * * * *" # Runs every 30 minutes
-  workflow_dispatch:
-    inputs:
-      source_branch:
-        description: "Source branch in Community repo"
-        required: true
-        default: "preview"
-      target_branch:
-        description: "Target branch in Enterprise repo"
-        required: true
-        default: "preview"
-
-jobs:
-  sync-from-community-repo:
-    runs-on: ubuntu-latest
-    steps:
-      - name: Checkout enterprise repository
-        uses: actions/checkout@v2
-        with:
-          fetch-depth: 0
-
-      - name: Set branch names
-        run: |
-          echo "SOURCE_BRANCH=${{ github.event.inputs.source_branch || 'preview' }}" >> $GITHUB_ENV
-          echo "TARGET_BRANCH=${{ github.event.inputs.target_branch || 'preview' }}" >> $GITHUB_ENV
-          echo "SYNC_BRANCH=sync-${{ github.run_id }}" >> $GITHUB_ENV
-
-      - name: Create sync branch
-        run: git checkout -b ${{ env.SYNC_BRANCH }}
-
-      - name: Fetch from community repository
-        run: |
-          git config user.name github-actions
-          git config user.email github-actions@github.com
-          git remote add community https://github.com/makeplane/plane.git
-          git reset --hard community/${{ env.SOURCE_BRANCH }}
-
-      - name: Create Pull Request
-        env:
-          GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-        run: |
-          PR_TITLE="Sync changes from community repo"
-          EXISTING_PR=$(gh pr list --base ${{ env.TARGET_BRANCH }} --head ${{ env.SYNC_BRANCH }} --json number --jq '.[0].number')
-          if [ -z "$EXISTING_PR" ]; then
-            pr_url=$(gh pr create --base ${{ env.TARGET_BRANCH }} --head ${{ env.SYNC_BRANCH }} --title "$PR_TITLE" --body "This PR syncs changes from the community repository's ${{ env.SOURCE_BRANCH }} branch.")
-            echo "New Pull Request created: $pr_url"
-          else
-            echo "Pull Request already exists with number: $EXISTING_PR"
-            gh pr edit $EXISTING_PR --title "$PR_TITLE" --body "This PR syncs changes from the community repository's ${{ env.SOURCE_BRANCH }} branch. (Updated)"
-            echo "Existing Pull Request updated"
-          fi

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

@@ -5,7 +5,6 @@ on:
   push:
     branches:
       - "sync/**"
-      - "mobile-sync/**"
 
 env:
   CURRENT_BRANCH: ${{ github.ref_name }}
@@ -22,7 +21,7 @@ jobs:
       contents: write
     steps:
       - name: Checkout code
-        uses: actions/checkout@v4.1.1
+        uses: actions/checkout@v4
         with:
           fetch-depth: 0 # Fetch all history for all branches and tags
 
@@ -42,22 +41,12 @@ jobs:
 
       - name: Create PR to Target Branch
         run: |
-          # Determine target branch based on current branch prefix
-          if [[ "$CURRENT_BRANCH" == "${{vars.SYNC_TARGET_MOBILE_BRANCH_NAME}}" ]]; then
-            TARGET_BRANCH="mobile"
-            PR_TITLE="${{vars.SYNC_MOBILE_PR_TITLE}}"
-          else
-            TARGET_BRANCH="preview"
-            PR_TITLE="${{vars.SYNC_PR_TITLE}}"
-          fi
-
-
           # get all pull requests and check if there is already a PR
           PR_EXISTS=$(gh pr list --base $TARGET_BRANCH --head $CURRENT_BRANCH --state open --json number | jq '.[] | .number')
           if [ -n "$PR_EXISTS" ]; then
             echo "Pull Request already exists: $PR_EXISTS"
           else
             echo "Creating new pull request"
-            PR_URL=$(gh pr create --base $TARGET_BRANCH --head $CURRENT_BRANCH --title "$PR_TITLE" --body "")
+            PR_URL=$(gh pr create --base $TARGET_BRANCH --head $CURRENT_BRANCH --title "${{ vars.SYNC_PR_TITLE }}" --body "")
             echo "Pull Request created: $PR_URL"
           fi

.github/workflows/sync-repo.yml

@@ -5,7 +5,6 @@ on:
   push:
     branches:
       - preview
-      - mobile
 
 env:
   SOURCE_BRANCH_NAME: ${{ github.ref_name }}
@@ -18,7 +17,7 @@ jobs:
       contents: read
     steps:
       - name: Checkout Code
-        uses: actions/checkout@v4.1.1
+        uses: actions/checkout@v4
         with:
           persist-credentials: false
           fetch-depth: 0
@@ -37,14 +36,9 @@ jobs:
           GH_TOKEN: ${{ secrets.ACCESS_TOKEN }}
         run: |
           TARGET_REPO="${{ vars.SYNC_TARGET_REPO }}"
+          TARGET_BRANCH="${{ vars.SYNC_TARGET_BRANCH_NAME }}"
           SOURCE_BRANCH="${{ env.SOURCE_BRANCH_NAME }}"
 
-          if [ "$SOURCE_BRANCH" = "mobile" ]; then
-            TARGET_BRANCH="${{ vars.SYNC_TARGET_MOBILE_BRANCH_NAME }}"
-          else
-            TARGET_BRANCH="${{ vars.SYNC_TARGET_BRANCH_NAME }}"
-          fi
-
           git checkout $SOURCE_BRANCH
           git remote add target-origin-a "https://$GH_TOKEN@github.com/$TARGET_REPO.git"
           git push target-origin-a $SOURCE_BRANCH:$TARGET_BRANCH

.gitignore

@@ -82,12 +82,6 @@ tmp/
 dist
 .temp/
 deploy/selfhost/plane-app/
-
 ## Storybook
 *storybook.log
 output.css
-
-# Monitor
-monitor/prime.key
-monitor/prime.key.pub
-monitor.db

ENV_SETUP.md

@@ -27,7 +27,7 @@ FILE_SIZE_LIMIT=5242880
 # GPT settings
 OPENAI_API_BASE="https://api.openai.com/v1" # deprecated
 OPENAI_API_KEY="sk-" # deprecated
-GPT_ENGINE="gpt-4o-mini" # 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

README.md

@@ -5,9 +5,7 @@
   <img src="https://plane-marketing.s3.ap-south-1.amazonaws.com/plane-readme/plane_logo_.webp" alt="Plane Logo" width="70">
 </a>
 </p>
-
-<h3 align="center"><b>Plane</b></h3>
-<p align="center"><b>Open-source project management that unlocks customer value</b></p>
+<h1 align="center"><b>Plane</b></h1>
 
 <p align="center">
 <a href="https://discord.com/invite/A92xrEGCge">
@@ -44,79 +42,85 @@ Meet [Plane](https://dub.sh/plane-website-readme), an open-source project manage
 
 > Plane is evolving every day. Your suggestions, ideas, and reported bugs help us immensely. Do not hesitate to join in the conversation on [Discord](https://discord.com/invite/A92xrEGCge) or raise a GitHub issue. We read everything and respond to most.
 
-## ⚡ Installation
+## 🚀 Installation
 
-The easiest way to get started with Plane is by creating a [Plane Cloud](https://app.plane.so) account.
+Getting started with Plane is simple. Choose the setup that works best for you:
 
-If you would like to self-host Plane, please see our [deployment guide](https://docs.plane.so/docker-compose).
+- **Plane Cloud**   
+Sign up for a free account on [Plane Cloud](https://app.plane.so)—it's the fastest way to get up and running without worrying about infrastructure.
+
+- **Self-host Plane**  
+Prefer full control over your data and infrastructure? Install and run Plane on your own servers. Follow our detailed [deployment guides](https://developers.plane.so/self-hosting/overview) to get started.
 
 | Installation methods | Docs link                                                                                                                                          |
 | -------------------- | ------------------------------------------------------------------------------------------------------------------------------------------------------------ |
-| Docker               | [![Docker](https://img.shields.io/badge/docker-%230db7ed.svg?style=for-the-badge&logo=docker&logoColor=white)](https://docs.plane.so/self-hosting/methods/docker-compose)         |
-| Kubernetes           | [![Kubernetes](https://img.shields.io/badge/kubernetes-%23326ce5.svg?style=for-the-badge&logo=kubernetes&logoColor=white)](https://docs.plane.so/kubernetes) |
+| Docker               | [![Docker](https://img.shields.io/badge/docker-%230db7ed.svg?style=for-the-badge&logo=docker&logoColor=white)](https://developers.plane.so/self-hosting/methods/docker-compose)         |
+| Kubernetes           | [![Kubernetes](https://img.shields.io/badge/kubernetes-%23326ce5.svg?style=for-the-badge&logo=kubernetes&logoColor=white)](https://developers.plane.so/self-hosting/methods/kubernetes) |
 
-`Instance admins` can configure instance settings with [God-mode](https://docs.plane.so/instance-admin).
+`Instance admins` can manage and customize settings using [God mode](https://developers.plane.so/self-hosting/govern/instance-admin).
 
-## 🚀 Features
+## 🌟 Features
 
-- **Issues**: Quickly create issues and add details using a powerful rich text editor that supports file uploads. Add sub-properties and references to problems for better organization and tracking.
+- **Issues**  
+Efficiently create and manage tasks with a robust rich text editor that supports file uploads. Enhance organization and tracking by adding sub-properties and referencing related issues.
 
-- **Cycles**:
-  Keep up your team's momentum with Cycles. Gain insights into your project's progress with burn-down charts and other valuable features.
+- **Cycles**   
+Maintain your team’s momentum with Cycles. Track progress effortlessly using burn-down charts and other insightful tools.
 
-- **Modules**: Break down your large projects into smaller, more manageable modules. Assign modules between teams to track and plan your project's progress easily.
+- **Modules**  
+Simplify complex projects by dividing them into smaller, manageable modules. 
 
-- **Views**: Create custom filters to display only the issues that matter to you. Save and share your filters in just a few clicks.
+- **Views**  
+Customize your workflow by creating filters to display only the most relevant issues. Save and share these views with ease.
 
-- **Pages**: Plane pages, equipped with AI and a rich text editor, let you jot down your thoughts on the fly. Format your text, upload images, hyperlink, or sync your existing ideas into an actionable item or issue.
+- **Pages**  
+Capture and organize ideas using Plane Pages, complete with AI capabilities and a rich text editor. Format text, insert images, add hyperlinks, or convert your notes into actionable items.
 
-- **Analytics**: Get insights into all your Plane data in real-time. Visualize issue data to spot trends, remove blockers, and progress your work.
+- **Analytics**  
+Access real-time insights across all your Plane data. Visualize trends, remove blockers, and keep your projects moving forward.
 
 - **Drive** (_coming soon_): The drive helps you share documents, images, videos, or any other files that make sense to you or your team and align on the problem/solution.
 
-## 🛠️ Quick start for contributors
 
-> Development system must have docker engine installed and running.
+## 🛠️ Local development
 
-Setting up local environment is extremely easy and straight forward. Follow the below step and you will be ready to contribute - 
+### Pre-requisites
+- Ensure Docker Engine is installed and running.
 
-1. Clone the code locally using:
+###  Development setup
+Setting up your local environment is simple and straightforward. Follow these steps to get started:
+
+1. Clone the repository:
    ```
    git clone https://github.com/makeplane/plane.git
    ```
-2. Switch to the code folder:
+2. Navigate to the project folder:
    ```
    cd plane
    ```
-3. Create your feature or fix branch you plan to work on using:
+3. Create a new branch for your feature or fix:
    ```
    git checkout -b <feature-branch-name>
    ```
-4. Open terminal and run:
+4. Run the setup script in the terminal:
    ```
    ./setup.sh
    ```
-5. Open the code on VSCode or similar equivalent IDE.
-6. Review the `.env` files available in various folders.
-   Visit [Environment Setup](./ENV_SETUP.md) to know about various environment variables used in system.
-7. Run the docker command to initiate services:
+5. Open the project in an IDE such as VS Code.
+
+6. Review the `.env` files in the relevant folders. Refer to [Environment Setup](./ENV_SETUP.md) for details on the environment variables used.
+
+7. Start the services using Docker:
    ```
    docker compose -f docker-compose-local.yml up -d
    ```
 
-You are ready to make changes to the code. Do not forget to refresh the browser (in case it does not auto-reload).
+That’s it! You’re all set to begin coding. Remember to refresh your browser if changes don’t auto-reload. Happy contributing! 🎉
 
-Thats it!
-
-## ❤️ Community
-
-The Plane community can be found on [GitHub Discussions](https://github.com/orgs/makeplane/discussions), and our [Discord server](https://discord.com/invite/A92xrEGCge). Our [Code of conduct](https://github.com/makeplane/plane/blob/master/CODE_OF_CONDUCT.md) applies to all Plane community chanels.
-
-Ask questions, report bugs, join discussions, voice ideas, make feature requests, or share your projects.
-
-### Repo Activity
-
-![Plane Repo Activity](https://repobeats.axiom.co/api/embed/2523c6ed2f77c082b7908c33e2ab208981d76c39.svg "Repobeats analytics image")
+## Built with
+[![Next JS](https://img.shields.io/badge/next.js-000000?style=for-the-badge&logo=nextdotjs&logoColor=white)](https://nextjs.org/)<br/>
+[![Django](https://img.shields.io/badge/Django-092E20?style=for-the-badge&logo=django&logoColor=green)](https://www.djangoproject.com/)<br/>
+[![Node JS](https://img.shields.io/badge/node.js-339933?style=for-the-badge&logo=Node.js&logoColor=white)](https://nodejs.org/en)
 
 ## 📸 Screenshots
 
@@ -165,7 +169,7 @@ Ask questions, report bugs, join discussions, voice ideas, make feature requests
     </a>
   </p>
 </p>
-   <p>
+<p>
     <a href="https://plane.so" target="_blank">
       <img
         src="https://ik.imagekit.io/w2okwbtu2/Drive_LlfeY4xn3.png?updatedAt=1709298837917"
@@ -176,23 +180,42 @@ Ask questions, report bugs, join discussions, voice ideas, make feature requests
   </p>
 </p>
 
-## ⛓️ Security
+## 📝 Documentation
+Explore Plane's [product documentation](https://docs.plane.so/) and [developer documentation](https://developers.plane.so/) to learn about features, setup, and usage.
 
-If you believe you have found a security vulnerability in Plane, we encourage you to responsibly disclose this and not open a public issue. We will investigate all legitimate reports.
+## ❤️ Community
 
-Email squawk@plane.so to disclose any security vulnerabilities.
+Join the Plane community on [GitHub Discussions](https://github.com/orgs/makeplane/discussions) and our [Discord server](https://discord.com/invite/A92xrEGCge). We follow a [Code of conduct](https://github.com/makeplane/plane/blob/master/CODE_OF_CONDUCT.md) in all our community channels.
 
-## ❤️ Contribute
+Feel free to ask questions, report bugs, participate in discussions, share ideas, request features, or showcase your projects. We’d love to hear from you!
 
-There are many ways to contribute to Plane, including:
+## 🛡️ Security
 
-- Submitting [bugs](https://github.com/makeplane/plane/issues/new?assignees=srinivaspendem%2Cpushya22&labels=%F0%9F%90%9Bbug&projects=&template=--bug-report.yaml&title=%5Bbug%5D%3A+) and [feature requests](https://github.com/makeplane/plane/issues/new?assignees=srinivaspendem%2Cpushya22&labels=%E2%9C%A8feature&projects=&template=--feature-request.yaml&title=%5Bfeature%5D%3A+) for various components.
-- Reviewing [the documentation](https://docs.plane.so/) and submitting [pull requests](https://github.com/makeplane/plane), from fixing typos to adding new features.
-- Speaking or writing about Plane or any other ecosystem integration and [letting us know](https://discord.com/invite/A92xrEGCge)!
-- Upvoting [popular feature requests](https://github.com/makeplane/plane/issues) to show your support.
+If you discover a security vulnerability in Plane, please report it responsibly instead of opening a public issue. We take all legitimate reports seriously and will investigate them promptly. See [Security policy](https://github.com/makeplane/plane/blob/master/SECURITY.md) for more info.
+
+To disclose any security issues, please email us at security@plane.so. 
+
+## 🤝 Contributing
+
+There are many ways you can contribute to Plane:
+
+- Report [bugs](https://github.com/makeplane/plane/issues/new?assignees=srinivaspendem%2Cpushya22&labels=%F0%9F%90%9Bbug&projects=&template=--bug-report.yaml&title=%5Bbug%5D%3A+) or submit [feature requests](https://github.com/makeplane/plane/issues/new?assignees=srinivaspendem%2Cpushya22&labels=%E2%9C%A8feature&projects=&template=--feature-request.yaml&title=%5Bfeature%5D%3A+).
+- Review the [documentation](https://docs.plane.so/) and submit [pull requests](https://github.com/makeplane/docs) to improve it—whether it's fixing typos or adding new content.
+- Talk or write about Plane or any other ecosystem integration and [let us know](https://discord.com/invite/A92xrEGCge)!
+- Show your support by upvoting [popular feature requests](https://github.com/makeplane/plane/issues).
+
+Please read [CONTRIBUTING.md](https://github.com/makeplane/plane/blob/master/CONTRIBUTING.md) for details on the process for submitting pull requests to us.
+
+### Repo activity
+
+![Plane Repo Activity](https://repobeats.axiom.co/api/embed/2523c6ed2f77c082b7908c33e2ab208981d76c39.svg "Repobeats analytics image")
 
 ### We couldn't have done this without you.
 
 <a href="https://github.com/makeplane/plane/graphs/contributors">
   <img src="https://contrib.rocks/image?repo=makeplane/plane" />
 </a>
+
+
+## License
+This project is licensed under the [GNU Affero General Public License v3.0](https://github.com/makeplane/plane/blob/master/LICENSE.txt).

admin/app/ai/form.tsx

@@ -49,7 +49,7 @@ export const InstanceAIForm: FC<IInstanceAIForm> = (props) => {
           </a>
         </>
       ),
-      placeholder: "gpt-4o-mini",
+      placeholder: "gpt-3.5-turbo",
       error: Boolean(errors.GPT_ENGINE),
       required: false,
     },
@@ -121,7 +121,12 @@ export const InstanceAIForm: FC<IInstanceAIForm> = (props) => {
 
         <div className="relative inline-flex items-center gap-2 rounded border border-custom-primary-100/20 bg-custom-primary-100/10 px-4 py-2 text-xs text-custom-primary-200">
           <Lightbulb height="14" width="14" />
-          <div>If you have a preferred AI models vendor, please get in touch with us.</div>
+          <div>
+            If you have a preferred AI models vendor, please get in{" "}
+            <a className="underline font-medium" href="https://plane.so/contact">
+              touch with us.
+            </a>
+          </div>
         </div>
       </div>
     </div>

admin/app/authentication/github/form.tsx

@@ -195,7 +195,7 @@ export const InstanceGithubConfigForm: FC<Props> = (props) => {
                 </Button>
                 <Link
                   href="/authentication"
-                  className={cn(getButtonStyling("link-neutral", "md"), "font-medium")}
+                  className={cn(getButtonStyling("neutral-primary", "md"), "font-medium")}
                   onClick={handleGoBack}
                 >
                   Go back

admin/app/authentication/github/page.tsx

@@ -44,7 +44,7 @@ const InstanceGithubAuthenticationPage = observer(() => {
       loading: "Saving Configuration...",
       success: {
         title: "Configuration saved",
-        message: () => `Github authentication is now ${value ? "active" : "disabled"}.`,
+        message: () => `GitHub authentication is now ${value ? "active" : "disabled"}.`,
       },
       error: {
         title: "Error",
@@ -67,8 +67,8 @@ const InstanceGithubAuthenticationPage = observer(() => {
       <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
-            name="Github"
-            description="Allow members to login or sign up to plane with their Github accounts."
+            name="GitHub"
+            description="Allow members to login or sign up to plane with their GitHub accounts."
             icon={
               <Image
                 src={resolveGeneralTheme(resolvedTheme) === "dark" ? githubDarkModeImage : githubLightModeImage}

admin/app/authentication/gitlab/form.tsx

@@ -191,7 +191,7 @@ export const InstanceGitlabConfigForm: FC<Props> = (props) => {
                 </Button>
                 <Link
                   href="/authentication"
-                  className={cn(getButtonStyling("link-neutral", "md"), "font-medium")}
+                  className={cn(getButtonStyling("neutral-primary", "md"), "font-medium")}
                   onClick={handleGoBack}
                 >
                   Go back

admin/app/authentication/google/form.tsx

@@ -192,7 +192,7 @@ export const InstanceGoogleConfigForm: FC<Props> = (props) => {
                 </Button>
                 <Link
                   href="/authentication"
-                  className={cn(getButtonStyling("link-neutral", "md"), "font-medium")}
+                  className={cn(getButtonStyling("neutral-primary", "md"), "font-medium")}
                   onClick={handleGoBack}
                 >
                   Go back

admin/app/authentication/oidc/form.tsx

@@ -1,244 +0,0 @@
-import { FC, useState } from "react";
-import Link from "next/link";
-import { useForm } from "react-hook-form";
-// types
-import { IFormattedInstanceConfiguration, TInstanceOIDCAuthenticationConfigurationKeys } from "@plane/types";
-// ui
-import { Button, TOAST_TYPE, getButtonStyling, setToast } from "@plane/ui";
-// components
-import {
-  ConfirmDiscardModal,
-  ControllerInput,
-  TControllerInputFormField,
-  CopyField,
-  TCopyField,
-  CodeBlock,
-} from "@/components/common";
-// helpers
-import { cn } from "@/helpers/common.helper";
-// hooks
-import { useInstance } from "@/hooks/store";
-
-type Props = {
-  config: IFormattedInstanceConfiguration;
-};
-
-type OIDCConfigFormValues = Record<TInstanceOIDCAuthenticationConfigurationKeys, string>;
-
-export const InstanceOIDCConfigForm: FC<Props> = (props) => {
-  const { config } = props;
-  // states
-  const [isDiscardChangesModalOpen, setIsDiscardChangesModalOpen] = useState(false);
-  // store hooks
-  const { updateInstanceConfigurations } = useInstance();
-  // form data
-  const {
-    handleSubmit,
-    control,
-    reset,
-    formState: { errors, isDirty, isSubmitting },
-  } = useForm<OIDCConfigFormValues>({
-    defaultValues: {
-      OIDC_CLIENT_ID: config["OIDC_CLIENT_ID"],
-      OIDC_CLIENT_SECRET: config["OIDC_CLIENT_SECRET"],
-      OIDC_TOKEN_URL: config["OIDC_TOKEN_URL"],
-      OIDC_USERINFO_URL: config["OIDC_USERINFO_URL"],
-      OIDC_AUTHORIZE_URL: config["OIDC_AUTHORIZE_URL"],
-      OIDC_LOGOUT_URL: config["OIDC_LOGOUT_URL"],
-      OIDC_PROVIDER_NAME: config["OIDC_PROVIDER_NAME"],
-    },
-  });
-
-  const originURL = typeof window !== "undefined" ? window.location.origin : "";
-
-  const OIDC_FORM_FIELDS: TControllerInputFormField[] = [
-    {
-      key: "OIDC_CLIENT_ID",
-      type: "text",
-      label: "Client ID",
-      description: "A unique ID for this Plane app that you register on your IdP",
-      placeholder: "abc123xyz789",
-      error: Boolean(errors.OIDC_CLIENT_ID),
-      required: true,
-    },
-    {
-      key: "OIDC_CLIENT_SECRET",
-      type: "password",
-      label: "Client secret",
-      description: "The secret key that authenticates this Plane app to your IdP",
-      placeholder: "s3cr3tK3y123!",
-      error: Boolean(errors.OIDC_CLIENT_SECRET),
-      required: true,
-    },
-    {
-      key: "OIDC_AUTHORIZE_URL",
-      type: "text",
-      label: "Authorize URL",
-      description: (
-        <>
-          The URL that brings up your IdP{"'"}s authentication screen when your users click the{" "}
-          <CodeBlock>{"Continue with"}</CodeBlock>
-        </>
-      ),
-      placeholder: "https://example.com/",
-      error: Boolean(errors.OIDC_AUTHORIZE_URL),
-      required: true,
-    },
-    {
-      key: "OIDC_TOKEN_URL",
-      type: "text",
-      label: "Token URL",
-      description: "The URL that talks to the IdP and persists user authentication on Plane",
-      placeholder: "https://example.com/oauth/token",
-      error: Boolean(errors.OIDC_TOKEN_URL),
-      required: true,
-    },
-    {
-      key: "OIDC_USERINFO_URL",
-      type: "text",
-      label: "Users' info URL",
-      description: "The URL that fetches your users' info from your IdP",
-      placeholder: "https://example.com/userinfo",
-      error: Boolean(errors.OIDC_USERINFO_URL),
-      required: true,
-    },
-    {
-      key: "OIDC_LOGOUT_URL",
-      type: "text",
-      label: "Logout URL",
-      description: "Optional field that controls where your users go after they log out of Plane",
-      placeholder: "https://example.com/logout",
-      error: Boolean(errors.OIDC_LOGOUT_URL),
-      required: false,
-    },
-    {
-      key: "OIDC_PROVIDER_NAME",
-      type: "text",
-      label: "IdP's name",
-      description: (
-        <>
-          Optional field for the name that your users see on the <CodeBlock>Continue with</CodeBlock> button
-        </>
-      ),
-      placeholder: "Okta",
-      error: Boolean(errors.OIDC_PROVIDER_NAME),
-      required: false,
-    },
-  ];
-
-  const OIDC_SERVICE_DETAILS: TCopyField[] = [
-    {
-      key: "Origin_URI",
-      label: "Origin URI",
-      url: `${originURL}/auth/oidc/`,
-      description:
-        "We will generate this for this Plane app. Add this as a trusted origin on your IdP's corresponding field.",
-    },
-    {
-      key: "Callback_URI",
-      label: "Callback URI",
-      url: `${originURL}/auth/oidc/callback/`,
-      description: (
-        <>
-          We will generate this for you.Add this in the{" "}
-          <CodeBlock darkerShade>Sign-in redirect URI</CodeBlock> field of
-          your IdP.
-        </>
-      ),
-    },
-    {
-      key: "Logout_URI",
-      label: "Logout URI",
-      url: `${originURL}/auth/oidc/logout/`,
-      description: (
-        <>
-          We will generate this for you. Add this in the{" "}
-          <CodeBlock darkerShade>Logout redirect URI</CodeBlock> field of
-          your IdP.
-        </>
-      ),
-    },
-  ];
-
-  const onSubmit = async (formData: OIDCConfigFormValues) => {
-    const payload: Partial<OIDCConfigFormValues> = { ...formData };
-
-    await updateInstanceConfigurations(payload)
-      .then((response = []) => {
-        setToast({
-          type: TOAST_TYPE.SUCCESS,
-          title: "Done!",
-          message: "Your OIDC-based authentication is configured. You should test it now.",
-        });
-        reset({
-          OIDC_CLIENT_ID: response.find((item) => item.key === "OIDC_CLIENT_ID")?.value,
-          OIDC_CLIENT_SECRET: response.find((item) => item.key === "OIDC_CLIENT_SECRET")?.value,
-          OIDC_AUTHORIZE_URL: response.find((item) => item.key === "OIDC_AUTHORIZE_URL")?.value,
-          OIDC_TOKEN_URL: response.find((item) => item.key === "OIDC_TOKEN_URL")?.value,
-          OIDC_USERINFO_URL: response.find((item) => item.key === "OIDC_USERINFO_URL")?.value,
-          OIDC_LOGOUT_URL: response.find((item) => item.key === "OIDC_LOGOUT_URL")?.value,
-          OIDC_PROVIDER_NAME: response.find((item) => item.key === "OIDC_PROVIDER_NAME")?.value,
-        });
-      })
-      .catch((err) => console.error(err));
-  };
-
-  const handleGoBack = (e: React.MouseEvent<HTMLAnchorElement, MouseEvent>) => {
-    if (isDirty) {
-      e.preventDefault();
-      setIsDiscardChangesModalOpen(true);
-    }
-  };
-
-  return (
-    <>
-      <ConfirmDiscardModal
-        isOpen={isDiscardChangesModalOpen}
-        onDiscardHref="/authentication"
-        handleClose={() => setIsDiscardChangesModalOpen(false)}
-      />
-      <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">IdP-provided details for Plane</div>
-            {OIDC_FORM_FIELDS.map((field) => (
-              <ControllerInput
-                key={field.key}
-                control={control}
-                type={field.type}
-                name={field.key}
-                label={field.label}
-                description={field.description}
-                placeholder={field.placeholder}
-                error={field.error}
-                required={field.required}
-              />
-            ))}
-            <div className="flex flex-col gap-1 pt-4">
-              <div className="flex items-center gap-4">
-                <Button variant="primary" onClick={handleSubmit(onSubmit)} loading={isSubmitting} disabled={!isDirty}>
-                  {isSubmitting ? "Saving..." : "Save changes"}
-                </Button>
-                <Link
-                  href="/authentication"
-                  className={cn(getButtonStyling("link-neutral", "md"), "font-medium")}
-                  onClick={handleGoBack}
-                >
-                  Go back
-                </Link>
-              </div>
-            </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 your IdP</div>
-              {OIDC_SERVICE_DETAILS.map((field) => (
-                <CopyField key={field.key} label={field.label} url={field.url} description={field.description} />
-              ))}
-            </div>
-          </div>
-        </div>
-      </div>
-    </>
-  );
-};

admin/app/authentication/oidc/page.tsx

@@ -1,120 +0,0 @@
-"use client";
-
-import { useState } from "react";
-import { observer } from "mobx-react-lite";
-import Image from "next/image";
-import useSWR from "swr";
-// ui
-import { Loader, ToggleSwitch, setPromiseToast } from "@plane/ui";
-// components
-import { AuthenticationMethodCard } from "@/components/authentication";
-import { PageHeader } from "@/components/common";
-// hooks
-import { useInstance } from "@/hooks/store";
-// icons
-import OIDCLogo from "/public/logos/oidc-logo.svg";
-// plane admin hooks
-import { useInstanceFlag } from "@/plane-admin/hooks/store/use-instance-flag";
-// local components
-import { InstanceOIDCConfigForm } from "./form";
-
-const InstanceOIDCAuthenticationPage = observer(() => {
-  // state
-  const [isSubmitting, setIsSubmitting] = useState<boolean>(false);
-  // store
-  const { fetchInstanceConfigurations, formattedConfig, updateInstanceConfigurations } = useInstance();
-  // plane admin store
-  const isOIDCEnabled = useInstanceFlag("OIDC_SAML_AUTH");
-  // config
-  const enableOIDCConfig = formattedConfig?.IS_OIDC_ENABLED ?? "";
-
-  useSWR("INSTANCE_CONFIGURATIONS", () => fetchInstanceConfigurations());
-
-  const updateConfig = async (key: "IS_OIDC_ENABLED", value: string) => {
-    setIsSubmitting(true);
-
-    const payload = {
-      [key]: value,
-    };
-
-    const updateConfigPromise = updateInstanceConfigurations(payload);
-
-    setPromiseToast(updateConfigPromise, {
-      loading: "Saving Configuration...",
-      success: {
-        title: "Configuration saved",
-        message: () => `OIDC authentication is now ${value ? "active" : "disabled"}.`,
-      },
-      error: {
-        title: "Error",
-        message: () => "Failed to save configuration",
-      },
-    });
-
-    await updateConfigPromise
-      .then(() => {
-        setIsSubmitting(false);
-      })
-      .catch((err) => {
-        console.error(err);
-        setIsSubmitting(false);
-      });
-  };
-
-  if (isOIDCEnabled === false) {
-    return (
-      <div className="relative container mx-auto w-full h-full p-4 py-4 my-6 space-y-6 flex flex-col">
-        <PageHeader title="Authentication - God Mode" />
-        <div className="text-center text-lg text-gray-500">
-          <p>OpenID Connect (OIDC) authentication is not enabled for this instance.</p>
-          <p>Activate any of your workspace to get this feature.</p>
-        </div>
-      </div>
-    );
-  }
-
-  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">
-          <AuthenticationMethodCard
-            name="OIDC"
-            description="Authenticate your users via the OpenID connect protocol."
-            icon={<Image src={OIDCLogo} height={24} width={24} alt="OIDC Logo" />}
-            config={
-              <ToggleSwitch
-                value={Boolean(parseInt(enableOIDCConfig))}
-                onChange={() => {
-                  Boolean(parseInt(enableOIDCConfig)) === true
-                    ? updateConfig("IS_OIDC_ENABLED", "0")
-                    : updateConfig("IS_OIDC_ENABLED", "1");
-                }}
-                size="sm"
-                disabled={isSubmitting || !formattedConfig}
-              />
-            }
-            disabled={isSubmitting || !formattedConfig}
-            withBorder={false}
-          />
-        </div>
-        <div className="flex-grow overflow-hidden overflow-y-scroll vertical-scrollbar scrollbar-md px-4">
-          {formattedConfig ? (
-            <InstanceOIDCConfigForm config={formattedConfig} />
-          ) : (
-            <Loader className="space-y-8">
-              <Loader.Item height="50px" width="25%" />
-              <Loader.Item height="50px" />
-              <Loader.Item height="50px" />
-              <Loader.Item height="50px" />
-              <Loader.Item height="50px" />
-              <Loader.Item height="50px" width="50%" />
-            </Loader>
-          )}
-        </div>
-      </div>
-    </>
-  );
-});
-
-export default InstanceOIDCAuthenticationPage;

admin/app/authentication/page.tsx

@@ -60,7 +60,7 @@ const InstanceAuthenticationPage = observer(() => {
         <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-sm font-normal text-custom-text-300">
-            Configure authentication modes for your team and restrict sign ups to be invite only.
+            Configure authentication modes for your team and restrict sign-ups to be invite only.
           </div>
         </div>
         <div className="flex-grow overflow-hidden overflow-y-scroll vertical-scrollbar scrollbar-md px-4">
@@ -80,9 +80,11 @@ const InstanceAuthenticationPage = observer(() => {
                     <ToggleSwitch
                       value={Boolean(parseInt(enableSignUpConfig))}
                       onChange={() => {
-                        Boolean(parseInt(enableSignUpConfig)) === true
-                          ? updateConfig("ENABLE_SIGNUP", "0")
-                          : updateConfig("ENABLE_SIGNUP", "1");
+                        if (Boolean(parseInt(enableSignUpConfig)) === true) {
+                          updateConfig("ENABLE_SIGNUP", "0");
+                        } else {
+                          updateConfig("ENABLE_SIGNUP", "1");
+                        }
                       }}
                       size="sm"
                       disabled={isSubmitting}
@@ -90,7 +92,7 @@ const InstanceAuthenticationPage = observer(() => {
                   </div>
                 </div>
               </div>
-              <div className="text-lg font-medium pt-6">Authentication modes</div>
+              <div className="text-lg font-medium pt-6">Available authentication modes</div>
               <AuthenticationModes disabled={isSubmitting} updateConfig={updateConfig} />
             </div>
           ) : (

admin/app/authentication/saml/form.tsx

@@ -1,245 +0,0 @@
-import { FC, useState } from "react";
-import Link from "next/link";
-import { Controller, useForm } from "react-hook-form";
-// types
-import { IFormattedInstanceConfiguration, TInstanceSAMLAuthenticationConfigurationKeys } from "@plane/types";
-// ui
-import { Button, TOAST_TYPE, TextArea, getButtonStyling, setToast } from "@plane/ui";
-// components
-import {
-  ConfirmDiscardModal,
-  ControllerInput,
-  TControllerInputFormField,
-  CopyField,
-  TCopyField,
-  CodeBlock,
-} from "@/components/common";
-// helpers
-import { cn } from "@/helpers/common.helper";
-// hooks
-import { useInstance } from "@/hooks/store";
-import { SAMLAttributeMappingTable } from "@/plane-admin/components/authentication";
-
-type Props = {
-  config: IFormattedInstanceConfiguration;
-};
-
-type SAMLConfigFormValues = Record<TInstanceSAMLAuthenticationConfigurationKeys, string>;
-
-export const InstanceSAMLConfigForm: FC<Props> = (props) => {
-  const { config } = props;
-  // states
-  const [isDiscardChangesModalOpen, setIsDiscardChangesModalOpen] = useState(false);
-  // store hooks
-  const { updateInstanceConfigurations } = useInstance();
-  // form data
-  const {
-    handleSubmit,
-    control,
-    reset,
-    formState: { errors, isDirty, isSubmitting },
-  } = useForm<SAMLConfigFormValues>({
-    defaultValues: {
-      SAML_ENTITY_ID: config["SAML_ENTITY_ID"],
-      SAML_SSO_URL: config["SAML_SSO_URL"],
-      SAML_LOGOUT_URL: config["SAML_LOGOUT_URL"],
-      SAML_CERTIFICATE: config["SAML_CERTIFICATE"],
-      SAML_PROVIDER_NAME: config["SAML_PROVIDER_NAME"],
-    },
-  });
-
-  const originURL = typeof window !== "undefined" ? window.location.origin : "";
-
-  const SAML_FORM_FIELDS: TControllerInputFormField[] = [
-    {
-      key: "SAML_ENTITY_ID",
-      type: "text",
-      label: "Entity ID",
-      description: "A unique ID for this Plane app that you register on your IdP",
-      placeholder: "70a44354520df8bd9bcd",
-      error: Boolean(errors.SAML_ENTITY_ID),
-      required: true,
-    },
-    {
-      key: "SAML_SSO_URL",
-      type: "text",
-      label: "SSO URL",
-      description: (
-        <>
-          The URL that brings up your IdP{"'"}s authentication screen when your users click the{" "}
-          <CodeBlock>{"Continue with"}</CodeBlock> button
-        </>
-      ),
-      placeholder: "https://example.com/sso",
-      error: Boolean(errors.SAML_SSO_URL),
-      required: true,
-    },
-    {
-      key: "SAML_LOGOUT_URL",
-      type: "text",
-      label: "Logout URL",
-      description: "Optional field that tells your IdP your users have logged out of this Plane app",
-      placeholder: "https://example.com/logout",
-      error: Boolean(errors.SAML_LOGOUT_URL),
-      required: false,
-    },
-    {
-      key: "SAML_PROVIDER_NAME",
-      type: "text",
-      label: "IdP's name",
-      description: (
-        <>
-          Optional field for the name that your users see on the <CodeBlock>Continue with</CodeBlock> button
-        </>
-      ),
-      placeholder: "Okta",
-      error: Boolean(errors.SAML_PROVIDER_NAME),
-      required: false,
-    },
-  ];
-
-  const SAML_SERVICE_DETAILS: TCopyField[] = [
-    {
-      key: "Metadata_Information",
-      label: "Entity ID | Audience | Metadata information",
-      url: `${originURL}/auth/saml/metadata/`,
-      description:
-        "We will generate this bit of the metadata that identifies this Plane app as an authorized service on your IdP.",
-    },
-    {
-      key: "Callback_URI",
-      label: "Callback URI",
-      url: `${originURL}/auth/saml/callback/`,
-      description: (
-        <>
-          We will generate this{" "}
-          <CodeBlock darkerShade>http-post request</CodeBlock> URL that you
-          should paste into your <CodeBlock darkerShade>ACS URL</CodeBlock>{" "}
-          or <CodeBlock darkerShade>Sign-in call back URL</CodeBlock> field
-          on your IdP.
-        </>
-      ),
-    },
-    {
-      key: "Logout_URI",
-      label: "Logout URI",
-      url: `${originURL}/auth/saml/logout/`,
-      description: (
-        <>
-          We will generate this{" "}
-          <CodeBlock darkerShade>http-redirect request</CodeBlock> URL that
-          you should paste into your{" "}
-          <CodeBlock darkerShade>SLS URL</CodeBlock> or{" "}
-          <CodeBlock darkerShade>Logout URL</CodeBlock>
-          field on your IdP.
-        </>
-      ),
-    },
-  ];
-
-  const onSubmit = async (formData: SAMLConfigFormValues) => {
-    const payload: Partial<SAMLConfigFormValues> = { ...formData };
-
-    await updateInstanceConfigurations(payload)
-      .then((response = []) => {
-        setToast({
-          type: TOAST_TYPE.SUCCESS,
-          title: "Done!",
-          message: "Your SAML-based authentication is configured. You should test it now.",
-        });
-        reset({
-          SAML_ENTITY_ID: response.find((item) => item.key === "SAML_ENTITY_ID")?.value,
-          SAML_SSO_URL: response.find((item) => item.key === "SAML_SSO_URL")?.value,
-          SAML_LOGOUT_URL: response.find((item) => item.key === "SAML_LOGOUT_URL")?.value,
-          SAML_CERTIFICATE: response.find((item) => item.key === "SAML_CERTIFICATE")?.value,
-          SAML_PROVIDER_NAME: response.find((item) => item.key === "SAML_PROVIDER_NAME")?.value,
-        });
-      })
-      .catch((err) => console.error(err));
-  };
-
-  const handleGoBack = (e: React.MouseEvent<HTMLAnchorElement, MouseEvent>) => {
-    if (isDirty) {
-      e.preventDefault();
-      setIsDiscardChangesModalOpen(true);
-    }
-  };
-
-  return (
-    <>
-      <ConfirmDiscardModal
-        isOpen={isDiscardChangesModalOpen}
-        onDiscardHref="/authentication"
-        handleClose={() => setIsDiscardChangesModalOpen(false)}
-      />
-      <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">IdP-provided details for Plane</div>
-            {SAML_FORM_FIELDS.map((field) => (
-              <ControllerInput
-                key={field.key}
-                control={control}
-                type={field.type}
-                name={field.key}
-                label={field.label}
-                description={field.description}
-                placeholder={field.placeholder}
-                error={field.error}
-                required={field.required}
-              />
-            ))}
-            <div className="flex flex-col gap-1">
-              <h4 className="text-sm">SAML certificate</h4>
-              <Controller
-                control={control}
-                name="SAML_CERTIFICATE"
-                rules={{ required: "Certificate is required." }}
-                render={({ field: { value, onChange } }) => (
-                  <TextArea
-                    id="SAML_CERTIFICATE"
-                    name="SAML_CERTIFICATE"
-                    value={value}
-                    onChange={onChange}
-                    hasError={Boolean(errors.SAML_CERTIFICATE)}
-                    placeholder="---BEGIN CERTIFICATE---\n2yWn1gc7DhOFB9\nr0gbE+\n---END CERTIFICATE---"
-                    className="min-h-[102px] w-full rounded-md font-medium text-sm"
-                  />
-                )}
-              />
-              <p className="pt-0.5 text-xs text-custom-text-300">
-                IdP-generated certificate for signing this Plane app as an authorized service provider for your IdP
-              </p>
-            </div>
-            <div className="flex flex-col gap-1 pt-4">
-              <div className="flex items-center gap-4">
-                <Button variant="primary" onClick={handleSubmit(onSubmit)} loading={isSubmitting} disabled={!isDirty}>
-                  {isSubmitting ? "Saving..." : "Save changes"}
-                </Button>
-                <Link
-                  href="/authentication"
-                  className={cn(getButtonStyling("link-neutral", "md"), "font-medium")}
-                  onClick={handleGoBack}
-                >
-                  Go back
-                </Link>
-              </div>
-            </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 your IdP</div>
-              {SAML_SERVICE_DETAILS.map((field) => (
-                <CopyField key={field.key} label={field.label} url={field.url} description={field.description} />
-              ))}
-              <div className="flex flex-col gap-1">
-                <h4 className="text-sm text-custom-text-200 font-medium">Mapping</h4>
-                <SAMLAttributeMappingTable />
-              </div>
-            </div>
-          </div>
-        </div>
-      </div>
-    </>
-  );
-};

admin/app/authentication/saml/page.tsx

@@ -1,120 +0,0 @@
-"use client";
-
-import { useState } from "react";
-import { observer } from "mobx-react-lite";
-import Image from "next/image";
-import useSWR from "swr";
-// ui
-import { Loader, ToggleSwitch, setPromiseToast } from "@plane/ui";
-// components
-import { AuthenticationMethodCard } from "@/components/authentication";
-import { PageHeader } from "@/components/common";
-// hooks
-import { useInstance } from "@/hooks/store";
-// icons
-import SAMLLogo from "/public/logos/saml-logo.svg";
-// plane admin hooks
-import { useInstanceFlag } from "@/plane-admin/hooks/store/use-instance-flag";
-// local components
-import { InstanceSAMLConfigForm } from "./form";
-
-const InstanceSAMLAuthenticationPage = observer(() => {
-  // state
-  const [isSubmitting, setIsSubmitting] = useState<boolean>(false);
-  // store
-  const { fetchInstanceConfigurations, formattedConfig, updateInstanceConfigurations } = useInstance();
-  // plane admin store
-  const isSAMLEnabled = useInstanceFlag("OIDC_SAML_AUTH");
-  // config
-  const enableSAMLConfig = formattedConfig?.IS_SAML_ENABLED ?? "";
-
-  useSWR("INSTANCE_CONFIGURATIONS", () => fetchInstanceConfigurations());
-
-  const updateConfig = async (key: "IS_SAML_ENABLED", value: string) => {
-    setIsSubmitting(true);
-
-    const payload = {
-      [key]: value,
-    };
-
-    const updateConfigPromise = updateInstanceConfigurations(payload);
-
-    setPromiseToast(updateConfigPromise, {
-      loading: "Saving Configuration...",
-      success: {
-        title: "Configuration saved",
-        message: () => `SAML authentication is now ${value ? "active" : "disabled"}.`,
-      },
-      error: {
-        title: "Error",
-        message: () => "Failed to save configuration",
-      },
-    });
-
-    await updateConfigPromise
-      .then(() => {
-        setIsSubmitting(false);
-      })
-      .catch((err) => {
-        console.error(err);
-        setIsSubmitting(false);
-      });
-  };
-
-  if (isSAMLEnabled === false) {
-    return (
-      <div className="relative container mx-auto w-full h-full p-4 py-4 my-6 space-y-6 flex flex-col">
-        <PageHeader title="Authentication - God Mode" />
-        <div className="text-center text-lg text-gray-500">
-          <p>Security Assertion Markup Language (SAML) authentication is not enabled for this instance.</p>
-          <p>Activate any of your workspace to get this feature.</p>
-        </div>
-      </div>
-    );
-  }
-
-  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">
-          <AuthenticationMethodCard
-            name="SAML"
-            description="Authenticate your users via Security Assertion Markup Language
-          protocol."
-            icon={<Image src={SAMLLogo} height={24} width={24} alt="SAML Logo" className="pl-0.5" />}
-            config={
-              <ToggleSwitch
-                value={Boolean(parseInt(enableSAMLConfig))}
-                onChange={() => {
-                  Boolean(parseInt(enableSAMLConfig)) === true
-                    ? updateConfig("IS_SAML_ENABLED", "0")
-                    : updateConfig("IS_SAML_ENABLED", "1");
-                }}
-                size="sm"
-                disabled={isSubmitting || !formattedConfig}
-              />
-            }
-            disabled={isSubmitting || !formattedConfig}
-            withBorder={false}
-          />
-        </div>
-        <div className="flex-grow overflow-hidden overflow-y-scroll vertical-scrollbar scrollbar-md px-4">
-          {formattedConfig ? (
-            <InstanceSAMLConfigForm config={formattedConfig} />
-          ) : (
-            <Loader className="space-y-8">
-              <Loader.Item height="50px" width="25%" />
-              <Loader.Item height="50px" />
-              <Loader.Item height="50px" />
-              <Loader.Item height="50px" />
-              <Loader.Item height="50px" width="50%" />
-            </Loader>
-          )}
-        </div>
-      </div>
-    </>
-  );
-});
-
-export default InstanceSAMLAuthenticationPage;

admin/app/email/email-config-form.tsx

@@ -72,7 +72,7 @@ export const InstanceEmailForm: FC<IInstanceEmailForm> = (props) => {
     {
       key: "EMAIL_FROM",
       type: "text",
-      label: "Sender email address",
+      label: "Sender's email address",
       description:
         "This is the email address your users will see when getting emails from this instance. You will need to verify this address.",
       placeholder: "no-reply@projectplane.so",
@@ -174,12 +174,12 @@ export const InstanceEmailForm: FC<IInstanceEmailForm> = (props) => {
           </div>
         </div>
         <div className="flex flex-col gap-6 my-6 pt-4 border-t border-custom-border-100">
-          <div className="flex w-full max-w-md flex-col gap-y-10 px-1">
+          <div className="flex w-full max-w-xl flex-col gap-y-10 px-1">
             <div className="mr-8 flex items-center gap-10 pt-4">
               <div className="grow">
-                <div className="text-sm font-medium text-custom-text-100">Authentication (optional)</div>
+                <div className="text-sm font-medium text-custom-text-100">Authentication</div>
                 <div className="text-xs font-normal text-custom-text-300">
-                  We recommend setting up a username password for your SMTP server
+                  This is optional, but we recommend setting up a username and a password for your SMTP server.
                 </div>
               </div>
             </div>

admin/app/general/form.tsx

@@ -117,17 +117,18 @@ export const GeneralConfigurationForm: FC<IGeneralConfigurationForm> = observer(
             </div>
             <div className="grow">
               <div className="text-sm font-medium text-custom-text-100 leading-5">
-                Allow Plane to collect anonymous usage events
+                Let Plane collect anonymous usage data
               </div>
               <div className="text-xs font-normal text-custom-text-300 leading-5">
-                We collect usage events without any PII to analyse and improve Plane.{" "}
+                No PII is collected.This anonymized data is used to understand how you use Plane and build new features
+                in line with{" "}
                 <a
                   href="https://docs.plane.so/self-hosting/telemetry"
                   target="_blank"
                   className="text-custom-primary-100 hover:underline"
                   rel="noreferrer"
                 >
-                  Know more.
+                  our Telemetry Policy.
                 </a>
               </div>
             </div>

admin/app/general/intercom.tsx

@@ -60,9 +60,9 @@ export const IntercomConfig: FC<TIntercomConfig> = observer((props) => {
           </div>
 
           <div className="grow">
-            <div className="text-sm font-medium text-custom-text-100 leading-5">Talk to Plane</div>
+            <div className="text-sm font-medium text-custom-text-100 leading-5">Chat with us</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
+              Let your users chat with us via Intercom or another service. Toggling Telemetry off turns this off
               automatically.
             </div>
           </div>

admin/app/workspace/create/form.tsx

@@ -0,0 +1,214 @@
+import { useState, useEffect } from "react";
+import Link from "next/link";
+import { useRouter } from "next/navigation";
+import { Controller, useForm } from "react-hook-form";
+// constants
+import { ORGANIZATION_SIZE, RESTRICTED_URLS } from "@plane/constants";
+// types
+import { IWorkspace } from "@plane/types";
+// components
+import { Button, CustomSelect, getButtonStyling, Input, setToast, TOAST_TYPE } from "@plane/ui";
+// helpers
+import { WEB_BASE_URL } from "@/helpers/common.helper";
+// hooks
+import { useWorkspace } from "@/hooks/store";
+// services
+import { WorkspaceService } from "@/services/workspace.service";
+
+const workspaceService = new WorkspaceService();
+
+export const WorkspaceCreateForm = () => {
+  // router
+  const router = useRouter();
+  // states
+  const [slugError, setSlugError] = useState(false);
+  const [invalidSlug, setInvalidSlug] = useState(false);
+  const [defaultValues, setDefaultValues] = useState<Partial<IWorkspace>>({
+    name: "",
+    slug: "",
+    organization_size: "",
+  });
+  // store hooks
+  const { createWorkspace } = useWorkspace();
+  // form info
+  const {
+    handleSubmit,
+    control,
+    setValue,
+    getValues,
+    formState: { errors, isSubmitting, isValid },
+  } = useForm<IWorkspace>({ defaultValues, mode: "onChange" });
+  // derived values
+  const workspaceBaseURL = encodeURI(WEB_BASE_URL || window.location.origin + "/");
+
+  const handleCreateWorkspace = async (formData: IWorkspace) => {
+    await workspaceService
+      .workspaceSlugCheck(formData.slug)
+      .then(async (res) => {
+        if (res.status === true && !RESTRICTED_URLS.includes(formData.slug)) {
+          setSlugError(false);
+          await createWorkspace(formData)
+            .then(async () => {
+              setToast({
+                type: TOAST_TYPE.SUCCESS,
+                title: "Success!",
+                message: "Workspace created successfully.",
+              });
+              router.push(`/workspace`);
+            })
+            .catch(() => {
+              setToast({
+                type: TOAST_TYPE.ERROR,
+                title: "Error!",
+                message: "Workspace could not be created. Please try again.",
+              });
+            });
+        } else setSlugError(true);
+      })
+      .catch(() => {
+        setToast({
+          type: TOAST_TYPE.ERROR,
+          title: "Error!",
+          message: "Some error occurred while creating workspace. Please try again.",
+        });
+      });
+  };
+
+  useEffect(
+    () => () => {
+      // when the component unmounts set the default values to whatever user typed in
+      setDefaultValues(getValues());
+    },
+    [getValues, setDefaultValues]
+  );
+
+  return (
+    <div className="space-y-8">
+      <div className="grid-col grid w-full max-w-4xl grid-cols-1 items-start justify-between gap-x-10 gap-y-6 lg:grid-cols-2">
+        <div className="flex flex-col gap-1">
+          <h4 className="text-sm text-custom-text-300">Name your workspace</h4>
+          <div className="flex flex-col gap-1">
+            <Controller
+              control={control}
+              name="name"
+              rules={{
+                required: "This is a required field.",
+                validate: (value) =>
+                  /^[\w\s-]*$/.test(value) ||
+                  `Workspaces names can contain only (" "), ( - ), ( _ ) and alphanumeric characters.`,
+                maxLength: {
+                  value: 80,
+                  message: "Limit your name to 80 characters.",
+                },
+              }}
+              render={({ field: { value, ref, onChange } }) => (
+                <Input
+                  id="workspaceName"
+                  type="text"
+                  value={value}
+                  onChange={(e) => {
+                    onChange(e.target.value);
+                    setValue("name", e.target.value);
+                    setValue("slug", e.target.value.toLocaleLowerCase().trim().replace(/ /g, "-"), {
+                      shouldValidate: true,
+                    });
+                  }}
+                  ref={ref}
+                  hasError={Boolean(errors.name)}
+                  placeholder="Something familiar and recognizable is always best."
+                  className="w-full"
+                />
+              )}
+            />
+            <span className="text-xs text-red-500">{errors?.name?.message}</span>
+          </div>
+        </div>
+        <div className="flex flex-col gap-1">
+          <h4 className="text-sm text-custom-text-300">Set your workspace&apos;s URL</h4>
+          <div className="flex gap-0.5 w-full items-center rounded-md border-[0.5px] border-custom-border-200 px-3">
+            <span className="whitespace-nowrap text-sm text-custom-text-200">{workspaceBaseURL}</span>
+            <Controller
+              control={control}
+              name="slug"
+              rules={{
+                required: "The URL is a required field.",
+                maxLength: {
+                  value: 48,
+                  message: "Limit your URL to 48 characters.",
+                },
+              }}
+              render={({ field: { onChange, value, ref } }) => (
+                <Input
+                  id="workspaceUrl"
+                  type="text"
+                  value={value.toLocaleLowerCase().trim().replace(/ /g, "-")}
+                  onChange={(e) => {
+                    if (/^[a-zA-Z0-9_-]+$/.test(e.target.value)) setInvalidSlug(false);
+                    else setInvalidSlug(true);
+                    onChange(e.target.value.toLowerCase());
+                  }}
+                  ref={ref}
+                  hasError={Boolean(errors.slug)}
+                  placeholder="workspace-name"
+                  className="block w-full rounded-md border-none bg-transparent !px-0 py-2 text-sm"
+                />
+              )}
+            />
+          </div>
+          {slugError && <p className="text-sm text-red-500">This URL is taken. Try something else.</p>}
+          {invalidSlug && (
+            <p className="text-sm text-red-500">{`URLs can contain only ( - ), ( _ ) and alphanumeric characters.`}</p>
+          )}
+          {errors.slug && <span className="text-xs text-red-500">{errors.slug.message}</span>}
+        </div>
+        <div className="flex flex-col gap-1">
+          <h4 className="text-sm text-custom-text-300">How many people will use this workspace?</h4>
+          <div className="w-full">
+            <Controller
+              name="organization_size"
+              control={control}
+              rules={{ required: "This is a required field." }}
+              render={({ field: { value, onChange } }) => (
+                <CustomSelect
+                  value={value}
+                  onChange={onChange}
+                  label={
+                    ORGANIZATION_SIZE.find((c) => c === value) ?? (
+                      <span className="text-custom-text-400">Select a range</span>
+                    )
+                  }
+                  buttonClassName="!border-[0.5px] !border-custom-border-200 !shadow-none"
+                  input
+                  optionsClassName="w-full"
+                >
+                  {ORGANIZATION_SIZE.map((item) => (
+                    <CustomSelect.Option key={item} value={item}>
+                      {item}
+                    </CustomSelect.Option>
+                  ))}
+                </CustomSelect>
+              )}
+            />
+            {errors.organization_size && (
+              <span className="text-sm text-red-500">{errors.organization_size.message}</span>
+            )}
+          </div>
+        </div>
+      </div>
+      <div className="flex max-w-4xl items-center py-1 gap-4">
+        <Button
+          variant="primary"
+          size="sm"
+          onClick={handleSubmit(handleCreateWorkspace)}
+          disabled={!isValid}
+          loading={isSubmitting}
+        >
+          {isSubmitting ? "Creating workspace" : "Create workspace"}
+        </Button>
+        <Link className={getButtonStyling("neutral-primary", "sm")} href="/workspace">
+          Go back
+        </Link>
+      </div>
+    </div>
+  );
+};

admin/app/workspace/create/page.tsx

@@ -0,0 +1,21 @@
+"use client";
+
+import { observer } from "mobx-react";
+// components
+import { WorkspaceCreateForm } from "./form";
+
+const WorkspaceCreatePage = observer(() => (
+  <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">Create a new workspace on this instance.</div>
+      <div className="text-sm font-normal text-custom-text-300">
+        You will need to invite users from Workspace Settings after you create this workspace.
+      </div>
+    </div>
+    <div className="flex-grow overflow-hidden overflow-y-scroll vertical-scrollbar scrollbar-md px-4">
+      <WorkspaceCreateForm />
+    </div>
+  </div>
+));
+
+export default WorkspaceCreatePage;

admin/app/workspace/layout.tsx

@@ -0,0 +1,12 @@
+import { ReactNode } from "react";
+import { Metadata } from "next";
+// layouts
+import { AdminLayout } from "@/layouts/admin-layout";
+
+export const metadata: Metadata = {
+  title: "Workspace Management - Plane Web",
+};
+
+export default function WorkspaceManagementLayout({ children }: { children: ReactNode }) {
+  return <AdminLayout>{children}</AdminLayout>;
+}

admin/app/workspace/page.tsx

@@ -0,0 +1,169 @@
+"use client";
+
+import { useState } from "react";
+import { observer } from "mobx-react";
+import Link from "next/link";
+import useSWR from "swr";
+import { Loader as LoaderIcon } from "lucide-react";
+// types
+import { TInstanceConfigurationKeys } from "@plane/types";
+// ui
+import { Button, getButtonStyling, Loader, setPromiseToast, ToggleSwitch } from "@plane/ui";
+// components
+import { WorkspaceListItem } from "@/components/workspace";
+// helpers
+import { cn } from "@/helpers/common.helper";
+// hooks
+import { useInstance, useWorkspace } from "@/hooks/store";
+
+const WorkspaceManagementPage = observer(() => {
+  // states
+  const [isSubmitting, setIsSubmitting] = useState<boolean>(false);
+  // store
+  const { formattedConfig, fetchInstanceConfigurations, updateInstanceConfigurations } = useInstance();
+  const {
+    workspaceIds,
+    loader: workspaceLoader,
+    paginationInfo,
+    fetchWorkspaces,
+    fetchNextWorkspaces,
+  } = useWorkspace();
+  // derived values
+  const disableWorkspaceCreation = formattedConfig?.DISABLE_WORKSPACE_CREATION ?? "";
+  const hasNextPage = paginationInfo?.next_page_results && paginationInfo?.next_cursor !== undefined;
+
+  // fetch data
+  useSWR("INSTANCE_CONFIGURATIONS", () => fetchInstanceConfigurations());
+  useSWR("INSTANCE_WORKSPACES", () => fetchWorkspaces());
+
+  const updateConfig = async (key: TInstanceConfigurationKeys, value: string) => {
+    setIsSubmitting(true);
+
+    const payload = {
+      [key]: value,
+    };
+
+    const updateConfigPromise = updateInstanceConfigurations(payload);
+
+    setPromiseToast(updateConfigPromise, {
+      loading: "Saving configuration",
+      success: {
+        title: "Success",
+        message: () => "Configuration saved successfully",
+      },
+      error: {
+        title: "Error",
+        message: () => "Failed to save configuration",
+      },
+    });
+
+    await updateConfigPromise
+      .then(() => {
+        setIsSubmitting(false);
+      })
+      .catch((err) => {
+        console.error(err);
+        setIsSubmitting(false);
+      });
+  };
+
+  return (
+    <div className="relative container mx-auto w-full h-full p-4 py-4 space-y-6 flex flex-col">
+      <div className="flex items-center justify-between gap-4 border-b border-custom-border-100 mx-4 py-4 space-y-1 flex-shrink-0">
+        <div className="flex flex-col gap-1">
+          <div className="text-xl font-medium text-custom-text-100">Workspaces on this instance</div>
+          <div className="text-sm font-normal text-custom-text-300">
+            See all workspaces and control who can create them.
+          </div>
+        </div>
+      </div>
+      <div className="flex-grow overflow-hidden overflow-y-scroll vertical-scrollbar scrollbar-md px-4">
+        <div className="space-y-3">
+          {formattedConfig ? (
+            <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">Prevent anyone else from creating a workspace.</div>
+                  <div className={cn("font-normal leading-5 text-custom-text-300 text-xs")}>
+                    Toggling this on will let only you create workspaces. You will have to invite users to new
+                    workspaces.
+                  </div>
+                </div>
+              </div>
+              <div className={`shrink-0 pr-4 ${isSubmitting && "opacity-70"}`}>
+                <div className="flex items-center gap-4">
+                  <ToggleSwitch
+                    value={Boolean(parseInt(disableWorkspaceCreation))}
+                    onChange={() => {
+                      if (Boolean(parseInt(disableWorkspaceCreation)) === true) {
+                        updateConfig("DISABLE_WORKSPACE_CREATION", "0");
+                      } else {
+                        updateConfig("DISABLE_WORKSPACE_CREATION", "1");
+                      }
+                    }}
+                    size="sm"
+                    disabled={isSubmitting}
+                  />
+                </div>
+              </div>
+            </div>
+          ) : (
+            <Loader>
+              <Loader.Item height="50px" width="100%" />
+            </Loader>
+          )}
+          {workspaceLoader !== "init-loader" ? (
+            <>
+              <div className="pt-6 flex items-center justify-between gap-2">
+                <div className="flex flex-col items-start gap-x-2">
+                  <div className="flex items-center gap-2 text-lg font-medium">
+                    All workspaces on this instance{" "}
+                    <span className="text-custom-text-300">• {workspaceIds.length}</span>
+                    {workspaceLoader && ["mutation", "pagination"].includes(workspaceLoader) && (
+                      <LoaderIcon className="w-4 h-4 animate-spin" />
+                    )}
+                  </div>
+                  <div className={cn("font-normal leading-5 text-custom-text-300 text-xs")}>
+                    You can&apos;t yet delete workspaces and you can only go to the workspace if you are an Admin or a
+                    Member.
+                  </div>
+                </div>
+                <div className="flex items-center gap-2">
+                  <Link href="/workspace/create" className={getButtonStyling("primary", "sm")}>
+                    Create workspace
+                  </Link>
+                </div>
+              </div>
+              <div className="flex flex-col gap-4 py-2">
+                {workspaceIds.map((workspaceId) => (
+                  <WorkspaceListItem key={workspaceId} workspaceId={workspaceId} />
+                ))}
+              </div>
+              {hasNextPage && (
+                <div className="flex justify-center">
+                  <Button
+                    variant="link-primary"
+                    onClick={() => fetchNextWorkspaces()}
+                    disabled={workspaceLoader === "pagination"}
+                  >
+                    Load more
+                    {workspaceLoader === "pagination" && <LoaderIcon className="w-3 h-3 animate-spin" />}
+                  </Button>
+                </div>
+              )}
+            </>
+          ) : (
+            <Loader className="space-y-10 py-8">
+              <Loader.Item height="24px" width="20%" />
+              <Loader.Item height="92px" width="100%" />
+              <Loader.Item height="92px" width="100%" />
+              <Loader.Item height="92px" width="100%" />
+            </Loader>
+          )}
+        </div>
+      </div>
+    </div>
+  );
+});
+
+export default WorkspaceManagementPage;

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

@@ -9,8 +9,8 @@ import { getButtonStyling } from "@plane/ui";
 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
+  <a href="https://plane.so/pricing?mode=self-hosted" target="_blank" className={cn(getButtonStyling("primary", "sm"))}>
+    Upgrade
     <SquareArrowOutUpRight className="h-3.5 w-3.5 p-0.5" />
   </a>
 );

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

@@ -52,13 +52,13 @@ export const HelpSection: FC = observer(() => {
       )}
     >
       <div className={`flex items-center gap-1 ${isSidebarCollapsed ? "flex-col justify-center" : "w-full"}`}>
-        <Tooltip tooltipContent="Redirect to plane" position="right" className="ml-4" disabled={!isSidebarCollapsed}>
+        <Tooltip tooltipContent="Redirect to Plane" position="right" className="ml-4" disabled={!isSidebarCollapsed}>
           <a
             href={redirectionLink}
             className={`relative px-2 py-1.5 flex items-center gap-2 font-medium rounded border border-custom-primary-100/20 bg-custom-primary-100/10 text-xs text-custom-primary-200 whitespace-nowrap`}
           >
             <ExternalLink size={14} />
-            {!isSidebarCollapsed && "Redirect to plane"}
+            {!isSidebarCollapsed && "Redirect to Plane"}
           </a>
         </Tooltip>
         <Tooltip tooltipContent="Help" position={isSidebarCollapsed ? "right" : "top"} className="ml-4">

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

@@ -3,7 +3,7 @@
 import { FC, useEffect, useRef } from "react";
 import { observer } from "mobx-react";
 // plane helpers
-import { useOutsideClickDetector } from "@plane/helpers";
+import { useOutsideClickDetector } from "@plane/hooks";
 // components
 import { HelpSection, SidebarMenu, SidebarDropdown } from "@/components/admin-sidebar";
 // hooks

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

@@ -4,7 +4,7 @@ import { observer } from "mobx-react";
 import Link from "next/link";
 import { usePathname } from "next/navigation";
 import { Image, BrainCog, Cog, Lock, Mail } from "lucide-react";
-import { Tooltip } from "@plane/ui";
+import { Tooltip, WorkspaceIcon } from "@plane/ui";
 // hooks
 import { cn } from "@/helpers/common.helper";
 import { useTheme } from "@/hooks/store";
@@ -14,31 +14,37 @@ const INSTANCE_ADMIN_LINKS = [
   {
     Icon: Cog,
     name: "General",
-    description: "Identify your instances and get key details",
+    description: "Identify your instances and get key details.",
     href: `/general/`,
   },
+  {
+    Icon: WorkspaceIcon,
+    name: "Workspaces",
+    description: "Manage all workspaces on this instance.",
+    href: `/workspace/`,
+  },
   {
     Icon: Mail,
     name: "Email",
-    description: "Set up emails to your users",
+    description: "Configure your SMTP controls.",
     href: `/email/`,
   },
   {
     Icon: Lock,
     name: "Authentication",
-    description: "Configure authentication modes",
+    description: "Configure authentication modes.",
     href: `/authentication/`,
   },
   {
     Icon: BrainCog,
     name: "Artificial intelligence",
-    description: "Configure your OpenAI creds",
+    description: "Configure your OpenAI creds.",
     href: `/ai/`,
   },
   {
     Icon: Image,
     name: "Images in Plane",
-    description: "Allow third-party image libraries",
+    description: "Allow third-party image libraries.",
     href: `/image/`,
   },
 ];

admin/core/components/auth-header.tsx

@@ -30,9 +30,13 @@ export const InstanceHeader: FC = observer(() => {
       case "google":
         return "Google";
       case "github":
-        return "Github";
+        return "GitHub";
       case "gitlab":
         return "GitLab";
+      case "workspace":
+        return "Workspace";
+      case "create":
+        return "Create";
       default:
         return pathName.toUpperCase();
     }

admin/core/components/new-user-popup.tsx

@@ -1,13 +1,13 @@
 "use client";
 
 import React from "react";
+import { resolveGeneralTheme } from "helpers/common.helper";
 import { observer } from "mobx-react";
 import Image from "next/image";
+import Link from "next/link";
 import { useTheme as nextUseTheme } from "next-themes";
 // ui
 import { Button, getButtonStyling } from "@plane/ui";
-// helpers
-import { WEB_BASE_URL, resolveGeneralTheme } from "helpers/common.helper";
 // hooks
 import { useTheme } from "@/hooks/store";
 // icons
@@ -20,8 +20,6 @@ export const NewUserPopup: React.FC = observer(() => {
   // theme
   const { resolvedTheme } = nextUseTheme();
 
-  const redirectionLink = encodeURI(WEB_BASE_URL + "/create-workspace");
-
   if (!isNewUserPopup) return <></>;
   return (
     <div className="absolute bottom-8 right-8 p-6 w-96 border border-custom-border-100 shadow-md rounded-lg bg-custom-background-100">
@@ -30,12 +28,12 @@ export const NewUserPopup: React.FC = observer(() => {
           <div className="text-base font-semibold">Create workspace</div>
           <div className="py-2 text-sm font-medium text-custom-text-300">
             Instance setup done! Welcome to Plane instance portal. Start your journey with by creating your first
-            workspace, you will need to login again.
+            workspace.
           </div>
           <div className="flex items-center gap-4 pt-2">
-            <a href={redirectionLink} className={getButtonStyling("primary", "sm")}>
+            <Link href="/workspace/create" className={getButtonStyling("primary", "sm")}>
               Create workspace
-            </a>
+            </Link>
             <Button variant="neutral-primary" size="sm" onClick={toggleNewUserPopup}>
               Close
             </Button>

admin/core/components/workspace/index.ts

@@ -1,2 +1 @@
 export * from "./list-item";
-export * from "./list";

admin/core/components/workspace/list-item.tsx

@@ -0,0 +1,81 @@
+import { observer } from "mobx-react";
+import { ExternalLink } from "lucide-react";
+// helpers
+import { Tooltip } from "@plane/ui";
+import { WEB_BASE_URL } from "@/helpers/common.helper";
+import { getFileURL } from "@/helpers/file.helper";
+// hooks
+import { useWorkspace } from "@/hooks/store";
+
+type TWorkspaceListItemProps = {
+  workspaceId: string;
+};
+
+export const WorkspaceListItem = observer(({ workspaceId }: TWorkspaceListItemProps) => {
+  // store hooks
+  const { getWorkspaceById } = useWorkspace();
+  // derived values
+  const workspace = getWorkspaceById(workspaceId);
+
+  if (!workspace) return null;
+  return (
+    <a
+      key={workspaceId}
+      href={`${WEB_BASE_URL}/${encodeURIComponent(workspace.slug)}`}
+      target="_blank"
+      className="group flex items-center justify-between p-4 gap-2.5 truncate border border-custom-border-200/70 hover:border-custom-border-200 hover:bg-custom-background-90 rounded-md"
+    >
+      <div className="flex items-start gap-4">
+        <span
+          className={`relative flex h-8 w-8 flex-shrink-0 items-center justify-center p-2 mt-1 text-xs uppercase ${
+            !workspace?.logo_url && "rounded bg-custom-primary-500 text-white"
+          }`}
+        >
+          {workspace?.logo_url && workspace.logo_url !== "" ? (
+            <img
+              src={getFileURL(workspace.logo_url)}
+              className="absolute left-0 top-0 h-full w-full rounded object-cover"
+              alt="Workspace Logo"
+            />
+          ) : (
+            (workspace?.name?.[0] ?? "...")
+          )}
+        </span>
+        <div className="flex flex-col items-start gap-1">
+          <div className="flex flex-wrap w-full items-center gap-2.5">
+            <h3 className={`text-base font-medium capitalize`}>{workspace.name}</h3>/
+            <Tooltip tooltipContent="The unique URL of your workspace">
+              <h4 className="text-sm text-custom-text-300">[{workspace.slug}]</h4>
+            </Tooltip>
+          </div>
+          {workspace.owner.email && (
+            <div className="flex items-center gap-1 text-xs">
+              <h3 className="text-custom-text-200 font-medium">Owned by:</h3>
+              <h4 className="text-custom-text-300">{workspace.owner.email}</h4>
+            </div>
+          )}
+          <div className="flex items-center gap-2.5 text-xs">
+            {workspace.total_projects !== null && (
+              <span className="flex items-center gap-1">
+                <h3 className="text-custom-text-200 font-medium">Total projects:</h3>
+                <h4 className="text-custom-text-300">{workspace.total_projects}</h4>
+              </span>
+            )}
+            {workspace.total_members !== null && (
+              <>
+                •
+                <span className="flex items-center gap-1">
+                  <h3 className="text-custom-text-200 font-medium">Total members:</h3>
+                  <h4 className="text-custom-text-300">{workspace.total_members}</h4>
+                </span>
+              </>
+            )}
+          </div>
+        </div>
+      </div>
+      <div className="flex-shrink-0">
+        <ExternalLink size={14} className="text-custom-text-400 group-hover:text-custom-text-200" />
+      </div>
+    </a>
+  );
+});

admin/core/hooks/store/index.ts

@@ -1,3 +1,4 @@
 export * from "./use-theme";
 export * from "./use-instance";
 export * from "./use-user";
+export * from "./use-workspace";

admin/core/hooks/store/use-workspace.tsx

@@ -0,0 +1,10 @@
+import { useContext } from "react";
+// store
+import { StoreContext } from "@/lib/store-provider";
+import { IWorkspaceStore } from "@/store/workspace.store";
+
+export const useWorkspace = (): IWorkspaceStore => {
+  const context = useContext(StoreContext);
+  if (context === undefined) throw new Error("useWorkspace must be used within StoreProvider");
+  return context.workspace;
+};

admin/core/layouts/admin-layout.tsx

@@ -2,7 +2,6 @@
 import { FC, ReactNode, useEffect } from "react";
 import { observer } from "mobx-react";
 import { useRouter } from "next/navigation";
-import useSWR from "swr";
 // components
 import { InstanceSidebar } from "@/components/admin-sidebar";
 import { InstanceHeader } from "@/components/auth-header";
@@ -10,8 +9,6 @@ import { LogoSpinner } from "@/components/common";
 import { NewUserPopup } from "@/components/new-user-popup";
 // hooks
 import { useUser } from "@/hooks/store";
-// plane admin hooks
-import { useInstanceFeatureFlags } from "@/plane-admin/hooks/store/use-instance-feature-flag";
 
 type TAdminLayout = {
   children: ReactNode;
@@ -23,14 +20,6 @@ export const AdminLayout: FC<TAdminLayout> = observer((props) => {
   const router = useRouter();
   // store hooks
   const { isUserLoggedIn } = useUser();
-  // plane admin hooks
-  const { fetchInstanceFeatureFlags } = useInstanceFeatureFlags();
-  // fetching instance feature flags
-  const { isLoading: flagsLoader, error: flagsError } = useSWR(
-    `INSTANCE_FEATURE_FLAGS`,
-    () => fetchInstanceFeatureFlags(),
-    { revalidateOnFocus: false, revalidateIfStale: false, errorRetryCount: 1 }
-  );
 
   useEffect(() => {
     if (isUserLoggedIn === false) {
@@ -38,7 +27,7 @@ export const AdminLayout: FC<TAdminLayout> = observer((props) => {
     }
   }, [router, isUserLoggedIn]);
 
-  if ((flagsLoader && !flagsError) || isUserLoggedIn === undefined) {
+  if (isUserLoggedIn === undefined) {
     return (
       <div className="relative flex h-screen w-full items-center justify-center">
         <LogoSpinner />

admin/core/services/workspace.service.ts

@@ -0,0 +1,53 @@
+// types
+import type { IWorkspace, TWorkspacePaginationInfo } from "@plane/types";
+// helpers
+import { API_BASE_URL } from "@/helpers/common.helper";
+// services
+import { APIService } from "@/services/api.service";
+
+export class WorkspaceService extends APIService {
+  constructor() {
+    super(API_BASE_URL);
+  }
+
+  /**
+   * @description Fetches all workspaces
+   * @returns Promise<TWorkspacePaginationInfo>
+   */
+  async getWorkspaces(nextPageCursor?: string): Promise<TWorkspacePaginationInfo> {
+    return this.get<TWorkspacePaginationInfo>("/api/instances/workspaces/", {
+      cursor: nextPageCursor,
+    })
+      .then((response) => response.data)
+      .catch((error) => {
+        throw error?.response?.data;
+      });
+  }
+
+  /**
+   * @description Checks if a slug is available
+   * @param slug - string
+   * @returns Promise<any>
+   */
+  async workspaceSlugCheck(slug: string): Promise<any> {
+    const params = new URLSearchParams({ slug });
+    return this.get(`/api/instances/workspace-slug-check/?${params.toString()}`)
+      .then((response) => response?.data)
+      .catch((error) => {
+        throw error?.response?.data;
+      });
+  }
+
+  /**
+   * @description Creates a new workspace
+   * @param data - IWorkspace
+   * @returns Promise<IWorkspace>
+   */
+  async createWorkspace(data: IWorkspace): Promise<IWorkspace> {
+    return this.post<IWorkspace, IWorkspace>("/api/instances/workspaces/", data)
+      .then((response) => response.data)
+      .catch((error) => {
+        throw error?.response?.data;
+      });
+  }
+}

admin/core/store/root.store.ts

@@ -3,6 +3,7 @@ import { enableStaticRendering } from "mobx-react";
 import { IInstanceStore, InstanceStore } from "./instance.store";
 import { IThemeStore, ThemeStore } from "./theme.store";
 import { IUserStore, UserStore } from "./user.store";
+import { IWorkspaceStore, WorkspaceStore } from "./workspace.store";
 
 enableStaticRendering(typeof window === "undefined");
 
@@ -10,17 +11,20 @@ export abstract class CoreRootStore {
   theme: IThemeStore;
   instance: IInstanceStore;
   user: IUserStore;
+  workspace: IWorkspaceStore;
 
   constructor() {
     this.theme = new ThemeStore(this);
     this.instance = new InstanceStore(this);
     this.user = new UserStore(this);
+    this.workspace = new WorkspaceStore(this);
   }
 
   hydrate(initialData: any) {
     this.theme.hydrate(initialData.theme);
     this.instance.hydrate(initialData.instance);
     this.user.hydrate(initialData.user);
+    this.workspace.hydrate(initialData.workspace);
   }
 
   resetOnSignOut() {
@@ -28,5 +32,6 @@ export abstract class CoreRootStore {
     this.instance = new InstanceStore(this);
     this.user = new UserStore(this);
     this.theme = new ThemeStore(this);
+    this.workspace = new WorkspaceStore(this);
   }
 }

admin/core/store/workspace.store.ts

@@ -0,0 +1,150 @@
+import set from "lodash/set";
+import { action, observable, runInAction, makeObservable, computed } from "mobx";
+import { IWorkspace, TLoader, TPaginationInfo } from "@plane/types";
+// services
+import { WorkspaceService } from "@/services/workspace.service";
+// root store
+import { CoreRootStore } from "@/store/root.store";
+
+export interface IWorkspaceStore {
+  // observables
+  loader: TLoader;
+  workspaces: Record<string, IWorkspace>;
+  paginationInfo: TPaginationInfo | undefined;
+  // computed
+  workspaceIds: string[];
+  // helper actions
+  hydrate: (data: Record<string, IWorkspace>) => void;
+  getWorkspaceById: (workspaceId: string) => IWorkspace | undefined;
+  // fetch actions
+  fetchWorkspaces: () => Promise<IWorkspace[]>;
+  fetchNextWorkspaces: () => Promise<IWorkspace[]>;
+  // curd actions
+  createWorkspace: (data: IWorkspace) => Promise<IWorkspace>;
+}
+
+export class WorkspaceStore implements IWorkspaceStore {
+  // observables
+  loader: TLoader = "init-loader";
+  workspaces: Record<string, IWorkspace> = {};
+  paginationInfo: TPaginationInfo | undefined = undefined;
+  // services
+  workspaceService;
+
+  constructor(private store: CoreRootStore) {
+    makeObservable(this, {
+      // observables
+      loader: observable,
+      workspaces: observable,
+      paginationInfo: observable,
+      // computed
+      workspaceIds: computed,
+      // helper actions
+      hydrate: action,
+      getWorkspaceById: action,
+      // fetch actions
+      fetchWorkspaces: action,
+      fetchNextWorkspaces: action,
+      // curd actions
+      createWorkspace: action,
+    });
+    this.workspaceService = new WorkspaceService();
+  }
+
+  // computed
+  get workspaceIds() {
+    return Object.keys(this.workspaces);
+  }
+
+  // helper actions
+  /**
+   * @description Hydrates the workspaces
+   * @param data - Record<string, IWorkspace>
+   */
+  hydrate = (data: Record<string, IWorkspace>) => {
+    if (data) this.workspaces = data;
+  };
+
+  /**
+   * @description Gets a workspace by id
+   * @param workspaceId - string
+   * @returns IWorkspace | undefined
+   */
+  getWorkspaceById = (workspaceId: string) => this.workspaces[workspaceId];
+
+  // fetch actions
+  /**
+   * @description Fetches all workspaces
+   * @returns Promise<>
+   */
+  fetchWorkspaces = async (): Promise<IWorkspace[]> => {
+    try {
+      if (this.workspaceIds.length > 0) {
+        this.loader = "mutation";
+      } else {
+        this.loader = "init-loader";
+      }
+      const paginatedWorkspaceData = await this.workspaceService.getWorkspaces();
+      runInAction(() => {
+        const { results, ...paginationInfo } = paginatedWorkspaceData;
+        results.forEach((workspace: IWorkspace) => {
+          set(this.workspaces, [workspace.id], workspace);
+        });
+        set(this, "paginationInfo", paginationInfo);
+      });
+      return paginatedWorkspaceData.results;
+    } catch (error) {
+      console.error("Error fetching workspaces", error);
+      throw error;
+    } finally {
+      this.loader = "loaded";
+    }
+  };
+
+  /**
+   * @description Fetches the next page of workspaces
+   * @returns Promise<IWorkspace[]>
+   */
+  fetchNextWorkspaces = async (): Promise<IWorkspace[]> => {
+    if (!this.paginationInfo || this.paginationInfo.next_page_results === false) return [];
+    try {
+      this.loader = "pagination";
+      const paginatedWorkspaceData = await this.workspaceService.getWorkspaces(this.paginationInfo.next_cursor);
+      runInAction(() => {
+        const { results, ...paginationInfo } = paginatedWorkspaceData;
+        results.forEach((workspace: IWorkspace) => {
+          set(this.workspaces, [workspace.id], workspace);
+        });
+        set(this, "paginationInfo", paginationInfo);
+      });
+      return paginatedWorkspaceData.results;
+    } catch (error) {
+      console.error("Error fetching next workspaces", error);
+      throw error;
+    } finally {
+      this.loader = "loaded";
+    }
+  };
+
+  // curd actions
+  /**
+   * @description Creates a new workspace
+   * @param data - IWorkspace
+   * @returns Promise<IWorkspace>
+   */
+  createWorkspace = async (data: IWorkspace): Promise<IWorkspace> => {
+    try {
+      this.loader = "mutation";
+      const workspace = await this.workspaceService.createWorkspace(data);
+      runInAction(() => {
+        set(this.workspaces, [workspace.id], workspace);
+      });
+      return workspace;
+    } catch (error) {
+      console.error("Error creating workspace", error);
+      throw error;
+    } finally {
+      this.loader = "loaded";
+    }
+  };
+}

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

@@ -1,85 +1 @@
-import { observer } from "mobx-react";
-import Image from "next/image";
-import { useTheme } from "next-themes";
-import {
-  TInstanceAuthenticationMethodKeys as TBaseAuthenticationMethods,
-  TInstanceAuthenticationModes,
-  TInstanceEnterpriseAuthenticationMethodKeys,
-} from "@plane/types";
-import { getAuthenticationModes as getCEAuthenticationModes } from "@/ce/components/authentication/authentication-modes";
-// types
-// components
-import { AuthenticationMethodCard } from "@/components/authentication";
-// helpers
-import { getBaseAuthenticationModes } from "@/helpers/authentication.helper";
-// plane admin components
-import { OIDCConfiguration, SAMLConfiguration } from "@/plane-admin/components/authentication";
-// images
-import { useInstanceFlag } from "@/plane-admin/hooks/store/use-instance-flag";
-import OIDCLogo from "@/public/logos/oidc-logo.svg";
-import SAMLLogo from "@/public/logos/saml-logo.svg";
-// plane admin hooks
-
-type TInstanceAuthenticationMethodKeys = TBaseAuthenticationMethods | TInstanceEnterpriseAuthenticationMethodKeys;
-
-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;
-};
-
-// Enterprise authentication methods
-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: <OIDCConfiguration 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: <SAMLConfiguration disabled={disabled} updateConfig={updateConfig} />,
-  },
-];
-
-export const AuthenticationModes: React.FC<TAuthenticationModeProps> = observer((props) => {
-  const { disabled, updateConfig } = props;
-  // next-themes
-  const { resolvedTheme } = useTheme();
-  // plane admin hooks
-  const isOIDCSAMLEnabled = useInstanceFlag("OIDC_SAML_AUTH");
-
-  const authenticationModes = isOIDCSAMLEnabled
-    ? getAuthenticationModes({ disabled, updateConfig, resolvedTheme })
-    : getCEAuthenticationModes({ disabled, updateConfig, resolvedTheme });
-
-  return (
-    <>
-      {authenticationModes.map((method) => (
-        <AuthenticationMethodCard
-          key={method.key}
-          name={method.name}
-          description={method.description}
-          icon={method.icon}
-          config={method.config}
-          disabled={disabled}
-          unavailable={method.unavailable}
-        />
-      ))}
-    </>
-  );
-});
+export * from "ce/components/authentication/authentication-modes";

admin/ee/components/authentication/index.ts

@@ -1,4 +1 @@
 export * from "./authentication-modes";
-export * from "./oidc-config";
-export * from "./saml-config";
-export * from "./saml-attribute-mapping-table";

admin/ee/components/authentication/oidc-config.tsx

@@ -1,72 +0,0 @@
-"use client";
-
-import React from "react";
-import { observer } from "mobx-react-lite";
-import Link from "next/link";
-// icons
-import { Settings2 } from "lucide-react";
-// types
-import { TInstanceEnterpriseAuthenticationMethodKeys } from "@plane/types";
-// ui
-import { ToggleSwitch, getButtonStyling } from "@plane/ui";
-// helpers
-import { cn } from "@/helpers/common.helper";
-// hooks
-import { useInstance } from "@/hooks/store";
-
-type Props = {
-  disabled: boolean;
-  updateConfig: (
-    key: TInstanceEnterpriseAuthenticationMethodKeys,
-    value: string
-  ) => void;
-};
-
-export const OIDCConfiguration: React.FC<Props> = observer((props) => {
-  const { disabled, updateConfig } = props;
-  // store
-  const { formattedConfig } = useInstance();
-  // derived values
-  const enableOIDCConfig = formattedConfig?.IS_OIDC_ENABLED ?? "";
-  const isOIDCConfigured =
-    !!formattedConfig?.OIDC_CLIENT_ID && !!formattedConfig?.OIDC_CLIENT_SECRET;
-
-  return (
-    <>
-      {isOIDCConfigured ? (
-        <div className="flex items-center gap-4">
-          <Link
-            href="/authentication/oidc"
-            className={cn(
-              getButtonStyling("link-primary", "md"),
-              "font-medium"
-            )}
-          >
-            Edit
-          </Link>
-          <ToggleSwitch
-            value={Boolean(parseInt(enableOIDCConfig))}
-            onChange={() => {
-              Boolean(parseInt(enableOIDCConfig)) === true
-                ? updateConfig("IS_OIDC_ENABLED", "0")
-                : updateConfig("IS_OIDC_ENABLED", "1");
-            }}
-            size="sm"
-            disabled={disabled}
-          />
-        </div>
-      ) : (
-        <Link
-          href="/authentication/oidc"
-          className={cn(
-            getButtonStyling("neutral-primary", "sm"),
-            "text-custom-text-300"
-          )}
-        >
-          <Settings2 className="h-4 w-4 p-0.5 text-custom-text-300/80" />
-          Configure
-        </Link>
-      )}
-    </>
-  );
-});

admin/ee/components/authentication/saml-attribute-mapping-table.tsx

@@ -1,28 +0,0 @@
-export const SAMLAttributeMappingTable = () => (
-  <table className="table-auto border-collapse text-custom-text-200 text-sm">
-    <thead>
-      <tr className="text-left">
-        <th className="border-b border-r border-custom-border-300 px-4 py-1.5">IdP</th>
-        <th className="border-b border-custom-border-300 px-4 py-1.5">Plane</th>
-      </tr>
-    </thead>
-    <tbody>
-      <tr>
-        <td className="border-t border-r border-custom-border-300 px-4 py-1.5">Name ID format</td>
-        <td className="border-t border-custom-border-300 px-4 py-1.5">emailAddress</td>
-      </tr>
-      <tr>
-        <td className="border-t border-r border-custom-border-300 px-4 py-1.5">first_name</td>
-        <td className="border-t border-custom-border-300 px-4 py-1.5">user.firstName</td>
-      </tr>
-      <tr>
-        <td className="border-t border-r border-custom-border-300 px-4 py-1.5">last_name</td>
-        <td className="border-t border-custom-border-300 px-4 py-1.5">user.lastName</td>
-      </tr>
-      <tr>
-        <td className="border-t border-r border-custom-border-300 px-4 py-1.5">email</td>
-        <td className="border-t border-custom-border-300 px-4 py-1.5">user.email</td>
-      </tr>
-    </tbody>
-  </table>
-);

admin/ee/components/authentication/saml-config.tsx

@@ -1,72 +0,0 @@
-"use client";
-
-import React from "react";
-import { observer } from "mobx-react-lite";
-import Link from "next/link";
-// icons
-import { Settings2 } from "lucide-react";
-// types
-import { TInstanceEnterpriseAuthenticationMethodKeys } from "@plane/types";
-// ui
-import { ToggleSwitch, getButtonStyling } from "@plane/ui";
-// helpers
-import { cn } from "@/helpers/common.helper";
-// hooks
-import { useInstance } from "@/hooks/store";
-
-type Props = {
-  disabled: boolean;
-  updateConfig: (
-    key: TInstanceEnterpriseAuthenticationMethodKeys,
-    value: string
-  ) => void;
-};
-
-export const SAMLConfiguration: React.FC<Props> = observer((props) => {
-  const { disabled, updateConfig } = props;
-  // store
-  const { formattedConfig } = useInstance();
-  // derived values
-  const enableSAMLConfig = formattedConfig?.IS_SAML_ENABLED ?? "";
-  const isSAMLConfigured =
-    !!formattedConfig?.SAML_ENTITY_ID && !!formattedConfig?.SAML_CERTIFICATE;
-
-  return (
-    <>
-      {isSAMLConfigured ? (
-        <div className="flex items-center gap-4">
-          <Link
-            href="/authentication/saml"
-            className={cn(
-              getButtonStyling("link-primary", "md"),
-              "font-medium"
-            )}
-          >
-            Edit
-          </Link>
-          <ToggleSwitch
-            value={Boolean(parseInt(enableSAMLConfig))}
-            onChange={() => {
-              Boolean(parseInt(enableSAMLConfig)) === true
-                ? updateConfig("IS_SAML_ENABLED", "0")
-                : updateConfig("IS_SAML_ENABLED", "1");
-            }}
-            size="sm"
-            disabled={disabled}
-          />
-        </div>
-      ) : (
-        <Link
-          href="/authentication/saml"
-          className={cn(
-            getButtonStyling("neutral-primary", "sm"),
-            "text-custom-text-300"
-          )}
-        >
-          <Settings2 className="h-4 w-4 p-0.5 text-custom-text-300/80" />
-          Configure
-        </Link>
-      )}
-    </>
-  );
-});

admin/ee/components/common/index.ts

@@ -1 +1 @@
-export * from "./upgrade-button";
+export * from "ce/components/common";

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

@@ -1,39 +0,0 @@
-"use client";
-
-import React from "react";
-// ui
-import { AlertModalCore, Button } from "@plane/ui";
-// helpers
-import { WEB_BASE_URL } from "@/helpers/common.helper";
-
-export const UpgradeButton: React.FC = () => {
-  // states
-  const [isActivationModalOpen, setIsActivationModalOpen] = React.useState(false);
-  // derived values
-  const redirectionLink = encodeURI(WEB_BASE_URL + "/");
-
-  return (
-    <>
-      <AlertModalCore
-        variant="primary"
-        isOpen={isActivationModalOpen}
-        handleClose={() => setIsActivationModalOpen(false)}
-        handleSubmit={() => {
-          window.open(redirectionLink, "_blank");
-          setIsActivationModalOpen(false);
-        }}
-        isSubmitting={false}
-        title="Activate workspace"
-        content="Activate any of your workspace to get this feature."
-        primaryButtonText={{
-          loading: "Redirecting...",
-          default: "Go to Plane",
-        }}
-        secondaryButtonText="Close"
-      />
-      <Button variant="primary" size="sm" onClick={() => setIsActivationModalOpen(true)}>
-        Activate workspace
-      </Button>
-    </>
-  );
-};

admin/ee/hooks/store/use-instance-feature-flag.ts

@@ -1,11 +0,0 @@
-import { useContext } from "react";
-// context
-import { StoreContext } from "@/lib/store-provider";
-// plane admin stores
-import { IInstanceFeatureFlagsStore } from "@/plane-admin/store/instance-feature-flags.store";
-
-export const useInstanceFeatureFlags = (): IInstanceFeatureFlagsStore => {
-  const context = useContext(StoreContext);
-  if (context === undefined) throw new Error("useInstanceFeatureFlags must be used within StoreProvider");
-  return context.instanceFeatureFlags;
-};

admin/ee/hooks/store/use-instance-flag.ts

@@ -1,13 +0,0 @@
-import { useContext } from "react";
-// context
-import { StoreContext } from "@/lib/store-provider";
-
-export enum E_FEATURE_FLAGS {
-  OIDC_SAML_AUTH = "OIDC_SAML_AUTH",
-}
-
-export const useInstanceFlag = (flag: keyof typeof E_FEATURE_FLAGS, defaultValue: boolean = false): boolean => {
-  const context = useContext(StoreContext);
-  if (context === undefined) throw new Error("useInstanceFlag must be used within StoreProvider");
-  return context.instanceFeatureFlags.flags?.[E_FEATURE_FLAGS[flag]] ?? defaultValue;
-};

admin/ee/services/instance-feature-flag.service.ts

@@ -1,21 +0,0 @@
-import { API_BASE_URL } from "@/helpers/common.helper";
-// services
-import { APIService } from "@/services/api.service";
-
-export type TInstanceFeatureFlagsResponse = {
-  [featureFlag: string]: boolean;
-};
-
-export class InstanceFeatureFlagService extends APIService {
-  constructor() {
-    super(API_BASE_URL);
-  }
-
-  async getInstanceFeatureFlags(): Promise<TInstanceFeatureFlagsResponse> {
-    return this.get<TInstanceFeatureFlagsResponse>("/api/instances/admins/feature-flags/")
-      .then((response) => response.data)
-      .catch((error) => {
-        throw error;
-      });
-  }
-}

admin/ee/store/instance-feature-flags.store.ts

@@ -1,50 +0,0 @@
-import { set } from "lodash";
-import { action, makeObservable, observable, runInAction } from "mobx";
-// services
-import {
-  InstanceFeatureFlagService,
-  TInstanceFeatureFlagsResponse,
-} from "@/plane-admin/services/instance-feature-flag.service";
-
-const instanceFeatureFlagService = new InstanceFeatureFlagService();
-
-type TFeatureFlagsMaps = Record<string, boolean>; // feature flag -> boolean
-
-export interface IInstanceFeatureFlagsStore {
-  flags: TFeatureFlagsMaps;
-  // actions
-  hydrate: (data: any) => void;
-  fetchInstanceFeatureFlags: () => Promise<TInstanceFeatureFlagsResponse>;
-}
-
-export class InstanceFeatureFlagsStore implements IInstanceFeatureFlagsStore {
-  flags: TFeatureFlagsMaps = {};
-
-  constructor() {
-    makeObservable(this, {
-      flags: observable,
-      fetchInstanceFeatureFlags: action,
-    });
-  }
-
-  hydrate = (data: any) => {
-    if (data) this.flags = data;
-  };
-
-  fetchInstanceFeatureFlags = async () => {
-    try {
-      const response = await instanceFeatureFlagService.getInstanceFeatureFlags();
-      runInAction(() => {
-        if (response) {
-          Object.keys(response).forEach((key) => {
-            set(this.flags, key, response[key]);
-          });
-        }
-      });
-      return response;
-    } catch (error) {
-      console.error("Error fetching instance feature flags", error);
-      throw error;
-    }
-  };
-}

admin/ee/store/root.store.ts

@@ -1,29 +1 @@
-import { enableStaticRendering } from "mobx-react";
-// stores
-import {
-  IInstanceFeatureFlagsStore,
-  InstanceFeatureFlagsStore,
-} from "@/plane-admin/store/instance-feature-flags.store";
-import { CoreRootStore } from "@/store/root.store";
-// plane admin store
-
-enableStaticRendering(typeof window === "undefined");
-
-export class RootStore extends CoreRootStore {
-  instanceFeatureFlags: IInstanceFeatureFlagsStore;
-
-  constructor() {
-    super();
-    this.instanceFeatureFlags = new InstanceFeatureFlagsStore();
-  }
-
-  hydrate(initialData: any) {
-    super.hydrate(initialData);
-    this.instanceFeatureFlags.hydrate(initialData.instanceFeatureFlags);
-  }
-
-  resetOnSignOut() {
-    super.resetOnSignOut();
-    this.instanceFeatureFlags = new InstanceFeatureFlagsStore();
-  }
-}
+export * from "ce/store/root.store";

admin/package.json

@@ -1,6 +1,6 @@
 {
   "name": "admin",
-  "version": "0.23.1",
+  "version": "0.24.1",
   "private": true,
   "scripts": {
     "dev": "turbo run develop",
@@ -14,9 +14,10 @@
   "dependencies": {
     "@headlessui/react": "^1.7.19",
     "@plane/constants": "*",
-    "@plane/helpers": "*",
+    "@plane/hooks": "*",
     "@plane/types": "*",
     "@plane/ui": "*",
+    "@plane/utils": "*",
     "@sentry/nextjs": "^8.32.0",
     "@tailwindcss/typography": "^0.5.9",
     "@types/lodash": "^4.17.0",
@@ -26,7 +27,7 @@
     "lucide-react": "^0.356.0",
     "mobx": "^6.12.0",
     "mobx-react": "^9.1.1",
-    "next": "^14.2.12",
+    "next": "^14.2.20",
     "next-themes": "^0.2.1",
     "postcss": "^8.4.38",
     "react": "^18.3.1",

admin/tsconfig.json

@@ -7,8 +7,7 @@
       "@/*": ["core/*"],
       "@/helpers/*": ["helpers/*"],
       "@/public/*": ["public/*"],
-      "@/plane-admin/*": ["ee/*"],
-      "@/ce/*": ["ce/*"]
+      "@/plane-admin/*": ["ce/*"]
     }
   },
   "include": ["next-env.d.ts", "next.config.js", "**/*.ts", "**/*.tsx", ".next/types/**/*.ts"],

apiserver/.env.example

@@ -56,7 +56,6 @@ GUNICORN_WORKERS=2
 ADMIN_BASE_URL=
 SPACE_BASE_URL=
 APP_BASE_URL=
-SILO_BASE_URL=
 
 
 # Hard delete files after days

apiserver/Dockerfile.api

@@ -3,8 +3,8 @@ FROM python:3.12.5-alpine AS backend
 # set environment variables
 ENV PYTHONDONTWRITEBYTECODE 1
 ENV PYTHONUNBUFFERED 1
-ENV PIP_DISABLE_PIP_VERSION_CHECK=1
-ENV INSTANCE_CHANGELOG_URL https://api.plane.so/api/public/anchor/c210fcf7b0ff439490b1cd606b4bb92b/pages/
+ENV PIP_DISABLE_PIP_VERSION_CHECK=1 
+ENV INSTANCE_CHANGELOG_URL https://sites.plane.so/pages/691ef037bcfe416a902e48cb55f59891/
 
 WORKDIR /code
 

apiserver/Dockerfile.dev

@@ -4,7 +4,7 @@ FROM python:3.12.5-alpine AS backend
 ENV PYTHONDONTWRITEBYTECODE 1
 ENV PYTHONUNBUFFERED 1
 ENV PIP_DISABLE_PIP_VERSION_CHECK=1 
-ENV INSTANCE_CHANGELOG_URL https://api.plane.so/api/public/anchor/c210fcf7b0ff439490b1cd606b4bb92b/pages/
+ENV INSTANCE_CHANGELOG_URL https://sites.plane.so/pages/691ef037bcfe416a902e48cb55f59891/
 
 RUN apk --no-cache add \
     "bash~=5.2" \
@@ -21,8 +21,7 @@ RUN apk --no-cache add \
     "make" \
     "postgresql-dev" \
     "libc-dev" \
-    "linux-headers" \
-    "xmlsec-dev"
+    "linux-headers"
 
 WORKDIR /code
 

apiserver/README.md

@@ -1 +0,0 @@
-# API SERVER

apiserver/back_migration.py

@@ -26,9 +26,7 @@ def update_description():
             updated_issues.append(issue)
 
         Issue.objects.bulk_update(
-            updated_issues,
-            ["description_html", "description_stripped"],
-            batch_size=100,
+            updated_issues, ["description_html", "description_stripped"], batch_size=100
         )
         print("Success")
     except Exception as e:
@@ -42,9 +40,7 @@ def update_comments():
         updated_issue_comments = []
 
         for issue_comment in issue_comments:
-            issue_comment.comment_html = (
-                f"<p>{issue_comment.comment_stripped}</p>"
-            )
+            issue_comment.comment_html = f"<p>{issue_comment.comment_stripped}</p>"
             updated_issue_comments.append(issue_comment)
 
         IssueComment.objects.bulk_update(
@@ -103,9 +99,7 @@ def updated_issue_sort_order():
             issue.sort_order = issue.sequence_id * random.randint(100, 500)
             updated_issues.append(issue)
 
-        Issue.objects.bulk_update(
-            updated_issues, ["sort_order"], batch_size=100
-        )
+        Issue.objects.bulk_update(updated_issues, ["sort_order"], batch_size=100)
         print("Success")
     except Exception as e:
         print(e)
@@ -143,9 +137,7 @@ def update_project_cover_images():
             project.cover_image = project_cover_images[random.randint(0, 19)]
             updated_projects.append(project)
 
-        Project.objects.bulk_update(
-            updated_projects, ["cover_image"], batch_size=100
-        )
+        Project.objects.bulk_update(updated_projects, ["cover_image"], batch_size=100)
         print("Success")
     except Exception as e:
         print(e)
@@ -194,9 +186,7 @@ def update_label_color():
 
 def create_slack_integration():
     try:
-        _ = Integration.objects.create(
-            provider="slack", network=2, title="Slack"
-        )
+        _ = Integration.objects.create(provider="slack", network=2, title="Slack")
         print("Success")
     except Exception as e:
         print(e)
@@ -222,16 +212,12 @@ def update_integration_verified():
 
 def update_start_date():
     try:
-        issues = Issue.objects.filter(
-            state__group__in=["started", "completed"]
-        )
+        issues = Issue.objects.filter(state__group__in=["started", "completed"])
         updated_issues = []
         for issue in issues:
             issue.start_date = issue.created_at.date()
             updated_issues.append(issue)
-        Issue.objects.bulk_update(
-            updated_issues, ["start_date"], batch_size=500
-        )
+        Issue.objects.bulk_update(updated_issues, ["start_date"], batch_size=500)
         print("Success")
     except Exception as e:
         print(e)

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

@@ -1,18 +0,0 @@
-#!/bin/bash
-set -e
-
-export SKIP_ENV_VAR=0
-
-python manage.py wait_for_db
-# Wait for migrations
-python manage.py wait_for_migrations
-
-# Clear Cache before starting to remove stale values
-python manage.py clear_cache
-
-# Register instance if INSTANCE_ADMIN_EMAIL is set
-if [ -n "$INSTANCE_ADMIN_EMAIL" ]; then
-    python manage.py setup_instance $INSTANCE_ADMIN_EMAIL
-fi
-
-exec gunicorn -w "$GUNICORN_WORKERS" -k uvicorn.workers.UvicornWorker plane.asgi:application --bind 0.0.0.0:"${PORT:-8000}" --max-requests 1200 --max-requests-jitter 1000 --access-logfile -

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

@@ -1,39 +0,0 @@
-#!/bin/bash
-set -e
-python manage.py wait_for_db
-# Wait for migrations
-python manage.py wait_for_migrations
-
-# Create the default bucket
-#!/bin/bash
-
-# Collect system information
-HOSTNAME=$(hostname)
-MAC_ADDRESS=$(ip link show | awk '/ether/ {print $2}' | head -n 1)
-CPU_INFO=$(cat /proc/cpuinfo)
-MEMORY_INFO=$(free -h)
-DISK_INFO=$(df -h)
-
-# Concatenate information and compute SHA-256 hash
-SIGNATURE=$(echo "$HOSTNAME$MAC_ADDRESS$CPU_INFO$MEMORY_INFO$DISK_INFO" | sha256sum | awk '{print $1}')
-
-# Export the variables
-MACHINE_SIGNATURE=${MACHINE_SIGNATURE:-$SIGNATURE}
-export SKIP_ENV_VAR=1
-
-# Register instance
-python manage.py register_instance_ee "$MACHINE_SIGNATURE"
-
-# Load the configuration variable
-python manage.py configure_instance
-
-# Create the default bucket
-python manage.py create_bucket
-
-# Clear Cache before starting to remove stale values
-python manage.py clear_cache
-
-# Clear workspace licenses
-python manage.py clear_workspace_licenses
-
-exec gunicorn -w "$GUNICORN_WORKERS" -k uvicorn.workers.UvicornWorker plane.asgi:application --bind 0.0.0.0:"${PORT:-8000}" --max-requests 1200 --max-requests-jitter 1000 --access-logfile -

apiserver/bin/docker-entrypoint-api.sh

@@ -32,4 +32,4 @@ python manage.py create_bucket
 # Clear Cache before starting to remove stale values
 python manage.py clear_cache
 
-exec gunicorn -w "$GUNICORN_WORKERS" -k uvicorn.workers.UvicornWorker plane.asgi:application --bind 0.0.0.0:"${PORT:-8000}" --max-requests 1200 --max-requests-jitter 1000 --access-logfile -
+exec gunicorn -w "$GUNICORN_WORKERS" -k uvicorn.workers.UvicornWorker plane.asgi:application --bind 0.0.0.0:"${PORT:-8000}" --max-requests 1200 --max-requests-jitter 1000 --access-logfile -

apiserver/manage.py

@@ -3,9 +3,7 @@ import os
 import sys
 
 if __name__ == "__main__":
-    os.environ.setdefault(
-        "DJANGO_SETTINGS_MODULE", "plane.settings.production"
-    )
+    os.environ.setdefault("DJANGO_SETTINGS_MODULE", "plane.settings.production")
     try:
         from django.core.management import execute_from_command_line
     except ImportError as exc:

apiserver/package.json

@@ -1,4 +1,4 @@
 {
   "name": "plane-api",
-  "version": "0.23.1"
+  "version": "0.24.1"
 }

apiserver/plane/api/middleware/api_authentication.py

@@ -25,10 +25,7 @@ class APIKeyAuthentication(authentication.BaseAuthentication):
     def validate_api_token(self, token):
         try:
             api_token = APIToken.objects.get(
-                Q(
-                    Q(expired_at__gt=timezone.now())
-                    | Q(expired_at__isnull=True)
-                ),
+                Q(Q(expired_at__gt=timezone.now()) | Q(expired_at__isnull=True)),
                 token=token,
                 is_active=True,
             )

apiserver/plane/api/rate_limit.py

@@ -80,4 +80,4 @@ class ServiceTokenRateThrottle(SimpleRateThrottle):
             request.META["X-RateLimit-Remaining"] = max(0, available)
             request.META["X-RateLimit-Reset"] = reset_time
 
-        return allowed
+        return allowed

apiserver/plane/api/serializers/__init__.py

@@ -13,10 +13,5 @@ from .issue import (
 )
 from .state import StateLiteSerializer, StateSerializer
 from .cycle import CycleSerializer, CycleIssueSerializer, CycleLiteSerializer
-from .module import (
-    ModuleSerializer,
-    ModuleIssueSerializer,
-    ModuleLiteSerializer,
-)
+from .module import ModuleSerializer, ModuleIssueSerializer, ModuleLiteSerializer
 from .intake import IntakeIssueSerializer
-from .issue_type import IssueTypeAPISerializer, ProjectIssueTypeAPISerializer

apiserver/plane/api/serializers/base.py

@@ -102,8 +102,6 @@ class BaseSerializer(serializers.ModelSerializer):
                         response[expand] = exp_serializer.data
                     else:
                         # You might need to handle this case differently
-                        response[expand] = getattr(
-                            instance, f"{expand}_id", None
-                        )
+                        response[expand] = getattr(instance, f"{expand}_id", None)
 
         return response

apiserver/plane/api/serializers/cycle.py

@@ -4,7 +4,7 @@ from rest_framework import serializers
 # Module imports
 from .base import BaseSerializer
 from plane.db.models import Cycle, CycleIssue
-
+from plane.utils.timezone_converter import convert_to_utc
 
 class CycleSerializer(BaseSerializer):
     total_issues = serializers.IntegerField(read_only=True)
@@ -23,8 +23,18 @@ class CycleSerializer(BaseSerializer):
             and data.get("end_date", None) is not None
             and data.get("start_date", None) > data.get("end_date", None)
         ):
-            raise serializers.ValidationError(
-                "Start date cannot exceed end date"
+            raise serializers.ValidationError("Start date cannot exceed end date")
+
+        if (
+            data.get("start_date", None) is not None
+            and data.get("end_date", None) is not None
+        ):
+            project_id = self.initial_data.get("project_id") or self.instance.project_id
+            data["start_date"] = convert_to_utc(
+                str(data.get("start_date").date()), project_id, is_start_date=True
+            )
+            data["end_date"] = convert_to_utc(
+                str(data.get("end_date", None).date()), project_id
             )
         return data
 
@@ -50,11 +60,7 @@ class CycleIssueSerializer(BaseSerializer):
     class Meta:
         model = CycleIssue
         fields = "__all__"
-        read_only_fields = [
-            "workspace",
-            "project",
-            "cycle",
-        ]
+        read_only_fields = ["workspace", "project", "cycle"]
 
 
 class CycleLiteSerializer(BaseSerializer):

apiserver/plane/api/serializers/intake.py

@@ -6,7 +6,6 @@ from rest_framework import serializers
 
 
 class IntakeIssueSerializer(BaseSerializer):
-
     issue_detail = IssueExpandSerializer(read_only=True, source="issue")
     inbox = serializers.UUIDField(source="intake.id", read_only=True)
 

apiserver/plane/api/serializers/issue.py

@@ -49,25 +49,13 @@ class IssueSerializer(BaseSerializer):
         required=False,
     )
     type_id = serializers.PrimaryKeyRelatedField(
-        source="type",
-        queryset=IssueType.objects.all(),
-        required=False,
-        allow_null=True,
+        source="type", queryset=IssueType.objects.all(), required=False, allow_null=True
     )
 
     class Meta:
         model = Issue
-        read_only_fields = [
-            "id",
-            "workspace",
-            "project",
-            "updated_by",
-            "updated_at",
-        ]
-        exclude = [
-            "description",
-            "description_stripped",
-        ]
+        read_only_fields = ["id", "workspace", "project", "updated_by", "updated_at"]
+        exclude = ["description", "description_stripped"]
 
     def validate(self, data):
         if (
@@ -75,9 +63,7 @@ class IssueSerializer(BaseSerializer):
             and data.get("target_date", None) is not None
             and data.get("start_date", None) > data.get("target_date", None)
         ):
-            raise serializers.ValidationError(
-                "Start date cannot exceed target date"
-            )
+            raise serializers.ValidationError("Start date cannot exceed target date")
 
         try:
             if data.get("description_html", None) is not None:
@@ -99,16 +85,14 @@ class IssueSerializer(BaseSerializer):
         # Validate labels are from project
         if data.get("labels", []):
             data["labels"] = Label.objects.filter(
-                project_id=self.context.get("project_id"),
-                id__in=data["labels"],
+                project_id=self.context.get("project_id"), id__in=data["labels"]
             ).values_list("id", flat=True)
 
         # Check state is from the project only else raise validation error
         if (
             data.get("state")
             and not State.objects.filter(
-                project_id=self.context.get("project_id"),
-                pk=data.get("state").id,
+                project_id=self.context.get("project_id"), pk=data.get("state").id
             ).exists()
         ):
             raise serializers.ValidationError(
@@ -119,8 +103,7 @@ class IssueSerializer(BaseSerializer):
         if (
             data.get("parent")
             and not Issue.objects.filter(
-                workspace_id=self.context.get("workspace_id"),
-                pk=data.get("parent").id,
+                workspace_id=self.context.get("workspace_id"), pk=data.get("parent").id
             ).exists()
         ):
             raise serializers.ValidationError(
@@ -147,9 +130,7 @@ class IssueSerializer(BaseSerializer):
             issue_type = issue_type
 
         issue = Issue.objects.create(
-            **validated_data,
-            project_id=project_id,
-            type=issue_type,
+            **validated_data, project_id=project_id, type=issue_type
         )
 
         # Issue Audit Users
@@ -264,13 +245,9 @@ class IssueSerializer(BaseSerializer):
                 ]
         if "labels" in self.fields:
             if "labels" in self.expand:
-                data["labels"] = LabelSerializer(
-                    instance.labels.all(), many=True
-                ).data
+                data["labels"] = LabelSerializer(instance.labels.all(), many=True).data
             else:
-                data["labels"] = [
-                    str(label.id) for label in instance.labels.all()
-                ]
+                data["labels"] = [str(label.id) for label in instance.labels.all()]
 
         return data
 
@@ -278,11 +255,7 @@ class IssueSerializer(BaseSerializer):
 class IssueLiteSerializer(BaseSerializer):
     class Meta:
         model = Issue
-        fields = [
-            "id",
-            "sequence_id",
-            "project_id",
-        ]
+        fields = ["id", "sequence_id", "project_id"]
         read_only_fields = fields
 
 
@@ -334,8 +307,7 @@ class IssueLinkSerializer(BaseSerializer):
     # Validation if url already exists
     def create(self, validated_data):
         if IssueLink.objects.filter(
-            url=validated_data.get("url"),
-            issue_id=validated_data.get("issue_id"),
+            url=validated_data.get("url"), issue_id=validated_data.get("issue_id")
         ).exists():
             raise serializers.ValidationError(
                 {"error": "URL already exists for this Issue"}
@@ -345,8 +317,7 @@ class IssueLinkSerializer(BaseSerializer):
     def update(self, instance, validated_data):
         if (
             IssueLink.objects.filter(
-                url=validated_data.get("url"),
-                issue_id=instance.issue_id,
+                url=validated_data.get("url"), issue_id=instance.issue_id
             )
             .exclude(pk=instance.id)
             .exists()
@@ -387,10 +358,7 @@ class IssueCommentSerializer(BaseSerializer):
             "created_at",
             "updated_at",
         ]
-        exclude = [
-            "comment_stripped",
-            "comment_json",
-        ]
+        exclude = ["comment_stripped", "comment_json"]
 
     def validate(self, data):
         try:
@@ -407,38 +375,27 @@ class IssueCommentSerializer(BaseSerializer):
 class IssueActivitySerializer(BaseSerializer):
     class Meta:
         model = IssueActivity
-        exclude = [
-            "created_by",
-            "updated_by",
-        ]
+        exclude = ["created_by", "updated_by"]
 
 
 class CycleIssueSerializer(BaseSerializer):
     cycle = CycleSerializer(read_only=True)
 
     class Meta:
-        fields = [
-            "cycle",
-        ]
+        fields = ["cycle"]
 
 
 class ModuleIssueSerializer(BaseSerializer):
     module = ModuleSerializer(read_only=True)
 
     class Meta:
-        fields = [
-            "module",
-        ]
+        fields = ["module"]
 
 
 class LabelLiteSerializer(BaseSerializer):
     class Meta:
         model = Label
-        fields = [
-            "id",
-            "name",
-            "color",
-        ]
+        fields = ["id", "name", "color"]
 
 
 class IssueExpandSerializer(BaseSerializer):

apiserver/plane/api/serializers/issue_type.py

@@ -1,45 +0,0 @@
-# Third party imports
-from rest_framework import serializers
-
-# Module imports
-from plane.ee.serializers import BaseSerializer
-from plane.db.models import IssueType, ProjectIssueType
-
-
-class IssueTypeAPISerializer(BaseSerializer):
-    project_ids = serializers.ListField(
-        child=serializers.UUIDField(),
-        required=False,
-    )
-
-    class Meta:
-        model = IssueType
-        fields = fields = "__all__"
-        read_only_fields = [
-            "workspace",
-            "logo_props",
-            "is_default",
-            "level",
-            "deleted_at",
-            "created_at",
-            "updated_at",
-            "created_by",
-            "updated_by",
-        ]
-
-
-class ProjectIssueTypeAPISerializer(BaseSerializer):
-    class Meta:
-        model = ProjectIssueType
-        fields = fields = "__all__"
-        read_only_fields = [
-            "workspace",
-            "project",
-            "level",
-            "is_default",
-            "deleted_at",
-            "created_at",
-            "updated_at",
-            "created_by",
-            "updated_by",
-        ]

apiserver/plane/api/serializers/module.py

@@ -53,14 +53,11 @@ class ModuleSerializer(BaseSerializer):
             and data.get("target_date", None) is not None
             and data.get("start_date", None) > data.get("target_date", None)
         ):
-            raise serializers.ValidationError(
-                "Start date cannot exceed target date"
-            )
+            raise serializers.ValidationError("Start date cannot exceed target date")
 
         if data.get("members", []):
             data["members"] = ProjectMember.objects.filter(
-                project_id=self.context.get("project_id"),
-                member_id__in=data["members"],
+                project_id=self.context.get("project_id"), member_id__in=data["members"]
             ).values_list("member_id", flat=True)
 
         return data
@@ -74,9 +71,7 @@ class ModuleSerializer(BaseSerializer):
         module_name = validated_data.get("name")
         if module_name:
             # Lookup for the module name in the module table for that project
-            if Module.objects.filter(
-                name=module_name, project_id=project_id
-            ).exists():
+            if Module.objects.filter(name=module_name, project_id=project_id).exists():
                 raise serializers.ValidationError(
                     {"error": "Module with this name already exists"}
                 )
@@ -107,9 +102,7 @@ class ModuleSerializer(BaseSerializer):
         if module_name:
             # Lookup for the module name in the module table for that project
             if (
-                Module.objects.filter(
-                    name=module_name, project=instance.project
-                )
+                Module.objects.filter(name=module_name, project=instance.project)
                 .exclude(id=instance.id)
                 .exists()
             ):
@@ -172,8 +165,7 @@ class ModuleLinkSerializer(BaseSerializer):
     # Validation if url already exists
     def create(self, validated_data):
         if ModuleLink.objects.filter(
-            url=validated_data.get("url"),
-            module_id=validated_data.get("module_id"),
+            url=validated_data.get("url"), module_id=validated_data.get("module_id")
         ).exists():
             raise serializers.ValidationError(
                 {"error": "URL already exists for this Issue"}

apiserver/plane/api/serializers/project.py

@@ -2,11 +2,7 @@
 from rest_framework import serializers
 
 # Module imports
-from plane.db.models import (
-    Project,
-    ProjectIdentifier,
-    WorkspaceMember,
-)
+from plane.db.models import Project, ProjectIdentifier, WorkspaceMember
 
 from .base import BaseSerializer
 
@@ -67,16 +63,12 @@ class ProjectSerializer(BaseSerializer):
     def create(self, validated_data):
         identifier = validated_data.get("identifier", "").strip().upper()
         if identifier == "":
-            raise serializers.ValidationError(
-                detail="Project Identifier is required"
-            )
+            raise serializers.ValidationError(detail="Project Identifier is required")
 
         if ProjectIdentifier.objects.filter(
             name=identifier, workspace_id=self.context["workspace_id"]
         ).exists():
-            raise serializers.ValidationError(
-                detail="Project Identifier is taken"
-            )
+            raise serializers.ValidationError(detail="Project Identifier is taken")
 
         project = Project.objects.create(
             **validated_data, workspace_id=self.context["workspace_id"]

apiserver/plane/api/serializers/state.py

@@ -7,9 +7,9 @@ class StateSerializer(BaseSerializer):
     def validate(self, data):
         # If the default is being provided then make all other states default False
         if data.get("default", False):
-            State.objects.filter(
-                project_id=self.context.get("project_id")
-            ).update(default=False)
+            State.objects.filter(project_id=self.context.get("project_id")).update(
+                default=False
+            )
         return data
 
     class Meta:
@@ -30,10 +30,5 @@ class StateSerializer(BaseSerializer):
 class StateLiteSerializer(BaseSerializer):
     class Meta:
         model = State
-        fields = [
-            "id",
-            "name",
-            "color",
-            "group",
-        ]
+        fields = ["id", "name", "color", "group"]
         read_only_fields = fields

apiserver/plane/api/serializers/workspace.py

@@ -8,9 +8,5 @@ class WorkspaceLiteSerializer(BaseSerializer):
 
     class Meta:
         model = Workspace
-        fields = [
-            "name",
-            "slug",
-            "id",
-        ]
+        fields = ["name", "slug", "id"]
         read_only_fields = fields

apiserver/plane/api/urls/__init__.py

@@ -5,9 +5,6 @@ from .cycle import urlpatterns as cycle_patterns
 from .module import urlpatterns as module_patterns
 from .intake import urlpatterns as intake_patterns
 from .member import urlpatterns as member_patterns
-from .issue_type import urlpatterns as issue_type_patterns
-# ee imports
-from plane.ee.urls.api.issue_property import urlpatterns as ee_issue_property_patterns
 
 urlpatterns = [
     *project_patterns,
@@ -17,6 +14,4 @@ urlpatterns = [
     *module_patterns,
     *intake_patterns,
     *member_patterns,
-    *issue_type_patterns,
-    *ee_issue_property_patterns,
 ]

apiserver/plane/api/urls/issue_type.py

@@ -1,18 +0,0 @@
-from django.urls import path
-
-from plane.api.views import IssueTypeAPIEndpoint
-
-urlpatterns = [
-    # ======================== issue types start ========================
-    path(
-        "workspaces/<str:slug>/projects/<uuid:project_id>/issue-types/",
-        IssueTypeAPIEndpoint.as_view(),
-        name="external-issue-type",
-    ),
-    path(
-        "workspaces/<str:slug>/projects/<uuid:project_id>/issue-types/<uuid:type_id>/",
-        IssueTypeAPIEndpoint.as_view(),
-        name="external-issue-type-detail",
-    ),
-    # ======================== issue types end ========================
-]

apiserver/plane/api/urls/member.py

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

apiserver/plane/api/urls/project.py

@@ -1,15 +1,10 @@
 from django.urls import path
 
-from plane.api.views import (
-    ProjectAPIEndpoint,
-    ProjectArchiveUnarchiveAPIEndpoint,
-)
+from plane.api.views import ProjectAPIEndpoint, ProjectArchiveUnarchiveAPIEndpoint
 
 urlpatterns = [
     path(
-        "workspaces/<str:slug>/projects/",
-        ProjectAPIEndpoint.as_view(),
-        name="project",
+        "workspaces/<str:slug>/projects/", ProjectAPIEndpoint.as_view(), name="project"
     ),
     path(
         "workspaces/<str:slug>/projects/<uuid:pk>/",

apiserver/plane/api/views/__init__.py

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

apiserver/plane/api/views/base.py

@@ -37,13 +37,9 @@ class TimezoneMixin:
 
 
 class BaseAPIView(TimezoneMixin, APIView, BasePaginator):
-    authentication_classes = [
-        APIKeyAuthentication,
-    ]
+    authentication_classes = [APIKeyAuthentication]
 
-    permission_classes = [
-        IsAuthenticated,
-    ]
+    permission_classes = [IsAuthenticated]
 
     def filter_queryset(self, queryset):
         for backend in list(self.filter_backends):
@@ -56,8 +52,7 @@ class BaseAPIView(TimezoneMixin, APIView, BasePaginator):
 
         if api_key:
             service_token = APIToken.objects.filter(
-                token=api_key,
-                is_service=True,
+                token=api_key, is_service=True
             ).first()
 
             if service_token:
@@ -123,9 +118,7 @@ class BaseAPIView(TimezoneMixin, APIView, BasePaginator):
 
     def finalize_response(self, request, response, *args, **kwargs):
         # Call super to get the default response
-        response = super().finalize_response(
-            request, response, *args, **kwargs
-        )
+        response = super().finalize_response(request, response, *args, **kwargs)
 
         # Add custom headers if they exist in the request META
         ratelimit_remaining = request.META.get("X-RateLimit-Remaining")
@@ -154,17 +147,13 @@ class BaseAPIView(TimezoneMixin, APIView, BasePaginator):
     @property
     def fields(self):
         fields = [
-            field
-            for field in self.request.GET.get("fields", "").split(",")
-            if field
+            field for field in self.request.GET.get("fields", "").split(",") if field
         ]
         return fields if fields else None
 
     @property
     def expand(self):
         expand = [
-            expand
-            for expand in self.request.GET.get("expand", "").split(",")
-            if expand
+            expand 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

@@ -25,10 +25,7 @@ from rest_framework import status
 from rest_framework.response import Response
 
 # Module imports
-from plane.api.serializers import (
-    CycleIssueSerializer,
-    CycleSerializer,
-)
+from plane.api.serializers import CycleIssueSerializer, CycleSerializer
 from plane.app.permissions import ProjectEntityPermission
 from plane.bgtasks.issue_activities_task import issue_activity
 from plane.db.models import (
@@ -57,9 +54,7 @@ class CycleAPIEndpoint(BaseAPIView):
     serializer_class = CycleSerializer
     model = Cycle
     webhook_event = "cycle"
-    permission_classes = [
-        ProjectEntityPermission,
-    ]
+    permission_classes = [ProjectEntityPermission]
 
     def get_queryset(self):
         return (
@@ -143,26 +138,18 @@ class CycleAPIEndpoint(BaseAPIView):
 
     def get(self, request, slug, project_id, pk=None):
         if pk:
-            queryset = (
-                self.get_queryset().filter(archived_at__isnull=True).get(pk=pk)
-            )
+            queryset = self.get_queryset().filter(archived_at__isnull=True).get(pk=pk)
             data = CycleSerializer(
-                queryset,
-                fields=self.fields,
-                expand=self.expand,
+                queryset, fields=self.fields, expand=self.expand
             ).data
-            return Response(
-                data,
-                status=status.HTTP_200_OK,
-            )
+            return Response(data, status=status.HTTP_200_OK)
         queryset = self.get_queryset().filter(archived_at__isnull=True)
         cycle_view = request.GET.get("cycle_view", "all")
 
         # Current Cycle
         if cycle_view == "current":
             queryset = queryset.filter(
-                start_date__lte=timezone.now(),
-                end_date__gte=timezone.now(),
+                start_date__lte=timezone.now(), end_date__gte=timezone.now()
             )
             data = CycleSerializer(
                 queryset, many=True, fields=self.fields, expand=self.expand
@@ -176,10 +163,7 @@ class CycleAPIEndpoint(BaseAPIView):
                 request=request,
                 queryset=(queryset),
                 on_results=lambda cycles: CycleSerializer(
-                    cycles,
-                    many=True,
-                    fields=self.fields,
-                    expand=self.expand,
+                    cycles, many=True, fields=self.fields, expand=self.expand
                 ).data,
             )
 
@@ -190,53 +174,38 @@ class CycleAPIEndpoint(BaseAPIView):
                 request=request,
                 queryset=(queryset),
                 on_results=lambda cycles: CycleSerializer(
-                    cycles,
-                    many=True,
-                    fields=self.fields,
-                    expand=self.expand,
+                    cycles, many=True, fields=self.fields, expand=self.expand
                 ).data,
             )
 
         # Draft Cycles
         if cycle_view == "draft":
-            queryset = queryset.filter(
-                end_date=None,
-                start_date=None,
-            )
+            queryset = queryset.filter(end_date=None, start_date=None)
             return self.paginate(
                 request=request,
                 queryset=(queryset),
                 on_results=lambda cycles: CycleSerializer(
-                    cycles,
-                    many=True,
-                    fields=self.fields,
-                    expand=self.expand,
+                    cycles, many=True, fields=self.fields, expand=self.expand
                 ).data,
             )
 
         # Incomplete Cycles
         if cycle_view == "incomplete":
             queryset = queryset.filter(
-                Q(end_date__gte=timezone.now()) | Q(end_date__isnull=True),
+                Q(end_date__gte=timezone.now()) | Q(end_date__isnull=True)
             )
             return self.paginate(
                 request=request,
                 queryset=(queryset),
                 on_results=lambda cycles: CycleSerializer(
-                    cycles,
-                    many=True,
-                    fields=self.fields,
-                    expand=self.expand,
+                    cycles, many=True, fields=self.fields, expand=self.expand
                 ).data,
             )
         return self.paginate(
             request=request,
             queryset=(queryset),
             on_results=lambda cycles: CycleSerializer(
-                cycles,
-                many=True,
-                fields=self.fields,
-                expand=self.expand,
+                cycles, many=True, fields=self.fields, expand=self.expand
             ).data,
         )
 
@@ -273,10 +242,7 @@ class CycleAPIEndpoint(BaseAPIView):
                         },
                         status=status.HTTP_409_CONFLICT,
                     )
-                serializer.save(
-                    project_id=project_id,
-                    owned_by=request.user,
-                )
+                serializer.save(project_id=project_id, owned_by=request.user)
                 # Send the model activity
                 model_activity.delay(
                     model_name="cycle",
@@ -287,12 +253,8 @@ class CycleAPIEndpoint(BaseAPIView):
                     slug=slug,
                     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
-            )
+                return Response(serializer.data, status=status.HTTP_201_CREATED)
+            return Response(serializer.errors, status=status.HTTP_400_BAD_REQUEST)
         else:
             return Response(
                 {
@@ -302,9 +264,7 @@ class CycleAPIEndpoint(BaseAPIView):
             )
 
     def patch(self, request, slug, project_id, pk):
-        cycle = Cycle.objects.get(
-            workspace__slug=slug, project_id=project_id, pk=pk
-        )
+        cycle = Cycle.objects.get(workspace__slug=slug, project_id=project_id, pk=pk)
 
         current_instance = json.dumps(
             CycleSerializer(cycle).data, cls=DjangoJSONEncoder
@@ -322,9 +282,7 @@ class CycleAPIEndpoint(BaseAPIView):
             if "sort_order" in request_data:
                 # Can only change sort order
                 request_data = {
-                    "sort_order": request_data.get(
-                        "sort_order", cycle.sort_order
-                    )
+                    "sort_order": request_data.get("sort_order", cycle.sort_order)
                 }
             else:
                 return Response(
@@ -371,9 +329,7 @@ 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
-        )
+        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,
@@ -389,9 +345,9 @@ class CycleAPIEndpoint(BaseAPIView):
             )
 
         cycle_issues = list(
-            CycleIssue.objects.filter(
-                cycle_id=self.kwargs.get("pk")
-            ).values_list("issue", flat=True)
+            CycleIssue.objects.filter(cycle_id=self.kwargs.get("pk")).values_list(
+                "issue", flat=True
+            )
         )
 
         issue_activity.delay(
@@ -413,17 +369,13 @@ class CycleAPIEndpoint(BaseAPIView):
         cycle.delete()
         # Delete the user favorite cycle
         UserFavorite.objects.filter(
-            entity_type="cycle",
-            entity_identifier=pk,
-            project_id=project_id,
+            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,
-    ]
+    permission_classes = [ProjectEntityPermission]
 
     def get_queryset(self):
         return (
@@ -502,9 +454,7 @@ class CycleArchiveUnarchiveAPIEndpoint(BaseAPIView):
                     ),
                 )
             )
-            .annotate(
-                total_estimates=Sum("issue_cycle__issue__estimate_point")
-            )
+            .annotate(total_estimates=Sum("issue_cycle__issue__estimate_point"))
             .annotate(
                 completed_estimates=Sum(
                     "issue_cycle__issue__estimate_point",
@@ -536,10 +486,7 @@ class CycleArchiveUnarchiveAPIEndpoint(BaseAPIView):
             request=request,
             queryset=(self.get_queryset()),
             on_results=lambda cycles: CycleSerializer(
-                cycles,
-                many=True,
-                fields=self.fields,
-                expand=self.expand,
+                cycles, many=True, fields=self.fields, expand=self.expand
             ).data,
         )
 
@@ -582,16 +529,12 @@ class CycleIssueAPIEndpoint(BaseAPIView):
     model = CycleIssue
     webhook_event = "cycle_issue"
     bulk = True
-    permission_classes = [
-        ProjectEntityPermission,
-    ]
+    permission_classes = [ProjectEntityPermission]
 
     def get_queryset(self):
         return (
             CycleIssue.objects.annotate(
-                sub_issues_count=Issue.issue_objects.filter(
-                    parent=OuterRef("issue_id")
-                )
+                sub_issues_count=Issue.issue_objects.filter(parent=OuterRef("issue_id"))
                 .order_by()
                 .annotate(count=Func(F("id"), function="Count"))
                 .values("count")
@@ -630,13 +573,10 @@ class CycleIssueAPIEndpoint(BaseAPIView):
         order_by = request.GET.get("order_by", "created_at")
         issues = (
             Issue.issue_objects.filter(
-                issue_cycle__cycle_id=cycle_id,
-                issue_cycle__deleted_at__isnull=True,
+                issue_cycle__cycle_id=cycle_id, issue_cycle__deleted_at__isnull=True
             )
             .annotate(
-                sub_issues_count=Issue.issue_objects.filter(
-                    parent=OuterRef("id")
-                )
+                sub_issues_count=Issue.issue_objects.filter(parent=OuterRef("id"))
                 .order_by()
                 .annotate(count=Func(F("id"), function="Count"))
                 .values("count")
@@ -672,10 +612,7 @@ class CycleIssueAPIEndpoint(BaseAPIView):
             request=request,
             queryset=(issues),
             on_results=lambda issues: CycleSerializer(
-                issues,
-                many=True,
-                fields=self.fields,
-                expand=self.expand,
+                issues, many=True, fields=self.fields, expand=self.expand
             ).data,
         )
 
@@ -684,8 +621,7 @@ class CycleIssueAPIEndpoint(BaseAPIView):
 
         if not issues:
             return Response(
-                {"error": "Issues are required"},
-                status=status.HTTP_400_BAD_REQUEST,
+                {"error": "Issues are required"}, status=status.HTTP_400_BAD_REQUEST
             )
 
         cycle = Cycle.objects.get(
@@ -694,9 +630,7 @@ class CycleIssueAPIEndpoint(BaseAPIView):
 
         # Get all CycleIssues already created
         cycle_issues = list(
-            CycleIssue.objects.filter(
-                ~Q(cycle_id=cycle_id), issue_id__in=issues
-            )
+            CycleIssue.objects.filter(~Q(cycle_id=cycle_id), issue_id__in=issues)
         )
 
         existing_issues = [
@@ -741,9 +675,7 @@ class CycleIssueAPIEndpoint(BaseAPIView):
             )
 
         # Update the cycle issues
-        CycleIssue.objects.bulk_update(
-            updated_records, ["cycle_id"], batch_size=100
-        )
+        CycleIssue.objects.bulk_update(updated_records, ["cycle_id"], batch_size=100)
 
         # Capture Issue Activity
         issue_activity.delay(
@@ -802,9 +734,7 @@ class TransferCycleIssueAPIEndpoint(BaseAPIView):
 
     """
 
-    permission_classes = [
-        ProjectEntityPermission,
-    ]
+    permission_classes = [ProjectEntityPermission]
 
     def post(self, request, slug, project_id, cycle_id):
         new_cycle_id = request.data.get("new_cycle_id", False)
@@ -930,9 +860,7 @@ class TransferCycleIssueAPIEndpoint(BaseAPIView):
                 )
                 .values("display_name", "assignee_id", "avatar", "avatar_url")
                 .annotate(
-                    total_estimates=Sum(
-                        Cast("estimate_point__value", FloatField())
-                    )
+                    total_estimates=Sum(Cast("estimate_point__value", FloatField()))
                 )
                 .annotate(
                     completed_estimates=Sum(
@@ -961,9 +889,7 @@ class TransferCycleIssueAPIEndpoint(BaseAPIView):
                 {
                     "display_name": item["display_name"],
                     "assignee_id": (
-                        str(item["assignee_id"])
-                        if item["assignee_id"]
-                        else None
+                        str(item["assignee_id"]) if item["assignee_id"] else None
                     ),
                     "avatar": item.get("avatar", None),
                     "avatar_url": item.get("avatar_url", None),
@@ -986,9 +912,7 @@ class TransferCycleIssueAPIEndpoint(BaseAPIView):
                 .annotate(label_id=F("labels__id"))
                 .values("label_name", "color", "label_id")
                 .annotate(
-                    total_estimates=Sum(
-                        Cast("estimate_point__value", FloatField())
-                    )
+                    total_estimates=Sum(Cast("estimate_point__value", FloatField()))
                 )
                 .annotate(
                     completed_estimates=Sum(
@@ -1025,9 +949,7 @@ class TransferCycleIssueAPIEndpoint(BaseAPIView):
                 {
                     "label_name": item["label_name"],
                     "color": item["color"],
-                    "label_id": (
-                        str(item["label_id"]) if item["label_id"] else None
-                    ),
+                    "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"],
@@ -1059,8 +981,7 @@ class TransferCycleIssueAPIEndpoint(BaseAPIView):
                     ),
                     # If `avatar_asset` is None, fall back to using `avatar` field directly
                     When(
-                        assignees__avatar_asset__isnull=True,
-                        then="assignees__avatar",
+                        assignees__avatar_asset__isnull=True, then="assignees__avatar"
                     ),
                     default=Value(None),
                     output_field=models.CharField(),
@@ -1069,12 +990,8 @@ class TransferCycleIssueAPIEndpoint(BaseAPIView):
             .values("display_name", "assignee_id", "avatar_url")
             .annotate(
                 total_issues=Count(
-                    "id",
-                    filter=Q(
-                        archived_at__isnull=True,
-                        is_draft=False,
-                    ),
-                ),
+                    "id", filter=Q(archived_at__isnull=True, is_draft=False)
+                )
             )
             .annotate(
                 completed_issues=Count(
@@ -1128,12 +1045,8 @@ class TransferCycleIssueAPIEndpoint(BaseAPIView):
             .values("label_name", "color", "label_id")
             .annotate(
                 total_issues=Count(
-                    "id",
-                    filter=Q(
-                        archived_at__isnull=True,
-                        is_draft=False,
-                    ),
-                ),
+                    "id", filter=Q(archived_at__isnull=True, is_draft=False)
+                )
             )
             .annotate(
                 completed_issues=Count(
@@ -1163,9 +1076,7 @@ class TransferCycleIssueAPIEndpoint(BaseAPIView):
             {
                 "label_name": item["label_name"],
                 "color": item["color"],
-                "label_id": (
-                    str(item["label_id"]) if item["label_id"] else None
-                ),
+                "label_id": (str(item["label_id"]) if item["label_id"] else None),
                 "total_issues": item["total_issues"],
                 "completed_issues": item["completed_issues"],
                 "pending_issues": item["pending_issues"],
@@ -1210,10 +1121,7 @@ class TransferCycleIssueAPIEndpoint(BaseAPIView):
         }
         current_cycle.save(update_fields=["progress_snapshot"])
 
-        if (
-            new_cycle.end_date is not None
-            and new_cycle.end_date < timezone.now()
-        ):
+        if new_cycle.end_date is not None and new_cycle.end_date < timezone.now():
             return Response(
                 {
                     "error": "The cycle where the issues are transferred is already completed"

apiserver/plane/api/views/intake.py

@@ -17,16 +17,7 @@ from rest_framework.response import Response
 from plane.api.serializers import IntakeIssueSerializer, IssueSerializer
 from plane.app.permissions import ProjectLitePermission
 from plane.bgtasks.issue_activities_task import issue_activity
-from plane.db.models import (
-    IssueType,
-    Intake,
-    IntakeIssue,
-    Issue,
-    Project,
-    ProjectMember,
-    State,
-)
-from plane.ee.models import IntakeSetting
+from plane.db.models import Intake, IntakeIssue, Issue, Project, ProjectMember, State
 
 from .base import BaseAPIView
 
@@ -38,16 +29,12 @@ class IntakeIssueAPIEndpoint(BaseAPIView):
 
     """
 
-    permission_classes = [
-        ProjectLitePermission,
-    ]
+    permission_classes = [ProjectLitePermission]
 
     serializer_class = IntakeIssueSerializer
     model = IntakeIssue
 
-    filterset_fields = [
-        "status",
-    ]
+    filterset_fields = ["status"]
 
     def get_queryset(self):
         intake = Intake.objects.filter(
@@ -56,8 +43,7 @@ class IntakeIssueAPIEndpoint(BaseAPIView):
         ).first()
 
         project = Project.objects.get(
-            workspace__slug=self.kwargs.get("slug"),
-            pk=self.kwargs.get("project_id"),
+            workspace__slug=self.kwargs.get("slug"), pk=self.kwargs.get("project_id")
         )
 
         if intake is None and not project.intake_view:
@@ -65,8 +51,7 @@ class IntakeIssueAPIEndpoint(BaseAPIView):
 
         return (
             IntakeIssue.objects.filter(
-                Q(snoozed_till__gte=timezone.now())
-                | Q(snoozed_till__isnull=True),
+                Q(snoozed_till__gte=timezone.now()) | Q(snoozed_till__isnull=True),
                 workspace__slug=self.kwargs.get("slug"),
                 project_id=self.kwargs.get("project_id"),
                 intake_id=intake.id,
@@ -79,41 +64,29 @@ class IntakeIssueAPIEndpoint(BaseAPIView):
         if issue_id:
             intake_issue_queryset = self.get_queryset().get(issue_id=issue_id)
             intake_issue_data = IntakeIssueSerializer(
-                intake_issue_queryset,
-                fields=self.fields,
-                expand=self.expand,
+                intake_issue_queryset, fields=self.fields, expand=self.expand
             ).data
-            return Response(
-                intake_issue_data,
-                status=status.HTTP_200_OK,
-            )
+            return Response(intake_issue_data, status=status.HTTP_200_OK)
         issue_queryset = self.get_queryset()
         return self.paginate(
             request=request,
             queryset=(issue_queryset),
             on_results=lambda intake_issues: IntakeIssueSerializer(
-                intake_issues,
-                many=True,
-                fields=self.fields,
-                expand=self.expand,
+                intake_issues, many=True, fields=self.fields, expand=self.expand
             ).data,
         )
 
     def post(self, request, slug, project_id):
         if not request.data.get("issue", {}).get("name", False):
             return Response(
-                {"error": "Name is required"},
-                status=status.HTTP_400_BAD_REQUEST,
+                {"error": "Name is required"}, status=status.HTTP_400_BAD_REQUEST
             )
 
         intake = Intake.objects.filter(
             workspace__slug=slug, project_id=project_id
         ).first()
 
-        project = Project.objects.get(
-            workspace__slug=slug,
-            pk=project_id,
-        )
+        project = Project.objects.get(workspace__slug=slug, pk=project_id)
 
         # Intake view
         if intake is None and not project.intake_view:
@@ -133,8 +106,7 @@ class IntakeIssueAPIEndpoint(BaseAPIView):
             "none",
         ]:
             return Response(
-                {"error": "Invalid priority"},
-                status=status.HTTP_400_BAD_REQUEST,
+                {"error": "Invalid priority"}, status=status.HTTP_400_BAD_REQUEST
             )
 
         # Create or get state
@@ -147,11 +119,6 @@ class IntakeIssueAPIEndpoint(BaseAPIView):
             is_triage=True,
         )
 
-        # Get the issue type
-        issue_type = IssueType.objects.filter(
-            project_issue_types__project_id=project_id, is_default=True
-        ).first()
-
         # create an issue
         issue = Issue.objects.create(
             name=request.data.get("issue", {}).get("name"),
@@ -162,7 +129,6 @@ class IntakeIssueAPIEndpoint(BaseAPIView):
             priority=request.data.get("issue", {}).get("priority", "none"),
             project_id=project_id,
             state=state,
-            type=issue_type,
         )
 
         # create an intake issue
@@ -192,11 +158,7 @@ class IntakeIssueAPIEndpoint(BaseAPIView):
             workspace__slug=slug, project_id=project_id
         ).first()
 
-        project = Project.objects.get(
-            workspace__slug=slug,
-            pk=project_id,
-        )
-
+        project = Project.objects.get(workspace__slug=slug, pk=project_id)
 
         # Intake view
         if intake is None and not project.intake_view:
@@ -207,21 +169,6 @@ class IntakeIssueAPIEndpoint(BaseAPIView):
                 status=status.HTTP_400_BAD_REQUEST,
             )
 
-        intake_settings = IntakeSetting.objects.filter(
-            workspace__slug=slug,
-            project_id=project_id,
-            intake=intake,
-        ).first()
-
-        if (
-            intake_settings is not None
-            and not intake_settings.is_in_app_enabled
-        ):
-            return Response(
-                {"error": "Creating intake issues is disabled"},
-                status=status.HTTP_400_BAD_REQUEST,
-            )
-
         # Get the intake issue
         intake_issue = IntakeIssue.objects.get(
             issue_id=issue_id,
@@ -258,7 +205,7 @@ class IntakeIssueAPIEndpoint(BaseAPIView):
                         distinct=True,
                         filter=Q(
                             ~Q(labels__id__isnull=True)
-                            & Q(label_issue__deleted_at__isnull=True),
+                            & Q(label_issue__deleted_at__isnull=True)
                         ),
                     ),
                     Value([], output_field=ArrayField(UUIDField())),
@@ -275,11 +222,7 @@ class IntakeIssueAPIEndpoint(BaseAPIView):
                     ),
                     Value([], output_field=ArrayField(UUIDField())),
                 ),
-            ).get(
-                pk=issue_id,
-                workspace__slug=slug,
-                project_id=project_id,
-            )
+            ).get(pk=issue_id, workspace__slug=slug, project_id=project_id)
             # Only allow guests to edit name and description
             if project_member.role <= 5:
                 issue_data = {
@@ -287,14 +230,10 @@ class IntakeIssueAPIEndpoint(BaseAPIView):
                     "description_html": issue_data.get(
                         "description_html", issue.description_html
                     ),
-                    "description": issue_data.get(
-                        "description", issue.description
-                    ),
+                    "description": issue_data.get("description", issue.description),
                 }
 
-            issue_serializer = IssueSerializer(
-                issue, data=issue_data, partial=True
-            )
+            issue_serializer = IssueSerializer(issue, data=issue_data, partial=True)
 
             if issue_serializer.is_valid():
                 current_instance = issue
@@ -334,14 +273,10 @@ class IntakeIssueAPIEndpoint(BaseAPIView):
                 # Update the issue state if the issue is rejected or marked as duplicate
                 if serializer.data["status"] in [-1, 2]:
                     issue = Issue.objects.get(
-                        pk=issue_id,
-                        workspace__slug=slug,
-                        project_id=project_id,
+                        pk=issue_id, workspace__slug=slug, project_id=project_id
                     )
                     state = State.objects.filter(
-                        group="cancelled",
-                        workspace__slug=slug,
-                        project_id=project_id,
+                        group="cancelled", workspace__slug=slug, project_id=project_id
                     ).first()
                     if state is not None:
                         issue.state = state
@@ -350,18 +285,14 @@ class IntakeIssueAPIEndpoint(BaseAPIView):
                 # Update the issue state if it is accepted
                 if serializer.data["status"] in [1]:
                     issue = Issue.objects.get(
-                        pk=issue_id,
-                        workspace__slug=slug,
-                        project_id=project_id,
+                        pk=issue_id, workspace__slug=slug, project_id=project_id
                     )
 
                     # Update the issue state only if it is in triage state
                     if issue.state.is_triage:
                         # Move to default state
                         state = State.objects.filter(
-                            workspace__slug=slug,
-                            project_id=project_id,
-                            default=True,
+                            workspace__slug=slug, project_id=project_id, default=True
                         ).first()
                         if state is not None:
                             issue.state = state
@@ -370,9 +301,7 @@ class IntakeIssueAPIEndpoint(BaseAPIView):
                 # create a activity for status change
                 issue_activity.delay(
                     type="intake.activity.created",
-                    requested_data=json.dumps(
-                        request.data, cls=DjangoJSONEncoder
-                    ),
+                    requested_data=json.dumps(request.data, cls=DjangoJSONEncoder),
                     actor_id=str(request.user.id),
                     issue_id=str(issue_id),
                     project_id=str(project_id),
@@ -384,13 +313,10 @@ class IntakeIssueAPIEndpoint(BaseAPIView):
                 )
 
                 return Response(serializer.data, status=status.HTTP_200_OK)
-            return Response(
-                serializer.errors, status=status.HTTP_400_BAD_REQUEST
-            )
+            return Response(serializer.errors, status=status.HTTP_400_BAD_REQUEST)
         else:
             return Response(
-                IntakeIssueSerializer(intake_issue).data,
-                status=status.HTTP_200_OK,
+                IntakeIssueSerializer(intake_issue).data, status=status.HTTP_200_OK
             )
 
     def delete(self, request, slug, project_id, issue_id):
@@ -398,10 +324,7 @@ class IntakeIssueAPIEndpoint(BaseAPIView):
             workspace__slug=slug, project_id=project_id
         ).first()
 
-        project = Project.objects.get(
-            workspace__slug=slug,
-            pk=project_id,
-        )
+        project = Project.objects.get(workspace__slug=slug, pk=project_id)
 
         # Intake view
         if intake is None and not project.intake_view:

apiserver/plane/api/views/issue.py

@@ -51,7 +51,7 @@ from plane.db.models import (
     ProjectMember,
     CycleIssue,
 )
-from plane.bgtasks.version_task import version_task
+
 from .base import BaseAPIView
 
 
@@ -73,9 +73,7 @@ class WorkspaceIssueAPIEndpoint(BaseAPIView):
     def get_queryset(self):
         return (
             Issue.issue_objects.annotate(
-                sub_issues_count=Issue.issue_objects.filter(
-                    parent=OuterRef("id")
-                )
+                sub_issues_count=Issue.issue_objects.filter(parent=OuterRef("id"))
                 .order_by()
                 .annotate(count=Func(F("id"), function="Count"))
                 .values("count")
@@ -91,14 +89,10 @@ class WorkspaceIssueAPIEndpoint(BaseAPIView):
             .order_by(self.kwargs.get("order_by", "-created_at"))
         ).distinct()
 
-    def get(
-        self, request, slug, project__identifier=None, issue__identifier=None
-    ):
+    def get(self, request, slug, project__identifier=None, issue__identifier=None):
         if issue__identifier and project__identifier:
             issue = Issue.issue_objects.annotate(
-                sub_issues_count=Issue.issue_objects.filter(
-                    parent=OuterRef("id")
-                )
+                sub_issues_count=Issue.issue_objects.filter(parent=OuterRef("id"))
                 .order_by()
                 .annotate(count=Func(F("id"), function="Count"))
                 .values("count")
@@ -108,11 +102,7 @@ class WorkspaceIssueAPIEndpoint(BaseAPIView):
                 sequence_id=issue__identifier,
             )
             return Response(
-                IssueSerializer(
-                    issue,
-                    fields=self.fields,
-                    expand=self.expand,
-                ).data,
+                IssueSerializer(issue, fields=self.fields, expand=self.expand).data,
                 status=status.HTTP_200_OK,
             )
 
@@ -126,17 +116,13 @@ class IssueAPIEndpoint(BaseAPIView):
 
     model = Issue
     webhook_event = "issue"
-    permission_classes = [
-        ProjectEntityPermission,
-    ]
+    permission_classes = [ProjectEntityPermission]
     serializer_class = IssueSerializer
 
     def get_queryset(self):
         return (
             Issue.issue_objects.annotate(
-                sub_issues_count=Issue.issue_objects.filter(
-                    parent=OuterRef("id")
-                )
+                sub_issues_count=Issue.issue_objects.filter(parent=OuterRef("id"))
                 .order_by()
                 .annotate(count=Func(F("id"), function="Count"))
                 .values("count")
@@ -164,41 +150,25 @@ class IssueAPIEndpoint(BaseAPIView):
                 project_id=project_id,
             )
             return Response(
-                IssueSerializer(
-                    issue,
-                    fields=self.fields,
-                    expand=self.expand,
-                ).data,
+                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(
-                    parent=OuterRef("id")
-                )
+                sub_issues_count=Issue.issue_objects.filter(parent=OuterRef("id"))
                 .order_by()
                 .annotate(count=Func(F("id"), function="Count"))
                 .values("count")
             ).get(workspace__slug=slug, project_id=project_id, pk=pk)
             return Response(
-                IssueSerializer(
-                    issue,
-                    fields=self.fields,
-                    expand=self.expand,
-                ).data,
+                IssueSerializer(issue, fields=self.fields, expand=self.expand).data,
                 status=status.HTTP_200_OK,
             )
 
         # Custom ordering for priority and state
         priority_order = ["urgent", "high", "medium", "low", "none"]
-        state_order = [
-            "backlog",
-            "unstarted",
-            "started",
-            "completed",
-            "cancelled",
-        ]
+        state_order = ["backlog", "unstarted", "started", "completed", "cancelled"]
 
         order_by_param = request.GET.get("order_by", "-created_at")
 
@@ -231,9 +201,7 @@ class IssueAPIEndpoint(BaseAPIView):
         # Priority Ordering
         if order_by_param == "priority" or order_by_param == "-priority":
             priority_order = (
-                priority_order
-                if order_by_param == "priority"
-                else priority_order[::-1]
+                priority_order if order_by_param == "priority" else priority_order[::-1]
             )
             issue_queryset = issue_queryset.annotate(
                 priority_order=Case(
@@ -281,9 +249,7 @@ class IssueAPIEndpoint(BaseAPIView):
                     else order_by_param
                 )
             ).order_by(
-                "-max_values"
-                if order_by_param.startswith("-")
-                else "max_values"
+                "-max_values" if order_by_param.startswith("-") else "max_values"
             )
         else:
             issue_queryset = issue_queryset.order_by(order_by_param)
@@ -292,10 +258,7 @@ class IssueAPIEndpoint(BaseAPIView):
             request=request,
             queryset=(issue_queryset),
             on_results=lambda issues: IssueSerializer(
-                issues,
-                many=True,
-                fields=self.fields,
-                expand=self.expand,
+                issues, many=True, fields=self.fields, expand=self.expand
             ).data,
         )
 
@@ -339,22 +302,16 @@ class IssueAPIEndpoint(BaseAPIView):
             serializer.save()
             # Refetch the issue
             issue = Issue.objects.filter(
-                workspace__slug=slug,
-                project_id=project_id,
-                pk=serializer.data["id"],
+                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.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(
                 type="issue.activity.created",
-                requested_data=json.dumps(
-                    self.request.data, cls=DjangoJSONEncoder
-                ),
+                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),
@@ -391,9 +348,7 @@ class IssueAPIEndpoint(BaseAPIView):
 
                 # 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
-                )
+                requested_data = json.dumps(self.request.data, cls=DjangoJSONEncoder)
                 serializer = IssueSerializer(
                     issue,
                     data=request.data,
@@ -451,9 +406,7 @@ class IssueAPIEndpoint(BaseAPIView):
                     # 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_at = request.data.get("created_at", timezone.now())
                     issue.created_by_id = request.data.get(
                         "created_by", request.user.id
                     )
@@ -470,12 +423,8 @@ class IssueAPIEndpoint(BaseAPIView):
                         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
-                )
+                    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"},
@@ -483,16 +432,7 @@ class IssueAPIEndpoint(BaseAPIView):
             )
 
     def patch(self, request, slug, project_id, pk=None):
-        issue = Issue.objects.get(
-            workspace__slug=slug, project_id=project_id, pk=pk
-        )
-        # Serialize the existing instance
-        existing_instance = json.dumps(
-            {
-                "description_html": issue.description_html,
-            },
-            cls=DjangoJSONEncoder,
-        )
+        issue = Issue.objects.get(workspace__slug=slug, project_id=project_id, pk=pk)
         project = Project.objects.get(pk=project_id)
         current_instance = json.dumps(
             IssueSerializer(issue).data, cls=DjangoJSONEncoder
@@ -501,10 +441,7 @@ class IssueAPIEndpoint(BaseAPIView):
         serializer = IssueSerializer(
             issue,
             data=request.data,
-            context={
-                "project_id": project_id,
-                "workspace_id": project.workspace_id,
-            },
+            context={"project_id": project_id, "workspace_id": project.workspace_id},
             partial=True,
         )
         if serializer.is_valid():
@@ -529,13 +466,6 @@ class IssueAPIEndpoint(BaseAPIView):
                 )
 
             serializer.save()
-            # Return a success response
-            version_task.delay(
-                entity_type="ISSUE",
-                entity_identifier=pk,
-                existing_instance=existing_instance,
-                user_id=request.user.id,
-            )
             issue_activity.delay(
                 type="issue.activity.updated",
                 requested_data=requested_data,
@@ -549,9 +479,7 @@ class IssueAPIEndpoint(BaseAPIView):
         return Response(serializer.errors, status=status.HTTP_400_BAD_REQUEST)
 
     def delete(self, request, slug, project_id, pk=None):
-        issue = Issue.objects.get(
-            workspace__slug=slug, project_id=project_id, pk=pk
-        )
+        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,
@@ -590,9 +518,7 @@ class LabelAPIEndpoint(BaseAPIView):
 
     serializer_class = LabelSerializer
     model = Label
-    permission_classes = [
-        ProjectMemberPermission,
-    ]
+    permission_classes = [ProjectMemberPermission]
 
     def get_queryset(self):
         return (
@@ -639,12 +565,8 @@ class LabelAPIEndpoint(BaseAPIView):
                     )
 
                 serializer.save(project_id=project_id)
-                return Response(
-                    serializer.data, status=status.HTTP_201_CREATED
-                )
-            return Response(
-                serializer.errors, status=status.HTTP_400_BAD_REQUEST
-            )
+                return Response(serializer.data, status=status.HTTP_201_CREATED)
+            return Response(serializer.errors, status=status.HTTP_400_BAD_REQUEST)
         except IntegrityError:
             label = Label.objects.filter(
                 workspace__slug=slug,
@@ -665,18 +587,11 @@ class LabelAPIEndpoint(BaseAPIView):
                 request=request,
                 queryset=(self.get_queryset()),
                 on_results=lambda labels: LabelSerializer(
-                    labels,
-                    many=True,
-                    fields=self.fields,
-                    expand=self.expand,
+                    labels, many=True, fields=self.fields, expand=self.expand
                 ).data,
             )
         label = self.get_queryset().get(pk=pk)
-        serializer = LabelSerializer(
-            label,
-            fields=self.fields,
-            expand=self.expand,
-        )
+        serializer = LabelSerializer(label, fields=self.fields, expand=self.expand)
         return Response(serializer.data, status=status.HTTP_200_OK)
 
     def patch(self, request, slug, project_id, pk=None):
@@ -719,9 +634,7 @@ class IssueLinkAPIEndpoint(BaseAPIView):
 
     """
 
-    permission_classes = [
-        ProjectEntityPermission,
-    ]
+    permission_classes = [ProjectEntityPermission]
 
     model = IssueLink
     serializer_class = IssueLinkSerializer
@@ -744,46 +657,32 @@ class IssueLinkAPIEndpoint(BaseAPIView):
         if pk is None:
             issue_links = self.get_queryset()
             serializer = IssueLinkSerializer(
-                issue_links,
-                fields=self.fields,
-                expand=self.expand,
+                issue_links, fields=self.fields, expand=self.expand
             )
             return self.paginate(
                 request=request,
                 queryset=(self.get_queryset()),
                 on_results=lambda issue_links: IssueLinkSerializer(
-                    issue_links,
-                    many=True,
-                    fields=self.fields,
-                    expand=self.expand,
+                    issue_links, many=True, fields=self.fields, expand=self.expand
                 ).data,
             )
         issue_link = self.get_queryset().get(pk=pk)
         serializer = IssueLinkSerializer(
-            issue_link,
-            fields=self.fields,
-            expand=self.expand,
+            issue_link, fields=self.fields, expand=self.expand
         )
         return Response(serializer.data, status=status.HTTP_200_OK)
 
     def post(self, request, slug, project_id, issue_id):
         serializer = IssueLinkSerializer(data=request.data)
         if serializer.is_valid():
-            serializer.save(
-                project_id=project_id,
-                issue_id=issue_id,
-            )
+            serializer.save(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.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
-                ),
+                requested_data=json.dumps(serializer.data, cls=DjangoJSONEncoder),
                 issue_id=str(self.kwargs.get("issue_id")),
                 project_id=str(self.kwargs.get("project_id")),
                 actor_id=str(link.created_by_id),
@@ -795,19 +694,13 @@ class IssueLinkAPIEndpoint(BaseAPIView):
 
     def patch(self, request, slug, project_id, issue_id, pk):
         issue_link = IssueLink.objects.get(
-            workspace__slug=slug,
-            project_id=project_id,
-            issue_id=issue_id,
-            pk=pk,
+            workspace__slug=slug, project_id=project_id, issue_id=issue_id, pk=pk
         )
         requested_data = json.dumps(request.data, cls=DjangoJSONEncoder)
         current_instance = json.dumps(
-            IssueLinkSerializer(issue_link).data,
-            cls=DjangoJSONEncoder,
-        )
-        serializer = IssueLinkSerializer(
-            issue_link, data=request.data, partial=True
+            IssueLinkSerializer(issue_link).data, cls=DjangoJSONEncoder
         )
+        serializer = IssueLinkSerializer(issue_link, data=request.data, partial=True)
         if serializer.is_valid():
             serializer.save()
             issue_activity.delay(
@@ -824,14 +717,10 @@ class IssueLinkAPIEndpoint(BaseAPIView):
 
     def delete(self, request, slug, project_id, issue_id, pk):
         issue_link = IssueLink.objects.get(
-            workspace__slug=slug,
-            project_id=project_id,
-            issue_id=issue_id,
-            pk=pk,
+            workspace__slug=slug, project_id=project_id, issue_id=issue_id, pk=pk
         )
         current_instance = json.dumps(
-            IssueLinkSerializer(issue_link).data,
-            cls=DjangoJSONEncoder,
+            IssueLinkSerializer(issue_link).data, cls=DjangoJSONEncoder
         )
         issue_activity.delay(
             type="link.activity.deleted",
@@ -856,15 +745,11 @@ class IssueCommentAPIEndpoint(BaseAPIView):
     serializer_class = IssueCommentSerializer
     model = IssueComment
     webhook_event = "issue_comment"
-    permission_classes = [
-        ProjectLitePermission,
-    ]
+    permission_classes = [ProjectLitePermission]
 
     def get_queryset(self):
         return (
-            IssueComment.objects.filter(
-                workspace__slug=self.kwargs.get("slug")
-            )
+            IssueComment.objects.filter(workspace__slug=self.kwargs.get("slug"))
             .filter(project_id=self.kwargs.get("project_id"))
             .filter(issue_id=self.kwargs.get("issue_id"))
             .filter(
@@ -891,19 +776,14 @@ class IssueCommentAPIEndpoint(BaseAPIView):
         if pk:
             issue_comment = self.get_queryset().get(pk=pk)
             serializer = IssueCommentSerializer(
-                issue_comment,
-                fields=self.fields,
-                expand=self.expand,
+                issue_comment, fields=self.fields, expand=self.expand
             )
             return Response(serializer.data, status=status.HTTP_200_OK)
         return self.paginate(
             request=request,
             queryset=(self.get_queryset()),
             on_results=lambda issue_comment: IssueCommentSerializer(
-                issue_comment,
-                many=True,
-                fields=self.fields,
-                expand=self.expand,
+                issue_comment, many=True, fields=self.fields, expand=self.expand
             ).data,
         )
 
@@ -936,17 +816,11 @@ class IssueCommentAPIEndpoint(BaseAPIView):
         serializer = IssueCommentSerializer(data=request.data)
         if serializer.is_valid():
             serializer.save(
-                project_id=project_id,
-                issue_id=issue_id,
-                actor=request.user,
-            )
-            issue_comment = IssueComment.objects.get(
-                pk=serializer.data.get("id")
+                project_id=project_id, 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_at = request.data.get("created_at", timezone.now())
             issue_comment.created_by_id = request.data.get(
                 "created_by", request.user.id
             )
@@ -954,9 +828,7 @@ class IssueCommentAPIEndpoint(BaseAPIView):
 
             issue_activity.delay(
                 type="comment.activity.created",
-                requested_data=json.dumps(
-                    serializer.data, cls=DjangoJSONEncoder
-                ),
+                requested_data=json.dumps(serializer.data, cls=DjangoJSONEncoder),
                 actor_id=str(issue_comment.created_by_id),
                 issue_id=str(self.kwargs.get("issue_id")),
                 project_id=str(self.kwargs.get("project_id")),
@@ -968,24 +840,17 @@ class IssueCommentAPIEndpoint(BaseAPIView):
 
     def patch(self, request, slug, project_id, issue_id, pk):
         issue_comment = IssueComment.objects.get(
-            workspace__slug=slug,
-            project_id=project_id,
-            issue_id=issue_id,
-            pk=pk,
+            workspace__slug=slug, project_id=project_id, issue_id=issue_id, pk=pk
         )
         requested_data = json.dumps(self.request.data, cls=DjangoJSONEncoder)
         current_instance = json.dumps(
-            IssueCommentSerializer(issue_comment).data,
-            cls=DjangoJSONEncoder,
+            IssueCommentSerializer(issue_comment).data, cls=DjangoJSONEncoder
         )
 
         # Validation check if the issue already exists
         if (
             request.data.get("external_id")
-            and (
-                issue_comment.external_id
-                != str(request.data.get("external_id"))
-            )
+            and (issue_comment.external_id != str(request.data.get("external_id")))
             and IssueComment.objects.filter(
                 project_id=project_id,
                 workspace__slug=slug,
@@ -1022,14 +887,10 @@ class IssueCommentAPIEndpoint(BaseAPIView):
 
     def delete(self, request, slug, project_id, issue_id, pk):
         issue_comment = IssueComment.objects.get(
-            workspace__slug=slug,
-            project_id=project_id,
-            issue_id=issue_id,
-            pk=pk,
+            workspace__slug=slug, project_id=project_id, issue_id=issue_id, pk=pk
         )
         current_instance = json.dumps(
-            IssueCommentSerializer(issue_comment).data,
-            cls=DjangoJSONEncoder,
+            IssueCommentSerializer(issue_comment).data, cls=DjangoJSONEncoder
         )
         issue_comment.delete()
         issue_activity.delay(
@@ -1045,9 +906,7 @@ class IssueCommentAPIEndpoint(BaseAPIView):
 
 
 class IssueActivityAPIEndpoint(BaseAPIView):
-    permission_classes = [
-        ProjectEntityPermission,
-    ]
+    permission_classes = [ProjectEntityPermission]
 
     def get(self, request, slug, project_id, issue_id, pk=None):
         issue_activities = (
@@ -1072,19 +931,14 @@ class IssueActivityAPIEndpoint(BaseAPIView):
             request=request,
             queryset=(issue_activities),
             on_results=lambda issue_activity: IssueActivitySerializer(
-                issue_activity,
-                many=True,
-                fields=self.fields,
-                expand=self.expand,
+                issue_activity, many=True, fields=self.fields, expand=self.expand
             ).data,
         )
 
 
 class IssueAttachmentEndpoint(BaseAPIView):
     serializer_class = IssueAttachmentSerializer
-    permission_classes = [
-        ProjectEntityPermission,
-    ]
+    permission_classes = [ProjectEntityPermission]
     model = FileAsset
     parser_classes = (MultiPartParser, FormParser)
 
@@ -1123,10 +977,7 @@ class IssueAttachmentEndpoint(BaseAPIView):
                 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,
-                ),
+                current_instance=json.dumps(serializer.data, cls=DjangoJSONEncoder),
                 epoch=int(timezone.now().timestamp()),
                 notification=True,
                 origin=request.META.get("HTTP_ORIGIN"),

apiserver/plane/api/views/issue_type.py

@@ -1,201 +0,0 @@
-# Django imports
-from django.db.models import OuterRef, Subquery
-from django.db.models.functions import Coalesce
-from django.contrib.postgres.aggregates import ArrayAgg
-
-# Third party imports
-from rest_framework import status
-from rest_framework.response import Response
-
-# Module imports
-from plane.api.views.base import BaseAPIView
-from plane.app.permissions import ProjectEntityPermission
-from plane.db.models import Workspace, Project, IssueType, ProjectIssueType
-from plane.api.serializers import (
-    IssueTypeAPISerializer,
-    ProjectIssueTypeAPISerializer,
-)
-from plane.payment.flags.flag_decorator import check_feature_flag
-from plane.payment.flags.flag import FeatureFlag
-
-
-class IssueTypeAPIEndpoint(BaseAPIView):
-    """
-    This viewset automatically provides `list`, `create`, `retrieve`,
-    `update` and `destroy` actions related to issue types.
-
-    """
-
-    model = IssueType
-    serializer_class = IssueTypeAPISerializer
-    permission_classes = [ProjectEntityPermission]
-    webhook_event = "issue_type"
-
-    @property
-    def workspace_slug(self):
-        return self.kwargs.get("slug", None)
-
-    @property
-    def project_id(self):
-        return self.kwargs.get("project_id", None)
-
-    @property
-    def type_id(self):
-        return self.kwargs.get("type_id", None)
-
-    # list issue types and get issue type by id
-    @check_feature_flag(FeatureFlag.ISSUE_TYPE_DISPLAY)
-    def get(self, request, slug, project_id, type_id=None):
-        if self.workspace_slug and self.project_id:
-            # list of issue types
-            if self.type_id is None:
-                issue_types = self.model.objects.filter(
-                    workspace__slug=self.workspace_slug,
-                    project_issue_types__project_id=self.project_id,
-                ).annotate(
-                    project_ids=Coalesce(
-                        Subquery(
-                            ProjectIssueType.objects.filter(
-                                issue_type=OuterRef("pk"), workspace__slug=slug
-                            )
-                            .values("issue_type")
-                            .annotate(
-                                project_ids=ArrayAgg(
-                                    "project_id", distinct=True
-                                )
-                            )
-                            .values("project_ids")
-                        ),
-                        [],
-                    )
-                )
-                serializer = self.serializer_class(issue_types, many=True)
-                return Response(serializer.data, status=status.HTTP_200_OK)
-
-            # getting issue type by id
-            issue_type = self.model.objects.get(
-                workspace__slug=self.workspace_slug,
-                project_issue_types__project_id=self.project_id,
-                pk=self.type_id,
-            )
-            serializer = self.serializer_class(issue_type)
-            return Response(serializer.data, status=status.HTTP_200_OK)
-
-    # create issue type
-    @check_feature_flag(FeatureFlag.ISSUE_TYPE_SETTINGS)
-    def post(self, request, slug, project_id):
-        if self.workspace_slug and self.project_id:
-            workspace = Workspace.objects.get(slug=self.workspace_slug)
-            project = Project.objects.get(pk=self.project_id)
-
-            # check if issue type with the same external id and external source already exists
-            external_id = request.data.get("external_id")
-            external_existing_issue_type = self.model.objects.filter(
-                workspace__slug=slug,
-                project_issue_types__project=project_id,
-                external_source=request.data.get("external_source"),
-                external_id=request.data.get("external_id"),
-            )
-            if (
-                external_id
-                and request.data.get("external_source")
-                and external_existing_issue_type.exists()
-            ):
-                issue_type = self.model.objects.filter(
-                    workspace__slug=slug,
-                    project_issue_types__project=project_id,
-                    external_source=request.data.get("external_source"),
-                    external_id=external_id,
-                ).first()
-                return Response(
-                    {
-                        "error": "Issue type with the same external id and external source already exists",
-                        "id": str(issue_type.id),
-                    },
-                    status=status.HTTP_409_CONFLICT,
-                )
-
-            # creating issue type
-            data = request.data
-            issue_type_serializer = self.serializer_class(data=data)
-            issue_type_serializer.is_valid(raise_exception=True)
-            issue_type_serializer.save(workspace=workspace)
-
-            # adding the issue type to the project
-            project_issue_type_serializer = ProjectIssueTypeAPISerializer(
-                data={
-                    "issue_type": issue_type_serializer.data["id"],
-                }
-            )
-            project_issue_type_serializer.is_valid(raise_exception=True)
-            project_issue_type_serializer.save(
-                project=project,
-                level=0,
-            )
-
-            # getting the issue type
-            issue_type = self.model.objects.get(
-                workspace=workspace,
-                project_issue_types__project=project,
-                pk=issue_type_serializer.data["id"],
-            )
-            serializer = self.serializer_class(issue_type)
-            return Response(serializer.data, status=status.HTTP_201_CREATED)
-
-    # update issue type by id
-    @check_feature_flag(FeatureFlag.ISSUE_TYPE_SETTINGS)
-    def patch(self, request, slug, project_id, type_id):
-        if self.workspace_slug and self.project_id and self.type_id:
-            issue_type = self.model.objects.get(
-                workspace__slug=self.workspace_slug,
-                project_issue_types__project_id=self.project_id,
-                pk=self.type_id,
-            )
-
-            data = request.data
-            data_is_active = data.get("is_active", False)
-            update_issue_type = (
-                False if issue_type.is_default and not data_is_active else True
-            )
-
-            if update_issue_type:
-                issue_type_serializer = self.serializer_class(
-                    issue_type, data=data, partial=True
-                )
-                issue_type_serializer.is_valid(raise_exception=True)
-
-                # check if issue type with the same external id and external source already exists
-                external_id = request.data.get("external_id")
-                external_existing_issue_type = self.model.objects.filter(
-                    workspace__slug=slug,
-                    project_issue_types__project_id=self.project_id,
-                    external_source=request.data.get(
-                        "external_source", issue_type.external_source
-                    ),
-                    external_id=external_id,
-                )
-                if (
-                    external_id
-                    and (issue_type.external_id != external_id)
-                    and external_existing_issue_type.exists()
-                ):
-                    return Response(
-                        {
-                            "error": "Issue type with the same external id and external source already exists",
-                            "id": str(issue_type.id),
-                        },
-                        status=status.HTTP_409_CONFLICT,
-                    )
-
-                issue_type_serializer.save()
-                return Response(
-                    issue_type_serializer.data, status=status.HTTP_200_OK
-                )
-
-    # delete issue type by id
-    @check_feature_flag(FeatureFlag.ISSUE_TYPE_SETTINGS)
-    def delete(self, request, slug, project_id, type_id):
-        if self.workspace_slug and self.project_id and self.type_id:
-            issue_type = self.model.objects.get(pk=self.type_id)
-            issue_type.delete()
-            return Response(status=status.HTTP_204_NO_CONTENT)

apiserver/plane/api/views/member.py

@@ -13,24 +13,14 @@ 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.db.models import User, Workspace, Project, WorkspaceMember, ProjectMember
 
-from plane.app.permissions import (
-    ProjectMemberPermission,
-)
+from plane.app.permissions import ProjectMemberPermission
 
 
 # API endpoint to get and insert users inside the workspace
 class ProjectMemberAPIEndpoint(BaseAPIView):
-    permission_classes = [
-        ProjectMemberPermission,
-    ]
+    permission_classes = [ProjectMemberPermission]
 
     # Get all the users that are present inside the workspace
     def get(self, request, slug, project_id):
@@ -48,10 +38,7 @@ class ProjectMemberAPIEndpoint(BaseAPIView):
 
         # Get all the users that are present inside the workspace
         users = UserLiteSerializer(
-            User.objects.filter(
-                id__in=project_members,
-            ),
-            many=True,
+            User.objects.filter(id__in=project_members), many=True
         ).data
 
         return Response(users, status=status.HTTP_200_OK)
@@ -78,8 +65,7 @@ class ProjectMemberAPIEndpoint(BaseAPIView):
             validate_email(email)
         except ValidationError:
             return Response(
-                {"error": "Invalid email provided"},
-                status=status.HTTP_400_BAD_REQUEST,
+                {"error": "Invalid email provided"}, status=status.HTTP_400_BAD_REQUEST
             )
 
         workspace = Workspace.objects.filter(slug=slug).first()
@@ -108,9 +94,7 @@ class ProjectMemberAPIEndpoint(BaseAPIView):
                 ).first()
                 if project_member:
                     return Response(
-                        {
-                            "error": "User is already part of the workspace and project"
-                        },
+                        {"error": "User is already part of the workspace and project"},
                         status=status.HTTP_400_BAD_REQUEST,
                     )
 
@@ -131,18 +115,14 @@ class ProjectMemberAPIEndpoint(BaseAPIView):
         # 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", 5),
+                workspace=workspace, member=user, role=request.data.get("role", 5)
             )
             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", 5),
+                project=project, member=user, role=request.data.get("role", 5)
             )
             project_member.save()
 
@@ -150,4 +130,3 @@ class ProjectMemberAPIEndpoint(BaseAPIView):
         user_data = UserLiteSerializer(user).data
 
         return Response(user_data, status=status.HTTP_201_CREATED)
-

apiserver/plane/api/views/module.py

@@ -43,9 +43,7 @@ class ModuleAPIEndpoint(BaseAPIView):
     """
 
     model = Module
-    permission_classes = [
-        ProjectEntityPermission,
-    ]
+    permission_classes = [ProjectEntityPermission]
     serializer_class = ModuleSerializer
     webhook_event = "module"
 
@@ -60,9 +58,7 @@ class ModuleAPIEndpoint(BaseAPIView):
             .prefetch_related(
                 Prefetch(
                     "link_module",
-                    queryset=ModuleLink.objects.select_related(
-                        "module", "created_by"
-                    ),
+                    queryset=ModuleLink.objects.select_related("module", "created_by"),
                 )
             )
             .annotate(
@@ -74,7 +70,7 @@ class ModuleAPIEndpoint(BaseAPIView):
                         issue_module__deleted_at__isnull=True,
                     ),
                     distinct=True,
-                ),
+                )
             )
             .annotate(
                 completed_issues=Count(
@@ -143,10 +139,7 @@ class ModuleAPIEndpoint(BaseAPIView):
         project = Project.objects.get(pk=project_id, workspace__slug=slug)
         serializer = ModuleSerializer(
             data=request.data,
-            context={
-                "project_id": project_id,
-                "workspace_id": project.workspace_id,
-            },
+            context={"project_id": project_id, "workspace_id": project.workspace_id},
         )
         if serializer.is_valid():
             if (
@@ -189,9 +182,7 @@ class ModuleAPIEndpoint(BaseAPIView):
         return Response(serializer.errors, status=status.HTTP_400_BAD_REQUEST)
 
     def patch(self, request, slug, project_id, pk):
-        module = Module.objects.get(
-            pk=pk, project_id=project_id, workspace__slug=slug
-        )
+        module = Module.objects.get(pk=pk, project_id=project_id, workspace__slug=slug)
 
         current_instance = json.dumps(
             ModuleSerializer(module).data, cls=DjangoJSONEncoder
@@ -203,10 +194,7 @@ class ModuleAPIEndpoint(BaseAPIView):
                 status=status.HTTP_400_BAD_REQUEST,
             )
         serializer = ModuleSerializer(
-            module,
-            data=request.data,
-            context={"project_id": project_id},
-            partial=True,
+            module, data=request.data, context={"project_id": project_id}, partial=True
         )
         if serializer.is_valid():
             if (
@@ -246,33 +234,21 @@ class ModuleAPIEndpoint(BaseAPIView):
 
     def get(self, request, slug, project_id, pk=None):
         if pk:
-            queryset = (
-                self.get_queryset().filter(archived_at__isnull=True).get(pk=pk)
-            )
+            queryset = self.get_queryset().filter(archived_at__isnull=True).get(pk=pk)
             data = ModuleSerializer(
-                queryset,
-                fields=self.fields,
-                expand=self.expand,
+                queryset, fields=self.fields, expand=self.expand
             ).data
-            return Response(
-                data,
-                status=status.HTTP_200_OK,
-            )
+            return Response(data, status=status.HTTP_200_OK)
         return self.paginate(
             request=request,
             queryset=(self.get_queryset().filter(archived_at__isnull=True)),
             on_results=lambda modules: ModuleSerializer(
-                modules,
-                many=True,
-                fields=self.fields,
-                expand=self.expand,
+                modules, many=True, fields=self.fields, expand=self.expand
             ).data,
         )
 
     def delete(self, request, slug, project_id, pk):
-        module = Module.objects.get(
-            workspace__slug=slug, project_id=project_id, pk=pk
-        )
+        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,
@@ -288,9 +264,7 @@ class ModuleAPIEndpoint(BaseAPIView):
             )
 
         module_issues = list(
-            ModuleIssue.objects.filter(module_id=pk).values_list(
-                "issue", flat=True
-            )
+            ModuleIssue.objects.filter(module_id=pk).values_list("issue", flat=True)
         )
         issue_activity.delay(
             type="module.activity.deleted",
@@ -304,24 +278,15 @@ class ModuleAPIEndpoint(BaseAPIView):
             actor_id=str(request.user.id),
             issue_id=None,
             project_id=str(project_id),
-            current_instance=json.dumps(
-                {
-                    "module_name": str(module.name),
-                }
-            ),
+            current_instance=json.dumps({"module_name": str(module.name)}),
             epoch=int(timezone.now().timestamp()),
         )
         module.delete()
         # Delete the module issues
-        ModuleIssue.objects.filter(
-            module=pk,
-            project_id=project_id,
-        ).delete()
+        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,
+            entity_type="module", entity_identifier=pk, project_id=project_id
         ).delete()
         return Response(status=status.HTTP_204_NO_CONTENT)
 
@@ -338,16 +303,12 @@ class ModuleIssueAPIEndpoint(BaseAPIView):
     webhook_event = "module_issue"
     bulk = True
 
-    permission_classes = [
-        ProjectEntityPermission,
-    ]
+    permission_classes = [ProjectEntityPermission]
 
     def get_queryset(self):
         return (
             ModuleIssue.objects.annotate(
-                sub_issues_count=Issue.issue_objects.filter(
-                    parent=OuterRef("issue")
-                )
+                sub_issues_count=Issue.issue_objects.filter(parent=OuterRef("issue"))
                 .order_by()
                 .annotate(count=Func(F("id"), function="Count"))
                 .values("count")
@@ -374,13 +335,10 @@ class ModuleIssueAPIEndpoint(BaseAPIView):
         order_by = request.GET.get("order_by", "created_at")
         issues = (
             Issue.issue_objects.filter(
-                issue_module__module_id=module_id,
-                issue_module__deleted_at__isnull=True,
+                issue_module__module_id=module_id, issue_module__deleted_at__isnull=True
             )
             .annotate(
-                sub_issues_count=Issue.issue_objects.filter(
-                    parent=OuterRef("id")
-                )
+                sub_issues_count=Issue.issue_objects.filter(parent=OuterRef("id"))
                 .order_by()
                 .annotate(count=Func(F("id"), function="Count"))
                 .values("count")
@@ -415,10 +373,7 @@ class ModuleIssueAPIEndpoint(BaseAPIView):
             request=request,
             queryset=(issues),
             on_results=lambda issues: IssueSerializer(
-                issues,
-                many=True,
-                fields=self.fields,
-                expand=self.expand,
+                issues, many=True, fields=self.fields, expand=self.expand
             ).data,
         )
 
@@ -426,8 +381,7 @@ class ModuleIssueAPIEndpoint(BaseAPIView):
         issues = request.data.get("issues", [])
         if not len(issues):
             return Response(
-                {"error": "Issues are required"},
-                status=status.HTTP_400_BAD_REQUEST,
+                {"error": "Issues are required"}, status=status.HTTP_400_BAD_REQUEST
             )
         module = Module.objects.get(
             workspace__slug=slug, project_id=project_id, pk=module_id
@@ -474,16 +428,10 @@ class ModuleIssueAPIEndpoint(BaseAPIView):
                 )
 
         ModuleIssue.objects.bulk_create(
-            record_to_create,
-            batch_size=10,
-            ignore_conflicts=True,
+            record_to_create, batch_size=10, ignore_conflicts=True
         )
 
-        ModuleIssue.objects.bulk_update(
-            records_to_update,
-            ["module"],
-            batch_size=10,
-        )
+        ModuleIssue.objects.bulk_update(records_to_update, ["module"], batch_size=10)
 
         # Capture Issue Activity
         issue_activity.delay(
@@ -519,10 +467,7 @@ class ModuleIssueAPIEndpoint(BaseAPIView):
         issue_activity.delay(
             type="module.activity.deleted",
             requested_data=json.dumps(
-                {
-                    "module_id": str(module_id),
-                    "issues": [str(module_issue.issue_id)],
-                }
+                {"module_id": str(module_id), "issues": [str(module_issue.issue_id)]}
             ),
             actor_id=str(request.user.id),
             issue_id=str(issue_id),
@@ -534,9 +479,7 @@ class ModuleIssueAPIEndpoint(BaseAPIView):
 
 
 class ModuleArchiveUnarchiveAPIEndpoint(BaseAPIView):
-    permission_classes = [
-        ProjectEntityPermission,
-    ]
+    permission_classes = [ProjectEntityPermission]
 
     def get_queryset(self):
         return (
@@ -550,9 +493,7 @@ class ModuleArchiveUnarchiveAPIEndpoint(BaseAPIView):
             .prefetch_related(
                 Prefetch(
                     "link_module",
-                    queryset=ModuleLink.objects.select_related(
-                        "module", "created_by"
-                    ),
+                    queryset=ModuleLink.objects.select_related("module", "created_by"),
                 )
             )
             .annotate(
@@ -564,7 +505,7 @@ class ModuleArchiveUnarchiveAPIEndpoint(BaseAPIView):
                         issue_module__deleted_at__isnull=True,
                     ),
                     distinct=True,
-                ),
+                )
             )
             .annotate(
                 completed_issues=Count(
@@ -634,22 +575,15 @@ class ModuleArchiveUnarchiveAPIEndpoint(BaseAPIView):
             request=request,
             queryset=(self.get_queryset()),
             on_results=lambda modules: ModuleSerializer(
-                modules,
-                many=True,
-                fields=self.fields,
-                expand=self.expand,
+                modules, many=True, fields=self.fields, expand=self.expand
             ).data,
         )
 
     def post(self, request, slug, project_id, pk):
-        module = Module.objects.get(
-            pk=pk, project_id=project_id, workspace__slug=slug
-        )
+        module = Module.objects.get(pk=pk, project_id=project_id, workspace__slug=slug)
         if module.status not in ["completed", "cancelled"]:
             return Response(
-                {
-                    "error": "Only completed or cancelled modules can be archived"
-                },
+                {"error": "Only completed or cancelled modules can be archived"},
                 status=status.HTTP_400_BAD_REQUEST,
             )
         module.archived_at = timezone.now()
@@ -663,9 +597,7 @@ class ModuleArchiveUnarchiveAPIEndpoint(BaseAPIView):
         return Response(status=status.HTTP_204_NO_CONTENT)
 
     def delete(self, request, slug, project_id, pk):
-        module = Module.objects.get(
-            pk=pk, project_id=project_id, workspace__slug=slug
-        )
+        module = Module.objects.get(pk=pk, project_id=project_id, workspace__slug=slug)
         module.archived_at = None
         module.save()
         return Response(status=status.HTTP_204_NO_CONTENT)