chore: test cases

chore: move validation to serializer
chore: move validation to viewset
2025-09-04 17:04:06 +05:30 · 2025-09-03 16:40:17 +05:30 · 2025-09-03 16:21:41 +05:30 · 2025-09-03 16:14:10 +05:30 · 2025-08-28 19:21:59 +05:30 · 2025-08-28 19:21:57 +05:30
166 changed files with 1718 additions and 6732 deletions
@@ -35,10 +35,6 @@ on:
      - preview
      - canary

-concurrency:
-  group: ${{ github.workflow }}-${{ github.ref }}
-  cancel-in-progress: true
-
 env:
  TARGET_BRANCH: ${{ github.ref_name }}
  ARM64_BUILD: ${{ github.event.inputs.arm64 }}
@@ -139,8 +135,7 @@ jobs:
  branch_build_push_admin:
    name: Build-Push Admin Docker Image
    runs-on: ubuntu-22.04
-    needs:
-      - branch_build_setup
+    needs: [branch_build_setup]
    steps:
      - name: Admin Build and Push
        uses: makeplane/actions/build-push@v1.0.0
@@ -153,9 +148,7 @@ jobs:
          docker-image-owner: makeplane
          docker-image-name: ${{ needs.branch_build_setup.outputs.dh_img_admin }}
          build-context: .
-          dockerfile-path: ./Dockerfile.node
-          build-args: |
-            APP_SCOPE=admin
+          dockerfile-path: ./apps/admin/Dockerfile.admin
          buildx-driver: ${{ needs.branch_build_setup.outputs.gh_buildx_driver }}
          buildx-version: ${{ needs.branch_build_setup.outputs.gh_buildx_version }}
          buildx-platforms: ${{ needs.branch_build_setup.outputs.gh_buildx_platforms }}
@@ -164,8 +157,7 @@ jobs:
  branch_build_push_web:
    name: Build-Push Web Docker Image
    runs-on: ubuntu-22.04
-    needs:
-      - branch_build_setup
+    needs: [branch_build_setup]
    steps:
      - name: Web Build and Push
        uses: makeplane/actions/build-push@v1.0.0
@@ -178,9 +170,7 @@ jobs:
          docker-image-owner: makeplane
          docker-image-name: ${{ needs.branch_build_setup.outputs.dh_img_web }}
          build-context: .
-          dockerfile-path: ./Dockerfile.node
-          build-args: |
-            APP_SCOPE=web
+          dockerfile-path: ./apps/web/Dockerfile.web
          buildx-driver: ${{ needs.branch_build_setup.outputs.gh_buildx_driver }}
          buildx-version: ${{ needs.branch_build_setup.outputs.gh_buildx_version }}
          buildx-platforms: ${{ needs.branch_build_setup.outputs.gh_buildx_platforms }}
@@ -189,8 +179,7 @@ jobs:
  branch_build_push_space:
    name: Build-Push Space Docker Image
    runs-on: ubuntu-22.04
-    needs:
-      - branch_build_setup
+    needs: [branch_build_setup]
    steps:
      - name: Space Build and Push
        uses: makeplane/actions/build-push@v1.0.0
@@ -203,9 +192,7 @@ jobs:
          docker-image-owner: makeplane
          docker-image-name: ${{ needs.branch_build_setup.outputs.dh_img_space }}
          build-context: .
-          dockerfile-path: ./Dockerfile.node
-          build-args: |
-            APP_SCOPE=space
+          dockerfile-path: ./apps/space/Dockerfile.space
          buildx-driver: ${{ needs.branch_build_setup.outputs.gh_buildx_driver }}
          buildx-version: ${{ needs.branch_build_setup.outputs.gh_buildx_version }}
          buildx-platforms: ${{ needs.branch_build_setup.outputs.gh_buildx_platforms }}
@@ -214,8 +201,7 @@ jobs:
  branch_build_push_live:
    name: Build-Push Live Collaboration Docker Image
    runs-on: ubuntu-22.04
-    needs:
-      - branch_build_setup
+    needs: [branch_build_setup]
    steps:
      - name: Live Build and Push
        uses: makeplane/actions/build-push@v1.0.0
@@ -237,8 +223,7 @@ jobs:
  branch_build_push_api:
    name: Build-Push API Server Docker Image
    runs-on: ubuntu-22.04
-    needs:
-      - branch_build_setup
+    needs: [branch_build_setup]
    steps:
      - name: Backend Build and Push
        uses: makeplane/actions/build-push@v1.0.0
@@ -250,8 +235,8 @@ jobs:
          dockerhub-token: ${{ secrets.DOCKERHUB_TOKEN }}
          docker-image-owner: makeplane
          docker-image-name: ${{ needs.branch_build_setup.outputs.dh_img_backend }}
-          build-context: .
-          dockerfile-path: ./Dockerfile.api
+          build-context: ./apps/api
+          dockerfile-path: ./apps/api/Dockerfile.api
          buildx-driver: ${{ needs.branch_build_setup.outputs.gh_buildx_driver }}
          buildx-version: ${{ needs.branch_build_setup.outputs.gh_buildx_version }}
          buildx-platforms: ${{ needs.branch_build_setup.outputs.gh_buildx_platforms }}
@@ -260,8 +245,7 @@ jobs:
  branch_build_push_proxy:
    name: Build-Push Proxy Docker Image
    runs-on: ubuntu-22.04
-    needs:
-      - branch_build_setup
+    needs: [branch_build_setup]
    steps:
      - name: Proxy Build and Push
        uses: makeplane/actions/build-push@v1.0.0
@@ -284,14 +268,15 @@ jobs:
    if: ${{ needs.branch_build_setup.outputs.aio_build == 'true' }}
    name: Build-Push AIO Docker Image
    runs-on: ubuntu-22.04
-    needs:
-      - branch_build_setup
-      - branch_build_push_admin
-      - branch_build_push_web
-      - branch_build_push_space
-      - branch_build_push_live
-      - branch_build_push_api
-      - branch_build_push_proxy
+    needs: [
+        branch_build_setup,
+        branch_build_push_admin,
+        branch_build_push_web,
+        branch_build_push_space,
+        branch_build_push_live,
+        branch_build_push_api,
+        branch_build_push_proxy
+      ]
    steps:
      - name: Checkout Files
        uses: actions/checkout@v4
@@ -300,7 +285,7 @@ jobs:
        id: prepare_aio_assets
        run: |
          cd deployments/aio/community
-
+          
          if [ "${{ needs.branch_build_setup.outputs.build_type }}" == "Release" ]; then
            aio_version=${{ needs.branch_build_setup.outputs.release_version }}
          else
@@ -339,14 +324,7 @@ jobs:
  upload_build_assets:
    name: Upload Build Assets
    runs-on: ubuntu-22.04
-    needs:
-      - branch_build_setup
-      - branch_build_push_admin
-      - branch_build_push_web
-      - branch_build_push_space
-      - branch_build_push_live
-      - branch_build_push_api
-      - branch_build_push_proxy
+    needs: [branch_build_setup, branch_build_push_admin, branch_build_push_web, branch_build_push_space, branch_build_push_live, branch_build_push_api, branch_build_push_proxy]
    steps:
      - name: Checkout Files
        uses: actions/checkout@v4
@@ -380,13 +358,15 @@ jobs:
    name: Build Release
    runs-on: ubuntu-22.04
    needs:
-      - branch_build_setup
-      - branch_build_push_admin
-      - branch_build_push_web
-      - branch_build_push_space
-      - branch_build_push_live
-      - branch_build_push_api
-      - branch_build_push_proxy
+      [
+        branch_build_setup,
+        branch_build_push_admin,
+        branch_build_push_web,
+        branch_build_push_space,
+        branch_build_push_live,
+        branch_build_push_api,
+        branch_build_push_proxy,
+      ]
    env:
      REL_VERSION: ${{ needs.branch_build_setup.outputs.release_version }}
    steps:
@@ -417,3 +397,4 @@ jobs:
            ${{ github.workspace }}/deployments/cli/community/docker-compose.yml
            ${{ github.workspace }}/deployments/cli/community/variables.env
            ${{ github.workspace }}/deployments/swarm/community/swarm.sh
+
@@ -1,121 +0,0 @@
-name: Docker AIO build and smoke test
-
-on:
-  workflow_dispatch:
-  pull_request:
-    branches:
-      - "preview"
-    paths:
-      - "apps/web/**"
-      - "apps/space/**"
-      - "apps/admin/**"
-      - "apps/live/**"
-      - "packages/**"
-      - "turbo.json"
-      - "pnpm-lock.yaml"
-      - "pnpm-workspace.yaml"
-      - "Dockerfile.node"
-      - "Dockerfile.api"
-      - "Dockerfile.aio"
-      - "docker-bake.hcl"
-      - ".github/workflows/docker-smoke-aio.yml"
-  push:
-    branches:
-      - "preview"
-    paths:
-      - "apps/web/**"
-      - "apps/space/**"
-      - "apps/admin/**"
-      - "apps/live/**"
-      - "packages/**"
-      - "turbo.json"
-      - "pnpm-lock.yaml"
-      - "pnpm-workspace.yaml"
-      - "Dockerfile.node"
-      - "Dockerfile.api"
-      - "Dockerfile.aio"
-      - "docker-bake.hcl"
-      - ".github/workflows/docker-smoke-aio.yml"
-
-concurrency:
-  group: aio-${{ github.workflow }}-${{ github.ref }}
-  cancel-in-progress: false
-
-jobs:
-  determine-aio:
-    name: Determine if AIO needed
-    runs-on: ubuntu-latest
-    outputs:
-      aio_needed: ${{ steps.build-flag.outputs.aio_needed }}
-    steps:
-      - name: Checkout repository
-        uses: actions/checkout@v4
-        with:
-          fetch-depth: 0
-
-      - name: Detect changed paths
-        id: changes
-        uses: dorny/paths-filter@v3
-        with:
-          filters: |
-            web:
-              - 'apps/web/**'
-            space:
-              - 'apps/space/**'
-            admin:
-              - 'apps/admin/**'
-            live:
-              - 'apps/live/**'
-            common:
-              - 'packages/**'
-              - 'turbo.json'
-              - 'pnpm-lock.yaml'
-              - 'pnpm-workspace.yaml'
-              - 'Dockerfile.node'
-              - 'Dockerfile.api'
-              - 'Dockerfile.aio'
-              - 'docker-bake.hcl'
-              - '.github/workflows/docker-smoke-aio.yml'
-
-      - name: Compute AIO flag
-        id: build-flag
-        uses: actions/github-script@v7
-        with:
-          script: |
-            const anyCommon = '${{ steps.changes.outputs.common }}' === 'true';
-            const changedWeb = '${{ steps.changes.outputs.web }}' === 'true';
-            const changedSpace = '${{ steps.changes.outputs.space }}' === 'true';
-            const changedAdmin = '${{ steps.changes.outputs.admin }}' === 'true';
-            const changedLive = '${{ steps.changes.outputs.live }}' === 'true';
-            const aioNeeded = anyCommon || changedWeb || changedSpace || changedAdmin || changedLive;
-            core.setOutput('aio_needed', String(aioNeeded));
-
-  aio_smoke:
-    name: Build and smoke test AIO
-    runs-on: ubuntu-latest
-    needs: determine-aio
-    if: ${{ needs.determine-aio.outputs.aio_needed == 'true' }}
-    timeout-minutes: 30
-
-    steps:
-      - name: Checkout repository
-        uses: actions/checkout@v4
-        with:
-          fetch-depth: 0
-
-      - name: Show Docker version
-        run: |
-          docker version
-          docker info
-
-      - name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v3
-
-      - name: Build AIO image with bake (load into local daemon)
-        run: |
-          docker buildx bake -f "./docker-bake.hcl" --load aio
-
-      - name: Run AIO smoke script
-        run: |
-          chmod +x "scripts/smoke-aio.sh"
-          "scripts/smoke-aio.sh"
@@ -1,171 +0,0 @@
-name: Docker build and smoke test for apps
-
-on:
-  workflow_dispatch:
-  pull_request:
-    branches:
-      - "preview"
-    paths:
-      - "apps/web/**"
-      - "apps/space/**"
-      - "apps/admin/**"
-      - "apps/live/**"
-      - "packages/**"
-      - "turbo.json"
-      - "pnpm-lock.yaml"
-      - "pnpm-workspace.yaml"
-      - "Dockerfile.node"
-      - "Dockerfile.api"
-      - "Dockerfile.aio"
-      - "docker-bake.hcl"
-
-      - ".github/workflows/docker-smoke.yml"
-  push:
-    branches:
-      - "preview"
-    paths:
-      - "apps/web/**"
-      - "apps/space/**"
-      - "apps/admin/**"
-      - "apps/live/**"
-      - "packages/**"
-      - "turbo.json"
-      - "pnpm-lock.yaml"
-      - "pnpm-workspace.yaml"
-      - "Dockerfile.node"
-      - "Dockerfile.api"
-      - "Dockerfile.aio"
-      - "docker-bake.hcl"
-
-      - ".github/workflows/docker-smoke.yml"
-
-jobs:
-  determine-matrix:
-    name: Determine matrix
-    runs-on: ubuntu-latest
-    outputs:
-      matrix: ${{ steps.build-matrix.outputs.matrix }}
-    steps:
-      - name: Checkout repository
-        uses: actions/checkout@v4
-        with:
-          fetch-depth: 0
-
-      - name: Detect changed paths
-        id: changes
-        uses: dorny/paths-filter@v3
-        with:
-          filters: |
-            web:
-              - 'apps/web/**'
-            space:
-              - 'apps/space/**'
-            admin:
-              - 'apps/admin/**'
-            live:
-              - 'apps/live/**'
-            common:
-              - 'packages/**'
-              - 'turbo.json'
-              - 'pnpm-lock.yaml'
-              - 'pnpm-workspace.yaml'
-              - 'Dockerfile.node'
-              - 'Dockerfile.api'
-              - 'Dockerfile.aio'
-              - 'docker-bake.hcl'
-              - '.github/workflows/docker-smoke.yml'
-
-      - name: Build matrix
-        id: build-matrix
-        uses: actions/github-script@v7
-        with:
-          script: |
-            const include = [];
-            const anyCommon = '${{ steps.changes.outputs.common }}' === 'true';
-            const changed = {
-              web:   '${{ steps.changes.outputs.web }}'   === 'true',
-              space: '${{ steps.changes.outputs.space }}' === 'true',
-              admin: '${{ steps.changes.outputs.admin }}' === 'true',
-              live:  '${{ steps.changes.outputs.live }}'  === 'true',
-            };
-            const add = (name, bake_target, image, container, port, path, env_flags = "") =>
-              include.push({ name, bake_target, image, container, host_port: port, path, env_flags });
-
-            const buildAll = anyCommon || changed.web || changed.space || changed.admin || changed.live;
-            if (buildAll || changed.web)   add('web',   'web',   'plane-web:ci-smoke',   'plane-web-ci',   3001, '/');
-            if (buildAll || changed.space) add('space', 'space', 'plane-space:ci-smoke', 'plane-space-ci', 3002, '/spaces');
-            if (buildAll || changed.admin) add('admin', 'admin', 'plane-admin:ci-smoke', 'plane-admin-ci', 3003, '/god-mode');
-            if (buildAll || changed.live)  add('live',  'live',  'plane-live:ci-smoke',  'plane-live-ci',  3005, '/live/health', '-e NODE_ENV=production -e LIVE_BASE_PATH=/live');
-
-            if (include.length === 0) {
-              // Default to web to keep job non-empty
-              add('web', 'web', 'plane-web:ci-smoke', 'plane-web-ci', 3001, '/');
-            }
-            core.setOutput('matrix', JSON.stringify({ include }));
-
-  smoke:
-    name: Build and smoke test ${{ matrix.name }}
-    runs-on: ubuntu-latest
-    needs: determine-matrix
-    timeout-minutes: 25
-
-    strategy:
-      fail-fast: false
-      matrix: ${{ fromJSON(needs.determine-matrix.outputs.matrix) }}
-
-    steps:
-      - name: Checkout repository
-        uses: actions/checkout@v4
-        with:
-          fetch-depth: 0
-
-      - name: Prepare build environment
-        run: echo "Using docker build (no buildx bake)"
-
-      - name: Show Docker version
-        run: |
-          docker version
-          docker info
-
-      - name: Build image (${{ matrix.name }})
-        shell: bash
-        run: |
-          set -euo pipefail
-          name="${{ matrix.name }}"
-          tag="${{ matrix.image }}"
-          if [ "$name" = "live" ]; then
-            docker build -f "apps/live/Dockerfile.live" -t "$tag" "."
-          else
-            docker build -f "Dockerfile.node" --target runtime --build-arg APP_SCOPE="$name" -t "$tag" "."
-          fi
-
-      - name: Run container (${{ matrix.name }})
-        run: |
-          docker run -d --name ${{ matrix.container }} -p ${{ matrix.host_port }}:3000 ${{ matrix.env_flags }} ${{ matrix.image }}
-          docker ps -a
-
-      - name: Smoke test HTTP endpoint (${{ matrix.name }})
-        shell: bash
-        run: |
-          set -euo pipefail
-          URL="http://localhost:${{ matrix.host_port }}${{ matrix.path }}"
-          echo "Probing $URL ..."
-          for i in {1..60}; do
-            STATUS="$(curl -sS -o /dev/null -w "%{http_code}" -L "${URL}" || true)"
-            if [ "${STATUS}" = "200" ]; then
-              echo "Success: HTTP ${STATUS} from ${URL}"
-              exit 0
-            fi
-            echo "Attempt ${i}: HTTP ${STATUS} (waiting 2s)"
-            sleep 2
-          done
-          echo "Failed to get HTTP 200 from ${URL}"
-          echo "::group::Container logs (${{ matrix.container }})"
-          docker logs ${{ matrix.container }} || true
-          echo "::endgroup::"
-          exit 1
-
-      - name: Cleanup container (${{ matrix.name }})
-        if: always()
-        run: |
-          docker rm -f ${{ matrix.container }} || true
@@ -3,21 +3,11 @@ name: Build and lint API
 on:
  workflow_dispatch:
  pull_request:
-    branches:
-      - "preview"
-    types:
-      - "opened"
-      - "synchronize"
-      - "ready_for_review"
-      - "review_requested"
-      - "reopened"
+    branches: ["preview"]
+    types: ["opened", "synchronize", "ready_for_review", "review_requested", "reopened"]
    paths:
      - "apps/api/**"

-concurrency:
-  group: ${{ github.workflow }}-${{ github.ref }}
-  cancel-in-progress: true
-
 jobs:
  lint-api:
    name: Lint API
@@ -3,18 +3,21 @@ name: Build and lint web apps
 on:
  workflow_dispatch:
  pull_request:
-    branches:
-      - "preview"
+    branches: ["preview"]
    types:
-      - "opened"
-      - "synchronize"
-      - "ready_for_review"
-      - "review_requested"
-      - "reopened"
-
-concurrency:
-  group: ${{ github.workflow }}-${{ github.ref }}
-  cancel-in-progress: true
+      [
+        "opened",
+        "synchronize",
+        "ready_for_review",
+        "review_requested",
+        "reopened",
+      ]
+    paths:
+      - "**.tsx?"
+      - "**.jsx?"
+      - "**.css"
+      - "**.json"
+      - "!apps/api/**"

 jobs:
  build-and-lint:
@@ -24,15 +27,11 @@ jobs:
    if: |
      github.event.pull_request.draft == false &&
      github.event.pull_request.requested_reviewers != null
-    env:
-      TURBO_SCM_BASE: ${{ github.event.pull_request.base.sha }}
-      TURBO_SCM_HEAD: ${{ github.sha }}
    steps:
      - name: Checkout code
        uses: actions/checkout@v4
        with:
-          fetch-depth: 50
-          filter: blob:none
+          fetch-depth: 2

      - name: Set up Node.js
        uses: actions/setup-node@v4
@@ -45,11 +44,11 @@ jobs:
      - name: Install dependencies
        run: pnpm install --frozen-lockfile

-      - name: Lint Affected
-        run: pnpm turbo run check:lint --affected
+      - name: Lint web apps
+        run: pnpm run check:lint

-      - name: Check Affected format
-        run: pnpm turbo run check:format --affected
+      - name: Check format
+        run: pnpm run check:format

-      - name: Build Affected
-        run: pnpm turbo run build --affected
+      - name: Build apps
+        run: pnpm run build
@@ -97,5 +97,3 @@ dev-editor
 # Redis
 *.rdb
 *.rdb.gz
-
-storybook-static
@@ -18,6 +18,9 @@ public-hoist-pattern[]=eslint
 public-hoist-pattern[]=prettier
 public-hoist-pattern[]=typescript

+# Enforce Node version for consistent installs
+use-node-version=22.18.0
+
 # Reproducible installs across CI and dev
 prefer-frozen-lockfile=true

@@ -1,120 +0,0 @@
-# syntax=docker/dockerfile:1.7
-#
-# All-in-one assembler image that composes Plane runtime from per-app images
-# and the community supervisor/Caddy configuration.
-#
-# Build requirements:
-#  - Build and tag the per-app images first (or override args below):
-#      plane-web:latest, plane-space:latest, plane-admin:latest, plane-live:latest,
-#      plane-api:latest, plane-proxy:latest
-#
-# Example:
-#   docker build \
-#     -f plane/Dockerfile.aio \
-#     --build-arg WEB_IMG=plane-web:latest \
-#     --build-arg SPACE_IMG=plane-space:latest \
-#     --build-arg ADMIN_IMG=plane-admin:latest \
-#     --build-arg LIVE_IMG=plane-live:latest \
-#     --build-arg API_IMG=plane-api:latest \
-#     --build-arg PROXY_IMG=plane-proxy:latest \
-#     -t plane-aio:latest .
-#
-# Run:
-#   docker run --rm -it -p 80:80 plane-aio:latest
-#
-# Provide required env vars; see deployments/aio/community/README.md.
-
-# ------------------------------------------------------------------------------
-# Arguments to reference locally-built component images
-# ------------------------------------------------------------------------------
-# Build contexts are used for component images:
-#   --build-context web_ctx=target:web
-#   --build-context space_ctx=target:space
-#   --build-context admin_ctx=target:admin
-#   --build-context live_ctx=target:live
-#   --build-context api_ctx=target:api
-#   --build-context proxy_ctx=target:proxy
-ARG NODE_VERSION=22-alpine
-ARG PY_VERSION=3.12.10-alpine
-
-# ------------------------------------------------------------------------------
-# Source stages: pull artifacts from pre-built images
-# ------------------------------------------------------------------------------
-FROM node:${NODE_VERSION} AS node
-
-# ------------------------------------------------------------------------------
-# Final runner: Python as base (Supervisor + API deps live here)
-# ------------------------------------------------------------------------------
-FROM python:${PY_VERSION} AS runner
-
-WORKDIR /app
-
-# Base system libs for API/Caddy/Node runtime
-RUN apk add --no-cache \
-    libpq \
-    libxslt \
-    xmlsec \
-    nss-tools \
-    bash \
-    curl \
-    ca-certificates \
-    openssl
-
-# Install supervisor
-RUN pip install --no-cache-dir supervisor && mkdir -p /etc/supervisor/conf.d
-
-# Copy Node runtime into the AIO container for Next standalone apps
-COPY --from=node /usr/lib /usr/lib
-COPY --from=node /usr/local/lib /usr/local/lib
-COPY --from=node /usr/local/include /usr/local/include
-COPY --from=node /usr/local/bin /usr/local/bin
-
-# Copy Next.js standalone app artifacts (namespaced under /app/<app>)
-COPY --from=web_ctx   /app /app/web
-COPY --from=space_ctx /app /app/space
-COPY --from=admin_ctx /app /app/admin
-COPY --from=live_ctx  /app /app/live
-
-# Clean potential Next caches (optional)
-RUN rm -rf /app/web/apps/web/.next/cache || true \
-    && rm -rf /app/space/apps/space/.next/cache || true \
-    && rm -rf /app/admin/apps/admin/.next/cache || true
-
-# Copy Python backend code and installed packages/binaries
-COPY --from=api_ctx /code /app/backend
-# Match CPython version path (PY_VERSION=3.12.x-alpine)
-COPY --from=api_ctx /usr/local/lib/python3.12/site-packages/ /usr/local/lib/python3.12/site-packages/
-COPY --from=api_ctx /usr/local/bin/ /usr/local/bin/
-
-# Caddy binary from proxy image
-COPY --from=proxy_ctx /usr/bin/caddy /usr/bin/caddy
-
-# Community supervisor config and startup script
-COPY deployments/aio/community/start.sh /app/start.sh
-COPY deployments/aio/community/supervisor.conf /etc/supervisor/conf.d/supervisor.conf
-
-# Provide a default plane.env from variables template; start.sh will update it
-COPY deployments/aio/community/variables.env /app/plane.env
-
-# Prepare Caddy configuration:
-# - Start from the repository Caddyfile.ce
-# - Update upstreams to localhost-bound ports managed by supervisor
-RUN mkdir -p /app/proxy
-COPY apps/proxy/Caddyfile.ce /app/proxy/Caddyfile
-RUN set -eux; \
-    sed -i 's|web:3000|localhost:3001|g'    /app/proxy/Caddyfile; \
-    sed -i 's|space:3000|localhost:3002|g'  /app/proxy/Caddyfile; \
-    sed -i 's|admin:3000|localhost:3003|g'  /app/proxy/Caddyfile; \
-    sed -i 's|api:8000|localhost:3004|g'    /app/proxy/Caddyfile; \
-    sed -i 's|live:3000|localhost:3005|g'   /app/proxy/Caddyfile; \
-    sed -i '/plane-minio:9000/d'            /app/proxy/Caddyfile
-
-# Folders and permissions
-RUN mkdir -p /app/logs/access /app/logs/error /app/data \
-    && chmod +x /app/start.sh
-
-VOLUME ["/app/data", "/app/logs"]
-
-EXPOSE 80 443
-
-CMD ["/app/start.sh"]
@@ -1,151 +0,0 @@
-# syntax=docker/dockerfile:1.7
-#
-# Unified multi-stage Dockerfile for the Python API
-# Targets:
-#   - dev:      local development with hot reload and full build toolchain
-#   - runtime:  production runtime using prebuilt wheels
-#
-# Example builds (from repo root):
-#   docker build -f plane/Dockerfile.api --target dev -t plane-api:dev .
-#   docker build -f plane/Dockerfile.api --target runtime -t plane-api:latest .
-
-ARG PY_VERSION=python:3.12.10-alpine
-
-# -----------------------------------------------------------------------------
-# base: common runtime base (no build toolchain)
-# -----------------------------------------------------------------------------
-FROM ${PY_VERSION} AS base
-
-ENV PYTHONDONTWRITEBYTECODE=1 \
-    PYTHONUNBUFFERED=1 \
-    PIP_DISABLE_PIP_VERSION_CHECK=1 \
-    INSTANCE_CHANGELOG_URL=https://sites.plane.so/pages/691ef037bcfe416a902e48cb55f59891/
-
-# Runtime libraries required by the app
-RUN apk add --no-cache \
-    libpq \
-    libxslt \
-    xmlsec \
-    ca-certificates \
-    openssl
-
-WORKDIR /code
-
-# -----------------------------------------------------------------------------
-# builder: build Python wheels for all dependencies
-# -----------------------------------------------------------------------------
-FROM ${PY_VERSION} AS builder
-
-# Full build toolchain to compile deps to wheels
-RUN apk add --no-cache \
-    bash~=5.2 \
-    g++ \
-    gcc \
-    cargo \
-    git \
-    make \
-    postgresql-dev \
-    libc-dev \
-    linux-headers \
-    libffi-dev \
-    libxml2-dev \
-    libxslt-dev \
-    openssl-dev \
-    xmlsec-dev
-
-WORKDIR /w
-
-# Copy requirements (relative to repo root)
-COPY apps/api/requirements.txt /w/requirements.txt
-COPY apps/api/requirements /w/requirements
-
-# Build wheels into /wheels to reuse in runtime
-RUN --mount=type=cache,target=/root/.cache/pip \
-    pip wheel -r /w/requirements.txt --wheel-dir /wheels
-
-# -----------------------------------------------------------------------------
-# dev: local development image (bind mount source into /code)
-# -----------------------------------------------------------------------------
-FROM ${PY_VERSION} AS dev
-
-ENV PYTHONDONTWRITEBYTECODE=1 \
-    PYTHONUNBUFFERED=1 \
-    PIP_DISABLE_PIP_VERSION_CHECK=1 \
-    INSTANCE_CHANGELOG_URL=https://sites.plane.so/pages/691ef037bcfe416a902e48cb55f59891/
-
-# Match prior dev environment: runtime + build deps + node
-RUN apk add --no-cache \
-    libpq \
-    libxslt \
-    xmlsec \
-    nodejs-current \
-    bash~=5.2 \
-    g++ \
-    gcc \
-    cargo \
-    git \
-    make \
-    postgresql-dev \
-    libc-dev \
-    linux-headers \
-    libffi-dev
-
-WORKDIR /code
-
-# Copy and install local dev requirements
-COPY apps/api/requirements.txt ./requirements.txt
-COPY apps/api/requirements ./requirements
-RUN --mount=type=cache,target=/root/.cache/pip \
-    pip install -r requirements/local.txt --no-cache-dir
-
-# Bring in the API source
-COPY apps/api/ ./
-
-# Permissions similar to existing Dockerfiles
-RUN mkdir -p /code/plane/logs \
- && chmod -R +x /code/bin \
- && chmod -R 777 /code
-
-EXPOSE 8000
-CMD ["./bin/docker-entrypoint-api-local.sh"]
-
-# -----------------------------------------------------------------------------
-# runtime: production image using wheels from builder
-# -----------------------------------------------------------------------------
-FROM base AS runtime
-
-# Bash needed for entrypoint scripts
-RUN apk add --no-cache bash~=5.2
-
-WORKDIR /code
-
-# Install from wheels for reproducible, fast builds
-COPY --from=builder /wheels /wheels
-COPY apps/api/requirements.txt ./requirements.txt
-COPY apps/api/requirements ./requirements
-RUN --mount=type=cache,target=/root/.cache/pip \
-    pip install --no-cache-dir --no-index --find-links=/wheels -r requirements.txt
-
-# Copy only what is required to run
-COPY apps/api/manage.py ./manage.py
-COPY apps/api/plane ./plane
-COPY apps/api/templates ./templates
-COPY apps/api/package.json ./package.json
-COPY apps/api/bin ./bin
-
-# Create unprivileged user and set secure permissions
-RUN addgroup -S plane && adduser -S -G plane -h /code -s /sbin/nologin plane \
- && chmod +x ./bin/* \
- && mkdir -p /code/plane/logs \
- && chown -R plane:plane /code \
- && chmod -R 755 /code \
- && chmod 775 /code/plane/logs
-
-ENV GUNICORN_WORKERS=3 \
-    PORT=8000
-
-USER plane
-EXPOSE 8000
-
-# Default: API server; override command for worker/beat/migrator as needed
-CMD ["./bin/docker-entrypoint-api.sh"]
@@ -1,138 +0,0 @@
-# syntax=docker/dockerfile:1.7
-#
-# Unified multi-stage Dockerfile for Next.js apps in this monorepo.
-# Supports:
-#  - target=dev     (hot-reload, expects bind-mounted repo)
-#  - target=runtime (production image using Next.js standalone output)
-#
-# Usage examples:
-#  - Build dev image for web:    docker build --target dev --build-arg APP_SCOPE=web -t plane-web:dev .
-#  - Run dev (with compose):     mount the repo into /repo and override command/ports as needed
-#  - Build prod image for web:   docker build --target runtime --build-arg APP_SCOPE=web -t plane-web:latest .
-#
-# APP_SCOPE must be one of: web, space, admin
-
-ARG NODE_VERSION=22-alpine
-ARG TURBO_VERSION=2.5.6
-
-# -----------------------------------------------------------------------------
-# Base: Node + pnpm (corepack)
-# -----------------------------------------------------------------------------
-FROM node:${NODE_VERSION} AS base
-
-ENV PNPM_HOME=/pnpm
-ENV PATH=$PNPM_HOME:$PATH
-RUN corepack enable && apk add --no-cache libc6-compat
-
-# -----------------------------------------------------------------------------
-# builder: prune workspace using turbo for the selected app scope
-# -----------------------------------------------------------------------------
-FROM base AS builder
-ARG APP_SCOPE
-WORKDIR /repo
-
-# Full context is required for turbo prune
-COPY . .
-RUN pnpm add -g turbo@${TURBO_VERSION}
-RUN turbo prune --scope=${APP_SCOPE} --docker
-
-# -----------------------------------------------------------------------------
-# installer: install deps (offline) and build the selected scope
-# -----------------------------------------------------------------------------
-FROM base AS installer
-WORKDIR /repo
-
-# Seed minimal files for reproducible installs and good caching
-COPY .gitignore .gitignore
-COPY --from=builder /repo/out/json/ .
-COPY --from=builder /repo/out/pnpm-lock.yaml ./pnpm-lock.yaml
-
-# Fetch dependencies into a cached store layer
-RUN --mount=type=cache,id=pnpm-store,target=/pnpm/store \
-    pnpm fetch --store-dir=/pnpm/store
-
-# Bring in only the pruned workspace for fast installs/builds
-COPY --from=builder /repo/out/full/ .
-COPY turbo.json turbo.json
-
-# Offline, frozen lockfile install from cached store
-RUN --mount=type=cache,id=pnpm-store,target=/pnpm/store \
-    pnpm install --offline --frozen-lockfile --store-dir=/pnpm/store
-
-# Build-time environment (safe to pass through; only NEXT_PUBLIC_* are embedded)
-# Keep parity with existing app Dockerfiles
-ARG NEXT_PUBLIC_API_BASE_URL=""
-ENV NEXT_PUBLIC_API_BASE_URL=$NEXT_PUBLIC_API_BASE_URL
-
-ARG NEXT_PUBLIC_ADMIN_BASE_URL=""
-ENV NEXT_PUBLIC_ADMIN_BASE_URL=$NEXT_PUBLIC_ADMIN_BASE_URL
-
-ARG NEXT_PUBLIC_ADMIN_BASE_PATH="/god-mode"
-ENV NEXT_PUBLIC_ADMIN_BASE_PATH=$NEXT_PUBLIC_ADMIN_BASE_PATH
-
-ARG NEXT_PUBLIC_SPACE_BASE_URL=""
-ENV NEXT_PUBLIC_SPACE_BASE_URL=$NEXT_PUBLIC_SPACE_BASE_URL
-
-ARG NEXT_PUBLIC_SPACE_BASE_PATH="/spaces"
-ENV NEXT_PUBLIC_SPACE_BASE_PATH=$NEXT_PUBLIC_SPACE_BASE_PATH
-
-ARG NEXT_PUBLIC_WEB_BASE_URL=""
-ENV NEXT_PUBLIC_WEB_BASE_URL=$NEXT_PUBLIC_WEB_BASE_URL
-
-ENV NEXT_TELEMETRY_DISABLED=1
-ENV TURBO_TELEMETRY_DISABLED=1
-
-# Build only the selected scope
-ARG APP_SCOPE
-RUN pnpm turbo run build --filter=${APP_SCOPE}
-
-# -----------------------------------------------------------------------------
-# dev: for local development with hot reload (bind-mount the repo to /repo)
-# -----------------------------------------------------------------------------
-FROM base AS dev
-WORKDIR /repo
-
-# Helpful global tool for selective builds/dev
-RUN pnpm add -g turbo@${TURBO_VERSION}
-
-ENV NODE_ENV=development \
-    NEXT_TELEMETRY_DISABLED=1 \
-    TURBO_TELEMETRY_DISABLED=1
-
-# Select which app to run in dev (web|space|admin)
-ARG APP_SCOPE
-ENV APP_SCOPE=${APP_SCOPE}
-
-EXPOSE 3000
-# Expect the source to be bind-mounted; install deps and start dev server
-CMD ["sh", "-lc", "pnpm install && pnpm dev --filter=${APP_SCOPE}"]
-
-# -----------------------------------------------------------------------------
-# runtime: minimal Next.js standalone runner for the selected scope
-# -----------------------------------------------------------------------------
-FROM node:${NODE_VERSION} AS runtime
-WORKDIR /app
-
-ENV NODE_ENV=production \
-    NEXT_TELEMETRY_DISABLED=1 \
-    TURBO_TELEMETRY_DISABLED=1 \
-    HOSTNAME=0.0.0.0 \
-    PORT=3000
-
-# Drop privileges
-RUN addgroup -S -g 1001 nodejs \
- && adduser -S -u 1001 -G nodejs -h /home/nextjs -D nextjs \
- && mkdir -p /home/nextjs \
- && chown -R nextjs:nodejs /home/nextjs
-USER nextjs
-
-# Copy only the built output for the selected scope
-ARG APP_SCOPE
-ENV APP_SCOPE=${APP_SCOPE}
-# Next.js standalone layout
-COPY --from=installer /repo/apps/${APP_SCOPE}/.next/standalone ./
-COPY --from=installer /repo/apps/${APP_SCOPE}/.next/static ./apps/${APP_SCOPE}/.next/static
-COPY --from=installer /repo/apps/${APP_SCOPE}/public ./apps/${APP_SCOPE}/public
-
-EXPOSE 3000
-CMD ["sh", "-lc", "set -e; : \"${APP_SCOPE:?APP_SCOPE env is required}\"; SERVER=\"apps/${APP_SCOPE}/server.js\"; if [ ! -f \"$SERVER\" ]; then echo \"Error: $SERVER not found.\"; ls -la \"apps/${APP_SCOPE}\" || true; echo \"Known apps:\"; ls -1 apps || true; exit 1; fi; exec node \"$SERVER\""]
@@ -0,0 +1,103 @@
+# syntax=docker/dockerfile:1.7
+FROM node:22-alpine AS base
+
+# Setup pnpm package manager with corepack and configure global bin directory for caching
+ENV PNPM_HOME="/pnpm"
+ENV PATH="$PNPM_HOME:$PATH"
+RUN corepack enable
+
+# *****************************************************************************
+# STAGE 1: Build the project
+# *****************************************************************************
+FROM base AS builder
+RUN apk add --no-cache libc6-compat
+WORKDIR /app
+
+ARG TURBO_VERSION=2.5.6
+RUN corepack enable pnpm && pnpm add -g turbo@${TURBO_VERSION}
+COPY . .
+
+RUN turbo prune --scope=admin --docker
+
+# *****************************************************************************
+# STAGE 2: Install dependencies & build the project
+# *****************************************************************************
+FROM base AS installer
+
+RUN apk add --no-cache libc6-compat
+WORKDIR /app
+
+COPY .gitignore .gitignore
+COPY --from=builder /app/out/json/ .
+COPY --from=builder /app/out/pnpm-lock.yaml ./pnpm-lock.yaml
+RUN corepack enable pnpm
+RUN --mount=type=cache,id=pnpm-store,target=/pnpm/store pnpm fetch --store-dir=/pnpm/store
+
+COPY --from=builder /app/out/full/ .
+COPY turbo.json turbo.json
+RUN --mount=type=cache,id=pnpm-store,target=/pnpm/store pnpm install --offline --frozen-lockfile --store-dir=/pnpm/store
+
+ARG NEXT_PUBLIC_API_BASE_URL=""
+ENV NEXT_PUBLIC_API_BASE_URL=$NEXT_PUBLIC_API_BASE_URL
+
+ARG NEXT_PUBLIC_ADMIN_BASE_URL=""
+ENV NEXT_PUBLIC_ADMIN_BASE_URL=$NEXT_PUBLIC_ADMIN_BASE_URL
+
+ARG NEXT_PUBLIC_ADMIN_BASE_PATH="/god-mode"
+ENV NEXT_PUBLIC_ADMIN_BASE_PATH=$NEXT_PUBLIC_ADMIN_BASE_PATH
+
+ARG NEXT_PUBLIC_SPACE_BASE_URL=""
+ENV NEXT_PUBLIC_SPACE_BASE_URL=$NEXT_PUBLIC_SPACE_BASE_URL
+
+ARG NEXT_PUBLIC_SPACE_BASE_PATH="/spaces"
+ENV NEXT_PUBLIC_SPACE_BASE_PATH=$NEXT_PUBLIC_SPACE_BASE_PATH
+
+ARG NEXT_PUBLIC_WEB_BASE_URL=""
+ENV NEXT_PUBLIC_WEB_BASE_URL=$NEXT_PUBLIC_WEB_BASE_URL
+
+ENV NEXT_TELEMETRY_DISABLED=1
+ENV TURBO_TELEMETRY_DISABLED=1
+
+RUN pnpm turbo run build --filter=admin
+
+# *****************************************************************************
+# STAGE 3: Copy the project and start it
+# *****************************************************************************
+FROM base AS runner
+WORKDIR /app
+
+# Don't run production as root
+RUN addgroup --system --gid 1001 nodejs
+RUN adduser --system --uid 1001 nextjs
+USER nextjs
+
+# Automatically leverage output traces to reduce image size
+# https://nextjs.org/docs/advanced-features/output-file-tracing
+COPY --from=installer /app/apps/admin/.next/standalone ./
+COPY --from=installer /app/apps/admin/.next/static ./apps/admin/.next/static
+COPY --from=installer /app/apps/admin/public ./apps/admin/public
+
+ARG NEXT_PUBLIC_API_BASE_URL=""
+ENV NEXT_PUBLIC_API_BASE_URL=$NEXT_PUBLIC_API_BASE_URL
+
+ARG NEXT_PUBLIC_ADMIN_BASE_URL=""
+ENV NEXT_PUBLIC_ADMIN_BASE_URL=$NEXT_PUBLIC_ADMIN_BASE_URL
+
+ARG NEXT_PUBLIC_ADMIN_BASE_PATH="/god-mode"
+ENV NEXT_PUBLIC_ADMIN_BASE_PATH=$NEXT_PUBLIC_ADMIN_BASE_PATH
+
+ARG NEXT_PUBLIC_SPACE_BASE_URL=""
+ENV NEXT_PUBLIC_SPACE_BASE_URL=$NEXT_PUBLIC_SPACE_BASE_URL
+
+ARG NEXT_PUBLIC_SPACE_BASE_PATH="/spaces"
+ENV NEXT_PUBLIC_SPACE_BASE_PATH=$NEXT_PUBLIC_SPACE_BASE_PATH
+
+ARG NEXT_PUBLIC_WEB_BASE_URL=""
+ENV NEXT_PUBLIC_WEB_BASE_URL=$NEXT_PUBLIC_WEB_BASE_URL
+
+ENV NEXT_TELEMETRY_DISABLED=1
+ENV TURBO_TELEMETRY_DISABLED=1
+
+EXPOSE 3000
+
+CMD ["node", "apps/admin/server.js"]
@@ -0,0 +1,17 @@
+FROM node:22-alpine
+RUN apk add --no-cache libc6-compat
+# Set working directory
+WORKDIR /app
+
+COPY . .
+
+RUN corepack enable pnpm && pnpm add -g turbo
+RUN pnpm install
+
+ENV NEXT_PUBLIC_ADMIN_BASE_PATH="/god-mode"
+
+EXPOSE 3000
+
+VOLUME [ "/app/node_modules", "/app/admin/node_modules" ]
+
+CMD ["pnpm", "dev", "--filter=admin"]
@@ -0,0 +1,58 @@
+FROM python:3.12.10-alpine
+
+# set environment variables
+ENV PYTHONDONTWRITEBYTECODE=1
+ENV PYTHONUNBUFFERED=1
+ENV PIP_DISABLE_PIP_VERSION_CHECK=1 
+ENV INSTANCE_CHANGELOG_URL=https://sites.plane.so/pages/691ef037bcfe416a902e48cb55f59891/
+
+# Update system packages for security
+RUN apk update && apk upgrade
+
+WORKDIR /code
+
+RUN apk add --no-cache --upgrade \
+    "libpq" \
+    "libxslt" \
+    "xmlsec" \
+    "ca-certificates" \
+    "openssl"
+
+COPY requirements.txt ./
+COPY requirements ./requirements
+RUN apk add --no-cache libffi-dev
+RUN apk add --no-cache --virtual .build-deps \
+    "bash~=5.2" \
+    "g++" \
+    "gcc" \
+    "cargo" \
+    "git" \
+    "make" \
+    "postgresql-dev" \
+    "libc-dev" \
+    "linux-headers" \
+    && \
+    pip install -r requirements.txt --compile --no-cache-dir \
+    && \
+    apk del .build-deps \
+    && \
+    rm -rf /var/cache/apk/*
+
+
+# Add in Django deps and generate Django's static files
+COPY manage.py manage.py
+COPY plane plane/
+COPY templates templates/
+COPY package.json package.json
+
+RUN apk --no-cache add "bash~=5.2"
+COPY ./bin ./bin/
+
+RUN mkdir -p /code/plane/logs
+RUN chmod +x ./bin/*
+RUN chmod -R 777 /code
+
+# Expose container port and run entry point script
+EXPOSE 8000
+
+CMD ["./bin/docker-entrypoint-api.sh"]
@@ -0,0 +1,46 @@
+FROM python:3.12.5-alpine AS backend
+
+# set environment variables
+ENV PYTHONDONTWRITEBYTECODE 1
+ENV PYTHONUNBUFFERED 1
+ENV PIP_DISABLE_PIP_VERSION_CHECK=1 
+ENV INSTANCE_CHANGELOG_URL https://sites.plane.so/pages/691ef037bcfe416a902e48cb55f59891/
+
+RUN apk --no-cache add \
+    "bash~=5.2" \
+    "libpq" \
+    "libxslt" \
+    "nodejs-current" \
+    "xmlsec" \
+    "libffi-dev" \
+    "bash~=5.2" \
+    "g++" \
+    "gcc" \
+    "cargo" \
+    "git" \
+    "make" \
+    "postgresql-dev" \
+    "libc-dev" \
+    "linux-headers"
+
+WORKDIR /code
+
+COPY requirements.txt ./requirements.txt
+ADD requirements ./requirements
+
+# Install the local development settings
+RUN pip install -r requirements/local.txt --compile --no-cache-dir
+
+
+COPY . .
+
+RUN mkdir -p /code/plane/logs
+RUN chmod -R +x /code/bin
+RUN chmod -R 777 /code
+
+
+# Expose container port and run entry point script
+EXPOSE 8000
+
+CMD [ "./bin/docker-entrypoint-api-local.sh" ]
+
@@ -24,6 +24,7 @@ from plane.db.models import (
 )
 from plane.utils.content_validator import (
    validate_html_content,
+    validate_json_content,
    validate_binary_data,
 )

@@ -88,24 +89,20 @@ class IssueSerializer(BaseSerializer):
            raise serializers.ValidationError("Invalid HTML passed")

        # Validate description content for security
-        if data.get("description_html"):
-            is_valid, error_msg, sanitized_html = validate_html_content(
-                data["description_html"]
-            )
+        if data.get("description"):
+            is_valid, error_msg = validate_json_content(data["description"])
            if not is_valid:
-                raise serializers.ValidationError(
-                    {"error": "html content is not valid"}
-                )
-            # Update the data with sanitized HTML if available
-            if sanitized_html is not None:
-                data["description_html"] = sanitized_html
+                raise serializers.ValidationError({"description": error_msg})
+
+        if data.get("description_html"):
+            is_valid, error_msg = validate_html_content(data["description_html"])
+            if not is_valid:
+                raise serializers.ValidationError({"description_html": error_msg})

        if data.get("description_binary"):
            is_valid, error_msg = validate_binary_data(data["description_binary"])
            if not is_valid:
-                raise serializers.ValidationError(
-                    {"description_binary": "Invalid binary data"}
-                )
+                raise serializers.ValidationError({"description_binary": error_msg})

        # Validate assignees are from project
        if data.get("assignees", []):
@@ -12,6 +12,7 @@ from plane.db.models import (

 from plane.utils.content_validator import (
    validate_html_content,
+    validate_json_content,
 )
 from .base import BaseSerializer

@@ -44,10 +45,6 @@ class ProjectCreateSerializer(BaseSerializer):
            "archive_in",
            "close_in",
            "timezone",
-            "logo_props",
-            "external_source",
-            "external_id",
-            "is_issue_type_enabled",
        ]

        read_only_fields = [
@@ -199,18 +196,27 @@ class ProjectSerializer(BaseSerializer):
            )

        # Validate description content for security
+        if "description" in data and data["description"]:
+            # For Project, description might be text field, not JSON
+            if isinstance(data["description"], dict):
+                is_valid, error_msg = validate_json_content(data["description"])
+                if not is_valid:
+                    raise serializers.ValidationError({"description": error_msg})
+
+        if "description_text" in data and data["description_text"]:
+            is_valid, error_msg = validate_json_content(data["description_text"])
+            if not is_valid:
+                raise serializers.ValidationError({"description_text": error_msg})
+
        if "description_html" in data and data["description_html"]:
            if isinstance(data["description_html"], dict):
-                is_valid, error_msg, sanitized_html = validate_html_content(
+                is_valid, error_msg = validate_json_content(data["description_html"])
+            else:
+                is_valid, error_msg = validate_html_content(
                    str(data["description_html"])
                )
-                # Update the data with sanitized HTML if available
-                if sanitized_html is not None:
-                    data["description_html"] = sanitized_html
            if not is_valid:
-                raise serializers.ValidationError(
-                    {"error": "html content is not valid"}
-                )
+                raise serializers.ValidationError({"description_html": error_msg})

        return data

@@ -4,7 +4,7 @@ from plane.api.views import ProjectMemberAPIEndpoint, WorkspaceMemberAPIEndpoint

 urlpatterns = [
    path(
-        "workspaces/<str:slug>/projects/<uuid:project_id>/members/",
+        "workspaces/<str:slug>/projects/<str:project_id>/members/",
        ProjectMemberAPIEndpoint.as_view(http_method_names=["get"]),
        name="project-members",
    ),
@@ -23,6 +23,7 @@ from plane.db.models import (
 )
 from plane.utils.content_validator import (
    validate_html_content,
+    validate_json_content,
    validate_binary_data,
 )
 from plane.app.permissions import ROLE
@@ -75,24 +76,20 @@ class DraftIssueCreateSerializer(BaseSerializer):
            raise serializers.ValidationError("Start date cannot exceed target date")

        # Validate description content for security
-        if "description_html" in attrs and attrs["description_html"]:
-            is_valid, error_msg, sanitized_html = validate_html_content(
-                attrs["description_html"]
-            )
+        if "description" in attrs and attrs["description"]:
+            is_valid, error_msg = validate_json_content(attrs["description"])
            if not is_valid:
-                raise serializers.ValidationError(
-                    {"error": "html content is not valid"}
-                )
-            # Update the attrs with sanitized HTML if available
-            if sanitized_html is not None:
-                attrs["description_html"] = sanitized_html
+                raise serializers.ValidationError({"description": error_msg})
+
+        if "description_html" in attrs and attrs["description_html"]:
+            is_valid, error_msg = validate_html_content(attrs["description_html"])
+            if not is_valid:
+                raise serializers.ValidationError({"description_html": error_msg})

        if "description_binary" in attrs and attrs["description_binary"]:
            is_valid, error_msg = validate_binary_data(attrs["description_binary"])
            if not is_valid:
-                raise serializers.ValidationError(
-                    {"description_binary": "Invalid binary data"}
-                )
+                raise serializers.ValidationError({"description_binary": error_msg})

        # Validate assignees are from project
        if attrs.get("assignee_ids", []):
@@ -43,6 +43,7 @@ from plane.db.models import (
 )
 from plane.utils.content_validator import (
    validate_html_content,
+    validate_json_content,
    validate_binary_data,
 )

@@ -127,24 +128,20 @@ class IssueCreateSerializer(BaseSerializer):
            raise serializers.ValidationError("Start date cannot exceed target date")

        # Validate description content for security
-        if "description_html" in attrs and attrs["description_html"]:
-            is_valid, error_msg, sanitized_html = validate_html_content(
-                attrs["description_html"]
-            )
+        if "description" in attrs and attrs["description"]:
+            is_valid, error_msg = validate_json_content(attrs["description"])
            if not is_valid:
-                raise serializers.ValidationError(
-                    {"error": "html content is not valid"}
-                )
-            # Update the attrs with sanitized HTML if available
-            if sanitized_html is not None:
-                attrs["description_html"] = sanitized_html
+                raise serializers.ValidationError({"description": error_msg})
+
+        if "description_html" in attrs and attrs["description_html"]:
+            is_valid, error_msg = validate_html_content(attrs["description_html"])
+            if not is_valid:
+                raise serializers.ValidationError({"description_html": error_msg})

        if "description_binary" in attrs and attrs["description_binary"]:
            is_valid, error_msg = validate_binary_data(attrs["description_binary"])
            if not is_valid:
-                raise serializers.ValidationError(
-                    {"description_binary": "Invalid binary data"}
-                )
+                raise serializers.ValidationError({"description_binary": error_msg})

        # Validate assignees are from project
        if attrs.get("assignee_ids", []):
@@ -911,14 +908,9 @@ class IssueLiteSerializer(DynamicBaseSerializer):
 class IssueDetailSerializer(IssueSerializer):
    description_html = serializers.CharField()
    is_subscribed = serializers.BooleanField(read_only=True)
-    is_intake = serializers.BooleanField(read_only=True)

    class Meta(IssueSerializer.Meta):
-        fields = IssueSerializer.Meta.fields + [
-            "description_html",
-            "is_subscribed",
-            "is_intake",
-        ]
+        fields = IssueSerializer.Meta.fields + ["description_html", "is_subscribed"]
        read_only_fields = fields


@@ -7,6 +7,7 @@ from .base import BaseSerializer
 from plane.utils.content_validator import (
    validate_binary_data,
    validate_html_content,
+    validate_json_content,
 )
 from plane.db.models import (
    Page,
@@ -228,13 +229,23 @@ class PageBinaryUpdateSerializer(serializers.Serializer):
            return value

        # Use the validation function from utils
-        is_valid, error_message, sanitized_html = validate_html_content(value)
+        is_valid, error_message = validate_html_content(value)
        if not is_valid:
            raise serializers.ValidationError(error_message)

-        # Return sanitized HTML if available, otherwise return original
-        return sanitized_html if sanitized_html is not None else value
+        return value

+    def validate_description(self, value):
+        """Validate the JSON description"""
+        if not value:
+            return value
+
+        # Use the validation function from utils
+        is_valid, error_message = validate_json_content(value)
+        if not is_valid:
+            raise serializers.ValidationError(error_message)
+
+        return value

    def update(self, instance, validated_data):
        """Update the page instance with validated data"""
@@ -15,6 +15,7 @@ from plane.db.models import (
 )
 from plane.utils.content_validator import (
    validate_html_content,
+    validate_json_content,
    validate_binary_data,
 )

@@ -64,18 +65,27 @@ class ProjectSerializer(BaseSerializer):

    def validate(self, data):
        # Validate description content for security
-        if "description_html" in data and data["description_html"]:
-            is_valid, error_msg, sanitized_html = validate_html_content(
-                str(data["description_html"])
-            )
-            # Update the data with sanitized HTML if available
-            if sanitized_html is not None:
-                data["description_html"] = sanitized_html
+        if "description" in data and data["description"]:
+            # For Project, description might be text field, not JSON
+            if isinstance(data["description"], dict):
+                is_valid, error_msg = validate_json_content(data["description"])
+                if not is_valid:
+                    raise serializers.ValidationError({"description": error_msg})

+        if "description_text" in data and data["description_text"]:
+            is_valid, error_msg = validate_json_content(data["description_text"])
            if not is_valid:
-                raise serializers.ValidationError(
-                    {"error": "html content is not valid"}
+                raise serializers.ValidationError({"description_text": error_msg})
+
+        if "description_html" in data and data["description_html"]:
+            if isinstance(data["description_html"], dict):
+                is_valid, error_msg = validate_json_content(data["description_html"])
+            else:
+                is_valid, error_msg = validate_html_content(
+                    str(data["description_html"])
                )
+            if not is_valid:
+                raise serializers.ValidationError({"description_html": error_msg})

        return data

@@ -7,16 +7,31 @@ from plane.utils.url import contains_url

 from .base import BaseSerializer

+# Django import
+import re
+

 class UserSerializer(BaseSerializer):
    def validate_first_name(self, value):
        if contains_url(value):
            raise serializers.ValidationError("First name cannot contain a URL.")
+
+        if not re.match(r"^[a-zA-Z0-9_\- ]+$", value):
+            raise serializers.ValidationError(
+                "first name can only contain letters, numbers, hyphens (-), and underscores (_)"
+            )
+
        return value

    def validate_last_name(self, value):
        if contains_url(value):
            raise serializers.ValidationError("Last name cannot contain a URL.")
+
+        if not re.match(r"^[a-zA-Z0-9_\- ]+$", value) and not value == "":
+            raise serializers.ValidationError(
+                "last name can only contain letters, numbers, hyphens (-), and underscores (_)"
+            )
+
        return value

    class Meta:
@@ -26,6 +26,7 @@ from plane.utils.constants import RESTRICTED_WORKSPACE_SLUGS
 from plane.utils.url import contains_url
 from plane.utils.content_validator import (
    validate_html_content,
+    validate_json_content,
    validate_binary_data,
 )

@@ -318,24 +319,20 @@ class StickySerializer(BaseSerializer):

    def validate(self, data):
        # Validate description content for security
-        if "description_html" in data and data["description_html"]:
-            is_valid, error_msg, sanitized_html = validate_html_content(
-                data["description_html"]
-            )
+        if "description" in data and data["description"]:
+            is_valid, error_msg = validate_json_content(data["description"])
            if not is_valid:
-                raise serializers.ValidationError(
-                    {"error": "html content is not valid"}
-                )
-            # Update the data with sanitized HTML if available
-            if sanitized_html is not None:
-                data["description_html"] = sanitized_html
+                raise serializers.ValidationError({"description": error_msg})
+
+        if "description_html" in data and data["description_html"]:
+            is_valid, error_msg = validate_html_content(data["description_html"])
+            if not is_valid:
+                raise serializers.ValidationError({"description_html": error_msg})

        if "description_binary" in data and data["description_binary"]:
            is_valid, error_msg = validate_binary_data(data["description_binary"])
            if not is_valid:
-                raise serializers.ValidationError(
-                    {"description_binary": "Invalid binary data"}
-                )
+                raise serializers.ValidationError({"description_binary": error_msg})

        return data

@@ -51,7 +51,6 @@ from plane.db.models import (
    IssueRelation,
    IssueAssignee,
    IssueLabel,
-    IntakeIssue,
 )
 from plane.utils.grouper import (
    issue_group_values,
@@ -1224,7 +1223,7 @@ class IssueDetailIdentifierEndpoint(BaseAPIView):

        # Fetch the issue
        issue = (
-            Issue.objects.filter(project_id=project.id)
+            Issue.issue_objects.filter(project_id=project.id)
            .filter(workspace__slug=slug)
            .select_related("workspace", "project", "state", "parent")
            .prefetch_related("assignees", "labels", "issue_module__module")
@@ -1316,16 +1315,6 @@ class IssueDetailIdentifierEndpoint(BaseAPIView):
                    )
                )
            )
-            .annotate(
-                is_intake=Exists(
-                    IntakeIssue.objects.filter(
-                        issue=OuterRef("id"),
-                        status__in=[-2, 0],
-                        workspace__slug=slug,
-                        project_id=project.id,
-                    )
-                )
-            )
        ).first()

        # Check if the issue exists
@@ -59,10 +59,9 @@ class IssueSearchEndpoint(BaseAPIView):
        )

        related_issue_ids = [item for sublist in related_issue_ids for item in sublist]
-        related_issue_ids.append(issue_id)

        if issue:
-            issues = issues.exclude(pk__in=related_issue_ids)
+            issues = issues.filter(~Q(pk=issue_id), ~Q(pk__in=related_issue_ids))

        return issues

@@ -0,0 +1,15 @@
+from django.utils import timezone
+from datetime import timedelta
+from plane.db.models import APIActivityLog
+from celery import shared_task
+
+
+@shared_task
+def delete_api_logs():
+    # Get the logs older than 30 days to delete
+    logs_to_delete = APIActivityLog.objects.filter(
+        created_at__lte=timezone.now() - timedelta(days=30)
+    )
+
+    # Delete the logs
+    logs_to_delete._raw_delete(logs_to_delete.db)
@@ -1,423 +0,0 @@
-# Python imports
-from datetime import timedelta
-import logging
-from typing import List, Dict, Any, Callable, Optional
-import os
-
-# Django imports
-from django.utils import timezone
-from django.db.models import F, Window, Subquery
-from django.db.models.functions import RowNumber
-
-# Third party imports
-from celery import shared_task
-from pymongo.errors import BulkWriteError
-from pymongo.collection import Collection
-from pymongo.operations import InsertOne
-
-# Module imports
-from plane.db.models import (
-    EmailNotificationLog,
-    PageVersion,
-    APIActivityLog,
-    IssueDescriptionVersion,
-)
-from plane.settings.mongo import MongoConnection
-from plane.utils.exception_logger import log_exception
-
-
-logger = logging.getLogger("plane.worker")
-BATCH_SIZE = 1000
-
-
-def get_mongo_collection(collection_name: str) -> Optional[Collection]:
-    """Get MongoDB collection if available, otherwise return None."""
-    if not MongoConnection.is_configured():
-        logger.info("MongoDB not configured")
-        return None
-
-    try:
-        mongo_collection = MongoConnection.get_collection(collection_name)
-        logger.info(f"MongoDB collection '{collection_name}' connected successfully")
-        return mongo_collection
-    except Exception as e:
-        logger.error(f"Failed to get MongoDB collection: {str(e)}")
-        log_exception(e)
-        return None
-
-
-def flush_to_mongo_and_delete(
-    mongo_collection: Optional[Collection],
-    buffer: List[Dict[str, Any]],
-    ids_to_delete: List[int],
-    model,
-    mongo_available: bool,
-) -> None:
-    """
-    Inserts a batch of records into MongoDB and deletes the corresponding rows from PostgreSQL.
-    """
-    if not buffer:
-        logger.debug("No records to flush - buffer is empty")
-        return
-
-    logger.info(
-        f"Starting batch flush: {len(buffer)} records, {len(ids_to_delete)} IDs to delete"
-    )
-
-    mongo_archival_failed = False
-
-    # Try to insert into MongoDB if available
-    if mongo_collection and mongo_available:
-        try:
-            mongo_collection.bulk_write([InsertOne(doc) for doc in buffer])
-        except BulkWriteError as bwe:
-            logger.error(f"MongoDB bulk write error: {str(bwe)}")
-            log_exception(bwe)
-            mongo_archival_failed = True
-
-    # If MongoDB is available and archival failed, log the error and return
-    if mongo_available and mongo_archival_failed:
-        logger.error(f"MongoDB archival failed for {len(buffer)} records")
-        return
-
-    # Delete from PostgreSQL - delete() returns (count, {model: count})
-    delete_result = model.all_objects.filter(id__in=ids_to_delete).delete()
-    deleted_count = (
-        delete_result[0] if delete_result and isinstance(delete_result, tuple) else 0
-    )
-    logger.info(f"Batch flush completed: {deleted_count} records deleted")
-
-
-def process_cleanup_task(
-    queryset_func: Callable,
-    transform_func: Callable[[Dict], Dict],
-    model,
-    task_name: str,
-    collection_name: str,
-):
-    """
-    Generic function to process cleanup tasks.
-
-    Args:
-        queryset_func: Function that returns the queryset to process
-        transform_func: Function to transform each record for MongoDB
-        model: Django model class
-        task_name: Name of the task for logging
-        collection_name: MongoDB collection name
-    """
-    logger.info(f"Starting {task_name} cleanup task")
-
-    # Get MongoDB collection
-    mongo_collection = get_mongo_collection(collection_name)
-    mongo_available = mongo_collection is not None
-
-    # Get queryset
-    queryset = queryset_func()
-
-    # Process records in batches
-    buffer: List[Dict[str, Any]] = []
-    ids_to_delete: List[int] = []
-    total_processed = 0
-    total_batches = 0
-
-    for record in queryset:
-        # Transform record for MongoDB
-        buffer.append(transform_func(record))
-        ids_to_delete.append(record["id"])
-
-        # Flush batch when it reaches BATCH_SIZE
-        if len(buffer) >= BATCH_SIZE:
-            total_batches += 1
-            flush_to_mongo_and_delete(
-                mongo_collection=mongo_collection,
-                buffer=buffer,
-                ids_to_delete=ids_to_delete,
-                model=model,
-                mongo_available=mongo_available,
-            )
-            total_processed += len(buffer)
-            buffer.clear()
-            ids_to_delete.clear()
-
-    # Process final batch if any records remain
-    if buffer:
-        total_batches += 1
-        flush_to_mongo_and_delete(
-            mongo_collection=mongo_collection,
-            buffer=buffer,
-            ids_to_delete=ids_to_delete,
-            model=model,
-            mongo_available=mongo_available,
-        )
-        total_processed += len(buffer)
-
-    logger.info(
-        f"{task_name} cleanup task completed",
-        extra={
-            "total_records_processed": total_processed,
-            "total_batches": total_batches,
-            "mongo_available": mongo_available,
-            "collection_name": collection_name,
-        },
-    )
-
-
-# Transform functions for each model
-def transform_api_log(record: Dict) -> Dict:
-    """Transform API activity log record."""
-    return {
-        "id": record["id"],
-        "created_at": str(record["created_at"]) if record.get("created_at") else None,
-        "token_identifier": record["token_identifier"],
-        "path": record["path"],
-        "method": record["method"],
-        "query_params": record.get("query_params"),
-        "headers": record.get("headers"),
-        "body": record.get("body"),
-        "response_code": record["response_code"],
-        "response_body": record["response_body"],
-        "ip_address": record["ip_address"],
-        "user_agent": record["user_agent"],
-        "created_by_id": record["created_by_id"],
-    }
-
-
-def transform_email_log(record: Dict) -> Dict:
-    """Transform email notification log record."""
-    return {
-        "id": record["id"],
-        "created_at": str(record["created_at"]) if record.get("created_at") else None,
-        "receiver_id": record["receiver_id"],
-        "triggered_by_id": record["triggered_by_id"],
-        "entity_identifier": record["entity_identifier"],
-        "entity_name": record["entity_name"],
-        "data": record["data"],
-        "processed_at": (
-            str(record["processed_at"]) if record.get("processed_at") else None
-        ),
-        "sent_at": str(record["sent_at"]) if record.get("sent_at") else None,
-        "entity": record["entity"],
-        "old_value": record["old_value"],
-        "new_value": record["new_value"],
-        "created_by_id": record["created_by_id"],
-    }
-
-
-def transform_page_version(record: Dict) -> Dict:
-    """Transform page version record."""
-    return {
-        "id": record["id"],
-        "created_at": str(record["created_at"]) if record.get("created_at") else None,
-        "page_id": record["page_id"],
-        "workspace_id": record["workspace_id"],
-        "owned_by_id": record["owned_by_id"],
-        "description_html": record["description_html"],
-        "description_binary": record["description_binary"],
-        "description_stripped": record["description_stripped"],
-        "description_json": record["description_json"],
-        "sub_pages_data": record["sub_pages_data"],
-        "created_by_id": record["created_by_id"],
-        "updated_by_id": record["updated_by_id"],
-        "deleted_at": str(record["deleted_at"]) if record.get("deleted_at") else None,
-        "last_saved_at": (
-            str(record["last_saved_at"]) if record.get("last_saved_at") else None
-        ),
-    }
-
-
-def transform_issue_description_version(record: Dict) -> Dict:
-    """Transform issue description version record."""
-    return {
-        "id": record["id"],
-        "created_at": str(record["created_at"]) if record.get("created_at") else None,
-        "issue_id": record["issue_id"],
-        "workspace_id": record["workspace_id"],
-        "project_id": record["project_id"],
-        "created_by_id": record["created_by_id"],
-        "updated_by_id": record["updated_by_id"],
-        "owned_by_id": record["owned_by_id"],
-        "last_saved_at": (
-            str(record["last_saved_at"]) if record.get("last_saved_at") else None
-        ),
-        "description_binary": record["description_binary"],
-        "description_html": record["description_html"],
-        "description_stripped": record["description_stripped"],
-        "description_json": record["description_json"],
-        "deleted_at": str(record["deleted_at"]) if record.get("deleted_at") else None,
-    }
-
-
-# Queryset functions for each cleanup task
-def get_api_logs_queryset():
-    """Get API logs older than cutoff days."""
-    cutoff_days = int(os.environ.get("HARD_DELETE_AFTER_DAYS", 30))
-    cutoff_time = timezone.now() - timedelta(days=cutoff_days)
-    logger.info(f"API logs cutoff time: {cutoff_time}")
-
-    return (
-        APIActivityLog.all_objects.filter(created_at__lte=cutoff_time)
-        .values(
-            "id",
-            "created_at",
-            "token_identifier",
-            "path",
-            "method",
-            "query_params",
-            "headers",
-            "body",
-            "response_code",
-            "response_body",
-            "ip_address",
-            "user_agent",
-            "created_by_id",
-        )
-        .iterator(chunk_size=BATCH_SIZE)
-    )
-
-
-def get_email_logs_queryset():
-    """Get email logs older than cutoff days."""
-    cutoff_days = int(os.environ.get("HARD_DELETE_AFTER_DAYS", 30))
-    cutoff_time = timezone.now() - timedelta(days=cutoff_days)
-    logger.info(f"Email logs cutoff time: {cutoff_time}")
-
-    return (
-        EmailNotificationLog.all_objects.filter(sent_at__lte=cutoff_time)
-        .values(
-            "id",
-            "created_at",
-            "receiver_id",
-            "triggered_by_id",
-            "entity_identifier",
-            "entity_name",
-            "data",
-            "processed_at",
-            "sent_at",
-            "entity",
-            "old_value",
-            "new_value",
-            "created_by_id",
-        )
-        .iterator(chunk_size=BATCH_SIZE)
-    )
-
-
-def get_page_versions_queryset():
-    """Get page versions beyond the maximum allowed (20 per page)."""
-    subq = (
-        PageVersion.all_objects.annotate(
-            row_num=Window(
-                expression=RowNumber(),
-                partition_by=[F("page_id")],
-                order_by=F("created_at").desc(),
-            )
-        )
-        .filter(row_num__gt=20)
-        .values("id")
-    )
-
-    return (
-        PageVersion.all_objects.filter(id__in=Subquery(subq))
-        .values(
-            "id",
-            "created_at",
-            "page_id",
-            "workspace_id",
-            "owned_by_id",
-            "description_html",
-            "description_binary",
-            "description_stripped",
-            "description_json",
-            "sub_pages_data",
-            "created_by_id",
-            "updated_by_id",
-            "deleted_at",
-            "last_saved_at",
-        )
-        .iterator(chunk_size=BATCH_SIZE)
-    )
-
-
-def get_issue_description_versions_queryset():
-    """Get issue description versions beyond the maximum allowed (20 per issue)."""
-    subq = (
-        IssueDescriptionVersion.all_objects.annotate(
-            row_num=Window(
-                expression=RowNumber(),
-                partition_by=[F("issue_id")],
-                order_by=F("created_at").desc(),
-            )
-        )
-        .filter(row_num__gt=20)
-        .values("id")
-    )
-
-    return (
-        IssueDescriptionVersion.all_objects.filter(id__in=Subquery(subq))
-        .values(
-            "id",
-            "created_at",
-            "issue_id",
-            "workspace_id",
-            "project_id",
-            "created_by_id",
-            "updated_by_id",
-            "owned_by_id",
-            "last_saved_at",
-            "description_binary",
-            "description_html",
-            "description_stripped",
-            "description_json",
-            "deleted_at",
-        )
-        .iterator(chunk_size=BATCH_SIZE)
-    )
-
-
-# Celery tasks - now much simpler!
-@shared_task
-def delete_api_logs():
-    """Delete old API activity logs."""
-    process_cleanup_task(
-        queryset_func=get_api_logs_queryset,
-        transform_func=transform_api_log,
-        model=APIActivityLog,
-        task_name="API Activity Log",
-        collection_name="api_activity_logs",
-    )
-
-
-@shared_task
-def delete_email_notification_logs():
-    """Delete old email notification logs."""
-    process_cleanup_task(
-        queryset_func=get_email_logs_queryset,
-        transform_func=transform_email_log,
-        model=EmailNotificationLog,
-        task_name="Email Notification Log",
-        collection_name="email_notification_logs",
-    )
-
-
-@shared_task
-def delete_page_versions():
-    """Delete excess page versions."""
-    process_cleanup_task(
-        queryset_func=get_page_versions_queryset,
-        transform_func=transform_page_version,
-        model=PageVersion,
-        task_name="Page Version",
-        collection_name="page_versions",
-    )
-
-
-@shared_task
-def delete_issue_description_versions():
-    """Delete excess issue description versions."""
-    process_cleanup_task(
-        queryset_func=get_issue_description_versions_queryset,
-        transform_func=transform_issue_description_version,
-        model=IssueDescriptionVersion,
-        task_name="Issue Description Version",
-        collection_name="issue_description_versions",
-    )
@@ -50,21 +50,9 @@ app.conf.beat_schedule = {
        "schedule": crontab(hour=2, minute=0),  # UTC 02:00
    },
    "check-every-day-to-delete-api-logs": {
-        "task": "plane.bgtasks.cleanup_task.delete_api_logs",
+        "task": "plane.bgtasks.api_logs_task.delete_api_logs",
        "schedule": crontab(hour=2, minute=30),  # UTC 02:30
    },
-    "check-every-day-to-delete-email-notification-logs": {
-        "task": "plane.bgtasks.cleanup_task.delete_email_notification_logs",
-        "schedule": crontab(hour=3, minute=0),  # UTC 03:00
-    },
-    "check-every-day-to-delete-page-versions": {
-        "task": "plane.bgtasks.cleanup_task.delete_page_versions",
-        "schedule": crontab(hour=3, minute=30),  # UTC 03:30
-    },
-    "check-every-day-to-delete-issue-description-versions": {
-        "task": "plane.bgtasks.cleanup_task.delete_issue_description_versions",
-        "schedule": crontab(hour=4, minute=0),  # UTC 04:00
-    },
 }


@@ -284,7 +284,7 @@ CELERY_IMPORTS = (
    "plane.bgtasks.exporter_expired_task",
    "plane.bgtasks.file_asset_task",
    "plane.bgtasks.email_notification_task",
-    "plane.bgtasks.cleanup_task",
+    "plane.bgtasks.api_logs_task",
    "plane.license.bgtasks.tracer",
    # management tasks
    "plane.bgtasks.dummy_data_task",
@@ -73,10 +73,5 @@ LOGGING = {
            "handlers": ["console"],
            "propagate": False,
        },
-        "plane.mongo": {
-            "level": "INFO",
-            "handlers": ["console"],
-            "propagate": False,
-        },
    },
 }
@@ -1,121 +0,0 @@
-# Django imports
-from django.conf import settings
-import logging
-
-# Third party imports
-from pymongo import MongoClient
-from pymongo.database import Database
-from pymongo.collection import Collection
-from typing import Optional, TypeVar, Type
-
-
-T = TypeVar("T", bound="MongoConnection")
-
-# Set up logger
-logger = logging.getLogger("plane.mongo")
-
-
-class MongoConnection:
-    """
-    A singleton class that manages MongoDB connections.
-
-    This class ensures only one MongoDB connection is maintained throughout the application.
-    It provides methods to access the MongoDB client, database, and collections.
-
-    Attributes:
-        _instance (Optional[MongoConnection]): The singleton instance of this class
-        _client (Optional[MongoClient]): The MongoDB client instance
-        _db (Optional[Database]): The MongoDB database instance
-    """
-
-    _instance: Optional["MongoConnection"] = None
-    _client: Optional[MongoClient] = None
-    _db: Optional[Database] = None
-
-    def __new__(cls: Type[T]) -> T:
-        """
-        Creates a new instance of MongoConnection if one doesn't exist.
-
-        Returns:
-            MongoConnection: The singleton instance
-        """
-        if cls._instance is None:
-            cls._instance = super(MongoConnection, cls).__new__(cls)
-            try:
-                mongo_url = getattr(settings, "MONGO_DB_URL", None)
-                mongo_db_database = getattr(settings, "MONGO_DB_DATABASE", None)
-
-                if not mongo_url or not mongo_db_database:
-                    logger.warning(
-                        "MongoDB connection parameters not configured. MongoDB functionality will be disabled."
-                    )
-                    return cls._instance
-
-                cls._client = MongoClient(mongo_url)
-                cls._db = cls._client[mongo_db_database]
-
-                # Test the connection
-                cls._client.server_info()
-                logger.info("MongoDB connection established successfully")
-            except Exception as e:
-                logger.warning(
-                    f"Failed to initialize MongoDB connection: {str(e)}. MongoDB functionality will be disabled."
-                )
-        return cls._instance
-
-    @classmethod
-    def get_client(cls) -> Optional[MongoClient]:
-        """
-        Returns the MongoDB client instance.
-
-        Returns:
-            Optional[MongoClient]: The MongoDB client instance or None if not configured
-        """
-        if cls._client is None:
-            cls._instance = cls()
-        return cls._client
-
-    @classmethod
-    def get_db(cls) -> Optional[Database]:
-        """
-        Returns the MongoDB database instance.
-
-        Returns:
-            Optional[Database]: The MongoDB database instance or None if not configured
-        """
-        if cls._db is None:
-            cls._instance = cls()
-        return cls._db
-
-    @classmethod
-    def get_collection(cls, collection_name: str) -> Optional[Collection]:
-        """
-        Returns a MongoDB collection by name.
-
-        Args:
-            collection_name (str): The name of the collection to retrieve
-
-        Returns:
-            Optional[Collection]: The MongoDB collection instance or None if not configured
-        """
-        try:
-            db = cls.get_db()
-            if db is None:
-                logger.warning(
-                    f"Cannot access collection '{collection_name}': MongoDB not configured"
-                )
-                return None
-            return db[collection_name]
-        except Exception as e:
-            logger.warning(f"Failed to access collection '{collection_name}': {str(e)}")
-            return None
-
-    @classmethod
-    def is_configured(cls) -> bool:
-        """
-        Check if MongoDB is properly configured and connected.
-
-        Returns:
-            bool: True if MongoDB is configured and connected, False otherwise
-        """
-        return cls._client is not None and cls._db is not None
@@ -83,10 +83,5 @@ LOGGING = {
            "handlers": ["console"],
            "propagate": False,
        },
-        "plane.mongo": {
-            "level": "INFO",
-            "handlers": ["console"],
-            "propagate": False,
-        },
    },
 }
@@ -30,6 +30,7 @@ from plane.db.models import (
 )
 from plane.utils.content_validator import (
    validate_html_content,
+    validate_json_content,
    validate_binary_data,
 )

@@ -289,22 +290,20 @@ class IssueCreateSerializer(BaseSerializer):
            raise serializers.ValidationError("Start date cannot exceed target date")

        # Validate description content for security
-        if "description_html" in data and data["description_html"]:
-            is_valid, error_msg, sanitized_html = validate_html_content(
-                data["description_html"]
-            )
+        if "description" in data and data["description"]:
+            is_valid, error_msg = validate_json_content(data["description"])
            if not is_valid:
-                raise serializers.ValidationError(
-                    {"error": "html content is not valid"}
-                )
-            # Update the data with sanitized HTML if available
-            if sanitized_html is not None:
-                data["description_html"] = sanitized_html
+                raise serializers.ValidationError({"description": error_msg})
+
+        if "description_html" in data and data["description_html"]:
+            is_valid, error_msg = validate_html_content(data["description_html"])
+            if not is_valid:
+                raise serializers.ValidationError({"description_html": error_msg})

        if "description_binary" in data and data["description_binary"]:
            is_valid, error_msg = validate_binary_data(data["description_binary"])
            if not is_valid:
-                raise serializers.ValidationError({"description_binary": "Invalid binary data"})
+                raise serializers.ValidationError({"description_binary": error_msg})

        return data

@@ -0,0 +1,118 @@
+import pytest
+from rest_framework import serializers
+
+from plane.app.serializers.user import UserSerializer
+
+
+@pytest.mark.unit
+class TestUserSerializer:
+    """Test the UserSerializer"""
+
+    def test_validate_first_name_valid(self):
+        """Test that valid first names are accepted"""
+
+        serializer = UserSerializer()
+        valid_names = [
+            "John",
+            "John Doe",
+            "John-Doe",
+            "John_Doe",
+            "John123",
+        ]
+
+        for name in valid_names:
+            result = serializer.validate_first_name(name)
+
+            assert result == name
+
+    def test_validate_first_name_with_url(self):
+        """Test that first names containing URLs are rejected"""
+
+        serializer = UserSerializer()
+        invalid_names = [
+            "http://example.com",
+            "John https://test.com",
+            "www.test.com",
+        ]
+
+        for name in invalid_names:
+            with pytest.raises(serializers.ValidationError) as exc_info:
+                serializer.validate_first_name(name)
+
+            assert str(exc_info.value.detail[0]) == "First name cannot contain a URL."
+
+    def test_validate_first_name_with_special_chars(self):
+        """Test that first names with special characters are rejected"""
+
+        serializer = UserSerializer()
+        invalid_names = [
+            "John@Doe",
+            "John#Doe",
+            "John$Doe",
+            "John!Doe",
+            "John&Doe",
+        ]
+
+        for name in invalid_names:
+            with pytest.raises(serializers.ValidationError) as exc_info:
+                serializer.validate_first_name(name)
+
+            assert str(exc_info.value.detail[0]) == (
+                "first name can only contain letters, numbers, "
+                "hyphens (-), and underscores (_)"
+            )
+
+    def test_validate_last_name_valid(self):
+        """Test that valid last names are accepted"""
+
+        serializer = UserSerializer()
+        valid_names = [
+            "Smith",
+            "Smith Jr",
+            "Smith-Jr",
+            "Smith_Jr",
+            "Smith123",
+            "",
+        ]
+
+        for name in valid_names:
+            result = serializer.validate_last_name(name)
+
+            assert result == name
+
+    def test_validate_last_name_with_url(self):
+        """Test that last names containing URLs are rejected"""
+
+        serializer = UserSerializer()
+        invalid_names = [
+            "http://example.com",
+            "Smith https://test.com",
+            "www.test.com",
+        ]
+
+        for name in invalid_names:
+            with pytest.raises(serializers.ValidationError) as exc_info:
+                serializer.validate_last_name(name)
+
+            assert str(exc_info.value.detail[0]) == "Last name cannot contain a URL."
+
+    def test_validate_last_name_with_special_chars(self):
+        """Test that last names with special characters are rejected"""
+
+        serializer = UserSerializer()
+        invalid_names = [
+            "Smith@Jr",
+            "Smith#Jr",
+            "Smith$Jr",
+            "Smith!Jr",
+            "Smith&Jr",
+        ]
+
+        for name in invalid_names:
+            with pytest.raises(serializers.ValidationError) as exc_info:
+                serializer.validate_last_name(name)
+
+            assert str(exc_info.value.detail[0]) == (
+                "last name can only contain letters, numbers, "
+                "hyphens (-), and underscores (_)"
+            )
@@ -1,11 +1,36 @@
 # Python imports
 import base64
-import nh3
-from plane.utils.exception_logger import log_exception
+import json
+import re
+

 # Maximum allowed size for binary data (10MB)
 MAX_SIZE = 10 * 1024 * 1024

+# Maximum recursion depth to prevent stack overflow
+MAX_RECURSION_DEPTH = 20
+
+# Dangerous text patterns that could indicate XSS or script injection
+DANGEROUS_TEXT_PATTERNS = [
+    r"<script[^>]*>.*?</script>",
+    r"javascript\s*:",
+    r"data\s*:\s*text/html",
+    r"eval\s*\(",
+    r"document\s*\.",
+    r"window\s*\.",
+    r"location\s*\.",
+]
+
+# Dangerous attribute patterns for HTML attributes
+DANGEROUS_ATTR_PATTERNS = [
+    r"javascript\s*:",
+    r"data\s*:\s*text/html",
+    r"eval\s*\(",
+    r"alert\s*\(",
+    r"document\s*\.",
+    r"window\s*\.",
+]
+
 # Suspicious patterns for binary data content
 SUSPICIOUS_BINARY_PATTERNS = [
    "<html",
@@ -16,6 +41,70 @@ SUSPICIOUS_BINARY_PATTERNS = [
    "<iframe",
 ]

+# Malicious HTML patterns for content validation
+MALICIOUS_HTML_PATTERNS = [
+    # Script tags with any content
+    r"<script[^>]*>",
+    r"</script>",
+    # JavaScript URLs in various attributes
+    r'(?:href|src|action)\s*=\s*["\']?\s*javascript:',
+    # Data URLs with text/html (potential XSS)
+    r'(?:href|src|action)\s*=\s*["\']?\s*data:text/html',
+    # Dangerous event handlers with JavaScript-like content
+    r'on(?:load|error|click|focus|blur|change|submit|reset|select|resize|scroll|unload|beforeunload|hashchange|popstate|storage|message|offline|online)\s*=\s*["\']?[^"\']*(?:javascript|alert|eval|document\.|window\.|location\.|history\.)[^"\']*["\']?',
+    # Object and embed tags that could load external content
+    r"<(?:object|embed)[^>]*(?:data|src)\s*=",
+    # Base tag that could change relative URL resolution
+    r"<base[^>]*href\s*=",
+    # Dangerous iframe sources
+    r'<iframe[^>]*src\s*=\s*["\']?(?:javascript:|data:text/html)',
+    # Meta refresh redirects
+    r'<meta[^>]*http-equiv\s*=\s*["\']?refresh["\']?',
+    # Link tags - simplified patterns
+    r'<link[^>]*rel\s*=\s*["\']?stylesheet["\']?',
+    r'<link[^>]*href\s*=\s*["\']?https?://',
+    r'<link[^>]*href\s*=\s*["\']?//',
+    r'<link[^>]*href\s*=\s*["\']?(?:data:|javascript:)',
+    # Style tags with external imports
+    r"<style[^>]*>.*?@import.*?(?:https?://|//)",
+    # Link tags with dangerous rel types
+    r'<link[^>]*rel\s*=\s*["\']?(?:import|preload|prefetch|dns-prefetch|preconnect)["\']?',
+    # Forms with action attributes
+    r"<form[^>]*action\s*=",
+]
+
+# Dangerous JavaScript patterns for event handlers
+DANGEROUS_JS_PATTERNS = [
+    r"alert\s*\(",
+    r"eval\s*\(",
+    r"document\s*\.",
+    r"window\s*\.",
+    r"location\s*\.",
+    r"fetch\s*\(",
+    r"XMLHttpRequest",
+    r"innerHTML\s*=",
+    r"outerHTML\s*=",
+    r"document\.write",
+    r"script\s*>",
+]
+
+# HTML self-closing tags that don't need closing tags
+SELF_CLOSING_TAGS = {
+    "img",
+    "br",
+    "hr",
+    "input",
+    "meta",
+    "link",
+    "area",
+    "base",
+    "col",
+    "embed",
+    "source",
+    "track",
+    "wbr",
+}
+

 def validate_binary_data(data):
    """
@@ -60,21 +149,191 @@ def validate_binary_data(data):
    return True, None


-def validate_html_content(html_content: str):
+def validate_html_content(html_content):
    """
-    Sanitize HTML content using nh3.
-    Returns a tuple: (is_valid, error_message, clean_html)
+    Validate that HTML content is safe and doesn't contain malicious patterns.
+
+    Args:
+        html_content (str): The HTML content to validate
+
+    Returns:
+        tuple: (is_valid: bool, error_message: str or None)
    """
    if not html_content:
-        return True, None, None
+        return True, None  # Empty is OK

    # Size check - 10MB limit (consistent with binary validation)
    if len(html_content.encode("utf-8")) > MAX_SIZE:
-        return False, "HTML content exceeds maximum size limit (10MB)", None
+        return False, "HTML content exceeds maximum size limit (10MB)"
+
+    # Check for specific malicious patterns (simplified and more reliable)
+    for pattern in MALICIOUS_HTML_PATTERNS:
+        if re.search(pattern, html_content, re.IGNORECASE | re.DOTALL):
+            return (
+                False,
+                f"HTML content contains potentially malicious patterns: {pattern}",
+            )
+
+    # Additional check for inline event handlers that contain suspicious content
+    # This is more permissive - only blocks if the event handler contains actual dangerous code
+    event_handler_pattern = r'on\w+\s*=\s*["\']([^"\']*)["\']'
+    event_matches = re.findall(event_handler_pattern, html_content, re.IGNORECASE)
+
+    for handler_content in event_matches:
+        for js_pattern in DANGEROUS_JS_PATTERNS:
+            if re.search(js_pattern, handler_content, re.IGNORECASE):
+                return (
+                    False,
+                    f"HTML content contains dangerous JavaScript in event handler: {handler_content[:100]}",
+                )
+
+
+    return True, None
+
+
+def validate_json_content(json_content):
+    """
+    Validate that JSON content is safe and doesn't contain malicious patterns.
+
+    Args:
+        json_content (dict): The JSON content to validate
+
+    Returns:
+        tuple: (is_valid: bool, error_message: str or None)
+    """
+    if not json_content:
+        return True, None  # Empty is OK

    try:
-        clean_html = nh3.clean(html_content)
-        return True, None, clean_html
+        # Size check - 10MB limit (consistent with other validations)
+        json_str = json.dumps(json_content)
+        if len(json_str.encode("utf-8")) > MAX_SIZE:
+            return False, "JSON content exceeds maximum size limit (10MB)"
+
+        # Basic structure validation for page description JSON
+        if isinstance(json_content, dict):
+            # Check for expected page description structure
+            # This is based on ProseMirror/Tiptap JSON structure
+            if "type" in json_content and json_content.get("type") == "doc":
+                # Valid document structure
+                if "content" in json_content and isinstance(
+                    json_content["content"], list
+                ):
+                    # Recursively check content for suspicious patterns
+                    is_valid, error_msg = _validate_json_content_array(
+                        json_content["content"]
+                    )
+                    if not is_valid:
+                        return False, error_msg
+            elif "type" not in json_content and "content" not in json_content:
+                # Allow other JSON structures but validate for suspicious content
+                is_valid, error_msg = _validate_json_content_recursive(json_content)
+                if not is_valid:
+                    return False, error_msg
+        else:
+            return False, "JSON description must be a valid object"
+
+    except (TypeError, ValueError) as e:
+        return False, "Invalid JSON structure"
    except Exception as e:
-        log_exception(e)
-        return False, "Failed to sanitize HTML", None
+        return False, "Failed to validate JSON content"
+
+    return True, None
+
+
+def _validate_json_content_array(content, depth=0):
+    """
+    Validate JSON content array for suspicious patterns.
+
+    Args:
+        content (list): Array of content nodes to validate
+        depth (int): Current recursion depth (default: 0)
+
+    Returns:
+        tuple: (is_valid: bool, error_message: str or None)
+    """
+    # Check recursion depth to prevent stack overflow
+    if depth > MAX_RECURSION_DEPTH:
+        return False, f"Maximum recursion depth ({MAX_RECURSION_DEPTH}) exceeded"
+
+    if not isinstance(content, list):
+        return True, None
+
+    for node in content:
+        if isinstance(node, dict):
+            # Check text content for suspicious patterns (more targeted)
+            if node.get("type") == "text" and "text" in node:
+                text_content = node["text"]
+                for pattern in DANGEROUS_TEXT_PATTERNS:
+                    if re.search(pattern, text_content, re.IGNORECASE):
+                        return (
+                            False,
+                            "JSON content contains suspicious script patterns in text",
+                        )
+
+            # Check attributes for suspicious content (more targeted)
+            if "attrs" in node and isinstance(node["attrs"], dict):
+                for attr_name, attr_value in node["attrs"].items():
+                    if isinstance(attr_value, str):
+                        # Only check specific attributes that could be dangerous
+                        if attr_name.lower() in [
+                            "href",
+                            "src",
+                            "action",
+                            "onclick",
+                            "onload",
+                            "onerror",
+                        ]:
+                            for pattern in DANGEROUS_ATTR_PATTERNS:
+                                if re.search(pattern, attr_value, re.IGNORECASE):
+                                    return (
+                                        False,
+                                        f"JSON content contains dangerous pattern in {attr_name} attribute",
+                                    )
+
+            # Recursively check nested content
+            if "content" in node and isinstance(node["content"], list):
+                is_valid, error_msg = _validate_json_content_array(
+                    node["content"], depth + 1
+                )
+                if not is_valid:
+                    return False, error_msg
+
+    return True, None
+
+
+def _validate_json_content_recursive(obj, depth=0):
+    """
+    Recursively validate JSON object for suspicious content.
+
+    Args:
+        obj: JSON object (dict, list, or primitive) to validate
+        depth (int): Current recursion depth (default: 0)
+
+    Returns:
+        tuple: (is_valid: bool, error_message: str or None)
+    """
+    # Check recursion depth to prevent stack overflow
+    if depth > MAX_RECURSION_DEPTH:
+        return False, f"Maximum recursion depth ({MAX_RECURSION_DEPTH}) exceeded"
+    if isinstance(obj, dict):
+        for key, value in obj.items():
+            if isinstance(value, str):
+                # Check for dangerous patterns using module constants
+                for pattern in DANGEROUS_TEXT_PATTERNS:
+                    if re.search(pattern, value, re.IGNORECASE):
+                        return (
+                            False,
+                            "JSON content contains suspicious script patterns",
+                        )
+            elif isinstance(value, (dict, list)):
+                is_valid, error_msg = _validate_json_content_recursive(value, depth + 1)
+                if not is_valid:
+                    return False, error_msg
+    elif isinstance(obj, list):
+        for item in obj:
+            is_valid, error_msg = _validate_json_content_recursive(item, depth + 1)
+            if not is_valid:
+                return False, error_msg
+
+    return True, None
@@ -9,8 +9,6 @@ psycopg==3.1.18
 psycopg-binary==3.1.18
 psycopg-c==3.1.18
 dj-database-url==2.1.0
-# mongo
-pymongo==4.6.3
 # redis
 redis==5.0.4
 django-redis==5.4.0
@@ -68,6 +66,4 @@ opentelemetry-sdk==1.28.1
 opentelemetry-instrumentation-django==0.49b1
 opentelemetry-exporter-otlp==1.28.1
 # OpenAPI Specification
-drf-spectacular==0.28.0
-# html sanitizer
-nh3==0.2.18
+drf-spectacular==0.28.0
@@ -14,7 +14,6 @@ export abstract class APIService {
    this.axiosInstance = axios.create({
      baseURL,
      withCredentials: true,
-      timeout: 20000,
    });
  }

@@ -0,0 +1,19 @@
+FROM node:22-alpine
+
+RUN apk add --no-cache libc6-compat
+
+# Set working directory
+WORKDIR /app
+
+COPY . .
+
+RUN corepack enable pnpm && pnpm add -g turbo
+RUN pnpm install
+
+EXPOSE 3002
+
+ENV NEXT_PUBLIC_SPACE_BASE_PATH="/spaces"
+
+VOLUME [ "/app/node_modules", "/app/apps/space/node_modules"]
+
+CMD ["pnpm", "dev", "--filter=space"]
@@ -0,0 +1,103 @@
+# syntax=docker/dockerfile:1.7
+FROM node:22-alpine AS base
+
+# Setup pnpm package manager with corepack and configure global bin directory for caching
+ENV PNPM_HOME="/pnpm"
+ENV PATH="$PNPM_HOME:$PATH"
+RUN corepack enable
+
+# *****************************************************************************
+# STAGE 1: Build the project
+# *****************************************************************************
+FROM base AS builder
+RUN apk add --no-cache libc6-compat
+WORKDIR /app
+
+ARG TURBO_VERSION=2.5.6
+RUN corepack enable pnpm && pnpm add -g turbo@${TURBO_VERSION}
+COPY . .
+
+RUN turbo prune --scope=space --docker
+
+# *****************************************************************************
+# STAGE 2: Install dependencies & build the project
+# *****************************************************************************
+FROM base AS installer
+
+RUN apk add --no-cache libc6-compat
+WORKDIR /app
+
+COPY .gitignore .gitignore
+COPY --from=builder /app/out/json/ .
+COPY --from=builder /app/out/pnpm-lock.yaml ./pnpm-lock.yaml
+RUN corepack enable pnpm
+RUN --mount=type=cache,id=pnpm-store,target=/pnpm/store pnpm fetch --store-dir=/pnpm/store
+
+COPY --from=builder /app/out/full/ .
+COPY turbo.json turbo.json
+RUN --mount=type=cache,id=pnpm-store,target=/pnpm/store pnpm install --offline --frozen-lockfile --store-dir=/pnpm/store
+
+ARG NEXT_PUBLIC_API_BASE_URL=""
+ENV NEXT_PUBLIC_API_BASE_URL=$NEXT_PUBLIC_API_BASE_URL
+
+ARG NEXT_PUBLIC_ADMIN_BASE_URL=""
+ENV NEXT_PUBLIC_ADMIN_BASE_URL=$NEXT_PUBLIC_ADMIN_BASE_URL
+
+ARG NEXT_PUBLIC_ADMIN_BASE_PATH="/god-mode"
+ENV NEXT_PUBLIC_ADMIN_BASE_PATH=$NEXT_PUBLIC_ADMIN_BASE_PATH
+
+ARG NEXT_PUBLIC_SPACE_BASE_URL=""
+ENV NEXT_PUBLIC_SPACE_BASE_URL=$NEXT_PUBLIC_SPACE_BASE_URL
+
+ARG NEXT_PUBLIC_SPACE_BASE_PATH="/spaces"
+ENV NEXT_PUBLIC_SPACE_BASE_PATH=$NEXT_PUBLIC_SPACE_BASE_PATH
+
+ARG NEXT_PUBLIC_WEB_BASE_URL=""
+ENV NEXT_PUBLIC_WEB_BASE_URL=$NEXT_PUBLIC_WEB_BASE_URL
+
+ENV NEXT_TELEMETRY_DISABLED=1
+ENV TURBO_TELEMETRY_DISABLED=1
+
+RUN pnpm turbo run build --filter=space
+
+# *****************************************************************************
+# STAGE 3: Copy the project and start it
+# *****************************************************************************
+FROM base AS runner
+WORKDIR /app
+
+# Don't run production as root
+RUN addgroup --system --gid 1001 nodejs
+RUN adduser --system --uid 1001 nextjs
+USER nextjs
+
+# Automatically leverage output traces to reduce image size
+# https://nextjs.org/docs/advanced-features/output-file-tracing
+COPY --from=installer /app/apps/space/.next/standalone ./
+COPY --from=installer /app/apps/space/.next/static ./apps/space/.next/static
+COPY --from=installer /app/apps/space/public ./apps/space/public
+
+ARG NEXT_PUBLIC_API_BASE_URL=""
+ENV NEXT_PUBLIC_API_BASE_URL=$NEXT_PUBLIC_API_BASE_URL
+
+ARG NEXT_PUBLIC_ADMIN_BASE_URL=""
+ENV NEXT_PUBLIC_ADMIN_BASE_URL=$NEXT_PUBLIC_ADMIN_BASE_URL
+
+ARG NEXT_PUBLIC_ADMIN_BASE_PATH="/god-mode"
+ENV NEXT_PUBLIC_ADMIN_BASE_PATH=$NEXT_PUBLIC_ADMIN_BASE_PATH
+
+ARG NEXT_PUBLIC_SPACE_BASE_URL=""
+ENV NEXT_PUBLIC_SPACE_BASE_URL=$NEXT_PUBLIC_SPACE_BASE_URL
+
+ARG NEXT_PUBLIC_SPACE_BASE_PATH="/spaces"
+ENV NEXT_PUBLIC_SPACE_BASE_PATH=$NEXT_PUBLIC_SPACE_BASE_PATH
+
+ARG NEXT_PUBLIC_WEB_BASE_URL=""
+ENV NEXT_PUBLIC_WEB_BASE_URL=$NEXT_PUBLIC_WEB_BASE_URL
+
+ENV NEXT_TELEMETRY_DISABLED=1
+ENV TURBO_TELEMETRY_DISABLED=1
+
+EXPOSE 3000
+
+CMD ["node", "apps/space/server.js"]
@@ -71,7 +71,7 @@ export const isCommentEmpty = (comment: string | undefined): boolean => {
  return (
    comment?.trim() === "" ||
    comment === "<p></p>" ||
-    isEmptyHtmlString(comment ?? "", ["img", "mention-component", "image-component", "embed-component"])
+    isEmptyHtmlString(comment ?? "", ["img", "mention-component", "image-component"])
  );
 };

@@ -0,0 +1,13 @@
+FROM node:22-alpine
+
+RUN apk add --no-cache libc6-compat
+# Set working directory
+WORKDIR /app
+
+COPY . .
+RUN corepack enable pnpm && pnpm add -g turbo
+RUN pnpm install
+
+EXPOSE 3000
+VOLUME [ "/app/node_modules", "/app/web/node_modules" ]
+CMD ["pnpm", "dev", "--filter=web"]
@@ -0,0 +1,120 @@
+# syntax=docker/dockerfile:1.7
+FROM node:22-alpine AS base
+
+# Setup pnpm package manager with corepack and configure global bin directory for caching
+ENV PNPM_HOME="/pnpm"
+ENV PATH="$PNPM_HOME:$PATH"
+RUN corepack enable
+
+# *****************************************************************************
+# STAGE 1: Build the project
+# *****************************************************************************
+FROM base AS builder
+RUN apk add --no-cache libc6-compat
+# Set working directory
+WORKDIR /app
+
+ARG TURBO_VERSION=2.5.6
+RUN corepack enable pnpm && pnpm add -g turbo@${TURBO_VERSION}
+COPY . .
+
+RUN turbo prune --scope=web --docker
+
+# *****************************************************************************
+# STAGE 2: Install dependencies & build the project
+# *****************************************************************************
+# Add lockfile and package.json's of isolated subworkspace
+FROM base AS installer
+
+RUN apk add --no-cache libc6-compat
+WORKDIR /app
+
+# First install the dependencies (as they change less often)
+COPY .gitignore .gitignore
+COPY --from=builder /app/out/json/ .
+COPY --from=builder /app/out/pnpm-lock.yaml ./pnpm-lock.yaml
+RUN corepack enable pnpm
+RUN --mount=type=cache,id=pnpm-store,target=/pnpm/store pnpm fetch --store-dir=/pnpm/store
+
+# Build the project
+COPY --from=builder /app/out/full/ .
+COPY turbo.json turbo.json
+RUN --mount=type=cache,id=pnpm-store,target=/pnpm/store pnpm install --offline --frozen-lockfile --store-dir=/pnpm/store
+
+ARG NEXT_PUBLIC_API_BASE_URL=""
+ENV NEXT_PUBLIC_API_BASE_URL=$NEXT_PUBLIC_API_BASE_URL
+
+ARG NEXT_PUBLIC_ADMIN_BASE_URL=""
+ENV NEXT_PUBLIC_ADMIN_BASE_URL=$NEXT_PUBLIC_ADMIN_BASE_URL
+
+ARG NEXT_PUBLIC_ADMIN_BASE_PATH="/god-mode"
+ENV NEXT_PUBLIC_ADMIN_BASE_PATH=$NEXT_PUBLIC_ADMIN_BASE_PATH
+
+ARG NEXT_PUBLIC_LIVE_BASE_URL=""
+ENV NEXT_PUBLIC_LIVE_BASE_URL=$NEXT_PUBLIC_LIVE_BASE_URL
+
+ARG NEXT_PUBLIC_LIVE_BASE_PATH="/live"
+ENV NEXT_PUBLIC_LIVE_BASE_PATH=$NEXT_PUBLIC_LIVE_BASE_PATH
+
+ARG NEXT_PUBLIC_SPACE_BASE_URL=""
+ENV NEXT_PUBLIC_SPACE_BASE_URL=$NEXT_PUBLIC_SPACE_BASE_URL
+
+ARG NEXT_PUBLIC_SPACE_BASE_PATH="/spaces"
+ENV NEXT_PUBLIC_SPACE_BASE_PATH=$NEXT_PUBLIC_SPACE_BASE_PATH
+
+ARG NEXT_PUBLIC_WEB_BASE_URL=""
+ENV NEXT_PUBLIC_WEB_BASE_URL=$NEXT_PUBLIC_WEB_BASE_URL
+
+ENV NEXT_TELEMETRY_DISABLED=1
+ENV TURBO_TELEMETRY_DISABLED=1
+
+RUN pnpm turbo run build --filter=web
+
+# *****************************************************************************
+# STAGE 3: Copy the project and start it
+# *****************************************************************************
+FROM base AS runner
+WORKDIR /app
+
+# Don't run production as root
+RUN addgroup --system --gid 1001 nodejs
+RUN adduser --system --uid 1001 nextjs
+USER nextjs
+
+
+# Automatically leverage output traces to reduce image size
+# https://nextjs.org/docs/advanced-features/output-file-tracing
+COPY --from=installer /app/apps/web/.next/standalone ./
+COPY --from=installer /app/apps/web/.next/static ./apps/web/.next/static
+COPY --from=installer /app/apps/web/public ./apps/web/public
+
+ARG NEXT_PUBLIC_API_BASE_URL=""
+ENV NEXT_PUBLIC_API_BASE_URL=$NEXT_PUBLIC_API_BASE_URL
+
+ARG NEXT_PUBLIC_ADMIN_BASE_URL=""
+ENV NEXT_PUBLIC_ADMIN_BASE_URL=$NEXT_PUBLIC_ADMIN_BASE_URL
+
+ARG NEXT_PUBLIC_ADMIN_BASE_PATH="/god-mode"
+ENV NEXT_PUBLIC_ADMIN_BASE_PATH=$NEXT_PUBLIC_ADMIN_BASE_PATH
+
+ARG NEXT_PUBLIC_LIVE_BASE_URL=""
+ENV NEXT_PUBLIC_LIVE_BASE_URL=$NEXT_PUBLIC_LIVE_BASE_URL
+
+ARG NEXT_PUBLIC_LIVE_BASE_PATH="/live"
+ENV NEXT_PUBLIC_LIVE_BASE_PATH=$NEXT_PUBLIC_LIVE_BASE_PATH
+
+ARG NEXT_PUBLIC_SPACE_BASE_URL=""
+ENV NEXT_PUBLIC_SPACE_BASE_URL=$NEXT_PUBLIC_SPACE_BASE_URL
+
+ARG NEXT_PUBLIC_SPACE_BASE_PATH="/spaces"
+ENV NEXT_PUBLIC_SPACE_BASE_PATH=$NEXT_PUBLIC_SPACE_BASE_PATH
+
+ARG NEXT_PUBLIC_WEB_BASE_URL=""
+ENV NEXT_PUBLIC_WEB_BASE_URL=$NEXT_PUBLIC_WEB_BASE_URL
+
+ENV NEXT_TELEMETRY_DISABLED=1
+ENV TURBO_TELEMETRY_DISABLED=1
+
+EXPOSE 3000
+
+CMD ["node", "apps/web/server.js"]
@@ -78,12 +78,6 @@ const IssueDetailsPage = observer(() => {
    return () => window.removeEventListener("resize", handleToggleIssueDetailSidebar);
  }, [issueDetailSidebarCollapsed, toggleIssueDetailSidebar]);

-  useEffect(() => {
-    if (data?.is_intake) {
-      router.push(`/${workspaceSlug}/projects/${data.project_id}/intake/?currentTab=open&inboxIssueId=${data?.id}`);
-    }
-  }, [workspaceSlug, data]);
-
  return (
    <>
      <PageHead title={pageTitle} />
@@ -3,7 +3,7 @@
 // components
 import { AppHeader } from "@/components/core/app-header";
 import { ContentWrapper } from "@/components/core/content-wrapper";
-import { ProjectInboxHeader } from "@/plane-web/components/projects/settings/intake/header";
+import { ProjectInboxHeader } from "@/plane-web/components/projects/settings/intake";

 export default function ProjectInboxIssuesLayout({ children }: { children: React.ReactNode }) {
  return (
@@ -2,7 +2,7 @@

 import { useEffect } from "react";
 import { observer } from "mobx-react";
-import { useParams } from "next/navigation";
+import { redirect, useParams } from "next/navigation";
 import { useTheme } from "next-themes";
 import useSWR from "swr";
 import { useTranslation } from "@plane/i18n";
@@ -34,7 +34,7 @@ const IssueDetailsPage = observer(() => {

  useEffect(() => {
    if (data) {
-      router.push(`/${workspaceSlug}/browse/${data.project_identifier}-${data.sequence_id}`);
+      redirect(`/${workspaceSlug}/browse/${data.project_identifier}-${data.sequence_id}`);
    }
  }, [workspaceSlug, data]);

@@ -16,7 +16,7 @@ import { SettingsHeading } from "@/components/settings/heading";
 import { useProject } from "@/hooks/store/use-project";
 import { useUserPermissions } from "@/hooks/store/user";
 // plane web imports
-import { ProjectTeamspaceList } from "@/plane-web/components/projects/teamspaces/teamspace-list";
+import { ProjectTeamspaceList } from "@/plane-web/components/projects/teamspaces";
 import { getProjectSettingsPageLabelI18nKey } from "@/plane-web/helpers/project-settings";

 const MembersSettingsPage = observer(() => {
@@ -12,7 +12,7 @@ import type { TNavigationItem } from "@/components/workspace/sidebar/project-nav
 import { useProject } from "@/hooks/store/use-project";
 import { useAppRouter } from "@/hooks/use-app-router";
 // local imports
-import { getProjectFeatureNavigation } from "../projects/navigation/helper";
+import { getProjectFeatureNavigation } from "../projects/navigation";

 type TProjectFeatureBreadcrumbProps = {
  workspaceSlug: string;
@@ -0,0 +1,2 @@
+export * from "./subscription";
+export * from "./extended-app-header";
@@ -0,0 +1 @@
+export * from "./subscription-pill";
@@ -0,0 +1,4 @@
+export * from "./de-dupe-button";
+export * from "./duplicate-modal";
+export * from "./duplicate-popover";
+export * from "./issue-block";
@@ -0,0 +1 @@
+export * from "./button-label";
@@ -0,0 +1 @@
+export * from "./epic-modal";
@@ -0,0 +1 @@
+export * from "./helper";
@@ -0,0 +1 @@
+export * from "./header";
@@ -0,0 +1 @@
+export * from "./teamspace-list";
@@ -16,11 +16,10 @@ type Props = {
  params: IAnalyticsParams;
  workspaceSlug: string;
  classNames?: string;
-  isEpic?: boolean;
 };

 export const AnalyticsSelectParams: React.FC<Props> = observer((props) => {
-  const { control, params, classNames, isEpic } = props;
+  const { control, params, classNames } = props;
  const xAxisOptions = useMemo(
    () => ANALYTICS_X_AXIS_VALUES.filter((option) => option.value !== params.group_by),
    [params.group_by]
@@ -43,10 +42,7 @@ export const AnalyticsSelectParams: React.FC<Props> = observer((props) => {
                onChange(val);
              }}
              options={ANALYTICS_Y_AXIS_VALUES}
-              hiddenOptions={[
-                ChartYAxisMetric.ESTIMATE_POINT_COUNT,
-                isEpic ? ChartYAxisMetric.WORK_ITEM_COUNT : ChartYAxisMetric.EPIC_WORK_ITEM_COUNT,
-              ]}
+              hiddenOptions={[ChartYAxisMetric.ESTIMATE_POINT_COUNT]}
            />
          )}
        />
@@ -10,13 +10,17 @@ import AnalyticsSectionWrapper from "../analytics-section-wrapper";
 import { AnalyticsSelectParams } from "../select/analytics-params";
 import PriorityChart from "./priority-chart";

-const CustomizedInsights = observer(({ peekView, isEpic }: { peekView?: boolean; isEpic?: boolean }) => {
+const defaultValues: IAnalyticsParams = {
+  x_axis: ChartXAxisProperty.PRIORITY,
+  y_axis: ChartYAxisMetric.WORK_ITEM_COUNT,
+};
+
+const CustomizedInsights = observer(({ peekView }: { peekView?: boolean }) => {
  const { t } = useTranslation();
  const { workspaceSlug } = useParams();
  const { control, watch, setValue } = useForm<IAnalyticsParams>({
    defaultValues: {
-      x_axis: ChartXAxisProperty.PRIORITY,
-      y_axis: isEpic ? ChartYAxisMetric.EPIC_WORK_ITEM_COUNT : ChartYAxisMetric.WORK_ITEM_COUNT,
+      ...defaultValues,
    },
  });

@@ -37,7 +41,6 @@ const CustomizedInsights = observer(({ peekView, isEpic }: { peekView?: boolean;
          setValue={setValue}
          params={params}
          workspaceSlug={workspaceSlug.toString()}
-          isEpic={isEpic}
        />
      }
    >
@@ -17,11 +17,10 @@ type Props = {
  projectDetails: IProject | undefined;
  cycleDetails: ICycle | undefined;
  moduleDetails: IModule | undefined;
-  isEpic?: boolean;
 };

 export const WorkItemsModalMainContent: React.FC<Props> = observer((props) => {
-  const { projectDetails, cycleDetails, moduleDetails, fullScreen, isEpic } = props;
+  const { projectDetails, cycleDetails, moduleDetails, fullScreen } = props;
  const { updateSelectedProjects, updateSelectedCycle, updateSelectedModule, updateIsPeekView } = useAnalytics();
  const [isModalConfigured, setIsModalConfigured] = useState(false);

@@ -73,7 +72,7 @@ export const WorkItemsModalMainContent: React.FC<Props> = observer((props) => {
      <div className="flex flex-col gap-14 overflow-y-auto p-6">
        <TotalInsights analyticsType="work-items" peekView={!fullScreen} />
        <CreatedVsResolved />
-        <CustomizedInsights peekView={!fullScreen} isEpic={isEpic} />
+        <CustomizedInsights peekView={!fullScreen} />
        <WorkItemsInsightTable />
      </div>
    </Tab.Group>
@@ -20,7 +20,7 @@ type Props = {

 export const WorkItemsModal: React.FC<Props> = observer((props) => {
  const { isOpen, onClose, projectDetails, moduleDetails, cycleDetails, isEpic } = props;
-  const { updateIsEpic, isPeekView } = useAnalytics();
+  const { updateIsEpic } = useAnalytics();
  const [fullScreen, setFullScreen] = useState(false);

  const handleClose = () => {
@@ -29,18 +29,18 @@ export const WorkItemsModal: React.FC<Props> = observer((props) => {
  };

  useEffect(() => {
-    updateIsEpic(isPeekView ? (isEpic ?? false) : false);
-  }, [isEpic, updateIsEpic, isPeekView]);
+    updateIsEpic(isEpic ?? false);
+  }, [isEpic, updateIsEpic]);

  const portalContainer = document.getElementById("full-screen-portal") as HTMLElement;

  if (!isOpen) return null;

  const content = (
-    <div className={cn("z-[25] h-full w-full overflow-y-auto absolute")}>
+    <div className={cn("inset-0 z-[25] h-full w-full overflow-y-auto", fullScreen ? "absolute" : "fixed")}>
      <div
-        className={`top-0 right-0 z-[25] h-full bg-custom-background-100 shadow-custom-shadow-md absolute ${
-          fullScreen ? "w-full p-2" : "w-1/2"
+        className={`right-0 top-0 z-20 h-full bg-custom-background-100 shadow-custom-shadow-md ${
+          fullScreen ? "w-full p-2 absolute" : "w-full sm:w-full md:w-1/2 fixed"
        }`}
      >
        <div
@@ -61,12 +61,11 @@ export const WorkItemsModal: React.FC<Props> = observer((props) => {
            projectDetails={projectDetails}
            cycleDetails={cycleDetails}
            moduleDetails={moduleDetails}
-            isEpic={isEpic}
          />
        </div>
      </div>
    </div>
  );

-  return portalContainer ? createPortal(content, portalContainer) : content;
+  return fullScreen && portalContainer ? createPortal(content, portalContainer) : content;
 });
@@ -5,7 +5,7 @@ import { observer } from "mobx-react";
 // plane imports
 import { Row } from "@plane/ui";
 // components
-import { ExtendedAppHeader } from "@/plane-web/components/common/extended-app-header";
+import { ExtendedAppHeader } from "@/plane-web/components/common";

 export interface AppHeaderProps {
  header: ReactNode;
@@ -1,7 +1,6 @@
 "use client";

 import React, { useEffect, useState } from "react";
-import { filter } from "lodash";
 import { Rocket, Search, X } from "lucide-react";
 import { Combobox, Dialog, Transition } from "@headlessui/react";
 // i18n
@@ -21,6 +20,7 @@ import { IssueIdentifier } from "@/plane-web/components/issues/issue-details/iss
 import { ProjectService } from "@/services/project";
 // components
 import { IssueSearchModalEmptyState } from "./issue-search-modal-empty-state";
+import { filter } from "lodash";

 type Props = {
  workspaceSlug: string | undefined;
@@ -1,6 +1,6 @@
 "use client";
+
 import { FC, MouseEvent, useRef } from "react";
-import isEmpty from "lodash/isEmpty";
 import { observer } from "mobx-react";
 import { usePathname, useSearchParams } from "next/navigation";
 import { Check } from "lucide-react";
@@ -53,6 +53,11 @@ export const CyclesListItem: FC<TCyclesListItem> = observer((props) => {
  const isCompleted = cycleStatus === "completed";
  const isActive = cycleStatus === "current";

+  const completionPercentage =
+    ((cycleDetails.completed_issues + cycleDetails.cancelled_issues) / cycleDetails.total_issues) * 100;
+
+  const progress = isNaN(completionPercentage) ? 0 : Math.floor(completionPercentage);
+
  // handlers
  const openCycleOverview = (e: MouseEvent<HTMLButtonElement | HTMLAnchorElement>) => {
    e.preventDefault();
@@ -73,21 +78,6 @@ export const CyclesListItem: FC<TCyclesListItem> = observer((props) => {

  const handleItemClick = cycleDetails.archived_at ? handleArchivedCycleClick : undefined;

-  const getCycleProgress = () => {
-    let completionPercentage =
-      ((cycleDetails.completed_issues + cycleDetails.cancelled_issues) / cycleDetails.total_issues) * 100;
-
-    if (isCompleted && !isEmpty(cycleDetails.progress_snapshot)) {
-      completionPercentage =
-        ((cycleDetails.progress_snapshot.completed_issues + cycleDetails.progress_snapshot.cancelled_issues) /
-          cycleDetails.progress_snapshot.total_issues) *
-        100;
-    }
-    return isNaN(completionPercentage) ? 0 : Math.floor(completionPercentage);
-  };
-
-  const progress = getCycleProgress();
-
  return (
    <ListItem
      title={cycleDetails?.name ?? ""}
@@ -1,7 +1,6 @@
 import React, { useState } from "react";
-// plane constants
-import { EIssueCommentAccessSpecifier } from "@plane/constants";
 // plane imports
+import { EIssueCommentAccessSpecifier } from "@plane/constants";
 import { type EditorRefApi, type ILiteTextEditorProps, LiteTextEditorWithRef, type TFileHandler } from "@plane/editor";
 import { useTranslation } from "@plane/i18n";
 import type { MakeOptional } from "@plane/types";
@@ -88,6 +87,7 @@ export const LiteTextEditor = React.forwardRef<EditorRefApi, LiteTextEditorWrapp
  // derived values
  const isEmpty = isCommentEmpty(props.initialValue);
  const editorRef = isMutableRefObject<EditorRefApi>(ref) ? ref.current : null;
+
  return (
    <div
      className={cn(
@@ -59,6 +59,7 @@ export const StickyEditor = React.forwardRef<EditorRefApi, StickyEditorWrapperPr
  }
  // derived values
  const editorRef = isMutableRefObject<EditorRefApi>(ref) ? ref.current : null;
+
  return (
    <div
      className={cn("relative border border-custom-border-200 rounded", parentClassName)}
@@ -104,6 +104,8 @@ export const InboxIssueActionsHeader: FC<TInboxIssueActionsHeader> = observer((p

  const currentInboxIssueId = inboxIssue?.issue?.id;

+  const intakeIssueLink = `${workspaceSlug}/projects/${issue?.project_id}/intake/?currentTab=${currentTab}&inboxIssueId=${currentInboxIssueId}`;
+
  const redirectIssue = (): string | undefined => {
    let nextOrPreviousIssueId: string | undefined = undefined;
    const currentIssueIndex = filteredInboxIssueIds.findIndex((id) => id === currentInboxIssueId);
@@ -411,7 +413,7 @@ export const InboxIssueActionsHeader: FC<TInboxIssueActionsHeader> = observer((p
                        </div>
                      </CustomMenu.MenuItem>
                    )}
-                    <CustomMenu.MenuItem onClick={() => handleCopyIssueLink(workItemLink)}>
+                    <CustomMenu.MenuItem onClick={() => handleCopyIssueLink(intakeIssueLink)}>
                      <div className="flex items-center gap-2">
                        <Copy size={14} strokeWidth={2} />
                        {t("inbox_issue.actions.copy")}
@@ -26,7 +26,7 @@ import { useProjectInbox } from "@/hooks/store/use-project-inbox";
 import { useUser } from "@/hooks/store/user";
 import useReloadConfirmations from "@/hooks/use-reload-confirmation";
 // store types
-import { DeDupeIssuePopoverRoot } from "@/plane-web/components/de-dupe/duplicate-popover";
+import { DeDupeIssuePopoverRoot } from "@/plane-web/components/de-dupe";
 import { useDebouncedDuplicateIssues } from "@/plane-web/hooks/use-debounced-duplicate-issues";
 // services
 import { IntakeWorkItemVersionService } from "@/services/inbox";
@@ -19,8 +19,7 @@ import { useAppRouter } from "@/hooks/use-app-router";
 import useKeypress from "@/hooks/use-keypress";
 import { usePlatformOS } from "@/hooks/use-platform-os";
 // plane web imports
-import { DeDupeButtonRoot } from "@/plane-web/components/de-dupe/de-dupe-button";
-import { DuplicateModalRoot } from "@/plane-web/components/de-dupe/duplicate-modal";
+import { DeDupeButtonRoot, DuplicateModalRoot } from "@/plane-web/components/de-dupe";
 import { useDebouncedDuplicateIssues } from "@/plane-web/hooks/use-debounced-duplicate-issues";
 // services
 import { FileService } from "@/services/file.service";
@@ -10,7 +10,7 @@ import { CreateUpdateIssueModal } from "@/components/issues/issue-modal/modal";
 // hooks
 import { useIssueDetail } from "@/hooks/store/use-issue-detail";
 // Plane-web
-import { CreateUpdateEpicModal } from "@/plane-web/components/epics/epic-modal";
+import { CreateUpdateEpicModal } from "@/plane-web/components/epics";
 import { useTimeLineRelationOptions } from "@/plane-web/components/relations";
 import { TIssueRelationTypes } from "@/plane-web/types";
 // helper
@@ -16,7 +16,7 @@ import { useUser } from "@/hooks/store/user";
 import useReloadConfirmations from "@/hooks/use-reload-confirmation";
 import useSize from "@/hooks/use-window-size";
 // plane web components
-import { DeDupeIssuePopoverRoot } from "@/plane-web/components/de-dupe/duplicate-popover";
+import { DeDupeIssuePopoverRoot } from "@/plane-web/components/de-dupe";
 import { IssueTypeSwitcher } from "@/plane-web/components/issues/issue-details/issue-type-switcher";
 import { useDebouncedDuplicateIssues } from "@/plane-web/hooks/use-debounced-duplicate-issues";
 // services
@@ -71,8 +71,7 @@ export const isWorkspaceLevel = (type: EIssuesStoreType) =>
    EIssuesStoreType.GLOBAL,
    EIssuesStoreType.TEAM,
    EIssuesStoreType.TEAM_VIEW,
-    EIssuesStoreType.TEAM_PROJECT_WORK_ITEMS,
-    EIssuesStoreType.WORKSPACE_DRAFT,
+    EIssuesStoreType.PROJECT_VIEW,
  ].includes(type)
    ? true
    : false;
@@ -40,8 +40,7 @@ import { useWorkspaceDraftIssues } from "@/hooks/store/workspace-draft";
 import { usePlatformOS } from "@/hooks/use-platform-os";
 import { useProjectIssueProperties } from "@/hooks/use-project-issue-properties";
 // plane web imports
-import { DeDupeButtonRoot } from "@/plane-web/components/de-dupe/de-dupe-button";
-import { DuplicateModalRoot } from "@/plane-web/components/de-dupe/duplicate-modal";
+import { DeDupeButtonRoot, DuplicateModalRoot } from "@/plane-web/components/de-dupe";
 import { IssueTypeSelect, WorkItemTemplateSelect } from "@/plane-web/components/issues/issue-modal";
 import { WorkItemModalAdditionalProperties } from "@/plane-web/components/issues/issue-modal/modal-additional-properties";
 import { useDebouncedDuplicateIssues } from "@/plane-web/hooks/use-debounced-duplicate-issues";
@@ -14,7 +14,7 @@ import { useProject } from "@/hooks/store/use-project";
 import { useUser } from "@/hooks/store/user";
 import useReloadConfirmations from "@/hooks/use-reload-confirmation";
 // plane web components
-import { DeDupeIssuePopoverRoot } from "@/plane-web/components/de-dupe/duplicate-popover";
+import { DeDupeIssuePopoverRoot } from "@/plane-web/components/de-dupe";
 import { IssueTypeSwitcher } from "@/plane-web/components/issues/issue-details/issue-type-switcher";
 // plane web hooks
 import { useDebouncedDuplicateIssues } from "@/plane-web/hooks/use-debounced-duplicate-issues";
@@ -110,16 +110,16 @@ export const IssueView: FC<IIssueView> = observer((props) => {

  const peekOverviewIssueClassName = cn(
    !embedIssue
-      ? "absolute z-[25] flex flex-col overflow-hidden rounded border border-custom-border-200 bg-custom-background-100 transition-all duration-300"
+      ? "fixed z-[25] flex flex-col overflow-hidden rounded border border-custom-border-200 bg-custom-background-100 transition-all duration-300"
      : `w-full h-full`,
    !embedIssue && {
-      "top-0 bottom-0 right-0 w-full md:w-[50%] border-0 border-l": peekMode === "side-peek",
+      "top-2 bottom-2 right-2 w-full md:w-[50%] border-0 border-l": peekMode === "side-peek",
      "size-5/6 top-[8.33%] left-[8.33%]": peekMode === "modal",
      "inset-0 m-4 absolute": peekMode === "full-screen",
    }
  );

-  const shouldUsePortal = !embedIssue;
+  const shouldUsePortal = !embedIssue && peekMode === "full-screen";

  const portalContainer = document.getElementById("full-screen-portal") as HTMLElement;

@@ -213,6 +213,11 @@ export const ProfileSetupStep: FC<Props> = observer(({ handleStepChange }) => {
                value: 24,
                message: "Name must be within 24 characters.",
              },
+              validate: (value) => {
+                if (!/^[a-zA-Z0-9 _-]+$/.test(value))
+                  return "First name can only contain letters, numbers, hyphens, and underscores.";
+                return true;
+              },
            }}
            render={({ field: { value, onChange, ref } }) => (
              <input
@@ -247,6 +247,11 @@ export const ProfileForm = observer((props: TProfileFormProps) => {
                  name="first_name"
                  rules={{
                    required: "Please enter first name",
+                    validate: (value) => {
+                      if (!/^[a-zA-Z0-9 _-]+$/.test(value))
+                        return "First name can only contain letters, numbers, hyphens, and underscores.";
+                      return true;
+                    },
                  }}
                  render={({ field: { value, onChange, ref } }) => (
                    <Input
@@ -271,6 +276,14 @@ export const ProfileForm = observer((props: TProfileFormProps) => {
                <Controller
                  control={control}
                  name="last_name"
+                  rules={{
+                    validate: (value) => {
+                      if (value === "") return true;
+                      if (!/^[a-zA-Z0-9 _-]+$/.test(value))
+                        return "Last name can only contain letters, numbers, hyphens, and underscores.";
+                      return true;
+                    },
+                  }}
                  render={({ field: { value, onChange, ref } }) => (
                    <Input
                      id="last_name"
@@ -287,6 +300,7 @@ export const ProfileForm = observer((props: TProfileFormProps) => {
                    />
                  )}
                />
+                {errors?.last_name && <span className="text-xs text-red-500">{errors?.last_name?.message}</span>}
              </div>
              <div className="flex flex-col gap-1">
                <h4 className="text-sm font-medium text-custom-text-200">
@@ -6,7 +6,7 @@ import { WorkspaceLogo } from "@/components/workspace/logo";
 // hooks
 import { useWorkspace } from "@/hooks/store/use-workspace";
 // plane web imports
-import { SubscriptionPill } from "@/plane-web/components/common/subscription/subscription-pill";
+import { SubscriptionPill } from "@/plane-web/components/common";

 export const SettingsSidebarHeader = observer((props: { customHeader?: React.ReactNode }) => {
  const { customHeader } = props;
@@ -3,14 +3,15 @@ import { observer } from "mobx-react";
 import Link from "next/link";
 import { useParams } from "next/navigation";
 import { Check, Settings, UserPlus } from "lucide-react";
-import { Menu } from "@headlessui/react";
 // plane imports
+import { Menu } from "@headlessui/react";
 import { EUserPermissions } from "@plane/constants";
 import { useTranslation } from "@plane/i18n";
 import { IWorkspace } from "@plane/types";
 import { cn, getFileURL, getUserRole } from "@plane/utils";
+// helpers
 // plane web imports
-import { SubscriptionPill } from "@/plane-web/components/common/subscription/subscription-pill";
+import { SubscriptionPill } from "@/plane-web/components/common/subscription";

 type TProps = {
  workspace: IWorkspace;
@@ -1,4 +1,4 @@
-// plane imports
+// types
 import { API_BASE_URL } from "@plane/constants";
 import {
  EIssueServiceType,
@@ -12,8 +12,12 @@ import {
  type TIssuesResponse,
  type TIssueSubIssues,
 } from "@plane/types";
+// helpers
 import { getIssuesShouldFallbackToServer } from "@plane/utils";
+import { persistence } from "@/local-db/storage.sqlite";
 // services
+
+import { addIssuesBulk, deleteIssueFromLocal, updateIssue } from "@/local-db/utils/load-issues";
 import { APIService } from "@/services/api.service";

 export class IssueService extends APIService {
@@ -81,7 +85,7 @@ export class IssueService extends APIService {
    if (getIssuesShouldFallbackToServer(queries) || this.serviceType !== EIssueServiceType.ISSUES) {
      return await this.getIssuesFromServer(workspaceSlug, projectId, queries, config);
    }
-    const { persistence } = await import("@/local-db/storage.sqlite");
+
    const response = await persistence.getIssues(workspaceSlug, projectId, queries, config);
    return response as TIssuesResponse;
  }
@@ -114,10 +118,9 @@ export class IssueService extends APIService {
    return this.get(`/api/workspaces/${workspaceSlug}/projects/${projectId}/${this.serviceType}/${issueId}/`, {
      params: queries,
    })
-      .then(async (response) => {
+      .then((response) => {
        // skip issue update when the service type is epic
        if (response.data && this.serviceType === EIssueServiceType.ISSUES) {
-          const { updateIssue } = await import("@/local-db/utils/load-issues");
          updateIssue({ ...response.data, is_local_update: 1 });
        }
        // add is_epic flag when the service type is epic
@@ -135,9 +138,8 @@ export class IssueService extends APIService {
    return this.get(`/api/workspaces/${workspaceSlug}/projects/${projectId}/${this.serviceType}/list/`, {
      params: { issues: issueIds.join(",") },
    })
-      .then(async (response) => {
+      .then((response) => {
        if (response?.data && Array.isArray(response?.data) && this.serviceType === EIssueServiceType.ISSUES) {
-          const { addIssuesBulk } = await import("@/local-db/utils/load-issues");
          addIssuesBulk(response.data);
        }
        return response?.data;
@@ -244,7 +246,6 @@ export class IssueService extends APIService {

  async deleteIssue(workspaceSlug: string, projectId: string, issuesId: string): Promise<any> {
    if (this.serviceType === EIssueServiceType.ISSUES) {
-      const { deleteIssueFromLocal } = await import("@/local-db/utils/load-issues");
      deleteIssueFromLocal(issuesId);
    }
    return this.delete(`/api/workspaces/${workspaceSlug}/projects/${projectId}/${this.serviceType}/${issuesId}/`)
@@ -353,9 +354,8 @@ export class IssueService extends APIService {

  async bulkOperations(workspaceSlug: string, projectId: string, data: TBulkOperationsPayload): Promise<any> {
    return this.post(`/api/workspaces/${workspaceSlug}/projects/${projectId}/bulk-operation-issues/`, data)
-      .then(async (response) => {
+      .then((response) => {
        if (this.serviceType === EIssueServiceType.ISSUES) {
-          const { persistence } = await import("@/local-db/storage.sqlite");
          persistence.syncIssues(projectId);
        }
        return response?.data;
@@ -373,9 +373,8 @@ export class IssueService extends APIService {
    }
  ): Promise<any> {
    return this.delete(`/api/workspaces/${workspaceSlug}/projects/${projectId}/bulk-delete-issues/`, data)
-      .then(async (response) => {
+      .then((response) => {
        if (this.serviceType === EIssueServiceType.ISSUES) {
-          const { persistence } = await import("@/local-db/storage.sqlite");
          persistence.syncIssues(projectId);
        }
        return response?.data;
@@ -395,9 +394,8 @@ export class IssueService extends APIService {
    archived_at: string;
  }> {
    return this.post(`/api/workspaces/${workspaceSlug}/projects/${projectId}/bulk-archive-issues/`, data)
-      .then(async (response) => {
+      .then((response) => {
        if (this.serviceType === EIssueServiceType.ISSUES) {
-          const { persistence } = await import("@/local-db/storage.sqlite");
          persistence.syncIssues(projectId);
        }
        return response?.data;
@@ -478,10 +476,9 @@ export class IssueService extends APIService {
    return this.get(`/api/workspaces/${workspaceSlug}/work-items/${project_identifier}-${issue_sequence}/`, {
      params: queries,
    })
-      .then(async (response) => {
+      .then((response) => {
        // skip issue update when the service type is epic
        if (response.data && this.serviceType === EIssueServiceType.ISSUES) {
-          const { updateIssue } = await import("@/local-db/utils/load-issues");
          updateIssue({ ...response.data, is_local_update: 1 });
        }
        // add is_epic flag when the service type is epic
@@ -95,7 +95,6 @@ export interface IIssueDetail
  attachmentDeleteModalId: string | null;
  // computed
  isAnyModalOpen: boolean;
-  isPeekOpen: boolean;
  // helper actions
  getIsIssuePeeked: (issueId: string) => boolean;
  // actions
@@ -189,7 +188,6 @@ export abstract class IssueDetail implements IIssueDetail {
      lastWidgetAction: observable.ref,
      // computed
      isAnyModalOpen: computed,
-      isPeekOpen: computed,
      // action
      setPeekIssue: action,
      setIssueLinkData: action,
@@ -237,10 +235,6 @@ export abstract class IssueDetail implements IIssueDetail {
    );
  }

-  get isPeekOpen() {
-    return !!this.peekIssue;
-  }
-
  // helper actions
  getIsIssuePeeked = (issueId: string) => this.peekIssue?.issueId === issueId;

@@ -0,0 +1 @@
+export * from "ce/components/de-dupe";
@@ -0,0 +1 @@
+export * from "ce/components/epics";
@@ -0,0 +1 @@
+export * from "ce/components/projects/settings/intake";
@@ -12,7 +12,7 @@ const nextConfig = {
    return [
      {
        source: "/(.*)?",
-        headers: [{ key: "X-Frame-Options", value: "DENY" }],
+        headers: [{ key: "X-Frame-Options", value: "SAMEORIGIN" }],
      },
    ];
  },
@@ -97,7 +97,7 @@ priority=20

 [program:live]
 directory=/app/live
-command=sh -c "node /app/live/apps/live/dist/server.js"
+command=sh -c "node live/server.js"
 autostart=true
 autorestart=true
 stdout_logfile=/app/logs/access/live.log
@@ -106,7 +106,7 @@ stderr_logfile=/app/logs/error/live.err.log
 # stderr_logfile=/dev/stderr
 stderr_logfile_maxbytes=50MB
 stderr_logfile_backups=5
-environment=PORT=3005,HOSTNAME=0.0.0.0,LIVE_BASE_PATH=/live
+environment=PORT=3005,HOSTNAME=0.0.0.0
 priority=20


@@ -121,4 +121,4 @@ stderr_logfile=/app/logs/error/proxy.err.log
 # stderr_logfile=/dev/stderr
 stderr_logfile_maxbytes=50MB
 stderr_logfile_backups=5
-priority=20
+priority=20
@@ -3,25 +3,19 @@ services:
    image: ${DOCKERHUB_USER:-local}/plane-frontend:${APP_RELEASE:-latest}
    build:
      context: ../../
-      dockerfile: Dockerfile.node
-      args:
-        APP_SCOPE: web
+      dockerfile: apps/web/Dockerfile.web

  space:
    image: ${DOCKERHUB_USER:-local}/plane-space:${APP_RELEASE:-latest}
    build:
      context: ../../
-      dockerfile: Dockerfile.node
-      args:
-        APP_SCOPE: space
+      dockerfile: apps/space/Dockerfile.space

  admin:
    image: ${DOCKERHUB_USER:-local}/plane-admin:${APP_RELEASE:-latest}
    build:
      context: ../../
-      dockerfile: Dockerfile.node
-      args:
-        APP_SCOPE: admin
+      dockerfile: apps/admin/Dockerfile.admin

  live:
    image: ${DOCKERHUB_USER:-local}/plane-live:${APP_RELEASE:-latest}
@@ -32,7 +26,7 @@ services:
  api:
    image: ${DOCKERHUB_USER:-local}/plane-backend:${APP_RELEASE:-latest}
    build:
-      context: ../../
+      context: ../../apps/api
      dockerfile: Dockerfile.api

  proxy:
@@ -1,132 +0,0 @@
-# docker-bake.hcl
-#
-# Build all runtime images for Plane services and the AIO assembler image.
-# Uses unified Dockerfiles under plane/ for Node (Next.js) apps and API.
-#
-# Usage examples:
-#   # Build all individual runtime images (no push)
-#   docker buildx bake
-#
-#   # Build everything including AIO
-#   docker buildx bake all
-#
-#   # Build and push with custom tag and registry/prefix
-#   docker buildx bake all --set *.tags=myrepo/plane-{{.target}}:1.2.3 --push
-#
-#   # Or set variables:
-#   docker buildx bake all --set TAG=1.2.3 --set IMAGE_PREFIX=myrepo/ --push
-#
-# Notes:
-# - The "AIO" image composes from the individual images built here.
-# - "live" currently uses its app-specific Dockerfile (non-Next.js runtime).
-
-group "default" {
-  targets = ["web", "space", "admin", "live", "api", "proxy"]
-}
-
-group "all" {
-  targets = ["web", "space", "admin", "live", "api", "proxy", "aio"]
-}
-
-group "frontend" {
-  targets = ["web", "space", "admin"]
-}
-
-variable "TAG" {
-  # Global tag to apply to images
-  default = "latest"
-}
-
-variable "IMAGE_PREFIX" {
-  # Optional prefix/registry for image tags, e.g. "ghcr.io/makeplane/" or "yourrepo/"
-  # Leave empty to tag locally (e.g. "plane-web:latest")
-  default = ""
-}
-
-variable "PLATFORMS" {
-  # List of platforms (e.g., ["linux/amd64", "linux/arm64"])
-  default = ["linux/amd64"]
-}
-
-# Common cache configuration for faster CI builds
-target "with-cache" {
-  cache-from = ["type=gha"]
-  cache-to   = ["type=gha,mode=max"]
-}
-
-# Common base for Next.js apps using the unified Dockerfile
-target "common-node" {
-  inherits   = ["with-cache"]
-  dockerfile = "Dockerfile.node"
-  context    = "."
-  platforms  = "${PLATFORMS}"
-}
-
-# Frontend apps (Next.js standalone runtime)
-target "web" {
-  inherits = ["common-node"]
-  target   = "runtime"
-  args     = { APP_SCOPE = "web" }
-  tags     = ["${IMAGE_PREFIX}plane-web:${TAG}"]
-}
-
-target "space" {
-  inherits = ["common-node"]
-  target   = "runtime"
-  args     = { APP_SCOPE = "space" }
-  tags     = ["${IMAGE_PREFIX}plane-space:${TAG}"]
-}
-
-target "admin" {
-  inherits = ["common-node"]
-  target   = "runtime"
-  args     = { APP_SCOPE = "admin" }
-  tags     = ["${IMAGE_PREFIX}plane-admin:${TAG}"]
-}
-
-# Live app (Node service; not Next.js standalone)
-# Keeps its dedicated Dockerfile to match current build/run layout
-target "live" {
-  inherits   = ["with-cache"]
-  dockerfile = "apps/live/Dockerfile.live"
-  context    = "."
-  platforms  = "${PLATFORMS}"
-  tags       = ["${IMAGE_PREFIX}plane-live:${TAG}"]
-}
-
-# Python API (unified Dockerfile)
-target "api" {
-  inherits   = ["with-cache"]
-  dockerfile = "Dockerfile.api"
-  context    = "."
-  target     = "runtime"
-  platforms  = "${PLATFORMS}"
-  tags       = ["${IMAGE_PREFIX}plane-api:${TAG}"]
-}
-
-# Proxy (Caddy with plugins)
-target "proxy" {
-  inherits   = ["with-cache"]
-  dockerfile = "Dockerfile.ce"
-  context    = "apps/proxy"
-  platforms  = "${PLATFORMS}"
-  tags       = ["${IMAGE_PREFIX}plane-proxy:${TAG}"]
-}
-
-# All-in-one assembler image
-# Composes from previously built runtime images; override args if you use different tags.
-target "aio" {
-  inherits   = ["with-cache"]
-  dockerfile = "Dockerfile.aio"
-  context    = "."
-  platforms  = "${PLATFORMS}"
-  contexts = {
-    web_ctx   = "target:web"
-    space_ctx = "target:space"
-    admin_ctx = "target:admin"
-    live_ctx  = "target:live"
-    api_ctx   = "target:api"
-    proxy_ctx = "target:proxy"
-  }
-  tags = ["${IMAGE_PREFIX}plane-aio:${TAG}"]
-}
@@ -1,134 +1,9 @@
-# Local development stack with hot reload for web/space/admin/live and Django API.
-# Uses unified dev targets in plane/Dockerfile.node and plane/Dockerfile.api.
-# Infra services (Postgres, Redis, RabbitMQ, MinIO) are included.
-
 services:
-  # Django API in dev mode (bind mounts for instant reload)
-  api:
-    build:
-      context: .
-      dockerfile: Dockerfile.api
-      target: dev
-    restart: unless-stopped
-    working_dir: /code
-    command: ./bin/docker-entrypoint-api-local.sh
-    env_file:
-      - ./apps/api/.env
-    environment:
-      USE_MINIO: "1"
-      AWS_S3_ENDPOINT_URL: http://plane-minio:9000
-      MINIO_ENDPOINT_URL: http://plane-minio:9000
-      AWS_ACCESS_KEY_ID: ${AWS_ACCESS_KEY_ID:-minioadmin}
-      AWS_SECRET_ACCESS_KEY: ${AWS_SECRET_ACCESS_KEY:-minioadmin}
-      AWS_S3_BUCKET_NAME: ${AWS_S3_BUCKET_NAME:-uploads}
-      AWS_REGION: ${AWS_REGION:-us-east-1}
-      WEB_URL: ${WEB_URL:-http://localhost:3001}
-      DJANGO_DEBUG_TOOLBAR: ${DJANGO_DEBUG_TOOLBAR:-0}
-    volumes:
-      - ./apps/api:/code
-    depends_on:
-      - plane-db
-      - plane-redis
-      - plane-mq
-      - plane-minio
-    ports:
-      - "8000:8000"
-
-  worker:
-    build:
-      context: .
-      dockerfile: Dockerfile.api
-      target: dev
-    restart: unless-stopped
-    working_dir: /code
-    command: ./bin/docker-entrypoint-worker.sh
-    env_file:
-      - ./apps/api/.env
-    environment:
-      USE_MINIO: "1"
-      AWS_S3_ENDPOINT_URL: http://plane-minio:9000
-      MINIO_ENDPOINT_URL: http://plane-minio:9000
-      AWS_ACCESS_KEY_ID: ${AWS_ACCESS_KEY_ID:-minioadmin}
-      AWS_SECRET_ACCESS_KEY: ${AWS_SECRET_ACCESS_KEY:-minioadmin}
-      AWS_S3_BUCKET_NAME: ${AWS_S3_BUCKET_NAME:-uploads}
-      AWS_REGION: ${AWS_REGION:-us-east-1}
-    volumes:
-      - ./apps/api:/code
-    depends_on:
-      - api
-      - plane-db
-      - plane-redis
-      - plane-mq
-
-  beat-worker:
-    build:
-      context: .
-      dockerfile: Dockerfile.api
-      target: dev
-    restart: unless-stopped
-    working_dir: /code
-    command: ./bin/docker-entrypoint-beat.sh
-    env_file:
-      - ./apps/api/.env
-    environment:
-      USE_MINIO: "1"
-      AWS_S3_ENDPOINT_URL: http://plane-minio:9000
-      MINIO_ENDPOINT_URL: http://plane-minio:9000
-      AWS_ACCESS_KEY_ID: ${AWS_ACCESS_KEY_ID:-minioadmin}
-      AWS_SECRET_ACCESS_KEY: ${AWS_SECRET_ACCESS_KEY:-minioadmin}
-      AWS_S3_BUCKET_NAME: ${AWS_S3_BUCKET_NAME:-uploads}
-      AWS_REGION: ${AWS_REGION:-us-east-1}
-    volumes:
-      - ./apps/api:/code
-    depends_on:
-      - api
-      - plane-db
-      - plane-redis
-      - plane-mq
-
-  migrator:
-    build:
-      context: .
-      dockerfile: Dockerfile.api
-      target: dev
-    restart: "no"
-    working_dir: /code
-    command: ./bin/docker-entrypoint-migrator.sh --settings=plane.settings.local
-    env_file:
-      - ./apps/api/.env
-    environment:
-      USE_MINIO: "1"
-      AWS_S3_ENDPOINT_URL: http://plane-minio:9000
-      MINIO_ENDPOINT_URL: http://plane-minio:9000
-      AWS_ACCESS_KEY_ID: ${AWS_ACCESS_KEY_ID:-minioadmin}
-      AWS_SECRET_ACCESS_KEY: ${AWS_SECRET_ACCESS_KEY:-minioadmin}
-      AWS_S3_BUCKET_NAME: ${AWS_S3_BUCKET_NAME:-uploads}
-      AWS_REGION: ${AWS_REGION:-us-east-1}
-    volumes:
-      - ./apps/api:/code
-    depends_on:
-      - plane-db
-      - plane-redis
-      - plane-minio
-
-  # Infra
-  plane-db:
-    image: postgres:15.7-alpine
-    restart: unless-stopped
-    command: "postgres -c 'max_connections=1000'"
-    environment:
-      POSTGRES_USER: ${POSTGRES_USER:-plane}
-      POSTGRES_DB: ${POSTGRES_DB:-plane}
-      POSTGRES_PASSWORD: ${POSTGRES_PASSWORD:-plane}
-      PGDATA: /var/lib/postgresql/data
-    volumes:
-      - pgdata:/var/lib/postgresql/data
-    ports:
-      - "5432:5432"
-
  plane-redis:
    image: valkey/valkey:7.2.5-alpine
    restart: unless-stopped
+    networks:
+      - dev_env
    volumes:
      - redisdata:/data
    ports:
@@ -137,43 +12,218 @@ services:
  plane-mq:
    image: rabbitmq:3.13.6-management-alpine
    restart: unless-stopped
-    environment:
-      RABBITMQ_DEFAULT_USER: ${RABBITMQ_USER:-plane}
-      RABBITMQ_DEFAULT_PASS: ${RABBITMQ_PASSWORD:-plane}
-      RABBITMQ_DEFAULT_VHOST: ${RABBITMQ_VHOST:-plane}
+    networks:
+      - dev_env
    volumes:
      - rabbitmq_data:/var/lib/rabbitmq
-    ports:
-      - "15672:15672"
+    env_file:
+      - .env
+    environment:
+      RABBITMQ_DEFAULT_USER: ${RABBITMQ_USER}
+      RABBITMQ_DEFAULT_PASS: ${RABBITMQ_PASSWORD}
+      RABBITMQ_DEFAULT_VHOST: ${RABBITMQ_VHOST}

  plane-minio:
    image: minio/minio
    restart: unless-stopped
-    # Bootstrap bucket on first run; suitable for local smoke/dev only
+    networks:
+      - dev_env
    entrypoint: >
      /bin/sh -c "
-      set -e
-      mkdir -p /export/${AWS_S3_BUCKET_NAME:-uploads};
-      minio server /export --console-address ':9090' & pid=$!;
-      sleep 5;
-      mc alias set myminio http://plane-minio:9000 ${AWS_ACCESS_KEY_ID:-minioadmin} ${AWS_SECRET_ACCESS_KEY:-minioadmin};
-      mc mb myminio/${AWS_S3_BUCKET_NAME:-uploads} -p || true;
-      wait $pid
+      mkdir -p /export/${AWS_S3_BUCKET_NAME} &&
+      minio server /export --console-address ':9090' &
+      sleep 5 &&
+      mc alias set myminio http://localhost:9000 ${AWS_ACCESS_KEY_ID} ${AWS_SECRET_ACCESS_KEY} &&
+      mc mb myminio/${AWS_S3_BUCKET_NAME} -p || true
+      && tail -f /dev/null
      "
-    environment:
-      MINIO_ROOT_USER: ${AWS_ACCESS_KEY_ID:-minioadmin}
-      MINIO_ROOT_PASSWORD: ${AWS_SECRET_ACCESS_KEY:-minioadmin}
    volumes:
      - uploads:/export
+    env_file:
+      - .env
+    environment:
+      MINIO_ROOT_USER: ${AWS_ACCESS_KEY_ID}
+      MINIO_ROOT_PASSWORD: ${AWS_SECRET_ACCESS_KEY}
    ports:
      - "9000:9000"
      - "9090:9090"

-volumes:
-  # Node/pnpm caches for speedy dev
+  plane-db:
+    image: postgres:15.7-alpine
+    restart: unless-stopped
+    networks:
+      - dev_env
+    command: postgres -c 'max_connections=1000'
+    volumes:
+      - pgdata:/var/lib/postgresql/data
+    env_file:
+      - .env
+    environment:
+      PGDATA: /var/lib/postgresql/data
+    ports:
+      - "5432:5432"

-  # Infra data
-  pgdata:
+  # web:
+  #   build:
+  #     context: .
+  #     dockerfile: ./web/Dockerfile.dev
+  #   restart: unless-stopped
+  #   networks:
+  #     - dev_env
+  #   volumes:
+  #     - ./web:/app/web
+  #   env_file:
+  #     - ./web/.env
+  #   depends_on:
+  #     - api
+  #     - worker
+
+  # space:
+  #   build:
+  #     context: .
+  #     dockerfile: ./space/Dockerfile.dev
+  #   restart: unless-stopped
+  #   networks:
+  #     - dev_env
+  #   volumes:
+  #     - ./space:/app/space
+  #   depends_on:
+  #     - api
+  #     - worker
+  #     - web
+
+  # admin:
+  #   build:
+  #     context: .
+  #     dockerfile: ./admin/Dockerfile.dev
+  #   restart: unless-stopped
+  #   networks:
+  #     - dev_env
+  #   volumes:
+  #     - ./admin:/app/admin
+  #   depends_on:
+  #     - api
+  #     - worker
+  #     - web
+
+  # live:
+  #   build:
+  #     context: .
+  #     dockerfile: ./live/Dockerfile.dev
+  #   restart: unless-stopped
+  #   networks:
+  #     - dev_env
+  #   volumes:
+  #     - ./live:/app/live
+  #   depends_on:
+  #     - api
+  #     - worker
+  #     - web
+
+  api:
+    build:
+      context: ./apps/api
+      dockerfile: Dockerfile.dev
+      args:
+        DOCKER_BUILDKIT: 1
+    restart: unless-stopped
+    networks:
+      - dev_env
+    volumes:
+      - ./apps/api:/code
+    command: ./bin/docker-entrypoint-api-local.sh
+    env_file:
+      - ./apps/api/.env
+    depends_on:
+      - plane-db
+      - plane-redis
+      - plane-mq
+    ports:
+      - "8000:8000"
+
+  worker:
+    build:
+      context: ./apps/api
+      dockerfile: Dockerfile.dev
+      args:
+        DOCKER_BUILDKIT: 1
+    restart: unless-stopped
+    networks:
+      - dev_env
+    volumes:
+      - ./apps/api:/code
+    command: ./bin/docker-entrypoint-worker.sh
+    env_file:
+      - ./apps/api/.env
+    depends_on:
+      - api
+      - plane-db
+      - plane-redis
+
+  beat-worker:
+    build:
+      context: ./apps/api
+      dockerfile: Dockerfile.dev
+      args:
+        DOCKER_BUILDKIT: 1
+    restart: unless-stopped
+    networks:
+      - dev_env
+    volumes:
+      - ./apps/api:/code
+    command: ./bin/docker-entrypoint-beat.sh
+    env_file:
+      - ./apps/api/.env
+    depends_on:
+      - api
+      - plane-db
+      - plane-redis
+
+  migrator:
+    build:
+      context: ./apps/api
+      dockerfile: Dockerfile.dev
+      args:
+        DOCKER_BUILDKIT: 1
+    restart: "no"
+    networks:
+      - dev_env
+    volumes:
+      - ./apps/api:/code
+    command: ./bin/docker-entrypoint-migrator.sh --settings=plane.settings.local
+    env_file:
+      - ./apps/api/.env
+    depends_on:
+      - plane-db
+      - plane-redis
+
+  # proxy:
+  #   build:
+  #     context: ./apps/proxy
+  #     dockerfile: Dockerfile.ce
+  #   restart: unless-stopped
+  #   networks:
+  #     - dev_env
+  #   ports:
+  #     - ${LISTEN_HTTP_PORT}:80
+  #     - ${LISTEN_HTTPS_PORT}:443
+  #   env_file:
+  #     - .env
+  #   environment:
+  #     FILE_SIZE_LIMIT: ${FILE_SIZE_LIMIT:-5242880}
+  #     BUCKET_NAME: ${AWS_S3_BUCKET_NAME:-uploads}
+  #   depends_on:
+  #     - api
+  #     - web
+  #     - space
+  #     - admin
+
+volumes:
  redisdata:
-  rabbitmq_data:
  uploads:
+  pgdata:
+  rabbitmq_data:
+
+networks:
+  dev_env:
+    driver: bridge
@@ -3,10 +3,9 @@ services:
    container_name: web
    build:
      context: .
-      dockerfile: ./Dockerfile.node
+      dockerfile: ./apps/web/Dockerfile.web
      args:
        DOCKER_BUILDKIT: 1
-        APP_SCOPE: web
    restart: always
    depends_on:
      - api
@@ -15,10 +14,9 @@ services:
    container_name: admin
    build:
      context: .
-      dockerfile: ./Dockerfile.node
+      dockerfile: ./apps/admin/Dockerfile.admin
      args:
        DOCKER_BUILDKIT: 1
-        APP_SCOPE: admin
    restart: always
    depends_on:
      - api
@@ -28,10 +26,9 @@ services:
    container_name: space
    build:
      context: .
-      dockerfile: ./Dockerfile.node
+      dockerfile: ./apps/space/Dockerfile.space
      args:
        DOCKER_BUILDKIT: 1
-        APP_SCOPE: space
    restart: always
    depends_on:
      - api
@@ -40,8 +37,8 @@ services:
  api:
    container_name: api
    build:
-      context: .
-      dockerfile: ./Dockerfile.api
+      context: ./apps/api
+      dockerfile: Dockerfile.api
      args:
        DOCKER_BUILDKIT: 1
    restart: always
@@ -55,8 +52,8 @@ services:
  worker:
    container_name: bgworker
    build:
-      context: .
-      dockerfile: ./Dockerfile.api
+      context: ./apps/api
+      dockerfile: Dockerfile.api
      args:
        DOCKER_BUILDKIT: 1
    restart: always
@@ -71,8 +68,8 @@ services:
  beat-worker:
    container_name: beatworker
    build:
-      context: .
-      dockerfile: ./Dockerfile.api
+      context: ./apps/api
+      dockerfile: Dockerfile.api
      args:
        DOCKER_BUILDKIT: 1
    restart: always
@@ -87,8 +84,8 @@ services:
  migrator:
    container_name: plane-migrator
    build:
-      context: .
-      dockerfile: ./Dockerfile.api
+      context: ./apps/api
+      dockerfile: Dockerfile.api
      args:
        DOCKER_BUILDKIT: 1
    restart: no
@@ -1,14 +0,0 @@
-# Repo-wide tool versions managed by mise
-# See: https://mise.jdx.dev
-
-[tools]
-# Node LTS "Jod" to match .nvmrc and package.json engines
-node = "22.18.0"
-
-# Python version to match Dockerfile.api
-python = "3.12.10"
-
-# Global CLI utilities installed via pipx
-# This provides the `ruff` command used by CI and local checks
-pipx = "latest"
-"pipx:ruff" = "0.9.7"
@@ -15,7 +15,6 @@
    "start": "turbo run start",
    "clean": "turbo run clean && rm -rf .turbo && rm -rf .next && rm -rf node_modules && rm -rf dist",
    "fix": "turbo run fix",
-    "fix:format": "turbo run fix:format",
    "check": "turbo run check",
    "check:lint": "turbo run check:lint",
    "check:format": "turbo run check:format"
@@ -40,8 +39,5 @@
      "sharp": "0.33.5"
    }
  },
-  "packageManager": "pnpm@10.12.1",
-  "engines": {
-    "node": ">=22.18.0"
-  }
+  "packageManager": "pnpm@10.12.1"
 }
@@ -174,10 +174,6 @@ export const ANALYTICS_Y_AXIS_VALUES: { value: ChartYAxisMetric; label: string }
    value: ChartYAxisMetric.ESTIMATE_POINT_COUNT,
    label: "Estimate",
  },
-  {
-    value: ChartYAxisMetric.EPIC_WORK_ITEM_COUNT,
-    label: "Epic",
-  },
 ];

 export const ANALYTICS_V2_DATE_KEYS = ["completed_at", "target_date", "start_date", "created_at"];
@@ -4,7 +4,7 @@ import type { IEditorProps } from "@/types";

 export type TCoreAdditionalExtensionsProps = Pick<
  IEditorProps,
-  "disabledExtensions" | "flaggedExtensions" | "fileHandler" | "embedHandler"
+  "disabledExtensions" | "flaggedExtensions" | "fileHandler"
 >;

 export const CoreEditorAdditionalExtensions = (props: TCoreAdditionalExtensionsProps): Extensions => {
@@ -108,8 +108,6 @@ const CollaborativeDocumentEditor: React.FC<ICollaborativeDocumentEditorProps> =
      isTouchDevice={!!isTouchDevice}
      isLoading={!hasServerSynced && !hasServerConnectionFailed}
      tabIndex={tabIndex}
-      flaggedExtensions={flaggedExtensions}
-      disabledExtensions={disabledExtensions}
    />
  );
 };
@@ -82,7 +82,6 @@ const DocumentEditor = (props: IDocumentEditorProps) => {
    initialValue: value,
    mentionHandler,
    onChange,
-    embedHandler,
  });

  const editorContainerClassName = getEditorClassNames({
@@ -98,8 +97,6 @@ const DocumentEditor = (props: IDocumentEditorProps) => {
      editor={editor}
      editorContainerClassName={cn(editorContainerClassName, "document-editor")}
      id={id}
-      flaggedExtensions={flaggedExtensions}
-      disabledExtensions={disabledExtensions}
      isTouchDevice={!!isTouchDevice}
    />
  );
@@ -5,7 +5,7 @@ import { cn } from "@plane/utils";
 import { DocumentContentLoader, EditorContainer, EditorContentWrapper } from "@/components/editors";
 import { AIFeaturesMenu, BlockMenu, EditorBubbleMenu } from "@/components/menus";
 // types
-import { IEditorProps, TAIHandler, TDisplayConfig } from "@/types";
+import { TAIHandler, TDisplayConfig } from "@/types";

 type Props = {
  aiHandler?: TAIHandler;
@@ -18,8 +18,6 @@ type Props = {
  isLoading?: boolean;
  isTouchDevice: boolean;
  tabIndex?: number;
-  flaggedExtensions: IEditorProps["flaggedExtensions"];
-  disabledExtensions: IEditorProps["disabledExtensions"];
 };

 export const PageRenderer = (props: Props) => {
@@ -34,8 +32,6 @@ export const PageRenderer = (props: Props) => {
    isLoading,
    isTouchDevice,
    tabIndex,
-    flaggedExtensions,
-    disabledExtensions,
  } = props;

  return (
@@ -58,11 +54,7 @@ export const PageRenderer = (props: Props) => {
          {editor.isEditable && !isTouchDevice && (
            <div>
              {bubbleMenuEnabled && <EditorBubbleMenu editor={editor} />}
-              <BlockMenu
-                editor={editor}
-                flaggedExtensions={flaggedExtensions}
-                disabledExtensions={disabledExtensions}
-              />
+              <BlockMenu editor={editor} />
              <AIFeaturesMenu menu={aiHandler?.menu} />
            </div>
          )}
@@ -41,7 +41,6 @@ export const EditorWrapper: React.FC<Props> = (props) => {
    placeholder,
    tabIndex,
    value,
-    embedHandler,
  } = props;

  const editor = useEditor({
@@ -66,7 +65,6 @@ export const EditorWrapper: React.FC<Props> = (props) => {
    placeholder,
    tabIndex,
    value,
-    embedHandler,
  });

  const editorContainerClassName = getEditorClassNames({
@@ -1,12 +1,8 @@
 import { autoUpdate, flip, hide, shift, useDismiss, useFloating, useInteractions } from "@floating-ui/react";
 import { Editor, useEditorState } from "@tiptap/react";
 import { FC, useCallback, useEffect, useRef, useState } from "react";
-
 // components
 import { LinkView, LinkViewProps } from "@/components/links";
-import { CORE_EXTENSIONS } from "@/constants/extension";
-// components
-import { getExtensionStorage } from "@/helpers/get-extension-storage";

 type Props = {
  editor: Editor;
@@ -22,7 +18,7 @@ export const LinkViewContainer: FC<Props> = ({ editor, containerRef }) => {
  const editorState = useEditorState({
    editor,
    selector: ({ editor }: { editor: Editor }) => ({
-      linkExtensionStorage: getExtensionStorage(editor, CORE_EXTENSIONS.CUSTOM_LINK),
+      linkExtensionStorage: editor.storage.link,
    }),
  });

@@ -4,12 +4,9 @@ import { useCallback, useEffect, useRef } from "react";
 import tippy, { Instance } from "tippy.js";
 // constants
 import { CORE_EXTENSIONS } from "@/constants/extension";
-import { IEditorProps } from "@/types";

 type Props = {
  editor: Editor;
-  flaggedExtensions?: IEditorProps["flaggedExtensions"];
-  disabledExtensions?: IEditorProps["disabledExtensions"];
 };

 export const BlockMenu = (props: Props) => {
@@ -55,7 +55,6 @@ export const TextAlignmentSelector: React.FC<Props> = (props) => {
      isActive: () => editorState.right,
    },
  ];
-  if (editorState.code) return null;

  return (
    <div className="flex gap-0.5 px-2">
@@ -1,5 +1,3 @@
 export enum CORE_EDITOR_META {
  SKIP_FILE_DELETION = "skipFileDeletion",
-  INTENTIONAL_DELETION = "intentionalDeletion",
-  ADD_TO_HISTORY = "addToHistory",
 }
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
sangeethailango	b4acaa2086	chore: test cases	2025-09-04 17:04:06 +05:30
sangeethailango	00e38a7149	chore: move validation to serializer	2025-09-03 16:40:17 +05:30
sangeethailango	04e14f32bf	chore: move validation to viewset	2025-09-03 16:21:41 +05:30
gakshita	56795bbcba	fix: allowed empty screen for last name	2025-09-03 16:14:10 +05:30
gakshita	03bbe79320	Merge branch 'fix-user-name-validation' of https://github.com/makeplane/plane into fix-user-name-validation	2025-08-28 19:21:59 +05:30
gakshita	9ef0de4848	fix: allowed spaces	2025-08-28 19:21:57 +05:30
sangeethailango	4e4e3ef659	Merge branch 'fix-user-name-validation' of github.com:makeplane/plane into fix-user-name-validation	2025-08-28 19:18:23 +05:30
sangeethailango	43cdaec895	chore: allow space	2025-08-28 19:15:09 +05:30
gakshita	fde6de3fcf	fix: handled fe to not allow special characters in first_name and last_name	2025-08-28 16:04:50 +05:30
sangeethailango	33d3e032b3	fix: user name validation	2025-08-21 14:57:59 +05:30
				`@@ -0,0 +1 @@`
				`export * from "ce/components/projects/settings/intake";`