chore: handled notification error styling (#4996)

* fix: command enter submits the form

* fix: build errors

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

@@ -16,36 +16,44 @@ jobs:
       gh_buildx_version: ${{ steps.set_env_variables.outputs.BUILDX_VERSION }}
       gh_buildx_platforms: ${{ steps.set_env_variables.outputs.BUILDX_PLATFORMS }}
       gh_buildx_endpoint: ${{ steps.set_env_variables.outputs.BUILDX_ENDPOINT }}
-      build_base: ${{ steps.changed_files.outputs.base_any_changed }}
+      image_tag: ${{ steps.set_env_variables.outputs.IMAGE_TAG }}
 
     steps:
       - id: set_env_variables
         name: Set Environment Variables
         run: |
-          echo "BUILDX_DRIVER=cloud" >> $GITHUB_OUTPUT
-          echo "BUILDX_VERSION=lab:latest" >> $GITHUB_OUTPUT
-          echo "BUILDX_PLATFORMS=linux/amd64,linux/arm64" >> $GITHUB_OUTPUT
-          echo "BUILDX_ENDPOINT=makeplane/plane-dev" >> $GITHUB_OUTPUT
-          echo "TARGET_BRANCH=${{ env.TARGET_BRANCH }}" >> $GITHUB_OUTPUT
+          if [ "${{ env.TARGET_BRANCH }}" == "master" ]; then
+            echo "BUILDX_DRIVER=cloud" >> $GITHUB_OUTPUT
+            echo "BUILDX_VERSION=lab:latest" >> $GITHUB_OUTPUT
+            echo "BUILDX_PLATFORMS=linux/amd64,linux/arm64" >> $GITHUB_OUTPUT
+            echo "BUILDX_ENDPOINT=makeplane/plane-dev" >> $GITHUB_OUTPUT
+            echo "TARGET_BRANCH=${{ env.TARGET_BRANCH }}" >> $GITHUB_OUTPUT
+
+            echo "IMAGE_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 [ "${{ env.TARGET_BRANCH }}" == "preview" ]; then
+              echo "TARGET_BRANCH=preview" >> $GITHUB_OUTPUT
+              echo "IMAGE_TAG=preview" >> $GITHUB_OUTPUT
+            else
+              echo "TARGET_BRANCH=develop" >> $GITHUB_OUTPUT
+              echo "IMAGE_TAG=develop" >> $GITHUB_OUTPUT
+            fi
+          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: |
-            base: 
-              - aio/Dockerfile.base
-
-  base_build_push:
-    if: ${{ needs.base_build_setup.outputs.build_base == 'true' || github.event_name == 'workflow_dispatch' || needs.base_build_setup.outputs.gh_branch_name == 'master' }}
+  full_base_build_push:
     runs-on: ubuntu-latest
     needs: [base_build_setup]
     env:
-      BASE_IMG_TAG: makeplane/plane-aio-base:${{ needs.base_build_setup.outputs.gh_branch_name }}
+      BASE_IMG_TAG: makeplane/plane-aio-base:full-${{ needs.base_build_setup.outputs.image_tag }}
       TARGET_BRANCH: ${{ needs.base_build_setup.outputs.gh_branch_name }}
       BUILDX_DRIVER: ${{ needs.base_build_setup.outputs.gh_buildx_driver }}
       BUILDX_VERSION: ${{ needs.base_build_setup.outputs.gh_buildx_version }}
@@ -55,15 +63,6 @@ jobs:
       - name: Check out the repo
         uses: actions/checkout@v4
 
-      - name: Set Docker Tag
-        run: |
-          if [ "${{ env.TARGET_BRANCH }}" == "master" ]; then
-            TAG=makeplane/plane-aio-base:latest
-          else
-            TAG=${{ env.BASE_IMG_TAG }}
-          fi
-          echo "BASE_IMG_TAG=${TAG}" >> $GITHUB_ENV
-
       - name: Login to Docker Hub
         uses: docker/login-action@v3
         with:
@@ -81,10 +80,54 @@ jobs:
         uses: docker/build-push-action@v5.1.0
         with:
           context: ./aio
-          file: ./aio/Dockerfile.base
+          file: ./aio/Dockerfile-base-full
           platforms: ${{ env.BUILDX_PLATFORMS }}
           tags: ${{ env.BASE_IMG_TAG }}
           push: true
+          cache-from: type=gha
+          cache-to: type=gha,mode=max
+        env:
+          DOCKER_BUILDKIT: 1
+          DOCKER_USERNAME: ${{ secrets.DOCKERHUB_USERNAME }}
+          DOCKER_PASSWORD: ${{ secrets.DOCKERHUB_TOKEN }}
+
+  slim_base_build_push:
+    runs-on: ubuntu-latest
+    needs: [base_build_setup]
+    env:
+      BASE_IMG_TAG: makeplane/plane-aio-base:slim-${{ needs.base_build_setup.outputs.image_tag }}
+      TARGET_BRANCH: ${{ needs.base_build_setup.outputs.gh_branch_name }}
+      BUILDX_DRIVER: ${{ needs.base_build_setup.outputs.gh_buildx_driver }}
+      BUILDX_VERSION: ${{ needs.base_build_setup.outputs.gh_buildx_version }}
+      BUILDX_PLATFORMS: ${{ needs.base_build_setup.outputs.gh_buildx_platforms }}
+      BUILDX_ENDPOINT: ${{ needs.base_build_setup.outputs.gh_buildx_endpoint }}
+    steps:
+      - name: Check out the repo
+        uses: actions/checkout@v4
+
+      - name: Login to Docker Hub
+        uses: docker/login-action@v3
+        with:
+          username: ${{ secrets.DOCKERHUB_USERNAME }}
+          password: ${{ secrets.DOCKERHUB_TOKEN }}
+
+      - name: Set up Docker Buildx
+        uses: docker/setup-buildx-action@v3
+        with:
+          driver: ${{ env.BUILDX_DRIVER }}
+          version: ${{ env.BUILDX_VERSION }}
+          endpoint: ${{ env.BUILDX_ENDPOINT }}
+
+      - name: Build and Push to Docker Hub
+        uses: docker/build-push-action@v5.1.0
+        with:
+          context: ./aio
+          file: ./aio/Dockerfile-base-slim
+          platforms: ${{ env.BUILDX_PLATFORMS }}
+          tags: ${{ env.BASE_IMG_TAG }}
+          push: true
+          cache-from: type=gha
+          cache-to: type=gha,mode=max
         env:
           DOCKER_BUILDKIT: 1
           DOCKER_USERNAME: ${{ secrets.DOCKERHUB_USERNAME }}

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

@@ -0,0 +1,197 @@
+name: Branch Build AIO
+
+on:
+  workflow_dispatch:
+    inputs:
+      full:
+        description: 'Run full build'
+        type: boolean
+        required: false
+        default: false
+      slim:
+        description: 'Run slim build'
+        type: boolean
+        required: false
+        default: false
+  release:
+    types: [released, prereleased]
+
+env:
+  TARGET_BRANCH: ${{ github.ref_name || github.event.release.target_commitish }}
+  FULL_BUILD_INPUT: ${{ github.event.inputs.full }}
+  SLIM_BUILD_INPUT: ${{ github.event.inputs.slim }}
+
+jobs:
+  branch_build_setup:
+    name: Build Setup
+    runs-on: ubuntu-latest
+    outputs:
+      gh_branch_name: ${{ steps.set_env_variables.outputs.TARGET_BRANCH }}
+      gh_buildx_driver: ${{ steps.set_env_variables.outputs.BUILDX_DRIVER }}
+      gh_buildx_version: ${{ steps.set_env_variables.outputs.BUILDX_VERSION }}
+      gh_buildx_platforms: ${{ steps.set_env_variables.outputs.BUILDX_PLATFORMS }}
+      gh_buildx_endpoint: ${{ steps.set_env_variables.outputs.BUILDX_ENDPOINT }}
+      aio_base_tag: ${{ steps.set_env_variables.outputs.AIO_BASE_TAG }}
+      do_full_build: ${{ steps.set_env_variables.outputs.DO_FULL_BUILD }}
+      do_slim_build: ${{ steps.set_env_variables.outputs.DO_SLIM_BUILD }}
+
+    steps:
+      - id: set_env_variables
+        name: Set Environment Variables
+        run: |
+          if [ "${{ env.TARGET_BRANCH }}" == "master" ] || [ "${{ github.event_name }}" == "release" ]; then
+            echo "BUILDX_DRIVER=cloud" >> $GITHUB_OUTPUT
+            echo "BUILDX_VERSION=lab:latest" >> $GITHUB_OUTPUT
+            echo "BUILDX_PLATFORMS=linux/amd64,linux/arm64" >> $GITHUB_OUTPUT
+            echo "BUILDX_ENDPOINT=makeplane/plane-dev" >> $GITHUB_OUTPUT
+
+            echo "AIO_BASE_TAG=latest" >> $GITHUB_OUTPUT
+          else
+            echo "BUILDX_DRIVER=docker-container" >> $GITHUB_OUTPUT
+            echo "BUILDX_VERSION=latest" >> $GITHUB_OUTPUT
+            echo "BUILDX_PLATFORMS=linux/amd64" >> $GITHUB_OUTPUT
+            echo "BUILDX_ENDPOINT=" >> $GITHUB_OUTPUT
+
+            if [ "${{ 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: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:${{env.BUILD_TYPE}}-stable,makeplane/plane-aio:${{env.BUILD_TYPE}}-${{ github.event.release.tag_name }}
+          elif [ "${{ env.TARGET_BRANCH }}" == "master" ]; then
+            TAG=makeplane/plane-aio:${{env.BUILD_TYPE}}-latest
+          else
+            TAG=${{ env.AIO_IMAGE_TAGS }}
+          fi
+          echo "AIO_IMAGE_TAGS=${TAG}" >> $GITHUB_ENV
+
+      - name: Login to Docker Hub
+        uses: docker/login-action@v3
+        with:
+          username: ${{ secrets.DOCKERHUB_USERNAME }}
+          password: ${{ secrets.DOCKERHUB_TOKEN }}
+
+      - name: Set up Docker Buildx
+        uses: docker/setup-buildx-action@v3
+        with:
+          driver: ${{ env.BUILDX_DRIVER }}
+          version: ${{ env.BUILDX_VERSION }}
+          endpoint: ${{ env.BUILDX_ENDPOINT }}
+
+      - name: Check out the repo
+        uses: actions/checkout@v4
+
+      - name: Build and Push to Docker Hub
+        uses: docker/build-push-action@v5.1.0
+        with:
+          context: .
+          file: ./aio/Dockerfile-app
+          platforms: ${{ env.BUILDX_PLATFORMS }}
+          tags: ${{ env.AIO_IMAGE_TAGS }}
+          push: true
+          build-args: |
+            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: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:${{env.BUILD_TYPE}}-stable,makeplane/plane-aio:${{env.BUILD_TYPE}}-${{ github.event.release.tag_name }}
+          elif [ "${{ env.TARGET_BRANCH }}" == "master" ]; then
+            TAG=makeplane/plane-aio:${{env.BUILD_TYPE}}-latest
+          else
+            TAG=${{ env.AIO_IMAGE_TAGS }}
+          fi
+          echo "AIO_IMAGE_TAGS=${TAG}" >> $GITHUB_ENV
+
+      - name: Login to Docker Hub
+        uses: docker/login-action@v3
+        with:
+          username: ${{ secrets.DOCKERHUB_USERNAME }}
+          password: ${{ secrets.DOCKERHUB_TOKEN }}
+
+      - name: Set up Docker Buildx
+        uses: docker/setup-buildx-action@v3
+        with:
+          driver: ${{ env.BUILDX_DRIVER }}
+          version: ${{ env.BUILDX_VERSION }}
+          endpoint: ${{ env.BUILDX_ENDPOINT }}
+
+      - name: Check out the repo
+        uses: actions/checkout@v4
+
+      - name: Build and Push to Docker Hub
+        uses: docker/build-push-action@v5.1.0
+        with:
+          context: .
+          file: ./aio/Dockerfile-app
+          platforms: ${{ env.BUILDX_PLATFORMS }}
+          tags: ${{ env.AIO_IMAGE_TAGS }}
+          push: true
+          build-args: |
+            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/feature-deployment.yml

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

aio/Dockerfile-app

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

aio/Dockerfile-base-full

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

aio/Dockerfile-base-slim

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

aio/aio.sh

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

aio/env.sh

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

aio/nginx.conf

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

aio/pg-setup.sh

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

aio/postgresql.conf

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

aio/supervisord-app

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

aio/supervisord-full-base

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

aio/supervisord-slim-base

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

aio/supervisord.conf

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

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

@@ -43,8 +43,9 @@ class NotificationViewSet(BaseViewSet, BasePaginator):
         # Get query parameters
         snoozed = request.GET.get("snoozed", "false")
         archived = request.GET.get("archived", "false")
-        read = request.GET.get("read", "true")
+        read = request.GET.get("read", None)
         type = request.GET.get("type", "all")
+        q_filters = Q()
 
         notifications = (
             Notification.objects.filter(
@@ -74,8 +75,12 @@ class NotificationViewSet(BaseViewSet, BasePaginator):
         if read == "false":
             notifications = notifications.filter(read_at__isnull=True)
 
+        if read == "true":
+            notifications = notifications.filter(read_at__isnull=False)
+
+        type = type.split(",")
         # Subscribed issues
-        if type == "watching":
+        if "subscribed" in type:
             issue_ids = (
                 IssueSubscriber.objects.filter(
                     workspace__slug=slug, subscriber_id=request.user.id
@@ -97,35 +102,32 @@ class NotificationViewSet(BaseViewSet, BasePaginator):
                 .filter(created=False, assigned=False)
                 .values_list("issue_id", flat=True)
             )
-            notifications = notifications.filter(
-                entity_identifier__in=issue_ids,
-            )
+            q_filters |= Q(entity_identifier__in=issue_ids)
 
         # Assigned Issues
-        if type == "assigned":
+        if "assigned" in type:
             issue_ids = IssueAssignee.objects.filter(
                 workspace__slug=slug, assignee_id=request.user.id
             ).values_list("issue_id", flat=True)
-            notifications = notifications.filter(
-                entity_identifier__in=issue_ids
-            )
+            q_filters |= Q(entity_identifier__in=issue_ids)
 
         # Created issues
-        if type == "created":
+        if "created" in type:
             if WorkspaceMember.objects.filter(
                 workspace__slug=slug,
                 member=request.user,
                 role__lt=15,
                 is_active=True,
             ).exists():
-                notifications = Notification.objects.none()
+                notifications = notifications.none()
             else:
                 issue_ids = Issue.objects.filter(
                     workspace__slug=slug, created_by=request.user
                 ).values_list("pk", flat=True)
-                notifications = notifications.filter(
-                    entity_identifier__in=issue_ids
-                )
+                q_filters |= Q(entity_identifier__in=issue_ids)
+
+        # Apply the combined Q object filters
+        notifications = notifications.filter(q_filters)
 
         # Pagination
         if request.GET.get("per_page", False) and request.GET.get(
@@ -200,11 +202,12 @@ class NotificationViewSet(BaseViewSet, BasePaginator):
 class UnreadNotificationEndpoint(BaseAPIView):
     def get(self, request, slug):
         # Watching Issues Count
-        watching_issues_count = Notification.objects.filter(
+        subscribed_issues_count = Notification.objects.filter(
             workspace__slug=slug,
             receiver_id=request.user.id,
             read_at__isnull=True,
             archived_at__isnull=True,
+            snoozed_till__isnull=True,
             entity_identifier__in=IssueSubscriber.objects.filter(
                 workspace__slug=slug, subscriber_id=request.user.id
             ).values_list("issue_id", flat=True),
@@ -216,6 +219,7 @@ class UnreadNotificationEndpoint(BaseAPIView):
             receiver_id=request.user.id,
             read_at__isnull=True,
             archived_at__isnull=True,
+            snoozed_till__isnull=True,
             entity_identifier__in=IssueAssignee.objects.filter(
                 workspace__slug=slug, assignee_id=request.user.id
             ).values_list("issue_id", flat=True),
@@ -227,6 +231,7 @@ class UnreadNotificationEndpoint(BaseAPIView):
             receiver_id=request.user.id,
             read_at__isnull=True,
             archived_at__isnull=True,
+            snoozed_till__isnull=True,
             entity_identifier__in=Issue.objects.filter(
                 workspace__slug=slug, created_by=request.user
             ).values_list("pk", flat=True),
@@ -234,7 +239,7 @@ class UnreadNotificationEndpoint(BaseAPIView):
 
         return Response(
             {
-                "watching_issues": watching_issues_count,
+                "subscribed_issues": subscribed_issues_count,
                 "my_issues": my_issues_count,
                 "created_issues": created_issues_count,
             },

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

@@ -24,6 +24,8 @@ from plane.db.models import (
     TeamMember,
     IssueProperty,
 )
+from plane.bgtasks.project_add_user_email_task import project_add_user_email
+from plane.utils.host import base_host
 
 
 class ProjectMemberViewSet(BaseViewSet):
@@ -64,33 +66,29 @@ class ProjectMemberViewSet(BaseViewSet):
         )
 
     def create(self, request, slug, project_id):
+        # Get the list of members to be added to the project and their roles i.e. the user_id and the role
         members = request.data.get("members", [])
 
         # get the project
         project = Project.objects.get(pk=project_id, workspace__slug=slug)
 
+        # Check if the members array is empty
         if not len(members):
             return Response(
                 {"error": "Atleast one member is required"},
                 status=status.HTTP_400_BAD_REQUEST,
             )
+
+        # Initialize the bulk arrays
         bulk_project_members = []
         bulk_issue_props = []
 
-        project_members = (
-            ProjectMember.objects.filter(
-                workspace__slug=slug,
-                member_id__in=[member.get("member_id") for member in members],
-            )
-            .values("member_id", "sort_order")
-            .order_by("sort_order")
-        )
-
-        bulk_project_members = []
+        # Create a dictionary of the member_id and their roles
         member_roles = {
             member.get("member_id"): member.get("role") for member in members
         }
-        # Update roles in the members array based on the member_roles dictionary
+
+        # Update roles in the members array based on the member_roles dictionary and set is_active to True
         for project_member in ProjectMember.objects.filter(
             project_id=project_id,
             member_id__in=[member.get("member_id") for member in members],
@@ -104,13 +102,27 @@ class ProjectMemberViewSet(BaseViewSet):
             bulk_project_members, ["is_active", "role"], batch_size=100
         )
 
+        # Get the list of project members of the requested workspace with the given slug
+        project_members = (
+            ProjectMember.objects.filter(
+                workspace__slug=slug,
+                member_id__in=[member.get("member_id") for member in members],
+            )
+            .values("member_id", "sort_order")
+            .order_by("sort_order")
+        )
+
+        # Loop through requested members
         for member in members:
+
+            # Get the sort orders of the member
             sort_order = [
                 project_member.get("sort_order")
                 for project_member in project_members
                 if str(project_member.get("member_id"))
                 == str(member.get("member_id"))
             ]
+            # Create a new project member
             bulk_project_members.append(
                 ProjectMember(
                     member_id=member.get("member_id"),
@@ -122,6 +134,7 @@ class ProjectMemberViewSet(BaseViewSet):
                     ),
                 )
             )
+            # Create a new issue property
             bulk_issue_props.append(
                 IssueProperty(
                     user_id=member.get("member_id"),
@@ -130,6 +143,7 @@ class ProjectMemberViewSet(BaseViewSet):
                 )
             )
 
+        # Bulk create the project members and issue properties
         project_members = ProjectMember.objects.bulk_create(
             bulk_project_members,
             batch_size=10,
@@ -144,7 +158,18 @@ class ProjectMemberViewSet(BaseViewSet):
             project_id=project_id,
             member_id__in=[member.get("member_id") for member in members],
         )
+        # Send emails to notify the users
+        [
+            project_add_user_email.delay(
+                base_host(request=request, is_app=True),
+                project_member.id,
+                request.user.id,
+            )
+            for project_member in project_members
+        ]
+        # Serialize the project members
         serializer = ProjectMemberRoleSerializer(project_members, many=True)
+        # Return the serialized data
         return Response(serializer.data, status=status.HTTP_201_CREATED)
 
     def list(self, request, slug, project_id):

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

@@ -35,6 +35,8 @@ from plane.license.models import Instance, InstanceAdmin
 from plane.utils.cache import cache_response, invalidate_cache
 from plane.utils.paginator import BasePaginator
 from plane.authentication.utils.host import user_ip
+from plane.bgtasks.user_deactivation_email_task import user_deactivation_email
+from plane.utils.host import base_host
 
 
 class UserEndpoint(BaseViewSet):
@@ -192,6 +194,11 @@ class UserEndpoint(BaseViewSet):
         user.last_logout_time = timezone.now()
         user.save()
 
+        # Send an email to the user
+        user_deactivation_email.delay(
+            base_host(request=request, is_app=True), user.id
+        )
+
         # Logout the user
         logout(request)
         return Response(status=status.HTTP_204_NO_CONTENT)

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

@@ -14,6 +14,7 @@ from django.db.models.functions import Coalesce
 from django.utils.decorators import method_decorator
 from django.views.decorators.gzip import gzip_page
 from rest_framework import status
+from django.db import transaction
 
 # Third party imports
 from rest_framework.response import Response
@@ -31,6 +32,8 @@ from plane.db.models import (
     IssueLink,
     IssueView,
     Workspace,
+    WorkspaceMember,
+    ProjectMember,
 )
 from plane.utils.grouper import (
     issue_group_values,
@@ -76,32 +79,60 @@ class WorkspaceViewViewSet(BaseViewSet):
         )
 
     def partial_update(self, request, slug, pk):
+        with transaction.atomic():
+            workspace_view = IssueView.objects.select_for_update().get(
+                pk=pk,
+                workspace__slug=slug,
+            )
+
+            if workspace_view.is_locked:
+                return Response(
+                    {"error": "view is locked"},
+                    status=status.HTTP_400_BAD_REQUEST,
+                )
+
+            # Only update the view if owner is updating
+            if workspace_view.owned_by_id != request.user.id:
+                return Response(
+                    {
+                        "error": "Only the owner of the view can update the view"
+                    },
+                    status=status.HTTP_400_BAD_REQUEST,
+                )
+
+            serializer = IssueViewSerializer(
+                workspace_view, data=request.data, partial=True
+            )
+
+            if serializer.is_valid():
+                serializer.save()
+                return Response(serializer.data, status=status.HTTP_200_OK)
+            return Response(
+                serializer.errors, status=status.HTTP_400_BAD_REQUEST
+            )
+
+    def destroy(self, request, slug, pk):
         workspace_view = IssueView.objects.get(
             pk=pk,
             workspace__slug=slug,
         )
-
-        if workspace_view.is_locked:
-            return Response(
-                {"error": "view is locked"},
-                status=status.HTTP_400_BAD_REQUEST,
-            )
-
-        # Only update the view if owner is updating
-        if workspace_view.owned_by_id != request.user.id:
-            return Response(
-                {"error": "Only the owner of the view can update the view"},
-                status=status.HTTP_400_BAD_REQUEST,
-            )
-
-        serializer = IssueViewSerializer(
-            workspace_view, data=request.data, partial=True
+        workspace_member = WorkspaceMember.objects.filter(
+            workspace__slug=slug,
+            member=request.user,
+            role=20,
+            is_active=True,
         )
-
-        if serializer.is_valid():
-            serializer.save()
-            return Response(serializer.data, status=status.HTTP_200_OK)
-        return Response(serializer.errors, status=status.HTTP_400_BAD_REQUEST)
+        if (
+            workspace_member.exists()
+            or workspace_view.owned_by == request.user
+        ):
+            workspace_view.delete()
+        else:
+            return Response(
+                {"error": "Only admin or owner can delete the view"},
+                status=status.HTTP_400_BAD_REQUEST,
+            )
+        return Response(status=status.HTTP_204_NO_CONTENT)
 
 
 class WorkspaceViewIssuesViewSet(BaseViewSet):
@@ -344,31 +375,58 @@ class IssueViewViewSet(BaseViewSet):
         return Response(views, status=status.HTTP_200_OK)
 
     def partial_update(self, request, slug, project_id, pk):
-        issue_view = IssueView.objects.get(
-            pk=pk, workspace__slug=slug, project_id=project_id
-        )
-
-        if issue_view.is_locked:
-            return Response(
-                {"error": "view is locked"},
-                status=status.HTTP_400_BAD_REQUEST,
+        with transaction.atomic():
+            issue_view = IssueView.objects.select_for_update().get(
+                pk=pk, workspace__slug=slug, project_id=project_id
             )
 
-        # Only update the view if owner is updating
-        if issue_view.owned_by_id != request.user.id:
-            return Response(
-                {"error": "Only the owner of the view can update the view"},
-                status=status.HTTP_400_BAD_REQUEST,
+            if issue_view.is_locked:
+                return Response(
+                    {"error": "view is locked"},
+                    status=status.HTTP_400_BAD_REQUEST,
+                )
+
+            # Only update the view if owner is updating
+            if issue_view.owned_by_id != request.user.id:
+                return Response(
+                    {
+                        "error": "Only the owner of the view can update the view"
+                    },
+                    status=status.HTTP_400_BAD_REQUEST,
+                )
+
+            serializer = IssueViewSerializer(
+                issue_view, data=request.data, partial=True
             )
 
-        serializer = IssueViewSerializer(
-            issue_view, data=request.data, partial=True
-        )
+            if serializer.is_valid():
+                serializer.save()
+                return Response(serializer.data, status=status.HTTP_200_OK)
+            return Response(
+                serializer.errors, status=status.HTTP_400_BAD_REQUEST
+            )
 
-        if serializer.is_valid():
-            serializer.save()
-            return Response(serializer.data, status=status.HTTP_200_OK)
-        return Response(serializer.errors, status=status.HTTP_400_BAD_REQUEST)
+    def destroy(self, request, slug, project_id, pk):
+        project_view = IssueView.objects.get(
+            pk=pk,
+            project_id=project_id,
+            workspace__slug=slug,
+        )
+        project_member = ProjectMember.objects.filter(
+            workspace__slug=slug,
+            project_id=project_id,
+            member=request.user,
+            role=20,
+            is_active=True,
+        )
+        if project_member.exists() or project_view.owned_by == request.user:
+            project_view.delete()
+        else:
+            return Response(
+                {"error": "Only admin or owner can delete the view"},
+                status=status.HTTP_400_BAD_REQUEST,
+            )
+        return Response(status=status.HTTP_204_NO_CONTENT)
 
 
 class IssueViewFavoriteViewSet(BaseViewSet):

apiserver/plane/authentication/adapter/base.py

@@ -18,6 +18,8 @@ from plane.db.models import (
 )
 from plane.license.utils.instance_value import get_configuration_value
 from .error import AuthenticationException, AUTHENTICATION_ERROR_CODES
+from plane.bgtasks.user_activation_email_task import user_activation_email
+from plane.authentication.utils.host import base_host
 
 
 class Adapter:
@@ -120,6 +122,13 @@ class Adapter:
         user.last_login_ip = self.request.META.get("REMOTE_ADDR")
         user.last_login_uagent = self.request.META.get("HTTP_USER_AGENT")
         user.token_updated_at = timezone.now()
+        # If user is not active, send the activation email and set the user as active
+        if not user.is_active:
+            user_activation_email.delay(
+                base_host(request=self.request), user.id
+            )
+        # Set user as active
+        user.is_active = True
         user.save()
         return user
 
@@ -168,12 +177,6 @@ class Adapter:
             # Create profile
             Profile.objects.create(user=user)
 
-        if not user.is_active:
-            raise AuthenticationException(
-                AUTHENTICATION_ERROR_CODES["USER_ACCOUNT_DEACTIVATED"],
-                error_message="USER_ACCOUNT_DEACTIVATED",
-            )
-
         # Save user data
         user = self.save_user_data(user=user)
 

apiserver/plane/authentication/views/app/check.py

@@ -95,17 +95,7 @@ class EmailCheckEndpoint(APIView):
 
         # If existing user
         if existing_user:
-            if not existing_user.is_active:
-                exc = AuthenticationException(
-                    error_code=AUTHENTICATION_ERROR_CODES[
-                        "USER_ACCOUNT_DEACTIVATED"
-                    ],
-                    error_message="USER_ACCOUNT_DEACTIVATED",
-                )
-                return Response(
-                    exc.get_error_dict(), status=status.HTTP_400_BAD_REQUEST
-                )
-
+            # Return response
             return Response(
                 {
                     "existing": True,

apiserver/plane/authentication/views/app/email.py

@@ -107,22 +107,6 @@ class SignInAuthEndpoint(View):
             )
             return HttpResponseRedirect(url)
 
-        if not existing_user.is_active:
-            exc = AuthenticationException(
-                error_code=AUTHENTICATION_ERROR_CODES[
-                    "USER_ACCOUNT_DEACTIVATED"
-                ],
-                error_message="USER_ACCOUNT_DEACTIVATED",
-            )
-            params = exc.get_error_dict()
-            if next_path:
-                params["next_path"] = str(next_path)
-            url = urljoin(
-                base_host(request=request, is_app=True),
-                "sign-in?" + urlencode(params),
-            )
-            return HttpResponseRedirect(url)
-
         try:
             provider = EmailProvider(
                 request=request,
@@ -222,22 +206,6 @@ class SignUpAuthEndpoint(View):
 
         if existing_user:
             # Existing User
-            if not existing_user.is_active:
-                exc = AuthenticationException(
-                    error_code=AUTHENTICATION_ERROR_CODES[
-                        "USER_ACCOUNT_DEACTIVATED"
-                    ],
-                    error_message="USER_ACCOUNT_DEACTIVATED",
-                )
-                params = exc.get_error_dict()
-                if next_path:
-                    params["next_path"] = str(next_path)
-                url = urljoin(
-                    base_host(request=request, is_app=True),
-                    "?" + urlencode(params),
-                )
-                return HttpResponseRedirect(url)
-
             exc = AuthenticationException(
                 error_code=AUTHENTICATION_ERROR_CODES["USER_ALREADY_EXIST"],
                 error_message="USER_ALREADY_EXIST",

apiserver/plane/authentication/views/app/magic.py

@@ -112,22 +112,6 @@ class MagicSignInEndpoint(View):
             )
             return HttpResponseRedirect(url)
 
-        if not existing_user.is_active:
-            exc = AuthenticationException(
-                error_code=AUTHENTICATION_ERROR_CODES[
-                    "USER_ACCOUNT_DEACTIVATED"
-                ],
-                error_message="USER_ACCOUNT_DEACTIVATED",
-            )
-            params = exc.get_error_dict()
-            if next_path:
-                params["next_path"] = str(next_path)
-            url = urljoin(
-                base_host(request=request, is_app=True),
-                "sign-in?" + urlencode(params),
-            )
-            return HttpResponseRedirect(url)
-
         try:
             provider = MagicCodeProvider(
                 request=request,

apiserver/plane/authentication/views/space/check.py

@@ -93,17 +93,7 @@ class EmailCheckSpaceEndpoint(APIView):
 
         # If existing user
         if existing_user:
-            if not existing_user.is_active:
-                exc = AuthenticationException(
-                    error_code=AUTHENTICATION_ERROR_CODES[
-                        "USER_ACCOUNT_DEACTIVATED"
-                    ],
-                    error_message="USER_ACCOUNT_DEACTIVATED",
-                )
-                return Response(
-                    exc.get_error_dict(), status=status.HTTP_400_BAD_REQUEST
-                )
-
+            # Return response
             return Response(
                 {
                     "existing": True,

apiserver/plane/authentication/views/space/email.py

@@ -89,19 +89,6 @@ class SignInAuthSpaceEndpoint(View):
             url = f"{base_host(request=request, is_space=True)}?{urlencode(params)}"
             return HttpResponseRedirect(url)
 
-        if not existing_user.is_active:
-            exc = AuthenticationException(
-                error_code=AUTHENTICATION_ERROR_CODES[
-                    "USER_ACCOUNT_DEACTIVATED"
-                ],
-                error_message="USER_ACCOUNT_DEACTIVATED",
-            )
-            params = exc.get_error_dict()
-            if next_path:
-                params["next_path"] = str(next_path)
-            url = f"{base_host(request=request, is_space=True)}?{urlencode(params)}"
-            return HttpResponseRedirect(url)
-
         try:
             provider = EmailProvider(
                 request=request, key=email, code=password, is_signup=False
@@ -178,19 +165,6 @@ class SignUpAuthSpaceEndpoint(View):
         existing_user = User.objects.filter(email=email).first()
 
         if existing_user:
-            if not existing_user.is_active:
-                exc = AuthenticationException(
-                    error_code=AUTHENTICATION_ERROR_CODES[
-                        "USER_ACCOUNT_DEACTIVATED"
-                    ],
-                    error_message="USER_ACCOUNT_DEACTIVATED",
-                )
-                params = exc.get_error_dict()
-                if next_path:
-                    params["next_path"] = str(next_path)
-                url = f"{base_host(request=request, is_space=True)}?{urlencode(params)}"
-                return HttpResponseRedirect(url)
-
             exc = AuthenticationException(
                 error_code=AUTHENTICATION_ERROR_CODES["USER_ALREADY_EXIST"],
                 error_message="USER_ALREADY_EXIST",

apiserver/plane/authentication/views/space/magic.py

@@ -101,18 +101,6 @@ class MagicSignInSpaceEndpoint(View):
             return HttpResponseRedirect(url)
 
         # Active User
-        if not existing_user.is_active:
-            exc = AuthenticationException(
-                error_code=AUTHENTICATION_ERROR_CODES[
-                    "USER_ACCOUNT_DEACTIVATED"
-                ],
-                error_message="USER_ACCOUNT_DEACTIVATED",
-            )
-            params = exc.get_error_dict()
-            if next_path:
-                params["next_path"] = str(next_path)
-            url = f"{base_host(request=request, is_space=True)}?{urlencode(params)}"
-            return HttpResponseRedirect(url)
         try:
             provider = MagicCodeProvider(
                 request=request, key=f"magic_{email}", code=code

apiserver/plane/bgtasks/dummy_data_task.py

@@ -28,6 +28,7 @@ from plane.db.models import (
     CycleIssue,
     ModuleIssue,
     Page,
+    ProjectPage,
     PageLabel,
     Inbox,
     InboxIssue,
@@ -37,7 +38,7 @@ from plane.db.models import (
 def create_project(workspace, user_id):
     fake = Faker()
     name = fake.name()
-    unique_id = str(uuid.uuid4())[:5] 
+    unique_id = str(uuid.uuid4())[:5]
 
     project = Project.objects.create(
         workspace=workspace,
@@ -244,7 +245,6 @@ def create_pages(workspace, project, user_id, pages_count):
         pages.append(
             Page(
                 name=fake.name(),
-                project=project,
                 workspace=workspace,
                 owned_by_id=user_id,
                 access=random.randint(0, 1),
@@ -254,8 +254,20 @@ def create_pages(workspace, project, user_id, pages_count):
                 is_locked=False,
             )
         )
-
-    return Page.objects.bulk_create(pages, ignore_conflicts=True)
+    # Bulk create pages
+    pages = Page.objects.bulk_create(pages, ignore_conflicts=True)
+    # Add Page to project
+    ProjectPage.objects.bulk_create(
+        [
+            ProjectPage(
+                page=page,
+                project=project,
+                workspace=workspace,
+            )
+            for page in pages
+        ],
+        batch_size=1000,
+    )
 
 
 def create_page_labels(workspace, project, user_id, pages_count):
@@ -263,7 +275,9 @@ def create_page_labels(workspace, project, user_id, pages_count):
     labels = Label.objects.filter(project=project).values_list("id", flat=True)
     pages = random.sample(
         list(
-            Page.objects.filter(project=project).values_list("id", flat=True)
+            Page.objects.filter(projects__id=project.id).values_list(
+                "id", flat=True
+            )
         ),
         int(pages_count / 2),
     )
@@ -292,8 +306,14 @@ def create_issues(workspace, project, user_id, issue_count):
     fake = Faker()
     Faker.seed(0)
 
-    states = State.objects.filter(workspace=workspace, project=project).exclude(group="Triage").values_list("id", flat=True)
-    creators = ProjectMember.objects.filter(workspace=workspace, project=project).values_list("member_id", flat=True)
+    states = (
+        State.objects.filter(workspace=workspace, project=project)
+        .exclude(group="Triage")
+        .values_list("id", flat=True)
+    )
+    creators = ProjectMember.objects.filter(
+        workspace=workspace, project=project
+    ).values_list("member_id", flat=True)
 
     issues = []
 

apiserver/plane/bgtasks/project_add_user_email_task.py

@@ -0,0 +1,87 @@
+# Python imports
+import logging
+
+# Third party imports
+from celery import shared_task
+
+# Third party imports
+from django.core.mail import EmailMultiAlternatives, get_connection
+from django.template.loader import render_to_string
+from django.utils.html import strip_tags
+
+
+# Module imports
+from plane.license.utils.instance_value import get_email_configuration
+from plane.utils.exception_logger import log_exception
+from plane.db.models import ProjectMember
+from plane.db.models import User
+
+
+@shared_task
+def project_add_user_email(current_site, project_member_id, invitor_id):
+    try:
+        # Get the invitor
+        invitor = User.objects.get(pk=invitor_id)
+        inviter_first_name = invitor.first_name
+        # Get the project member
+        project_member = ProjectMember.objects.get(pk=project_member_id)
+        # Get the project member details
+        project_name = project_member.project.name
+        workspace_name = project_member.workspace.name
+        member_email = project_member.member.email
+        project_url = f"{current_site}/{project_member.workspace.slug}/projects/{project_member.project_id}/issues"
+        # set the context
+        context = {
+            "project_name": project_name,
+            "workspace_name": workspace_name,
+            "email": member_email,
+            "inviter_first_name": inviter_first_name,
+            "project_url": project_url,
+        }
+
+        # Get the email configuration
+        (
+            EMAIL_HOST,
+            EMAIL_HOST_USER,
+            EMAIL_HOST_PASSWORD,
+            EMAIL_PORT,
+            EMAIL_USE_TLS,
+            EMAIL_USE_SSL,
+            EMAIL_FROM,
+        ) = get_email_configuration()
+
+        # Set the subject
+        subject = "You have been invited to a Plane project"
+
+        # Render the email template
+        html_content = render_to_string(
+            "emails/notifications/project_addition.html", context
+        )
+        text_content = strip_tags(html_content)
+        # Initialize the connection
+        connection = get_connection(
+            host=EMAIL_HOST,
+            port=int(EMAIL_PORT),
+            username=EMAIL_HOST_USER,
+            password=EMAIL_HOST_PASSWORD,
+            use_tls=EMAIL_USE_TLS == "1",
+            use_ssl=EMAIL_USE_SSL == "1",
+        )
+        # Send the email
+        msg = EmailMultiAlternatives(
+            subject=subject,
+            body=text_content,
+            from_email=EMAIL_FROM,
+            to=[member_email],
+            connection=connection,
+        )
+        # Attach the html content
+        msg.attach_alternative(html_content, "text/html")
+        # Send the email
+        msg.send()
+        # Log the success
+        logging.getLogger("plane").info("Email sent successfully.")
+        return
+    except Exception as e:
+        log_exception(e)
+        return

apiserver/plane/bgtasks/user_activation_email_task.py

@@ -0,0 +1,70 @@
+# Python imports
+import logging
+
+# Django imports
+from django.core.mail import EmailMultiAlternatives, get_connection
+from django.template.loader import render_to_string
+from django.utils.html import strip_tags
+
+# Third party imports
+from celery import shared_task
+
+# Module imports
+from plane.db.models import User
+from plane.license.utils.instance_value import get_email_configuration
+from plane.utils.exception_logger import log_exception
+
+
+@shared_task
+def user_activation_email(current_site, user_id):
+    try:
+        # Send email to user when account is activated
+        user = User.objects.get(id=user_id)
+        subject = f"{user.first_name or user.display_name or user.email} has been activated on Plane"
+
+        context = {
+            "email": str(user.email),
+            "profile_url": current_site + "/profile",
+        }
+
+        # Send email to user
+        html_content = render_to_string(
+            "emails/user/user_activation.html", context
+        )
+
+        text_content = strip_tags(html_content)
+        # Configure email connection from the database
+        (
+            EMAIL_HOST,
+            EMAIL_HOST_USER,
+            EMAIL_HOST_PASSWORD,
+            EMAIL_PORT,
+            EMAIL_USE_TLS,
+            EMAIL_USE_SSL,
+            EMAIL_FROM,
+        ) = get_email_configuration()
+
+        connection = get_connection(
+            host=EMAIL_HOST,
+            port=int(EMAIL_PORT),
+            username=EMAIL_HOST_USER,
+            password=EMAIL_HOST_PASSWORD,
+            use_tls=EMAIL_USE_TLS == "1",
+            use_ssl=EMAIL_USE_SSL == "1",
+        )
+
+        msg = EmailMultiAlternatives(
+            subject=subject,
+            body=text_content,
+            from_email=EMAIL_FROM,
+            to=[user.email],
+            connection=connection,
+        )
+
+        msg.attach_alternative(html_content, "text/html")
+        msg.send()
+        logging.getLogger("plane").info("Email sent successfully.")
+        return
+    except Exception as e:
+        log_exception(e)
+        return

apiserver/plane/bgtasks/user_deactivation_email_task.py

@@ -0,0 +1,72 @@
+# Python imports
+import logging
+
+# Django imports
+from django.core.mail import EmailMultiAlternatives, get_connection
+from django.template.loader import render_to_string
+from django.utils.html import strip_tags
+
+# Third party imports
+from celery import shared_task
+
+# Module imports
+from plane.db.models import User
+from plane.license.utils.instance_value import get_email_configuration
+from plane.utils.exception_logger import log_exception
+
+
+@shared_task
+def user_deactivation_email(current_site, user_id):
+    try:
+        # Send email to user when account is deactivated
+        user = User.objects.get(id=user_id)
+        subject = f"{user.first_name or user.display_name or user.email} has been deactivated on Plane"
+
+        context = {
+            "email": str(user.email),
+            "login_url": current_site + "/login",
+        }
+
+        # Send email to user
+        html_content = render_to_string(
+            "emails/user/user_deactivation.html", context
+        )
+
+        text_content = strip_tags(html_content)
+        # Configure email connection from the database
+        (
+            EMAIL_HOST,
+            EMAIL_HOST_USER,
+            EMAIL_HOST_PASSWORD,
+            EMAIL_PORT,
+            EMAIL_USE_TLS,
+            EMAIL_USE_SSL,
+            EMAIL_FROM,
+        ) = get_email_configuration()
+
+        connection = get_connection(
+            host=EMAIL_HOST,
+            port=int(EMAIL_PORT),
+            username=EMAIL_HOST_USER,
+            password=EMAIL_HOST_PASSWORD,
+            use_tls=EMAIL_USE_TLS == "1",
+            use_ssl=EMAIL_USE_SSL == "1",
+        )
+
+        # Send email
+        msg = EmailMultiAlternatives(
+            subject=subject,
+            body=text_content,
+            from_email=EMAIL_FROM,
+            to=[user.email],
+            connection=connection,
+        )
+
+        # Attach HTML content
+        msg.attach_alternative(html_content, "text/html")
+        msg.send()
+        logging.getLogger("plane").info("Email sent successfully.")
+        return
+    except Exception as e:
+        log_exception(e)
+        return

apiserver/plane/utils/host.py

@@ -0,0 +1,42 @@
+# Python imports
+from urllib.parse import urlsplit
+
+# Django imports
+from django.conf import settings
+
+
+def base_host(request, is_admin=False, is_space=False, is_app=False):
+    """Utility function to return host / origin from the request"""
+    # Calculate the base origin from request
+    base_origin = str(
+        request.META.get("HTTP_ORIGIN")
+        or f"{urlsplit(request.META.get('HTTP_REFERER')).scheme}://{urlsplit(request.META.get('HTTP_REFERER')).netloc}"
+        or f"""{"https" if request.is_secure() else "http"}://{request.get_host()}"""
+    )
+
+    # Admin redirections
+    if is_admin:
+        if settings.ADMIN_BASE_URL:
+            return settings.ADMIN_BASE_URL
+        else:
+            return base_origin + "/god-mode/"
+
+    # Space redirections
+    if is_space:
+        if settings.SPACE_BASE_URL:
+            return settings.SPACE_BASE_URL
+        else:
+            return base_origin + "/spaces/"
+
+    # App Redirection
+    if is_app:
+        if settings.APP_BASE_URL:
+            return settings.APP_BASE_URL
+        else:
+            return base_origin
+
+    return base_origin
+
+
+def user_ip(request):
+    return str(request.META.get("REMOTE_ADDR"))

apiserver/requirements/base.txt

@@ -3,7 +3,7 @@
 # django
 Django==4.2.11
 # rest framework
-djangorestframework==3.15.1
+djangorestframework==3.15.2
 # postgres 
 psycopg==3.1.18
 psycopg-binary==3.1.18

package.json

@@ -34,7 +34,7 @@
     "prettier": "latest",
     "prettier-plugin-tailwindcss": "^0.5.4",
     "tailwindcss": "^3.3.3",
-    "turbo": "^2.0.4"
+    "turbo": "^2.0.6"
   },
   "resolutions": {
     "@types/react": "18.2.48"

packages/editor/.eslintrc.js

@@ -1,4 +1,38 @@
 module.exports = {
   root: true,
   extends: ["custom"],
+  rules: {
+    "import/order": [
+      "error",
+      {
+        groups: ["builtin", "external", "internal", "parent", "sibling"],
+        pathGroups: [
+          {
+            pattern: "react",
+            group: "external",
+            position: "before",
+          },
+          {
+            pattern: "lucide-react",
+            group: "external",
+            position: "after",
+          },
+          {
+            pattern: "@plane/**",
+            group: "external",
+            position: "after",
+          },
+          {
+            pattern: "@/**",
+            group: "internal",
+          },
+        ],
+        pathGroupsExcludedImportTypes: ["builtin", "internal", "react"],
+        alphabetize: {
+          order: "asc",
+          caseInsensitive: true,
+        },
+      },
+    ],
+  },
 };

packages/editor/src/ce/extensions/document-extensions.tsx

@@ -1,11 +1,8 @@
-import { LayersIcon } from "lucide-react";
 import { SlashCommand } from "@/extensions";
 // hooks
 import { TFileHandler } from "@/hooks/use-editor";
 // plane editor types
 import { TIssueEmbedConfig } from "@/plane-editor/types";
-// types
-import { ISlashCommandItem } from "@/types";
 
 type Props = {
   fileHandler: TFileHandler;
@@ -15,27 +12,7 @@ type Props = {
 export const DocumentEditorAdditionalExtensions = (props: Props) => {
   const { fileHandler } = props;
 
-  const slashCommandAdditionalOptions: ISlashCommandItem[] = [
-    {
-      key: "issue_embed",
-      title: "Issue embed",
-      description: "Embed an issue from the project.",
-      searchTerms: ["issue", "link", "embed"],
-      icon: <LayersIcon className="h-3.5 w-3.5" />,
-      command: ({ editor, range }) => {
-        editor
-          .chain()
-          .focus()
-          .insertContentAt(
-            range,
-            "<p class='text-sm bg-gray-300 w-fit pl-3 pr-3 pt-1 pb-1 rounded shadow-sm'>#issue_</p>"
-          )
-          .run();
-      },
-    },
-  ];
-
-  const extensions = [SlashCommand(fileHandler.upload, slashCommandAdditionalOptions)];
+  const extensions = [SlashCommand(fileHandler.upload)];
 
   return extensions;
 };

packages/editor/src/core/components/editors/document/helpers.ts

@@ -0,0 +1,19 @@
+import { Extensions, generateJSON, getSchema } from "@tiptap/core";
+import { CoreEditorExtensionsWithoutProps, DocumentEditorExtensionsWithoutProps } from "@/extensions";
+
+/**
+ * @description return an object with contentJSON and editorSchema
+ * @description contentJSON- ProseMirror JSON from HTML content
+ * @description editorSchema- editor schema from extensions
+ * @param {string} html
+ * @returns {object} {contentJSON, editorSchema}
+ */
+export const generateJSONfromHTMLForDocumentEditor = (html: string) => {
+  const extensions = [...CoreEditorExtensionsWithoutProps(), ...DocumentEditorExtensionsWithoutProps()];
+  const contentJSON = generateJSON(html ?? "<p></p>", extensions as Extensions);
+  const editorSchema = getSchema(extensions as Extensions);
+  return {
+    contentJSON,
+    editorSchema,
+  };
+};

packages/editor/src/core/components/editors/document/index.ts

@@ -1,3 +1,4 @@
 export * from "./editor";
 export * from "./page-renderer";
 export * from "./read-only-editor";
+export * from "./helpers";

packages/editor/src/core/components/editors/editor-content.tsx

@@ -1,6 +1,7 @@
-import { Editor, EditorContent } from "@tiptap/react";
 import { FC, ReactNode } from "react";
-import { ImageResizer } from "src/core/extensions/image/image-resize";
+import { Editor, EditorContent } from "@tiptap/react";
+// extensions
+import { ImageResizer } from "@/extensions/image";
 
 interface EditorContentProps {
   editor: Editor | null;

packages/editor/src/core/components/menus/block-menu.tsx

@@ -1,7 +1,7 @@
 import { useCallback, useEffect, useRef } from "react";
-import { Copy, LucideIcon, Trash2 } from "lucide-react";
-import tippy, { Instance } from "tippy.js";
 import { Editor } from "@tiptap/react";
+import tippy, { Instance } from "tippy.js";
+import { Copy, LucideIcon, Trash2 } from "lucide-react";
 
 interface BlockMenuProps {
   editor: Editor;

packages/editor/src/core/extensions/code/code-block-node-view.tsx

@@ -1,11 +1,11 @@
 "use client";
 
 import { useState } from "react";
-import { NodeViewWrapper, NodeViewContent } from "@tiptap/react";
-import { common, createLowlight } from "lowlight";
-import ts from "highlight.js/lib/languages/typescript";
-import { CopyIcon, CheckIcon } from "lucide-react";
 import { Node as ProseMirrorNode } from "@tiptap/pm/model";
+import { NodeViewWrapper, NodeViewContent } from "@tiptap/react";
+import ts from "highlight.js/lib/languages/typescript";
+import { common, createLowlight } from "lowlight";
+import { CopyIcon, CheckIcon } from "lucide-react";
 // ui
 import { Tooltip } from "@plane/ui";
 // helpers

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

@@ -1,14 +1,14 @@
-import { common, createLowlight } from "lowlight";
+import { Selection } from "@tiptap/pm/state";
+import { ReactNodeViewRenderer } from "@tiptap/react";
 import ts from "highlight.js/lib/languages/typescript";
+import { common, createLowlight } from "lowlight";
+// components
+import { CodeBlockLowlight } from "./code-block-lowlight";
+import { CodeBlockComponent } from "./code-block-node-view";
 
 const lowlight = createLowlight(common);
 lowlight.register("ts", ts);
 
-import { Selection } from "@tiptap/pm/state";
-import { ReactNodeViewRenderer } from "@tiptap/react";
-import { CodeBlockComponent } from "./code-block-node-view";
-import { CodeBlockLowlight } from "./code-block-lowlight";
-
 export const CustomCodeBlockExtension = CodeBlockLowlight.extend({
   addNodeView() {
     return ReactNodeViewRenderer(CodeBlockComponent);

packages/editor/src/core/extensions/core-without-props.tsx

@@ -2,9 +2,8 @@ import TaskItem from "@tiptap/extension-task-item";
 import TaskList from "@tiptap/extension-task-list";
 import TextStyle from "@tiptap/extension-text-style";
 import TiptapUnderline from "@tiptap/extension-underline";
-import Placeholder from "@tiptap/extension-placeholder";
-import { Markdown } from "tiptap-markdown";
 import StarterKit from "@tiptap/starter-kit";
+import { Markdown } from "tiptap-markdown";
 // extensions
 import {
   CustomCodeBlockExtension,
@@ -46,10 +45,7 @@ export const CoreEditorExtensionsWithoutProps = () => [
     codeBlock: false,
     horizontalRule: false,
     blockquote: false,
-    dropcursor: {
-      color: "rgba(var(--color-text-100))",
-      width: 1,
-    },
+    dropcursor: false,
   }),
   CustomQuoteExtension,
   CustomHorizontalRule.configure({
@@ -58,7 +54,6 @@ export const CoreEditorExtensionsWithoutProps = () => [
     },
   }),
   CustomKeymap,
-  // ListKeymap,
   CustomLinkExtension.configure({
     openOnClick: true,
     autolink: true,
@@ -105,16 +100,4 @@ export const CoreEditorExtensionsWithoutProps = () => [
   TableCell,
   TableRow,
   CustomMentionWithoutProps(),
-  Placeholder.configure({
-    placeholder: ({ editor, node }) => {
-      if (node.type.name === "heading") return `Heading ${node.attrs.level}`;
-
-      const shouldHidePlaceholder =
-        editor.isActive("table") || editor.isActive("codeBlock") || editor.isActive("image");
-      if (shouldHidePlaceholder) return "";
-
-      return "Press '/' for commands...";
-    },
-    includeChildren: true,
-  }),
 ];

packages/editor/src/core/extensions/custom-list-keymap/list-helpers.ts

@@ -1,6 +1,6 @@
-import { EditorState } from "@tiptap/pm/state";
 import { Editor, getNodeType, getNodeAtPosition, isAtEndOfNode, isAtStartOfNode, isNodeActive } from "@tiptap/core";
 import { Node, NodeType } from "@tiptap/pm/model";
+import { EditorState } from "@tiptap/pm/state";
 
 const findListItemPos = (typeOrName: string | NodeType, state: EditorState) => {
   const { $from } = state.selection;

packages/editor/src/core/extensions/custom-list-keymap/list-keymap.ts

@@ -1,6 +1,6 @@
 import { Extension } from "@tiptap/core";
-
-import { handleBackspace, handleDelete } from "src/core/extensions/custom-list-keymap/list-helpers";
+// extensions
+import { handleBackspace, handleDelete } from "@/extensions/custom-list-keymap/list-helpers";
 
 export type ListKeymapOptions = {
   listTypes: Array<{

packages/editor/src/core/extensions/document-without-props.tsx

@@ -0,0 +1,3 @@
+import { IssueWidgetWithoutProps } from "@/extensions/issue-embed";
+
+export const DocumentEditorExtensionsWithoutProps = () => [IssueWidgetWithoutProps()];

packages/editor/src/core/extensions/drag-drop.tsx

@@ -69,19 +69,25 @@ function nodeDOMAtCoords(coords: { x: number; y: number }) {
     "p:not(:first-child)",
     ".code-block",
     "blockquote",
-    "h1, h2, h3",
-    ".table-wrapper",
+    "img",
+    "h1, h2, h3, h4, h5, h6",
     "[data-type=horizontalRule]",
+    ".table-wrapper",
   ].join(", ");
 
   for (const elem of elements) {
+    if (elem.matches("p:first-child") && elem.parentElement?.matches(".ProseMirror")) {
+      return elem;
+    }
+
     // if the element is a <p> tag that is the first child of a td or th
     if (
       (elem.matches("td > p:first-child") || elem.matches("th > p:first-child")) &&
       elem?.textContent?.trim() !== ""
     ) {
-      return elem; // Return only if p tag is not empty
+      return elem; // Return only if p tag is not empty in td or th
     }
+
     // apply general selector
     if (elem.matches(generalSelectors)) {
       return elem;
@@ -114,7 +120,7 @@ function calcNodePos(pos: number, view: EditorView, node: Element) {
   const $pos = view.state.doc.resolve(safePos);
 
   if ($pos.depth > 1) {
-    if (node.matches("ul:not([data-type=taskList]) li, ol li")) {
+    if (node.matches("ul li, ol li")) {
       // only for nested lists
       const newPos = $pos.before($pos.depth);
       return Math.max(0, Math.min(newPos, maxPos));
@@ -316,12 +322,24 @@ function DragHandle(options: DragHandleOptions) {
           rect.top += (lineHeight - 20) / 2;
           rect.top += paddingTop;
 
-          // Li markers
-          if (node.matches("ul:not([data-type=taskList]) li, ol li")) {
-            rect.left -= 18;
+          if (node.parentElement?.parentElement?.matches("td") || node.parentElement?.parentElement?.matches("th")) {
+            if (node.matches("ul:not([data-type=taskList]) li, ol li")) {
+              rect.left -= 5;
+            }
+          } else {
+            // Li markers
+            if (node.matches("ul:not([data-type=taskList]) li, ol li")) {
+              rect.left -= 18;
+            }
           }
+
           if (node.matches(".table-wrapper")) {
             rect.top += 8;
+            rect.left -= 8;
+          }
+
+          if (node.parentElement?.matches("td") || node.parentElement?.matches("th")) {
+            rect.left += 8;
           }
 
           rect.width = options.dragHandleWidth;
@@ -356,6 +374,7 @@ function DragHandle(options: DragHandleOptions) {
           if (view.state.selection instanceof NodeSelection) {
             droppedNode = view.state.selection.node;
           }
+
           if (!droppedNode) return;
 
           const resolvedPos = view.state.doc.resolve(dropPos.pos);

packages/editor/src/core/extensions/enter-key-extension.tsx

@@ -1,6 +1,6 @@
 import { Extension } from "@tiptap/core";
 
-export const EnterKeyExtension = (onEnterKeyPress?: () => void) =>
+export const EnterKeyExtension = (onEnterKeyPress?: (descriptionHTML: string) => void) =>
   Extension.create({
     name: "enterKey",
 
@@ -8,9 +8,7 @@ export const EnterKeyExtension = (onEnterKeyPress?: () => void) =>
       return {
         Enter: () => {
           if (!this.editor.storage.mentionsOpen) {
-            if (onEnterKeyPress) {
-              onEnterKeyPress();
-            }
+            onEnterKeyPress?.(this.editor.getHTML());
             return true;
           }
           return false;

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

@@ -1,8 +1,8 @@
+import Placeholder from "@tiptap/extension-placeholder";
 import TaskItem from "@tiptap/extension-task-item";
 import TaskList from "@tiptap/extension-task-list";
 import TextStyle from "@tiptap/extension-text-style";
 import TiptapUnderline from "@tiptap/extension-underline";
-import Placeholder from "@tiptap/extension-placeholder";
 import StarterKit from "@tiptap/starter-kit";
 import { Markdown } from "tiptap-markdown";
 // extensions
@@ -70,6 +70,7 @@ export const CoreEditorExtensions = ({
     codeBlock: false,
     horizontalRule: false,
     blockquote: false,
+    history: false,
     dropcursor: {
       color: "rgba(var(--color-text-100))",
       width: 1,
@@ -124,6 +125,7 @@ export const CoreEditorExtensions = ({
   Markdown.configure({
     html: true,
     transformPastedText: true,
+    breaks: true,
   }),
   Table,
   TableHeader,

packages/editor/src/core/extensions/image/extension.tsx

@@ -1,19 +1,23 @@
-import { UploadImagesPlugin } from "src/core/plugins/image/upload-image";
 import ImageExt from "@tiptap/extension-image";
-import { TrackImageDeletionPlugin } from "src/core/plugins/image/delete-image";
+// helpers
+import { insertEmptyParagraphAtNodeBoundaries } from "@/helpers/insert-empty-paragraph-at-node-boundary";
+// plugins
+import {
+  IMAGE_NODE_TYPE,
+  ImageExtensionStorage,
+  TrackImageDeletionPlugin,
+  TrackImageRestorationPlugin,
+  UploadImagesPlugin,
+} from "@/plugins/image";
+// types
 import { DeleteImage, RestoreImage } from "@/types";
-import { insertLineBelowImageAction } from "./utilities/insert-line-below-image";
-import { insertLineAboveImageAction } from "./utilities/insert-line-above-image";
-import { TrackImageRestorationPlugin } from "src/core/plugins/image/restore-image";
-import { IMAGE_NODE_TYPE } from "src/core/plugins/image/constants";
-import { ImageExtensionStorage } from "src/core/plugins/image/types/image-node";
 
 export const ImageExtension = (deleteImage: DeleteImage, restoreImage: RestoreImage, cancelUploadImage?: () => void) =>
   ImageExt.extend<any, ImageExtensionStorage>({
     addKeyboardShortcuts() {
       return {
-        ArrowDown: insertLineBelowImageAction,
-        ArrowUp: insertLineAboveImageAction,
+        ArrowDown: insertEmptyParagraphAtNodeBoundaries("down", "image"),
+        ArrowUp: insertEmptyParagraphAtNodeBoundaries("up", "image"),
       };
     },
     addProseMirrorPlugins() {

packages/editor/src/core/extensions/image/image-extension-without-props.tsx

@@ -1,24 +1,7 @@
 import ImageExt from "@tiptap/extension-image";
-import { insertLineBelowImageAction } from "./utilities/insert-line-below-image";
-import { insertLineAboveImageAction } from "./utilities/insert-line-above-image";
 
 export const ImageExtensionWithoutProps = () =>
   ImageExt.extend({
-    addKeyboardShortcuts() {
-      return {
-        ArrowDown: insertLineBelowImageAction,
-        ArrowUp: insertLineAboveImageAction,
-      };
-    },
-
-    // storage to keep track of image states Map<src, isDeleted>
-    addStorage() {
-      return {
-        images: new Map<string, boolean>(),
-        uploadInProgress: false,
-      };
-    },
-
     addAttributes() {
       return {
         ...this.parent?.(),

packages/editor/src/core/extensions/image/image-resize.tsx

@@ -1,5 +1,5 @@
-import { Editor } from "@tiptap/react";
 import { useState } from "react";
+import { Editor } from "@tiptap/react";
 import Moveable from "react-moveable";
 
 export const ImageResizer = ({ editor }: { editor: Editor }) => {

packages/editor/src/core/extensions/image/utilities/insert-line-above-image.ts

@@ -1,52 +0,0 @@
-import { Node as ProseMirrorNode } from "@tiptap/pm/model";
-import { KeyboardShortcutCommand } from "@tiptap/core";
-
-export const insertLineAboveImageAction: KeyboardShortcutCommand = ({ editor }) => {
-  try {
-    const { selection, doc } = editor.state;
-    const { $from, $to } = selection;
-
-    let imageNode: ProseMirrorNode | null = null;
-    let imagePos: number | null = null;
-
-    // Check if the selection itself is an image node
-    doc.nodesBetween($from.pos, $to.pos, (node, pos) => {
-      if (node.type.name === "image") {
-        imageNode = node;
-        imagePos = pos;
-        return false; // Stop iterating once an image node is found
-      }
-      return true;
-    });
-
-    if (imageNode === null || imagePos === null) return false;
-
-    // Since we want to insert above the image, we use the imagePos directly
-    const insertPos = imagePos;
-
-    const docSize = editor.state.doc.content.size;
-
-    if (insertPos < 0 || insertPos > docSize) return false;
-
-    // Check for an existing node immediately before the image
-    if (insertPos === 0) {
-      // If the previous node doesn't exist or isn't a paragraph, create and insert a new empty node there
-      editor.chain().insertContentAt(insertPos, { type: "paragraph" }).run();
-      editor.chain().setTextSelection(insertPos).run();
-    } else {
-      const prevNode = doc.nodeAt(insertPos);
-
-      if (prevNode && prevNode.type.name === "paragraph") {
-        // If the previous node is a paragraph, move the cursor there
-        editor.chain().setTextSelection(insertPos).run();
-      } else {
-        return false;
-      }
-    }
-
-    return true;
-  } catch (error) {
-    console.error("An error occurred while inserting a line above the image:", error);
-    return false;
-  }
-};

packages/editor/src/core/extensions/image/utilities/insert-line-below-image.ts

@@ -1,51 +0,0 @@
-import { Node as ProseMirrorNode } from "@tiptap/pm/model";
-import { KeyboardShortcutCommand } from "@tiptap/core";
-
-export const insertLineBelowImageAction: KeyboardShortcutCommand = ({ editor }) => {
-  try {
-    const { selection, doc } = editor.state;
-    const { $from, $to } = selection;
-
-    let imageNode: ProseMirrorNode | null = null;
-    let imagePos: number | null = null;
-
-    // Check if the selection itself is an image node
-    doc.nodesBetween($from.pos, $to.pos, (node, pos) => {
-      if (node.type.name === "image") {
-        imageNode = node;
-        imagePos = pos;
-        return false; // Stop iterating once an image node is found
-      }
-      return true;
-    });
-
-    if (imageNode === null || imagePos === null) return false;
-
-    const guaranteedImageNode: ProseMirrorNode = imageNode;
-    const nextNodePos = imagePos + guaranteedImageNode.nodeSize;
-
-    // Check for an existing node immediately after the image
-    const nextNode = doc.nodeAt(nextNodePos);
-
-    if (nextNode && nextNode.type.name === "paragraph") {
-      // If the next node is a paragraph, move the cursor there
-      const endOfParagraphPos = nextNodePos + nextNode.nodeSize - 1;
-      editor.chain().setTextSelection(endOfParagraphPos).run();
-    } else if (!nextNode) {
-      // If the next node doesn't exist i.e. we're at the end of the document, create and insert a new empty node there
-      editor.chain().insertContentAt(nextNodePos, { type: "paragraph" }).run();
-      editor
-        .chain()
-        .setTextSelection(nextNodePos + 1)
-        .run();
-    } else {
-      // If the next node is not a paragraph, do not proceed
-      return false;
-    }
-
-    return true;
-  } catch (error) {
-    console.error("An error occurred while inserting a line below the image:", error);
-    return false;
-  }
-};

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

@@ -8,6 +8,7 @@ export * from "./mentions";
 export * from "./table";
 export * from "./typography";
 export * from "./core-without-props";
+export * from "./document-without-props";
 export * from "./custom-code-inline";
 export * from "./drag-drop";
 export * from "./drop";

packages/editor/src/core/extensions/issue-embed/index.ts

@@ -1 +1,2 @@
 export * from "./widget-node";
+export * from "./issue-embed-without-props";

packages/editor/src/core/extensions/issue-embed/issue-embed-without-props.ts

@@ -0,0 +1,41 @@
+import { mergeAttributes, Node } from "@tiptap/core";
+
+export const IssueWidgetWithoutProps = () =>
+  Node.create({
+    name: "issue-embed-component",
+    group: "block",
+    atom: true,
+    selectable: true,
+    draggable: true,
+
+    addAttributes() {
+      return {
+        entity_identifier: {
+          default: undefined,
+        },
+        project_identifier: {
+          default: undefined,
+        },
+        workspace_identifier: {
+          default: undefined,
+        },
+        id: {
+          default: undefined,
+        },
+        entity_name: {
+          default: undefined,
+        },
+      };
+    },
+
+    parseHTML() {
+      return [
+        {
+          tag: "issue-embed-component",
+        },
+      ];
+    },
+    renderHTML({ HTMLAttributes }) {
+      return ["issue-embed-component", mergeAttributes(HTMLAttributes)];
+    },
+  });

packages/editor/src/core/extensions/keymap.tsx

@@ -1,7 +1,7 @@
 import { Extension } from "@tiptap/core";
+import { NodeType } from "@tiptap/pm/model";
 import { Plugin, PluginKey, Transaction } from "@tiptap/pm/state";
 import { canJoin } from "@tiptap/pm/transform";
-import { NodeType } from "@tiptap/pm/model";
 
 declare module "@tiptap/core" {
   // eslint-disable-next-line no-unused-vars

packages/editor/src/core/extensions/mentions/extension.tsx

@@ -1,6 +1,6 @@
+import { Editor, mergeAttributes } from "@tiptap/core";
 import Mention, { MentionOptions } from "@tiptap/extension-mention";
 import { ReactNodeViewRenderer, ReactRenderer } from "@tiptap/react";
-import { Editor, mergeAttributes } from "@tiptap/core";
 import tippy from "tippy.js";
 // extensions
 import { MentionList, MentionNodeView } from "@/extensions";

packages/editor/src/core/extensions/mentions/mention-node-view.tsx

@@ -1,3 +1,5 @@
+// TODO: fix all warnings
+
 /* eslint-disable react/display-name */
 // @ts-nocheck
 import { useEffect, useState } from "react";

packages/editor/src/core/extensions/mentions/mentions-without-props.tsx

@@ -1,6 +1,6 @@
+import { mergeAttributes } from "@tiptap/core";
 import Mention from "@tiptap/extension-mention";
 import { ReactNodeViewRenderer } from "@tiptap/react";
-import { mergeAttributes } from "@tiptap/core";
 // extensions
 import { CustomMentionOptions, MentionNodeView } from "@/extensions";
 

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

@@ -1,11 +1,9 @@
-import StarterKit from "@tiptap/starter-kit";
-import TiptapUnderline from "@tiptap/extension-underline";
-import TextStyle from "@tiptap/extension-text-style";
 import TaskItem from "@tiptap/extension-task-item";
 import TaskList from "@tiptap/extension-task-list";
+import TextStyle from "@tiptap/extension-text-style";
+import TiptapUnderline from "@tiptap/extension-underline";
+import StarterKit from "@tiptap/starter-kit";
 import { Markdown } from "tiptap-markdown";
-// helpers
-import { isValidHttpUrl } from "@/helpers/common";
 // extensions
 import {
   CustomQuoteExtension,
@@ -21,6 +19,8 @@ import {
   Table,
   CustomMention,
 } from "@/extensions";
+// helpers
+import { isValidHttpUrl } from "@/helpers/common";
 // types
 import { IMentionHighlight } from "@/types";
 

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

@@ -1,7 +1,7 @@
 import { useState, useEffect, useCallback, ReactNode, useRef, useLayoutEffect } from "react";
 import { Editor, Range, Extension } from "@tiptap/core";
-import Suggestion, { SuggestionOptions } from "@tiptap/suggestion";
 import { ReactRenderer } from "@tiptap/react";
+import Suggestion, { SuggestionOptions } from "@tiptap/suggestion";
 import tippy from "tippy.js";
 import {
   CaseSensitive,

packages/editor/src/core/extensions/table/table/table-controls.ts

@@ -1,5 +1,5 @@
-import { Plugin, PluginKey, TextSelection } from "@tiptap/pm/state";
 import { findParentNode } from "@tiptap/core";
+import { Plugin, PluginKey, TextSelection } from "@tiptap/pm/state";
 import { DecorationSet, Decoration } from "@tiptap/pm/view";
 
 const key = new PluginKey("tableControls");

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

@@ -1,6 +1,5 @@
-import { TextSelection } from "@tiptap/pm/state";
-
 import { callOrReturn, getExtensionField, mergeAttributes, Node, ParentConfig } from "@tiptap/core";
+import { TextSelection } from "@tiptap/pm/state";
 import {
   addColumnAfter,
   addColumnBefore,
@@ -21,12 +20,12 @@ import {
   toggleHeaderCell,
 } from "@tiptap/pm/tables";
 
-import { tableControls } from "src/core/extensions/table/table/table-controls";
-import { TableView } from "src/core/extensions/table/table/table-view";
-import { createTable } from "src/core/extensions/table/table/utilities/create-table";
-import { deleteTableWhenAllCellsSelected } from "src/core/extensions/table/table/utilities/delete-table-when-all-cells-selected";
-import { insertLineBelowTableAction } from "./utilities/insert-line-below-table-action";
+import { tableControls } from "@/extensions/table/table/table-controls";
+import { TableView } from "@/extensions/table/table/table-view";
+import { createTable } from "@/extensions/table/table/utilities/create-table";
+import { deleteTableWhenAllCellsSelected } from "@/extensions/table/table/utilities/delete-table-when-all-cells-selected";
 import { insertLineAboveTableAction } from "./utilities/insert-line-above-table-action";
+import { insertLineBelowTableAction } from "./utilities/insert-line-below-table-action";
 
 export interface TableOptions {
   HTMLAttributes: Record<string, any>;

packages/editor/src/core/extensions/table/table/utilities/create-table.ts

@@ -1,7 +1,7 @@
 import { Fragment, Node as ProsemirrorNode, Schema } from "@tiptap/pm/model";
-
-import { createCell } from "src/core/extensions/table/table/utilities/create-cell";
-import { getTableNodeTypes } from "src/core/extensions/table/table/utilities/get-table-node-types";
+// extensions
+import { createCell } from "@/extensions/table/table/utilities/create-cell";
+import { getTableNodeTypes } from "@/extensions/table/table/utilities/get-table-node-types";
 
 export function createTable(
   schema: Schema,

packages/editor/src/core/extensions/table/table/utilities/delete-table-when-all-cells-selected.ts

@@ -1,6 +1,6 @@
 import { findParentNodeClosestToPos, KeyboardShortcutCommand } from "@tiptap/core";
-
-import { isCellSelection } from "src/core/extensions/table/table/utilities/is-cell-selection";
+// extensions
+import { isCellSelection } from "@/extensions/table/table/utilities/is-cell-selection";
 
 export const deleteTableWhenAllCellsSelected: KeyboardShortcutCommand = ({ editor }) => {
   const { selection } = editor.state;

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

@@ -20,7 +20,7 @@ import {
   oneQuarter,
   threeQuarters,
   impliesArrowRight,
-} from "src/core/extensions/typography/inputRules";
+} from "./inputRules";
 
 export const CustomTypographyExtension = Extension.create<TypographyOptions>({
   name: "typography",

packages/editor/src/core/helpers/common.ts

@@ -61,20 +61,3 @@ export const isValidHttpUrl = (string: string): boolean => {
 
   return url.protocol === "http:" || url.protocol === "https:";
 };
-
-/**
- * @description return an object with contentJSON and editorSchema
- * @description contentJSON- ProseMirror JSON from HTML content
- * @description editorSchema- editor schema from extensions
- * @param {string} html
- * @returns {object} {contentJSON, editorSchema}
- */
-export const generateJSONfromHTML = (html: string) => {
-  const extensions = CoreEditorExtensionsWithoutProps();
-  const contentJSON = generateJSON(html ?? "<p></p>", extensions as Extensions);
-  const editorSchema = getSchema(extensions as Extensions);
-  return {
-    contentJSON,
-    editorSchema,
-  };
-};

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

@@ -1,8 +1,11 @@
 import { Editor, Range } from "@tiptap/core";
-import { startImageUpload } from "src/core/plugins/image/image-upload-handler";
-import { findTableAncestor } from "@/helpers/common";
 import { Selection } from "@tiptap/pm/state";
+// extensions
 import { replaceCodeWithText } from "@/extensions/code/utils/replace-code-block-with-text";
+// helpers
+import { findTableAncestor } from "@/helpers/common";
+// plugins
+import { startImageUpload } from "@/plugins/image";
 // types
 import { UploadImage } from "@/types";
 

packages/editor/src/core/helpers/insert-content-at-cursor-position.ts

@@ -1,6 +1,6 @@
+import { MutableRefObject } from "react";
 import { Selection } from "@tiptap/pm/state";
 import { Editor } from "@tiptap/react";
-import { MutableRefObject } from "react";
 
 export const insertContentAtSavedSelection = (
   editorRef: MutableRefObject<Editor | null>,

packages/editor/src/core/helpers/insert-empty-paragraph-at-node-boundary.ts

@@ -0,0 +1,96 @@
+import { KeyboardShortcutCommand } from "@tiptap/core";
+import { Node as ProseMirrorNode } from "@tiptap/pm/model";
+
+type Direction = "up" | "down";
+
+export const insertEmptyParagraphAtNodeBoundaries: (
+  direction: Direction,
+  nodeType: string
+) => KeyboardShortcutCommand =
+  (direction, nodeType) =>
+  ({ editor }) => {
+    try {
+      const { selection, doc } = editor.state;
+      const { $from, $to } = selection;
+
+      let targetNode: ProseMirrorNode | null = null;
+      let targetNodePos: number | null = null;
+
+      // Check if the selection itself is the target node
+      doc.nodesBetween($from.pos, $to.pos, (node, pos) => {
+        if (node.type.name === nodeType) {
+          targetNode = node;
+          targetNodePos = pos;
+          return false; // Stop iterating once the target node is found
+        }
+        return true;
+      });
+
+      if (targetNode === null || targetNodePos === null) return false;
+
+      const docSize = doc.content.size; // Get the size of the document
+
+      switch (direction) {
+        case "up": {
+          const insertPosUp = targetNodePos;
+
+          // Ensure the insert position is within the document boundaries
+          if (insertPosUp < 0 || insertPosUp > docSize) return false;
+
+          if (insertPosUp === 0) {
+            // If at the very start of the document, insert a new paragraph at the start
+            editor.chain().insertContentAt(insertPosUp, { type: "paragraph" }).run();
+            editor.chain().setTextSelection(insertPosUp).run(); // Set the cursor to the new paragraph
+          } else {
+            // Otherwise, check the node immediately before the target node
+            const prevNode = doc.nodeAt(insertPosUp - 1);
+
+            if (prevNode && prevNode.type.name === "paragraph") {
+              // If the previous node is a paragraph, move the cursor there
+              editor
+                .chain()
+                .setTextSelection(insertPosUp - 1)
+                .run();
+            } else {
+              return false; // If the previous node is not a paragraph, do not proceed
+            }
+          }
+          break;
+        }
+
+        case "down": {
+          const insertPosDown = targetNodePos + (targetNode as ProseMirrorNode).nodeSize;
+
+          // Ensure the insert position is within the document boundaries
+          if (insertPosDown < 0 || insertPosDown > docSize) return false;
+
+          // Check the node immediately after the target node
+          const nextNode = doc.nodeAt(insertPosDown);
+
+          if (nextNode && nextNode.type.name === "paragraph") {
+            // If the next node is a paragraph, move the cursor to the end of it
+            const endOfParagraphPos = insertPosDown + nextNode.nodeSize - 1;
+            editor.chain().setTextSelection(endOfParagraphPos).run();
+          } else if (!nextNode) {
+            // If there is no next node (end of document), insert a new paragraph
+            editor.chain().insertContentAt(insertPosDown, { type: "paragraph" }).run();
+            editor
+              .chain()
+              .setTextSelection(insertPosDown + 1)
+              .run(); // Set the cursor to the new paragraph
+          } else {
+            return false; // If the next node is not a paragraph, do not proceed
+          }
+          break;
+        }
+
+        default:
+          return false; // If the direction is not recognized, do not proceed
+      }
+
+      return true; // Return true if the operation was successful
+    } catch (error) {
+      console.error(`An error occurred while inserting a line ${direction} the ${nodeType}:`, error);
+      return false; // Return false if an error occurred
+    }
+  };

packages/editor/src/core/hooks/use-editor.ts

@@ -1,7 +1,7 @@
-import { useEditor as useCustomEditor, Editor } from "@tiptap/react";
 import { useImperativeHandle, useRef, MutableRefObject, useState, useEffect } from "react";
-import { EditorProps } from "@tiptap/pm/view";
 import { Selection } from "@tiptap/pm/state";
+import { EditorProps } from "@tiptap/pm/view";
+import { useEditor as useCustomEditor, Editor } from "@tiptap/react";
 // components
 import { EditorMenuItemNames, getEditorMenuItems } from "@/components/menus";
 // extensions
@@ -9,11 +9,12 @@ import { CoreEditorExtensions } from "@/extensions";
 // helpers
 import { insertContentAtSavedSelection } from "@/helpers/insert-content-at-cursor-position";
 import { IMarking, scrollSummary } from "@/helpers/scroll-to-node";
+// plane editor providers
+import { CollaborationProvider } from "@/plane-editor/providers";
 // props
 import { CoreEditorProps } from "@/props";
 // types
 import { DeleteImage, EditorRefApi, IMentionHighlight, IMentionSuggestion, RestoreImage, UploadImage } from "@/types";
-import { CollaborationProvider } from "@/plane-editor/providers";
 
 export type TFileHandler = {
   cancel: () => void;

packages/editor/src/core/plugins/image/utils/placeholder.ts

@@ -1,7 +1,8 @@
 import { Editor } from "@tiptap/core";
 import { EditorState } from "@tiptap/pm/state";
 import { DecorationSet, EditorView } from "@tiptap/pm/view";
-import { uploadKey } from "src/core/plugins/image/constants";
+// plugins
+import { uploadKey } from "@/plugins/image";
 
 export function findPlaceholder(state: EditorState, id: string): number | null {
   const decos = uploadKey.getState(state) as DecorationSet;

packages/editor/src/core/types/editor.ts

@@ -1,7 +1,10 @@
-// types
+// components
 import { EditorMenuItemNames } from "@/components/menus";
+// helpers
 import { IMarking } from "@/helpers/scroll-to-node";
+// hooks
 import { TFileHandler } from "@/hooks/use-editor";
+// types
 import { IMentionHighlight, IMentionSuggestion } from "@/types";
 
 export type EditorReadOnlyRefApi = {
@@ -35,7 +38,7 @@ export interface IEditorProps {
     suggestions?: () => Promise<IMentionSuggestion[]>;
   };
   onChange?: (json: object, html: string) => void;
-  onEnterKeyPress?: (e?: any) => void;
+  onEnterKeyPress?: (descriptionHTML: string) => void;
   placeholder?: string | ((isFocused: boolean, value: string) => string);
   tabIndex?: number;
   value?: string | null;

packages/editor/src/index.ts

@@ -19,6 +19,7 @@ export { isCellSelection } from "@/extensions/table/table/utilities/is-cell-sele
 
 // helpers
 export * from "@/helpers/common";
+export * from "@/components/editors/document/helpers";
 export * from "@/helpers/editor-commands";
 export * from "@/helpers/yjs";
 export * from "@/extensions/table/table";

packages/editor/src/styles/drag-drop.css

@@ -75,6 +75,37 @@
   border-radius: 4px;
 }
 
+/* for targetting the taks list items */
+li.ProseMirror-selectednode:not(.dragging)[data-checked]::after {
+  margin-left: -5px;
+}
+
+/* for targetting the unordered list items */
+ul > li.ProseMirror-selectednode:not(.dragging)::after {
+  margin-left: -10px; /* Adjust as needed */
+}
+
+/* Initialize a counter for the ordered list */
+ol {
+  counter-reset: item;
+}
+
+/* for targetting the ordered list items */
+ol > li.ProseMirror-selectednode:not(.dragging)::after {
+  counter-increment: item;
+  margin-left: -18px;
+}
+
+/* for targetting the ordered list items after the 9th item */
+ol > li:nth-child(n + 10).ProseMirror-selectednode:not(.dragging)::after {
+  margin-left: -25px;
+}
+
+/* for targetting the ordered list items after the 99th item */
+ol > li:nth-child(n + 100).ProseMirror-selectednode:not(.dragging)::after {
+  margin-left: -35px;
+}
+
 .ProseMirror img {
   transition: filter 0.1s ease-in-out;
   cursor: pointer;

packages/editor/src/styles/editor.css

@@ -17,6 +17,11 @@
   height: 0;
 }
 
+.ProseMirror li blockquote {
+  margin-top: 10px;
+  padding-inline-start: 1em;
+}
+
 /* block quotes */
 .ProseMirror blockquote {
   font-style: normal;

packages/editor/src/styles/table.css

@@ -20,7 +20,7 @@
 .table-wrapper table th {
   min-width: 1em;
   border: 1px solid rgba(var(--color-border-200));
-  padding: 10px 15px;
+  padding: 10px 20px;
   vertical-align: top;
   box-sizing: border-box;
   position: relative;
@@ -82,6 +82,7 @@
 .table-wrapper .table-controls .rows-control {
   width: 20px;
   transform: translateX(-50%);
+  left: -8px;
 }
 
 .table-wrapper .table-controls .rows-control .rows-control-div {
@@ -114,3 +115,4 @@
   opacity: 0;
   pointer-events: none;
 }
+

packages/types/src/enums.ts

@@ -37,3 +37,10 @@ export enum EEstimateUpdateStages {
   EDIT = "edit",
   SWITCH = "switch",
 }
+
+// workspace notifications
+export enum ENotificationFilterType {
+  CREATED = "created",
+  ASSIGNED = "assigned",
+  SUBSCRIBED = "subscribed",
+}

packages/types/src/index.d.ts

@@ -19,7 +19,6 @@ export * from "./auth";
 export * from "./calendar";
 export * from "./instance";
 export * from "./issues/base"; // TODO: Remove this after development and the refactor/mobx-store-issue branch is stable
-export * from "./notifications";
 export * from "./reaction";
 export * from "./view-props";
 export * from "./waitlist";
@@ -28,3 +27,4 @@ export * from "./workspace-views";
 export * from "./common";
 export * from "./pragmatic";
 export * from "./publish";
+export * from "./workspace-notifications";

packages/types/src/notifications.d.ts

@@ -1,79 +0,0 @@
-import type { IUserLite } from "./users";
-
-export interface PaginatedUserNotification {
-  next_cursor: string;
-  prev_cursor: string;
-  next_page_results: boolean;
-  prev_page_results: boolean;
-  count: number;
-  total_pages: number;
-  extra_stats: null;
-  results: IUserNotification[];
-}
-
-export interface IUserNotification {
-  archived_at: string | null;
-  created_at: string;
-  created_by: null;
-  data: Data;
-  entity_identifier: string;
-  entity_name: string;
-  id: string;
-  message: null;
-  message_html: string;
-  message_stripped: null;
-  project: string;
-  read_at: Date | null;
-  receiver: string;
-  sender: string;
-  snoozed_till: Date | null;
-  title: string;
-  triggered_by: string;
-  triggered_by_details: IUserLite;
-  updated_at: Date;
-  updated_by: null;
-  workspace: string;
-}
-
-export interface Data {
-  issue: INotificationIssueLite;
-  issue_activity: {
-    actor: string;
-    field: string;
-    id: string;
-    issue_comment: string | null;
-    new_value: string;
-    old_value: string;
-    verb: "created" | "updated";
-  };
-}
-
-export interface INotificationIssueLite {
-  id: string;
-  name: string;
-  identifier: string;
-  state_name: string;
-  sequence_id: number;
-  state_group: string;
-}
-
-export type NotificationType = "created" | "assigned" | "watching" | "all";
-
-export interface INotificationParams {
-  snoozed?: boolean;
-  type?: NotificationType;
-  archived?: boolean;
-  read?: boolean;
-}
-
-export type NotificationCount = {
-  created_issues: number;
-  my_issues: number;
-  watching_issues: number;
-};
-
-export interface IMarkAllAsReadPayload {
-  archived?: boolean;
-  snoozed?: boolean;
-  type?: NotificationType;
-}

packages/types/src/views.d.ts

@@ -27,3 +27,21 @@ export interface IProjectView {
   is_locked: boolean;
   owned_by: string;
 }
+
+export type TViewFiltersSortKey = "name" | "created_at" | "updated_at";
+
+export type TViewFiltersSortBy = "asc" | "desc";
+
+export type TViewFilterProps = {
+  created_at?: string[] | null;
+  owned_by?: string[] | null;
+  favorites?: boolean;
+  view_type?: EViewAccess[];
+};
+
+export type TViewFilters = {
+  searchQuery: string;
+  sortKey: TViewFiltersSortKey;
+  sortBy: TViewFiltersSortBy;
+  filters?: TViewFilterProps;
+};

packages/types/src/workspace-notifications.d.ts

@@ -0,0 +1,90 @@
+import type { IUserLite } from "./users";
+import { ENotificationFilterType } from "./enums";
+
+// filters
+export type TNotificationFilter = {
+  type: {
+    [key in ENotificationFilterType]: boolean;
+  };
+  snoozed: boolean;
+  archived: boolean;
+  read: boolean;
+};
+
+// notification payload
+export type TNotificationIssueLite = {
+  id: string | undefined;
+  sequence_id: number | undefined;
+  identifier: string | undefined;
+  name: string | undefined;
+  state_name: string | undefined;
+  state_group: string | undefined;
+};
+
+export type TNotificationData = {
+  issue: TNotificationIssueLite | undefined;
+  issue_activity: {
+    id: string | undefined;
+    actor: string | undefined;
+    field: string | undefined;
+    issue_comment: string | undefined;
+    verb: "created" | "updated";
+    new_value: string | undefined;
+    old_value: string | undefined;
+  };
+};
+
+export type TNotification = {
+  id: string | undefined;
+  title: string | undefined;
+  data: TNotificationData | undefined;
+  entity_identifier: string | undefined;
+  entity_name: string | undefined;
+  message_html: string | undefined;
+  message: undefined;
+  message_stripped: undefined;
+  sender: string | undefined;
+  receiver: string | undefined;
+  triggered_by: string | undefined;
+  triggered_by_details: IUserLite | undefined;
+  read_at: string | undefined;
+  archived_at: string | undefined;
+  snoozed_till: string | undefined;
+  workspace: string | undefined;
+  project: string | undefined;
+  created_at: string | undefined;
+  updated_at: string | undefined;
+  created_by: string | undefined;
+  updated_by: string | undefined;
+};
+
+// notification paginated information
+export type TNotificationPaginatedInfoQueryParams = {
+  type?: string | undefined;
+  snoozed?: boolean;
+  archived?: boolean;
+  read?: boolean;
+  per_page?: number;
+  cursor?: string;
+};
+
+export type TNotificationPaginatedInfo = {
+  next_cursor: string | undefined;
+  prev_cursor: string | undefined;
+  next_page_results: boolean | undefined;
+  prev_page_results: boolean | undefined;
+  total_pages: number | undefined;
+  extra_stats: string | undefined;
+  count: number | undefined; // current paginated results count
+  total_count: number | undefined; // total available results count
+  results: TNotification[] | undefined;
+  grouped_by: string | undefined;
+  sub_grouped_by: string | undefined;
+};
+
+// notification count
+export type TUnreadNotificationsCount = {
+  created_issues: number | undefined;
+  my_issues: number | undefined;
+  subscribed_issues: number | undefined;
+};

space/app/issues/[anchor]/layout.tsx

@@ -63,7 +63,7 @@ const IssuesLayout = observer((props: Props) => {
           <Image src={planeLogo} alt="Plane logo" className="h-6 w-6" height="24" width="24" />
         </div>
         <div className="text-xs">
-          Powered by <span className="font-semibold">Plane Deploy</span>
+          Powered by <span className="font-semibold">Plane Publish</span>
         </div>
       </a>
     </div>

space/app/layout.tsx

@@ -9,11 +9,11 @@ import "@/styles/globals.css";
 import { ToastProvider } from "@/lib/toast-provider";
 
 export const metadata: Metadata = {
-  title: "Plane Deploy | Make your Plane boards public with one-click",
-  description: "Plane Deploy is a customer feedback management tool built on top of plane.so",
+  title: "Plane Publish | Make your Plane boards public with one-click",
+  description: "Plane Publish is a customer feedback management tool built on top of plane.so",
   openGraph: {
-    title: "Plane Deploy | Make your Plane boards public with one-click",
-    description: "Plane Deploy is a customer feedback management tool built on top of plane.so",
+    title: "Plane Publish | Make your Plane boards public with one-click",
+    description: "Plane Publish is a customer feedback management tool built on top of plane.so",
     url: "https://sites.plane.so/",
   },
   keywords:

space/core/components/editor/lite-text-editor.tsx

@@ -64,7 +64,11 @@ export const LiteTextEditor = React.forwardRef<EditorRefApi, LiteTextEditorWrapp
         }}
         isSubmitting={isSubmitting}
         showSubmitButton={showSubmitButton}
-        handleSubmit={(e) => rest.onEnterKeyPress?.(e)}
+        handleSubmit={() => {
+          if (isMutableRefObject<EditorRefApi>(ref)) {
+            rest.onEnterKeyPress?.(ref.current?.getHTML() ?? "");
+          }
+        }}
         isCommentEmpty={isEmpty}
         editorRef={isMutableRefObject<EditorRefApi>(ref) ? ref : null}
       />

space/core/components/editor/toolbar.tsx

@@ -12,7 +12,7 @@ import { cn } from "@/helpers/common.helper";
 
 type Props = {
   executeCommand: (commandName: EditorMenuItemNames) => void;
-  handleSubmit: (event: React.MouseEvent<HTMLButtonElement, MouseEvent>) => void;
+  handleSubmit: () => void;
   isCommentEmpty: boolean;
   isSubmitting: boolean;
   showSubmitButton: boolean;
@@ -95,7 +95,7 @@ export const IssueCommentToolbar: React.FC<Props> = (props) => {
         {showSubmitButton && (
           <div className="sticky right-1">
             <Button
-              type="submit"
+              type="button"
               variant="primary"
               className="px-2.5 py-1.5 text-xs"
               onClick={handleSubmit}

space/core/components/issues/peek-overview/comment/add-comment.tsx

@@ -66,8 +66,8 @@ export const AddComment: React.FC<Props> = observer((props) => {
           control={control}
           render={({ field: { value, onChange } }) => (
             <LiteTextEditor
-              onEnterKeyPress={(e) => {
-                if (currentUser) handleSubmit(onSubmit)(e);
+              onEnterKeyPress={() => {
+                if (currentUser) handleSubmit(onSubmit)();
               }}
               workspaceId={workspaceID?.toString() ?? ""}
               workspaceSlug={workspaceSlug?.toString() ?? ""}

space/core/components/issues/peek-overview/comment/comment-detail-card.tsx

@@ -103,7 +103,7 @@ export const CommentCard: React.FC<Props> = observer((props) => {
                   <LiteTextEditor
                     workspaceId={workspaceID?.toString() ?? ""}
                     workspaceSlug={workspaceSlug?.toString() ?? ""}
-                    onEnterKeyPress={handleSubmit(handleCommentUpdate)}
+                    onEnterKeyPress={() => handleSubmit(handleCommentUpdate)()}
                     ref={editorRef}
                     initialValue={value}
                     value={null}

space/core/constants/seo.ts

@@ -1,6 +1,6 @@
-export const SITE_NAME = "Plane Deploy | Make your Plane boards and roadmaps pubic with just one-click. ";
-export const SITE_TITLE = "Plane Deploy | Make your Plane boards public with one-click";
-export const SITE_DESCRIPTION = "Plane Deploy is a customer feedback management tool built on top of plane.so";
+export const SITE_NAME = "Plane Publish | Make your Plane boards and roadmaps pubic with just one-click. ";
+export const SITE_TITLE = "Plane Publish | Make your Plane boards public with one-click";
+export const SITE_DESCRIPTION = "Plane Publish is a customer feedback management tool built on top of plane.so";
 export const SITE_KEYWORDS =
   "software development, customer feedback, software, accelerate, code management, release management, project management, issue tracking, agile, scrum, kanban, collaboration";
 export const SITE_URL = "https://app.plane.so/";

web/app/[workspaceSlug]/(projects)/notifications/layout.tsx

@@ -0,0 +1,15 @@
+"use client";
+
+// components
+import { NotificationsSidebar } from "@/components/workspace-notifications";
+
+export default function ProjectInboxIssuesLayout({ children }: { children: React.ReactNode }) {
+  return (
+    <div className="relative w-full h-full overflow-hidden flex items-center">
+      <div className="relative w-full lg:w-2/6 border-0 lg:border-r border-custom-border-200 z-[10] flex-shrink-0 bg-custom-background-100 h-full transition-all overflow-hidden">
+        <NotificationsSidebar />
+      </div>
+      <div className="w-full h-full overflow-hidden overflow-y-auto">{children}</div>
+    </div>
+  );
+}

web/app/[workspaceSlug]/(projects)/notifications/page.tsx

@@ -0,0 +1,46 @@
+"use client";
+
+import { observer } from "mobx-react";
+import useSWR from "swr";
+// components
+import { PageHead } from "@/components/core";
+import { IssuePeekOverview } from "@/components/issues";
+// constants
+import { ENotificationLoader, ENotificationQueryParamType } from "@/constants/notification";
+// hooks
+import { useWorkspace, useWorkspaceNotifications } from "@/hooks/store";
+
+const WorkspaceDashboardPage = observer(() => {
+  // hooks
+  const { currentWorkspace } = useWorkspace();
+  const { notificationIdsByWorkspaceId, getNotifications } = useWorkspaceNotifications();
+  // derived values
+  const pageTitle = currentWorkspace?.name ? `${currentWorkspace?.name} - Notifications` : undefined;
+
+  // fetch workspace notifications
+  const notificationMutation =
+    currentWorkspace && notificationIdsByWorkspaceId(currentWorkspace.id)
+      ? ENotificationLoader.MUTATION_LOADER
+      : ENotificationLoader.INIT_LOADER;
+  const notificationLoader =
+    currentWorkspace && notificationIdsByWorkspaceId(currentWorkspace.id)
+      ? ENotificationQueryParamType.CURRENT
+      : ENotificationQueryParamType.INIT;
+  useSWR(
+    currentWorkspace?.slug ? `WORKSPACE_NOTIFICATION` : null,
+    currentWorkspace?.slug
+      ? async () => getNotifications(currentWorkspace?.slug, notificationMutation, notificationLoader)
+      : null
+  );
+
+  return (
+    <>
+      <PageHead title={pageTitle} />
+      <div className="w-full h-full overflow-hidden overflow-y-auto">
+        <IssuePeekOverview embedIssue />
+      </div>
+    </>
+  );
+});
+
+export default WorkspaceDashboardPage;

web/app/[workspaceSlug]/(projects)/projects/(detail)/[projectId]/pages/(detail)/[pageId]/page.tsx

@@ -26,8 +26,10 @@ const PageDetailsPage = observer(() => {
 
   // fetch page details
   const { error: pageDetailsError } = useSWR(
-    pageId ? `PAGE_DETAILS_${pageId}` : null,
-    pageId ? () => getPageById(pageId.toString()) : null,
+    workspaceSlug && projectId && pageId ? `PAGE_DETAILS_${pageId}` : null,
+    workspaceSlug && projectId && pageId
+      ? () => getPageById(workspaceSlug?.toString(), projectId?.toString(), pageId.toString())
+      : null,
     {
       revalidateIfStale: false,
       revalidateOnFocus: false,

web/app/[workspaceSlug]/(projects)/projects/(detail)/[projectId]/views/(list)/header.tsx

@@ -1,16 +1,22 @@
 "use client";
 
+import { useCallback } from "react";
 import { observer } from "mobx-react";
 import { useParams } from "next/navigation";
 // ui
+import { TViewFilterProps } from "@plane/types";
 import { Breadcrumbs, PhotoFilterIcon, Button } from "@plane/ui";
 // components
 import { BreadcrumbLink, Logo } from "@/components/common";
 import { ViewListHeader } from "@/components/views";
+import { ViewAppliedFiltersList } from "@/components/views/applied-filters";
 // constants
 import { EUserProjectRoles } from "@/constants/project";
+import { EViewAccess } from "@/constants/views";
+// helpers
+import { calculateTotalFilters } from "@/helpers/filter.helper";
 // hooks
-import { useCommandPalette, useProject, useUser } from "@/hooks/store";
+import { useCommandPalette, useProject, useProjectView, useUser } from "@/hooks/store";
 
 export const ProjectViewsHeader = observer(() => {
   // router
@@ -21,8 +27,28 @@ export const ProjectViewsHeader = observer(() => {
     membership: { currentProjectRole },
   } = useUser();
   const { currentProjectDetails, loader } = useProject();
+  const { filters, updateFilters, clearAllFilters } = useProjectView();
 
-  const canUserCreateIssue =
+  const handleRemoveFilter = useCallback(
+    (key: keyof TViewFilterProps, value: string | EViewAccess | null) => {
+      let newValues = filters.filters?.[key];
+
+      if (key === "favorites") {
+        newValues = !!value;
+      }
+      if (Array.isArray(newValues)) {
+        if (!value) newValues = [];
+        else newValues = newValues.filter((val) => val !== value) as string[];
+      }
+
+      updateFilters("filters", { [key]: newValues });
+    },
+    [filters.filters, updateFilters]
+  );
+
+  const isFiltersApplied = calculateTotalFilters(filters?.filters ?? {}) !== 0;
+
+  const canUserCreateView =
     currentProjectRole && [EUserProjectRoles.ADMIN, EUserProjectRoles.MEMBER].includes(currentProjectRole);
 
   return (
@@ -56,17 +82,27 @@ export const ProjectViewsHeader = observer(() => {
             </Breadcrumbs>
           </div>
         </div>
-        {canUserCreateIssue && (
-          <div className="flex flex-shrink-0 items-center gap-2">
-            <ViewListHeader />
+        <div className="flex flex-shrink-0 items-center gap-2">
+          <ViewListHeader />
+          {canUserCreateView && (
             <div>
               <Button variant="primary" size="sm" onClick={() => toggleCreateViewModal(true)}>
                 Add View
               </Button>
             </div>
-          </div>
-        )}
+          )}
+        </div>
       </div>
+      {isFiltersApplied && (
+        <div className="border-t border-custom-border-200 px-5 py-3">
+          <ViewAppliedFiltersList
+            appliedFilters={filters.filters ?? {}}
+            handleClearAllFilters={clearAllFilters}
+            handleRemoveFilter={handleRemoveFilter}
+            alwaysAllowEditing
+          />
+        </div>
+      )}
     </>
   );
 });

web/app/invitations/page.tsx

@@ -27,11 +27,11 @@ import { useEventTracker, useUser, useUserProfile, useWorkspace } from "@/hooks/
 import { useAppRouter } from "@/hooks/use-app-router";
 // services
 import { AuthenticationWrapper } from "@/lib/wrappers";
+import { WorkspaceService } from "@/plane-web/services";
 // images
 import emptyInvitation from "@/public/empty-state/invitation.svg";
 import BlackHorizontalLogo from "@/public/plane-logos/black-horizontal-with-blue-logo.png";
 import WhiteHorizontalLogo from "@/public/plane-logos/white-horizontal-with-blue-logo.png";
-import { WorkspaceService } from "@/services/workspace.service";
 
 const workspaceService = new WorkspaceService();
 

web/app/onboarding/page.tsx

@@ -5,6 +5,8 @@ import { observer } from "mobx-react";
 import useSWR from "swr";
 // types
 import { TOnboardingSteps, TUserProfile } from "@plane/types";
+// ui
+import { TOAST_TYPE, setToast } from "@plane/ui";
 // components
 import { LogoSpinner } from "@/components/common";
 import { InviteMembers, CreateOrJoinWorkspaces, ProfileSetup } from "@/components/onboarding";
@@ -14,12 +16,11 @@ import { USER_WORKSPACES_LIST } from "@/constants/fetch-keys";
 // helpers
 import { EPageTypes } from "@/helpers/authentication.helper";
 // hooks
-import { useUser, useWorkspace, useUserProfile, useEventTracker, useUserSettings } from "@/hooks/store";
-import { useAppRouter } from "@/hooks/use-app-router";
+import { useUser, useWorkspace, useUserProfile, useEventTracker } from "@/hooks/store";
 // wrappers
 import { AuthenticationWrapper } from "@/lib/wrappers";
+import { WorkspaceService } from "@/plane-web/services";
 // services
-import { WorkspaceService } from "@/services/workspace.service";
 
 enum EOnboardingSteps {
   PROFILE_SETUP = "PROFILE_SETUP",
@@ -33,25 +34,22 @@ const OnboardingPage = observer(() => {
   // states
   const [step, setStep] = useState<EOnboardingSteps | null>(null);
   const [totalSteps, setTotalSteps] = useState<number | null>(null);
-  // router
-  const router = useAppRouter();
   // store hooks
   const { captureEvent } = useEventTracker();
   const { isLoading: userLoader, data: user, updateCurrentUser } = useUser();
-  const { data: profile, updateUserOnBoard, updateUserProfile } = useUserProfile();
-  const { data: currentUserSettings } = useUserSettings();
+  const { data: profile, updateUserProfile, finishUserOnboarding } = useUserProfile();
   const { workspaces, fetchWorkspaces } = useWorkspace();
 
   // computed values
   const workspacesList = Object.values(workspaces ?? {});
   // fetching workspaces list
-  const { isLoading: workspaceListLoader } = useSWR(USER_WORKSPACES_LIST, () => fetchWorkspaces(), {
-    shouldRetryOnError: false,
+  const { isLoading: workspaceListLoader } = useSWR(USER_WORKSPACES_LIST, () => {
+    user?.id && fetchWorkspaces();
   });
   // fetching user workspace invitations
-  const { data: invitations } = useSWR("USER_WORKSPACE_INVITATIONS_LIST", () =>
-    workspaceService.userWorkspaceInvitations()
-  );
+  const { isLoading: invitationsLoader, data: invitations } = useSWR("USER_WORKSPACE_INVITATIONS_LIST", () => {
+    if (user?.id) return workspaceService.userWorkspaceInvitations();
+  });
   // handle step change
   const stepChange = async (steps: Partial<TOnboardingSteps>) => {
     if (!user) return;
@@ -66,45 +64,11 @@ const OnboardingPage = observer(() => {
     await updateUserProfile(payload);
   };
 
-  const getWorkspaceRedirectionUrl = (): string => {
-    let redirectionRoute = "/profile";
-
-    // validate the last and fallback workspace_slug
-    const currentWorkspaceSlug =
-      currentUserSettings?.workspace?.last_workspace_slug ||
-      currentUserSettings?.workspace?.fallback_workspace_slug ||
-      undefined;
-
-    if (currentWorkspaceSlug) {
-      const isCurrentWorkspaceValid = Object.values(workspaces || {}).findIndex(
-        (workspace) => workspace.slug === currentWorkspaceSlug
-      );
-      if (isCurrentWorkspaceValid >= 0) {
-        redirectionRoute = `/${currentWorkspaceSlug}`;
-      }
-    }
-
-    return redirectionRoute;
-  };
-
   // complete onboarding
   const finishOnboarding = async () => {
-    if (!user || !workspaces) return;
+    if (!user) return;
 
-    const firstWorkspace = Object.values(workspaces ?? {})?.[0];
-
-    await Promise.all([
-      updateUserProfile({
-        onboarding_step: {
-          profile_complete: true,
-          workspace_join: true,
-          workspace_create: true,
-          workspace_invite: true,
-        },
-        last_workspace_id: firstWorkspace?.id,
-      }),
-      updateUserOnBoard(),
-    ])
+    await finishUserOnboarding()
       .then(() => {
         captureEvent(USER_ONBOARDING_COMPLETED, {
           // user_role: user.role,
@@ -114,10 +78,12 @@ const OnboardingPage = observer(() => {
         });
       })
       .catch(() => {
-        console.log("Failed to update onboarding status");
+        setToast({
+          type: TOAST_TYPE.ERROR,
+          title: "Failed",
+          message: "Failed to finish onboarding, Please try again later.",
+        });
       });
-
-    router.replace(`${getWorkspaceRedirectionUrl()}`);
   };
 
   useEffect(() => {
@@ -166,7 +132,7 @@ const OnboardingPage = observer(() => {
 
   return (
     <AuthenticationWrapper pageType={EPageTypes.ONBOARDING}>
-      {user && totalSteps && step !== null && invitations ? (
+      {user && totalSteps && step !== null && !invitationsLoader ? (
         <div className={`flex h-full w-full flex-col`}>
           {step === EOnboardingSteps.PROFILE_SETUP ? (
             <ProfileSetup
@@ -177,7 +143,7 @@ const OnboardingPage = observer(() => {
             />
           ) : step === EOnboardingSteps.WORKSPACE_CREATE_OR_JOIN ? (
             <CreateOrJoinWorkspaces
-              invitations={invitations}
+                invitations={invitations ?? []}
               totalSteps={totalSteps}
               stepChange={stepChange}
               finishOnboarding={finishOnboarding}

web/app/profile/security/page.tsx

@@ -1,6 +1,6 @@
 "use client";
 
-import { useEffect, useState } from "react";
+import { useState } from "react";
 import { observer } from "mobx-react";
 import { Controller, useForm } from "react-hook-form";
 import { Eye, EyeOff } from "lucide-react";
@@ -8,15 +8,11 @@ import { Eye, EyeOff } from "lucide-react";
 import { Button, Input, TOAST_TYPE, setToast } from "@plane/ui";
 // components
 import { PasswordStrengthMeter } from "@/components/account";
-import { LogoSpinner } from "@/components/common";
 import { PageHead } from "@/components/core";
 import { ProfileSettingContentHeader, ProfileSettingContentWrapper } from "@/components/profile";
 // helpers
 import { authErrorHandler } from "@/helpers/authentication.helper";
 import { E_PASSWORD_STRENGTH, getPasswordStrength } from "@/helpers/password.helper";
-// hooks
-import { useUser } from "@/hooks/store";
-import { useAppRouter } from "@/hooks/use-app-router";
 // services
 import { AuthService } from "@/services/auth.service";
 import { UserService } from "@/services/user.service";
@@ -44,13 +40,9 @@ const defaultShowPassword = {
 
 const SecurityPage = observer(() => {
   // states
-  const [isPageLoading, setIsPageLoading] = useState(true);
   const [showPassword, setShowPassword] = useState(defaultShowPassword);
   const [isPasswordInputFocused, setIsPasswordInputFocused] = useState(false);
   const [isRetryPasswordInputFocused, setIsRetryPasswordInputFocused] = useState(false);
-  // router
-  const router = useAppRouter();
-  const { data: currentUser } = useUser();
   // use form
   const {
     control,
@@ -98,14 +90,6 @@ const SecurityPage = observer(() => {
     }
   };
 
-  // if the user doesn't have a password set, redirect to the profile page
-  useEffect(() => {
-    if (!currentUser) return;
-
-    if (currentUser.is_password_autoset) router.push("/profile");
-    else setIsPageLoading(false);
-  }, [currentUser, router]);
-
   const isButtonDisabled =
     getPasswordStrength(password) != E_PASSWORD_STRENGTH.STRENGTH_VALID ||
     oldPassword.trim() === "" ||
@@ -119,13 +103,6 @@ const SecurityPage = observer(() => {
       <PasswordStrengthMeter password={password} isFocused={isPasswordInputFocused} />
     );
 
-  if (isPageLoading)
-    return (
-      <div className="grid h-screen w-full place-items-center">
-        <LogoSpinner />
-      </div>
-    );
-
   const renderPasswordMatchError = !isRetryPasswordInputFocused || confirmPassword.length >= password.length;
 
   return (