Merge branch 'fix-sub_issues_deletion' of github.com:makeplane/plane into fix-sub_issues_deletion

.dockerignore

@@ -16,48 +16,3 @@ out/
 **/out/
 dist/
 **/dist/
-# Logs
-npm-debug.log*
-pnpm-debug.log*
-.pnpm-debug.log*
-yarn-debug.log*
-yarn-error.log*
-
-# OS junk
-.DS_Store
-Thumbs.db
-
-# Editor settings
-.vscode
-.idea
-
-# Coverage and test output
-coverage/
-**/coverage/
-*.lcov
-.junit/
-test-results/
-
-# Caches and build artifacts
-.cache/
-**/.cache/
-storybook-static/
-*storybook.log
-*.tsbuildinfo
-
-# Local env and secrets
-.env.local
-.env.development.local
-.env.test.local
-.env.production.local
-.secrets
-tmp/
-temp/
-
-# Database/cache dumps
-*.rdb
-*.rdb.gz
-
-# Misc
-*.pem
-*.key

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

@@ -38,17 +38,14 @@ jobs:
         with:
           node-version-file: ".nvmrc"
 
-      - name: Enable Corepack and pnpm
-        run: corepack enable pnpm
-
       - name: Install dependencies
-        run: pnpm install --frozen-lockfile
+        run: yarn install --frozen-lockfile
 
       - name: Lint web apps
-        run: pnpm run check:lint
+        run: yarn check:lint
 
       - name: Check format
-        run: pnpm run check:format
+        run: yarn check:format
 
       - name: Build apps
-        run: pnpm run build
+        run: yarn build

.gitignore

@@ -24,13 +24,11 @@ out/
 .DS_Store
 *.pem
 .history
-tsconfig.tsbuildinfo
 
 # Debug
 npm-debug.log*
 yarn-debug.log*
 yarn-error.log*
-pnpm-debug.log*
 .pnpm-debug.log*
 
 # Local env files
@@ -62,7 +60,6 @@ node_modules/
 assets/dist/
 npm-debug.log
 yarn-error.log
-pnpm-debug.log
 
 # Editor directories and files
 .idea
@@ -78,9 +75,10 @@ package-lock.json
 
 # lock files
 package-lock.json
+pnpm-lock.yaml
+pnpm-workspace.yaml
 
-
-
+.npmrc
 .secrets
 tmp/
 
@@ -97,5 +95,3 @@ dev-editor
 # Redis
 *.rdb
 *.rdb.gz
-
-storybook-static

.npmrc

@@ -1,34 +0,0 @@
-# Enforce pnpm workspace behavior and allow Turbo's lifecycle hooks if scripts are disabled
-# This repo uses pnpm with workspaces.
-
-# Prefer linking local workspace packages when available
-prefer-workspace-packages=true
-link-workspace-packages=true
-shared-workspace-lockfile=true
-
-# Make peer installs smoother across the monorepo
-auto-install-peers=true
-strict-peer-dependencies=false
-
-# If scripts are disabled (e.g., CI with --ignore-scripts), allowlisted packages can still run their hooks
-# 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[]=prettier
-public-hoist-pattern[]=typescript
-
-# Reproducible installs across CI and dev
-prefer-frozen-lockfile=true
-
-# Prefer resolving to highest versions in monorepo to reduce duplication
-resolution-mode=highest
-
-# Speed up native module builds by caching side effects
-side-effects-cache=true
-
-# Speed up local dev by reusing local store when possible
-prefer-offline=true
-
-# Ensure workspace protocol is used when adding internal deps
-save-workspace-protocol=true

.yarnrc.yml

@@ -0,0 +1 @@
+nodeLinker: node-modules

CONTRIBUTING.md

@@ -73,7 +73,7 @@ docker compose -f docker-compose-local.yml up
 4. Start web apps:
 
 ```bash
-pnpm dev
+yarn dev
 ```
 
 5. Open your browser to http://localhost:3001/god-mode/ and register yourself as instance admin

apps/admin/Dockerfile.admin

@@ -1,11 +1,5 @@
-# syntax=docker/dockerfile:1.7
 FROM node:22-alpine AS base
 
-# Setup pnpm package manager with corepack and configure global bin directory for caching
-ENV PNPM_HOME="/pnpm"
-ENV PATH="$PNPM_HOME:$PATH"
-RUN corepack enable
-
 # *****************************************************************************
 # STAGE 1: Build the project
 # *****************************************************************************
@@ -13,8 +7,7 @@ FROM base AS builder
 RUN apk add --no-cache libc6-compat
 WORKDIR /app
 
-ARG TURBO_VERSION=2.5.6
-RUN corepack enable pnpm && pnpm add -g turbo@${TURBO_VERSION}
+RUN yarn global add turbo
 COPY . .
 
 RUN turbo prune --scope=admin --docker
@@ -29,13 +22,11 @@ WORKDIR /app
 
 COPY .gitignore .gitignore
 COPY --from=builder /app/out/json/ .
-COPY --from=builder /app/out/pnpm-lock.yaml ./pnpm-lock.yaml
-RUN corepack enable pnpm
-RUN --mount=type=cache,id=pnpm-store,target=/pnpm/store pnpm fetch --store-dir=/pnpm/store
+COPY --from=builder /app/out/yarn.lock ./yarn.lock
+RUN yarn install --network-timeout 500000
 
 COPY --from=builder /app/out/full/ .
 COPY turbo.json turbo.json
-RUN --mount=type=cache,id=pnpm-store,target=/pnpm/store pnpm install --offline --frozen-lockfile --store-dir=/pnpm/store
 
 ARG NEXT_PUBLIC_API_BASE_URL=""
 ENV NEXT_PUBLIC_API_BASE_URL=$NEXT_PUBLIC_API_BASE_URL
@@ -58,7 +49,7 @@ ENV NEXT_PUBLIC_WEB_BASE_URL=$NEXT_PUBLIC_WEB_BASE_URL
 ENV NEXT_TELEMETRY_DISABLED=1
 ENV TURBO_TELEMETRY_DISABLED=1
 
-RUN pnpm turbo run build --filter=admin
+RUN yarn turbo run build --filter=admin
 
 # *****************************************************************************
 # STAGE 3: Copy the project and start it
@@ -100,4 +91,4 @@ ENV TURBO_TELEMETRY_DISABLED=1
 
 EXPOSE 3000
 
-CMD ["node", "apps/admin/server.js"]
+CMD ["node", "apps/admin/server.js"]

apps/admin/Dockerfile.dev

@@ -5,8 +5,8 @@ WORKDIR /app
 
 COPY . .
 
-RUN corepack enable pnpm && pnpm add -g turbo
-RUN pnpm install
+RUN yarn global add turbo
+RUN yarn install
 
 ENV NEXT_PUBLIC_ADMIN_BASE_PATH="/god-mode"
 
@@ -14,4 +14,4 @@ EXPOSE 3000
 
 VOLUME [ "/app/node_modules", "/app/admin/node_modules" ]
 
-CMD ["pnpm", "dev", "--filter=admin"]
+CMD ["yarn", "dev", "--filter=admin"]

apps/admin/package.json

@@ -18,13 +18,15 @@
   },
   "dependencies": {
     "@headlessui/react": "^1.7.19",
-    "@plane/constants": "workspace:*",
-    "@plane/hooks": "workspace:*",
-    "@plane/propel": "workspace:*",
-    "@plane/services": "workspace:*",
-    "@plane/types": "workspace:*",
-    "@plane/ui": "workspace:*",
-    "@plane/utils": "workspace:*",
+    "@plane/constants": "*",
+    "@plane/hooks": "*",
+    "@plane/propel": "*",
+    "@plane/services": "*",
+    "@plane/types": "*",
+    "@plane/ui": "*",
+    "@plane/utils": "*",
+    "@tailwindcss/typography": "^0.5.9",
+    "@types/lodash": "^4.17.0",
     "autoprefixer": "10.4.14",
     "axios": "1.11.0",
     "lodash": "^4.17.21",
@@ -37,15 +39,13 @@
     "react": "^18.3.1",
     "react-dom": "^18.3.1",
     "react-hook-form": "7.51.5",
-    "sharp": "^0.33.5",
     "swr": "^2.2.4",
     "uuid": "^9.0.1"
   },
   "devDependencies": {
-    "@plane/eslint-config": "workspace:*",
-    "@plane/tailwind-config": "workspace:*",
-    "@plane/typescript-config": "workspace:*",
-    "@types/lodash": "^4.17.6",
+    "@plane/eslint-config": "*",
+    "@plane/tailwind-config": "*",
+    "@plane/typescript-config": "*",
     "@types/node": "18.16.1",
     "@types/react": "^18.3.11",
     "@types/react-dom": "^18.2.18",

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

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

apps/api/plane/api/urls/issue.py

@@ -89,9 +89,7 @@ urlpatterns = [
     ),
     path(
         "workspaces/<str:slug>/projects/<uuid:project_id>/issues/<uuid:issue_id>/issue-attachments/<uuid:pk>/",
-        IssueAttachmentDetailAPIEndpoint.as_view(
-            http_method_names=["get", "patch", "delete"]
-        ),
+        IssueAttachmentDetailAPIEndpoint.as_view(http_method_names=["get", "delete"]),
         name="issue-attachment",
     ),
 ]

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/api/views/issue.py

@@ -75,7 +75,7 @@ from plane.bgtasks.storage_metadata_task import get_asset_object_metadata
 from .base import BaseAPIView
 from plane.utils.host import base_host
 from plane.bgtasks.webhook_task import model_activity
-from plane.app.permissions import ROLE
+
 from plane.utils.openapi import (
     work_item_docs,
     label_docs,
@@ -145,22 +145,6 @@ from plane.utils.openapi import (
 )
 from plane.bgtasks.work_item_link_task import crawl_work_item_link_title
 
-def user_has_issue_permission(
-    user_id, project_id, issue=None, allowed_roles=None, allow_creator=True
-):
-    if allow_creator and issue is not None and user_id == issue.created_by_id:
-        return True
-
-    qs = ProjectMember.objects.filter(
-        project_id=project_id,
-        member_id=user_id,
-        is_active=True,
-    )
-    if allowed_roles is not None:
-        qs = qs.filter(role__in=allowed_roles)
-
-    return qs.exists()
-
 
 class WorkspaceIssueAPIEndpoint(BaseAPIView):
     """
@@ -347,10 +331,6 @@ class IssueListCreateAPIEndpoint(BaseAPIView):
             )
         )
 
-        total_issue_queryset = Issue.issue_objects.filter(
-            project_id=project_id, workspace__slug=slug
-        )
-
         # Priority Ordering
         if order_by_param == "priority" or order_by_param == "-priority":
             priority_order = (
@@ -410,7 +390,6 @@ class IssueListCreateAPIEndpoint(BaseAPIView):
         return self.paginate(
             request=request,
             queryset=(issue_queryset),
-            total_count_queryset=total_issue_queryset,
             on_results=lambda issues: IssueSerializer(
                 issues, many=True, fields=self.fields, expand=self.expand
             ).data,
@@ -1803,6 +1782,7 @@ class IssueAttachmentListCreateAPIEndpoint(BaseAPIView):
 
     serializer_class = IssueAttachmentSerializer
     model = FileAsset
+    permission_classes = [ProjectEntityPermission]
     use_read_replica = True
 
     @issue_attachment_docs(
@@ -1885,22 +1865,6 @@ class IssueAttachmentListCreateAPIEndpoint(BaseAPIView):
         Generate presigned URL for uploading file attachments to a work item.
         Validates file type and size before creating the attachment record.
         """
-        issue = Issue.objects.get(
-            pk=issue_id, workspace__slug=slug, project_id=project_id
-        )
-        # if the user is creator or admin,member then allow the upload
-        if not user_has_issue_permission(
-            request.user.id,
-            project_id=project_id,
-            issue=issue,
-            allowed_roles=[ROLE.ADMIN.value, ROLE.MEMBER.value],
-            allow_creator=True,
-        ):
-            return Response(
-                {"error": "You are not allowed to upload this attachment"},
-                status=status.HTTP_403_FORBIDDEN,
-            )
-
         name = request.data.get("name")
         type = request.data.get("type", False)
         size = request.data.get("size")
@@ -2025,6 +1989,7 @@ class IssueAttachmentDetailAPIEndpoint(BaseAPIView):
     """Issue Attachment Detail Endpoint"""
 
     serializer_class = IssueAttachmentSerializer
+    permission_classes = [ProjectEntityPermission]
     model = FileAsset
     use_read_replica = True
 
@@ -2047,22 +2012,6 @@ class IssueAttachmentDetailAPIEndpoint(BaseAPIView):
         Soft delete an attachment from a work item by marking it as deleted.
         Records deletion activity and triggers metadata cleanup.
         """
-        issue = Issue.objects.get(
-            pk=issue_id, workspace__slug=slug, project_id=project_id
-        )
-        # if the request user is creator or admin then delete the attachment
-        if not user_has_issue_permission(
-            request.user,
-            project_id=project_id,
-            issue=issue,
-            allowed_roles=[ROLE.ADMIN.value],
-            allow_creator=True,
-        ):
-            return Response(
-                {"error": "You are not allowed to delete this attachment"},
-                status=status.HTTP_403_FORBIDDEN,
-            )
-
         issue_attachment = FileAsset.objects.get(
             pk=pk, workspace__slug=slug, project_id=project_id
         )
@@ -2125,19 +2074,6 @@ class IssueAttachmentDetailAPIEndpoint(BaseAPIView):
 
         Retrieve details of a specific attachment.
         """
-        # if the user is part of the project then allow the download
-        if not user_has_issue_permission(
-            request.user,
-            project_id=project_id,
-            issue=None,
-            allowed_roles=None,
-            allow_creator=False,
-        ):
-            return Response(
-                {"error": "You are not allowed to download this attachment"},
-                status=status.HTTP_403_FORBIDDEN,
-            )
-
         # Get the asset
         asset = FileAsset.objects.get(
             id=pk, workspace__slug=slug, project_id=project_id
@@ -2192,23 +2128,6 @@ class IssueAttachmentDetailAPIEndpoint(BaseAPIView):
         Mark an attachment as uploaded after successful file transfer to storage.
         Triggers activity logging and metadata extraction.
         """
-
-        issue = Issue.objects.get(
-            pk=issue_id, workspace__slug=slug, project_id=project_id
-        )
-        # if the user is creator or admin then allow the upload
-        if not user_has_issue_permission(
-            request.user,
-            project_id=project_id,
-            issue=issue,
-            allowed_roles=[ROLE.ADMIN.value, ROLE.MEMBER.value],
-            allow_creator=True,
-        ):
-            return Response(
-                {"error": "You are not allowed to upload this attachment"},
-                status=status.HTTP_403_FORBIDDEN,
-            )
-
         issue_attachment = FileAsset.objects.get(
             pk=pk, workspace__slug=slug, project_id=project_id
         )

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

@@ -908,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/views/issue/archive.py

@@ -3,7 +3,7 @@ import json
 
 # Django imports
 from django.core.serializers.json import DjangoJSONEncoder
-from django.db.models import F, Func, OuterRef, Q, Prefetch, Exists, Subquery, Count
+from django.db.models import F, Func, OuterRef, Q, Prefetch, Exists, Subquery
 from django.utils import timezone
 from django.utils.decorators import method_decorator
 from django.views.decorators.gzip import gzip_page
@@ -69,31 +69,25 @@ class IssueArchiveViewSet(BaseViewSet):
                 )
             )
             .annotate(
-                link_count=Subquery(
-                    IssueLink.objects.filter(issue=OuterRef("id"))
-                    .values("issue")
-                    .annotate(count=Count("id"))
-                    .values("count")
-                )
+                link_count=IssueLink.objects.filter(issue=OuterRef("id"))
+                .order_by()
+                .annotate(count=Func(F("id"), function="Count"))
+                .values("count")
             )
             .annotate(
-                attachment_count=Subquery(
-                    FileAsset.objects.filter(
-                        issue_id=OuterRef("id"),
-                        entity_type=FileAsset.EntityTypeContext.ISSUE_ATTACHMENT,
-                    )
-                    .values("issue_id")
-                    .annotate(count=Count("id"))
-                    .values("count")
+                attachment_count=FileAsset.objects.filter(
+                    issue_id=OuterRef("id"),
+                    entity_type=FileAsset.EntityTypeContext.ISSUE_ATTACHMENT,
                 )
+                .order_by()
+                .annotate(count=Func(F("id"), function="Count"))
+                .values("count")
             )
             .annotate(
-                sub_issues_count=Subquery(
-                    Issue.issue_objects.filter(parent=OuterRef("id"))
-                    .values("parent")
-                    .annotate(count=Count("id"))
-                    .values("count")
-                )
+                sub_issues_count=Issue.issue_objects.filter(parent=OuterRef("id"))
+                .order_by()
+                .annotate(count=Func(F("id"), function="Count"))
+                .values("count")
             )
         )
 
@@ -107,19 +101,6 @@ class IssueArchiveViewSet(BaseViewSet):
 
         issue_queryset = self.get_queryset().filter(**filters)
 
-        total_issue_queryset = Issue.objects.filter(
-            deleted_at__isnull=True,
-            archived_at__isnull=False,
-            project_id=project_id,
-            workspace__slug=slug,
-        ).filter(**filters)
-
-        total_issue_queryset = (
-            total_issue_queryset
-            if show_sub_issues == "true"
-            else total_issue_queryset.filter(parent__isnull=True)
-        )
-
         issue_queryset = (
             issue_queryset
             if show_sub_issues == "true"
@@ -155,7 +136,6 @@ class IssueArchiveViewSet(BaseViewSet):
                         request=request,
                         order_by=order_by_param,
                         queryset=issue_queryset,
-                        total_count_queryset=total_issue_queryset,
                         on_results=lambda issues: issue_on_results(
                             group_by=group_by, issues=issues, sub_group_by=sub_group_by
                         ),
@@ -190,7 +170,6 @@ class IssueArchiveViewSet(BaseViewSet):
                     request=request,
                     order_by=order_by_param,
                     queryset=issue_queryset,
-                    total_count_queryset=total_issue_queryset,
                     on_results=lambda issues: issue_on_results(
                         group_by=group_by, issues=issues, sub_group_by=sub_group_by
                     ),
@@ -217,7 +196,6 @@ class IssueArchiveViewSet(BaseViewSet):
                 order_by=order_by_param,
                 request=request,
                 queryset=issue_queryset,
-                total_count_queryset=total_issue_queryset,
                 on_results=lambda issues: issue_on_results(
                     group_by=group_by, issues=issues, sub_group_by=sub_group_by
                 ),

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,
@@ -214,33 +213,27 @@ class IssueViewSet(BaseViewSet):
                 )
             )
             .annotate(
-                link_count=Subquery(
-                    IssueLink.objects.filter(issue=OuterRef("id"))
-                    .values("issue")
-                    .annotate(count=Count("id"))
-                    .values("count")
-                )
+                link_count=IssueLink.objects.filter(issue=OuterRef("id"))
+                .order_by()
+                .annotate(count=Func(F("id"), function="Count"))
+                .values("count")
             )
             .annotate(
-                attachment_count=Subquery(
-                    FileAsset.objects.filter(
-                        issue_id=OuterRef("id"),
-                        entity_type=FileAsset.EntityTypeContext.ISSUE_ATTACHMENT,
-                    )
-                    .values("issue_id")
-                    .annotate(count=Count("id"))
-                    .values("count")
+                attachment_count=FileAsset.objects.filter(
+                    issue_id=OuterRef("id"),
+                    entity_type=FileAsset.EntityTypeContext.ISSUE_ATTACHMENT,
                 )
+                .order_by()
+                .annotate(count=Func(F("id"), function="Count"))
+                .values("count")
             )
             .annotate(
-                sub_issues_count=Subquery(
-                    Issue.issue_objects.filter(parent=OuterRef("id"))
-                    .values("parent")
-                    .annotate(count=Count("id"))
-                    .values("count")
-                )
+                sub_issues_count=Issue.issue_objects.filter(parent=OuterRef("id"))
+                .order_by()
+                .annotate(count=Func(F("id"), function="Count"))
+                .values("count")
             )
-        )
+        ).distinct()
 
     @method_decorator(gzip_page)
     @allow_permission([ROLE.ADMIN, ROLE.MEMBER, ROLE.GUEST])
@@ -256,10 +249,6 @@ class IssueViewSet(BaseViewSet):
         issue_queryset = self.get_queryset().filter(**filters, **extra_filters)
         # Custom ordering for priority and state
 
-        total_issue_queryset = Issue.issue_objects.filter(
-            project_id=project_id, workspace__slug=slug
-        ).filter(**filters, **extra_filters)
-
         # Issue queryset
         issue_queryset, order_by_param = order_issue_queryset(
             issue_queryset=issue_queryset, order_by_param=order_by_param
@@ -292,7 +281,6 @@ class IssueViewSet(BaseViewSet):
             and not project.guest_view_all_features
         ):
             issue_queryset = issue_queryset.filter(created_by=request.user)
-            total_issue_queryset = total_issue_queryset.filter(created_by=request.user)
 
         if group_by:
             if sub_group_by:
@@ -308,7 +296,6 @@ class IssueViewSet(BaseViewSet):
                         request=request,
                         order_by=order_by_param,
                         queryset=issue_queryset,
-                        total_count_queryset=total_issue_queryset,
                         on_results=lambda issues: issue_on_results(
                             group_by=group_by, issues=issues, sub_group_by=sub_group_by
                         ),
@@ -342,7 +329,6 @@ class IssueViewSet(BaseViewSet):
                     request=request,
                     order_by=order_by_param,
                     queryset=issue_queryset,
-                    total_count_queryset=total_issue_queryset,
                     on_results=lambda issues: issue_on_results(
                         group_by=group_by, issues=issues, sub_group_by=sub_group_by
                     ),
@@ -368,7 +354,6 @@ class IssueViewSet(BaseViewSet):
                 order_by=order_by_param,
                 request=request,
                 queryset=issue_queryset,
-                total_count_queryset=total_issue_queryset,
                 on_results=lambda issues: issue_on_results(
                     group_by=group_by, issues=issues, sub_group_by=sub_group_by
                 ),
@@ -1224,7 +1209,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 +1301,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/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/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 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/db/migrations/0101_description_descriptionversion.py

@@ -1,182 +0,0 @@
-# Generated by Django 4.2.21 on 2025-08-19 11:52
-
-from django.conf import settings
-from django.db import migrations, models
-import django.db.models.deletion
-import uuid
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ("db", "0100_profile_has_marketing_email_consent_and_more"),
-    ]
-
-    operations = [
-        migrations.CreateModel(
-            name="Description",
-            fields=[
-                (
-                    "created_at",
-                    models.DateTimeField(auto_now_add=True, verbose_name="Created At"),
-                ),
-                (
-                    "updated_at",
-                    models.DateTimeField(
-                        auto_now=True, verbose_name="Last Modified At"
-                    ),
-                ),
-                (
-                    "deleted_at",
-                    models.DateTimeField(
-                        blank=True, null=True, verbose_name="Deleted At"
-                    ),
-                ),
-                (
-                    "id",
-                    models.UUIDField(
-                        db_index=True,
-                        default=uuid.uuid4,
-                        editable=False,
-                        primary_key=True,
-                        serialize=False,
-                        unique=True,
-                    ),
-                ),
-                ("description_json", models.JSONField(blank=True, default=dict)),
-                ("description_html", models.TextField(blank=True, default="<p></p>")),
-                ("description_binary", models.BinaryField(null=True)),
-                ("description_stripped", models.TextField(blank=True, null=True)),
-                (
-                    "created_by",
-                    models.ForeignKey(
-                        null=True,
-                        on_delete=django.db.models.deletion.SET_NULL,
-                        related_name="%(class)s_created_by",
-                        to=settings.AUTH_USER_MODEL,
-                        verbose_name="Created By",
-                    ),
-                ),
-                (
-                    "project",
-                    models.ForeignKey(
-                        null=True,
-                        on_delete=django.db.models.deletion.CASCADE,
-                        related_name="project_%(class)s",
-                        to="db.project",
-                    ),
-                ),
-                (
-                    "updated_by",
-                    models.ForeignKey(
-                        null=True,
-                        on_delete=django.db.models.deletion.SET_NULL,
-                        related_name="%(class)s_updated_by",
-                        to=settings.AUTH_USER_MODEL,
-                        verbose_name="Last Modified By",
-                    ),
-                ),
-                (
-                    "workspace",
-                    models.ForeignKey(
-                        on_delete=django.db.models.deletion.CASCADE,
-                        related_name="workspace_%(class)s",
-                        to="db.workspace",
-                    ),
-                ),
-            ],
-            options={
-                "verbose_name": "Description",
-                "verbose_name_plural": "Descriptions",
-                "db_table": "descriptions",
-                "ordering": ("-created_at",),
-            },
-        ),
-        migrations.CreateModel(
-            name="DescriptionVersion",
-            fields=[
-                (
-                    "created_at",
-                    models.DateTimeField(auto_now_add=True, verbose_name="Created At"),
-                ),
-                (
-                    "updated_at",
-                    models.DateTimeField(
-                        auto_now=True, verbose_name="Last Modified At"
-                    ),
-                ),
-                (
-                    "deleted_at",
-                    models.DateTimeField(
-                        blank=True, null=True, verbose_name="Deleted At"
-                    ),
-                ),
-                (
-                    "id",
-                    models.UUIDField(
-                        db_index=True,
-                        default=uuid.uuid4,
-                        editable=False,
-                        primary_key=True,
-                        serialize=False,
-                        unique=True,
-                    ),
-                ),
-                ("description_json", models.JSONField(blank=True, default=dict)),
-                ("description_html", models.TextField(blank=True, default="<p></p>")),
-                ("description_binary", models.BinaryField(null=True)),
-                ("description_stripped", models.TextField(blank=True, null=True)),
-                (
-                    "created_by",
-                    models.ForeignKey(
-                        null=True,
-                        on_delete=django.db.models.deletion.SET_NULL,
-                        related_name="%(class)s_created_by",
-                        to=settings.AUTH_USER_MODEL,
-                        verbose_name="Created By",
-                    ),
-                ),
-                (
-                    "description",
-                    models.ForeignKey(
-                        on_delete=django.db.models.deletion.CASCADE,
-                        related_name="versions",
-                        to="db.description",
-                    ),
-                ),
-                (
-                    "project",
-                    models.ForeignKey(
-                        null=True,
-                        on_delete=django.db.models.deletion.CASCADE,
-                        related_name="project_%(class)s",
-                        to="db.project",
-                    ),
-                ),
-                (
-                    "updated_by",
-                    models.ForeignKey(
-                        null=True,
-                        on_delete=django.db.models.deletion.SET_NULL,
-                        related_name="%(class)s_updated_by",
-                        to=settings.AUTH_USER_MODEL,
-                        verbose_name="Last Modified By",
-                    ),
-                ),
-                (
-                    "workspace",
-                    models.ForeignKey(
-                        on_delete=django.db.models.deletion.CASCADE,
-                        related_name="workspace_%(class)s",
-                        to="db.workspace",
-                    ),
-                ),
-            ],
-            options={
-                "verbose_name": "Description Version",
-                "verbose_name_plural": "Description Versions",
-                "db_table": "description_versions",
-                "ordering": ("-created_at",),
-            },
-        ),
-    ]

apps/api/plane/db/models/__init__.py

@@ -83,5 +83,3 @@ from .label import Label
 from .device import Device, DeviceSession
 
 from .sticky import Sticky
-
-from .description import Description, DescriptionVersion

apps/api/plane/db/models/description.py

@@ -1,56 +0,0 @@
-from django.db import models
-from django.utils.html import strip_tags
-from .workspace import WorkspaceBaseModel
-
-
-class Description(WorkspaceBaseModel):
-
-
-    description_json = models.JSONField(default=dict, blank=True)
-    description_html = models.TextField(blank=True, default="<p></p>")
-    description_binary = models.BinaryField(null=True)
-    description_stripped = models.TextField(blank=True, null=True)
-
-    class Meta:
-        verbose_name = "Description"
-        verbose_name_plural = "Descriptions"
-        db_table = "descriptions"
-        ordering = ("-created_at",)
-
-    def save(self, *args, **kwargs):
-        # Strip the html tags using html parser
-        self.description_stripped = (
-            None
-            if (self.description_html == "" or self.description_html is None)
-            else strip_tags(self.description_html)
-        )
-        super(Description, self).save(*args, **kwargs)
-
-
-class DescriptionVersion(WorkspaceBaseModel):
-    """
-    DescriptionVersion is a model used to store historical versions of a Description.
-    """
-
-    description = models.ForeignKey(
-        "db.Description", on_delete=models.CASCADE, related_name="versions"
-    )
-    description_json = models.JSONField(default=dict, blank=True)
-    description_html = models.TextField(blank=True, default="<p></p>")
-    description_binary = models.BinaryField(null=True)
-    description_stripped = models.TextField(blank=True, null=True)
-
-    class Meta:
-        verbose_name = "Description Version"
-        verbose_name_plural = "Description Versions"
-        db_table = "description_versions"
-        ordering = ("-created_at",)
-
-    def save(self, *args, **kwargs):
-        # Strip the html tags using html parser
-        self.description_stripped = (
-            None
-            if (self.description_html == "" or self.description_html is None)
-            else strip_tags(self.description_html)
-        )
-        super(DescriptionVersion, self).save(*args, **kwargs)

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

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,121 +0,0 @@
-# Django imports
-from django.conf import settings
-import logging
-
-# Third party imports
-from pymongo import MongoClient
-from pymongo.database import Database
-from pymongo.collection import Collection
-from typing import Optional, TypeVar, Type
-
-
-T = TypeVar("T", bound="MongoConnection")
-
-# Set up logger
-logger = logging.getLogger("plane.mongo")
-
-
-class MongoConnection:
-    """
-    A singleton class that manages MongoDB connections.
-
-    This class ensures only one MongoDB connection is maintained throughout the application.
-    It provides methods to access the MongoDB client, database, and collections.
-
-    Attributes:
-        _instance (Optional[MongoConnection]): The singleton instance of this class
-        _client (Optional[MongoClient]): The MongoDB client instance
-        _db (Optional[Database]): The MongoDB database instance
-    """
-
-    _instance: Optional["MongoConnection"] = None
-    _client: Optional[MongoClient] = None
-    _db: Optional[Database] = None
-
-    def __new__(cls: Type[T]) -> T:
-        """
-        Creates a new instance of MongoConnection if one doesn't exist.
-
-        Returns:
-            MongoConnection: The singleton instance
-        """
-        if cls._instance is None:
-            cls._instance = super(MongoConnection, cls).__new__(cls)
-            try:
-                mongo_url = getattr(settings, "MONGO_DB_URL", None)
-                mongo_db_database = getattr(settings, "MONGO_DB_DATABASE", None)
-
-                if not mongo_url or not mongo_db_database:
-                    logger.warning(
-                        "MongoDB connection parameters not configured. MongoDB functionality will be disabled."
-                    )
-                    return cls._instance
-
-                cls._client = MongoClient(mongo_url)
-                cls._db = cls._client[mongo_db_database]
-
-                # Test the connection
-                cls._client.server_info()
-                logger.info("MongoDB connection established successfully")
-            except Exception as e:
-                logger.warning(
-                    f"Failed to initialize MongoDB connection: {str(e)}. MongoDB functionality will be disabled."
-                )
-        return cls._instance
-
-    @classmethod
-    def get_client(cls) -> Optional[MongoClient]:
-        """
-        Returns the MongoDB client instance.
-
-        Returns:
-            Optional[MongoClient]: The MongoDB client instance or None if not configured
-        """
-        if cls._client is None:
-            cls._instance = cls()
-        return cls._client
-
-    @classmethod
-    def get_db(cls) -> Optional[Database]:
-        """
-        Returns the MongoDB database instance.
-
-        Returns:
-            Optional[Database]: The MongoDB database instance or None if not configured
-        """
-        if cls._db is None:
-            cls._instance = cls()
-        return cls._db
-
-    @classmethod
-    def get_collection(cls, collection_name: str) -> Optional[Collection]:
-        """
-        Returns a MongoDB collection by name.
-
-        Args:
-            collection_name (str): The name of the collection to retrieve
-
-        Returns:
-            Optional[Collection]: The MongoDB collection instance or None if not configured
-        """
-        try:
-            db = cls.get_db()
-            if db is None:
-                logger.warning(
-                    f"Cannot access collection '{collection_name}': MongoDB not configured"
-                )
-                return None
-            return db[collection_name]
-        except Exception as e:
-            logger.warning(f"Failed to access collection '{collection_name}': {str(e)}")
-            return None
-
-    @classmethod
-    def is_configured(cls) -> bool:
-        """
-        Check if MongoDB is properly configured and connected.
-
-        Returns:
-            bool: True if MongoDB is configured and connected, False otherwise
-        """
-        return cls._client is not None and cls._db is not None

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/utils/content_validator.py

@@ -187,6 +187,24 @@ def validate_html_content(html_content):
                     f"HTML content contains dangerous JavaScript in event handler: {handler_content[:100]}",
                 )
 
+    # Basic HTML structure validation - check for common malformed tags
+    try:
+        # Count opening and closing tags for basic structure validation
+        opening_tags = re.findall(r"<(\w+)[^>]*>", html_content)
+        closing_tags = re.findall(r"</(\w+)>", html_content)
+
+        # Filter out self-closing tags from opening tags
+        opening_tags_filtered = [
+            tag for tag in opening_tags if tag.lower() not in SELF_CLOSING_TAGS
+        ]
+
+        # Basic check - if we have significantly more opening than closing tags, it might be malformed
+        if len(opening_tags_filtered) > len(closing_tags) + 10:  # Allow some tolerance
+            return False, "HTML content appears to be malformed (unmatched tags)"
+
+    except Exception:
+        # If HTML parsing fails, we'll allow it
+        pass
 
     return True, None
 

apps/api/plane/utils/paginator.py

@@ -160,7 +160,7 @@ class OffsetPaginator:
         total_count = (
             self.total_count_queryset.count()
             if self.total_count_queryset
-            else queryset.count()
+            else results.count()
         )
 
         # Check if there are more results available after the current page

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,4 +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
+drf-spectacular==0.28.0

apps/live/Dockerfile.dev

@@ -4,12 +4,12 @@ RUN apk add --no-cache libc6-compat
 WORKDIR /app
 
 COPY . .
-RUN corepack enable pnpm && pnpm add -g turbo
-RUN pnpm install
+RUN yarn global add turbo
+RUN yarn install
 EXPOSE 3003
 
 ENV TURBO_TELEMETRY_DISABLED=1
 
 VOLUME [ "/app/node_modules", "/app/live/node_modules"]
 
-CMD ["pnpm","dev", "--filter=live"]
+CMD ["yarn","dev", "--filter=live"]

apps/live/Dockerfile.live

@@ -1,11 +1,5 @@
-# syntax=docker/dockerfile:1.7
 FROM node:22-alpine AS base
 
-# Setup pnpm package manager with corepack and configure global bin directory for caching
-ENV PNPM_HOME="/pnpm"
-ENV PATH="$PNPM_HOME:$PATH"
-RUN corepack enable
-
 # *****************************************************************************
 # STAGE 1: Prune the project
 # *****************************************************************************
@@ -15,10 +9,9 @@ RUN apk update
 RUN apk add --no-cache libc6-compat
 # Set working directory
 WORKDIR /app
-ARG TURBO_VERSION=2.5.6
-RUN corepack enable pnpm && pnpm add -g turbo@${TURBO_VERSION}
+RUN yarn global add turbo
 COPY . .
-RUN turbo prune --scope=live --docker
+RUN turbo prune live --docker
 
 # *****************************************************************************
 # STAGE 2: Install dependencies & build the project
@@ -32,18 +25,16 @@ WORKDIR /app
 # First install dependencies (as they change less often)
 COPY .gitignore .gitignore
 COPY --from=builder /app/out/json/ .
-COPY --from=builder /app/out/pnpm-lock.yaml ./pnpm-lock.yaml
-RUN corepack enable pnpm
-RUN --mount=type=cache,id=pnpm-store,target=/pnpm/store pnpm fetch --store-dir=/pnpm/store
+COPY --from=builder /app/out/yarn.lock ./yarn.lock
+RUN yarn install
 
 # Build the project and its dependencies
 COPY --from=builder /app/out/full/ .
 COPY turbo.json turbo.json
-RUN --mount=type=cache,id=pnpm-store,target=/pnpm/store pnpm install --offline --frozen-lockfile --store-dir=/pnpm/store
 
 ENV TURBO_TELEMETRY_DISABLED=1
 
-RUN pnpm turbo run build --filter=live
+RUN yarn turbo build --filter=live
 
 # *****************************************************************************
 # STAGE 3: Run the project
@@ -53,12 +44,11 @@ FROM base AS runner
 WORKDIR /app
 
 COPY --from=installer /app/packages ./packages
-COPY --from=installer /app/apps/live/dist ./apps/live/dist
-COPY --from=installer /app/apps/live/node_modules ./apps/live/node_modules
+COPY --from=installer /app/apps/live/dist ./live
 COPY --from=installer /app/node_modules ./node_modules
 
 ENV TURBO_TELEMETRY_DISABLED=1
 
 EXPOSE 3000
 
-CMD ["node", "apps/live/dist/server.js"]
+CMD ["node", "live/server.js"]

apps/live/package.json

@@ -24,8 +24,8 @@
     "@hocuspocus/extension-logger": "^2.15.0",
     "@hocuspocus/extension-redis": "^2.15.0",
     "@hocuspocus/server": "^2.15.0",
-    "@plane/editor": "workspace:*",
-    "@plane/types": "workspace:*",
+    "@plane/editor": "*",
+    "@plane/types": "*",
     "@tiptap/core": "^2.22.3",
     "@tiptap/html": "^2.22.3",
     "axios": "1.11.0",
@@ -46,15 +46,15 @@
     "yjs": "^13.6.20"
   },
   "devDependencies": {
-    "@plane/eslint-config": "workspace:*",
-    "@plane/typescript-config": "workspace:*",
+    "@plane/eslint-config": "*",
+    "@plane/typescript-config": "*",
     "@types/compression": "1.8.1",
     "@types/cors": "^2.8.17",
+    "@types/dotenv": "^8.2.0",
     "@types/express": "^4.17.23",
     "@types/express-ws": "^3.0.5",
     "@types/node": "^20.14.9",
     "@types/pino-http": "^5.8.4",
-    "@types/uuid": "^9.0.1",
     "concurrently": "^9.0.1",
     "nodemon": "^3.1.7",
     "ts-node": "^10.9.2",

apps/live/src/core/helpers/logger.ts

@@ -1,4 +1,5 @@
 import { pinoHttp } from "pino-http";
+import { Logger } from "pino";
 
 const transport = {
   target: "pino-pretty",
@@ -36,4 +37,4 @@ export const logger = pinoHttp({
   },
 });
 
-export const manualLogger: typeof logger.logger = logger.logger;
+export const manualLogger: Logger = logger.logger;

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/space/.gitignore

@@ -21,6 +21,8 @@
 
 # debug
 npm-debug.log*
+yarn-debug.log*
+yarn-error.log*
 .pnpm-debug.log*
 
 # local env files

apps/space/Dockerfile.dev

@@ -1,19 +1,16 @@
 FROM node:22-alpine
-
 RUN apk add --no-cache libc6-compat
-
 # Set working directory
 WORKDIR /app
 
 COPY . .
 
-RUN corepack enable pnpm && pnpm add -g turbo
-RUN pnpm install
+RUN yarn global add turbo
+RUN yarn install
 
-EXPOSE 3002
+EXPOSE 4000
 
 ENV NEXT_PUBLIC_SPACE_BASE_PATH="/spaces"
 
-VOLUME [ "/app/node_modules", "/app/apps/space/node_modules"]
-
-CMD ["pnpm", "dev", "--filter=space"]
+VOLUME [ "/app/node_modules", "/app/space/node_modules"]
+CMD ["yarn","dev", "--filter=space"]

apps/space/Dockerfile.space

@@ -1,11 +1,5 @@
-# syntax=docker/dockerfile:1.7
 FROM node:22-alpine AS base
 
-# Setup pnpm package manager with corepack and configure global bin directory for caching
-ENV PNPM_HOME="/pnpm"
-ENV PATH="$PNPM_HOME:$PATH"
-RUN corepack enable
-
 # *****************************************************************************
 # STAGE 1: Build the project
 # *****************************************************************************
@@ -13,8 +7,7 @@ FROM base AS builder
 RUN apk add --no-cache libc6-compat
 WORKDIR /app
 
-ARG TURBO_VERSION=2.5.6
-RUN corepack enable pnpm && pnpm add -g turbo@${TURBO_VERSION}
+RUN yarn global add turbo
 COPY . .
 
 RUN turbo prune --scope=space --docker
@@ -29,13 +22,11 @@ WORKDIR /app
 
 COPY .gitignore .gitignore
 COPY --from=builder /app/out/json/ .
-COPY --from=builder /app/out/pnpm-lock.yaml ./pnpm-lock.yaml
-RUN corepack enable pnpm
-RUN --mount=type=cache,id=pnpm-store,target=/pnpm/store pnpm fetch --store-dir=/pnpm/store
+COPY --from=builder /app/out/yarn.lock ./yarn.lock
+RUN yarn install --network-timeout 500000
 
 COPY --from=builder /app/out/full/ .
 COPY turbo.json turbo.json
-RUN --mount=type=cache,id=pnpm-store,target=/pnpm/store pnpm install --offline --frozen-lockfile --store-dir=/pnpm/store
 
 ARG NEXT_PUBLIC_API_BASE_URL=""
 ENV NEXT_PUBLIC_API_BASE_URL=$NEXT_PUBLIC_API_BASE_URL
@@ -58,7 +49,7 @@ ENV NEXT_PUBLIC_WEB_BASE_URL=$NEXT_PUBLIC_WEB_BASE_URL
 ENV NEXT_TELEMETRY_DISABLED=1
 ENV TURBO_TELEMETRY_DISABLED=1
 
-RUN pnpm turbo run build --filter=space
+RUN yarn turbo run build --filter=space
 
 # *****************************************************************************
 # STAGE 3: Copy the project and start it
@@ -100,4 +91,4 @@ ENV TURBO_TELEMETRY_DISABLED=1
 
 EXPOSE 3000
 
-CMD ["node", "apps/space/server.js"]
+CMD ["node", "apps/space/server.js"]

apps/space/core/components/editor/rich-text-editor.tsx

@@ -1,13 +1,12 @@
 import React, { forwardRef } from "react";
 // plane imports
+import { useEditorFlagging } from "ce/hooks/use-editor-flagging";
 import { type EditorRefApi, type IRichTextEditorProps, RichTextEditorWithRef, type TFileHandler } from "@plane/editor";
 import type { MakeOptional } from "@plane/types";
 // helpers
 import { getEditorFileHandlers } from "@/helpers/editor.helper";
 // hooks
 import { useMember } from "@/hooks/store/use-member";
-// plane web imports
-import { useEditorFlagging } from "@/plane-web/hooks/use-editor-flagging";
 // local imports
 import { EditorMentionsRoot } from "./embeds/mentions";
 

apps/space/helpers/file.helper.ts

@@ -45,5 +45,5 @@ export const getFileMetaDataForUpload = (file: File): TFileMetaDataLite => ({
 export const getAssetIdFromUrl = (src: string): string => {
   const sourcePaths = src.split("/");
   const assetUrl = sourcePaths[sourcePaths.length - 1];
-  return assetUrl ?? "";
+  return assetUrl;
 };

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

@@ -8,7 +8,7 @@
     "build": "next build",
     "start": "next start",
     "clean": "rm -rf .turbo && rm -rf .next && rm -rf node_modules && rm -rf dist",
-    "check:lint": "eslint . --max-warnings 28",
+    "check:lint": "eslint . --max-warnings 27",
     "check:types": "tsc --noEmit",
     "check:format": "prettier --check \"**/*.{ts,tsx,md,json,css,scss}\"",
     "fix:lint": "eslint . --fix",
@@ -21,15 +21,13 @@
     "@emotion/styled": "^11.11.0",
     "@headlessui/react": "^1.7.13",
     "@mui/material": "^5.14.1",
-    "@plane/constants": "workspace:*",
-    "@plane/editor": "workspace:*",
-    "@plane/i18n": "workspace:*",
-    "@plane/propel": "workspace:*",
-    "@plane/services": "workspace:*",
-    "@plane/types": "workspace:*",
-    "@plane/ui": "workspace:*",
-    "@plane/utils": "workspace:*",
-    "@popperjs/core": "^2.11.8",
+    "@plane/constants": "*",
+    "@plane/editor": "*",
+    "@plane/i18n": "*",
+    "@plane/propel": "*",
+    "@plane/services": "*",
+    "@plane/types": "*",
+    "@plane/ui": "*",
     "axios": "1.11.0",
     "clsx": "^2.0.0",
     "date-fns": "^4.1.0",
@@ -49,16 +47,16 @@
     "react-dropzone": "^14.2.3",
     "react-hook-form": "7.51.5",
     "react-popper": "^2.3.0",
-    "sharp": "^0.33.5",
     "swr": "^2.2.2",
     "tailwind-merge": "^2.0.0",
     "uuid": "^9.0.0"
   },
   "devDependencies": {
-    "@plane/eslint-config": "workspace:*",
-    "@plane/tailwind-config": "workspace:*",
-    "@plane/typescript-config": "workspace:*",
-    "@types/lodash": "^4.17.6",
+    "@plane/eslint-config": "*",
+    "@plane/tailwind-config": "*",
+    "@plane/typescript-config": "*",
+    "@types/dompurify": "^3.0.5",
+    "@types/lodash": "^4.17.1",
     "@types/node": "18.14.1",
     "@types/nprogress": "^0.2.0",
     "@types/react": "^18.3.11",

apps/space/tsconfig.json

@@ -22,7 +22,6 @@
         "name": "next"
       }
     ],
-
     "strictNullChecks": true
   }
 }

apps/web/Dockerfile.dev

@@ -5,9 +5,9 @@ RUN apk add --no-cache libc6-compat
 WORKDIR /app
 
 COPY . .
-RUN corepack enable pnpm && pnpm add -g turbo
-RUN pnpm install
+RUN yarn global add turbo
+RUN yarn install
 
 EXPOSE 3000
 VOLUME [ "/app/node_modules", "/app/web/node_modules" ]
-CMD ["pnpm", "dev", "--filter=web"]
+CMD ["yarn", "dev", "--filter=web"]

apps/web/Dockerfile.web

@@ -1,11 +1,5 @@
-# syntax=docker/dockerfile:1.7
 FROM node:22-alpine AS base
 
-# Setup pnpm package manager with corepack and configure global bin directory for caching
-ENV PNPM_HOME="/pnpm"
-ENV PATH="$PNPM_HOME:$PATH"
-RUN corepack enable
-
 # *****************************************************************************
 # STAGE 1: Build the project
 # *****************************************************************************
@@ -14,8 +8,7 @@ RUN apk add --no-cache libc6-compat
 # Set working directory
 WORKDIR /app
 
-ARG TURBO_VERSION=2.5.6
-RUN corepack enable pnpm && pnpm add -g turbo@${TURBO_VERSION}
+RUN yarn global add turbo
 COPY . .
 
 RUN turbo prune --scope=web --docker
@@ -32,14 +25,12 @@ WORKDIR /app
 # First install the dependencies (as they change less often)
 COPY .gitignore .gitignore
 COPY --from=builder /app/out/json/ .
-COPY --from=builder /app/out/pnpm-lock.yaml ./pnpm-lock.yaml
-RUN corepack enable pnpm
-RUN --mount=type=cache,id=pnpm-store,target=/pnpm/store pnpm fetch --store-dir=/pnpm/store
+COPY --from=builder /app/out/yarn.lock ./yarn.lock
+RUN yarn install --network-timeout 500000
 
 # Build the project
 COPY --from=builder /app/out/full/ .
 COPY turbo.json turbo.json
-RUN --mount=type=cache,id=pnpm-store,target=/pnpm/store pnpm install --offline --frozen-lockfile --store-dir=/pnpm/store
 
 ARG NEXT_PUBLIC_API_BASE_URL=""
 ENV NEXT_PUBLIC_API_BASE_URL=$NEXT_PUBLIC_API_BASE_URL
@@ -68,7 +59,7 @@ ENV NEXT_PUBLIC_WEB_BASE_URL=$NEXT_PUBLIC_WEB_BASE_URL
 ENV NEXT_TELEMETRY_DISABLED=1
 ENV TURBO_TELEMETRY_DISABLED=1
 
-RUN pnpm turbo run build --filter=web
+RUN yarn turbo run build --filter=web
 
 # *****************************************************************************
 # STAGE 3: Copy the project and start it
@@ -117,4 +108,4 @@ ENV TURBO_TELEMETRY_DISABLED=1
 
 EXPOSE 3000
 
-CMD ["node", "apps/web/server.js"]
+CMD ["node", "apps/web/server.js"]

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]/(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/ce/components/workspace/edition-badge.tsx

@@ -1,11 +1,11 @@
 import { useState } from "react";
 import { observer } from "mobx-react";
 // ui
+import packageJson from "package.json";
 import { useTranslation } from "@plane/i18n";
 import { Button, Tooltip } from "@plane/ui";
 // hooks
 import { usePlatformOS } from "@/hooks/use-platform-os";
-import packageJson from "package.json";
 // local components
 import { PaidPlanUpgradeModal } from "../license";
 

apps/web/ce/components/workspace/sidebar/extended-sidebar-item.tsx

@@ -15,8 +15,8 @@ import { cn } from "@plane/utils";
 import { SidebarNavItem } from "@/components/sidebar/sidebar-navigation";
 // hooks
 import { useAppTheme } from "@/hooks/store/use-app-theme";
-import { useWorkspace } from "@/hooks/store/use-workspace";
 import { useUser, useUserPermissions } from "@/hooks/store/user";
+import { useWorkspace } from "@/hooks/store/use-workspace";
 // plane web imports
 // local imports
 import { UpgradeBadge } from "../upgrade-badge";

apps/web/core/components/analytics/analytics-filter-actions.tsx

@@ -1,8 +1,8 @@
 // plane web components
 import { observer } from "mobx-react";
 // hooks
-import { useAnalytics } from "@/hooks/store/use-analytics";
 import { useProject } from "@/hooks/store/use-project";
+import { useAnalytics } from "@/hooks/store/use-analytics";
 // components
 import DurationDropdown from "./select/duration";
 import { ProjectSelect } from "./select/project";

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/analytics/work-items/priority-chart.tsx

@@ -20,8 +20,8 @@ import { TBarItem, TChart, TChartDatum, ChartXAxisProperty, ChartYAxisMetric } f
 import { Button } from "@plane/ui";
 import { generateExtendedColors, parseChartData } from "@/components/chart/utils";
 // hooks
-import { useAnalytics } from "@/hooks/store/use-analytics";
 import { useProjectState } from "@/hooks/store/use-project-state";
+import { useAnalytics } from "@/hooks/store/use-analytics";
 import { useResolvedAssetPath } from "@/hooks/use-resolved-asset-path";
 import { AnalyticsService } from "@/services/analytics.service";
 import AnalyticsEmptyState from "../empty-state";

apps/web/core/components/command-palette/command-palette.tsx

@@ -13,10 +13,10 @@ import { CommandModal, ShortcutsModal } from "@/components/command-palette";
 // helpers
 // hooks
 import { captureClick } from "@/helpers/event-tracker.helper";
+import { useUser, useUserPermissions } from "@/hooks/store/user";
 import { useAppTheme } from "@/hooks/store/use-app-theme";
 import { useCommandPalette } from "@/hooks/store/use-command-palette";
 import { useIssueDetail } from "@/hooks/store/use-issue-detail";
-import { useUser, useUserPermissions } from "@/hooks/store/user";
 import { usePlatformOS } from "@/hooks/use-platform-os";
 // plane web components
 import {

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
@@ -321,19 +320,18 @@ export const ExistingIssuesListModal: React.FC<Props> = (props) => {
                     )}
                   </Combobox.Options>
                 </Combobox>
-                <div className="flex justify-between items-center p-3">
+                <div className="flex justify-between items-center">
                   <Button
                     variant="link-primary"
                     size="sm"
                     onClick={handleSelectIssues}
                     disabled={filteredIssues.length === 0}
-                    className={filteredIssues.length === 0 ? "p-0" : ""}
                   >
                     {selectedIssues.length === issues.length
                       ? t("issue.select.deselect_all")
                       : t("issue.select.select_all")}
                   </Button>
-                  <div className="flex items-center justify-end gap-2">
+                  <div className="flex items-center justify-end gap-2 p-3">
                     <Button variant="neutral-primary" size="sm" onClick={handleClose}>
                       {t("common.cancel")}
                     </Button>

apps/web/core/components/cycles/analytics-sidebar/issue-progress.tsx

@@ -13,8 +13,8 @@ import { useTranslation } from "@plane/i18n";
 import { EIssuesStoreType, ICycle, IIssueFilterOptions, TCyclePlotType, TProgressSnapshot } from "@plane/types";
 import { getDate } from "@plane/utils";
 // hooks
-import { useCycle } from "@/hooks/store/use-cycle";
 import { useIssues } from "@/hooks/store/use-issues";
+import { useCycle } from "@/hooks/store/use-cycle";
 // plane web components
 import { SidebarChartRoot } from "@/plane-web/components/cycles";
 // local imports

apps/web/core/components/cycles/analytics-sidebar/sidebar-details.tsx

@@ -12,8 +12,8 @@ import { Avatar, AvatarGroup, TextArea } from "@plane/ui";
 // helpers
 import { getFileURL } from "@plane/utils";
 // hooks
-import { useProjectEstimates } from "@/hooks/store/estimates";
 import { useMember } from "@/hooks/store/use-member";
+import { useProjectEstimates } from "@/hooks/store/estimates";
 // plane web constants
 
 type Props = {

apps/web/core/components/cycles/dropdowns/estimate-type-dropdown.tsx

@@ -2,8 +2,8 @@ import React from "react";
 import { observer } from "mobx-react";
 import { EEstimateSystem, TCycleEstimateType } from "@plane/types";
 import { CustomSelect } from "@plane/ui";
-import { useProjectEstimates } from "@/hooks/store/estimates";
 import { useCycle } from "@/hooks/store/use-cycle";
+import { useProjectEstimates } from "@/hooks/store/estimates";
 // local imports
 import { cycleEstimateOptions } from "../analytics-sidebar/issue-progress";
 

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/dropdowns/estimate.tsx

@@ -10,8 +10,8 @@ import { EEstimateSystem } from "@plane/types";
 import { ComboDropDown } from "@plane/ui";
 import { convertMinutesToHoursMinutesString, cn } from "@plane/utils";
 // hooks
-import { useProjectEstimates } from "@/hooks/store/estimates";
 import { useEstimate } from "@/hooks/store/estimates/use-estimate";
+import { useProjectEstimates } from "@/hooks/store/estimates";
 import { useDropdown } from "@/hooks/use-dropdown";
 // components
 import { DropdownButton } from "./buttons";

apps/web/core/components/dropdowns/member/member-options.tsx

@@ -9,12 +9,12 @@ import { Check, Search } from "lucide-react";
 import { Combobox } from "@headlessui/react";
 // plane imports
 import { useTranslation } from "@plane/i18n";
-import { IUserLite } from "@plane/types";
 import { Avatar } from "@plane/ui";
 import { cn, getFileURL } from "@plane/utils";
 // hooks
 import { useUser } from "@/hooks/store/user";
 import { usePlatformOS } from "@/hooks/use-platform-os";
+import { IUserLite } from "@plane/types";
 
 interface Props {
   className?: string;

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/estimates/delete/modal.tsx

@@ -7,9 +7,9 @@ import { PROJECT_SETTINGS_TRACKER_EVENTS } from "@plane/constants";
 import { Button, EModalPosition, EModalWidth, ModalCore, TOAST_TYPE, setToast } from "@plane/ui";
 // hooks
 import { captureError, captureSuccess } from "@/helpers/event-tracker.helper";
-import { useProjectEstimates } from "@/hooks/store/estimates";
 import { useEstimate } from "@/hooks/store/estimates/use-estimate";
 import { useProject } from "@/hooks/store/use-project";
+import { useProjectEstimates } from "@/hooks/store/estimates";
 
 type TDeleteEstimateModal = {
   workspaceSlug: string;

apps/web/core/components/estimates/estimate-disable-switch.tsx

@@ -7,8 +7,8 @@ import { useTranslation } from "@plane/i18n";
 import { TOAST_TYPE, ToggleSwitch, setToast } from "@plane/ui";
 // hooks
 import { captureElementAndEvent } from "@/helpers/event-tracker.helper";
-import { useProjectEstimates } from "@/hooks/store/estimates";
 import { useProject } from "@/hooks/store/use-project";
+import { useProjectEstimates } from "@/hooks/store/estimates";
 // i18n
 type TEstimateDisableSwitch = {
   workspaceSlug: string;

apps/web/core/components/estimates/estimate-list-item.tsx

@@ -4,8 +4,8 @@ import { EEstimateSystem } from "@plane/constants";
 import { convertMinutesToHoursMinutesString, cn } from "@plane/utils";
 // helpers
 // hooks
-import { useProjectEstimates } from "@/hooks/store/estimates";
 import { useEstimate } from "@/hooks/store/estimates/use-estimate";
+import { useProjectEstimates } from "@/hooks/store/estimates";
 // plane web components
 import { EstimateListItemButtons } from "@/plane-web/components/estimates";
 

apps/web/core/components/estimates/root.tsx

@@ -4,8 +4,8 @@ import useSWR from "swr";
 // plane imports
 import { useTranslation } from "@plane/i18n";
 // hooks
-import { useProjectEstimates } from "@/hooks/store/estimates";
 import { useProject } from "@/hooks/store/use-project";
+import { useProjectEstimates } from "@/hooks/store/estimates";
 // plane web components
 import { UpdateEstimateModal } from "@/plane-web/components/estimates";
 // local imports

apps/web/core/components/gantt-chart/chart/root.tsx

@@ -1,6 +1,6 @@
 import { FC, useEffect, useState } from "react";
-import { observer } from "mobx-react";
 import { createPortal } from "react-dom";
+import { observer } from "mobx-react";
 // plane imports
 // components
 import type { ChartDataType, IBlockUpdateData, IBlockUpdateDependencyData, TGanttViews } from "@plane/types";

apps/web/core/components/home/home-dashboard-widgets.tsx

@@ -6,8 +6,8 @@ import { THomeWidgetKeys, THomeWidgetProps } from "@plane/types";
 // components
 import { SimpleEmptyState } from "@/components/empty-state/simple-empty-state-root";
 // hooks
-import { useHome } from "@/hooks/store/use-home";
 import { useProject } from "@/hooks/store/use-project";
+import { useHome } from "@/hooks/store/use-home";
 // plane web components
 import { useResolvedAssetPath } from "@/hooks/use-resolved-asset-path";
 import { HomePageHeader } from "@/plane-web/components/home/header";

apps/web/core/components/home/root.tsx

@@ -10,8 +10,8 @@ import { TourRoot } from "@/components/onboarding/tour";
 // helpers
 import { captureSuccess } from "@/helpers/event-tracker.helper";
 // hooks
-import { useHome } from "@/hooks/store/use-home";
 import { useUserProfile, useUser } from "@/hooks/store/user";
+import { useHome } from "@/hooks/store/use-home";
 // plane web components
 import { HomePeekOverviewsRoot } from "@/plane-web/components/home";
 // local imports
@@ -60,11 +60,11 @@ export const WorkspaceHomeView = observer(() => {
       )}
       <>
         <HomePeekOverviewsRoot />
-        <ContentWrapper className={cn("gap-6 bg-custom-background-100 mx-auto scrollbar-hide px-page-x lg:px-0")}>
-          <div className="max-w-[800px] mx-auto w-full">
-            {currentUser && <UserGreetingsView user={currentUser} />}
-            <DashboardWidgets />
-          </div>
+        <ContentWrapper
+          className={cn("gap-6 bg-custom-background-100 max-w-[800px] mx-auto scrollbar-hide px-page-x lg:px-0")}
+        >
+          {currentUser && <UserGreetingsView user={currentUser} />}
+          <DashboardWidgets />
         </ContentWrapper>
       </>
     </>

apps/web/core/components/home/widgets/empty-states/no-projects.tsx

@@ -14,8 +14,8 @@ import { cn, getFileURL } from "@plane/utils";
 import { captureClick } from "@/helpers/event-tracker.helper";
 import { useCommandPalette } from "@/hooks/store/use-command-palette";
 import { useProject } from "@/hooks/store/use-project";
-import { useWorkspace } from "@/hooks/store/use-workspace";
 import { useUser, useUserPermissions } from "@/hooks/store/user";
+import { useWorkspace } from "@/hooks/store/use-workspace";
 // plane web constants
 
 export const NoProjectsEmptyState = observer(() => {

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

@@ -25,9 +25,9 @@ import { copyUrlToClipboard, findHowManyDaysLeft, generateWorkItemLink } from "@
 import { CreateUpdateIssueModal } from "@/components/issues/issue-modal/modal";
 import { NameDescriptionUpdateStatus } from "@/components/issues/issue-update-status";
 // hooks
-import { useProject } from "@/hooks/store/use-project";
-import { useProjectInbox } from "@/hooks/store/use-project-inbox";
 import { useUser, useUserPermissions } from "@/hooks/store/user";
+import { useProjectInbox } from "@/hooks/store/use-project-inbox";
+import { useProject } from "@/hooks/store/use-project";
 import { useAppRouter } from "@/hooks/use-app-router";
 // store
 import type { IInboxIssueStore } from "@/store/inbox/inbox-issue.store";
@@ -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/inbox-filter/filters/filter-selection.tsx

@@ -2,8 +2,8 @@ import { FC, useState } from "react";
 import { observer } from "mobx-react";
 import { Search, X } from "lucide-react";
 // hooks
-import { useLabel } from "@/hooks/store/use-label";
 import { useMember } from "@/hooks/store/use-member";
+import { useLabel } from "@/hooks/store/use-label";
 import { useProjectState } from "@/hooks/store/use-project-state";
 import { usePlatformOS } from "@/hooks/use-platform-os";
 // local imports

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/archive-issue-modal.tsx

@@ -9,8 +9,8 @@ import { TDeDupeIssue, TIssue } from "@plane/types";
 // ui
 import { Button, TOAST_TYPE, setToast } from "@plane/ui";
 // hooks
-import { useIssues } from "@/hooks/store/use-issues";
 import { useProject } from "@/hooks/store/use-project";
+import { useIssues } from "@/hooks/store/use-issues";
 
 type Props = {
   data?: TIssue | TDeDupeIssue;

apps/web/core/components/issues/filters.tsx

@@ -20,10 +20,10 @@ import { Button } from "@plane/ui";
 import { isIssueFilterActive } from "@plane/utils";
 // helpers
 // hooks
-import { useIssues } from "@/hooks/store/use-issues";
 import { useLabel } from "@/hooks/store/use-label";
-import { useMember } from "@/hooks/store/use-member";
 import { useProjectState } from "@/hooks/store/use-project-state";
+import { useMember } from "@/hooks/store/use-member";
+import { useIssues } from "@/hooks/store/use-issues";
 // plane web types
 import { TProject } from "@/plane-web/types";
 import { WorkItemsModal } from "../analytics/work-items/modal";

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/calendar/base-calendar-root.tsx

@@ -8,15 +8,15 @@ import { EIssueGroupByToServerOptions, EUserPermissions, EUserPermissionsLevel }
 import { EIssuesStoreType, TGroupedIssues } from "@plane/types";
 import { TOAST_TYPE, setToast } from "@plane/ui";
 // hooks
-import { useCalendarView } from "@/hooks/store/use-calendar-view";
 import { useIssues } from "@/hooks/store/use-issues";
+import { useCalendarView } from "@/hooks/store/use-calendar-view";
 import { useUserPermissions } from "@/hooks/store/user";
 import { useIssueStoreType } from "@/hooks/use-issue-layout-store";
 import { useIssuesActions } from "@/hooks/use-issues-actions";
 // types
 import { IQuickActionProps } from "../list/list-view-types";
-import { CalendarChart } from "./calendar";
 import { handleDragDrop } from "./utils";
+import { CalendarChart } from "./calendar";
 
 export type CalendarStoreType =
   | EIssuesStoreType.PROJECT

apps/web/core/components/issues/issue-layouts/filters/applied-filters/roots/project-root.tsx

@@ -10,10 +10,10 @@ import {
 import { EIssuesStoreType, IIssueFilterOptions } from "@plane/types";
 import { Header, EHeaderVariant } from "@plane/ui";
 // hooks
-import { useIssues } from "@/hooks/store/use-issues";
 import { useLabel } from "@/hooks/store/use-label";
 import { useProjectState } from "@/hooks/store/use-project-state";
 import { useUserPermissions } from "@/hooks/store/user";
+import { useIssues } from "@/hooks/store/use-issues";
 // local imports
 import { SaveFilterView } from "../../../save-filter-view";
 import { AppliedFiltersList } from "../filters-list";

apps/web/core/components/issues/issue-layouts/gantt/base-gantt-root.tsx

@@ -21,8 +21,8 @@ import { useTimeLineChart } from "@/hooks/use-timeline-chart";
 import { useBulkOperationStatus } from "@/plane-web/hooks/use-bulk-operation-status";
 
 import { IssueLayoutHOC } from "../issue-layout-HOC";
-import { GanttQuickAddIssueButton, QuickAddIssueRoot } from "../quick-add";
 import { IssueGanttBlock } from "./blocks";
+import { GanttQuickAddIssueButton, QuickAddIssueRoot } from "../quick-add";
 
 interface IBaseGanttRoot {
   viewId?: string | undefined;

apps/web/core/components/issues/issue-layouts/kanban/base-kanban-root.tsx

@@ -21,13 +21,13 @@ import { useIssuesActions } from "@/hooks/use-issues-actions";
 // store
 // ui
 // types
-import { DeleteIssueModal } from "../../delete-issue-modal";
 import { IssueLayoutHOC } from "../issue-layout-HOC";
 import { IQuickActionProps, TRenderQuickActions } from "../list/list-view-types";
 //components
 import { getSourceFromDropPayload } from "../utils";
 import { KanBan } from "./default";
 import { KanBanSwimLanes } from "./swimlanes";
+import { DeleteIssueModal } from "../../delete-issue-modal";
 
 export type KanbanStoreType =
   | EIssuesStoreType.PROJECT

apps/web/core/components/issues/issue-layouts/list/blocks-list.tsx

@@ -4,8 +4,8 @@ import { TIssue, IIssueDisplayProperties, TIssueMap, TGroupedIssues } from "@pla
 // hooks
 import { TSelectionHelper } from "@/hooks/use-multiple-select";
 // types
-import { IssueBlockRoot } from "./block-root";
 import { TRenderQuickActions } from "./list-view-types";
+import { IssueBlockRoot } from "./block-root";
 
 interface Props {
   issueIds: TGroupedIssues | any;

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/context/issue-modal-context.tsx

@@ -1,12 +1,12 @@
 import { createContext } from "react";
 // ce imports
+import { TIssueFields } from "ce/components/issues/issue-modal";
 import { UseFormReset, UseFormWatch } from "react-hook-form";
 // plane imports
 import type { EditorRefApi } from "@plane/editor";
 import type { ISearchIssueResponse, TIssue } from "@plane/types";
 // plane web imports
 import { TIssuePropertyValues, TIssuePropertyValueErrors } from "@/plane-web/types/issue-types";
-import { TIssueFields } from "ce/components/issues/issue-modal";
 
 export type TPropertyValuesValidationProps = {
   projectId: string | null;