fix: close transition in panel

.github/workflows/build-branch.yml

@@ -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 }}
@@ -272,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
@@ -288,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
@@ -327,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
@@ -407,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
+

.github/workflows/check-version.yml

@@ -17,6 +17,8 @@ jobs:
 
       - name: Setup Node.js
         uses: actions/setup-node@v4
+        with:
+          node-version: '18'
 
       - name: Get PR Branch version
         run: echo "PR_VERSION=$(node -p "require('./package.json').version")" >> $GITHUB_ENV

.github/workflows/pull-request-build-lint-api.yml

@@ -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

.github/workflows/pull-request-build-lint-web-apps.yml

@@ -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,18 +27,16 @@ 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
+        with:
+          node-version-file: ".nvmrc"
 
       - name: Enable Corepack and pnpm
         run: corepack enable pnpm
@@ -43,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

.npmrc

@@ -14,10 +14,13 @@ strict-peer-dependencies=false
 # Turbo occasionally performs postinstall tasks for optimal performance
 # moved to pnpm-workspace.yaml: onlyBuiltDependencies (e.g., allow turbo)
 
-public-hoist-pattern[]=eslint*
+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
 

.nvmrc

@@ -0,0 +1 @@
+lts/jod

apps/admin/.eslintrc.js

@@ -1,4 +1,5 @@
 module.exports = {
   root: true,
   extends: ["@plane/eslint-config/next.js"],
+  parser: "@typescript-eslint/parser",
 };

apps/admin/app/(all)/(dashboard)/email/page.tsx

@@ -9,7 +9,7 @@ import { useInstance } from "@/hooks/store";
 // components
 import { InstanceEmailForm } from "./email-config-form";
 
-const InstanceEmailPage: React.FC = observer(() => {
+const InstanceEmailPage = observer(() => {
   // store
   const { fetchInstanceConfigurations, formattedConfig, disableEmail } = useInstance();
 
@@ -29,7 +29,7 @@ const InstanceEmailPage: React.FC = observer(() => {
           message: "Email feature has been disabled",
           type: TOAST_TYPE.SUCCESS,
         });
-      } catch (_error) {
+      } catch (error) {
         setToast({
           title: "Error disabling email",
           message: "Failed to disable email feature. Please try again.",

apps/admin/core/components/authentication/email-config-switch.tsx

@@ -25,8 +25,9 @@ export const EmailCodesConfiguration: React.FC<Props> = observer((props) => {
     <ToggleSwitch
       value={Boolean(parseInt(enableMagicLogin))}
       onChange={() => {
-        const newEnableMagicLogin = Boolean(parseInt(enableMagicLogin)) === true ? "0" : "1";
-        updateConfig("ENABLE_MAGIC_LINK_LOGIN", newEnableMagicLogin);
+        Boolean(parseInt(enableMagicLogin)) === true
+          ? updateConfig("ENABLE_MAGIC_LINK_LOGIN", "0")
+          : updateConfig("ENABLE_MAGIC_LINK_LOGIN", "1");
       }}
       size="sm"
       disabled={disabled}

apps/admin/core/components/authentication/github-config.tsx

@@ -35,8 +35,9 @@ export const GithubConfiguration: React.FC<Props> = observer((props) => {
           <ToggleSwitch
             value={Boolean(parseInt(enableGithubConfig))}
             onChange={() => {
-              const newEnableGithubConfig = Boolean(parseInt(enableGithubConfig)) === true ? "0" : "1";
-              updateConfig("IS_GITHUB_ENABLED", newEnableGithubConfig);
+              Boolean(parseInt(enableGithubConfig)) === true
+                ? updateConfig("IS_GITHUB_ENABLED", "0")
+                : updateConfig("IS_GITHUB_ENABLED", "1");
             }}
             size="sm"
             disabled={disabled}

apps/admin/core/components/authentication/gitlab-config.tsx

@@ -35,8 +35,9 @@ export const GitlabConfiguration: React.FC<Props> = observer((props) => {
           <ToggleSwitch
             value={Boolean(parseInt(enableGitlabConfig))}
             onChange={() => {
-              const newEnableGitlabConfig = Boolean(parseInt(enableGitlabConfig)) === true ? "0" : "1";
-              updateConfig("IS_GITLAB_ENABLED", newEnableGitlabConfig);
+              Boolean(parseInt(enableGitlabConfig)) === true
+                ? updateConfig("IS_GITLAB_ENABLED", "0")
+                : updateConfig("IS_GITLAB_ENABLED", "1");
             }}
             size="sm"
             disabled={disabled}

apps/admin/core/components/authentication/google-config.tsx

@@ -35,8 +35,9 @@ export const GoogleConfiguration: React.FC<Props> = observer((props) => {
           <ToggleSwitch
             value={Boolean(parseInt(enableGoogleConfig))}
             onChange={() => {
-              const newEnableGoogleConfig = Boolean(parseInt(enableGoogleConfig)) === true ? "0" : "1";
-              updateConfig("IS_GOOGLE_ENABLED", newEnableGoogleConfig);
+              Boolean(parseInt(enableGoogleConfig)) === true
+                ? updateConfig("IS_GOOGLE_ENABLED", "0")
+                : updateConfig("IS_GOOGLE_ENABLED", "1");
             }}
             size="sm"
             disabled={disabled}

apps/admin/core/components/authentication/password-config-switch.tsx

@@ -25,8 +25,9 @@ export const PasswordLoginConfiguration: React.FC<Props> = observer((props) => {
     <ToggleSwitch
       value={Boolean(parseInt(enableEmailPassword))}
       onChange={() => {
-        const newEnableEmailPassword = Boolean(parseInt(enableEmailPassword)) === true ? "0" : "1";
-        updateConfig("ENABLE_EMAIL_PASSWORD", newEnableEmailPassword);
+        Boolean(parseInt(enableEmailPassword)) === true
+          ? updateConfig("ENABLE_EMAIL_PASSWORD", "0")
+          : updateConfig("ENABLE_EMAIL_PASSWORD", "1");
       }}
       size="sm"
       disabled={disabled}

apps/admin/core/store/instance.store.ts

@@ -209,7 +209,7 @@ export class InstanceStore implements IInstanceStore {
         });
       });
       await this.instanceService.disableEmail();
-    } catch (_error) {
+    } catch (error) {
       console.error("Error disabling the email");
       this.instanceConfigurations = instanceConfigurations;
     }

apps/admin/eslint.config.js

@@ -1,4 +0,0 @@
-import { config } from "@plane/eslint-config/next";
-
-/** @type {import("eslint").Linter.Config} */
-export default config;

apps/admin/package.json

@@ -4,7 +4,6 @@
   "version": "0.28.0",
   "license": "AGPL-3.0",
   "private": true,
-  "type": "module",
   "scripts": {
     "dev": "next dev --port 3001",
     "build": "next build",
@@ -46,11 +45,10 @@
     "@plane/eslint-config": "workspace:*",
     "@plane/tailwind-config": "workspace:*",
     "@plane/typescript-config": "workspace:*",
-    "@types/lodash": "4.17.20",
+    "@types/lodash": "^4.17.6",
     "@types/node": "18.16.1",
     "@types/react": "^18.3.11",
     "@types/react-dom": "^18.2.18",
-    "eslint": "9.31.0",
     "@types/uuid": "^9.0.8",
     "typescript": "5.8.3"
   }

apps/api/plane/api/serializers/issue.py

@@ -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", []):

apps/api/plane/api/serializers/project.py

@@ -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
 

apps/api/plane/api/urls/member.py

@@ -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",
     ),

apps/api/plane/app/serializers/draft.py

@@ -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", []):

apps/api/plane/app/serializers/issue.py

@@ -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
 
 

apps/api/plane/app/serializers/page.py

@@ -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"""

apps/api/plane/app/serializers/project.py

@@ -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
 

apps/api/plane/app/serializers/workspace.py

@@ -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
 

apps/api/plane/app/views/asset/v2.py

@@ -441,11 +441,7 @@ class WorkspaceFileAssetEndpoint(BaseAPIView):
         # Get the presigned URL
         storage = S3Storage(request=request)
         # Generate a presigned URL to share an S3 object
-        signed_url = storage.generate_presigned_url(
-            object_name=asset.asset.name,
-            disposition="attachment",
-            filename=asset.attributes.get("name"),
-        )
+        signed_url = storage.generate_presigned_url(object_name=asset.asset.name)
         # Redirect to the signed URL
         return HttpResponseRedirect(signed_url)
 
@@ -645,11 +641,7 @@ class ProjectAssetEndpoint(BaseAPIView):
         # Get the presigned URL
         storage = S3Storage(request=request)
         # Generate a presigned URL to share an S3 object
-        signed_url = storage.generate_presigned_url(
-            object_name=asset.asset.name,
-            disposition="attachment",
-            filename=asset.attributes.get("name"),
-        )
+        signed_url = storage.generate_presigned_url(object_name=asset.asset.name)
         # Redirect to the signed URL
         return HttpResponseRedirect(signed_url)
 

apps/api/plane/app/views/issue/base.py

@@ -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

apps/api/plane/app/views/page/base.py

@@ -198,7 +198,6 @@ class PageViewSet(BaseViewSet):
     def retrieve(self, request, slug, project_id, pk=None):
         page = self.get_queryset().filter(pk=pk).first()
         project = Project.objects.get(pk=project_id)
-        track_visit = request.query_params.get("track_visit", "true").lower() == "true"
 
         """
         if the role is guest and guest_view_all_features is false and owned by is not
@@ -231,14 +230,13 @@ class PageViewSet(BaseViewSet):
             ).values_list("entity_identifier", flat=True)
             data = PageDetailSerializer(page).data
             data["issue_ids"] = issue_ids
-            if track_visit:
-                recent_visited_task.delay(
-                    slug=slug,
-                    entity_name="page",
-                    entity_identifier=pk,
-                    user_id=request.user.id,
-                    project_id=project_id,
-                )
+            recent_visited_task.delay(
+                slug=slug,
+                entity_name="page",
+                entity_identifier=pk,
+                user_id=request.user.id,
+                project_id=project_id,
+            )
             return Response(data, status=status.HTTP_200_OK)
 
     @allow_permission([ROLE.ADMIN], model=Page, creator=True)

apps/api/plane/app/views/search/issue.py

@@ -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
 

apps/api/plane/app/views/workspace/draft.py

@@ -172,14 +172,12 @@ class WorkspaceDraftIssueViewSet(BaseViewSet):
                 {"error": "Issue not found"}, status=status.HTTP_404_NOT_FOUND
             )
 
-        project_id = request.data.get("project_id", issue.project_id)
-
         serializer = DraftIssueCreateSerializer(
             issue,
             data=request.data,
             partial=True,
             context={
-                "project_id": project_id,
+                "project_id": request.data.get("project_id", None),
                 "cycle_id": request.data.get("cycle_id", "not_provided"),
             },
         )

apps/api/plane/bgtasks/api_logs_task.py

@@ -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)

apps/api/plane/bgtasks/cleanup_task.py

@@ -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 is not None 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",
-    )

apps/api/plane/celery.py

@@ -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
-    },
 }
 
 

apps/api/plane/settings/common.py

@@ -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",
@@ -465,7 +465,3 @@ if ENABLE_DRF_SPECTACULAR:
     REST_FRAMEWORK["DEFAULT_SCHEMA_CLASS"] = "drf_spectacular.openapi.AutoSchema"
     INSTALLED_APPS.append("drf_spectacular")
     from .openapi import SPECTACULAR_SETTINGS  # noqa: F401
-
-# MongoDB Settings
-MONGO_DB_URL = os.environ.get("MONGO_DB_URL", False)
-MONGO_DB_DATABASE = os.environ.get("MONGO_DB_DATABASE", False)

apps/api/plane/settings/local.py

@@ -73,10 +73,5 @@ LOGGING = {
             "handlers": ["console"],
             "propagate": False,
         },
-        "plane.mongo": {
-            "level": "INFO",
-            "handlers": ["console"],
-            "propagate": False,
-        },
     },
 }

apps/api/plane/settings/mongo.py

@@ -1,124 +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
-        """
-
-        if cls._client is None:
-            cls._instance = cls()
-        return cls._client is not None and cls._db is not None

apps/api/plane/settings/production.py

@@ -83,10 +83,5 @@ LOGGING = {
             "handlers": ["console"],
             "propagate": False,
         },
-        "plane.mongo": {
-            "level": "INFO",
-            "handlers": ["console"],
-            "propagate": False,
-        },
     },
 }

apps/api/plane/space/serializer/issue.py

@@ -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
 

apps/api/plane/utils/content_validator.py

@@ -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

apps/api/requirements/base.txt

@@ -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

apps/live/.eslintrc.json

@@ -0,0 +1,5 @@
+{
+  "root": true,
+  "extends": ["@plane/eslint-config/server.js"],
+  "parser": "@typescript-eslint/parser"
+}

apps/live/eslint.config.js

@@ -1,4 +0,0 @@
-import { config } from "@plane/eslint-config/server";
-
-/** @type {import("eslint").Linter.Config} */
-export default config;

apps/live/src/core/extensions/index.ts

@@ -1,17 +1,20 @@
+// Third-party libraries
+import { Redis } from "ioredis";
+// Hocuspocus extensions and core
 import { Database } from "@hocuspocus/extension-database";
+import { Extension } from "@hocuspocus/server";
 import { Logger } from "@hocuspocus/extension-logger";
 import { Redis as HocusPocusRedis } from "@hocuspocus/extension-redis";
-import { Extension } from "@hocuspocus/server";
-import { Redis } from "ioredis";
 // core helpers and utilities
 import { manualLogger } from "@/core/helpers/logger.js";
+import { getRedisUrl } from "@/core/lib/utils/redis-url.js";
 // core libraries
 import { fetchPageDescriptionBinary, updatePageDescription } from "@/core/lib/page.js";
-import { getRedisUrl } from "@/core/lib/utils/redis-url.js";
-import { type HocusPocusServerContext, type TDocumentTypes } from "@/core/types/common.js";
 // plane live libraries
 import { fetchDocument } from "@/plane-live/lib/fetch-document.js";
 import { updateDocument } from "@/plane-live/lib/update-document.js";
+// types
+import { type HocusPocusServerContext, type TDocumentTypes } from "@/core/types/common.js";
 
 export const getExtensions: () => Promise<Extension[]> = async () => {
   const extensions: Extension[] = [

apps/live/src/core/hocuspocus-server.ts

@@ -1,12 +1,12 @@
 import { Server } from "@hocuspocus/server";
 import { v4 as uuidv4 } from "uuid";
-// editor types
-import { TUserDetails } from "@plane/editor";
-import { DocumentCollaborativeEvents, TDocumentEventsServer } from "@plane/editor/lib";
-// extensions
-import { getExtensions } from "@/core/extensions/index.js";
 // lib
 import { handleAuthentication } from "@/core/lib/authentication.js";
+// extensions
+import { getExtensions } from "@/core/extensions/index.js";
+import { DocumentCollaborativeEvents, TDocumentEventsServer } from "@plane/editor/lib";
+// editor types
+import { TUserDetails } from "@plane/editor";
 // types
 import { type HocusPocusServerContext } from "@/core/types/common.js";
 

apps/live/src/core/lib/authentication.ts

@@ -1,7 +1,7 @@
-// core helpers
-import { manualLogger } from "@/core/helpers/logger.js";
 // services
 import { UserService } from "@/core/services/user.service.js";
+// core helpers
+import { manualLogger } from "@/core/helpers/logger.js";
 
 const userService = new UserService();
 

apps/live/src/core/services/api.service.ts

@@ -14,7 +14,6 @@ export abstract class APIService {
     this.axiosInstance = axios.create({
       baseURL,
       withCredentials: true,
-      timeout: 20000,
     });
   }
 

apps/live/src/server.ts

@@ -1,13 +1,13 @@
 import compression from "compression";
 import cors from "cors";
-import express, { Request, Response } from "express";
 import expressWs from "express-ws";
+import express, { Request, Response } from "express";
 import helmet from "helmet";
 // hocuspocus server
+import { getHocusPocusServer } from "@/core/hocuspocus-server.js";
 // helpers
 import { convertHTMLDocumentToAllFormats } from "@/core/helpers/convert-document.js";
 import { logger, manualLogger } from "@/core/helpers/logger.js";
-import { getHocusPocusServer } from "@/core/hocuspocus-server.js";
 // types
 import { TConvertDocumentRequestBody } from "@/core/types/common.js";
 

apps/space/.eslintignore

@@ -1,12 +0,0 @@
-.next/*
-out/*
-public/*
-dist/*
-node_modules/*
-.turbo/*
-.env*
-.env
-.env.local
-.env.development
-.env.production
-.env.test

apps/space/.eslintrc.js

@@ -0,0 +1,6 @@
+/** @type {import("eslint").Linter.Config} */
+module.exports = {
+  root: true,
+  extends: ["@plane/eslint-config/next.js"],
+  parser: "@typescript-eslint/parser",
+};

apps/space/helpers/string.helper.ts

@@ -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"])
   );
 };
 

apps/space/package.json

@@ -58,12 +58,13 @@
     "@plane/eslint-config": "workspace:*",
     "@plane/tailwind-config": "workspace:*",
     "@plane/typescript-config": "workspace:*",
-    "@types/lodash": "4.17.20",
+    "@types/lodash": "^4.17.6",
     "@types/node": "18.14.1",
     "@types/nprogress": "^0.2.0",
     "@types/react": "^18.3.11",
     "@types/react-dom": "^18.2.18",
     "@types/uuid": "^9.0.1",
+    "@typescript-eslint/eslint-plugin": "^8.36.0",
     "typescript": "5.8.3"
   }
 }

apps/web/.eslintignore

@@ -1,13 +1,4 @@
 .next/*
 out/*
 public/*
-core/local-db/worker/wa-sqlite/src/*
-dist/*
-node_modules/*
-.turbo/*
-.env*
-.env
-.env.local
-.env.development
-.env.production
-.env.test
+core/local-db/worker/wa-sqlite/src/*

apps/web/.eslintrc.js

@@ -0,0 +1,6 @@
+/** @type {import("eslint").Linter.Config} */
+module.exports = {
+  root: true,
+  extends: ["@plane/eslint-config/next.js"],
+  parser: "@typescript-eslint/parser",
+};

apps/web/app/(all)/[workspaceSlug]/(projects)/browse/[workItem]/page.tsx

@@ -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} />

apps/web/app/(all)/[workspaceSlug]/(projects)/projects/(detail)/[projectId]/intake/layout.tsx

@@ -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 (

apps/web/app/(all)/[workspaceSlug]/(projects)/projects/(detail)/[projectId]/issues/(detail)/[issueId]/page.tsx

@@ -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]);
 

apps/web/app/(all)/[workspaceSlug]/(projects)/sidebar.tsx

@@ -1,24 +1,36 @@
-import { FC } from "react";
+import { FC, useEffect, useRef } from "react";
 import isEmpty from "lodash/isEmpty";
 import { observer } from "mobx-react";
 // plane helpers
 import { EUserPermissions, EUserPermissionsLevel } from "@plane/constants";
+import { useOutsideClickDetector } from "@plane/hooks";
 // components
-import { SidebarWrapper } from "@/components/sidebar/sidebar-wrapper";
+import { AppSidebarToggleButton } from "@/components/sidebar/sidebar-toggle-button";
+import { SidebarDropdown } from "@/components/workspace/sidebar/dropdown";
 import { SidebarFavoritesMenu } from "@/components/workspace/sidebar/favorites/favorites-menu";
+import { HelpMenu } from "@/components/workspace/sidebar/help-menu";
 import { SidebarProjectsList } from "@/components/workspace/sidebar/projects-list";
 import { SidebarQuickActions } from "@/components/workspace/sidebar/quick-actions";
 import { SidebarMenuItems } from "@/components/workspace/sidebar/sidebar-menu-items";
 // hooks
+import { useAppTheme } from "@/hooks/store/use-app-theme";
 import { useFavorite } from "@/hooks/store/use-favorite";
 import { useUserPermissions } from "@/hooks/store/user";
+import { useAppRail } from "@/hooks/use-app-rail";
+import useSize from "@/hooks/use-window-size";
 // plane web components
+import { WorkspaceEditionBadge } from "@/plane-web/components/workspace/edition-badge";
 import { SidebarTeamsList } from "@/plane-web/components/workspace/sidebar/teams-sidebar-list";
 
 export const AppSidebar: FC = observer(() => {
   // store hooks
   const { allowPermissions } = useUserPermissions();
+  const { toggleSidebar, sidebarCollapsed } = useAppTheme();
+  const { shouldRenderAppRail, isEnabled: isAppRailEnabled } = useAppRail();
   const { groupedFavorites } = useFavorite();
+  const windowSize = useSize();
+  // refs
+  const ref = useRef<HTMLDivElement>(null);
 
   // derived values
   const canPerformWorkspaceMemberActions = allowPermissions(
@@ -26,17 +38,55 @@ export const AppSidebar: FC = observer(() => {
     EUserPermissionsLevel.WORKSPACE
   );
 
+  useOutsideClickDetector(ref, () => {
+    if (sidebarCollapsed === false) {
+      if (window.innerWidth < 768) {
+        toggleSidebar();
+      }
+    }
+  });
+
+  useEffect(() => {
+    if (windowSize[0] < 768 && !sidebarCollapsed) toggleSidebar();
+    // eslint-disable-next-line react-hooks/exhaustive-deps
+  }, [windowSize]);
+
   const isFavoriteEmpty = isEmpty(groupedFavorites);
 
   return (
-    <SidebarWrapper title="Projects" quickActions={<SidebarQuickActions />}>
-      <SidebarMenuItems />
-      {/* Favorites Menu */}
-      {canPerformWorkspaceMemberActions && !isFavoriteEmpty && <SidebarFavoritesMenu />}
-      {/* Teams List */}
-      <SidebarTeamsList />
-      {/* Projects List */}
-      <SidebarProjectsList />
-    </SidebarWrapper>
+    <>
+      <div className="flex flex-col gap-3 px-3">
+        {/* Workspace switcher and settings */}
+        {!shouldRenderAppRail && <SidebarDropdown />}
+
+        {isAppRailEnabled && (
+          <div className="flex items-center justify-between gap-2">
+            <span className="text-md text-custom-text-200 font-medium pt-1">Projects</span>
+            <div className="flex items-center gap-2">
+              <AppSidebarToggleButton />
+            </div>
+          </div>
+        )}
+        {/* Quick actions */}
+        <SidebarQuickActions />
+      </div>
+      <div className="flex flex-col gap-3 overflow-x-hidden scrollbar-sm h-full w-full overflow-y-auto vertical-scrollbar px-3 pt-3 pb-0.5">
+        <SidebarMenuItems />
+        {/* Favorites Menu */}
+        {canPerformWorkspaceMemberActions && !isFavoriteEmpty && <SidebarFavoritesMenu />}
+        {/* Teams List */}
+        <SidebarTeamsList />
+        {/* Projects List */}
+        <SidebarProjectsList />
+      </div>
+      {/* Help Section */}
+      <div className="flex items-center justify-between p-3 border-t border-custom-border-200 bg-custom-sidebar-background-100 h-12">
+        <WorkspaceEditionBadge />
+        <div className="flex items-center gap-2">
+          {!shouldRenderAppRail && <HelpMenu />}
+          {!isAppRailEnabled && <AppSidebarToggleButton />}
+        </div>
+      </div>
+    </>
   );
 });

apps/web/app/(all)/[workspaceSlug]/(settings)/settings/projects/[projectId]/members/page.tsx

@@ -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(() => {

apps/web/ce/components/breadcrumbs/project-feature.tsx

@@ -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;

apps/web/ce/components/common/index.ts

@@ -0,0 +1,2 @@
+export * from "./subscription";
+export * from "./extended-app-header";

apps/web/ce/components/common/subscription/index.ts

@@ -0,0 +1 @@
+export * from "./subscription-pill";

apps/web/ce/components/de-dupe/index.ts

@@ -0,0 +1,4 @@
+export * from "./de-dupe-button";
+export * from "./duplicate-modal";
+export * from "./duplicate-popover";
+export * from "./issue-block";

apps/web/ce/components/de-dupe/issue-block/index.ts

@@ -0,0 +1 @@
+export * from "./button-label";

apps/web/ce/components/epics/index.ts

@@ -0,0 +1 @@
+export * from "./epic-modal";

apps/web/ce/components/projects/navigation/index.ts

@@ -0,0 +1 @@
+export * from "./helper";

apps/web/ce/components/projects/settings/intake/index.ts

@@ -0,0 +1 @@
+export * from "./header";

apps/web/ce/components/projects/teamspaces/index.ts

@@ -0,0 +1 @@
+export * from "./teamspace-list";

apps/web/core/components/analytics/select/analytics-params.tsx

@@ -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]}
             />
           )}
         />

apps/web/core/components/analytics/work-items/customized-insights.tsx

@@ -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}
         />
       }
     >

apps/web/core/components/analytics/work-items/modal/content.tsx

@@ -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>

apps/web/core/components/analytics/work-items/modal/index.tsx

@@ -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;
 });

apps/web/core/components/core/app-header.tsx

@@ -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;

apps/web/core/components/core/modals/existing-issues-list-modal.tsx

@@ -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;

apps/web/core/components/cycles/list/cycles-list-item.tsx

@@ -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 ?? ""}

apps/web/core/components/editor/lite-text/editor.tsx

@@ -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(

apps/web/core/components/editor/sticky-editor/editor.tsx

@@ -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)}

apps/web/core/components/inbox/content/inbox-issue-header.tsx

@@ -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")}

apps/web/core/components/inbox/content/issue-root.tsx

@@ -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";

apps/web/core/components/inbox/modals/create-modal/create-root.tsx

@@ -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";

apps/web/core/components/issues/issue-detail-widgets/relations/content.tsx

@@ -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

apps/web/core/components/issues/issue-detail/main-content.tsx

@@ -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

apps/web/core/components/issues/issue-layouts/utils.tsx

@@ -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;

apps/web/core/components/issues/issue-modal/form.tsx

@@ -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";

apps/web/core/components/issues/peek-overview/issue-detail.tsx

@@ -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";

apps/web/core/components/issues/peek-overview/view.tsx

@@ -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;
 

apps/web/core/components/license/modal/card/base-paid-plan-card.tsx

@@ -19,6 +19,7 @@ export type TBasePaidPlanCardProps = {
   extraFeatures?: string | React.ReactNode;
   renderPriceContent: (price: TSubscriptionPrice) => React.ReactNode;
   renderActionButton: (price: TSubscriptionPrice) => React.ReactNode;
+  isSelfHosted: boolean;
 };
 
 export const BasePaidPlanCard: FC<TBasePaidPlanCardProps> = observer((props) => {
@@ -30,10 +31,11 @@ export const BasePaidPlanCard: FC<TBasePaidPlanCardProps> = observer((props) =>
     extraFeatures,
     renderPriceContent,
     renderActionButton,
+    isSelfHosted,
   } = props;
   // states
   const [selectedPlan, setSelectedPlan] = useState<TBillingFrequency>("month");
-  const basePlan = getBaseSubscriptionName(planVariant);
+  const basePlan = getBaseSubscriptionName(planVariant, isSelfHosted);
   const upgradeCardVariantStyle = getUpgradeCardVariantStyle(planVariant);
   // Plane details
   const planeName = getSubscriptionName(planVariant);

apps/web/core/components/license/modal/card/plan-upgrade.tsx

@@ -107,6 +107,7 @@ export const PlanUpgradeCard: FC<PlanUpgradeCardProps> = observer((props) => {
           isTrialAllowed={isTrialAllowed}
         />
       )}
+      isSelfHosted={isSelfHosted}
     />
   );
 });

apps/web/core/components/license/modal/card/talk-to-sales.tsx

@@ -107,6 +107,7 @@ export const TalkToSalesCard: FC<TalkToSalesCardProps> = observer((props) => {
       extraFeatures={extraFeatures}
       renderPriceContent={renderPriceContent}
       renderActionButton={renderActionButton}
+      isSelfHosted={isSelfHosted}
     />
   );
 });

apps/web/core/components/settings/sidebar/header.tsx

@@ -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;

apps/web/core/components/sidebar/sidebar-wrapper.tsx

@@ -1,72 +0,0 @@
-import { FC, useEffect, useRef } from "react";
-import { observer } from "mobx-react";
-// plane helpers
-import { useOutsideClickDetector } from "@plane/hooks";
-// components
-import { AppSidebarToggleButton } from "@/components/sidebar/sidebar-toggle-button";
-import { SidebarDropdown } from "@/components/workspace/sidebar/dropdown";
-import { HelpMenu } from "@/components/workspace/sidebar/help-menu";
-// hooks
-import { useAppTheme } from "@/hooks/store/use-app-theme";
-import { useAppRail } from "@/hooks/use-app-rail";
-import useSize from "@/hooks/use-window-size";
-// plane web components
-import { WorkspaceEditionBadge } from "@/plane-web/components/workspace/edition-badge";
-
-type TSidebarWrapperProps = {
-  title: string;
-  children: React.ReactNode;
-  quickActions?: React.ReactNode;
-};
-
-export const SidebarWrapper: FC<TSidebarWrapperProps> = observer((props) => {
-  const { children, title, quickActions } = props;
-  // store hooks
-  const { toggleSidebar, sidebarCollapsed } = useAppTheme();
-  const { shouldRenderAppRail, isEnabled: isAppRailEnabled } = useAppRail();
-  const windowSize = useSize();
-  // refs
-  const ref = useRef<HTMLDivElement>(null);
-
-  useOutsideClickDetector(ref, () => {
-    if (sidebarCollapsed === false && window.innerWidth < 768) {
-      toggleSidebar();
-    }
-  });
-
-  useEffect(() => {
-    if (windowSize[0] < 768 && !sidebarCollapsed) toggleSidebar();
-    // eslint-disable-next-line react-hooks/exhaustive-deps
-  }, [windowSize]);
-
-  return (
-    <div ref={ref} className="flex flex-col h-full w-full">
-      <div className="flex flex-col gap-3 px-3">
-        {/* Workspace switcher and settings */}
-        {!shouldRenderAppRail && <SidebarDropdown />}
-
-        {isAppRailEnabled && (
-          <div className="flex items-center justify-between gap-2">
-            <span className="text-md text-custom-text-200 font-medium pt-1">{title}</span>
-            <div className="flex items-center gap-2">
-              <AppSidebarToggleButton />
-            </div>
-          </div>
-        )}
-        {/* Quick actions */}
-        {quickActions}
-      </div>
-      <div className="flex flex-col gap-3 overflow-x-hidden scrollbar-sm h-full w-full overflow-y-auto vertical-scrollbar px-3 pt-3 pb-0.5">
-        {children}
-      </div>
-      {/* Help Section */}
-      <div className="flex items-center justify-between p-3 border-t border-custom-border-200 bg-custom-sidebar-background-100 h-12">
-        <WorkspaceEditionBadge />
-        <div className="flex items-center gap-2">
-          {!shouldRenderAppRail && <HelpMenu />}
-          {!isAppRailEnabled && <AppSidebarToggleButton />}
-        </div>
-      </div>
-    </div>
-  );
-});

apps/web/core/components/workspace/sidebar/dropdown-item.tsx

@@ -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;

apps/web/core/components/workspace/sidebar/sidebar-item.tsx

@@ -7,7 +7,6 @@ import { useParams, usePathname } from "next/navigation";
 // plane imports
 import { EUserPermissionsLevel, IWorkspaceSidebarNavigationItem } from "@plane/constants";
 import { useTranslation } from "@plane/i18n";
-import { joinUrlPath } from "@plane/utils";
 // components
 import { SidebarNavItem } from "@/components/sidebar/sidebar-navigation";
 import { NotificationAppSidebarOption } from "@/components/workspace-notifications/notification-app-sidebar-option";
@@ -48,13 +47,13 @@ export const SidebarItemBase: FC<Props> = observer(({ item, additionalRender, ad
   const isPinned = sidebarPreference?.[item.key]?.is_pinned;
   if (!isPinned && !staticItems.includes(item.key)) return null;
 
-  const itemHref =
-    item.key === "your_work" && data?.id ? joinUrlPath(slug, item.href, data?.id) : joinUrlPath(slug, item.href);
+  const itemHref = item.key === "your_work" ? `/${slug}${item.href}${data?.id}/` : `/${slug}${item.href}`;
+  const isActive = itemHref === pathname;
   const icon = getSidebarNavigationItemIcon(item.key);
 
   return (
     <Link href={itemHref} onClick={handleLinkClick}>
-      <SidebarNavItem isActive={item.highlight(pathname, itemHref)}>
+      <SidebarNavItem isActive={isActive}>
         <div className="flex items-center gap-1.5 py-[1px]">
           {icon}
           <p className="text-sm leading-5 font-medium">{t(item.labelTranslationKey)}</p>

apps/web/core/services/issue/issue.service.ts

@@ -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

apps/web/core/services/page/project-page.service.ts

@@ -23,12 +23,8 @@ export class ProjectPageService extends APIService {
       });
   }
 
-  async fetchById(workspaceSlug: string, projectId: string, pageId: string, trackVisit: boolean): Promise<TPage> {
-    return this.get(`/api/workspaces/${workspaceSlug}/projects/${projectId}/pages/${pageId}/`, {
-      params: {
-        track_visit: trackVisit,
-      },
-    })
+  async fetchById(workspaceSlug: string, projectId: string, pageId: string): Promise<TPage> {
+    return this.get(`/api/workspaces/${workspaceSlug}/projects/${projectId}/pages/${pageId}/`)
       .then((response) => response?.data)
       .catch((error) => {
         throw error?.response?.data;

apps/web/core/store/issue/issue-details/root.store.ts

@@ -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;
 

apps/web/core/store/pages/project-page.store.ts

@@ -49,12 +49,7 @@ export interface IProjectPageStore {
     projectId: string,
     pageType?: TPageNavigationTabs
   ) => Promise<TPage[] | undefined>;
-  fetchPageDetails: (
-    workspaceSlug: string,
-    projectId: string,
-    pageId: string,
-    options?: { trackVisit?: boolean }
-  ) => Promise<TPage | undefined>;
+  fetchPageDetails: (workspaceSlug: string, projectId: string, pageId: string) => Promise<TPage | undefined>;
   createPage: (pageData: Partial<TPage>) => Promise<TPage | undefined>;
   removePage: (pageId: string) => Promise<void>;
   movePage: (workspaceSlug: string, projectId: string, pageId: string, newProjectId: string) => Promise<void>;
@@ -244,9 +239,7 @@ export class ProjectPageStore implements IProjectPageStore {
    * @description fetch the details of a page
    * @param {string} pageId
    */
-  fetchPageDetails = async (...args: Parameters<IProjectPageStore["fetchPageDetails"]>) => {
-    const [workspaceSlug, projectId, pageId, options] = args;
-    const { trackVisit } = options || {};
+  fetchPageDetails = async (workspaceSlug: string, projectId: string, pageId: string) => {
     try {
       if (!workspaceSlug || !projectId || !pageId) return undefined;
 
@@ -256,7 +249,7 @@ export class ProjectPageStore implements IProjectPageStore {
         this.error = undefined;
       });
 
-      const page = await this.service.fetchById(workspaceSlug, projectId, pageId, trackVisit ?? true);
+      const page = await this.service.fetchById(workspaceSlug, projectId, pageId);
 
       runInAction(() => {
         if (page?.id) {

apps/web/ee/components/de-dupe/index.ts

@@ -0,0 +1 @@
+export * from "ce/components/de-dupe";

apps/web/ee/components/epics/index.ts

@@ -0,0 +1 @@
+export * from "ce/components/epics";

apps/web/ee/components/projects/settings/intake/index.ts

@@ -0,0 +1 @@
+export * from "ce/components/projects/settings/intake";

apps/web/eslint.config.js

@@ -1,4 +0,0 @@
-import { config } from "@plane/eslint-config/next";
-
-/** @type {import("eslint").Linter.Config} */
-export default config;

apps/web/next.config.js

@@ -12,7 +12,7 @@ const nextConfig = {
     return [
       {
         source: "/(.*)?",
-        headers: [{ key: "X-Frame-Options", value: "DENY" }],
+        headers: [{ key: "X-Frame-Options", value: "SAMEORIGIN" }],
       },
     ];
   },