CodeRabbit Generated Unit Tests: Add pytest tests for permissions, projects, and Jest store tests

* fix: update redirection path in MagicSignInEndpoint to home page

* Use / for clarity

apps/admin/app/(all)/(dashboard)/sidebar-help-section.tsx

@@ -7,8 +7,8 @@ import { ExternalLink, FileText, HelpCircle, MoveLeft } from "lucide-react";
 import { Transition } from "@headlessui/react";
 // plane internal packages
 import { WEB_BASE_URL } from "@plane/constants";
+import { DiscordIcon, GithubIcon } from "@plane/propel/icons";
 import { Tooltip } from "@plane/propel/tooltip";
-import { DiscordIcon, GithubIcon } from "@plane/ui";
 import { cn } from "@plane/utils";
 // hooks
 import { useTheme } from "@/hooks/store";

apps/admin/app/(all)/(dashboard)/sidebar-menu.tsx

@@ -5,8 +5,8 @@ import Link from "next/link";
 import { usePathname } from "next/navigation";
 import { Image, BrainCog, Cog, Lock, Mail } from "lucide-react";
 // plane internal packages
+import { WorkspaceIcon } from "@plane/propel/icons";
 import { Tooltip } from "@plane/propel/tooltip";
-import { WorkspaceIcon } from "@plane/ui";
 import { cn } from "@plane/utils";
 // hooks
 import { useTheme } from "@/hooks/store";

apps/admin/app/(all)/(home)/auth-header.tsx

@@ -1,7 +1,7 @@
 "use client";
 
 import Link from "next/link";
-import { PlaneLockup } from "@plane/ui";
+import { PlaneLockup } from "@plane/propel/icons";
 
 export const AuthHeader = () => (
   <div className="flex items-center justify-between gap-6 w-full flex-shrink-0 sticky top-0">

apps/api/plane/app/permissions/base.py

@@ -39,13 +39,31 @@ def allow_permission(allowed_roles, level="PROJECT", creator=False, model=None):
                 ).exists():
                     return view_func(instance, request, *args, **kwargs)
             else:
-                if ProjectMember.objects.filter(
+                is_user_has_allowed_role = ProjectMember.objects.filter(
                     member=request.user,
                     workspace__slug=kwargs["slug"],
                     project_id=kwargs["project_id"],
                     role__in=allowed_role_values,
                     is_active=True,
-                ).exists():
+                ).exists()
+
+                # Return if the user has the allowed role else if they are workspace admin and part of the project regardless of the role
+                if is_user_has_allowed_role:
+                    return view_func(instance, request, *args, **kwargs)
+                elif (
+                    ProjectMember.objects.filter(
+                        member=request.user,
+                        workspace__slug=kwargs["slug"],
+                        project_id=kwargs["project_id"],
+                        is_active=True,
+                    ).exists()
+                    and WorkspaceMember.objects.filter(
+                        member=request.user,
+                        workspace__slug=kwargs["slug"],
+                        role=ROLE.ADMIN.value,
+                        is_active=True,
+                    ).exists()
+                ):
                     return view_func(instance, request, *args, **kwargs)
 
             # Return permission denied if no conditions are met

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

@@ -3,11 +3,7 @@ from rest_framework.permissions import SAFE_METHODS, BasePermission
 
 # Module import
 from plane.db.models import ProjectMember, WorkspaceMember
-
-# Permission Mappings
-Admin = 20
-Member = 15
-Guest = 5
+from plane.db.models.project import ROLE
 
 
 class ProjectBasePermission(BasePermission):
@@ -26,18 +22,31 @@ class ProjectBasePermission(BasePermission):
             return WorkspaceMember.objects.filter(
                 workspace__slug=view.workspace_slug,
                 member=request.user,
-                role__in=[Admin, Member],
+                role__in=[ROLE.ADMIN.value, ROLE.MEMBER.value],
                 is_active=True,
             ).exists()
 
-        ## Only Project Admins can update project attributes
-        return ProjectMember.objects.filter(
+        project_member_qs = ProjectMember.objects.filter(
             workspace__slug=view.workspace_slug,
             member=request.user,
-            role=Admin,
             project_id=view.project_id,
             is_active=True,
-        ).exists()
+        )
+
+        ## Only project admins or workspace admin who is part of the project can access
+
+        if project_member_qs.filter(role=ROLE.ADMIN.value).exists():
+            return True
+        else:
+            return (
+                project_member_qs.exists()
+                and WorkspaceMember.objects.filter(
+                    member=request.user,
+                    workspace__slug=view.workspace_slug,
+                    role=ROLE.ADMIN.value,
+                    is_active=True,
+                ).exists()
+            )
 
 
 class ProjectMemberPermission(BasePermission):
@@ -55,7 +64,7 @@ class ProjectMemberPermission(BasePermission):
             return WorkspaceMember.objects.filter(
                 workspace__slug=view.workspace_slug,
                 member=request.user,
-                role__in=[Admin, Member],
+                role__in=[ROLE.ADMIN.value, ROLE.MEMBER.value],
                 is_active=True,
             ).exists()
 
@@ -63,7 +72,7 @@ class ProjectMemberPermission(BasePermission):
         return ProjectMember.objects.filter(
             workspace__slug=view.workspace_slug,
             member=request.user,
-            role__in=[Admin, Member],
+            role__in=[ROLE.ADMIN.value, ROLE.MEMBER.value],
             project_id=view.project_id,
             is_active=True,
         ).exists()
@@ -97,7 +106,7 @@ class ProjectEntityPermission(BasePermission):
         return ProjectMember.objects.filter(
             workspace__slug=view.workspace_slug,
             member=request.user,
-            role__in=[Admin, Member],
+            role__in=[ROLE.ADMIN.value, ROLE.MEMBER.value],
             project_id=view.project_id,
             is_active=True,
         ).exists()

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

@@ -667,16 +667,33 @@ class IssueReactionSerializer(BaseSerializer):
 
 
 class IssueReactionLiteSerializer(DynamicBaseSerializer):
+    display_name = serializers.CharField(source="actor.display_name", read_only=True)
+
     class Meta:
         model = IssueReaction
-        fields = ["id", "actor", "issue", "reaction"]
+        fields = ["id", "actor", "issue", "reaction", "display_name"]
 
 
 class CommentReactionSerializer(BaseSerializer):
+    display_name = serializers.CharField(source="actor.display_name", read_only=True)
+
     class Meta:
         model = CommentReaction
-        fields = "__all__"
-        read_only_fields = ["workspace", "project", "comment", "actor", "deleted_at"]
+        fields = [
+            "id",
+            "actor",
+            "comment",
+            "reaction",
+            "display_name",
+            "deleted_at",
+            "workspace",
+            "project",
+            "created_at",
+            "updated_at",
+            "created_by",
+            "updated_by",
+        ]
+        read_only_fields = ["workspace", "project", "comment", "actor", "deleted_at", "created_by", "updated_by"]
 
 
 class IssueVoteSerializer(BaseSerializer):

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

@@ -5,13 +5,12 @@ from django.utils import timezone
 import json
 
 # Django imports
-from django.db import IntegrityError
 from django.db.models import Exists, F, OuterRef, Prefetch, Q, Subquery
 from django.core.serializers.json import DjangoJSONEncoder
 
 # Third Party imports
 from rest_framework.response import Response
-from rest_framework import serializers, status
+from rest_framework import status
 from rest_framework.permissions import AllowAny
 
 # Module imports
@@ -106,7 +105,10 @@ class ProjectViewSet(BaseViewSet):
         fields = [field for field in request.GET.get("fields", "").split(",") if field]
         projects = self.get_queryset().order_by("sort_order", "name")
         if WorkspaceMember.objects.filter(
-            member=request.user, workspace__slug=slug, is_active=True, role=5
+            member=request.user,
+            workspace__slug=slug,
+            is_active=True,
+            role=ROLE.GUEST.value,
         ).exists():
             projects = projects.filter(
                 project_projectmember__member=self.request.user,
@@ -114,7 +116,10 @@ class ProjectViewSet(BaseViewSet):
             )
 
         if WorkspaceMember.objects.filter(
-            member=request.user, workspace__slug=slug, is_active=True, role=15
+            member=request.user,
+            workspace__slug=slug,
+            is_active=True,
+            role=ROLE.MEMBER.value,
         ).exists():
             projects = projects.filter(
                 Q(
@@ -189,7 +194,10 @@ class ProjectViewSet(BaseViewSet):
         )
 
         if WorkspaceMember.objects.filter(
-            member=request.user, workspace__slug=slug, is_active=True, role=5
+            member=request.user,
+            workspace__slug=slug,
+            is_active=True,
+            role=ROLE.GUEST.value,
         ).exists():
             projects = projects.filter(
                 project_projectmember__member=self.request.user,
@@ -197,7 +205,10 @@ class ProjectViewSet(BaseViewSet):
             )
 
         if WorkspaceMember.objects.filter(
-            member=request.user, workspace__slug=slug, is_active=True, role=15
+            member=request.user,
+            workspace__slug=slug,
+            is_active=True,
+            role=ROLE.MEMBER.value,
         ).exists():
             projects = projects.filter(
                 Q(
@@ -250,7 +261,9 @@ class ProjectViewSet(BaseViewSet):
 
             # Add the user as Administrator to the project
             _ = ProjectMember.objects.create(
-                project_id=serializer.data["id"], member=request.user, role=20
+                project_id=serializer.data["id"],
+                member=request.user,
+                role=ROLE.ADMIN.value,
             )
             # Also create the issue property for the user
             _ = IssueUserProperty.objects.create(
@@ -263,7 +276,7 @@ class ProjectViewSet(BaseViewSet):
                 ProjectMember.objects.create(
                     project_id=serializer.data["id"],
                     member_id=serializer.data["project_lead"],
-                    role=20,
+                    role=ROLE.ADMIN.value,
                 )
                 # Also create the issue property for the user
                 IssueUserProperty.objects.create(
@@ -341,13 +354,23 @@ class ProjectViewSet(BaseViewSet):
 
     def partial_update(self, request, slug, pk=None):
         # try:
-        if not ProjectMember.objects.filter(
+        is_workspace_admin = WorkspaceMember.objects.filter(
+            member=request.user,
+            workspace__slug=slug,
+            is_active=True,
+            role=ROLE.ADMIN.value,
+        ).exists()
+
+        is_project_admin = ProjectMember.objects.filter(
             member=request.user,
             workspace__slug=slug,
             project_id=pk,
-            role=20,
+            role=ROLE.ADMIN.value,
             is_active=True,
-        ).exists():
+        ).exists()
+
+        # Return error for if the user is neither workspace admin nor project admin
+        if not is_project_admin and not is_workspace_admin:
             return Response(
                 {"error": "You don't have the required permissions."},
                 status=status.HTTP_403_FORBIDDEN,
@@ -402,13 +425,16 @@ class ProjectViewSet(BaseViewSet):
     def destroy(self, request, slug, pk):
         if (
             WorkspaceMember.objects.filter(
-                member=request.user, workspace__slug=slug, is_active=True, role=20
+                member=request.user,
+                workspace__slug=slug,
+                is_active=True,
+                role=ROLE.ADMIN.value,
             ).exists()
             or ProjectMember.objects.filter(
                 member=request.user,
                 workspace__slug=slug,
                 project_id=pk,
-                role=20,
+                role=ROLE.ADMIN.value,
                 is_active=True,
             ).exists()
         ):

apps/api/plane/authentication/views/app/magic.py

@@ -107,7 +107,8 @@ class MagicSignInEndpoint(View):
             # Login the user and record his device info
             user_login(request=request, user=user, is_app=True)
             if user.is_password_autoset and profile.is_onboarded:
-                path = "accounts/set-password"
+                # Redirect to the home page
+                path = "/"
             else:
                 # Get the redirection path
                 path = (

apps/api/plane/bgtasks/page_version_task.py

@@ -30,6 +30,8 @@ def page_version(page_id, existing_instance, user_id):
                 description_binary=page.description_binary,
                 owned_by_id=user_id,
                 last_saved_at=page.updated_at,
+                description_json=page.description,
+                description_stripped=page.description_stripped,
             )
 
             # If page versions are greater than 20 delete the oldest one

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

@@ -18,6 +18,12 @@ from .base import BaseModel
 ROLE_CHOICES = ((20, "Admin"), (15, "Member"), (5, "Guest"))
 
 
+class ROLE(Enum):
+    ADMIN = 20
+    MEMBER = 15
+    GUEST = 5
+
+
 class ProjectNetwork(Enum):
     SECRET = 0
     PUBLIC = 2

apps/api/plane/tests/test_models_project.py

@@ -0,0 +1,205 @@
+# Testing library/framework: pytest + pytest-django + factory_boy
+import pytest
+import pytz
+from django.core.exceptions import ValidationError
+from django.db import IntegrityError
+from django.utils import timezone
+
+# Prefer existing FactoryBoy factories defined in the repo
+from plane.tests.factories import WorkspaceFactory, UserFactory, ProjectFactory
+
+# Import models and helpers under test
+from plane.db.models.project import (
+    Project,
+    ProjectMember,
+    ProjectMemberInvite,
+    ProjectIdentifier,
+    ProjectDeployBoard,
+    ProjectPublicMember,
+    ROLE,
+    ROLE_CHOICES,
+    ProjectNetwork,
+    get_default_props,
+    get_default_preferences,
+    get_default_views,
+)
+
+# FileAsset is optional in some environments; guard import
+try:
+    from plane.db.models.asset import FileAsset
+except Exception:
+    FileAsset = None
+
+
+@pytest.mark.django_db
+class TestProjectModel:
+    def test_identifier_is_stripped_and_uppercased_on_save(self):
+        ws = WorkspaceFactory()
+        proj = Project.objects.create(
+            name="Alpha",
+            identifier="  al-1 ",
+            workspace=ws,
+        )
+        proj.refresh_from_db()
+        assert proj.identifier == "AL-1"
+
+    def test_cover_image_url_resolution_and_precedence(self):
+        ws = WorkspaceFactory()
+        proj = ProjectFactory(workspace=ws)
+
+        # No cover data
+        proj.cover_image = None
+        proj.cover_image_asset = None
+        assert proj.cover_image_url is None
+
+        # Text cover image
+        proj.cover_image = "https://cdn.example.com/cover.jpg"
+        assert proj.cover_image_url == "https://cdn.example.com/cover.jpg"
+
+        # FileAsset should take precedence when present
+        if FileAsset:
+            asset = FileAsset.objects.create(asset_url="https://assets.example.com/a.png")
+            proj.cover_image_asset = asset
+            assert proj.cover_image_url == "https://assets.example.com/a.png"
+
+    def test___str___format(self):
+        ws = WorkspaceFactory(name="Team Rocket")
+        proj = ProjectFactory(name="Gamma", identifier="GMM", workspace=ws)
+        assert str(proj) == "Gamma <Team Rocket>"
+
+    def test_timezone_default_and_choices_include_utc(self):
+        ws = WorkspaceFactory()
+        proj = ProjectFactory(workspace=ws, timezone="UTC")
+        assert proj.timezone == "UTC"
+        assert ("UTC", "UTC") in Project.TIMEZONE_CHOICES
+        assert "UTC" in pytz.common_timezones
+
+    def test_archive_close_in_validators_bounds(self):
+        ws = WorkspaceFactory()
+        proj = Project(name="Delta", identifier="DLT", workspace=ws, archive_in=0, close_in=12)
+        # Valid
+        proj.full_clean()
+
+        # Invalid negative
+        proj.archive_in = -1
+        with pytest.raises(ValidationError):
+            proj.full_clean()
+
+        # Invalid > 12
+        proj.archive_in = 0
+        proj.close_in = 13
+        with pytest.raises(ValidationError):
+            proj.full_clean()
+
+    def test_unique_identifier_and_name_per_workspace_with_soft_delete(self):
+        ws = WorkspaceFactory()
+        p1 = Project.objects.create(name="Echo", identifier="ECH", workspace=ws)
+
+        # Duplicates while not soft-deleted -> IntegrityError
+        with pytest.raises(IntegrityError):
+            Project.objects.create(name="Echo", identifier="ECH2", workspace=ws)
+        with pytest.raises(IntegrityError):
+            Project.objects.create(name="Foxtrot", identifier="ECH", workspace=ws)
+
+        # Soft-delete first, then allow duplicates for the constrained fields
+        p1.deleted_at = timezone.now()
+        p1.save(update_fields=["deleted_at"])
+
+        Project.objects.create(name="Echo", identifier="ECHX", workspace=ws)
+        Project.objects.create(name="Zulu", identifier="ECH", workspace=ws)
+
+    def test_network_choices_and_enum(self):
+        assert Project.NETWORK_CHOICES == ((0, "Secret"), (2, "Public"))
+        assert ProjectNetwork.choices() == [(0, "Secret"), (2, "Public")]
+
+
+@pytest.mark.django_db
+class TestProjectBaseAndMembers:
+    def test_projectbasemodel_sets_workspace_on_save_for_invite(self):
+        ws = WorkspaceFactory()
+        proj = ProjectFactory(workspace=ws)
+        inv = ProjectMemberInvite.objects.create(project=proj, email="invitee@example.com", token="tok")
+        inv.refresh_from_db()
+        assert inv.workspace_id == proj.workspace_id
+        assert str(inv) == f"{proj.name} invitee@example.com {inv.accepted}"
+
+    def test_projectmember_sort_order_initialization(self):
+        ws = WorkspaceFactory()
+        user = UserFactory()
+        proj_a = ProjectFactory(workspace=ws)
+        proj_b = ProjectFactory(workspace=ws)
+
+        # First membership => default 65535
+        m1 = ProjectMember.objects.create(project=proj_a, member=user)
+        assert pytest.approx(m1.sort_order) == 65535
+
+        # Second membership for same user in same workspace => smallest - 10000
+        m2 = ProjectMember.objects.create(project=proj_b, member=user)
+        assert m2.sort_order == m1.sort_order - 10000
+
+    def test_projectmember_defaults_role_props_and_str(self):
+        ws = WorkspaceFactory()
+        user = UserFactory()
+        proj = ProjectFactory(workspace=ws)
+
+        member = ProjectMember.objects.create(project=proj, member=user)
+
+        # Role defaults
+        assert member.role == ROLE.GUEST.value == 5
+        assert ROLE_CHOICES == ((20, "Admin"), (15, "Member"), (5, "Guest"))
+
+        # Default props/preferences
+        assert member.view_props == get_default_props()
+        assert member.default_props == get_default_props()
+        assert member.preferences == get_default_preferences()
+
+        assert str(member) == f"{user.email} <{proj.name}>"
+
+
+@pytest.mark.django_db
+class TestProjectIdentifierAndDeployBoard:
+    def test_project_identifier_unique_with_soft_delete(self):
+        ws = WorkspaceFactory()
+        proj = ProjectFactory(workspace=ws, identifier="MU", name="Mu")
+        pid1 = ProjectIdentifier.objects.create(project=proj, workspace=ws, name="MU")
+
+        with pytest.raises(IntegrityError):
+            ProjectIdentifier.objects.create(project=proj, workspace=ws, name="MU")
+
+        pid1.deleted_at = timezone.now()
+        pid1.save(update_fields=["deleted_at"])
+
+        # Now allowed after soft-delete
+        ProjectIdentifier.objects.create(project=proj, workspace=ws, name="MU")
+
+    def test_deploy_board_defaults_and_str(self):
+        ws = WorkspaceFactory()
+        proj = ProjectFactory(workspace=ws)
+        board = ProjectDeployBoard.objects.create(project=proj)
+
+        assert isinstance(board.anchor, str) and len(board.anchor) >= 32
+        assert board.views == get_default_views()
+        assert str(board) == f"{board.anchor} <{proj.name}>"
+
+    def test_get_default_views_contents(self):
+        assert get_default_views() == {
+            "list": True,
+            "kanban": True,
+            "calendar": True,
+            "gantt": True,
+            "spreadsheet": True,
+        }
+
+
+@pytest.mark.django_db
+class TestProjectPublicMember:
+    def test_unique_constraint_on_public_member(self):
+        ws = WorkspaceFactory()
+        user = UserFactory()
+        proj = ProjectFactory(workspace=ws)
+
+        pm1 = ProjectPublicMember.objects.create(project=proj, member=user)
+        assert pm1.pk is not None
+
+        with pytest.raises(IntegrityError):
+            ProjectPublicMember.objects.create(project=proj, member=user)

apps/api/plane/tests/test_permissions_base_decorator_behaviors.py

@@ -0,0 +1,213 @@
+import builtins
+from types import SimpleNamespace
+from unittest.mock import patch, MagicMock
+
+import pytest
+from rest_framework.response import Response
+from rest_framework import status
+
+# Import the decorator and ROLE enum from the provided module
+from apps.api.plane.tests.test_permissions_base import allow_permission, ROLE
+
+# Helper: minimal request/user and dummy view
+class DummyUser(SimpleNamespace):
+    pass
+
+class DummyRequest(SimpleNamespace):
+    pass
+
+def dummy_view(instance, request, *args, **kwargs):
+    return Response({"ok": True}, status=status.HTTP_200_OK)
+
+@pytest.fixture
+def user():
+    return DummyUser(id=1, username="u1")
+
+@pytest.fixture
+def request(user):
+    return DummyRequest(user=user)
+
+@pytest.fixture
+def view_instance():
+    # For function-based views 'instance' is unused; for method-decorated views could be 'self'
+    return object()
+
+def _wrap_and_call(deco, request, view_instance=None, **kwargs):
+    wrapped = deco(dummy_view)
+    return wrapped(view_instance or object(), request, **kwargs)
+
+def make_exists_mock(result: bool):
+    # Returns a mock for model.objects.filter(...).exists() chain
+    exists_mock = MagicMock(return_value=result)
+    filter_mock = MagicMock(return_value=SimpleNamespace(exists=exists_mock))
+    objects_mock = SimpleNamespace(filter=filter_mock)
+    return objects_mock, filter_mock, exists_mock
+
+# --- Tests ---
+
+def test_allows_when_creator_matches_model_pk_and_created_by(request, view_instance):
+    # If creator=True and model is supplied, creator match should short-circuit and allow regardless of roles
+    class DummyModel:
+        pass
+
+    objects_mock, filter_mock, exists_mock = make_exists_mock(True)
+    with patch.object(DummyModel, "objects", objects_mock):
+        deco = allow_permission(allowed_roles=[ROLE.GUEST], level="PROJECT", creator=True, model=DummyModel)
+        resp = _wrap_and_call(deco, request, view_instance, pk=123, slug="ws", project_id=456)
+
+    filter_mock.assert_called_once()
+    # Ensure query filters by id and created_by
+    assert filter_mock.call_args.kwargs.get("id") == 123
+    assert filter_mock.call_args.kwargs.get("created_by") is request.user
+    exists_mock.assert_called_once()
+    assert isinstance(resp, Response) and resp.status_code == 200 and resp.data == {"ok": True}
+
+@pytest.mark.parametrize(
+    "allowed_roles_input",
+    [
+        [ROLE.ADMIN, ROLE.MEMBER],   # enum members
+        [20, 15],                    # numeric roles
+        [ROLE.ADMIN.value, ROLE.MEMBER.value],  # explicit ints
+    ],
+)
+def test_workspace_level_allows_when_workspace_member_has_allowed_role(request, view_instance, allowed_roles_input):
+    # WorkspaceMember.exists() -> True should allow
+    WM_objects, WM_filter, WM_exists = make_exists_mock(True)
+    with patch("apps.api.plane.tests.test_permissions_base.WorkspaceMember") as WM, \
+         patch("apps.api.plane.tests.test_permissions_base.ProjectMember") as PM:
+        WM.objects = WM_objects
+        # ProjectMember shouldn't be called at WORKSPACE level when allowed
+        PM.objects = SimpleNamespace(filter=MagicMock())
+
+        deco = allow_permission(allowed_roles=allowed_roles_input, level="WORKSPACE")
+        resp = _wrap_and_call(deco, request, view_instance, slug="acme", project_id=999, pk=1)
+
+    WM_filter.assert_called_once()
+    assert WM_exists.called
+    assert resp.status_code == 200
+
+def test_workspace_level_denies_when_no_allowed_role_or_inactive(request, view_instance):
+    # WorkspaceMember.exists() -> False should deny (no project fallback at WORKSPACE level)
+    WM_objects, WM_filter, WM_exists = make_exists_mock(False)
+    with patch("apps.api.plane.tests.test_permissions_base.WorkspaceMember") as WM:
+        WM.objects = WM_objects
+        deco = allow_permission(allowed_roles=[ROLE.ADMIN], level="WORKSPACE")
+        resp = _wrap_and_call(deco, request, view_instance, slug="acme", project_id=1, pk=1)
+
+    assert resp.status_code == status.HTTP_403_FORBIDDEN
+    assert resp.data == {"error": "You don't have the required permissions."}
+
+def test_project_level_allows_when_project_member_has_allowed_role(request, view_instance):
+    PM_objects, PM_filter, PM_exists = make_exists_mock(True)
+    with patch("apps.api.plane.tests.test_permissions_base.ProjectMember") as PM, \
+         patch("apps.api.plane.tests.test_permissions_base.WorkspaceMember") as WM:
+        PM.objects = PM_objects
+        WM.objects = SimpleNamespace(filter=MagicMock())  # not used
+        deco = allow_permission(allowed_roles=[ROLE.MEMBER], level="PROJECT")
+        resp = _wrap_and_call(deco, request, view_instance, slug="acme", project_id=42, pk=7)
+
+    PM_filter.assert_called_once()
+    assert PM_exists.called
+    assert resp.status_code == 200
+
+def test_project_level_allows_when_workspace_admin_even_if_project_role_not_allowed(request, view_instance):
+    # First project role check -> False
+    PM_allowed_objects, PM_allowed_filter, PM_allowed_exists = make_exists_mock(False)
+    # Then project membership check (any role) -> True
+    PM_member_objects, PM_member_filter, PM_member_exists = make_exists_mock(True)
+    # Workspace admin check -> True
+    WM_admin_objects, WM_admin_filter, WM_admin_exists = make_exists_mock(True)
+
+    def pm_filter_side_effect(*args, **kwargs):
+        # For role__in present, use allowed False; otherwise for membership True
+        if "role__in" in kwargs:
+            return PM_allowed_objects.filter(**kwargs)
+        return PM_member_objects.filter(**kwargs)
+
+    with patch("apps.api.plane.tests.test_permissions_base.ProjectMember") as PM, \
+         patch("apps.api.plane.tests.test_permissions_base.WorkspaceMember") as WM:
+        PM.objects = SimpleNamespace(filter=MagicMock(side_effect=pm_filter_side_effect))
+        WM.objects = WM_admin_objects
+
+        deco = allow_permission(allowed_roles=[ROLE.GUEST], level="PROJECT")
+        resp = _wrap_and_call(deco, request, view_instance, slug="acme", project_id=123, pk=9)
+
+    # Confirm both the membership and admin checks participated
+    assert resp.status_code == 200
+    assert WM_admin_filter.called
+    assert PM_allowed_filter.called or PM.objects.filter.called
+
+def test_project_level_denies_when_not_allowed_role_not_member_or_not_workspace_admin(request, view_instance):
+    # All checks -> False
+    PM_allowed_objects, PM_allowed_filter, PM_allowed_exists = make_exists_mock(False)
+    PM_member_objects, PM_member_filter, PM_member_exists = make_exists_mock(False)
+    WM_admin_objects, WM_admin_filter, WM_admin_exists = make_exists_mock(False)
+
+    def pm_filter_side_effect(*args, **kwargs):
+        if "role__in" in kwargs:
+            return PM_allowed_objects.filter(**kwargs)
+        return PM_member_objects.filter(**kwargs)
+
+    with patch("apps.api.plane.tests.test_permissions_base.ProjectMember") as PM, \
+         patch("apps.api.plane.tests.test_permissions_base.WorkspaceMember") as WM:
+        PM.objects = SimpleNamespace(filter=MagicMock(side_effect=pm_filter_side_effect))
+        WM.objects = WM_admin_objects
+
+        deco = allow_permission(allowed_roles=[ROLE.ADMIN], level="PROJECT")
+        resp = _wrap_and_call(deco, request, view_instance, slug="acme", project_id=99, pk=3)
+
+    assert resp.status_code == status.HTTP_403_FORBIDDEN
+    assert resp.data == {"error": "You don't have the required permissions."}
+
+def test_roles_accepts_mixed_enum_and_int_inputs(request, view_instance):
+    # Ensure conversion to values works: mix enum and ints
+    PM_objects, PM_filter, PM_exists = make_exists_mock(True)
+    with patch("apps.api.plane.tests.test_permissions_base.ProjectMember") as PM, \
+         patch("apps.api.plane.tests.test_permissions_base.WorkspaceMember") as WM:
+        PM.objects = PM_objects
+        WM.objects = SimpleNamespace(filter=MagicMock())
+        deco = allow_permission(allowed_roles=[ROLE.MEMBER, 5], level="PROJECT")
+        resp = _wrap_and_call(deco, request, view_instance, slug="acme", project_id=1, pk=1)
+
+    assert resp.status_code == 200
+    # Verify role__in passed as ints
+    passed_roles = PM_filter.call_args.kwargs.get("role__in")
+    assert isinstance(passed_roles, list)
+    assert all(isinstance(r, int) for r in passed_roles)
+
+def test_creator_flag_without_model_does_not_error_and_falls_back_to_role_checks(request, view_instance):
+    # creator=True but no model should not crash; proceed to role checks which we set to allow
+    PM_objects, PM_filter, PM_exists = make_exists_mock(True)
+    with patch("apps.api.plane.tests.test_permissions_base.ProjectMember") as PM, \
+         patch("apps.api.plane.tests.test_permissions_base.WorkspaceMember") as WM:
+        PM.objects = PM_objects
+        WM.objects = SimpleNamespace(filter=MagicMock())
+        deco = allow_permission(allowed_roles=[ROLE.ADMIN], level="PROJECT", creator=True, model=None)
+        resp = _wrap_and_call(deco, request, view_instance, slug="acme", project_id=11, pk=22)
+
+    assert resp.status_code == 200
+
+def test_missing_kwargs_results_in_403_in_project_level(request, view_instance):
+    # If required kwargs like slug or project_id are missing, filter will get KeyError before queries;
+    # The decorator accesses kwargs[...] so simulate missing and expect KeyError -> treat as failure handled by pytest
+    PM_objects, PM_filter, PM_exists = make_exists_mock(False)
+    with patch("apps.api.plane.tests.test_permissions_base.ProjectMember") as PM, \
+         patch("apps.api.plane.tests.test_permissions_base.WorkspaceMember") as WM:
+        PM.objects = PM_objects
+        WM.objects = SimpleNamespace(filter=MagicMock())
+
+        deco = allow_permission(allowed_roles=[ROLE.ADMIN], level="PROJECT")
+        with pytest.raises(KeyError):
+            _ = _wrap_and_call(deco, request, view_instance, pk=1)  # slug/project_id missing
+
+def test_inactive_members_are_not_considered(request, view_instance):
+    # Ensure is_active=True is part of filters; we validate by inspecting call kwargs
+    PM_objects, PM_filter, PM_exists = make_exists_mock(True)
+    with patch("apps.api.plane.tests.test_permissions_base.ProjectMember") as PM, \
+         patch("apps.api.plane.tests.test_permissions_base.WorkspaceMember") as WM:
+        PM.objects = PM_objects
+        WM.objects = SimpleNamespace(filter=MagicMock())
+        deco = allow_permission(allowed_roles=[ROLE.MEMBER], level="PROJECT")
+        _ = _wrap_and_call(deco, request, view_instance, slug="acme", project_id=1, pk=1)
+
+    assert PM_filter.call_args.kwargs.get("is_active") is True

apps/api/plane/tests/test_permissions_project_additional.py

@@ -0,0 +1,278 @@
+import types
+from unittest.mock import MagicMock, patch
+
+import pytest
+
+# Subject under test: permission classes defined in the provided file
+from apps.api.plane.tests import test_permissions_project as perms
+
+
+def _req(user_is_anonymous: bool, method: str = "GET"):
+    return types.SimpleNamespace(
+        user=types.SimpleNamespace(is_anonymous=user_is_anonymous),
+        method=method,
+    )
+
+
+def _view(workspace_slug="ws-1", project_id=1, project_identifier=None):
+    v = types.SimpleNamespace(
+        workspace_slug=workspace_slug,
+        project_id=project_id,
+    )
+    if project_identifier is not None:
+        v.project_identifier = project_identifier
+    return v
+
+
+def _qs_with_exists(result: bool):
+    qs = MagicMock()
+    qs.exists.return_value = result
+    # Any nested filter(...) should return the same qs unless overridden in a test
+    qs.filter.return_value = qs
+    return qs
+
+
+@pytest.mark.parametrize("method", ["GET", "HEAD", "OPTIONS"])
+def test_project_base_permission_safe_methods_allowed_for_active_workspace_member(method):
+    request = _req(False, method)
+    view = _view()
+
+    with patch.object(perms.WorkspaceMember.objects, "filter") as wm_filter:
+        wm_filter.return_value = _qs_with_exists(True)
+
+        assert perms.ProjectBasePermission().has_permission(request, view) is True
+
+        wm_filter.assert_called_with(
+            workspace__slug=view.workspace_slug,
+            member=request.user,
+            is_active=True,
+        )
+
+
+@pytest.mark.parametrize("method", ["GET", "HEAD", "OPTIONS"])
+def test_project_base_permission_safe_methods_denied_for_non_member(method):
+    request = _req(False, method)
+    view = _view()
+
+    with patch.object(perms.WorkspaceMember.objects, "filter") as wm_filter:
+        wm_filter.return_value = _qs_with_exists(False)
+
+        assert perms.ProjectBasePermission().has_permission(request, view) is False
+
+
+def test_project_base_permission_post_requires_workspace_admin_or_member():
+    request = _req(False, "POST")
+    view = _view()
+
+    with patch.object(perms.WorkspaceMember.objects, "filter") as wm_filter:
+        qs = _qs_with_exists(True)
+        wm_filter.return_value = qs
+
+        assert perms.ProjectBasePermission().has_permission(request, view) is True
+
+        # Validate role__in and other filters passed
+        called_kwargs = wm_filter.call_args.kwargs
+        assert called_kwargs["workspace__slug"] == view.workspace_slug
+        assert called_kwargs["member"] == request.user
+        assert called_kwargs["is_active"] is True
+        assert "role__in" in called_kwargs
+        assert isinstance(called_kwargs["role__in"], (list, tuple))
+        assert len(called_kwargs["role__in"]) == 2  # [ROLE.ADMIN.value, ROLE.MEMBER.value]
+
+
+def test_project_base_permission_post_denied_when_not_in_workspace():
+    request = _req(False, "POST")
+    view = _view()
+
+    with patch.object(perms.WorkspaceMember.objects, "filter") as wm_filter:
+        wm_filter.return_value = _qs_with_exists(False)
+
+        assert perms.ProjectBasePermission().has_permission(request, view) is False
+
+
+@pytest.mark.parametrize("method", ["PUT", "PATCH", "DELETE"])
+def test_project_base_permission_non_safe_granted_if_project_admin(method):
+    request = _req(False, method)
+    view = _view()
+
+    with patch.object(perms.ProjectMember.objects, "filter") as pm_filter:
+        base_qs = _qs_with_exists(False)
+        admin_qs = _qs_with_exists(True)  # admin exists
+        base_qs.filter.return_value = admin_qs
+        pm_filter.return_value = base_qs
+
+        assert perms.ProjectBasePermission().has_permission(request, view) is True
+
+        # Ensure admin role filter applied
+        admin_call = base_qs.filter.call_args
+        assert admin_call.kwargs == {"role": perms.ROLE.ADMIN.value}
+
+
+@pytest.mark.parametrize("method", ["PUT", "PATCH", "DELETE"])
+def test_project_base_permission_non_safe_granted_if_project_member_and_workspace_admin(method):
+    request = _req(False, method)
+    view = _view()
+
+    with patch.object(perms.ProjectMember.objects, "filter") as pm_filter, \
+         patch.object(perms.WorkspaceMember.objects, "filter") as wm_filter:
+
+        base_qs = _qs_with_exists(True)   # user is a project member
+        admin_qs = _qs_with_exists(False) # not a project admin
+        base_qs.filter.return_value = admin_qs
+        pm_filter.return_value = base_qs
+
+        wm_filter.return_value = _qs_with_exists(True)  # workspace admin
+
+        assert perms.ProjectBasePermission().has_permission(request, view) is True
+
+        # Validate workspace admin filter call includes role=ROLE.ADMIN.value
+        called_kwargs = wm_filter.call_args.kwargs
+        assert called_kwargs["workspace__slug"] == view.workspace_slug
+        assert called_kwargs["member"] == request.user
+        assert called_kwargs["role"] == perms.ROLE.ADMIN.value
+        assert called_kwargs["is_active"] is True
+
+
+@pytest.mark.parametrize("method", ["PUT", "PATCH", "DELETE"])
+def test_project_base_permission_non_safe_denied_if_not_admin_and_not_workspace_admin(method):
+    request = _req(False, method)
+    view = _view()
+
+    with patch.object(perms.ProjectMember.objects, "filter") as pm_filter, \
+         patch.object(perms.WorkspaceMember.objects, "filter") as wm_filter:
+
+        base_qs = _qs_with_exists(False)  # not a project member (or inactive)
+        admin_qs = _qs_with_exists(False)
+        base_qs.filter.return_value = admin_qs
+        pm_filter.return_value = base_qs
+
+        wm_filter.return_value = _qs_with_exists(False)
+
+        assert perms.ProjectBasePermission().has_permission(request, view) is False
+
+
+def test_project_base_permission_denies_anonymous_for_all_methods():
+    for method in ["GET", "POST", "PATCH"]:
+        assert perms.ProjectBasePermission().has_permission(_req(True, method), _view()) is False
+
+
+# ---- ProjectMemberPermission tests ----
+
+@pytest.mark.parametrize("method", ["GET", "HEAD", "OPTIONS"])
+def test_project_member_permission_safe_methods_require_project_membership(method):
+    request = _req(False, method)
+    view = _view()
+
+    with patch.object(perms.ProjectMember.objects, "filter") as pm_filter:
+        pm_filter.return_value = _qs_with_exists(True)
+        assert perms.ProjectMemberPermission().has_permission(request, view) is True
+
+        pm_filter.return_value = _qs_with_exists(False)
+        assert perms.ProjectMemberPermission().has_permission(request, view) is False
+
+
+def test_project_member_permission_post_requires_workspace_admin_or_member():
+    request = _req(False, "POST")
+    view = _view()
+
+    with patch.object(perms.WorkspaceMember.objects, "filter") as wm_filter:
+        wm_filter.return_value = _qs_with_exists(True)
+        assert perms.ProjectMemberPermission().has_permission(request, view) is True
+
+        called_kwargs = wm_filter.call_args.kwargs
+        assert "role__in" in called_kwargs
+        assert len(called_kwargs["role__in"]) == 2
+
+
+@pytest.mark.parametrize("is_active", [True, False])
+def test_project_member_permission_write_requires_admin_or_member_and_active(is_active):
+    request = _req(False, "PATCH")
+    view = _view()
+
+    with patch.object(perms.ProjectMember.objects, "filter") as pm_filter:
+        qs = _qs_with_exists(is_active)
+        pm_filter.return_value = qs
+
+        result = perms.ProjectMemberPermission().has_permission(request, view)
+        assert result is is_active
+
+        # Validate role__in and scoping filters
+        called_kwargs = pm_filter.call_args.kwargs
+        assert called_kwargs["workspace__slug"] == view.workspace_slug
+        assert called_kwargs["member"] == request.user
+        assert called_kwargs["project_id"] == view.project_id
+        assert "role__in" in called_kwargs
+        assert called_kwargs["is_active"] is True
+
+
+def test_project_member_permission_denies_anonymous():
+    assert perms.ProjectMemberPermission().has_permission(_req(True, "GET"), _view()) is False
+
+
+# ---- ProjectEntityPermission tests ----
+
+def test_project_entity_permission_safe_with_project_identifier_scopes_by_identifier():
+    request = _req(False, "GET")
+    view = _view(project_identifier="PRJ-123")
+
+    with patch.object(perms.ProjectMember.objects, "filter") as pm_filter:
+        pm_filter.return_value = _qs_with_exists(True)
+        assert perms.ProjectEntityPermission().has_permission(request, view) is True
+
+        # Ensure identifier used (not project_id)
+        called_kwargs = pm_filter.call_args.kwargs
+        assert called_kwargs["project__identifier"] == "PRJ-123"
+        assert "project_id" not in called_kwargs
+
+
+def test_project_entity_permission_safe_without_identifier_scopes_by_project_id():
+    request = _req(False, "GET")
+    view = _view(project_identifier=None)
+
+    with patch.object(perms.ProjectMember.objects, "filter") as pm_filter:
+        pm_filter.return_value = _qs_with_exists(True)
+        assert perms.ProjectEntityPermission().has_permission(request, view) is True
+
+        called_kwargs = pm_filter.call_args.kwargs
+        assert called_kwargs["project_id"] == view.project_id
+
+
+@pytest.mark.parametrize("method", ["POST", "PUT", "PATCH", "DELETE"])
+def test_project_entity_permission_write_requires_admin_or_member(method):
+    request = _req(False, method)
+    view = _view()
+
+    with patch.object(perms.ProjectMember.objects, "filter") as pm_filter:
+        pm_filter.return_value = _qs_with_exists(True)
+        assert perms.ProjectEntityPermission().has_permission(request, view) is True
+
+        called_kwargs = pm_filter.call_args.kwargs
+        assert "role__in" in called_kwargs
+        assert len(called_kwargs["role__in"]) == 2
+        assert called_kwargs["is_active"] is True
+
+
+def test_project_entity_permission_denies_anonymous():
+    assert perms.ProjectEntityPermission().has_permission(_req(True, "GET"), _view()) is False
+
+
+# ---- ProjectLitePermission tests ----
+
+def test_project_lite_permission_denies_anonymous():
+    assert perms.ProjectLitePermission().has_permission(_req(True, "GET"), _view()) is False
+
+
+@pytest.mark.parametrize("exists", [True, False])
+def test_project_lite_permission_requires_project_membership(exists):
+    request = _req(False, "GET")
+    view = _view()
+
+    with patch.object(perms.ProjectMember.objects, "filter") as pm_filter:
+        pm_filter.return_value = _qs_with_exists(exists)
+        assert perms.ProjectLitePermission().has_permission(request, view) is exists
+
+        called_kwargs = pm_filter.call_args.kwargs
+        assert called_kwargs["workspace__slug"] == view.workspace_slug
+        assert called_kwargs["member"] == request.user
+        assert called_kwargs["project_id"] == view.project_id
+        assert called_kwargs["is_active"] is True

apps/api/plane/tests/test_views_project_base.py

@@ -0,0 +1,475 @@
+import json
+from unittest import mock
+
+import pytest
+from django.urls import reverse
+from django.utils import timezone
+from rest_framework import status
+from rest_framework.test import APIClient, APIRequestFactory, force_authenticate
+
+# NOTE: Import paths may need adjustment based on the repo's layout.
+# We bias for action by importing via common app paths; adapt as needed if tests fail.
+from plane.app.models import (
+    Project,
+    Workspace,
+    WorkspaceMember,
+    ProjectMember,
+    DeployBoard,
+    UserFavorite,
+    Intake,
+    State,
+    ProjectIdentifier,
+    User,
+)
+from plane.app.views import (
+    ProjectViewSet,
+    ProjectArchiveUnarchiveEndpoint,
+    ProjectIdentifierEndpoint,
+    ProjectUserViewsEndpoint,
+    ProjectFavoritesViewSet,
+    ProjectPublicCoverImagesEndpoint,
+    DeployBoardViewSet,
+)
+from plane.app.permissions import ROLE
+
+
+@pytest.mark.django_db
+class TestProjectViewSetListDetail:
+    def setup_method(self):
+        self.factory = APIRequestFactory()
+        self.client = APIClient()
+        # Users
+        self.owner = User.objects.create_user(email="owner@example.com", password="x")
+        self.member = User.objects.create_user(email="member@example.com", password="x")
+        self.guest = User.objects.create_user(email="guest@example.com", password="x")
+        # Workspace and memberships
+        self.ws = Workspace.objects.create(name="Acme", slug="acme")
+        WorkspaceMember.objects.create(
+            workspace=self.ws, member=self.owner, role=ROLE.ADMIN.value, is_active=True
+        )
+        WorkspaceMember.objects.create(
+            workspace=self.ws, member=self.member, role=ROLE.MEMBER.value, is_active=True
+        )
+        WorkspaceMember.objects.create(
+            workspace=self.ws, member=self.guest, role=ROLE.GUEST.value, is_active=True
+        )
+        # Projects
+        self.p1 = Project.objects.create(name="P1", identifier="P1", workspace=self.ws)
+        self.p2 = Project.objects.create(name="P2", identifier="P2", workspace=self.ws, network=2)
+        self.p3 = Project.objects.create(name="P3", identifier="P3", workspace=self.ws, archived_at=None)
+        # Project memberships
+        ProjectMember.objects.create(project=self.p1, workspace=self.ws, member=self.owner, role=ROLE.ADMIN.value, is_active=True)
+        ProjectMember.objects.create(project=self.p1, workspace=self.ws, member=self.member, role=ROLE.MEMBER.value, is_active=True)
+        ProjectMember.objects.create(project=self.p2, workspace=self.ws, member=self.owner, role=ROLE.ADMIN.value, is_active=True)
+        ProjectMember.objects.create(project=self.p3, workspace=self.ws, member=self.owner, role=ROLE.ADMIN.value, is_active=True)
+        # Favorites and DeployBoard anchor annotations coverage
+        UserFavorite.objects.create(user=self.owner, entity_type="project", entity_identifier=self.p1.id, project=self.p1, workspace=self.ws)
+        DeployBoard.objects.create(entity_name="project", entity_identifier=self.p1.id, project=self.p1, workspace=self.ws, anchor="p1-anchor")
+
+    def _view(self, action: str):
+        return ProjectViewSet.as_view({ "get": action })
+
+    def test_list_detail_admin_sees_all_sorted(self):
+        request = self.factory.get(f"/workspaces/{self.ws.slug}/projects/list-detail")
+        force_authenticate(request, user=self.owner)
+        response = self._view("list_detail")(request, slug=self.ws.slug)
+        assert response.status_code == status.HTTP_200_OK
+        # Should include at least p1, p2, p3
+        ids = [p["id"] for p in response.data]
+        assert self.p1.id in ids and self.p2.id in ids and self.p3.id in ids
+
+    def test_list_detail_guest_only_memberships(self):
+        request = self.factory.get(f"/workspaces/{self.ws.slug}/projects/list-detail")
+        force_authenticate(request, user=self.guest)
+        response = self._view("list_detail")(request, slug=self.ws.slug)
+        assert response.status_code == status.HTTP_200_OK
+        # guest not a member of any project -> sees none
+        assert response.data == []
+
+        # Add guest to p1, ensure visibility
+        ProjectMember.objects.create(project=self.p1, workspace=self.ws, member=self.guest, role=ROLE.GUEST.value, is_active=True)
+        request = self.factory.get(f"/workspaces/{self.ws.slug}/projects/list-detail")
+        force_authenticate(request, user=self.guest)
+        response = self._view("list_detail")(request, slug=self.ws.slug)
+        ids = [p["id"] for p in response.data]
+        assert self.p1.id in ids
+        assert self.p2.id not in ids  # guest not member of p2
+
+    def test_list_detail_member_sees_memberships_plus_network_2(self):
+        request = self.factory.get(f"/workspaces/{self.ws.slug}/projects/list-detail")
+        force_authenticate(request, user=self.member)
+        response = self._view("list_detail")(request, slug=self.ws.slug)
+        assert response.status_code == status.HTTP_200_OK
+        ids = [p["id"] for p in response.data]
+        # Member of p1, should also see p2 because network=2
+        assert self.p1.id in ids and self.p2.id in ids
+
+    def test_list_detail_fields_filtering(self):
+        request = self.factory.get(f"/workspaces/{self.ws.slug}/projects/list-detail?fields=id,name")
+        force_authenticate(request, user=self.owner)
+        response = self._view("list_detail")(request, slug=self.ws.slug)
+        assert response.status_code == status.HTTP_200_OK
+        assert set(response.data[0].keys()).issubset({"id","name"})
+
+    def test_list_detail_cursor_pagination_path(self, monkeypatch):
+        # Force paginate branch by providing per_page and cursor
+        request = self.factory.get(f"/workspaces/{self.ws.slug}/projects/list-detail?per_page=2&cursor=abc&order_by=-created_at")
+        force_authenticate(request, user=self.owner)
+        # Mock paginate to ensure it is invoked
+        with mock.patch.object(ProjectViewSet, "paginate", return_value=mock.sentinel.PAGED) as m:
+            response = self._view("list_detail")(request, slug=self.ws.slug)
+            assert response == mock.sentinel.PAGED
+            assert m.called
+
+
+@pytest.mark.django_db
+class TestProjectViewSetList:
+    def setup_method(self):
+        self.factory = APIRequestFactory()
+        self.ws = Workspace.objects.create(name="Acme", slug="acme")
+        self.admin = User.objects.create_user(email="admin@example.com", password="x")
+        WorkspaceMember.objects.create(workspace=self.ws, member=self.admin, role=ROLE.ADMIN.value, is_active=True)
+        self.p1 = Project.objects.create(name="P1", identifier="P1", workspace=self.ws)
+        self.p2 = Project.objects.create(name="P2", identifier="P2", workspace=self.ws, network=2)
+        ProjectMember.objects.create(project=self.p1, workspace=self.ws, member=self.admin, role=ROLE.ADMIN.value, is_active=True)
+
+    def _view(self, action):
+        return ProjectViewSet.as_view({ "get": action })
+
+    def test_list_values_shape_and_inbox_view(self):
+        request = self.factory.get(f"/workspaces/{self.ws.slug}/projects")
+        force_authenticate(request, user=self.admin)
+        response = self._view("list")(request, slug=self.ws.slug)
+        assert response.status_code == status.HTTP_200_OK
+        assert isinstance(response.data, list)
+        item = response.data[0]
+        # Expect selected fields only
+        expected_subset = {"id","name","identifier","sort_order","member_role","inbox_view","network","created_at","updated_at"}
+        assert expected_subset.issubset(set(item.keys()))
+
+    def test_list_member_filtering_includes_network_two(self):
+        member = User.objects.create_user(email="member@example.com", password="x")
+        WorkspaceMember.objects.create(workspace=self.ws, member=member, role=ROLE.MEMBER.value, is_active=True)
+        ProjectMember.objects.create(project=self.p1, workspace=self.ws, member=member, role=ROLE.MEMBER.value, is_active=True)
+
+        request = self.factory.get(f"/workspaces/{self.ws.slug}/projects")
+        force_authenticate(request, user=member)
+        response = self._view("list")(request, slug=self.ws.slug)
+        ids = [p["id"] for p in response.data]
+        assert self.p1.id in ids
+        assert self.p2.id in ids  # network=2 visible to members
+
+
+@pytest.mark.django_db
+class TestProjectViewSetRetrieveCreateUpdateDestroy:
+    def setup_method(self):
+        self.factory = APIRequestFactory()
+        self.ws = Workspace.objects.create(name="Acme", slug="acme")
+        self.admin = User.objects.create_user(email="admin@example.com", password="x")
+        self.member = User.objects.create_user(email="user@example.com", password="x")
+        WorkspaceMember.objects.create(workspace=self.ws, member=self.admin, role=ROLE.ADMIN.value, is_active=True)
+        WorkspaceMember.objects.create(workspace=self.ws, member=self.member, role=ROLE.MEMBER.value, is_active=True)
+        self.project = Project.objects.create(name="Proj", identifier="PROJ", workspace=self.ws)
+        ProjectMember.objects.create(project=self.project, workspace=self.ws, member=self.admin, role=ROLE.ADMIN.value, is_active=True)
+
+    def _view(self, method_name, http_method="get"):
+        return ProjectViewSet.as_view({ http_method: method_name })
+
+    @mock.patch("plane.app.views.recent_visited_task.delay")
+    def test_retrieve_happy_path_and_404(self, mock_task):
+        # make member of project
+        ProjectMember.objects.create(project=self.project, workspace=self.ws, member=self.member, role=ROLE.MEMBER.value, is_active=True)
+        # OK
+        req = self.factory.get("/")
+        force_authenticate(req, user=self.member)
+        resp = self._view("retrieve")(req, slug=self.ws.slug, pk=str(self.project.id))
+        assert resp.status_code == status.HTTP_200_OK
+        mock_task.assert_called_once()
+        # 404 when not a member
+        outsider = User.objects.create_user(email="out@example.com", password="x")
+        WorkspaceMember.objects.create(workspace=self.ws, member=outsider, role=ROLE.MEMBER.value, is_active=True)
+        req = self.factory.get("/")
+        force_authenticate(req, user=outsider)
+        resp = self._view("retrieve")(req, slug=self.ws.slug, pk=str(self.project.id))
+        assert resp.status_code == status.HTTP_404_NOT_FOUND
+
+    @mock.patch("plane.app.views.model_activity.delay")
+    def test_create_creates_default_states_and_members(self, mock_activity):
+        req = self.factory.post("/", data={"name": "NewProj", "identifier": "NP"}, format="json")
+        force_authenticate(req, user=self.admin)
+        resp = self._view("create", http_method="post")(req, slug=self.ws.slug)
+        assert resp.status_code == status.HTTP_201_CREATED
+        created_id = resp.data["id"]
+        # Defaults: states created
+        assert State.objects.filter(project_id=created_id, workspace=self.ws).count() >= 5
+        # Memberships: admin added
+        assert ProjectMember.objects.filter(project_id=created_id, member=self.admin, role=ROLE.ADMIN.value).exists()
+        mock_activity.assert_called_once()
+
+    @mock.patch("plane.app.views.model_activity.delay")
+    def test_partial_update_requires_permission_and_handles_archived(self, mock_activity):
+        # Non-admin project member should be forbidden
+        non_admin = self.member
+        ProjectMember.objects.create(project=self.project, workspace=self.ws, member=non_admin, role=ROLE.MEMBER.value, is_active=True)
+        req = self.factory.patch("/", data={"name": "X"}, format="json")
+        force_authenticate(req, user=non_admin)
+        resp = self._view("partial_update", http_method="patch")(req, slug=self.ws.slug, pk=str(self.project.id))
+        assert resp.status_code == status.HTTP_403_FORBIDDEN
+
+        # Archive project then attempt update -> 400
+        self.project.archived_at = timezone.now()
+        self.project.save()
+        req = self.factory.patch("/", data={"name": "Y"}, format="json")
+        force_authenticate(req, user=self.admin)
+        resp = self._view("partial_update", http_method="patch")(req, slug=self.ws.slug, pk=str(self.project.id))
+        assert resp.status_code == status.HTTP_400_BAD_REQUEST
+
+        # Unarchive and enable inbox_view -> ensure Intake default created
+        self.project.archived_at = None
+        self.project.save()
+        req = self.factory.patch("/", data={"inbox_view": True}, format="json")
+        force_authenticate(req, user=self.admin)
+        resp = self._view("partial_update", http_method="patch")(req, slug=self.ws.slug, pk=str(self.project.id))
+        assert resp.status_code == status.HTTP_200_OK
+        assert Intake.objects.filter(project=self.project, is_default=True).exists()
+        assert mock_activity.called
+
+    @mock.patch("plane.app.views.webhook_activity.delay")
+    def test_destroy_deletes_related_and_respects_permission(self, mock_webhook):
+        # Non-admin cannot delete
+        req = self.factory.delete("/")
+        force_authenticate(req, user=self.member)
+        resp = self._view("destroy", http_method="delete")(req, slug=self.ws.slug, pk=str(self.project.id))
+        assert resp.status_code == status.HTTP_403_FORBIDDEN
+
+        # Admin delete removes deploy board and favorites
+        DeployBoard.objects.create(entity_name="project", entity_identifier=self.project.id, project=self.project, workspace=self.ws)
+        UserFavorite.objects.create(user=self.admin, entity_type="project", entity_identifier=self.project.id, project=self.project, workspace=self.ws)
+        req = self.factory.delete("/")
+        force_authenticate(req, user=self.admin)
+        resp = self._view("destroy", http_method="delete")(req, slug=self.ws.slug, pk=str(self.project.id))
+        assert resp.status_code == status.HTTP_204_NO_CONTENT
+        assert not DeployBoard.objects.filter(project_id=self.project.id, workspace=self.ws).exists()
+        assert not UserFavorite.objects.filter(project_id=self.project.id, workspace=self.ws).exists()
+        mock_webhook.assert_called_once()
+
+
+@pytest.mark.django_db
+class TestProjectArchiveUnarchiveEndpoint:
+    def setup_method(self):
+        self.factory = APIRequestFactory()
+        self.ws = Workspace.objects.create(name="Acme", slug="acme")
+        self.admin = User.objects.create_user(email="admin@example.com", password="x")
+        WorkspaceMember.objects.create(workspace=self.ws, member=self.admin, role=ROLE.ADMIN.value, is_active=True)
+        self.project = Project.objects.create(name="Proj", identifier="PROJ", workspace=self.ws)
+
+    def test_archive_sets_archived_at_and_removes_favorites(self):
+        fav = UserFavorite.objects.create(user=self.admin, entity_type="project", entity_identifier=self.project.id, project=self.project, workspace=self.ws)
+        view = ProjectArchiveUnarchiveEndpoint.as_view({"post": "post"})
+        req = self.factory.post("/")
+        force_authenticate(req, user=self.admin)
+        resp = view(req, slug=self.ws.slug, project_id=str(self.project.id))
+        assert resp.status_code == status.HTTP_200_OK
+        self.project.refresh_from_db()
+        assert self.project.archived_at is not None
+        assert not UserFavorite.objects.filter(pk=fav.pk).exists()
+
+    def test_unarchive_clears_archived_at(self):
+        self.project.archived_at = timezone.now()
+        self.project.save()
+        view = ProjectArchiveUnarchiveEndpoint.as_view({"delete": "delete"})
+        req = self.factory.delete("/")
+        force_authenticate(req, user=self.admin)
+        resp = view(req, slug=self.ws.slug, project_id=str(self.project.id))
+        assert resp.status_code == status.HTTP_204_NO_CONTENT
+        self.project.refresh_from_db()
+        assert self.project.archived_at is None
+
+
+@pytest.mark.django_db
+class TestProjectIdentifierEndpoint:
+    def setup_method(self):
+        self.factory = APIRequestFactory()
+        self.ws = Workspace.objects.create(name="Acme", slug="acme")
+        self.admin = User.objects.create_user(email="admin@example.com", password="x")
+        WorkspaceMember.objects.create(workspace=self.ws, member=self.admin, role=ROLE.ADMIN.value, is_active=True)
+
+    def test_get_requires_name(self):
+        view = ProjectIdentifierEndpoint.as_view({"get": "get"})
+        req = self.factory.get("/", data={"name": ""})
+        force_authenticate(req, user=self.admin)
+        resp = view(req, slug=self.ws.slug)
+        assert resp.status_code == status.HTTP_400_BAD_REQUEST
+
+    def test_get_returns_existing_identifiers(self):
+        ProjectIdentifier.objects.create(name="API", workspace=self.ws)
+        view = ProjectIdentifierEndpoint.as_view({"get": "get"})
+        req = self.factory.get("/", data={"name": "api"})
+        force_authenticate(req, user=self.admin)
+        resp = view(req, slug=self.ws.slug)
+        assert resp.status_code == status.HTTP_200_OK
+        assert resp.data["exists"] >= 1
+        assert any(i["name"] == "API" for i in resp.data["identifiers"])
+
+    def test_delete_validation_and_success(self):
+        view = ProjectIdentifierEndpoint.as_view({"delete": "delete"})
+        # Missing name
+        req = self.factory.delete("/", data={"name": ""}, format="json")
+        force_authenticate(req, user=self.admin)
+        resp = view(req, slug=self.ws.slug)
+        assert resp.status_code == status.HTTP_400_BAD_REQUEST
+
+        # Cannot delete if used by a project
+        proj = Project.objects.create(name="Proj", identifier="USED", workspace=self.ws)
+        req = self.factory.delete("/", data={"name": "used"}, format="json")
+        force_authenticate(req, user=self.admin)
+        resp = view(req, slug=self.ws.slug)
+        assert resp.status_code == status.HTTP_400_BAD_REQUEST
+
+        # Can delete free identifier
+        ProjectIdentifier.objects.create(name="FREE", workspace=self.ws)
+        req = self.factory.delete("/", data={"name": "free"}, format="json")
+        force_authenticate(req, user=self.admin)
+        resp = view(req, slug=self.ws.slug)
+        assert resp.status_code == status.HTTP_204_NO_CONTENT
+        assert not ProjectIdentifier.objects.filter(name="FREE", workspace=self.ws).exists()
+
+
+@pytest.mark.django_db
+class TestProjectUserViewsEndpoint:
+    def setup_method(self):
+        self.factory = APIRequestFactory()
+        self.ws = Workspace.objects.create(name="Acme", slug="acme")
+        self.user = User.objects.create_user(email="u@example.com", password="x")
+        self.project = Project.objects.create(name="Proj", identifier="PROJ", workspace=self.ws)
+
+    def test_post_forbidden_if_not_project_member(self):
+        view = ProjectUserViewsEndpoint.as_view({"post": "post"})
+        req = self.factory.post("/", data={"view_props": {"x": 1}}, format="json")
+        force_authenticate(req, user=self.user)
+        resp = view(req, slug=self.ws.slug, project_id=str(self.project.id))
+        assert resp.status_code == status.HTTP_403_FORBIDDEN
+
+    def test_post_updates_member_props(self):
+        # Make user a member
+        ProjectMember.objects.create(project=self.project, workspace=self.ws, member=self.user, role=ROLE.MEMBER.value, is_active=True, view_props={"a": 1}, default_props={"b": 2}, preferences={"c": 3}, sort_order=5)
+        view = ProjectUserViewsEndpoint.as_view({"post": "post"})
+        payload = {
+            "view_props": {"a": 9},
+            "default_props": {"b": 8},
+            "preferences": {"c": 7},
+            "sort_order": 42,
+        }
+        req = self.factory.post("/", data=payload, format="json")
+        force_authenticate(req, user=self.user)
+        resp = view(req, slug=self.ws.slug, project_id=str(self.project.id))
+        assert resp.status_code == status.HTTP_204_NO_CONTENT
+        pm = ProjectMember.objects.get(project=self.project, member=self.user)
+        assert pm.view_props == payload["view_props"]
+        assert pm.default_props == payload["default_props"]
+        assert pm.preferences == payload["preferences"]
+        assert pm.sort_order == 42
+
+
+@pytest.mark.django_db
+class TestProjectFavoritesViewSet:
+    def setup_method(self):
+        self.factory = APIRequestFactory()
+        self.ws = Workspace.objects.create(name="Acme", slug="acme")
+        self.user = User.objects.create_user(email="u@example.com", password="x")
+        WorkspaceMember.objects.create(workspace=self.ws, member=self.user, role=ROLE.MEMBER.value, is_active=True)
+        self.project = Project.objects.create(name="Proj", identifier="PROJ", workspace=self.ws)
+
+    def _view(self, method, http="post"):
+        return ProjectFavoritesViewSet.as_view({ http: method })
+
+    def test_create_and_destroy_favorite(self):
+        # Create
+        req = self.factory.post("/", data={"project": self.project.id}, format="json")
+        force_authenticate(req, user=self.user)
+        resp = self._view("create", "post")(req, slug=self.ws.slug)
+        assert resp.status_code == status.HTTP_204_NO_CONTENT
+        fav = UserFavorite.objects.get(user=self.user, project=self.project, entity_type="project")
+
+        # Destroy
+        req = self.factory.delete("/")
+        force_authenticate(req, user=self.user)
+        resp = self._view("destroy", "delete")(req, slug=self.ws.slug, project_id=str(self.project.id))
+        assert resp.status_code == status.HTTP_204_NO_CONTENT
+        assert not UserFavorite.objects.filter(pk=fav.pk).exists()
+
+
+@pytest.mark.django_db
+class TestProjectPublicCoverImagesEndpoint:
+    @mock.patch("plane.app.views.boto3.client")
+    def test_get_lists_public_images_and_handles_errors(self, mock_client):
+        # Mock S3 response
+        s3 = mock_client.return_value
+        s3.list_objects_v2.return_value = {
+            "Contents": [
+                {"Key": "static/project-cover/img1.png"},
+                {"Key": "static/project-cover/nested/"},
+                {"Key": "static/project-cover/img2.jpg"},
+            ]
+        }
+        req = APIRequestFactory().get("/public/project-covers")
+        resp = ProjectPublicCoverImagesEndpoint.as_view()(req)
+        assert resp.status_code == status.HTTP_200_OK
+        # Only files, ignore folders
+        assert len(resp.data) == 2
+        assert all(k.endswith(("img1.png","img2.jpg")) for k in resp.data[0:2] or [])
+
+        # Error path returns empty list
+        s3.list_objects_v2.side_effect = Exception("boom")
+        req = APIRequestFactory().get("/public/project-covers")
+        resp = ProjectPublicCoverImagesEndpoint.as_view()(req)
+        assert resp.status_code == status.HTTP_200_OK
+        assert resp.data == []
+
+
+@pytest.mark.django_db
+class TestDeployBoardViewSet:
+    def setup_method(self):
+        self.factory = APIRequestFactory()
+        self.client = APIClient()
+        self.ws = Workspace.objects.create(name="Acme", slug="acme")
+        self.user = User.objects.create_user(email="u@example.com", password="x")
+        WorkspaceMember.objects.create(workspace=self.ws, member=self.user, role=ROLE.MEMBER.value, is_active=True)
+        self.project = Project.objects.create(name="Proj", identifier="PROJ", workspace=self.ws)
+        ProjectMember.objects.create(project=self.project, workspace=self.ws, member=self.user, role=ROLE.MEMBER.value, is_active=True)
+
+    def _view(self, method, http="get"):
+        return DeployBoardViewSet.as_view({ http: method })
+
+    def test_list_returns_existing_board(self):
+        db = DeployBoard.objects.create(entity_name="project", entity_identifier=self.project.id, project=self.project, workspace=self.ws, view_props={"list": True})
+        req = self.factory.get("/")
+        force_authenticate(req, user=self.user)
+        resp = self._view("list", "get")(req, slug=self.ws.slug, project_id=str(self.project.id))
+        assert resp.status_code == status.HTTP_200_OK
+        assert resp.data["id"] == str(db.id) or resp.data["id"] == db.id
+
+    def test_create_upserts_and_sets_flags(self):
+        payload = {
+            "is_comments_enabled": True,
+            "is_reactions_enabled": True,
+            "is_votes_enabled": True,
+            "intake": {"enabled": True},
+            "views": {"list": True, "kanban": False, "calendar": True, "gantt": False, "spreadsheet": True},
+        }
+        req = self.factory.post("/", data=payload, format="json")
+        force_authenticate(req, user=self.user)
+        resp = self._view("create", "post")(req, slug=self.ws.slug, project_id=str(self.project.id))
+        assert resp.status_code == status.HTTP_200_OK
+
+        db = DeployBoard.objects.get(entity_name="project", entity_identifier=self.project.id)
+        assert db.is_comments_enabled is True
+        assert db.is_reactions_enabled is True
+        assert db.is_votes_enabled is True
+        assert db.view_props == payload["views"]
+        assert db.intake == payload["intake"]
+
+
+# Testing framework note:
+# These tests are written for pytest with pytest-django and Django REST Framework's testing utilities (APIRequestFactory/APIClient).
+# They follow repository conventions by mocking external dependencies (boto3, celery tasks) and exercising public interfaces of view classes.

apps/api/plane/utils/content_validator.py

@@ -67,20 +67,9 @@ def validate_binary_data(data):
 # Combine custom components and editor-specific nodes into a single set of tags
 CUSTOM_TAGS = {
     # editor node/tag names
-    "imageComponent",
-    "image",
-    "mention",
-    "link",
-    "customColor",
-    "emoji",
-    "tableHeader",
-    "tableCell",
-    "tableRow",
-    "codeBlock",
-    "code",
-    "horizontalRule",
-    "calloutComponent",
-    # component-style tag used by editor embeds
+    "mention-component",
+    "label",
+    "input",
     "image-component",
 }
 ALLOWED_TAGS = nh3.ALLOWED_TAGS | CUSTOM_TAGS
@@ -95,6 +84,8 @@ ATTRIBUTES = {
         "aria-label",
         "aria-hidden",
         "style",
+        "start",
+        "type",
         # common editor data-* attributes seen in stored HTML
         # (wildcards like data-* are NOT supported by nh3; we add known keys
         # here and dynamically include all data-* seen in the input below)
@@ -102,49 +93,64 @@ ATTRIBUTES = {
         "data-node-type",
         "data-type",
         "data-checked",
-        "data-background",
+        "data-background-color",
         "data-text-color",
+        "data-name",
+        # callout attributes
         "data-icon-name",
         "data-icon-color",
-        "data-background-color",
+        "data-background",
         "data-emoji-unicode",
         "data-emoji-url",
         "data-logo-in-use",
         "data-block-type",
-        "data-name",
-        "data-entity-id",
-        "data-entity-group-id",
     },
     "a": {"href", "target"},
     # editor node/tag attributes
-    "imageComponent": {"id", "width", "height", "aspectRatio", "src", "alignment"},
-    "image": {"width", "height", "aspectRatio", "alignment", "src", "alt", "title"},
-    "mention": {"id", "entity_identifier", "entity_name"},
-    "link": {"href", "target"},
-    "customColor": {"color", "backgroundColor"},
-    "emoji": {"name"},
-    "tableHeader": {"colspan", "rowspan", "colwidth", "background", "hideContent"},
-    "tableCell": {
+    "image-component": {
+        "id",
+        "width",
+        "height",
+        "aspectRatio",
+        "aspectratio",
+        "src",
+        "alignment",
+    },
+    "img": {
+        "width",
+        "height",
+        "aspectRatio",
+        "aspectratio",
+        "alignment",
+        "src",
+        "alt",
+        "title",
+    },
+    "mention-component": {"id", "entity_identifier", "entity_name"},
+    "th": {
+        "colspan",
+        "rowspan",
+        "colwidth",
+        "background",
+        "hideContent",
+        "hidecontent",
+        "style",
+    },
+    "td": {
         "colspan",
         "rowspan",
         "colwidth",
         "background",
         "textColor",
+        "textcolor",
         "hideContent",
+        "hidecontent",
+        "style",
     },
-    "tableRow": {"background", "textColor"},
-    "codeBlock": {"language"},
-    "calloutComponent": {
-        "data-icon-color",
-        "data-icon-name",
-        "data-emoji-unicode",
-        "data-emoji-url",
-        "data-logo-in-use",
-        "data-background",
-        "data-block-type",
-    },
-    # image-component (from editor extension and seeds)
-    "image-component": {"src", "id", "width", "height", "aspectratio", "alignment"},
+    "tr": {"background", "textColor", "textcolor", "style"},
+    "pre": {"language"},
+    "code": {"language", "spellcheck"},
+    "input": {"type", "checked"},
 }
 
 SAFE_PROTOCOLS = {"http", "https", "mailto", "tel"}

apps/api/plane/utils/issue_filters.py

@@ -476,6 +476,8 @@ def filter_subscribed_issues(params, issue_filter, method, prefix=""):
             issue_filter[f"{prefix}issue_subscribers__subscriber_id__in"] = params.get(
                 "subscriber"
             )
+    issue_filter[f"{prefix}issue_subscribers__deleted_at__isnull"] = True
+
     return issue_filter
 
 

apps/api/plane/utils/path_validator.py

@@ -3,18 +3,20 @@ from urllib.parse import urlparse
 
 
 def validate_next_path(next_path: str) -> str:
-    """Validates that next_path is a valid path and extracts only the path component."""
+    """Validates that next_path is a safe relative path for redirection."""
+    # Browsers interpret backslashes as forward slashes. Remove all backslashes.
+    next_path = next_path.replace("\\", "")
     parsed_url = urlparse(next_path)
 
-    # Ensure next_path is not an absolute URL
+    # Block absolute URLs or anything with scheme/netloc
     if parsed_url.scheme or parsed_url.netloc:
         next_path = parsed_url.path  # Extract only the path component
 
-    # Ensure it starts with a forward slash (indicating a valid relative path)
-    if not next_path.startswith("/"):
+    # Must start with a forward slash and not be empty
+    if not next_path or not next_path.startswith("/"):
         return ""
 
-    # Ensure it does not contain dangerous path traversal sequences
+    # Prevent path traversal
     if ".." in next_path:
         return ""
 

apps/api/requirements/base.txt

@@ -1,7 +1,7 @@
 # base requirements
 
 # django
-Django==4.2.22
+Django==4.2.24
 # rest framework
 djangorestframework==3.15.2
 # postgres

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

@@ -13,6 +13,11 @@ export async function generateMetadata({ params }: Props) {
   const { anchor } = params;
   const DEFAULT_TITLE = "Plane";
   const DEFAULT_DESCRIPTION = "Made with Plane, an AI-powered work management platform with publishing capabilities.";
+  // Validate anchor before using in request (only allow alphanumeric, -, _)
+  const ANCHOR_REGEX = /^[a-zA-Z0-9_-]+$/;
+  if (!ANCHOR_REGEX.test(anchor)) {
+    return { title: DEFAULT_TITLE, description: DEFAULT_DESCRIPTION };
+  }
   try {
     const response = await fetch(`${process.env.NEXT_PUBLIC_API_BASE_URL}/api/public/anchor/${anchor}/meta/`);
     const data = await response.json();

apps/space/core/components/account/user-logged-in.tsx

@@ -2,7 +2,7 @@
 
 import { observer } from "mobx-react";
 import Image from "next/image";
-import { PlaneLockup } from "@plane/ui";
+import { PlaneLockup } from "@plane/propel/icons";
 // components
 import { PoweredBy } from "@/components/common/powered-by";
 import { UserAvatar } from "@/components/issues/navbar/user-avatar";

apps/space/core/components/common/powered-by.tsx

@@ -3,7 +3,7 @@
 import { FC } from "react";
 import { WEBSITE_URL } from "@plane/constants";
 // assets
-import { PlaneLogo } from "@plane/ui";
+import { PlaneLogo } from "@plane/propel/icons";
 
 type TPoweredBy = {
   disabled?: boolean;

apps/space/core/components/issues/filters/applied-filters/priority.tsx

@@ -1,7 +1,7 @@
 "use client";
 
 import { X } from "lucide-react";
-import { PriorityIcon, type TIssuePriorities } from "@plane/ui";
+import { PriorityIcon, type TIssuePriorities } from "@plane/propel/icons";
 
 type Props = {
   handleRemove: (val: string) => void;

apps/space/core/components/issues/filters/applied-filters/state.tsx

@@ -4,7 +4,7 @@ import { observer } from "mobx-react";
 import { X } from "lucide-react";
 // plane imports
 import { EIconSize } from "@plane/constants";
-import { StateGroupIcon } from "@plane/ui";
+import { StateGroupIcon } from "@plane/propel/icons";
 // hooks
 import { useStates } from "@/hooks/store/use-state";
 

apps/space/core/components/issues/filters/priority.tsx

@@ -5,7 +5,7 @@ import { observer } from "mobx-react";
 // plane imports
 import { ISSUE_PRIORITY_FILTERS } from "@plane/constants";
 import { useTranslation } from "@plane/i18n";
-import { PriorityIcon } from "@plane/ui";
+import { PriorityIcon } from "@plane/propel/icons";
 // local imports
 import { FilterHeader } from "./helpers/filter-header";
 import { FilterOption } from "./helpers/filter-option";

apps/space/core/components/issues/filters/state.tsx

@@ -4,7 +4,8 @@ import React, { useState } from "react";
 import { observer } from "mobx-react";
 // ui
 import { EIconSize } from "@plane/constants";
-import { Loader, StateGroupIcon } from "@plane/ui";
+import { StateGroupIcon } from "@plane/propel/icons";
+import { Loader } from "@plane/ui";
 // hooks
 import { useStates } from "@/hooks/store/use-state";
 // local imports

apps/space/core/components/issues/issue-layouts/properties/cycle.tsx

@@ -2,8 +2,8 @@
 
 import { observer } from "mobx-react";
 // plane ui
+import { ContrastIcon } from "@plane/propel/icons";
 import { Tooltip } from "@plane/propel/tooltip";
-import { ContrastIcon } from "@plane/ui";
 // plane utils
 import { cn } from "@plane/utils";
 //hooks

apps/space/core/components/issues/issue-layouts/properties/modules.tsx

@@ -2,8 +2,8 @@
 
 import { observer } from "mobx-react";
 // plane ui
+import { DiceIcon } from "@plane/propel/icons";
 import { Tooltip } from "@plane/propel/tooltip";
-import { DiceIcon } from "@plane/ui";
 // plane utils
 import { cn } from "@plane/utils";
 // hooks

apps/space/core/components/issues/issue-layouts/properties/priority.tsx

@@ -3,9 +3,9 @@
 import { SignalHigh } from "lucide-react";
 import { useTranslation } from "@plane/i18n";
 // types
+import { PriorityIcon } from "@plane/propel/icons";
 import { Tooltip } from "@plane/propel/tooltip";
 import { TIssuePriorities } from "@plane/types";
-import { PriorityIcon } from "@plane/ui";
 // constants
 import { cn, getIssuePriorityFilters } from "@plane/utils";
 

apps/space/core/components/issues/issue-layouts/properties/state.tsx

@@ -2,8 +2,8 @@
 
 import { observer } from "mobx-react";
 // plane ui
+import { StateGroupIcon } from "@plane/propel/icons";
 import { Tooltip } from "@plane/propel/tooltip";
-import { StateGroupIcon } from "@plane/ui";
 // plane utils
 import { cn } from "@plane/utils";
 //hooks

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

@@ -4,6 +4,7 @@ import isNil from "lodash/isNil";
 import { ContrastIcon } from "lucide-react";
 // types
 import { EIconSize, ISSUE_PRIORITIES } from "@plane/constants";
+import { CycleGroupIcon, DiceIcon, PriorityIcon, StateGroupIcon } from "@plane/propel/icons";
 import {
   GroupByColumnTypes,
   IGroupByColumn,
@@ -12,7 +13,7 @@ import {
   TGroupedIssues,
 } from "@plane/types";
 // ui
-import { Avatar, CycleGroupIcon, DiceIcon, PriorityIcon, StateGroupIcon } from "@plane/ui";
+import { Avatar } from "@plane/ui";
 // components
 // constants
 // stores

apps/space/core/components/issues/peek-overview/header.tsx

@@ -5,7 +5,8 @@ import { observer } from "mobx-react";
 import { Link2, MoveRight } from "lucide-react";
 import { Listbox, Transition } from "@headlessui/react";
 // ui
-import { CenterPanelIcon, FullScreenPanelIcon, setToast, SidePanelIcon, TOAST_TYPE } from "@plane/ui";
+import { CenterPanelIcon, FullScreenPanelIcon, SidePanelIcon } from "@plane/propel/icons";
+import { setToast, TOAST_TYPE } from "@plane/ui";
 // helpers
 import { copyTextToClipboard } from "@/helpers/string.helper";
 // hooks

apps/space/core/components/issues/peek-overview/issue-properties.tsx

@@ -5,7 +5,8 @@ import { useParams } from "next/navigation";
 import { CalendarCheck2, Signal } from "lucide-react";
 // plane imports
 import { useTranslation } from "@plane/i18n";
-import { DoubleCircleIcon, StateGroupIcon, TOAST_TYPE, setToast } from "@plane/ui";
+import { DoubleCircleIcon, StateGroupIcon } from "@plane/propel/icons";
+import { TOAST_TYPE, setToast } from "@plane/ui";
 import { cn, getIssuePriorityFilters } from "@plane/utils";
 // components
 import { Icon } from "@/components/ui";

apps/space/core/components/views/header.tsx

@@ -2,7 +2,7 @@
 
 import React from "react";
 import Link from "next/link";
-import { PlaneLockup } from "@plane/ui";
+import { PlaneLockup } from "@plane/propel/icons";
 
 export const AuthHeader = () => (
   <div className="flex items-center justify-between gap-6 w-full flex-shrink-0 sticky top-0">

apps/web/app/(all)/[workspaceSlug]/(projects)/active-cycles/header.tsx

@@ -2,7 +2,8 @@
 import { observer } from "mobx-react";
 import { useTranslation } from "@plane/i18n";
 // ui
-import { Breadcrumbs, ContrastIcon, Header } from "@plane/ui";
+import { ContrastIcon } from "@plane/propel/icons";
+import { Breadcrumbs, Header } from "@plane/ui";
 // components
 import { BreadcrumbLink } from "@/components/common/breadcrumb-link";
 // plane web components

apps/web/app/(all)/[workspaceSlug]/(projects)/profile/[userId]/header.tsx

@@ -8,8 +8,9 @@ import { useParams } from "next/navigation";
 import { ChevronDown, PanelRight } from "lucide-react";
 import { PROFILE_VIEWER_TAB, PROFILE_ADMINS_TAB, EUserPermissions, EUserPermissionsLevel } from "@plane/constants";
 import { useTranslation } from "@plane/i18n";
+import { UserActivityIcon } from "@plane/propel/icons";
 import { IUserProfileProjectSegregation } from "@plane/types";
-import { Breadcrumbs, Header, CustomMenu, UserActivityIcon } from "@plane/ui";
+import { Breadcrumbs, Header, CustomMenu } from "@plane/ui";
 import { cn } from "@plane/utils";
 // components
 import { BreadcrumbLink } from "@/components/common/breadcrumb-link";

apps/web/app/(all)/[workspaceSlug]/(projects)/projects/(detail)/[projectId]/archives/header.tsx

@@ -3,10 +3,11 @@
 import { FC } from "react";
 import { observer } from "mobx-react";
 import { useParams } from "next/navigation";
+import { ArchiveIcon, ContrastIcon, DiceIcon, LayersIcon } from "@plane/propel/icons";
 import { Tooltip } from "@plane/propel/tooltip";
 import { EIssuesStoreType } from "@plane/types";
 // ui
-import { ArchiveIcon, Breadcrumbs, Header, ContrastIcon, DiceIcon, LayersIcon } from "@plane/ui";
+import { Breadcrumbs, Header } from "@plane/ui";
 // components
 import { BreadcrumbLink } from "@/components/common/breadcrumb-link";
 // hooks

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

@@ -4,7 +4,8 @@ import { observer } from "mobx-react";
 import { useParams } from "next/navigation";
 import useSWR from "swr";
 // ui
-import { ArchiveIcon, Breadcrumbs, LayersIcon, Header } from "@plane/ui";
+import { ArchiveIcon, LayersIcon } from "@plane/propel/icons";
+import { Breadcrumbs, Header } from "@plane/ui";
 // components
 import { BreadcrumbLink } from "@/components/common/breadcrumb-link";
 import { IssueDetailQuickActions } from "@/components/issues/issue-detail/issue-detail-quick-actions";

apps/web/app/(all)/[workspaceSlug]/(projects)/projects/(detail)/[projectId]/cycles/(detail)/header.tsx

@@ -16,6 +16,7 @@ import {
 } from "@plane/constants";
 import { usePlatformOS } from "@plane/hooks";
 import { useTranslation } from "@plane/i18n";
+import { ContrastIcon } from "@plane/propel/icons";
 import { Tooltip } from "@plane/propel/tooltip";
 import {
   EIssuesStoreType,
@@ -25,7 +26,7 @@ import {
   IIssueFilterOptions,
   EIssueLayoutTypes,
 } from "@plane/types";
-import { Breadcrumbs, Button, ContrastIcon, BreadcrumbNavigationSearchDropdown, Header } from "@plane/ui";
+import { Breadcrumbs, Button, BreadcrumbNavigationSearchDropdown, Header } from "@plane/ui";
 import { cn, isIssueFilterActive } from "@plane/utils";
 // components
 import { WorkItemsModal } from "@/components/analytics/work-items/modal";

apps/web/app/(all)/[workspaceSlug]/(projects)/projects/(detail)/[projectId]/modules/(detail)/header.tsx

@@ -14,6 +14,7 @@ import {
   EProjectFeatureKey,
   WORK_ITEM_TRACKER_ELEMENTS,
 } from "@plane/constants";
+import { DiceIcon } from "@plane/propel/icons";
 import { Tooltip } from "@plane/propel/tooltip";
 import {
   EIssuesStoreType,
@@ -23,7 +24,7 @@ import {
   IIssueFilterOptions,
   EIssueLayoutTypes,
 } from "@plane/types";
-import { Breadcrumbs, Button, DiceIcon, Header, BreadcrumbNavigationSearchDropdown } from "@plane/ui";
+import { Breadcrumbs, Button, Header, BreadcrumbNavigationSearchDropdown } from "@plane/ui";
 import { cn, isIssueFilterActive } from "@plane/utils";
 // components
 import { WorkItemsModal } from "@/components/analytics/work-items/modal";

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

@@ -3,7 +3,8 @@
 import { observer } from "mobx-react";
 import { useParams } from "next/navigation";
 // plane imports
-import { Breadcrumbs, Button, Header, RecentStickyIcon } from "@plane/ui";
+import { RecentStickyIcon } from "@plane/propel/icons";
+import { Breadcrumbs, Button, Header } from "@plane/ui";
 // components
 import { BreadcrumbLink } from "@/components/common/breadcrumb-link";
 import { StickySearch } from "@/components/stickies/modal/search";

apps/web/app/(all)/[workspaceSlug]/(projects)/workspace-views/header.tsx

@@ -191,7 +191,7 @@ export const GlobalIssuesHeader = observer(() => {
           </Breadcrumbs>
         </Header.LeftItem>
 
-        <Header.RightItem>
+        <Header.RightItem className="items-center">
           {!isLocked ? (
             <>
               <GlobalViewLayoutSelection

apps/web/app/(all)/create-workspace/page.tsx

@@ -6,8 +6,9 @@ import Image from "next/image";
 import Link from "next/link";
 // plane imports
 import { useTranslation } from "@plane/i18n";
+import { PlaneLogo } from "@plane/propel/icons";
 import { IWorkspace } from "@plane/types";
-import { Button, getButtonStyling, PlaneLogo } from "@plane/ui";
+import { Button, getButtonStyling } from "@plane/ui";
 // components
 import { CreateWorkspaceForm } from "@/components/workspace/create-workspace-form";
 // hooks

apps/web/app/(all)/invitations/page.tsx

@@ -10,9 +10,10 @@ import { CheckCircle2 } from "lucide-react";
 import { ROLE, MEMBER_TRACKER_EVENTS, MEMBER_TRACKER_ELEMENTS, GROUP_WORKSPACE_TRACKER_EVENT } from "@plane/constants";
 import { useTranslation } from "@plane/i18n";
 // types
+import { PlaneLogo } from "@plane/propel/icons";
 import type { IWorkspaceMemberInvitation } from "@plane/types";
 // ui
-import { Button, TOAST_TYPE, setToast, PlaneLogo } from "@plane/ui";
+import { Button, TOAST_TYPE, setToast } from "@plane/ui";
 import { truncateText } from "@plane/utils";
 // components
 import { EmptyState } from "@/components/common/empty-state";

apps/web/app/(all)/layout.tsx

@@ -5,7 +5,7 @@ import { PreloadResources } from "./layout.preload";
 // styles
 import "@/styles/command-pallette.css";
 import "@/styles/emoji.css";
-import "@/styles/react-day-picker.css";
+import "@plane/propel/styles/react-day-picker";
 
 export const metadata: Metadata = {
   robots: {

apps/web/app/error.tsx

@@ -1,69 +1,83 @@
 "use client";
 
-import Link from "next/link";
-// plane imports
-import { API_BASE_URL } from "@plane/constants";
-import { Button, TOAST_TYPE, getButtonStyling, setToast } from "@plane/ui";
-import { cn } from "@plane/utils";
-// hooks
-import { useAppRouter } from "@/hooks/use-app-router";
+import Image from "next/image";
+import { useTheme } from "next-themes";
 // layouts
+import { Button } from "@plane/ui";
+import { useAppRouter } from "@/hooks/use-app-router";
 import DefaultLayout from "@/layouts/default-layout";
-// services
-import { AuthService } from "@/services/auth.service";
+// images
+import maintenanceModeDarkModeImage from "@/public/instance/maintenance-mode-dark.svg";
+import maintenanceModeLightModeImage from "@/public/instance/maintenance-mode-light.svg";
 
-// services
-const authService = new AuthService();
+const linkMap = [
+  {
+    key: "mail_to",
+    label: "Contact Support",
+    value: "mailto:support@plane.so",
+  },
+  {
+    key: "status",
+    label: "Status Page",
+    value: "https://status.plane.so/",
+  },
+  {
+    key: "twitter_handle",
+    label: "@planepowers",
+    value: "https://x.com/planepowers",
+  },
+];
 
 export default function CustomErrorComponent() {
+  // hooks
+  const { resolvedTheme } = useTheme();
   const router = useAppRouter();
 
-  const handleSignOut = async () => {
-    await authService
-      .signOut(API_BASE_URL)
-      .catch(() =>
-        setToast({
-          type: TOAST_TYPE.ERROR,
-          title: "Error!",
-          message: "Failed to sign out. Please try again.",
-        })
-      )
-      .finally(() => router.push("/"));
-  };
+  // derived values
+  const maintenanceModeImage = resolvedTheme === "dark" ? maintenanceModeDarkModeImage : maintenanceModeLightModeImage;
 
   return (
     <DefaultLayout>
-      <div className={`h-screen w-full overflow-hidden bg-custom-background-100`}>
-        <div className="grid h-full place-items-center p-4">
-          <div className="space-y-8 text-center">
-            <div className="space-y-2 relative flex flex-col justify-center items-center">
-              <h3 className="text-lg font-semibold">Yikes! That doesn{"'"}t look good.</h3>
-              <p className="mx-auto md:w-1/2 text-sm text-custom-text-200">
-                That crashed Plane, pun intended. No worries, though. Our engineers have been notified. If you have more
-                details, please write to{" "}
-                <a href="mailto:support@plane.so" className="text-custom-primary">
-                  support@plane.so
-                </a>{" "}
-                or on our{" "}
+      <div className="relative container mx-auto h-full w-full max-w-xl flex flex-col gap-2 items-center justify-center gap-y-6 bg-custom-background-100 text-center px-6">
+        <div className="relative w-full">
+          <Image
+            src={maintenanceModeImage}
+            height="176"
+            width="288"
+            alt="ProjectSettingImg"
+            className="w-full h-full object-fill object-center"
+          />
+        </div>
+        <div className="w-full relative flex flex-col gap-4 mt-4">
+          <div className="flex flex-col gap-2.5">
+            <h1 className="text-xl font-semibold text-custom-text-100 text-left">
+              &#x1F6A7; Looks like something went wrong!
+            </h1>
+            <span className="text-base font-medium text-custom-text-200 text-left">
+              We track these errors automatically and working on getting things back up and running. If the problem
+              persists feel free to contact us. In the meantime, try refreshing.
+            </span>
+          </div>
+
+          <div className="flex items-center justify-start gap-6 mt-1">
+            {linkMap.map((link) => (
+              <div key={link.key}>
                 <a
-                  href="https://discord.com/invite/A92xrEGCge"
+                  href={link.value}
                   target="_blank"
-                  className="text-custom-primary"
                   rel="noopener noreferrer"
+                  className="text-custom-primary-100 hover:underline text-sm"
                 >
-                  Discord
+                  {link.label}
                 </a>
-                .
-              </p>
-            </div>
-            <div className="flex items-center justify-center gap-2">
-              <Link href="/" className={cn(getButtonStyling("primary", "md"))}>
-                Go to home
-              </Link>
-              <Button variant="neutral-primary" size="md" onClick={handleSignOut}>
-                Sign out
-              </Button>
-            </div>
+              </div>
+            ))}
+          </div>
+
+          <div className="flex items-center justify-start gap-6">
+            <Button variant="primary" size="md" onClick={() => router.push("/")}>
+              Go to home
+            </Button>
           </div>
         </div>
       </div>

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

@@ -4,7 +4,8 @@ import { FC } from "react";
 import { observer } from "mobx-react";
 // plane imports
 import { EProjectFeatureKey } from "@plane/constants";
-import { BreadcrumbNavigationDropdown, Breadcrumbs, ISvgIcons } from "@plane/ui";
+import { ISvgIcons } from "@plane/propel/icons";
+import { BreadcrumbNavigationDropdown, Breadcrumbs } from "@plane/ui";
 // components
 import { SwitcherLabel } from "@/components/common/switcher-label";
 import type { TNavigationItem } from "@/components/workspace/sidebar/project-navigation";

apps/web/ce/components/command-palette/actions/work-item-actions/change-state-list.tsx

@@ -3,7 +3,8 @@ import { observer } from "mobx-react";
 import { Check } from "lucide-react";
 // plane imports
 import { EIconSize } from "@plane/constants";
-import { Spinner, StateGroupIcon } from "@plane/ui";
+import { StateGroupIcon } from "@plane/propel/icons";
+import { Spinner } from "@plane/ui";
 // store hooks
 import { useProjectState } from "@/hooks/store/use-project-state";
 

apps/web/ce/components/command-palette/helpers.tsx

@@ -2,6 +2,7 @@
 
 // types
 import { Briefcase, FileText, Layers, LayoutGrid } from "lucide-react";
+import { ContrastIcon, DiceIcon } from "@plane/propel/icons";
 import {
   IWorkspaceDefaultSearchResult,
   IWorkspaceIssueSearchResult,
@@ -10,7 +11,6 @@ import {
   IWorkspaceSearchResult,
 } from "@plane/types";
 // ui
-import { ContrastIcon, DiceIcon } from "@plane/ui";
 // helpers
 import { generateWorkItemLink } from "@plane/utils";
 // plane web components

apps/web/ce/components/comments/comment-block.tsx

@@ -2,9 +2,8 @@ import { FC, ReactNode, useRef } from "react";
 import { observer } from "mobx-react";
 // plane imports
 import { useTranslation } from "@plane/i18n";
-import { Tooltip } from "@plane/propel/tooltip";
-import { TIssueComment } from "@plane/types";
-import { Avatar } from "@plane/ui";
+import { EIssueCommentAccessSpecifier, TIssueComment } from "@plane/types";
+import { Avatar, Tooltip } from "@plane/ui";
 import { calculateTimeAgo, cn, getFileURL, renderFormattedDate, renderFormattedTime } from "@plane/utils";
 // hooks
 import { useMember } from "@/hooks/store/use-member";
@@ -27,7 +26,13 @@ export const CommentBlock: FC<TCommentBlock> = observer((props) => {
   // translation
   const { t } = useTranslation();
 
-  if (!comment || !userDetails) return null;
+  const displayName = comment?.actor_detail?.is_bot
+    ? comment?.actor_detail?.first_name + ` ${t("bot")}`
+    : (userDetails?.display_name ?? comment?.actor_detail?.display_name);
+
+  const avatarUrl = userDetails?.avatar_url ?? comment?.actor_detail?.avatar_url;
+
+  if (!comment) return null;
 
   return (
     <div
@@ -43,20 +48,15 @@ export const CommentBlock: FC<TCommentBlock> = observer((props) => {
           "flex-shrink-0 relative w-7 h-6 rounded-full transition-border duration-1000 flex justify-center items-center z-[3] uppercase font-medium"
         )}
       >
-        <Avatar
-          size="base"
-          name={userDetails?.display_name}
-          src={getFileURL(userDetails?.avatar_url)}
-          className="flex-shrink-0"
-        />
+        <Avatar size="base" name={displayName} src={getFileURL(avatarUrl)} className="flex-shrink-0" />
       </div>
       <div className="flex flex-col gap-3 truncate flex-grow">
         <div className="flex w-full gap-2">
           <div className="flex-1 flex flex-wrap items-center gap-1">
-            <div className="text-xs font-medium">
-              {comment?.actor_detail?.is_bot
-                ? comment?.actor_detail?.first_name + ` ${t("bot")}`
-                : comment?.actor_detail?.display_name || userDetails.display_name}
+            <div className="flex items-center gap-1">
+              <span className="text-xs font-medium">
+                {`${displayName}${comment.access === EIssueCommentAccessSpecifier.EXTERNAL ? " (External User)" : ""}`}
+              </span>
             </div>
             <div className="text-xs text-custom-text-300">
               commented{" "}

apps/web/ce/components/global/product-updates-header.tsx

@@ -1,6 +1,6 @@
 import { observer } from "mobx-react";
 import { useTranslation } from "@plane/i18n";
-import { PlaneLogo } from "@plane/ui";
+import { PlaneLogo } from "@plane/propel/icons";
 // helpers
 import { cn } from "@plane/utils";
 // package.json

apps/web/ce/components/instance/maintenance-message.tsx

@@ -1,17 +1,37 @@
-import { observer } from "mobx-react";
-import { useTranslation } from "@plane/i18n";
-
-export const MaintenanceMessage = observer(() => {
-  // hooks
-  const { t } = useTranslation();
+export const MaintenanceMessage = () => {
+  const linkMap = [
+    {
+      key: "mail_to",
+      label: "Contact Support",
+      value: "mailto:support@plane.so",
+    },
+  ];
 
   return (
-    <h1 className="text-xl font-medium text-custom-text-100 text-center md:text-left">
-      {t(
-        "self_hosted_maintenance_message.plane_didnt_start_up_this_could_be_because_one_or_more_plane_services_failed_to_start"
-      )}
-      <br />
-      {t("self_hosted_maintenance_message.choose_view_logs_from_setup_sh_and_docker_logs_to_be_sure")}
-    </h1>
+    <>
+      <div className="flex flex-col gap-2.5">
+        <h1 className="text-xl font-semibold text-custom-text-100 text-left">
+          &#x1F6A7; Looks like Plane didn&apos;t start up correctly!
+        </h1>
+        <span className="text-base font-medium text-custom-text-200 text-left">
+          Some services might have failed to start. Please check your container logs to identify and resolve the issue.
+          If you&apos;re stuck, reach out to our support team for more help.
+        </span>
+      </div>
+      <div className="flex items-center justify-start gap-6 mt-1">
+        {linkMap.map((link) => (
+          <div key={link.key}>
+            <a
+              href={link.value}
+              target="_blank"
+              rel="noopener noreferrer"
+              className="text-custom-primary-100 hover:underline text-sm"
+            >
+              {link.label}
+            </a>
+          </div>
+        ))}
+      </div>
+    </>
   );
-});
+};

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

@@ -13,8 +13,8 @@ import {
   Users,
 } from "lucide-react";
 // types
+import { DiceIcon, DoubleCircleIcon, ISvgIcons } from "@plane/propel/icons";
 import { IGroupByColumn, IIssueDisplayProperties, TGetColumns, TSpreadsheetColumn } from "@plane/types";
-import { DiceIcon, DoubleCircleIcon, ISvgIcons } from "@plane/ui";
 // components
 import {
   SpreadsheetAssigneeColumn,

apps/web/ce/components/pages/navigation-pane/tab-panels/empty-states/assets.tsx

@@ -6,7 +6,7 @@ import { useResolvedAssetPath } from "@/hooks/use-resolved-asset-path";
 
 export const PageNavigationPaneAssetsTabEmptyState = () => {
   // asset resolved path
-  const resolvedPath = useResolvedAssetPath({ basePath: "/empty-state/pages/navigation-pane/assets" });
+  const resolvedPath = useResolvedAssetPath({ basePath: "/empty-state/wiki/navigation-pane/assets" });
   // translation
   const { t } = useTranslation();
 

apps/web/ce/components/pages/navigation-pane/tab-panels/empty-states/outline.tsx

@@ -6,7 +6,7 @@ import { useResolvedAssetPath } from "@/hooks/use-resolved-asset-path";
 
 export const PageNavigationPaneOutlineTabEmptyState = () => {
   // asset resolved path
-  const resolvedPath = useResolvedAssetPath({ basePath: "/empty-state/pages/navigation-pane/outline" });
+  const resolvedPath = useResolvedAssetPath({ basePath: "/empty-state/wiki/navigation-pane/outline" });
   // translation
   const { t } = useTranslation();
 

apps/web/ce/components/projects/navigation/helper.tsx

@@ -1,7 +1,7 @@
 import { FileText, Layers } from "lucide-react";
 // plane imports
 import { EUserPermissions, EProjectFeatureKey } from "@plane/constants";
-import { ContrastIcon, DiceIcon, Intake, LayersIcon } from "@plane/ui";
+import { ContrastIcon, DiceIcon, LayersIcon, Intake } from "@plane/propel/icons";
 // components
 import type { TNavigationItem } from "@/components/workspace/sidebar/project-navigation";
 

apps/web/ce/components/relations/index.tsx

@@ -1,5 +1,5 @@
 import { CircleDot, CopyPlus, XCircle } from "lucide-react";
-import { RelatedIcon } from "@plane/ui";
+import { RelatedIcon } from "@plane/propel/icons";
 import type { TRelationObject } from "@/components/issues/issue-detail-widgets/relations";
 import type { TIssueRelationTypes } from "../../types";
 

apps/web/ce/components/views/helper.tsx

@@ -1,4 +1,7 @@
-import { EIssueLayoutTypes } from "@plane/types";
+import { ExternalLink, Link, Pencil, Trash2 } from "lucide-react";
+import { useTranslation } from "@plane/i18n";
+import { EIssueLayoutTypes, IProjectView } from "@plane/types";
+import { TContextMenuItem } from "@plane/ui";
 import { TWorkspaceLayoutProps } from "@/components/views/helper";
 
 export type TLayoutSelectionProps = {
@@ -10,3 +13,68 @@ export type TLayoutSelectionProps = {
 export const GlobalViewLayoutSelection = (props: TLayoutSelectionProps) => <></>;
 
 export const WorkspaceAdditionalLayouts = (props: TWorkspaceLayoutProps) => <></>;
+
+export type TMenuItemsFactoryProps = {
+  isOwner: boolean;
+  isAdmin: boolean;
+  setDeleteViewModal: (open: boolean) => void;
+  setCreateUpdateViewModal: (open: boolean) => void;
+  handleOpenInNewTab: () => void;
+  handleCopyText: () => void;
+  isLocked: boolean;
+  workspaceSlug: string;
+  projectId?: string;
+  viewId: string;
+};
+
+export const useMenuItemsFactory = (props: TMenuItemsFactoryProps) => {
+  const { isOwner, isAdmin, setDeleteViewModal, setCreateUpdateViewModal, handleOpenInNewTab, handleCopyText } = props;
+
+  const { t } = useTranslation();
+
+  const editMenuItem = () => ({
+    key: "edit",
+    action: () => setCreateUpdateViewModal(true),
+    title: t("edit"),
+    icon: Pencil,
+    shouldRender: isOwner,
+  });
+
+  const openInNewTabMenuItem = () => ({
+    key: "open-new-tab",
+    action: handleOpenInNewTab,
+    title: t("open_in_new_tab"),
+    icon: ExternalLink,
+  });
+
+  const copyLinkMenuItem = () => ({
+    key: "copy-link",
+    action: handleCopyText,
+    title: t("copy_link"),
+    icon: Link,
+  });
+
+  const deleteMenuItem = () => ({
+    key: "delete",
+    action: () => setDeleteViewModal(true),
+    title: t("delete"),
+    icon: Trash2,
+    shouldRender: isOwner || isAdmin,
+  });
+
+  return {
+    editMenuItem,
+    openInNewTabMenuItem,
+    copyLinkMenuItem,
+    deleteMenuItem,
+  };
+};
+
+export const useViewMenuItems = (props: TMenuItemsFactoryProps): TContextMenuItem[] => {
+  const factory = useMenuItemsFactory(props);
+
+  return [factory.editMenuItem(), factory.openInNewTabMenuItem(), factory.copyLinkMenuItem(), factory.deleteMenuItem()];
+};
+
+// eslint-disable-next-line @typescript-eslint/no-unused-vars
+export const AdditionalHeaderItems = (view: IProjectView) => <></>;

apps/web/ce/components/workspace/sidebar/helper.tsx

@@ -1,5 +1,5 @@
 import { BarChart2, Briefcase, Home, Inbox, Layers, PenSquare } from "lucide-react";
-import { ArchiveIcon, ContrastIcon, UserActivityIcon } from "@plane/ui";
+import { ArchiveIcon, ContrastIcon, UserActivityIcon } from "@plane/propel/icons";
 import { cn } from "@plane/utils";
 
 export const getSidebarNavigationItemIcon = (key: string, className: string = "") => {

apps/web/ce/constants/project/settings/features.tsx

@@ -1,8 +1,8 @@
 import { ReactNode } from "react";
 import { FileText, Layers, Timer } from "lucide-react";
 // plane imports
+import { ContrastIcon, DiceIcon, Intake } from "@plane/propel/icons";
 import { IProject } from "@plane/types";
-import { ContrastIcon, DiceIcon, Intake } from "@plane/ui";
 
 export type TProperties = {
   key: string;

apps/web/ce/constants/sidebar-favorites.ts

@@ -1,7 +1,7 @@
 import { Briefcase, FileText, Layers, LucideIcon } from "lucide-react";
 // plane imports
+import { ContrastIcon, DiceIcon, FavoriteFolderIcon, ISvgIcons } from "@plane/propel/icons";
 import { IFavorite } from "@plane/types";
-import { ContrastIcon, DiceIcon, FavoriteFolderIcon, ISvgIcons } from "@plane/ui";
 
 export const FAVORITE_ITEM_ICONS: Record<string, React.FC<ISvgIcons> | LucideIcon> = {
   page: FileText,

apps/web/ce/services/index.ts

@@ -1,2 +1,2 @@
 export * from "./project";
-export * from "./workspace.service";
+export * from "@/services/workspace.service";

apps/web/ce/services/project/index.ts

@@ -1,2 +1,2 @@
 export * from "./estimate.service";
-export * from "./view.service";
+export * from "@/services/view.service";

apps/web/ce/services/project/view.service.ts

@@ -1,60 +0,0 @@
-import { API_BASE_URL } from "@plane/constants";
-import { EViewAccess, TPublishViewSettings } from "@plane/types";
-import { ViewService as CoreViewService } from "@/services/view.service";
-
-export class ViewService extends CoreViewService {
-  constructor() {
-    super(API_BASE_URL);
-  }
-
-  // eslint-disable-next-line @typescript-eslint/no-unused-vars
-  async updateViewAccess(workspaceSlug: string, projectId: string, viewId: string, access: EViewAccess) {
-    return Promise.resolve();
-  }
-
-  // eslint-disable-next-line @typescript-eslint/no-unused-vars
-  async lockView(workspaceSlug: string, projectId: string, viewId: string) {
-    return Promise.resolve();
-  }
-
-  // eslint-disable-next-line @typescript-eslint/no-unused-vars
-  async unLockView(workspaceSlug: string, projectId: string, viewId: string) {
-    return Promise.resolve();
-  }
-
-  // eslint-disable-next-line @typescript-eslint/no-unused-vars
-  async getPublishDetails(workspaceSlug: string, projectId: string, viewId: string): Promise<any> {
-    return Promise.resolve({});
-  }
-
-  async publishView(
-    // eslint-disable-next-line @typescript-eslint/no-unused-vars
-    workspaceSlug: string,
-    // eslint-disable-next-line @typescript-eslint/no-unused-vars
-    projectId: string,
-    // eslint-disable-next-line @typescript-eslint/no-unused-vars
-    viewId: string,
-    // eslint-disable-next-line @typescript-eslint/no-unused-vars
-    data: TPublishViewSettings
-  ): Promise<any> {
-    return Promise.resolve();
-  }
-
-  async updatePublishedView(
-    // eslint-disable-next-line @typescript-eslint/no-unused-vars
-    workspaceSlug: string,
-    // eslint-disable-next-line @typescript-eslint/no-unused-vars
-    projectId: string,
-    // eslint-disable-next-line @typescript-eslint/no-unused-vars
-    viewId: string,
-    // eslint-disable-next-line @typescript-eslint/no-unused-vars
-    data: Partial<TPublishViewSettings>
-  ): Promise<void> {
-    return Promise.resolve();
-  }
-
-  // eslint-disable-next-line @typescript-eslint/no-unused-vars
-  async unPublishView(workspaceSlug: string, projectId: string, viewId: string): Promise<void> {
-    return Promise.resolve();
-  }
-}

apps/web/ce/services/workspace.service.ts

@@ -1,24 +0,0 @@
-import { API_BASE_URL } from "@plane/constants";
-import { EViewAccess } from "@plane/types";
-import { WorkspaceService as CoreWorkspaceService } from "@/services/workspace.service";
-
-export class WorkspaceService extends CoreWorkspaceService {
-  constructor() {
-    super(API_BASE_URL);
-  }
-
-  // eslint-disable-next-line @typescript-eslint/no-unused-vars
-  async updateViewAccess(workspaceSlug: string, viewId: string, access: EViewAccess) {
-    return Promise.resolve();
-  }
-
-  // eslint-disable-next-line @typescript-eslint/no-unused-vars
-  async lockView(workspaceSlug: string, viewId: string) {
-    return Promise.resolve();
-  }
-
-  // eslint-disable-next-line @typescript-eslint/no-unused-vars
-  async unLockView(workspaceSlug: string, viewId: string) {
-    return Promise.resolve();
-  }
-}

apps/web/ce/store/global-view.store.ts

@@ -0,0 +1 @@
+export * from "@/store/global-view.store";

apps/web/ce/store/project-view.store.ts

@@ -0,0 +1 @@
+export * from "@/store/project-view.store";

apps/web/core/components/analytics/insight-card.tsx

@@ -1,28 +1,17 @@
 // plane package imports
-import React, { useMemo } from "react";
+import React from "react";
 import { IAnalyticsResponseFields } from "@plane/types";
 import { Loader } from "@plane/ui";
-// components
-import TrendPiece from "./trend-piece";
 
 export type InsightCardProps = {
   data?: IAnalyticsResponseFields;
   label: string;
   isLoading?: boolean;
-  versus?: string | null;
 };
 
 const InsightCard = (props: InsightCardProps) => {
-  const { data, label, isLoading, versus } = props;
-  const { count, filter_count } = data || {};
-  const percentage = useMemo(() => {
-    if (count != null && filter_count != null) {
-      const result = ((count - filter_count) / count) * 100;
-      const isFiniteAndNotNaNOrZero = Number.isFinite(result) && !Number.isNaN(result) && result !== 0;
-      return isFiniteAndNotNaNOrZero ? result : null;
-    }
-    return null;
-  }, [count, filter_count]);
+  const { data, label, isLoading = false } = props;
+  const count = data?.count ?? 0;
 
   return (
     <div className="flex flex-col gap-3">
@@ -30,12 +19,6 @@ const InsightCard = (props: InsightCardProps) => {
       {!isLoading ? (
         <div className="flex flex-col gap-1">
           <div className="text-2xl font-bold text-custom-text-100">{count}</div>
-          {/* {percentage && (
-            <div className="flex gap-1 text-xs text-custom-text-300">
-              <TrendPiece percentage={percentage} size="xs" />
-              {versus && <div>vs {versus}</div>}
-            </div>
-          )} */}
         </div>
       ) : (
         <Loader.Item height="50px" width="100%" />

apps/web/core/components/analytics/total-insights.tsx

@@ -19,7 +19,7 @@ const getInsightLabel = (
   analyticsType: TAnalyticsTabsBase,
   item: IInsightField,
   isEpic: boolean | undefined,
-  t: (key: string, options?: any) => string
+  t: (key: string, params?: Record<string, unknown>) => string
 ) => {
   if (analyticsType === "work-items") {
     return isEpic
@@ -50,15 +50,7 @@ const TotalInsights: React.FC<{
   const params = useParams();
   const workspaceSlug = params.workspaceSlug.toString();
   const { t } = useTranslation();
-  const {
-    selectedDuration,
-    selectedProjects,
-    selectedDurationLabel,
-    selectedCycle,
-    selectedModule,
-    isPeekView,
-    isEpic,
-  } = useAnalytics();
+  const { selectedDuration, selectedProjects, selectedCycle, selectedModule, isPeekView, isEpic } = useAnalytics();
   const { data: totalInsightsData, isLoading } = useSWR(
     `total-insights-${analyticsType}-${selectedDuration}-${selectedProjects}-${selectedCycle}-${selectedModule}-${isEpic}`,
     () =>
@@ -92,7 +84,6 @@ const TotalInsights: React.FC<{
           isLoading={isLoading}
           data={totalInsightsData?.[item.key]}
           label={getInsightLabel(analyticsType, item, isEpic, t)}
-          versus={selectedDurationLabel}
         />
       ))}
     </div>

apps/web/core/components/auth-screens/footer.tsx

@@ -1,6 +1,6 @@
 "use client";
 import React from "react";
-import { AccentureLogo, DolbyLogo, SonyLogo, ZerodhaLogo } from "@plane/ui";
+import { AccentureLogo, DolbyLogo, SonyLogo, ZerodhaLogo } from "@plane/propel/icons";
 
 const BRAND_LOGOS: {
   id: string;

apps/web/core/components/auth-screens/header.tsx

@@ -5,7 +5,7 @@ import { observer } from "mobx-react";
 import Link from "next/link";
 import { AUTH_TRACKER_ELEMENTS } from "@plane/constants";
 import { useTranslation } from "@plane/i18n";
-import { PlaneLockup } from "@plane/ui";
+import { PlaneLockup } from "@plane/propel/icons";
 import { PageHead } from "@/components/core/page-title";
 import { EAuthModes } from "@/helpers/authentication.helper";
 import { useInstance } from "@/hooks/store/use-instance";

apps/web/core/components/automation/auto-close-automation.tsx

@@ -15,9 +15,10 @@ import {
   PROJECT_SETTINGS_TRACKER_EVENTS,
 } from "@plane/constants";
 import { useTranslation } from "@plane/i18n";
+import { StateGroupIcon, DoubleCircleIcon } from "@plane/propel/icons";
 import { IProject } from "@plane/types";
 // ui
-import { CustomSelect, CustomSearchSelect, ToggleSwitch, StateGroupIcon, DoubleCircleIcon, Loader } from "@plane/ui";
+import { CustomSelect, CustomSearchSelect, ToggleSwitch, Loader } from "@plane/ui";
 // component
 import { SelectMonthModal } from "@/components/automation";
 // constants

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

@@ -3,7 +3,7 @@ import { Command } from "cmdk";
 import { observer } from "mobx-react";
 import { FileText, GithubIcon, MessageSquare, Rocket } from "lucide-react";
 // ui
-import { DiscordIcon } from "@plane/ui";
+import { DiscordIcon } from "@plane/propel/icons";
 // hooks
 import { useCommandPalette } from "@/hooks/store/use-command-palette";
 import { useTransient } from "@/hooks/store/use-transient";

apps/web/core/components/command-palette/actions/issue-actions/actions-list.tsx

@@ -4,9 +4,10 @@ import { Command } from "cmdk";
 import { observer } from "mobx-react";
 import { useParams } from "next/navigation";
 import { LinkIcon, Signal, Trash2, UserMinus2, UserPlus2, Users } from "lucide-react";
+import { DoubleCircleIcon } from "@plane/propel/icons";
 import { EIssueServiceType, TIssue } from "@plane/types";
 // hooks
-import { DoubleCircleIcon, TOAST_TYPE, setToast } from "@plane/ui";
+import { TOAST_TYPE, setToast } from "@plane/ui";
 // helpers
 import { copyTextToClipboard } from "@plane/utils";
 // hooks

apps/web/core/components/command-palette/actions/issue-actions/change-priority.tsx

@@ -7,9 +7,9 @@ import { Check } from "lucide-react";
 // plane constants
 import { ISSUE_PRIORITIES } from "@plane/constants";
 // plane types
+import { PriorityIcon } from "@plane/propel/icons";
 import { EIssueServiceType, TIssue, TIssuePriorities } from "@plane/types";
 // mobx store
-import { PriorityIcon } from "@plane/ui";
 import { useIssueDetail } from "@/hooks/store/use-issue-detail";
 // ui
 // types

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

@@ -9,7 +9,7 @@ import {
   PROJECT_PAGE_TRACKER_ELEMENTS,
   PROJECT_VIEW_TRACKER_ELEMENTS,
 } from "@plane/constants";
-import { DiceIcon } from "@plane/ui";
+import { DiceIcon } from "@plane/propel/icons";
 // hooks
 import { useCommandPalette } from "@/hooks/store/use-command-palette";
 // ui

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

@@ -16,8 +16,9 @@ import {
   WORKSPACE_DEFAULT_SEARCH_RESULT,
 } from "@plane/constants";
 import { useTranslation } from "@plane/i18n";
+import { LayersIcon } from "@plane/propel/icons";
 import { IWorkspaceSearchResults } from "@plane/types";
-import { LayersIcon, Loader, ToggleSwitch } from "@plane/ui";
+import { Loader, ToggleSwitch } from "@plane/ui";
 import { cn, getTabIndex } from "@plane/utils";
 // components
 import {

apps/web/core/components/common/activity/helper.tsx

@@ -25,7 +25,7 @@ import {
 } from "lucide-react";
 
 // components
-import { ArchiveIcon, DoubleCircleIcon, ContrastIcon, DiceIcon, Intake } from "@plane/ui";
+import { ArchiveIcon, DoubleCircleIcon, ContrastIcon, DiceIcon, Intake } from "@plane/propel/icons";
 import { store } from "@/lib/store-context";
 import { TProjectActivity } from "@/plane-web/types";
 

apps/web/core/components/common/switcher-label.tsx

@@ -1,6 +1,6 @@
 import { FC } from "react";
+import { ISvgIcons } from "@plane/propel/icons";
 import { TLogoProps } from "@plane/types";
-import { ISvgIcons } from "@plane/ui";
 import { getFileURL, truncateText } from "@plane/utils";
 import { Logo } from "@/components/common/logo";
 

apps/web/core/components/core/activity.tsx

@@ -20,9 +20,9 @@ import {
   MessageSquareIcon,
   UsersIcon,
 } from "lucide-react";
+import { BlockedIcon, BlockerIcon, RelatedIcon, LayersIcon, DiceIcon, EpicIcon, Intake } from "@plane/propel/icons";
 import { Tooltip } from "@plane/propel/tooltip";
 import { IIssueActivity } from "@plane/types";
-import { BlockedIcon, BlockerIcon, RelatedIcon, LayersIcon, DiceIcon, Intake, EpicIcon } from "@plane/ui";
 import { renderFormattedDate, generateWorkItemLink, capitalizeFirstLetter } from "@plane/utils";
 // helpers
 import { useLabel } from "@/hooks/store/use-label";

apps/web/core/components/core/description-versions/modal.tsx

@@ -131,13 +131,14 @@ export const DescriptionVersionsModal: React.FC<Props> = observer((props) => {
         {/* End header */}
         {/* Version description */}
         <div className="mt-4 pb-4">
-          {activeVersionDescription ? (
+          {activeVersionId && activeVersionDescription ? (
             <RichTextEditor
+              key={activeVersionId}
               editable={false}
               containerClassName="p-0 !pl-0 border-none"
               editorClassName="pl-0"
-              id={activeVersionId ?? ""}
-              initialValue={activeVersionDescription ?? "<p></p>"}
+              id={activeVersionId}
+              initialValue={activeVersionDescription}
               projectId={projectId}
               ref={editorRef}
               workspaceId={workspaceId}

apps/web/core/components/core/description-versions/root.tsx

@@ -48,6 +48,9 @@ export const DescriptionVersionsRoot: React.FC<Props> = observer((props) => {
   const versionsCount = versions?.length ?? 0;
   const activeVersionDetails = versions?.find((version) => version.id === activeVersionId);
   const activeVersionIndex = versions?.findIndex((version) => version.id === activeVersionId);
+  const activeVersionDescription = activeVersionResponse
+    ? (activeVersionResponse.description_html ?? "<p></p>")
+    : undefined;
 
   const handleNavigation = useCallback(
     (direction: "prev" | "next") => {
@@ -64,7 +67,7 @@ export const DescriptionVersionsRoot: React.FC<Props> = observer((props) => {
   return (
     <>
       <DescriptionVersionsModal
-        activeVersionDescription={activeVersionResponse?.description_html ?? "<p></p>"}
+        activeVersionDescription={activeVersionDescription}
         activeVersionDetails={activeVersionDetails}
         handleClose={() => {
           setIsModalOpen(false);

apps/web/core/components/core/filters/date-filter-modal.tsx

@@ -5,7 +5,8 @@ import { Controller, useForm } from "react-hook-form";
 import { X } from "lucide-react";
 import { Dialog, Transition } from "@headlessui/react";
 
-import { Button, Calendar } from "@plane/ui";
+import { Calendar } from "@plane/propel/calendar";
+import { Button } from "@plane/ui";
 
 import { renderFormattedPayloadDate, renderFormattedDate, getDate } from "@plane/utils";
 import { DateFilterSelect } from "./date-filter-select";
@@ -94,13 +95,11 @@ export const DateFilterModal: React.FC<Props> = ({ title, handleClose, isOpen, o
                         const date2Value = getDate(watch("date2"));
                         return (
                           <Calendar
-                            classNames={{
-                              root: ` border border-custom-border-200 p-3 rounded-md`,
-                            }}
+                            className="rounded-md border border-custom-border-200 p-3"
                             captionLayout="dropdown"
                             selected={dateValue}
                             defaultMonth={dateValue}
-                            onSelect={(date) => {
+                            onSelect={(date: Date | undefined) => {
                               if (!date) return;
                               onChange(date);
                             }}
@@ -119,13 +118,11 @@ export const DateFilterModal: React.FC<Props> = ({ title, handleClose, isOpen, o
                           const date1Value = getDate(watch("date1"));
                           return (
                             <Calendar
-                              classNames={{
-                                root: ` border border-custom-border-200 p-3 rounded-md`,
-                              }}
+                              className="rounded-md border border-custom-border-200 p-3"
                               captionLayout="dropdown"
                               selected={dateValue}
                               defaultMonth={dateValue}
-                              onSelect={(date) => {
+                              onSelect={(date: Date | undefined) => {
                                 if (!date) return;
                                 onChange(date);
                               }}

apps/web/core/components/core/filters/date-filter-select.tsx

@@ -2,7 +2,8 @@
 import React from "react";
 import { CalendarDays } from "lucide-react";
 // ui
-import { CustomSelect, CalendarAfterIcon, CalendarBeforeIcon } from "@plane/ui";
+import { CalendarAfterIcon, CalendarBeforeIcon } from "@plane/propel/icons";
+import { CustomSelect } from "@plane/ui";
 
 type Props = {
   title: string;

apps/web/core/components/cycles/active-cycle/cycle-stats.tsx

@@ -8,10 +8,11 @@ import { CalendarCheck } from "lucide-react";
 import { Tab } from "@headlessui/react";
 // plane imports
 import { useTranslation } from "@plane/i18n";
+import { PriorityIcon } from "@plane/propel/icons";
 import { Tooltip } from "@plane/propel/tooltip";
 import { EIssuesStoreType, ICycle, IIssueFilterOptions } from "@plane/types";
 // ui
-import { Loader, PriorityIcon, Avatar } from "@plane/ui";
+import { Loader, Avatar } from "@plane/ui";
 import { cn, renderFormattedDate, renderFormattedDateWithoutYear, getFileURL } from "@plane/utils";
 // components
 import { SingleProgressStats } from "@/components/core/sidebar/single-progress-stats";

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

@@ -6,6 +6,7 @@ import Image from "next/image";
 import { Tab } from "@headlessui/react";
 // plane imports
 import { useTranslation } from "@plane/i18n";
+import { StateGroupIcon } from "@plane/propel/icons";
 import {
   IIssueFilterOptions,
   IIssueFilters,
@@ -14,7 +15,7 @@ import {
   TCyclePlotType,
   TStateGroups,
 } from "@plane/types";
-import { Avatar, StateGroupIcon } from "@plane/ui";
+import { Avatar } from "@plane/ui";
 import { cn, getFileURL } from "@plane/utils";
 // components
 import { SingleProgressStats } from "@/components/core/sidebar/single-progress-stats";

apps/web/core/components/cycles/list/cycle-list-group-header.tsx

@@ -3,9 +3,10 @@
 import React, { FC } from "react";
 import { ChevronDown } from "lucide-react";
 // types
+import { CycleGroupIcon } from "@plane/propel/icons";
 import { TCycleGroups } from "@plane/types";
 // icons
-import { Row, CycleGroupIcon } from "@plane/ui";
+import { Row } from "@plane/ui";
 // helpers
 import { cn } from "@plane/utils";
 

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

@@ -15,9 +15,10 @@ import {
 } from "@plane/constants";
 import { useLocalStorage } from "@plane/hooks";
 import { useTranslation } from "@plane/i18n";
+import { LayersIcon, TransferIcon } from "@plane/propel/icons";
 import { Tooltip } from "@plane/propel/tooltip";
 import { ICycle, TCycleGroups } from "@plane/types";
-import { Avatar, AvatarGroup, FavoriteStar, LayersIcon, TransferIcon, setPromiseToast } from "@plane/ui";
+import { Avatar, AvatarGroup, FavoriteStar, setPromiseToast } from "@plane/ui";
 import { getDate, getFileURL, generateQueryParams } from "@plane/utils";
 // components
 import { DateRangeDropdown } from "@/components/dropdowns/date-range";

apps/web/core/components/cycles/quick-actions.tsx

@@ -13,7 +13,8 @@ import {
   CYCLE_TRACKER_ELEMENTS,
 } from "@plane/constants";
 import { useTranslation } from "@plane/i18n";
-import { ArchiveIcon, ContextMenu, CustomMenu, TContextMenuItem, TOAST_TYPE, setToast } from "@plane/ui";
+import { ArchiveIcon } from "@plane/propel/icons";
+import { ContextMenu, CustomMenu, TContextMenuItem, TOAST_TYPE, setToast } from "@plane/ui";
 import { copyUrlToClipboard, cn } from "@plane/utils";
 // helpers
 // hooks

apps/web/core/components/cycles/transfer-issues-modal.tsx

@@ -5,11 +5,12 @@ import { observer } from "mobx-react";
 import { useParams } from "next/navigation";
 import { AlertCircle, Search, X } from "lucide-react";
 import { Dialog, Transition } from "@headlessui/react";
+import { ContrastIcon, TransferIcon } from "@plane/propel/icons";
 import { EIssuesStoreType } from "@plane/types";
 // hooks
 // ui
 //icons
-import { ContrastIcon, TransferIcon, TOAST_TYPE, setToast } from "@plane/ui";
+import { TOAST_TYPE, setToast } from "@plane/ui";
 import { useCycle } from "@/hooks/store/use-cycle";
 import { useIssues } from "@/hooks/store/use-issues";
 //icons

apps/web/core/components/cycles/transfer-issues.tsx

@@ -2,7 +2,8 @@
 import React from "react";
 import { AlertCircle } from "lucide-react";
 // ui
-import { Button, TransferIcon } from "@plane/ui";
+import { TransferIcon } from "@plane/propel/icons";
+import { Button } from "@plane/ui";
 
 type Props = {
   handleClick: () => void;

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

@@ -11,9 +11,9 @@ import { Combobox } from "@headlessui/react";
 // i18n
 import { useTranslation } from "@plane/i18n";
 // icon
+import { ContrastIcon, CycleGroupIcon } from "@plane/propel/icons";
 import { TCycleGroups } from "@plane/types";
 // ui
-import { ContrastIcon, CycleGroupIcon } from "@plane/ui";
 // store hooks
 import { useCycle } from "@/hooks/store/use-cycle";
 import { usePlatformOS } from "@/hooks/use-platform-os";

apps/web/core/components/dropdowns/cycle/index.tsx

@@ -5,7 +5,8 @@ import { observer } from "mobx-react";
 import { ChevronDown } from "lucide-react";
 import { useTranslation } from "@plane/i18n";
 // ui
-import { ComboDropDown, ContrastIcon } from "@plane/ui";
+import { ContrastIcon } from "@plane/propel/icons";
+import { ComboDropDown } from "@plane/ui";
 // helpers
 import { cn } from "@plane/utils";
 // hooks

apps/web/core/components/dropdowns/date-range.tsx

@@ -3,14 +3,14 @@
 import React, { useEffect, useRef, useState } from "react";
 import { Placement } from "@popperjs/core";
 import { observer } from "mobx-react";
-import { DateRange, Matcher } from "react-day-picker";
 import { usePopper } from "react-popper";
 import { ArrowRight, CalendarCheck2, CalendarDays, X } from "lucide-react";
 import { Combobox } from "@headlessui/react";
 // plane imports
 import { useTranslation } from "@plane/i18n";
 // ui
-import { ComboDropDown, Calendar } from "@plane/ui";
+import { Calendar, DateRange, Matcher } from "@plane/propel/calendar";
+import { ComboDropDown } from "@plane/ui";
 import { cn, renderFormattedDate } from "@plane/utils";
 // helpers
 // hooks
@@ -271,10 +271,10 @@ export const DateRangeDropdown: React.FC<Props> = observer((props) => {
             {...attributes.popper}
           >
             <Calendar
+              className="rounded-md border border-custom-border-200 p-3"
               captionLayout="dropdown"
-              classNames={{ root: `p-3 rounded-md` }}
               selected={dateRange}
-              onSelect={(val) => {
+              onSelect={(val: DateRange | undefined) => {
                 onSelect?.(val);
               }}
               mode="range"

apps/web/core/components/dropdowns/date.tsx

@@ -1,12 +1,12 @@
 import React, { useRef, useState } from "react";
 import { observer } from "mobx-react";
-import { Matcher } from "react-day-picker";
 import { createPortal } from "react-dom";
 import { usePopper } from "react-popper";
 import { CalendarDays, X } from "lucide-react";
 import { Combobox } from "@headlessui/react";
 // ui
-import { ComboDropDown, Calendar } from "@plane/ui";
+import { Calendar, Matcher } from "@plane/propel/calendar";
+import { ComboDropDown } from "@plane/ui";
 import { cn, renderFormattedDate, getDate } from "@plane/utils";
 // helpers
 // hooks
@@ -178,11 +178,11 @@ export const DateDropdown: React.FC<Props> = observer((props) => {
               {...attributes.popper}
             >
               <Calendar
+                className="rounded-md border border-custom-border-200 p-3"
                 captionLayout="dropdown"
-                classNames={{ root: `p-3 rounded-md` }}
                 selected={getDate(value)}
                 defaultMonth={getDate(value)}
-                onSelect={(date) => {
+                onSelect={(date: Date | undefined) => {
                   dropdownOnChange(date ?? null);
                 }}
                 showOutsideDays

apps/web/core/components/dropdowns/module/button-content.tsx

@@ -2,8 +2,8 @@
 
 import { ChevronDown, X } from "lucide-react";
 // plane imports
+import { DiceIcon } from "@plane/propel/icons";
 import { Tooltip } from "@plane/propel/tooltip";
-import { DiceIcon } from "@plane/ui";
 import { cn } from "@plane/utils";
 // hooks
 import { useModule } from "@/hooks/store/use-module";

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

@@ -8,8 +8,8 @@ import { Check, Search } from "lucide-react";
 import { Combobox } from "@headlessui/react";
 // plane imports
 import { useTranslation } from "@plane/i18n";
+import { DiceIcon } from "@plane/propel/icons";
 import { IModule } from "@plane/types";
-import { DiceIcon } from "@plane/ui";
 import { cn } from "@plane/utils";
 // hooks
 import { usePlatformOS } from "@/hooks/use-platform-os";

apps/web/core/components/dropdowns/priority.tsx

@@ -8,10 +8,11 @@ import { Combobox } from "@headlessui/react";
 import { ISSUE_PRIORITIES } from "@plane/constants";
 import { useTranslation } from "@plane/i18n";
 // types
+import { PriorityIcon } from "@plane/propel/icons";
 import { Tooltip } from "@plane/propel/tooltip";
 import { TIssuePriorities } from "@plane/types";
 // ui
-import { ComboDropDown, PriorityIcon } from "@plane/ui";
+import { ComboDropDown } from "@plane/ui";
 // helpers
 import { cn } from "@plane/utils";
 // hooks

apps/web/core/components/dropdowns/state/base.tsx

@@ -7,8 +7,9 @@ import { ChevronDown, Search } from "lucide-react";
 import { Combobox } from "@headlessui/react";
 // plane imports
 import { useTranslation } from "@plane/i18n";
+import { StateGroupIcon } from "@plane/propel/icons";
 import { IState } from "@plane/types";
-import { ComboDropDown, Spinner, StateGroupIcon } from "@plane/ui";
+import { ComboDropDown, Spinner } from "@plane/ui";
 import { cn } from "@plane/utils";
 // components
 import { DropdownButton } from "@/components/dropdowns/buttons";

apps/web/core/components/editor/document/editor.tsx

@@ -1,6 +1,12 @@
 import React, { forwardRef } from "react";
 // plane imports
-import { DocumentEditorWithRef, type EditorRefApi, type IDocumentEditorProps, type TFileHandler } from "@plane/editor";
+import {
+  DocumentEditorWithRef,
+  IEditorPropsExtended,
+  type EditorRefApi,
+  type IDocumentEditorProps,
+  type TFileHandler,
+} from "@plane/editor";
 import { MakeOptional, TSearchEntityRequestPayload, TSearchResponse } from "@plane/types";
 import { cn } from "@plane/utils";
 // hooks
@@ -8,15 +14,14 @@ import { useEditorConfig, useEditorMention } from "@/hooks/editor";
 import { useMember } from "@/hooks/store/use-member";
 // plane web hooks
 import { useEditorFlagging } from "@/plane-web/hooks/use-editor-flagging";
-import { useIssueEmbed } from "@/plane-web/hooks/use-issue-embed";
 // local imports
 import { EditorMentionsRoot } from "../embeds/mentions";
 
 type DocumentEditorWrapperProps = MakeOptional<
-  Omit<IDocumentEditorProps, "fileHandler" | "mentionHandler" | "embedHandler" | "user" | "extendedEditorProps">,
+  Omit<IDocumentEditorProps, "fileHandler" | "mentionHandler" | "user" | "extendedEditorProps">,
   "disabledExtensions" | "editable" | "flaggedExtensions"
 > & {
-  embedHandler?: Partial<IDocumentEditorProps["embedHandler"]>;
+  extendedEditorProps?: Partial<IEditorPropsExtended>;
   workspaceSlug: string;
   workspaceId: string;
   projectId?: string;
@@ -35,7 +40,7 @@ export const DocumentEditor = forwardRef<EditorRefApi, DocumentEditorWrapperProp
   const {
     containerClassName,
     editable,
-    embedHandler,
+    extendedEditorProps,
     workspaceSlug,
     workspaceId,
     projectId,
@@ -54,11 +59,6 @@ export const DocumentEditor = forwardRef<EditorRefApi, DocumentEditorWrapperProp
   });
   // editor config
   const { getEditorFileHandlers } = useEditorConfig();
-  // issue-embed
-  const { issueEmbedProps } = useIssueEmbed({
-    projectId,
-    workspaceSlug,
-  });
 
   return (
     <DocumentEditorWithRef
@@ -81,11 +81,7 @@ export const DocumentEditor = forwardRef<EditorRefApi, DocumentEditorWrapperProp
         renderComponent: EditorMentionsRoot,
         getMentionedEntityDetails: (id: string) => ({ display_name: getUserDetails(id)?.display_name ?? "" }),
       }}
-      embedHandler={{
-        issue: issueEmbedProps,
-        ...embedHandler,
-      }}
-      extendedEditorProps={{}}
+      extendedEditorProps={extendedEditorProps}
       {...rest}
       containerClassName={cn("relative pl-3 pb-3", containerClassName)}
     />

apps/web/core/components/global/product-updates/footer.tsx

@@ -1,7 +1,8 @@
 import { USER_TRACKER_ELEMENTS } from "@plane/constants";
 import { useTranslation } from "@plane/i18n";
 // ui
-import { getButtonStyling, PlaneLogo } from "@plane/ui";
+import { PlaneLogo } from "@plane/propel/icons";
+import { getButtonStyling } from "@plane/ui";
 // helpers
 import { cn } from "@plane/utils";