fix: update workspace start date calculation and add twelve months ago logic in AdvanceAnalyticsChartEndpoint

apps/api/plane/api/serializers/intake.py

@@ -1,7 +1,7 @@
 # Module imports
 from .base import BaseSerializer
 from .issue import IssueExpandSerializer
-from plane.db.models import IntakeIssue, Issue, State, StateGroup
+from plane.db.models import IntakeIssue, Issue
 from rest_framework import serializers
 
 
@@ -103,52 +103,6 @@ class IntakeIssueUpdateSerializer(BaseSerializer):
             "updated_at",
         ]
 
-    def validate(self, attrs):
-        """
-        Validate that if status is being changed to accepted (1),
-        the project has a default state to transition to.
-        """
-
-        # Check if status is being updated to accepted
-        if attrs.get("status") == 1:
-            intake_issue = self.instance
-            issue = intake_issue.issue
-
-            # Check if issue is in TRIAGE state
-            if issue.state and issue.state.group == StateGroup.TRIAGE.value:
-                # Verify default state exists before allowing the update
-                default_state = State.objects.filter(
-                    workspace=intake_issue.workspace, project=intake_issue.project, default=True
-                ).first()
-
-                if not default_state:
-                    raise serializers.ValidationError(
-                        {"status": "Cannot accept intake issue: No default state found for the project"}
-                    )
-
-        return attrs
-
-    def update(self, instance, validated_data):
-        """
-        Update intake issue and transition associated issue state if accepted.
-        """
-
-        # Update the intake issue with validated data
-        instance = super().update(instance, validated_data)
-
-        # If status is accepted (1), update the associated issue state from TRIAGE to default
-        if validated_data.get("status") == 1:
-            issue = instance.issue
-            if issue.state and issue.state.group == StateGroup.TRIAGE.value:
-                # Get the default project state
-                default_state = State.objects.filter(
-                    workspace=instance.workspace, project=instance.project, default=True
-                ).first()
-                if default_state:
-                    issue.state = default_state
-                    issue.save()
-        return instance
-
 
 class IssueDataSerializer(serializers.Serializer):
     """

apps/api/plane/api/serializers/state.py

@@ -1,7 +1,6 @@
 # Module imports
 from .base import BaseSerializer
-from plane.db.models import State, StateGroup
-from rest_framework import serializers
+from plane.db.models import State
 
 
 class StateSerializer(BaseSerializer):
@@ -16,9 +15,6 @@ class StateSerializer(BaseSerializer):
         # If the default is being provided then make all other states default False
         if data.get("default", False):
             State.objects.filter(project_id=self.context.get("project_id")).update(default=False)
-
-        if data.get("group", None) == StateGroup.TRIAGE.value:
-            raise serializers.ValidationError("Cannot create triage state")
         return data
 
     class Meta:

apps/api/plane/api/views/intake.py

@@ -23,7 +23,7 @@ from plane.api.serializers import (
 )
 from plane.app.permissions import ProjectLitePermission
 from plane.bgtasks.issue_activities_task import issue_activity
-from plane.db.models import Intake, IntakeIssue, Issue, Project, ProjectMember, State, StateGroup
+from plane.db.models import Intake, IntakeIssue, Issue, Project, ProjectMember, State
 from plane.utils.host import base_host
 from .base import BaseAPIView
 from plane.db.models.intake import SourceType
@@ -165,20 +165,6 @@ class IntakeIssueListCreateAPIEndpoint(BaseAPIView):
         ]:
             return Response({"error": "Invalid priority"}, status=status.HTTP_400_BAD_REQUEST)
 
-        # get the triage state
-        triage_state = State.triage_objects.filter(project_id=project_id, workspace__slug=slug).first()
-
-        if not triage_state:
-            triage_state = State.objects.create(
-                name="Triage",
-                group=StateGroup.TRIAGE.value,
-                project_id=project_id,
-                workspace_id=project.workspace_id,
-                color="#4E5355",
-                sequence=65000,
-                default=False,
-            )
-
         # create an issue
         issue = Issue.objects.create(
             name=request.data.get("issue", {}).get("name"),
@@ -186,7 +172,6 @@ class IntakeIssueListCreateAPIEndpoint(BaseAPIView):
             description_html=request.data.get("issue", {}).get("description_html", "<p></p>"),
             priority=request.data.get("issue", {}).get("priority", "none"),
             project_id=project_id,
-            state_id=triage_state.id,
         )
 
         # create an intake issue
@@ -335,10 +320,7 @@ class IntakeIssueDetailAPIEndpoint(BaseAPIView):
 
         # Get issue data
         issue_data = request.data.pop("issue", False)
-        issue_serializer = None
-        intake_serializer = None
 
-        # Validate issue data if provided
         if bool(issue_data):
             issue = Issue.objects.annotate(
                 label_ids=Coalesce(
@@ -362,7 +344,6 @@ class IntakeIssueDetailAPIEndpoint(BaseAPIView):
                     Value([], output_field=ArrayField(UUIDField())),
                 ),
             ).get(pk=issue_id, workspace__slug=slug, project_id=project_id)
-
             # Only allow guests to edit name and description
             if project_member.role <= 5:
                 issue_data = {
@@ -373,55 +354,71 @@ class IntakeIssueDetailAPIEndpoint(BaseAPIView):
 
             issue_serializer = IssueSerializer(issue, data=issue_data, partial=True)
 
-            if not issue_serializer.is_valid():
+            if issue_serializer.is_valid():
+                current_instance = issue
+                # Log all the updates
+                requested_data = json.dumps(issue_data, cls=DjangoJSONEncoder)
+                if issue is not None:
+                    issue_activity.delay(
+                        type="issue.activity.updated",
+                        requested_data=requested_data,
+                        actor_id=str(request.user.id),
+                        issue_id=str(issue_id),
+                        project_id=str(project_id),
+                        current_instance=json.dumps(
+                            IssueSerializer(current_instance).data,
+                            cls=DjangoJSONEncoder,
+                        ),
+                        epoch=int(timezone.now().timestamp()),
+                        intake=(intake_issue.id),
+                    )
+                issue_serializer.save()
+            else:
                 return Response(issue_serializer.errors, status=status.HTTP_400_BAD_REQUEST)
 
         # Only project admins and members can edit intake issue attributes
         if project_member.role > 15:
-            intake_serializer = IntakeIssueUpdateSerializer(intake_issue, data=request.data, partial=True)
-
-            if not intake_serializer.is_valid():
-                return Response(intake_serializer.errors, status=status.HTTP_400_BAD_REQUEST)
-
-        # Both serializers are valid, now save them
-        if issue_serializer:
-            current_instance = issue
-            # Log all the updates
-            requested_data = json.dumps(issue_data, cls=DjangoJSONEncoder)
-            issue_activity.delay(
-                type="issue.activity.updated",
-                requested_data=requested_data,
-                actor_id=str(request.user.id),
-                issue_id=str(issue_id),
-                project_id=str(project_id),
-                current_instance=json.dumps(
-                    IssueSerializer(current_instance).data,
-                    cls=DjangoJSONEncoder,
-                ),
-                epoch=int(timezone.now().timestamp()),
-                intake=str(intake_issue.id),
-            )
-            issue_serializer.save()
-
-        # Save intake issue (state transition happens in serializer's update method)
-        if intake_serializer:
+            serializer = IntakeIssueUpdateSerializer(intake_issue, data=request.data, partial=True)
             current_instance = json.dumps(IntakeIssueSerializer(intake_issue).data, cls=DjangoJSONEncoder)
-            intake_serializer.save()
 
-            # create a activity for status change
-            issue_activity.delay(
-                type="intake.activity.created",
-                requested_data=json.dumps(request.data, cls=DjangoJSONEncoder),
-                actor_id=str(request.user.id),
-                issue_id=str(issue_id),
-                project_id=str(project_id),
-                current_instance=current_instance,
-                epoch=int(timezone.now().timestamp()),
-                notification=False,
-                origin=base_host(request=request, is_app=True),
-                intake=str(intake_issue.id),
-            )
-            return Response(IntakeIssueSerializer(intake_issue).data, status=status.HTTP_200_OK)
+            if serializer.is_valid():
+                serializer.save()
+                # Update the issue state if the issue is rejected or marked as duplicate
+                if serializer.data["status"] in [-1, 2]:
+                    issue = Issue.objects.get(pk=issue_id, workspace__slug=slug, project_id=project_id)
+                    state = State.objects.filter(group="cancelled", workspace__slug=slug, project_id=project_id).first()
+                    if state is not None:
+                        issue.state = state
+                        issue.save()
+
+                # Update the issue state if it is accepted
+                if serializer.data["status"] in [1]:
+                    issue = Issue.objects.get(pk=issue_id, workspace__slug=slug, project_id=project_id)
+
+                    # Update the issue state only if it is in triage state
+                    if issue.state.is_triage:
+                        # Move to default state
+                        state = State.objects.filter(workspace__slug=slug, project_id=project_id, default=True).first()
+                        if state is not None:
+                            issue.state = state
+                            issue.save()
+
+                # create a activity for status change
+                issue_activity.delay(
+                    type="intake.activity.created",
+                    requested_data=json.dumps(request.data, cls=DjangoJSONEncoder),
+                    actor_id=str(request.user.id),
+                    issue_id=str(issue_id),
+                    project_id=str(project_id),
+                    current_instance=current_instance,
+                    epoch=int(timezone.now().timestamp()),
+                    notification=False,
+                    origin=base_host(request=request, is_app=True),
+                    intake=str(intake_issue.id),
+                )
+                serializer = IntakeIssueSerializer(intake_issue)
+                return Response(serializer.data, status=status.HTTP_200_OK)
+            return Response(serializer.errors, status=status.HTTP_400_BAD_REQUEST)
         else:
             return Response(IntakeIssueSerializer(intake_issue).data, status=status.HTTP_200_OK)
 

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

@@ -24,7 +24,6 @@ from plane.db.models import (
     DeployBoard,
     ProjectMember,
     State,
-    DEFAULT_STATES,
     Workspace,
     UserFavorite,
 )
@@ -233,6 +232,41 @@ class ProjectListCreateAPIEndpoint(BaseAPIView):
                         user_id=serializer.instance.project_lead,
                     )
 
+                # Default states
+                states = [
+                    {
+                        "name": "Backlog",
+                        "color": "#60646C",
+                        "sequence": 15000,
+                        "group": "backlog",
+                        "default": True,
+                    },
+                    {
+                        "name": "Todo",
+                        "color": "#60646C",
+                        "sequence": 25000,
+                        "group": "unstarted",
+                    },
+                    {
+                        "name": "In Progress",
+                        "color": "#F59E0B",
+                        "sequence": 35000,
+                        "group": "started",
+                    },
+                    {
+                        "name": "Done",
+                        "color": "#46A758",
+                        "sequence": 45000,
+                        "group": "completed",
+                    },
+                    {
+                        "name": "Cancelled",
+                        "color": "#9AA4BC",
+                        "sequence": 55000,
+                        "group": "cancelled",
+                    },
+                ]
+
                 State.objects.bulk_create(
                     [
                         State(
@@ -245,7 +279,7 @@ class ProjectListCreateAPIEndpoint(BaseAPIView):
                             default=state.get("default", False),
                             created_by=request.user,
                         )
-                        for state in DEFAULT_STATES
+                        for state in states
                     ]
                 )
 

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

@@ -37,7 +37,6 @@ from .project import (
     ProjectMemberAdminSerializer,
     ProjectPublicMemberSerializer,
     ProjectMemberRoleSerializer,
-    ProjectMemberPreferenceSerializer,
 )
 from .state import StateSerializer, StateLiteSerializer
 from .view import IssueViewSerializer, ViewIssueListSerializer

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

@@ -7,7 +7,7 @@ from .issue import IssueIntakeSerializer, LabelLiteSerializer, IssueDetailSerial
 from .project import ProjectLiteSerializer
 from .state import StateLiteSerializer
 from .user import UserLiteSerializer
-from plane.db.models import Intake, IntakeIssue, Issue, StateGroup, State
+from plane.db.models import Intake, IntakeIssue, Issue
 
 
 class IntakeSerializer(BaseSerializer):
@@ -36,49 +36,6 @@ class IntakeIssueSerializer(BaseSerializer):
         ]
         read_only_fields = ["project", "workspace"]
 
-    def validate(self, attrs):
-        """
-        Validate that if status is being changed to accepted (1),
-        the project has a default state to transition to.
-        """
-
-        # Check if status is being updated to accepted
-        if attrs.get("status") == 1:
-            intake_issue = self.instance
-            issue = intake_issue.issue
-
-            # Check if issue is in TRIAGE state
-            if issue.state and issue.state.group == StateGroup.TRIAGE.value:
-                # Verify default state exists before allowing the update
-                default_state = State.objects.filter(
-                    workspace=intake_issue.workspace, project=intake_issue.project, default=True
-                ).first()
-
-                if not default_state:
-                    raise serializers.ValidationError(
-                        {"status": "Cannot accept intake issue: No default state found for the project"}
-                    )
-
-        return attrs
-
-    def update(self, instance, validated_data):
-        # Update the intake issue
-        instance = super().update(instance, validated_data)
-
-        # If status is accepted (1), transition the issue state from TRIAGE to default
-        if validated_data.get("status") == 1:
-            issue = instance.issue
-            if issue.state and issue.state.group == StateGroup.TRIAGE.value:
-                # Get the default project state
-                default_state = State.objects.filter(
-                    workspace=instance.workspace, project=instance.project, default=True
-                ).first()
-                if default_state:
-                    issue.state = default_state
-                    issue.save()
-
-        return instance
-
     def to_representation(self, instance):
         # Pass the annotated fields to the Issue instance if they exist
         if hasattr(instance, "label_ids"):

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

@@ -78,7 +78,7 @@ class IssueProjectLiteSerializer(BaseSerializer):
 class IssueCreateSerializer(BaseSerializer):
     # ids
     state_id = serializers.PrimaryKeyRelatedField(
-        source="state", queryset=State.all_state_objects.all(), required=False, allow_null=True
+        source="state", queryset=State.objects.all(), required=False, allow_null=True
     )
     parent_id = serializers.PrimaryKeyRelatedField(
         source="parent", queryset=Issue.objects.all(), required=False, allow_null=True
@@ -117,9 +117,6 @@ class IssueCreateSerializer(BaseSerializer):
         return data
 
     def validate(self, attrs):
-        allow_triage = self.context.get("allow_triage_state", False)
-        state_manager = State.triage_objects if allow_triage else State.objects
-
         if (
             attrs.get("start_date", None) is not None
             and attrs.get("target_date", None) is not None
@@ -163,7 +160,7 @@ class IssueCreateSerializer(BaseSerializer):
         # Check state is from the project only else raise validation error
         if (
             attrs.get("state")
-            and not state_manager.filter(
+            and not State.objects.filter(
                 project_id=self.context.get("project_id"),
                 pk=attrs.get("state").id,
             ).exists()
@@ -367,19 +364,6 @@ class LabelSerializer(BaseSerializer):
         ]
         read_only_fields = ["workspace", "project"]
 
-    def validate_name(self, value):
-        project_id = self.context.get("project_id")
-
-        label = Label.objects.filter(project_id=project_id, name__iexact=value)
-
-        if self.instance:
-            label = label.exclude(id=self.instance.pk)
-
-        if label.exists():
-            raise serializers.ValidationError(detail="LABEL_NAME_ALREADY_EXISTS")
-
-        return value
-
 
 class LabelLiteSerializer(BaseSerializer):
     class Meta:
@@ -798,14 +782,6 @@ class IssueSerializer(DynamicBaseSerializer):
         ]
         read_only_fields = fields
 
-    def validate(self, data):
-        if (
-            data.get("state_id")
-            and not State.objects.filter(project_id=self.context.get("project_id"), pk=data.get("state_id")).exists()
-        ):
-            raise serializers.ValidationError("State is not valid please pass a valid state_id")
-        return data
-
 
 class IssueListDetailSerializer(serializers.Serializer):
     def __init__(self, *args, **kwargs):

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

@@ -142,18 +142,6 @@ class ProjectMemberSerializer(BaseSerializer):
         fields = "__all__"
 
 
-class ProjectMemberPreferenceSerializer(BaseSerializer):
-    class Meta:
-        model = ProjectMember
-        fields = ["preferences", "project_id", "member_id", "workspace_id"]
-
-    def validate_preferences(self, value):
-        preferences = self.instance.preferences
-
-        preferences.update(value)
-        return preferences
-
-
 class ProjectMemberAdminSerializer(BaseSerializer):
     workspace = WorkspaceLiteSerializer(read_only=True)
     project = ProjectLiteSerializer(read_only=True)

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

@@ -2,7 +2,7 @@
 from .base import BaseSerializer
 from rest_framework import serializers
 
-from plane.db.models import State, StateGroup
+from plane.db.models import State
 
 
 class StateSerializer(BaseSerializer):
@@ -24,11 +24,6 @@ class StateSerializer(BaseSerializer):
         ]
         read_only_fields = ["workspace", "project"]
 
-    def validate(self, attrs):
-        if attrs.get("group") == StateGroup.TRIAGE.value:
-            raise serializers.ValidationError("Cannot create triage state")
-        return attrs
-
 
 class StateLiteSerializer(BaseSerializer):
     class Meta:

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

@@ -14,7 +14,6 @@ from plane.app.views import (
     ProjectPublicCoverImagesEndpoint,
     UserProjectRolesEndpoint,
     ProjectArchiveUnarchiveEndpoint,
-    ProjectMemberPreferenceEndpoint,
 )
 
 
@@ -126,9 +125,4 @@ urlpatterns = [
         ProjectArchiveUnarchiveEndpoint.as_view(),
         name="project-archive-unarchive",
     ),
-    path(
-        "workspaces/<str:slug>/projects/<uuid:project_id>/preferences/member/<uuid:member_id>/",
-        ProjectMemberPreferenceEndpoint.as_view(),
-        name="project-member-preference",
-    ),
 ]

apps/api/plane/app/urls/state.py

@@ -1,7 +1,7 @@
 from django.urls import path
 
 
-from plane.app.views import StateViewSet, IntakeStateEndpoint
+from plane.app.views import StateViewSet
 
 
 urlpatterns = [
@@ -15,11 +15,6 @@ urlpatterns = [
         StateViewSet.as_view({"get": "retrieve", "patch": "partial_update", "delete": "destroy"}),
         name="project-state",
     ),
-    path(
-        "workspaces/<str:slug>/projects/<uuid:project_id>/intake-state/",
-        IntakeStateEndpoint.as_view(),
-        name="intake-state",
-    ),
     path(
         "workspaces/<str:slug>/projects/<uuid:project_id>/states/<uuid:pk>/mark-default/",
         StateViewSet.as_view({"post": "mark_as_default"}),

apps/api/plane/app/urls/user.py

@@ -30,16 +30,6 @@ urlpatterns = [
         UserEndpoint.as_view({"get": "retrieve_user_settings"}),
         name="users",
     ),
-    path(
-        "users/me/email/generate-code/",
-        UserEndpoint.as_view({"post": "generate_email_verification_code"}),
-        name="user-email-verify-code",
-    ),
-    path(
-        "users/me/email/",
-        UserEndpoint.as_view({"patch": "update_email"}),
-        name="user-email-update",
-    ),
     # Profile
     path("users/me/profile/", ProfileEndpoint.as_view(), name="accounts"),
     # End profile

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

@@ -253,4 +253,9 @@ urlpatterns = [
         WorkspaceUserPreferenceViewSet.as_view(),
         name="workspace-user-preference",
     ),
+    path(
+        "workspaces/<str:slug>/sidebar-preferences/<str:key>/",
+        WorkspaceUserPreferenceViewSet.as_view(),
+        name="workspace-user-preference",
+    ),
 ]

apps/api/plane/app/views/__init__.py

@@ -18,7 +18,6 @@ from .project.member import (
     ProjectMemberViewSet,
     ProjectMemberUserEndpoint,
     UserProjectRolesEndpoint,
-    ProjectMemberPreferenceEndpoint,
 )
 
 from .user.base import (
@@ -80,7 +79,7 @@ from .workspace.cycle import WorkspaceCyclesEndpoint
 from .workspace.quick_link import QuickLinkViewSet
 from .workspace.sticky import WorkspaceStickyViewSet
 
-from .state.base import StateViewSet, IntakeStateEndpoint
+from .state.base import StateViewSet
 from .view.base import (
     WorkspaceViewViewSet,
     WorkspaceViewIssuesViewSet,

apps/api/plane/app/views/analytic/advance.py

@@ -1,3 +1,4 @@
+from dateutil.relativedelta import relativedelta
 from rest_framework.response import Response
 from rest_framework import status
 from typing import Dict, List, Any
@@ -219,7 +220,7 @@ class AdvanceAnalyticsChartEndpoint(AdvanceAnalyticsBaseView):
         )
 
         workspace = Workspace.objects.get(slug=self._workspace_slug)
-        start_date = workspace.created_at.date().replace(day=1)
+        workspace_start_date = workspace.created_at.date().replace(day=1)
 
         # Apply date range filter if available
         if self.filters["chart_period_range"]:
@@ -250,6 +251,9 @@ class AdvanceAnalyticsChartEndpoint(AdvanceAnalyticsBaseView):
         data = []
         # include the current date at the end
         end_date = timezone.now().date()
+
+        twelve_months_ago = end_date.replace(day=1) - relativedelta(months=12)
+        start_date = max(workspace_start_date, twelve_months_ago)
         last_month = end_date.replace(day=1)
         current_month = start_date
 

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

@@ -22,7 +22,6 @@ from plane.db.models import (
     IntakeIssue,
     Issue,
     State,
-    StateGroup,
     IssueLink,
     FileAsset,
     Project,
@@ -229,30 +228,14 @@ class IntakeIssueViewSet(BaseViewSet):
         ]:
             return Response({"error": "Invalid priority"}, status=status.HTTP_400_BAD_REQUEST)
 
-        project = Project.objects.get(pk=project_id)
-
-        # get the triage state
-        triage_state = State.triage_objects.filter(project_id=project_id, workspace__slug=slug).first()
-        if not triage_state:
-            triage_state = State.objects.create(
-                name="Triage",
-                group=StateGroup.TRIAGE.value,
-                project_id=project_id,
-                workspace_id=project.workspace_id,
-                color="#4E5355",
-                sequence=65000,
-                default=False,
-            )
-        request.data["issue"]["state_id"] = triage_state.id
-
         # create an issue
+        project = Project.objects.get(pk=project_id)
         serializer = IssueCreateSerializer(
             data=request.data.get("issue"),
             context={
                 "project_id": project_id,
                 "workspace_id": project.workspace_id,
                 "default_assignee_id": project.default_assignee_id,
-                "allow_triage_state": True,
             },
         )
         if serializer.is_valid():
@@ -361,12 +344,6 @@ class IntakeIssueViewSet(BaseViewSet):
 
         # Get issue data
         issue_data = request.data.pop("issue", False)
-        issue_serializer = None
-        issue = None
-        issue_current_instance = None
-        issue_requested_data = None
-
-        # Validate issue data if provided
         if bool(issue_data):
             issue = Issue.objects.annotate(
                 label_ids=Coalesce(
@@ -394,95 +371,119 @@ class IntakeIssueViewSet(BaseViewSet):
                     "description": issue_data.get("description", issue.description),
                 }
 
-            issue_current_instance = json.dumps(IssueDetailSerializer(issue).data, cls=DjangoJSONEncoder)
-            issue_requested_data = json.dumps(issue_data, cls=DjangoJSONEncoder)
+            current_instance = json.dumps(IssueDetailSerializer(issue).data, cls=DjangoJSONEncoder)
 
             issue_serializer = IssueCreateSerializer(
-                issue, data=issue_data, partial=True, context={"project_id": project_id, "allow_triage_state": True}
+                issue, data=issue_data, partial=True, context={"project_id": project_id}
             )
 
-            if not issue_serializer.is_valid():
+            if issue_serializer.is_valid():
+                # Log all the updates
+                requested_data = json.dumps(issue_data, cls=DjangoJSONEncoder)
+                if issue is not None:
+                    issue_activity.delay(
+                        type="issue.activity.updated",
+                        requested_data=requested_data,
+                        actor_id=str(request.user.id),
+                        issue_id=str(issue.id),
+                        project_id=str(project_id),
+                        current_instance=current_instance,
+                        epoch=int(timezone.now().timestamp()),
+                        notification=True,
+                        origin=base_host(request=request, is_app=True),
+                        intake=str(intake_issue.id),
+                    )
+                    # updated issue description version
+                    issue_description_version_task.delay(
+                        updated_issue=current_instance,
+                        issue_id=str(pk),
+                        user_id=request.user.id,
+                    )
+                issue_serializer.save()
+            else:
                 return Response(issue_serializer.errors, status=status.HTTP_400_BAD_REQUEST)
 
-        # Validate intake issue data if user has permission
-        intake_serializer = None
-        intake_current_instance = None
-
+        # Only project admins can edit intake issue attributes
         if (project_member and project_member.role > ROLE.MEMBER.value) or is_workspace_admin:
-            intake_current_instance = json.dumps(IntakeIssueSerializer(intake_issue).data, cls=DjangoJSONEncoder)
-            intake_serializer = IntakeIssueSerializer(intake_issue, data=request.data, partial=True)
+            serializer = IntakeIssueSerializer(intake_issue, data=request.data, partial=True)
+            current_instance = json.dumps(IntakeIssueSerializer(intake_issue).data, cls=DjangoJSONEncoder)
+            if serializer.is_valid():
+                serializer.save()
+                # Update the issue state if the issue is rejected or marked as duplicate
+                if serializer.data["status"] in [-1, 2]:
+                    issue = Issue.objects.get(
+                        pk=intake_issue.issue_id,
+                        workspace__slug=slug,
+                        project_id=project_id,
+                    )
+                    state = State.objects.filter(group="cancelled", workspace__slug=slug, project_id=project_id).first()
+                    if state is not None:
+                        issue.state = state
+                        issue.save()
 
-            if not intake_serializer.is_valid():
-                return Response(intake_serializer.errors, status=status.HTTP_400_BAD_REQUEST)
+                # Update the issue state if it is accepted
+                if serializer.data["status"] in [1]:
+                    issue = Issue.objects.get(
+                        pk=intake_issue.issue_id,
+                        workspace__slug=slug,
+                        project_id=project_id,
+                    )
 
-        # Both serializers are valid, now save them
-        if issue_serializer:
-            issue_serializer.save()
-            # Log all the updates
-            if issue is not None:
+                    # Update the issue state only if it is in triage state
+                    if issue.state.is_triage:
+                        # Move to default state
+                        state = State.objects.filter(workspace__slug=slug, project_id=project_id, default=True).first()
+                        if state is not None:
+                            issue.state = state
+                            issue.save()
+                # create a activity for status change
                 issue_activity.delay(
-                    type="issue.activity.updated",
-                    requested_data=issue_requested_data,
+                    type="intake.activity.created",
+                    requested_data=json.dumps(request.data, cls=DjangoJSONEncoder),
                     actor_id=str(request.user.id),
-                    issue_id=str(issue.id),
-                    project_id=str(project_id),
-                    current_instance=issue_current_instance,
-                    epoch=int(timezone.now().timestamp()),
-                    notification=True,
-                    origin=base_host(request=request, is_app=True),
-                    intake=str(intake_issue.id),
-                )
-                # updated issue description version
-                issue_description_version_task.delay(
-                    updated_issue=issue_current_instance,
                     issue_id=str(pk),
-                    user_id=request.user.id,
+                    project_id=str(project_id),
+                    current_instance=current_instance,
+                    epoch=int(timezone.now().timestamp()),
+                    notification=False,
+                    origin=base_host(request=request, is_app=True),
+                    intake=(intake_issue.id),
                 )
 
-        if intake_serializer:
-            intake_serializer.save()
-            # create a activity for status change
-            issue_activity.delay(
-                type="intake.activity.created",
-                requested_data=json.dumps(request.data, cls=DjangoJSONEncoder),
-                actor_id=str(request.user.id),
-                issue_id=str(pk),
-                project_id=str(project_id),
-                current_instance=intake_current_instance,
-                epoch=int(timezone.now().timestamp()),
-                notification=False,
-                origin=base_host(request=request, is_app=True),
-                intake=str(intake_issue.id),
-            )
-
-        # Fetch and return the updated intake issue
-        intake_issue = (
-            IntakeIssue.objects.select_related("issue")
-            .prefetch_related("issue__labels", "issue__assignees")
-            .annotate(
-                label_ids=Coalesce(
-                    ArrayAgg(
-                        "issue__labels__id",
-                        distinct=True,
-                        filter=Q(~Q(issue__labels__id__isnull=True) & Q(issue__label_issue__deleted_at__isnull=True)),
-                    ),
-                    Value([], output_field=ArrayField(UUIDField())),
-                ),
-                assignee_ids=Coalesce(
-                    ArrayAgg(
-                        "issue__assignees__id",
-                        distinct=True,
-                        filter=Q(
-                            ~Q(issue__assignees__id__isnull=True) & Q(issue__issue_assignee__deleted_at__isnull=True)
+                intake_issue = (
+                    IntakeIssue.objects.select_related("issue")
+                    .prefetch_related("issue__labels", "issue__assignees")
+                    .annotate(
+                        label_ids=Coalesce(
+                            ArrayAgg(
+                                "issue__labels__id",
+                                distinct=True,
+                                filter=Q(
+                                    ~Q(issue__labels__id__isnull=True) & Q(issue__label_issue__deleted_at__isnull=True)
+                                ),
+                            ),
+                            Value([], output_field=ArrayField(UUIDField())),
                         ),
-                    ),
-                    Value([], output_field=ArrayField(UUIDField())),
-                ),
-            )
-            .get(intake_id=intake_id.id, issue_id=pk, project_id=project_id)
-        )
-        serializer = IntakeIssueDetailSerializer(intake_issue).data
-        return Response(serializer, status=status.HTTP_200_OK)
+                        assignee_ids=Coalesce(
+                            ArrayAgg(
+                                "issue__assignees__id",
+                                distinct=True,
+                                filter=Q(
+                                    ~Q(issue__assignees__id__isnull=True)
+                                    & Q(issue__issue_assignee__deleted_at__isnull=True)
+                                ),
+                            ),
+                            Value([], output_field=ArrayField(UUIDField())),
+                        ),
+                    )
+                    .get(intake_id=intake_id.id, issue_id=pk, project_id=project_id)
+                )
+                serializer = IntakeIssueDetailSerializer(intake_issue).data
+                return Response(serializer, status=status.HTTP_200_OK)
+            return Response(serializer.errors, status=status.HTTP_400_BAD_REQUEST)
+        else:
+            serializer = IntakeIssueDetailSerializer(intake_issue).data
+            return Response(serializer, status=status.HTTP_200_OK)
 
     @allow_permission(allowed_roles=[ROLE.ADMIN, ROLE.MEMBER, ROLE.GUEST], creator=True, model=Issue)
     def retrieve(self, request, slug, project_id, pk):

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

@@ -39,9 +39,7 @@ class LabelViewSet(BaseViewSet):
     @allow_permission([ROLE.ADMIN])
     def create(self, request, slug, project_id):
         try:
-            serializer = LabelSerializer(
-                data=request.data, context={"project_id": project_id}
-            )
+            serializer = LabelSerializer(data=request.data)
             if serializer.is_valid():
                 serializer.save(project_id=project_id)
                 return Response(serializer.data, status=status.HTTP_201_CREATED)
@@ -66,18 +64,8 @@ class LabelViewSet(BaseViewSet):
                 {"error": "Label with the same name already exists in the project"},
                 status=status.HTTP_400_BAD_REQUEST,
             )
-
-        serializer = LabelSerializer(
-            instance=self.get_object(),
-            data=request.data,
-            context={"project_id": kwargs["project_id"]},
-            partial=True,
-        )
-
-        if serializer.is_valid():
-            serializer.save()
-            return Response(serializer.data)
-        return Response(serializer.errors, status=status.HTTP_400_BAD_REQUEST)
+        # call the parent method to perform the update
+        return super().partial_update(request, *args, **kwargs)
 
     @invalidate_cache(path="/api/workspaces/:slug/labels/", url_params=True, user=False)
     @allow_permission([ROLE.ADMIN])
@@ -89,7 +77,6 @@ class BulkCreateIssueLabelsEndpoint(BaseAPIView):
     @allow_permission([ROLE.ADMIN])
     def post(self, request, slug, project_id):
         label_data = request.data.get("label_data", [])
-
         project = Project.objects.get(pk=project_id)
 
         labels = Label.objects.bulk_create(

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

@@ -149,24 +149,14 @@ class PageViewSet(BaseViewSet):
 
     def partial_update(self, request, slug, project_id, page_id):
         try:
-            page = Page.objects.get(
-                pk=page_id,
-                workspace__slug=slug,
-                projects__id=project_id,
-                project_pages__deleted_at__isnull=True,
-            )
+            page = Page.objects.get(pk=page_id, workspace__slug=slug, projects__id=project_id)
 
             if page.is_locked:
                 return Response({"error": "Page is locked"}, status=status.HTTP_400_BAD_REQUEST)
 
             parent = request.data.get("parent", None)
             if parent:
-                _ = Page.objects.get(
-                    pk=parent,
-                    workspace__slug=slug,
-                    projects__id=project_id,
-                    project_pages__deleted_at__isnull=True,
-                )
+                _ = Page.objects.get(pk=parent, workspace__slug=slug, projects__id=project_id)
 
             # Only update access if the page owner is the requesting  user
             if page.access != request.data.get("access", page.access) and page.owned_by_id != request.user.id:
@@ -240,24 +230,14 @@ class PageViewSet(BaseViewSet):
             return Response(data, status=status.HTTP_200_OK)
 
     def lock(self, request, slug, project_id, page_id):
-        page = Page.objects.get(
-            pk=page_id,
-            workspace__slug=slug,
-            projects__id=project_id,
-            project_pages__deleted_at__isnull=True,
-        )
+        page = Page.objects.filter(pk=page_id, workspace__slug=slug, projects__id=project_id).first()
 
         page.is_locked = True
         page.save()
         return Response(status=status.HTTP_204_NO_CONTENT)
 
     def unlock(self, request, slug, project_id, page_id):
-        page = Page.objects.get(
-            pk=page_id,
-            workspace__slug=slug,
-            projects__id=project_id,
-            project_pages__deleted_at__isnull=True,
-        )
+        page = Page.objects.filter(pk=page_id, workspace__slug=slug, projects__id=project_id).first()
 
         page.is_locked = False
         page.save()
@@ -266,12 +246,7 @@ class PageViewSet(BaseViewSet):
 
     def access(self, request, slug, project_id, page_id):
         access = request.data.get("access", 0)
-        page = Page.objects.get(
-            pk=page_id,
-            workspace__slug=slug,
-            projects__id=project_id,
-            project_pages__deleted_at__isnull=True,
-        )
+        page = Page.objects.filter(pk=page_id, workspace__slug=slug, projects__id=project_id).first()
 
         # Only update access if the page owner is the requesting user
         if page.access != request.data.get("access", page.access) and page.owned_by_id != request.user.id:
@@ -302,12 +277,7 @@ class PageViewSet(BaseViewSet):
         return Response(pages, status=status.HTTP_200_OK)
 
     def archive(self, request, slug, project_id, page_id):
-        page = Page.objects.get(
-            pk=page_id,
-            workspace__slug=slug,
-            projects__id=project_id,
-            project_pages__deleted_at__isnull=True,
-        )
+        page = Page.objects.get(pk=page_id, workspace__slug=slug, projects__id=project_id)
 
         # only the owner or admin can archive the page
         if (
@@ -333,12 +303,7 @@ class PageViewSet(BaseViewSet):
         return Response({"archived_at": str(datetime.now())}, status=status.HTTP_200_OK)
 
     def unarchive(self, request, slug, project_id, page_id):
-        page = Page.objects.get(
-            pk=page_id,
-            workspace__slug=slug,
-            projects__id=project_id,
-            project_pages__deleted_at__isnull=True,
-        )
+        page = Page.objects.get(pk=page_id, workspace__slug=slug, projects__id=project_id)
 
         # only the owner or admin can un archive the page
         if (
@@ -362,12 +327,7 @@ class PageViewSet(BaseViewSet):
         return Response(status=status.HTTP_204_NO_CONTENT)
 
     def destroy(self, request, slug, project_id, page_id):
-        page = Page.objects.get(
-            pk=page_id,
-            workspace__slug=slug,
-            projects__id=project_id,
-            project_pages__deleted_at__isnull=True,
-        )
+        page = Page.objects.get(pk=page_id, workspace__slug=slug, projects__id=project_id)
 
         if page.archived_at is None:
             return Response(
@@ -390,12 +350,7 @@ class PageViewSet(BaseViewSet):
             )
 
         # remove parent from all the children
-        _ = Page.objects.filter(
-            parent_id=page_id,
-            projects__id=project_id,
-            workspace__slug=slug,
-            project_pages__deleted_at__isnull=True,
-        ).update(parent=None)
+        _ = Page.objects.filter(parent_id=page_id, projects__id=project_id, workspace__slug=slug).update(parent=None)
 
         page.delete()
         # Delete the user favorite page
@@ -496,14 +451,12 @@ class PagesDescriptionViewSet(BaseViewSet):
 
     def retrieve(self, request, slug, project_id, page_id):
         page = (
-            Page.objects.get(
-                Q(owned_by=self.request.user) | Q(access=0),
-                pk=page_id,
-                workspace__slug=slug,
-                projects__id=project_id,
-                project_pages__deleted_at__isnull=True,
-            )
+            Page.objects.filter(pk=page_id, workspace__slug=slug, projects__id=project_id)
+            .filter(Q(owned_by=self.request.user) | Q(access=0))
+            .first()
         )
+        if page is None:
+            return Response({"error": "Page not found"}, status=404)
         binary_data = page.description_binary
 
         def stream_data():
@@ -518,15 +471,14 @@ class PagesDescriptionViewSet(BaseViewSet):
 
     def partial_update(self, request, slug, project_id, page_id):
         page = (
-            Page.objects.get(
-                Q(owned_by=self.request.user) | Q(access=0),
-                pk=page_id,
-                workspace__slug=slug,
-                projects__id=project_id,
-                project_pages__deleted_at__isnull=True,
-            )
+            Page.objects.filter(pk=page_id, workspace__slug=slug, projects__id=project_id)
+            .filter(Q(owned_by=self.request.user) | Q(access=0))
+            .first()
         )
 
+        if page is None:
+            return Response({"error": "Page not found"}, status=404)
+
         if page.is_locked:
             return Response(
                 {
@@ -577,12 +529,7 @@ class PageDuplicateEndpoint(BaseAPIView):
     permission_classes = [ProjectPagePermission]
 
     def post(self, request, slug, project_id, page_id):
-        page = Page.objects.get(
-            pk=page_id,
-            workspace__slug=slug,
-            projects__id=project_id,
-            project_pages__deleted_at__isnull=True,
-        )
+        page = Page.objects.filter(pk=page_id, workspace__slug=slug, projects__id=project_id).first()
 
         # check for permission
         if page.access == Page.PRIVATE_ACCESS and page.owned_by_id != request.user.id:

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

@@ -31,7 +31,6 @@ from plane.db.models import (
     ProjectIdentifier,
     ProjectMember,
     State,
-    DEFAULT_STATES,
     Workspace,
     WorkspaceMember,
 )
@@ -265,6 +264,41 @@ class ProjectViewSet(BaseViewSet):
                     user_id=serializer.data["project_lead"],
                 )
 
+            # Default states
+            states = [
+                {
+                    "name": "Backlog",
+                    "color": "#60646C",
+                    "sequence": 15000,
+                    "group": "backlog",
+                    "default": True,
+                },
+                {
+                    "name": "Todo",
+                    "color": "#60646C",
+                    "sequence": 25000,
+                    "group": "unstarted",
+                },
+                {
+                    "name": "In Progress",
+                    "color": "#F59E0B",
+                    "sequence": 35000,
+                    "group": "started",
+                },
+                {
+                    "name": "Done",
+                    "color": "#46A758",
+                    "sequence": 45000,
+                    "group": "completed",
+                },
+                {
+                    "name": "Cancelled",
+                    "color": "#9AA4BC",
+                    "sequence": 55000,
+                    "group": "cancelled",
+                },
+            ]
+
             State.objects.bulk_create(
                 [
                     State(
@@ -277,7 +311,7 @@ class ProjectViewSet(BaseViewSet):
                         default=state.get("default", False),
                         created_by=request.user,
                     )
-                    for state in DEFAULT_STATES
+                    for state in states
                 ]
             )
 

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

@@ -8,7 +8,6 @@ from plane.app.serializers import (
     ProjectMemberSerializer,
     ProjectMemberAdminSerializer,
     ProjectMemberRoleSerializer,
-    ProjectMemberPreferenceSerializer,
 )
 
 from plane.app.permissions import WorkspaceUserPermission
@@ -301,32 +300,3 @@ class UserProjectRolesEndpoint(BaseAPIView):
 
         project_members = {str(member["project_id"]): member["role"] for member in project_members}
         return Response(project_members, status=status.HTTP_200_OK)
-
-
-class ProjectMemberPreferenceEndpoint(BaseAPIView):
-    def get_queryset(self, slug, project_id, member_id):
-        return ProjectMember.objects.get(
-            project_id=project_id,
-            member_id=member_id,
-            workspace__slug=slug,
-        )
-
-    @allow_permission([ROLE.ADMIN, ROLE.MEMBER, ROLE.GUEST])
-    def patch(self, request, slug, project_id, member_id):
-        project_member = self.get_queryset(slug, project_id, member_id)
-
-        serializer = ProjectMemberPreferenceSerializer(project_member, {"preferences": request.data}, partial=True)
-
-        if serializer.is_valid():
-            serializer.save()
-
-            return Response({"preferences": serializer.data["preferences"]}, status=status.HTTP_200_OK)
-        return Response(serializer.errors, status=status.HTTP_400_BAD_REQUEST)
-
-    @allow_permission([ROLE.ADMIN, ROLE.MEMBER, ROLE.GUEST])
-    def get(self, request, slug, project_id, member_id):
-        project_member = self.get_queryset(slug, project_id, member_id)
-
-        serializer = ProjectMemberPreferenceSerializer(project_member)
-
-        return Response(serializer.data, status=status.HTTP_200_OK)

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

@@ -10,7 +10,7 @@ from rest_framework.response import Response
 from rest_framework import status
 
 # Module imports
-from .. import BaseViewSet, BaseAPIView
+from .. import BaseViewSet
 from plane.app.serializers import StateSerializer
 from plane.app.permissions import ROLE, allow_permission
 from plane.db.models import State, Issue
@@ -127,16 +127,3 @@ class StateViewSet(BaseViewSet):
 
         state.delete()
         return Response(status=status.HTTP_204_NO_CONTENT)
-
-
-class IntakeStateEndpoint(BaseAPIView):
-    @allow_permission([ROLE.ADMIN, ROLE.MEMBER, ROLE.GUEST])
-    def get(self, request, slug, project_id):
-        state = State.triage_objects.filter(workspace__slug=slug, project_id=project_id).first()
-        if not state:
-            return Response(
-                {"error": "Triage state not found"},
-                status=status.HTTP_404_NOT_FOUND,
-            )
-
-        return Response(StateSerializer(state).data, status=status.HTTP_200_OK)

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

@@ -1,20 +1,10 @@
 # Python imports
 import uuid
-import json
-import logging
-import random
-import string
-import secrets
 
 # Django imports
 from django.db.models import Case, Count, IntegerField, Q, When
 from django.contrib.auth import logout
 from django.utils import timezone
-from django.utils.decorators import method_decorator
-from django.views.decorators.cache import cache_control
-from django.views.decorators.vary import vary_on_cookie
-from django.core.validators import validate_email
-from django.core.cache import cache
 
 # Third party imports
 from rest_framework import status
@@ -46,11 +36,9 @@ from plane.utils.paginator import BasePaginator
 from plane.authentication.utils.host import user_ip
 from plane.bgtasks.user_deactivation_email_task import user_deactivation_email
 from plane.utils.host import base_host
-from plane.bgtasks.user_email_update_task import send_email_update_magic_code, send_email_update_confirmation
-from plane.authentication.rate_limit import EmailVerificationThrottle
-
-
-logger = logging.getLogger("plane")
+from django.utils.decorators import method_decorator
+from django.views.decorators.cache import cache_control
+from django.views.decorators.vary import vary_on_cookie
 
 
 class UserEndpoint(BaseViewSet):
@@ -61,14 +49,6 @@ class UserEndpoint(BaseViewSet):
     def get_object(self):
         return self.request.user
 
-    def get_throttles(self):
-        """
-        Apply rate limiting to specific endpoints.
-        """
-        if self.action == "generate_email_verification_code":
-            return [EmailVerificationThrottle()]
-        return super().get_throttles()
-
     @method_decorator(cache_control(private=True, max_age=12))
     @method_decorator(vary_on_cookie)
     def retrieve(self, request):
@@ -89,169 +69,6 @@ class UserEndpoint(BaseViewSet):
     def partial_update(self, request, *args, **kwargs):
         return super().partial_update(request, *args, **kwargs)
 
-    def _validate_new_email(self, user, new_email):
-        """
-        Validate the new email address.
-
-        Args:
-            user: The User instance
-            new_email: The new email address to validate
-
-        Returns:
-            Response object with error if validation fails, None if validation passes
-        """
-        if not new_email:
-            return Response(
-                {"error": "Email is required"},
-                status=status.HTTP_400_BAD_REQUEST,
-            )
-
-        # Validate email format
-        try:
-            validate_email(new_email)
-        except Exception:
-            return Response(
-                {"error": "Invalid email format"},
-                status=status.HTTP_400_BAD_REQUEST,
-            )
-
-        # Check if email is the same as current email
-        if new_email == user.email:
-            return Response(
-                {"error": "New email must be different from current email"},
-                status=status.HTTP_400_BAD_REQUEST,
-            )
-
-        # Check if email already exists in the User model
-        if User.objects.filter(email=new_email).exclude(id=user.id).exists():
-            return Response(
-                {"error": "An account with this email already exists"},
-                status=status.HTTP_400_BAD_REQUEST,
-            )
-
-        return None
-
-    def generate_email_verification_code(self, request):
-        """
-        Generate and send a magic code to the new email address for verification.
-        Rate limited to 3 requests per hour per user (enforced by EmailVerificationThrottle).
-        Additional per-email cooldown of 60 seconds prevents rapid repeated requests.
-        """
-        user = self.get_object()
-        new_email = request.data.get("email", "").strip().lower()
-
-        # Validate the new email
-        validation_error = self._validate_new_email(user, new_email)
-        if validation_error:
-            return validation_error
-
-        try:
-            # Generate magic code for email verification
-            # Use a special key prefix to distinguish from regular magic signin
-            # Include user ID to bind the code to the specific user
-            cache_key = f"magic_email_update_{user.id}_{new_email}"
-            ## Generate a random token
-            token = (
-                "".join(secrets.choice(string.ascii_lowercase) for _ in range(4))
-                + "-"
-                + "".join(secrets.choice(string.ascii_lowercase) for _ in range(4))
-                + "-"
-                + "".join(secrets.choice(string.ascii_lowercase) for _ in range(4))
-            )
-            # Store in cache with 10 minute expiration
-            cache_data = json.dumps({"token": token})
-            cache.set(cache_key, cache_data, timeout=600)
-
-            # Send magic code to the new email
-            send_email_update_magic_code.delay(new_email, token)
-
-            return Response(
-                {"message": "Verification code sent to email"},
-                status=status.HTTP_200_OK,
-            )
-        except Exception as e:
-            logger.error("Failed to generate verification code: %s", str(e), exc_info=True)
-            return Response(
-                {"error": "Failed to generate verification code. Please try again."},
-                status=status.HTTP_400_BAD_REQUEST,
-            )
-
-    def update_email(self, request):
-        """
-        Verify the magic code and update the user's email address.
-        This endpoint verifies the code and updates the existing user record
-        without creating a new user, ensuring the user ID remains unchanged.
-        """
-        user = self.get_object()
-        new_email = request.data.get("email", "").strip().lower()
-        code = request.data.get("code", "").strip()
-
-        # Validate the new email
-        validation_error = self._validate_new_email(user, new_email)
-        if validation_error:
-            return validation_error
-
-        if not code:
-            return Response(
-                {"error": "Verification code is required"},
-                status=status.HTTP_400_BAD_REQUEST,
-            )
-
-        # Verify the magic code
-        try:
-            cache_key = f"magic_email_update_{user.id}_{new_email}"
-            cached_data = cache.get(cache_key)
-
-            if not cached_data:
-                logger.warning("Cache key not found: %s. Code may have expired or was never generated.", cache_key)
-                return Response(
-                    {"error": "Verification code has expired or is invalid"},
-                    status=status.HTTP_400_BAD_REQUEST,
-                )
-
-            data = json.loads(cached_data)
-            stored_token = data.get("token")
-
-            if str(stored_token) != str(code):
-                return Response(
-                    {"error": "Invalid verification code"},
-                    status=status.HTTP_400_BAD_REQUEST,
-                )
-
-        except Exception as e:
-            return Response(
-                {"error": "Failed to verify code. Please try again."},
-                status=status.HTTP_400_BAD_REQUEST,
-            )
-
-        # Final check: ensure email is still available (might have been taken between code generation and update)
-        if User.objects.filter(email=new_email).exclude(id=user.id).exists():
-            return Response(
-                {"error": "An account with this email already exists"},
-                status=status.HTTP_400_BAD_REQUEST,
-            )
-        old_email = user.email
-        # Update the email - this updates the existing user record without creating a new user
-        user.email = new_email
-        # Reset email verification status when email is changed
-        user.is_email_verified = False
-        user.save()
-
-        # delete the cache
-        cache.delete(cache_key)
-
-        # Logout the user
-        logout(request)
-
-        # Send confirmation email to the new email address
-        send_email_update_confirmation.delay(new_email)
-        # send the email to the old email address
-        send_email_update_confirmation.delay(old_email)
-
-        # Return updated user data
-        serialized_data = UserMeSerializer(user).data
-        return Response(serialized_data, status=status.HTTP_200_OK)
-
     def deactivate(self, request):
         # Check all workspace user is active
         user = self.get_object()

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

@@ -249,26 +249,23 @@ class WorkspaceUserPropertiesEndpoint(BaseAPIView):
     permission_classes = [WorkspaceViewerPermission]
 
     def patch(self, request, slug):
-        workspace = Workspace.objects.get(slug=slug)
+        workspace_properties = WorkspaceUserProperties.objects.get(user=request.user, workspace__slug=slug)
 
-        (workspace_properties, _) = WorkspaceUserProperties.objects.get_or_create(
-            user=request.user, workspace_id=workspace.id
+        workspace_properties.filters = request.data.get("filters", workspace_properties.filters)
+        workspace_properties.rich_filters = request.data.get("rich_filters", workspace_properties.rich_filters)
+        workspace_properties.display_filters = request.data.get("display_filters", workspace_properties.display_filters)
+        workspace_properties.display_properties = request.data.get(
+            "display_properties", workspace_properties.display_properties
         )
+        workspace_properties.save()
 
-        serializer = WorkspaceUserPropertiesSerializer(workspace_properties, data=request.data, partial=True)
-        if serializer.is_valid():
-            serializer.save()
-            return Response(serializer.data, status=status.HTTP_200_OK)
-
-        return Response(serializer.errors, status=status.HTTP_400_BAD_REQUEST)
+        serializer = WorkspaceUserPropertiesSerializer(workspace_properties)
+        return Response(serializer.data, status=status.HTTP_201_CREATED)
 
     def get(self, request, slug):
-        workspace = Workspace.objects.get(slug=slug)
-
         (workspace_properties, _) = WorkspaceUserProperties.objects.get_or_create(
-            user=request.user, workspace=workspace
+            user=request.user, workspace__slug=slug
         )
-
         serializer = WorkspaceUserPropertiesSerializer(workspace_properties)
         return Response(serializer.data, status=status.HTTP_200_OK)
 

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

@@ -39,16 +39,6 @@ class WorkspaceUserPreferenceViewSet(BaseAPIView):
                             user=request.user,
                             workspace=workspace,
                             sort_order=(65535 + (i * 10000)),
-                            is_pinned=(
-                                True
-                                if key
-                                in [
-                                    WorkspaceUserPreference.UserPreferenceKeys.DRAFTS,
-                                    WorkspaceUserPreference.UserPreferenceKeys.YOUR_WORK,
-                                    WorkspaceUserPreference.UserPreferenceKeys.STICKIES,
-                                ]
-                                else False
-                            ),
                         )
                         for i, key in enumerate(create_preference_keys)
                     ],
@@ -75,23 +65,15 @@ class WorkspaceUserPreferenceViewSet(BaseAPIView):
         )
 
     @allow_permission([ROLE.ADMIN, ROLE.MEMBER, ROLE.GUEST], level="WORKSPACE")
-    def patch(self, request, slug):
-        for data in request.data:
-            key = data.pop("key", None)
-            if not key:
-                continue
+    def patch(self, request, slug, key):
+        preference = WorkspaceUserPreference.objects.filter(key=key, workspace__slug=slug, user=request.user).first()
 
-            preference = WorkspaceUserPreference.objects.filter(key=key, workspace__slug=slug).first()
+        if preference:
+            serializer = WorkspaceUserPreferenceSerializer(preference, data=request.data, partial=True)
 
-            if not preference:
-                continue
+            if serializer.is_valid():
+                serializer.save()
+                return Response(serializer.data, status=status.HTTP_200_OK)
+            return Response(serializer.errors, status=status.HTTP_400_BAD_REQUEST)
 
-            if "is_pinned" in data:
-                preference.is_pinned = data["is_pinned"]
-
-            if "sort_order" in data:
-                preference.sort_order = data["sort_order"]
-
-            preference.save(update_fields=["is_pinned", "sort_order"])
-
-        return Response({"message": "Successfully updated"}, status=status.HTTP_200_OK)
+        return Response({"detail": "Preference not found"}, status=status.HTTP_404_NOT_FOUND)

apps/api/plane/authentication/rate_limit.py

@@ -1,5 +1,5 @@
 # Third party imports
-from rest_framework.throttling import AnonRateThrottle, UserRateThrottle
+from rest_framework.throttling import AnonRateThrottle
 from rest_framework import status
 from rest_framework.response import Response
 
@@ -22,22 +22,3 @@ class AuthenticationThrottle(AnonRateThrottle):
             )
         except AuthenticationException as e:
             return Response(e.get_error_dict(), status=status.HTTP_429_TOO_MANY_REQUESTS)
-
-
-class EmailVerificationThrottle(UserRateThrottle):
-    """
-    Throttle for email verification code generation.
-    Limits to 3 requests per hour per user to prevent abuse.
-    """
-
-    rate = "3/hour"
-    scope = "email_verification"
-
-    def throttle_failure_view(self, request, *args, **kwargs):
-        try:
-            raise AuthenticationException(
-                error_code=AUTHENTICATION_ERROR_CODES["RATE_LIMIT_EXCEEDED"],
-                error_message="RATE_LIMIT_EXCEEDED",
-            )
-        except AuthenticationException as e:
-            return Response(e.get_error_dict(), status=status.HTTP_429_TOO_MANY_REQUESTS)

apps/api/plane/bgtasks/dummy_data_task.py

@@ -17,7 +17,6 @@ from plane.db.models import (
     Project,
     ProjectMember,
     State,
-    StateGroup,
     Label,
     Cycle,
     Module,
@@ -265,9 +264,7 @@ def create_issues(workspace, project, user_id, issue_count):
     Faker.seed(0)
 
     states = (
-        State.objects.filter(workspace=workspace, project=project)
-        .exclude(group=StateGroup.TRIAGE.value)
-        .values_list("id", flat=True)
+        State.objects.filter(workspace=workspace, project=project).exclude(group="Triage").values_list("id", flat=True)
     )
     creators = ProjectMember.objects.filter(workspace=workspace, project=project).values_list("member_id", flat=True)
 

apps/api/plane/bgtasks/user_email_update_task.py

@@ -1,110 +0,0 @@
-# Python imports
-import logging
-
-# Third party imports
-from celery import shared_task
-
-# Django imports
-from django.core.mail import EmailMultiAlternatives, get_connection
-from django.template.loader import render_to_string
-from django.utils.html import strip_tags
-
-# Module imports
-from plane.license.utils.instance_value import get_email_configuration
-from plane.utils.exception_logger import log_exception
-
-
-@shared_task
-def send_email_update_magic_code(email, token):
-    try:
-        (
-            EMAIL_HOST,
-            EMAIL_HOST_USER,
-            EMAIL_HOST_PASSWORD,
-            EMAIL_PORT,
-            EMAIL_USE_TLS,
-            EMAIL_USE_SSL,
-            EMAIL_FROM,
-        ) = get_email_configuration()
-
-        # Send the mail
-        subject = "Verify your new email address"
-        context = {"code": token, "email": email}
-
-        html_content = render_to_string("emails/auth/magic_signin.html", context)
-        text_content = strip_tags(html_content)
-
-        connection = get_connection(
-            host=EMAIL_HOST,
-            port=int(EMAIL_PORT),
-            username=EMAIL_HOST_USER,
-            password=EMAIL_HOST_PASSWORD,
-            use_tls=EMAIL_USE_TLS == "1",
-            use_ssl=EMAIL_USE_SSL == "1",
-        )
-
-        msg = EmailMultiAlternatives(
-            subject=subject,
-            body=text_content,
-            from_email=EMAIL_FROM,
-            to=[email],
-            connection=connection,
-        )
-        msg.attach_alternative(html_content, "text/html")
-        msg.send()
-        logging.getLogger("plane.worker").info("Email sent successfully.")
-        return
-    except Exception as e:
-        log_exception(e)
-        return
-
-
-@shared_task
-def send_email_update_confirmation(email):
-    """
-    Send a confirmation email to the user after their email address has been successfully updated.
-
-    Args:
-        email: The new email address that was successfully updated
-    """
-    try:
-        (
-            EMAIL_HOST,
-            EMAIL_HOST_USER,
-            EMAIL_HOST_PASSWORD,
-            EMAIL_PORT,
-            EMAIL_USE_TLS,
-            EMAIL_USE_SSL,
-            EMAIL_FROM,
-        ) = get_email_configuration()
-
-        # Send the confirmation email
-        subject = "Plane email address successfully updated"
-        context = {"email": email}
-
-        html_content = render_to_string("emails/user/email_updated.html", context)
-        text_content = strip_tags(html_content)
-
-        connection = get_connection(
-            host=EMAIL_HOST,
-            port=int(EMAIL_PORT),
-            username=EMAIL_HOST_USER,
-            password=EMAIL_HOST_PASSWORD,
-            use_tls=EMAIL_USE_TLS == "1",
-            use_ssl=EMAIL_USE_SSL == "1",
-        )
-
-        msg = EmailMultiAlternatives(
-            subject=subject,
-            body=text_content,
-            from_email=EMAIL_FROM,
-            to=[email],
-            connection=connection,
-        )
-        msg.attach_alternative(html_content, "text/html")
-        msg.send()
-        logging.getLogger("plane.worker").info(f"Email update confirmation sent successfully to {email}.")
-        return
-    except Exception as e:
-        log_exception(e)
-        return

apps/api/plane/db/migrations/0112_auto_20251124_0603.py

@@ -1,92 +0,0 @@
-# Generated by Django 4.2.25 on 2025-11-24 06:03
-
-from django.db import migrations, transaction
-from django.db.models import OuterRef, Subquery
-
-import logging
-logger = logging.getLogger("plane.migrations")
-
-BATCH_SIZE = 4000
-
-
-def create_triage_state(apps, _schema_editor):
-    Project = apps.get_model("db", "Project")
-    State = apps.get_model("db", "State")
-    Issue = apps.get_model("db", "Issue")
-
-
-    # 1) Bulk-update existing triage states
-    triage_qs = State.objects.filter(group="triage")
-    projects_with_triage_state = list(triage_qs.values_list("project_id", flat=True))
-    triage_qs.update(
-        name="Triage",
-        color="#4E5355",
-        sequence=65000,
-        default=False,
-    )
-    logger.info(f"Updated {triage_qs.count()} triage states.")
-
-    # 2) Projects that already have a 'Triage' name but not in triage group
-    projects_to_update_qs = (
-        State.objects.exclude(group="triage")
-        .filter(name="Triage")
-        .values_list("project_id", flat=True)
-    )
-    projects_to_update = set(projects_to_update_qs)
-    logger.info(f"Projects to update: {len(projects_to_update)}")
-
-    # 3) Create missing triage states in chunks to avoid memory spike
-    states_to_create = []
-    project_iter = Project.objects.all().values_list("id", "workspace_id").iterator()
-    for proj_id, workspace_id in project_iter:
-        if proj_id in projects_with_triage_state:
-            continue
-        if proj_id in projects_to_update:
-            name = f"Triage-{str(proj_id)[:5]}"
-        else:
-            name = "Triage"
-        states_to_create.append(
-            State(
-                name=name,
-                group="triage",
-                project_id=proj_id,
-                workspace_id=workspace_id,
-                color="#4E5355",
-                sequence=65000,
-                default=False,
-            )
-        )
-        if len(states_to_create) >= BATCH_SIZE:
-            State.objects.bulk_create(states_to_create, batch_size=BATCH_SIZE)
-            states_to_create = []
-
-    if states_to_create:
-        State.objects.bulk_create(states_to_create, batch_size=BATCH_SIZE)
-
-    # 4) Update issues: use deterministic subquery and only update issues that will get a triage state.
-    with transaction.atomic():
-        triage_state_subquery = (
-            State.objects.filter(
-                group="triage",
-                project_id=OuterRef("project_id"),
-                workspace_id=OuterRef("workspace_id"),
-            )
-            .values("id")[:1]
-        )
-
-        updated_count = Issue._default_manager.filter(
-            issue_intake__status__in=[-2, 0],
-        ).update(state_id=Subquery(triage_state_subquery))
-        logger.info(f"Updated {updated_count} issues.")
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('db', '0111_notification_notif_receiver_status_idx_and_more'),
-    ]
-
-    operations = [
-        migrations.RunPython(create_triage_state, 
-        reverse_code=migrations.RunPython.noop),
-    ]

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

@@ -56,7 +56,7 @@ from .project import (
 )
 from .session import Session
 from .social_connection import SocialLoginConnection
-from .state import State, StateGroup, DEFAULT_STATES
+from .state import State
 from .user import Account, Profile, User
 from .view import IssueView
 from .webhook import Webhook, WebhookLog

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

@@ -19,7 +19,6 @@ from .project import ProjectBaseModel
 from plane.utils.uuid import convert_uuid_to_integer
 from .description import Description
 from plane.db.mixins import ChangeTrackerMixin
-from .state import StateGroup
 
 
 def get_default_properties():
@@ -98,7 +97,6 @@ class IssueManager(SoftDeletionManager):
             )
             .filter(deleted_at__isnull=True)
             .filter(state__is_triage=False)
-            .exclude(state__group=StateGroup.TRIAGE.value)
             .exclude(archived_at__isnull=False)
             .exclude(project__archived_at__isnull=False)
             .exclude(is_draft=True)

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

@@ -59,7 +59,7 @@ def get_default_props():
 
 
 def get_default_preferences():
-    return {"pages": {"block_display": True}, "navigation": {"default_tab": "work_items", "hide_in_more_menu": []}}
+    return {"pages": {"block_display": True}}
 
 
 class Project(BaseModel):

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

@@ -7,71 +7,6 @@ from django.db.models import Q
 from .project import ProjectBaseModel
 
 
-class StateGroup(models.TextChoices):
-    BACKLOG = "backlog", "Backlog"
-    UNSTARTED = "unstarted", "Unstarted"
-    STARTED = "started", "Started"
-    COMPLETED = "completed", "Completed"
-    CANCELLED = "cancelled", "Cancelled"
-    TRIAGE = "triage", "Triage"
-
-
-# Default states
-DEFAULT_STATES = [
-    {
-        "name": "Backlog",
-        "color": "#60646C",
-        "sequence": 15000,
-        "group": StateGroup.BACKLOG.value,
-        "default": True,
-    },
-    {
-        "name": "Todo",
-        "color": "#60646C",
-        "sequence": 25000,
-        "group": StateGroup.UNSTARTED.value,
-    },
-    {
-        "name": "In Progress",
-        "color": "#F59E0B",
-        "sequence": 35000,
-        "group": StateGroup.STARTED.value,
-    },
-    {
-        "name": "Done",
-        "color": "#46A758",
-        "sequence": 45000,
-        "group": StateGroup.COMPLETED.value,
-    },
-    {
-        "name": "Cancelled",
-        "color": "#9AA4BC",
-        "sequence": 55000,
-        "group": StateGroup.CANCELLED.value,
-    },
-    {
-        "name": "Triage",
-        "color": "#4E5355",
-        "sequence": 65000,
-        "group": StateGroup.TRIAGE.value,
-    },
-]
-
-
-class StateManager(models.Manager):
-    """Default manager - excludes triage states"""
-
-    def get_queryset(self):
-        return super().get_queryset().exclude(group=StateGroup.TRIAGE.value)
-
-
-class TriageStateManager(models.Manager):
-    """Manager for triage states only"""
-
-    def get_queryset(self):
-        return super().get_queryset().filter(group=StateGroup.TRIAGE.value)
-
-
 class State(ProjectBaseModel):
     name = models.CharField(max_length=255, verbose_name="State Name")
     description = models.TextField(verbose_name="State Description", blank=True)
@@ -79,8 +14,15 @@ class State(ProjectBaseModel):
     slug = models.SlugField(max_length=100, blank=True)
     sequence = models.FloatField(default=65535)
     group = models.CharField(
-        choices=StateGroup.choices,
-        default=StateGroup.BACKLOG,
+        choices=(
+            ("backlog", "Backlog"),
+            ("unstarted", "Unstarted"),
+            ("started", "Started"),
+            ("completed", "Completed"),
+            ("cancelled", "Cancelled"),
+            ("triage", "Triage"),
+        ),
+        default="backlog",
         max_length=20,
     )
     is_triage = models.BooleanField(default=False)
@@ -88,10 +30,6 @@ class State(ProjectBaseModel):
     external_source = models.CharField(max_length=255, null=True, blank=True)
     external_id = models.CharField(max_length=255, blank=True, null=True)
 
-    objects = StateManager()
-    all_state_objects = models.Manager()
-    triage_objects = TriageStateManager()
-
     def __str__(self):
         """Return name of the state"""
         return f"{self.name} <{self.project.name}>"

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

@@ -417,7 +417,6 @@ class WorkspaceUserPreference(BaseModel):
         DRAFTS = "drafts", "Drafts"
         YOUR_WORK = "your_work", "Your Work"
         ARCHIVES = "archives", "Archives"
-        STICKIES = "stickies", "Stickies"
 
     workspace = models.ForeignKey(
         "db.Workspace",

apps/api/plane/settings/local.py

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

apps/api/plane/settings/production.py

@@ -86,10 +86,5 @@ LOGGING = {
             "handlers": ["console"],
             "propagate": False,
         },
-        "plane.migrations": {
-            "level": "DEBUG" if DEBUG else "INFO",
-            "handlers": ["console"],
-            "propagate": False,
-        },
     },
 }

apps/api/plane/space/views/intake.py

@@ -12,7 +12,7 @@ from rest_framework.response import Response
 
 # Module imports
 from .base import BaseViewSet
-from plane.db.models import IntakeIssue, Issue, IssueLink, FileAsset, DeployBoard, State, StateGroup
+from plane.db.models import IntakeIssue, Issue, IssueLink, FileAsset, DeployBoard
 from plane.app.serializers import (
     IssueSerializer,
     IntakeIssueSerializer,
@@ -121,22 +121,6 @@ class IntakeIssuePublicViewSet(BaseViewSet):
         ]:
             return Response({"error": "Invalid priority"}, status=status.HTTP_400_BAD_REQUEST)
 
-        # get the triage state
-        triage_state = State.triage_objects.filter(
-            project_id=project_deploy_board.project_id, workspace_id=project_deploy_board.workspace_id
-        ).first()
-
-        if not triage_state:
-            triage_state = State.objects.create(
-                name="Triage",
-                group=StateGroup.TRIAGE.value,
-                project_id=project_deploy_board.project_id,
-                workspace_id=project_deploy_board.workspace_id,
-                color="#4E5355",
-                sequence=65000,
-                default=False,
-            )
-
         # create an issue
         issue = Issue.objects.create(
             name=request.data.get("issue", {}).get("name"),
@@ -144,7 +128,6 @@ class IntakeIssuePublicViewSet(BaseViewSet):
             description_html=request.data.get("issue", {}).get("description_html", "<p></p>"),
             priority=request.data.get("issue", {}).get("priority", "low"),
             project_id=project_deploy_board.project_id,
-            state_id=triage_state.id,
         )
 
         # Create an Issue Activity
@@ -208,7 +191,7 @@ class IntakeIssuePublicViewSet(BaseViewSet):
             issue,
             data=issue_data,
             partial=True,
-            context={"project_id": project_deploy_board.project_id, "allow_triage_state": True},
+            context={"project_id": project_deploy_board.project_id},
         )
 
         if issue_serializer.is_valid():

apps/api/plane/tests/unit/serializers/test_label.py

@@ -1,43 +0,0 @@
-import pytest
-from plane.app.serializers import LabelSerializer
-from plane.db.models import Project, Label
-
-
-@pytest.mark.unit
-class TestLabelSerializer:
-    """Test the LabelSerializer"""
-
-    @pytest.mark.django_db
-    def test_label_serializer_create_valid_data(self, db, workspace):
-        """Test creating a label with valid data"""
-        project = Project.objects.create(
-            name="Test Project", identifier="TEST", workspace=workspace
-        )
-
-        serializer = LabelSerializer(
-            data={"name": "Test Label"},
-            context={"project_id": project.id},
-        )
-        assert serializer.is_valid()
-        assert serializer.errors == {}
-        serializer.save(project_id=project.id)
-
-        label = Label.objects.all().first()
-        assert label.name == "Test Label"
-        assert label.project == project
-        assert label
-
-    @pytest.mark.django_db
-    def test_label_serializer_create_duplicate_name(self, db, workspace):
-        """Test creating a label with a duplicate name"""
-        project = Project.objects.create(
-            name="Test Project", identifier="TEST", workspace=workspace
-        )
-
-        Label.objects.create(name="Test Label", project=project)
-
-        serializer = LabelSerializer(
-            data={"name": "Test Label"}, context={"project_id": project.id}
-        )
-        assert not serializer.is_valid()
-        assert serializer.errors == {"name": ["LABEL_NAME_ALREADY_EXISTS"]}

apps/api/plane/utils/filters/filter_backend.py

@@ -1,16 +1,10 @@
-# Python imports
 import json
 
-# Django imports
+from django.core.exceptions import ValidationError
 from django.db.models import Q
 from django.http import QueryDict
-
-# Third party imports
 from django_filters.utils import translate_validation
 from rest_framework import filters
-from rest_framework.exceptions import ValidationError as DRFValidationError
-
-from plane.utils.exception_logger import log_exception
 
 
 class ComplexFilterBackend(filters.BaseFilterBackend):
@@ -41,12 +35,12 @@ class ComplexFilterBackend(filters.BaseFilterBackend):
 
             normalized = self._normalize_filter_data(filter_string, "filter")
             return self._apply_json_filter(queryset, normalized, view)
-        except DRFValidationError:
+        except ValidationError:
             # Propagate validation errors unchanged
             raise
         except Exception as e:
-            log_exception(e)
-            raise
+            # Convert unexpected errors to ValidationError to keep response consistent
+            raise ValidationError(f"Filter error: {str(e)}")
 
     def _normalize_filter_data(self, raw_filter, source_label):
         """Return a dict from raw filter input or raise a ValidationError.
@@ -59,19 +53,9 @@ class ComplexFilterBackend(filters.BaseFilterBackend):
                 return json.loads(raw_filter)
             if isinstance(raw_filter, dict):
                 return raw_filter
-            raise DRFValidationError(
-                {
-                    "message": f"'{source_label}' must be a dict or a JSON string.",
-                    "code": "invalid_filter_type",
-                }
-            )
+            raise ValidationError(f"'{source_label}' must be a dict or a JSON string.")
         except json.JSONDecodeError:
-            raise DRFValidationError(
-                {
-                    "message": (f"Invalid JSON for '{source_label}'. Expected a valid JSON object."),
-                    "code": "invalid_json",
-                }
-            )
+            raise ValidationError(f"Invalid JSON for '{source_label}'. Expected a valid JSON object.")
 
     def _apply_json_filter(self, queryset, filter_data, view):
         """Process a JSON filter structure using Q object composition."""
@@ -99,12 +83,7 @@ class ComplexFilterBackend(filters.BaseFilterBackend):
         allowed_fields = set(filterset_class.base_filters.keys()) if filterset_class else None
         if not allowed_fields:
             # If no FilterSet is configured, reject filtering to avoid unintended exposure # noqa: E501
-            raise DRFValidationError(
-                {
-                    "message": ("Filtering is not enabled for this endpoint (missing filterset_class)"),
-                    "code": "filtering_not_enabled",
-                }
-            )
+            raise ValidationError("Filtering is not enabled for this endpoint (missing filterset_class)")
 
         # Extract field names from the filter data
         fields = self._extract_field_names(filter_data)
@@ -115,25 +94,7 @@ class ComplexFilterBackend(filters.BaseFilterBackend):
             # Example: 'sequence_id__gte' should be declared in base_filters
             # Special-case __range: require the '<base>__range' filter itself
             if field not in allowed_fields:
-                raise DRFValidationError(
-                    {
-                        "message": f"Filtering on field '{field}' is not allowed",
-                        "code": "invalid_filter_field",
-                    }
-                )
-
-    def _transform_field_name_for_validation(self, field_name):
-        """Hook: Transform a field name before validation.
-
-        Override this in subclasses to handle special field naming conventions.
-
-        Args:
-            field_name: The original field name from the filter data
-
-        Returns:
-            The transformed field name to validate against the FilterSet
-        """
-        return field_name
+                raise ValidationError(f"Filtering on field '{field}' is not allowed")
 
     def _extract_field_names(self, filter_data):
         """Extract all field names from a nested filter structure"""
@@ -151,9 +112,8 @@ class ComplexFilterBackend(filters.BaseFilterBackend):
                         for item in value:
                             fields.extend(self._extract_field_names(item))
                 else:
-                    # This is a field name - apply transformation hook
-                    transformed_field = self._transform_field_name_for_validation(key)
-                    fields.append(transformed_field)
+                    # This is a field name
+                    fields.append(key)
             return fields
         return []
 
@@ -211,23 +171,6 @@ class ComplexFilterBackend(filters.BaseFilterBackend):
         # Leaf dict: evaluate via FilterSet to get a Q object
         return self._build_leaf_q(node, view, queryset)
 
-    def _preprocess_leaf_conditions(self, leaf_conditions, view, queryset):
-        """Hook: Preprocess leaf conditions before building Q object.
-
-        Override this in subclasses to transform filter keys/values.
-        For example, custom property filters might need to be transformed
-        from 'customproperty_<id>__<lookup>' to 'customproperty_value__<lookup>'.
-
-        Args:
-            leaf_conditions: Dict of field filters
-            view: The view instance
-            queryset: The queryset being filtered
-
-        Returns:
-            Dict of transformed field filters
-        """
-        return leaf_conditions
-
     def _build_leaf_q(self, leaf_conditions, view, queryset):
         """Build a Q object from leaf filter conditions using the view's FilterSet.
 
@@ -243,19 +186,11 @@ class ComplexFilterBackend(filters.BaseFilterBackend):
         # Get the filterset class from the view
         filterset_class = getattr(view, "filterset_class", None)
         if not filterset_class:
-            raise DRFValidationError(
-                {
-                    "message": ("Filtering requires a filterset_class to be defined on the view"),
-                    "code": "filterset_missing",
-                }
-            )
-
-        # Apply preprocessing hook
-        processed_conditions = self._preprocess_leaf_conditions(leaf_conditions, view, queryset)
+            raise ValidationError("Filtering requires a filterset_class to be defined on the view")
 
         # Build a QueryDict from the leaf conditions
         qd = QueryDict(mutable=True)
-        for key, value in processed_conditions.items():
+        for key, value in leaf_conditions.items():
             # Default serialization to string; QueryDict expects strings
             if isinstance(value, list):
                 # Repeat key for list values (e.g., __in)
@@ -271,23 +206,11 @@ class ComplexFilterBackend(filters.BaseFilterBackend):
         fs = filterset_class(data=qd, queryset=queryset)
 
         if not fs.is_valid():
-            ve = translate_validation(fs.errors)
-            raise DRFValidationError(
-                {
-                    "message": "Invalid filter parameters",
-                    "code": "invalid_filterset",
-                    "errors": ve.detail,
-                }
-            )
+            raise translate_validation(fs.errors)
 
         # Build and return the combined Q object
         if not hasattr(fs, "build_combined_q"):
-            raise DRFValidationError(
-                {
-                    "message": ("FilterSet must have build_combined_q method for complex filtering"),
-                    "code": "missing_build_combined_q",
-                }
-            )
+            raise ValidationError("FilterSet must have build_combined_q method for complex filtering")
 
         return fs.build_combined_q()
 
@@ -320,69 +243,34 @@ class ComplexFilterBackend(filters.BaseFilterBackend):
         - Depth must not exceed max_depth
         """
         if current_depth > max_depth:
-            raise DRFValidationError(
-                {
-                    "message": (f"Filter nesting is too deep (max {max_depth}); found depth {current_depth}"),
-                    "code": "max_depth_exceeded",
-                }
-            )
+            raise ValidationError(f"Filter nesting is too deep (max {max_depth}); found depth {current_depth}")
 
         if not isinstance(node, dict):
-            raise DRFValidationError(
-                {
-                    "message": "Each filter node must be a JSON object",
-                    "code": "invalid_filter_node",
-                }
-            )
+            raise ValidationError("Each filter node must be a JSON object")
 
         if not node:
-            raise DRFValidationError(
-                {
-                    "message": "Filter objects must not be empty",
-                    "code": "empty_filter_object",
-                }
-            )
+            raise ValidationError("Filter objects must not be empty")
 
         logical_keys = [k for k in node.keys() if isinstance(k, str) and k.lower() in ("or", "and", "not")]
 
         if len(logical_keys) > 1:
-            raise DRFValidationError(
-                {
-                    "message": ("A filter object cannot contain multiple logical operators at the same level"),
-                    "code": "multiple_logical_operators",
-                }
-            )
+            raise ValidationError("A filter object cannot contain multiple logical operators at the same level")
 
         if len(logical_keys) == 1:
             op_key = logical_keys[0]
             # must not mix operator with other keys
             if len(node) != 1:
-                raise DRFValidationError(
-                    {
-                        "message": (f"Cannot mix logical operator '{op_key}' with field keys at the same level"),
-                        "code": "mixed_operator_and_fields",
-                    }
-                )
+                raise ValidationError(f"Cannot mix logical operator '{op_key}' with field keys at the same level")
 
             op = op_key.lower()
             value = node[op_key]
 
             if op in ("or", "and"):
                 if not isinstance(value, list) or len(value) == 0:
-                    raise DRFValidationError(
-                        {
-                            "message": f"'{op}' must be a non-empty list of filter objects",
-                            "code": "invalid_operator_children",
-                        }
-                    )
+                    raise ValidationError(f"'{op}' must be a non-empty list of filter objects")
                 for child in value:
                     if not isinstance(child, dict):
-                        raise DRFValidationError(
-                            {
-                                "message": f"All children of '{op}' must be JSON objects",
-                                "code": "invalid_operator_child_type",
-                            }
-                        )
+                        raise ValidationError(f"All children of '{op}' must be JSON objects")
                     self._validate_structure(
                         child,
                         max_depth=max_depth,
@@ -392,12 +280,7 @@ class ComplexFilterBackend(filters.BaseFilterBackend):
 
             if op == "not":
                 if not isinstance(value, dict):
-                    raise DRFValidationError(
-                        {
-                            "message": "'not' must be a single JSON object",
-                            "code": "invalid_not_child",
-                        }
-                    )
+                    raise ValidationError("'not' must be a single JSON object")
                 self._validate_structure(value, max_depth=max_depth, current_depth=current_depth + 1)
                 return
 
@@ -407,49 +290,24 @@ class ComplexFilterBackend(filters.BaseFilterBackend):
     def _validate_leaf(self, leaf):
         """Validate a leaf dict containing field lookups and values."""
         if not isinstance(leaf, dict) or not leaf:
-            raise DRFValidationError(
-                {
-                    "message": "Leaf filter must be a non-empty JSON object",
-                    "code": "invalid_leaf",
-                }
-            )
+            raise ValidationError("Leaf filter must be a non-empty JSON object")
 
         for key, value in leaf.items():
             if isinstance(key, str) and key.lower() in ("or", "and", "not"):
-                raise DRFValidationError(
-                    {
-                        "message": "Logical operators cannot appear in a leaf filter object",
-                        "code": "operator_in_leaf",
-                    }
-                )
+                raise ValidationError("Logical operators cannot appear in a leaf filter object")
 
             # Lists/Tuples must contain only scalar values
             if isinstance(value, (list, tuple)):
                 if len(value) == 0:
-                    raise DRFValidationError(
-                        {
-                            "message": f"List value for '{key}' must not be empty",
-                            "code": "empty_list_value",
-                        }
-                    )
+                    raise ValidationError(f"List value for '{key}' must not be empty")
                 for item in value:
                     if not self._is_scalar(item):
-                        raise DRFValidationError(
-                            {
-                                "message": f"List value for '{key}' must contain only scalar items",
-                                "code": "non_scalar_list_item",
-                            }
-                        )
+                        raise ValidationError(f"List value for '{key}' must contain only scalar items")
                 continue
 
             # Scalars and None are allowed
             if not self._is_scalar(value):
-                raise DRFValidationError(
-                    {
-                        "message": (f"Value for '{key}' must be a scalar, null, or list/tuple of scalars"),
-                        "code": "invalid_value_type",
-                    }
-                )
+                raise ValidationError(f"Value for '{key}' must be a scalar, null, or list/tuple of scalars")
 
     def _is_scalar(self, value):
         return value is None or isinstance(value, (str, int, float, bool))

apps/space/app/page.tsx

@@ -9,11 +9,6 @@ import { LogoSpinner } from "@/components/common/logo-spinner";
 import { AuthView } from "@/components/views";
 // hooks
 import { useUser } from "@/hooks/store/use-user";
-import type { Route } from "./+types/page";
-
-export const headers: Route.HeadersFunction = () => ({
-  "X-Frame-Options": "SAMEORIGIN",
-});
 
 const HomePage = observer(function HomePage() {
   const { data: currentUser, isAuthenticated, isInitializing } = useUser();

apps/space/app/root.tsx

@@ -1,5 +1,6 @@
 import * as Sentry from "@sentry/react-router";
 import { Links, Meta, Outlet, Scripts } from "react-router";
+import type { HeadersFunction, LinksFunction } from "react-router";
 // assets
 import appleTouchIcon from "@/app/assets/favicon/apple-touch-icon.png?url";
 import favicon16 from "@/app/assets/favicon/favicon-16x16.png?url";
@@ -17,7 +18,7 @@ import { AppProviders } from "./providers";
 const APP_TITLE = "Plane Publish | Make your Plane boards public with one-click";
 const APP_DESCRIPTION = "Plane Publish is a customer feedback management tool built on top of plane.so";
 
-export const links: Route.LinksFunction = () => [
+export const links: LinksFunction = () => [
   { rel: "apple-touch-icon", sizes: "180x180", href: appleTouchIcon },
   { rel: "icon", type: "image/png", sizes: "32x32", href: favicon32 },
   { rel: "icon", type: "image/png", sizes: "16x16", href: favicon16 },
@@ -26,8 +27,9 @@ export const links: Route.LinksFunction = () => [
   { rel: "stylesheet", href: globalStyles },
 ];
 
-export const headers: Route.HeadersFunction = () => ({
+export const headers: HeadersFunction = () => ({
   "Referrer-Policy": "origin-when-cross-origin",
+  "X-Frame-Options": "SAMEORIGIN",
   "X-Content-Type-Options": "nosniff",
   "X-DNS-Prefetch-Control": "on",
   "Strict-Transport-Security": "max-age=31536000; includeSubDomains; preload",

apps/space/ce/components/editor/embeds/index.ts

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

apps/space/ce/components/editor/embeds/mentions/root.tsx

@@ -1,8 +1,6 @@
 // plane editor
 import type { TCallbackMentionComponentProps } from "@plane/editor";
 
-export type TEditorMentionComponentProps = TCallbackMentionComponentProps;
-
-export function EditorAdditionalMentionsRoot(_props: TEditorMentionComponentProps) {
+export function EditorAdditionalMentionsRoot(_props: TCallbackMentionComponentProps) {
   return null;
 }

apps/space/ce/components/editor/index.ts

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

apps/space/core/components/editor/embeds/mentions/root.tsx

@@ -1,10 +1,11 @@
-// plane web imports
-import type { TEditorMentionComponentProps } from "@/plane-web/components/editor/embeds/mentions";
-import { EditorAdditionalMentionsRoot } from "@/plane-web/components/editor/embeds/mentions";
+// plane editor
+import type { TCallbackMentionComponentProps } from "@plane/editor";
+// plane web components
+import { EditorAdditionalMentionsRoot } from "@/plane-web/components/editor";
 // local components
 import { EditorUserMention } from "./user";
 
-export function EditorMentionsRoot(props: TEditorMentionComponentProps) {
+export function EditorMentionsRoot(props: TCallbackMentionComponentProps) {
   const { entity_identifier, entity_name } = props;
 
   switch (entity_name) {

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

@@ -79,23 +79,21 @@ export const LiteTextEditor = React.forwardRef(function LiteTextEditor(
         // overriding the containerClassName to add relative class passed
         containerClassName={cn(containerClassName, "relative")}
       />
-      {editable && (
-        <IssueCommentToolbar
-          executeCommand={(item) => {
-            // TODO: update this while toolbar homogenization
-            // @ts-expect-error type mismatch here
-            editorRef?.executeMenuItemCommand({
-              itemKey: item.itemKey,
-              ...item.extraProps,
-            });
-          }}
-          isSubmitting={isSubmitting}
-          showSubmitButton={showSubmitButton}
-          handleSubmit={(e) => rest.onEnterKeyPress?.(e)}
-          isCommentEmpty={isEmpty}
-          editorRef={editorRef}
-        />
-      )}
+      <IssueCommentToolbar
+        executeCommand={(item) => {
+          // TODO: update this while toolbar homogenization
+          // @ts-expect-error type mismatch here
+          editorRef?.executeMenuItemCommand({
+            itemKey: item.itemKey,
+            ...item.extraProps,
+          });
+        }}
+        isSubmitting={isSubmitting}
+        showSubmitButton={showSubmitButton}
+        handleSubmit={(e) => rest.onEnterKeyPress?.(e)}
+        isCommentEmpty={isEmpty}
+        editorRef={editorRef}
+      />
     </div>
   );
 });

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

@@ -1,47 +1,31 @@
-"use client";
-
 import { observer } from "mobx-react";
 // plane ui
 import { StateGroupIcon } from "@plane/propel/icons";
 import { Tooltip } from "@plane/propel/tooltip";
-import type { TStateGroups } from "@plane/types";
 // plane utils
 import { cn } from "@plane/utils";
 //hooks
 import { useStates } from "@/hooks/store/use-state";
 
 type Props = {
+  stateId: string | undefined;
   shouldShowBorder?: boolean;
-} & (
-  | {
-      stateDetails: {
-        name: string;
-        group: TStateGroups;
-      };
-    }
-  | {
-      stateId: string;
-    }
-);
-
-export const IssueBlockState: React.FC<Props> = observer((props) => {
-  const { shouldShowBorder = true } = props;
-  // store hooks
+};
+export const IssueBlockState = observer(function IssueBlockState({ stateId, shouldShowBorder = true }: Props) {
   const { getStateById } = useStates();
-  // derived values
-  const state = "stateId" in props ? getStateById(props.stateId) : props.stateDetails;
-  if (!state) return null;
+
+  const state = getStateById(stateId);
 
   return (
-    <Tooltip tooltipHeading="State" tooltipContent={state.name}>
+    <Tooltip tooltipHeading="State" tooltipContent={state?.name ?? "State"}>
       <div
         className={cn("flex h-full w-full items-center justify-between gap-1 rounded px-2.5 py-1 text-xs", {
           "border-[0.5px] border-custom-border-300": shouldShowBorder,
         })}
       >
         <div className="flex w-full items-center gap-1.5">
-          <StateGroupIcon stateGroup={state.group} />
-          <div className="text-xs">{state.name}</div>
+          <StateGroupIcon stateGroup={state?.group ?? "backlog"} color={state?.color} />
+          <div className="text-xs">{state?.name ?? "State"}</div>
         </div>
       </div>
     </Tooltip>

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

@@ -96,9 +96,6 @@ export const AddComment = observer(function AddComment(props: Props) {
                 setUploadAssetIds((prev) => [...prev, asset_id]);
                 return asset_id;
               }}
-              displayConfig={{
-                fontSize: "small-font",
-              }}
             />
           )}
         />

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

@@ -42,7 +42,7 @@ export const CommentCard = observer(function CommentCard(props: Props) {
     control,
     formState: { isSubmitting },
     handleSubmit,
-  } = useForm<TIssuePublicComment>({
+  } = useForm<any>({
     defaultValues: { comment_html: comment.comment_html },
   });
 
@@ -120,9 +120,6 @@ export const CommentCard = observer(function CommentCard(props: Props) {
                       const { asset_id } = await uploadCommentAsset(file, anchor, comment.id);
                       return asset_id;
                     }}
-                    displayConfig={{
-                      fontSize: "small-font",
-                    }}
                   />
                 )}
               />

apps/space/ee/components/editor/index.ts

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

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

@@ -2,13 +2,13 @@ import type { FC } from "react";
 import { useState } from "react";
 import { observer } from "mobx-react";
 // plane imports
-import { useParams, usePathname } from "next/navigation";
 import { SIDEBAR_WIDTH } from "@plane/constants";
 import { useLocalStorage } from "@plane/hooks";
 // components
 import { ResizableSidebar } from "@/components/sidebar/resizable-sidebar";
 // hooks
 import { useAppTheme } from "@/hooks/store/use-app-theme";
+import { useAppRail } from "@/hooks/use-app-rail";
 // local imports
 import { ExtendedAppSidebar } from "./extended-sidebar";
 import { AppSidebar } from "./sidebar";
@@ -26,19 +26,14 @@ export const ProjectAppSidebar = observer(function ProjectAppSidebar() {
   const { storedValue, setValue } = useLocalStorage("sidebarWidth", SIDEBAR_WIDTH);
   // states
   const [sidebarWidth, setSidebarWidth] = useState<number>(storedValue ?? SIDEBAR_WIDTH);
-  // routes
-  const { workspaceSlug } = useParams();
-  const pathname = usePathname();
+  // hooks
+  const { shouldRenderAppRail } = useAppRail();
   // derived values
   const isAnyExtendedSidebarOpen = isExtendedSidebarOpened;
 
-  const isNotificationsPath = pathname.includes(`/${workspaceSlug}/notifications`);
-
   // handlers
   const handleWidthChange = (width: number) => setValue(width);
 
-  if (isNotificationsPath) return null;
-
   return (
     <>
       <ResizableSidebar
@@ -60,6 +55,7 @@ export const ProjectAppSidebar = observer(function ProjectAppSidebar() {
         }
         isAnyExtendedSidebarExpanded={isAnyExtendedSidebarOpen}
         isAnySidebarDropdownOpen={isAnySidebarDropdownOpen}
+        disablePeekTrigger={shouldRenderAppRail}
       >
         <AppSidebar />
       </ResizableSidebar>

apps/web/app/(all)/[workspaceSlug]/(projects)/analytics/[tabId]/page.tsx

@@ -1,15 +1,14 @@
-"use client";
-
-import { useState, useEffect } from "react";
+import { useMemo } from "react";
 import { observer } from "mobx-react";
 import { useRouter } from "next/navigation";
 // plane package imports
 import { EUserPermissions, EUserPermissionsLevel, PROJECT_TRACKER_ELEMENTS } from "@plane/constants";
 import { useTranslation } from "@plane/i18n";
 import { EmptyStateDetailed } from "@plane/propel/empty-state";
-import { Tabs } from "@plane/propel/tabs";
+import type { AnalyticsTab } from "@plane/types";
+import { Tabs } from "@plane/ui";
+import type { TabItem } from "@plane/ui";
 // components
-import { cn } from "@plane/utils";
 import AnalyticsFilterActions from "@/components/analytics/analytics-filter-actions";
 import { PageHead } from "@/components/core/page-title";
 // hooks
@@ -18,7 +17,7 @@ import { useCommandPalette } from "@/hooks/store/use-command-palette";
 import { useProject } from "@/hooks/store/use-project";
 import { useWorkspace } from "@/hooks/store/use-workspace";
 import { useUserPermissions } from "@/hooks/store/user";
-import { useAnalyticsTabs } from "@/plane-web/components/analytics/use-analytics-tabs";
+import { getAnalyticsTabs } from "@/plane-web/components/analytics/tabs";
 import type { Route } from "./+types/page";
 
 function AnalyticsPage({ params }: Route.ComponentProps) {
@@ -36,32 +35,31 @@ function AnalyticsPage({ params }: Route.ComponentProps) {
   const { currentWorkspace } = useWorkspace();
   const { allowPermissions } = useUserPermissions();
 
-  const pageTitle = currentWorkspace?.name
-    ? t(`workspace_analytics.page_label`, { workspace: currentWorkspace?.name })
-    : undefined;
-
   // permissions
   const canPerformEmptyStateActions = allowPermissions(
     [EUserPermissions.ADMIN, EUserPermissions.MEMBER],
     EUserPermissionsLevel.WORKSPACE
   );
 
-  const workspaceSlug = params.workspaceSlug;
-  const ANALYTICS_TABS = useAnalyticsTabs(workspaceSlug.toString());
-
-  const [selectedTab, setSelectedTab] = useState(tabId || ANALYTICS_TABS[0]?.key);
-
-  useEffect(() => {
-    if (tabId) {
-      setSelectedTab(tabId);
-    }
-  }, [tabId]);
-
-  // Handle tab change
-  const handleTabChange = (value: string) => {
-    setSelectedTab(value);
-    router.push(`/${currentWorkspace?.slug}/analytics/${value}`);
-  };
+  // derived values
+  const pageTitle = currentWorkspace?.name
+    ? t(`workspace_analytics.page_label`, { workspace: currentWorkspace?.name })
+    : undefined;
+  const ANALYTICS_TABS = useMemo<AnalyticsTab[]>(() => getAnalyticsTabs(t), [t]);
+  const tabs: TabItem[] = useMemo(
+    () =>
+      ANALYTICS_TABS.map((tab) => ({
+        key: tab.key,
+        label: tab.label,
+        content: <tab.content />,
+        onClick: () => {
+          router.push(`/${currentWorkspace?.slug}/analytics/${tab.key}`);
+        },
+        disabled: tab.isDisabled,
+      })),
+    [ANALYTICS_TABS, router, currentWorkspace?.slug]
+  );
+  const defaultTab = tabId;
 
   return (
     <>
@@ -69,43 +67,19 @@ function AnalyticsPage({ params }: Route.ComponentProps) {
       {workspaceProjectIds && (
         <>
           {workspaceProjectIds.length > 0 || loader === "init-loader" ? (
-            <div className="flex h-full overflow-hidden bg-custom-background-100 ">
-              <Tabs value={selectedTab} onValueChange={handleTabChange} className="w-full h-full">
-                <div className={"flex flex-col w-full h-full"}>
-                  <div
-                    className={cn(
-                      "px-6 py-2 border-b border-custom-border-200 flex items-center gap-4 overflow-hidden w-full justify-between"
-                    )}
-                  >
-                    <Tabs.List className={"my-2 overflow-x-auto flex w-fit"}>
-                      {ANALYTICS_TABS.map((tab) => (
-                        <Tabs.Trigger
-                          key={tab.key}
-                          value={tab.key}
-                          disabled={tab.isDisabled}
-                          size="md"
-                          className="px-3"
-                        >
-                          {tab.label}
-                        </Tabs.Trigger>
-                      ))}
-                    </Tabs.List>
-
-                    <div className="flex-shrink-0">
-                      <AnalyticsFilterActions />
-                    </div>
-                  </div>
-                  {ANALYTICS_TABS.map((tab) => (
-                    <Tabs.Content
-                      key={tab.key}
-                      value={tab.key}
-                      className={"h-full overflow-hidden overflow-y-auto px-2"}
-                    >
-                      <tab.content />
-                    </Tabs.Content>
-                  ))}
-                </div>
-              </Tabs>
+            <div className="flex h-full overflow-hidden bg-custom-background-100 justify-between items-center  ">
+              <Tabs
+                tabs={tabs}
+                storageKey={`analytics-page-${currentWorkspace?.id}`}
+                defaultTab={defaultTab}
+                size="md"
+                tabListContainerClassName="px-6 py-2 border-b border-custom-border-200 flex items-center justify-between"
+                tabListClassName="my-2 w-auto"
+                tabClassName="px-3"
+                tabPanelClassName="h-full overflow-hidden overflow-y-auto px-2"
+                storeInLocalStorage={false}
+                actions={<AnalyticsFilterActions />}
+              />
             </div>
           ) : (
             <EmptyStateDetailed

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

@@ -1,59 +1,61 @@
 import { observer } from "mobx-react";
 import { useParams } from "next/navigation";
 // plane imports
-import { Header, Row } from "@plane/ui";
-import { cn } from "@plane/utils";
+import { EProjectFeatureKey } from "@plane/constants";
+import { Breadcrumbs, Header } from "@plane/ui";
 // components
-import { AppHeader } from "@/components/core/app-header";
-import { TabNavigationRoot } from "@/components/navigation";
-import { AppSidebarToggleButton } from "@/components/sidebar/sidebar-toggle-button";
+import { BreadcrumbLink } from "@/components/common/breadcrumb-link";
+import { IssueDetailQuickActions } from "@/components/issues/issue-detail/issue-detail-quick-actions";
 // hooks
-import { useAppTheme } from "@/hooks/store/use-app-theme";
 import { useIssueDetail } from "@/hooks/store/use-issue-detail";
-import { useProjectNavigationPreferences } from "@/hooks/use-navigation-preferences";
-// local components
-import { WorkItemDetailsHeader } from "./work-item-header";
+import { useProject } from "@/hooks/store/use-project";
+import { useAppRouter } from "@/hooks/use-app-router";
+import { CommonProjectBreadcrumbs } from "@/plane-web/components/breadcrumbs/common";
 
-export const ProjectWorkItemDetailsHeader = observer(function ProjectWorkItemDetailsHeader() {
+export const ProjectIssueDetailsHeader = observer(function ProjectIssueDetailsHeader() {
   // router
+  const router = useAppRouter();
   const { workspaceSlug, workItem } = useParams();
   // store hooks
-  const { sidebarCollapsed } = useAppTheme();
+  const { getProjectById, loader } = useProject();
   const {
     issue: { getIssueById, getIssueIdByIdentifier },
   } = useIssueDetail();
   // derived values
   const issueId = getIssueIdByIdentifier(workItem?.toString());
-  const issueDetails = issueId ? getIssueById(issueId?.toString()) : undefined;
-  // preferences
-  const { preferences: projectPreferences } = useProjectNavigationPreferences();
+  const issueDetails = issueId ? getIssueById(issueId.toString()) : undefined;
+  const projectId = issueDetails ? issueDetails?.project_id : undefined;
+  const projectDetails = projectId ? getProjectById(projectId?.toString()) : undefined;
+
+  if (!workspaceSlug || !projectId || !issueId) return null;
 
   return (
-    <>
-      {projectPreferences.navigationMode === "horizontal" && (
-        <div className="z-20">
-          <Row className="h-header flex gap-2 w-full items-center border-b border-custom-border-200 bg-custom-sidebar-background-100">
-            <div className="flex items-center gap-2 divide-x divide-custom-border-100 h-full w-full">
-              <div className="flex items-center gap-2 size-full flex-1">
-                {sidebarCollapsed && (
-                  <div className="shrink-0">
-                    <AppSidebarToggleButton />
-                  </div>
-                )}
-                <Header className={cn("h-full", { "pl-1.5": !sidebarCollapsed })}>
-                  <Header.LeftItem className="h-full max-w-full">
-                    <TabNavigationRoot
-                      workspaceSlug={workspaceSlug}
-                      projectId={issueDetails?.project_id?.toString() ?? ""}
-                    />
-                  </Header.LeftItem>
-                </Header>
-              </div>
-            </div>
-          </Row>
-        </div>
-      )}
-      <AppHeader header={<WorkItemDetailsHeader />} />
-    </>
+    <Header>
+      <Header.LeftItem>
+        <Breadcrumbs onBack={router.back} isLoading={loader === "init-loader"}>
+          <CommonProjectBreadcrumbs
+            workspaceSlug={workspaceSlug?.toString()}
+            projectId={projectId?.toString()}
+            featureKey={EProjectFeatureKey.WORK_ITEMS}
+          />
+          <Breadcrumbs.Item
+            component={
+              <BreadcrumbLink
+                label={projectDetails && issueDetails ? `${projectDetails.identifier}-${issueDetails.sequence_id}` : ""}
+              />
+            }
+          />
+        </Breadcrumbs>
+      </Header.LeftItem>
+      <Header.RightItem>
+        {projectId && issueId && (
+          <IssueDetailQuickActions
+            workspaceSlug={workspaceSlug?.toString()}
+            projectId={projectId?.toString()}
+            issueId={issueId?.toString()}
+          />
+        )}
+      </Header.RightItem>
+    </Header>
   );
 });

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

@@ -1,12 +1,13 @@
 // components
 import { Outlet } from "react-router";
+import { AppHeader } from "@/components/core/app-header";
 import { ContentWrapper } from "@/components/core/content-wrapper";
-import { ProjectWorkItemDetailsHeader } from "./header";
+import { ProjectIssueDetailsHeader } from "./header";
 
 export default function ProjectIssueDetailsLayout() {
   return (
     <>
-      <ProjectWorkItemDetailsHeader />
+      <AppHeader header={<ProjectIssueDetailsHeader />} />
       <ContentWrapper className="overflow-hidden">
         <Outlet />
       </ContentWrapper>

apps/web/app/(all)/[workspaceSlug]/(projects)/browse/[workItem]/work-item-header.tsx

@@ -1,69 +0,0 @@
-"use client";
-
-import React from "react";
-import { observer } from "mobx-react";
-import { useParams } from "next/navigation";
-// plane ui
-import { WorkItemsIcon } 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";
-// hooks
-import { useIssueDetail } from "@/hooks/store/use-issue-detail";
-import { useProject } from "@/hooks/store/use-project";
-import { useAppRouter } from "@/hooks/use-app-router";
-// plane web imports
-import { CommonProjectBreadcrumbs } from "@/plane-web/components/breadcrumbs/common";
-
-export const WorkItemDetailsHeader = observer(() => {
-  // router
-  const router = useAppRouter();
-  const { workspaceSlug, workItem } = useParams();
-  // store hooks
-  const { getProjectById, loader } = useProject();
-  const {
-    issue: { getIssueById, getIssueIdByIdentifier },
-  } = useIssueDetail();
-  // derived values
-  const issueId = getIssueIdByIdentifier(workItem?.toString());
-  const issueDetails = issueId ? getIssueById(issueId.toString()) : undefined;
-  const projectId = issueDetails ? issueDetails?.project_id : undefined;
-  const projectDetails = projectId ? getProjectById(projectId?.toString()) : undefined;
-
-  if (!workspaceSlug || !projectId || !issueId) return null;
-  return (
-    <Header>
-      <Header.LeftItem>
-        <Breadcrumbs onBack={router.back} isLoading={loader === "init-loader"}>
-          <CommonProjectBreadcrumbs workspaceSlug={workspaceSlug?.toString()} projectId={projectId?.toString()} />
-          <Breadcrumbs.Item
-            component={
-              <BreadcrumbLink
-                label="Work Items"
-                href={`/${workspaceSlug}/projects/${projectId}/issues/`}
-                icon={<WorkItemsIcon className="h-4 w-4 text-custom-text-300" />}
-              />
-            }
-          />
-          <Breadcrumbs.Item
-            component={
-              <BreadcrumbLink
-                label={projectDetails && issueDetails ? `${projectDetails.identifier}-${issueDetails.sequence_id}` : ""}
-              />
-            }
-          />
-        </Breadcrumbs>
-      </Header.LeftItem>
-      <Header.RightItem>
-        {projectId && issueId && (
-          <IssueDetailQuickActions
-            workspaceSlug={workspaceSlug?.toString()}
-            projectId={projectId?.toString()}
-            issueId={issueId?.toString()}
-          />
-        )}
-      </Header.RightItem>
-    </Header>
-  );
-});

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

@@ -1,11 +1,10 @@
-import { useCallback, useRef, useState } from "react";
+import React, { useRef, useState } from "react";
 import { observer } from "mobx-react";
 import { useParams } from "next/navigation";
 // plane imports
 import { Plus, Search } from "lucide-react";
 import { EUserPermissions, EUserPermissionsLevel, PROJECT_TRACKER_ELEMENTS } from "@plane/constants";
 import { useTranslation } from "@plane/i18n";
-import { EmptyStateCompact } from "@plane/propel/empty-state";
 import { TOAST_TYPE, setToast } from "@plane/propel/toast";
 import { Tooltip } from "@plane/propel/tooltip";
 import { copyUrlToClipboard, orderJoinedProjects } from "@plane/utils";
@@ -76,7 +75,7 @@ export const ExtendedProjectSidebar = observer(function ExtendedProjectSidebar()
     EUserPermissionsLevel.WORKSPACE
   );
 
-  const handleClose = useCallback(() => toggleExtendedProjectSidebar(false), [toggleExtendedProjectSidebar]);
+  const handleClose = () => toggleExtendedProjectSidebar(false);
 
   const handleCopyText = (projectId: string) => {
     copyUrlToClipboard(`${workspaceSlug}/projects/${projectId}/issues`).then(() => {
@@ -102,9 +101,8 @@ export const ExtendedProjectSidebar = observer(function ExtendedProjectSidebar()
         extendedSidebarRef={extendedProjectSidebarRef}
         handleClose={handleClose}
         excludedElementId="extended-project-sidebar-toggle"
-        className="px-0"
       >
-        <div className="flex flex-col gap-1 w-full sticky top-4 px-4">
+        <div className="flex flex-col gap-1 w-full sticky top-4 pt-0 px-4">
           <div className="flex items-center justify-between">
             <span className="text-sm font-semibold text-custom-text-300 py-1.5">Projects</span>
             {isAuthorizedUser && (
@@ -112,7 +110,7 @@ export const ExtendedProjectSidebar = observer(function ExtendedProjectSidebar()
                 <button
                   type="button"
                   data-ph-element={PROJECT_TRACKER_ELEMENTS.EXTENDED_SIDEBAR_ADD_BUTTON}
-                  className="p-0.5 rounded hover:bg-custom-sidebar-background-80 flex-shrink-0 text-custom-text-300 hover:text-custom-text-200 transition-colors"
+                  className="p-0.5 rounded hover:bg-custom-sidebar-background-80 flex-shrink-0"
                   onClick={() => {
                     setIsProjectModalOpen(true);
                   }}
@@ -133,33 +131,21 @@ export const ExtendedProjectSidebar = observer(function ExtendedProjectSidebar()
             />
           </div>
         </div>
-        {filteredProjects.length === 0 ? (
-          <div className="flex flex-col items-center mt-4 p-10">
-            <EmptyStateCompact
-              title={t("common_empty_state.search.title")}
-              description={t("common_empty_state.search.description")}
-              assetKey="search"
-              assetClassName="size-20"
-              align="center"
+        <div className="flex flex-col gap-0.5 overflow-x-hidden overflow-y-auto vertical-scrollbar scrollbar-sm flex-grow mt-4 px-4">
+          {filteredProjects.map((projectId, index) => (
+            <SidebarProjectsListItem
+              key={projectId}
+              projectId={projectId}
+              handleCopyText={() => handleCopyText(projectId)}
+              projectListType={"JOINED"}
+              disableDrag={false}
+              disableDrop={false}
+              isLastChild={index === joinedProjects.length - 1}
+              handleOnProjectDrop={handleOnProjectDrop}
+              renderInExtendedSidebar
             />
-          </div>
-        ) : (
-          <div className="flex flex-col gap-0.5 overflow-x-hidden overflow-y-auto vertical-scrollbar scrollbar-sm flex-grow mt-4 pl-9 pr-2">
-            {filteredProjects.map((projectId, index) => (
-              <SidebarProjectsListItem
-                key={projectId}
-                projectId={projectId}
-                handleCopyText={() => handleCopyText(projectId)}
-                projectListType={"JOINED"}
-                disableDrag={false}
-                disableDrop={false}
-                isLastChild={index === filteredProjects.length - 1}
-                handleOnProjectDrop={handleOnProjectDrop}
-                renderInExtendedSidebar
-              />
-            ))}
-          </div>
-        )}
+          ))}
+        </div>
       </ExtendedSidebarWrapper>
     </>
   );

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

@@ -1,16 +1,14 @@
-import React, { useEffect } from "react";
+import type { FC } from "react";
+import React from "react";
 import { observer } from "mobx-react";
 // plane imports
 import { EXTENDED_SIDEBAR_WIDTH, SIDEBAR_WIDTH } from "@plane/constants";
 import { useLocalStorage } from "@plane/hooks";
 import { cn } from "@plane/utils";
 // hooks
-import { useAppTheme } from "@/hooks/store/use-app-theme";
-// hooks
 import useExtendedSidebarOutsideClickDetector from "@/hooks/use-extended-sidebar-overview-outside-click";
 
 type Props = {
-  className?: string;
   children: React.ReactNode;
   extendedSidebarRef: React.RefObject<HTMLDivElement>;
   isExtendedSidebarOpened: boolean;
@@ -19,35 +17,26 @@ type Props = {
 };
 
 export const ExtendedSidebarWrapper = observer(function ExtendedSidebarWrapper(props: Props) {
-  const { className, children, extendedSidebarRef, isExtendedSidebarOpened, handleClose, excludedElementId } = props;
+  const { children, extendedSidebarRef, isExtendedSidebarOpened, handleClose, excludedElementId } = props;
   // store hooks
-  const { sidebarCollapsed } = useAppTheme();
-  // local storage
   const { storedValue } = useLocalStorage("sidebarWidth", SIDEBAR_WIDTH);
 
   useExtendedSidebarOutsideClickDetector(extendedSidebarRef, handleClose, excludedElementId);
 
-  useEffect(() => {
-    if (sidebarCollapsed) {
-      handleClose();
-    }
-  }, [sidebarCollapsed, handleClose]);
-
   return (
     <div
       id={excludedElementId}
       ref={extendedSidebarRef}
       className={cn(
-        "absolute h-full z-[21] flex flex-col py-2 transform transition-all duration-300 ease-in-out bg-custom-sidebar-background-100 border-r border-custom-sidebar-border-200 p-4 shadow-sm",
+        `absolute h-full z-[19] flex flex-col py-2 transform transition-all duration-300 ease-in-out bg-custom-sidebar-background-100 border-r border-custom-sidebar-border-200 p-4 shadow-sm`,
         {
-          "opacity-100": isExtendedSidebarOpened,
-          "opacity-0 hidden": !isExtendedSidebarOpened,
-        },
-        className
+          "translate-x-0 opacity-100": isExtendedSidebarOpened,
+          [`-translate-x-[${EXTENDED_SIDEBAR_WIDTH}px] opacity-0 hidden`]: !isExtendedSidebarOpened,
+        }
       )}
       style={{
         left: `${storedValue ?? SIDEBAR_WIDTH}px`,
-        width: `${EXTENDED_SIDEBAR_WIDTH}px`,
+        width: `${isExtendedSidebarOpened ? EXTENDED_SIDEBAR_WIDTH : 0}px`,
       }}
     >
       {children}

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

@@ -1,13 +1,12 @@
-import { useCallback, useMemo, useRef } from "react";
+import React, { useMemo, useRef } from "react";
 import { observer } from "mobx-react";
 import { useParams } from "next/navigation";
 // plane imports
-import { WORKSPACE_SIDEBAR_DYNAMIC_NAVIGATION_ITEMS_LINKS, EUserPermissionsLevel } from "@plane/constants";
+import { WORKSPACE_SIDEBAR_DYNAMIC_NAVIGATION_ITEMS_LINKS } from "@plane/constants";
 import type { EUserWorkspaceRoles } from "@plane/types";
 // hooks
 import { useAppTheme } from "@/hooks/store/use-app-theme";
-import { useUserPermissions } from "@/hooks/store/user";
-import { useWorkspaceNavigationPreferences } from "@/hooks/use-navigation-preferences";
+import { useWorkspace } from "@/hooks/store/use-workspace";
 // plane-web imports
 import { ExtendedSidebarItem } from "@/plane-web/components/workspace/sidebar/extended-sidebar-item";
 import { ExtendedSidebarWrapper } from "./extended-sidebar-wrapper";
@@ -19,38 +18,22 @@ export const ExtendedAppSidebar = observer(function ExtendedAppSidebar() {
   const { workspaceSlug } = useParams();
   // store hooks
   const { isExtendedSidebarOpened, toggleExtendedSidebar } = useAppTheme();
-  const { allowPermissions } = useUserPermissions();
-  const { preferences: workspacePreferences, updateWorkspaceItemSortOrder } = useWorkspaceNavigationPreferences();
+  const { updateSidebarPreference, getNavigationPreferences } = useWorkspace();
 
   // derived values
-  const currentWorkspaceNavigationPreferences = workspacePreferences.items;
+  const currentWorkspaceNavigationPreferences = getNavigationPreferences(workspaceSlug.toString());
 
-  const sortedNavigationItems = useMemo(() => {
-    const slug = workspaceSlug.toString();
-
-    return WORKSPACE_SIDEBAR_DYNAMIC_NAVIGATION_ITEMS_LINKS.filter((item) => {
-      // Permission check
-      const hasPermission = allowPermissions(item.access, EUserPermissionsLevel.WORKSPACE, slug);
-
-      return hasPermission;
-    })
-      .map((item) => {
+  const sortedNavigationItems = useMemo(
+    () =>
+      WORKSPACE_SIDEBAR_DYNAMIC_NAVIGATION_ITEMS_LINKS.map((item) => {
         const preference = currentWorkspaceNavigationPreferences?.[item.key];
         return {
           ...item,
-          sort_order: preference?.sort_order ?? 0,
-          is_pinned: preference?.is_pinned ?? false,
+          sort_order: preference ? preference.sort_order : 0,
         };
-      })
-      .sort((a, b) => {
-        // First sort by pinned status (pinned items first)
-        if (a.is_pinned !== b.is_pinned) {
-          return b.is_pinned ? 1 : -1;
-        }
-        // Then sort by sort_order within each group
-        return a.sort_order - b.sort_order;
-      });
-  }, [workspaceSlug, currentWorkspaceNavigationPreferences, allowPermissions]);
+      }).sort((a, b) => a.sort_order - b.sort_order),
+    [currentWorkspaceNavigationPreferences]
+  );
 
   const sortedNavigationItemsKeys = sortedNavigationItems.map((item) => item.key);
 
@@ -104,10 +87,13 @@ export const ExtendedAppSidebar = observer(function ExtendedAppSidebar() {
 
     const updatedSortOrder = orderNavigationItem(sourceIndex, destinationIndex, sortedNavigationItems);
 
-    if (updatedSortOrder != undefined) updateWorkspaceItemSortOrder(sourceId, updatedSortOrder);
+    if (updatedSortOrder != undefined)
+      updateSidebarPreference(workspaceSlug.toString(), sourceId, {
+        sort_order: updatedSortOrder,
+      });
   };
 
-  const handleClose = useCallback(() => toggleExtendedSidebar(false), [toggleExtendedSidebar]);
+  const handleClose = () => toggleExtendedSidebar(false);
 
   return (
     <ExtendedSidebarWrapper

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

@@ -3,7 +3,6 @@ import { Outlet } from "react-router";
 import { ProjectsAppPowerKProvider } from "@/components/power-k/projects-app-provider";
 // plane web components
 import { ProjectAppSidebar } from "./_sidebar";
-import { ExtendedProjectSidebar } from "./extended-project-sidebar";
 
 function WorkspaceLayout() {
   return (
@@ -13,7 +12,6 @@ function WorkspaceLayout() {
         <div id="full-screen-portal" className="inset-0 absolute w-full" />
         <div className="relative flex size-full overflow-hidden">
           <ProjectAppSidebar />
-          <ExtendedProjectSidebar />
           <main className="relative flex h-full w-full flex-col overflow-hidden bg-custom-background-100">
             <Outlet />
           </main>

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

@@ -1,3 +1,4 @@
+import type { FC } from "react";
 import { observer } from "mobx-react";
 import { useParams } from "next/navigation";
 import { ArchiveIcon, CycleIcon, ModuleIcon, WorkItemsIcon } from "@plane/propel/icons";
@@ -12,8 +13,8 @@ import { useIssues } from "@/hooks/store/use-issues";
 import { useProject } from "@/hooks/store/use-project";
 import { useAppRouter } from "@/hooks/use-app-router";
 import { usePlatformOS } from "@/hooks/use-platform-os";
-// plane web imports
-import { CommonProjectBreadcrumbs } from "@/plane-web/components/breadcrumbs/common";
+// plane web
+import { ProjectBreadcrumb } from "@/plane-web/components/breadcrumbs/project";
 
 type TProps = {
   activeTab: "issues" | "cycles" | "modules";
@@ -66,7 +67,7 @@ export const ProjectArchivesHeader = observer(function ProjectArchivesHeader(pro
       <Header.LeftItem>
         <div className="flex items-center gap-2.5">
           <Breadcrumbs onBack={router.back} isLoading={loader === "init-loader"}>
-            <CommonProjectBreadcrumbs workspaceSlug={workspaceSlug?.toString()} projectId={projectId?.toString()} />
+            <ProjectBreadcrumb workspaceSlug={workspaceSlug?.toString()} projectId={projectId?.toString()} />
             <Breadcrumbs.Item
               component={
                 <BreadcrumbLink

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

@@ -8,6 +8,7 @@ import {
   EIssueFilterType,
   EUserPermissions,
   EUserPermissionsLevel,
+  EProjectFeatureKey,
   ISSUE_DISPLAY_FILTERS_BY_PAGE,
   WORK_ITEM_TRACKER_ELEMENTS,
 } from "@plane/constants";
@@ -22,7 +23,6 @@ import { Breadcrumbs, BreadcrumbNavigationSearchDropdown, Header } from "@plane/
 import { cn } from "@plane/utils";
 // components
 import { WorkItemsModal } from "@/components/analytics/work-items/modal";
-import { BreadcrumbLink } from "@/components/common/breadcrumb-link";
 import { SwitcherLabel } from "@/components/common/switcher-label";
 import { CycleQuickActions } from "@/components/cycles/quick-actions";
 import {
@@ -135,15 +135,10 @@ export const CycleIssuesHeader = observer(function CycleIssuesHeader() {
         <Header.LeftItem>
           <div className="flex items-center gap-2">
             <Breadcrumbs onBack={router.back} isLoading={loader === "init-loader"}>
-              <CommonProjectBreadcrumbs workspaceSlug={workspaceSlug?.toString()} projectId={projectId?.toString()} />
-              <Breadcrumbs.Item
-                component={
-                  <BreadcrumbLink
-                    label="Cycles"
-                    href={`/${workspaceSlug}/projects/${projectId}/cycles/`}
-                    icon={<CycleIcon className="h-4 w-4 text-custom-text-300" />}
-                  />
-                }
+              <CommonProjectBreadcrumbs
+                workspaceSlug={workspaceSlug?.toString()}
+                projectId={projectId?.toString()}
+                featureKey={EProjectFeatureKey.CYCLES}
               />
               <Breadcrumbs.Item
                 component={

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

@@ -1,26 +1,26 @@
+import type { FC } from "react";
 import { observer } from "mobx-react";
 import { useParams } from "next/navigation";
 // ui
-import { EUserPermissions, EUserPermissionsLevel, CYCLE_TRACKER_ELEMENTS } from "@plane/constants";
+import { EProjectFeatureKey, EUserPermissions, EUserPermissionsLevel, CYCLE_TRACKER_ELEMENTS } from "@plane/constants";
 import { useTranslation } from "@plane/i18n";
 import { Button } from "@plane/propel/button";
-import { CycleIcon } from "@plane/propel/icons";
 import { Breadcrumbs, Header } from "@plane/ui";
 // components
-import { BreadcrumbLink } from "@/components/common/breadcrumb-link";
 import { CyclesViewHeader } from "@/components/cycles/cycles-view-header";
 // hooks
 import { useCommandPalette } from "@/hooks/store/use-command-palette";
 import { useProject } from "@/hooks/store/use-project";
 import { useUserPermissions } from "@/hooks/store/user";
 import { useAppRouter } from "@/hooks/use-app-router";
-// plane web imports
+// plane web
 import { CommonProjectBreadcrumbs } from "@/plane-web/components/breadcrumbs/common";
+// constants
 
 export const CyclesListHeader = observer(function CyclesListHeader() {
   // router
   const router = useAppRouter();
-  const { workspaceSlug, projectId } = useParams();
+  const { workspaceSlug } = useParams();
 
   // store hooks
   const { toggleCreateCycleModal } = useCommandPalette();
@@ -37,16 +37,10 @@ export const CyclesListHeader = observer(function CyclesListHeader() {
     <Header>
       <Header.LeftItem>
         <Breadcrumbs onBack={router.back} isLoading={loader === "init-loader"}>
-          <CommonProjectBreadcrumbs workspaceSlug={workspaceSlug?.toString()} projectId={projectId?.toString()} />
-          <Breadcrumbs.Item
-            component={
-              <BreadcrumbLink
-                label="Cycles"
-                href={`/${workspaceSlug}/projects/${currentProjectDetails?.id}/cycles/`}
-                icon={<CycleIcon className="h-4 w-4 text-custom-text-300" />}
-                isLast
-              />
-            }
+          <CommonProjectBreadcrumbs
+            workspaceSlug={workspaceSlug?.toString()}
+            projectId={currentProjectDetails?.id ?? ""}
+            featureKey={EProjectFeatureKey.CYCLES}
             isLast
           />
         </Breadcrumbs>

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

@@ -1,52 +0,0 @@
-"use client";
-
-import { observer } from "mobx-react";
-import { Outlet } from "react-router";
-// plane imports
-import { Header, Row } from "@plane/ui";
-import { cn } from "@plane/utils";
-// components
-import { TabNavigationRoot } from "@/components/navigation/tab-navigation-root";
-import { AppSidebarToggleButton } from "@/components/sidebar/sidebar-toggle-button";
-// hooks
-import { useAppTheme } from "@/hooks/store/use-app-theme";
-import { useProjectNavigationPreferences } from "@/hooks/use-navigation-preferences";
-// local imports
-import type { Route } from "./+types/layout";
-
-function ProjectLayout({ params }: Route.ComponentProps) {
-  // router
-  const { workspaceSlug, projectId } = params;
-  // store hooks
-  const { sidebarCollapsed } = useAppTheme();
-  // preferences
-  const { preferences: projectPreferences } = useProjectNavigationPreferences();
-
-  return (
-    <>
-      {projectPreferences.navigationMode === "horizontal" && (
-        <div className="z-20">
-          <Row className="h-header flex gap-2 w-full items-center border-b border-custom-border-200 bg-custom-sidebar-background-100">
-            <div className="flex items-center gap-2 divide-x divide-custom-border-100 h-full w-full">
-              <div className="flex items-center gap-2 size-full flex-1">
-                {sidebarCollapsed && (
-                  <div className="shrink-0">
-                    <AppSidebarToggleButton />
-                  </div>
-                )}
-                <Header className={cn("h-full", { "pl-1.5": !sidebarCollapsed })}>
-                  <Header.LeftItem className="h-full max-w-full flex items-center gap-2">
-                    <TabNavigationRoot workspaceSlug={workspaceSlug} projectId={projectId} />
-                  </Header.LeftItem>
-                </Header>
-              </div>
-            </div>
-          </Row>
-        </div>
-      )}
-      <Outlet />
-    </>
-  );
-}
-
-export default observer(ProjectLayout);

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

@@ -9,6 +9,7 @@ import {
   ISSUE_DISPLAY_FILTERS_BY_PAGE,
   EUserPermissions,
   EUserPermissionsLevel,
+  EProjectFeatureKey,
   WORK_ITEM_TRACKER_ELEMENTS,
 } from "@plane/constants";
 import { Button } from "@plane/propel/button";
@@ -20,7 +21,6 @@ import { Breadcrumbs, Header, BreadcrumbNavigationSearchDropdown } from "@plane/
 import { cn } from "@plane/utils";
 // components
 import { WorkItemsModal } from "@/components/analytics/work-items/modal";
-import { BreadcrumbLink } from "@/components/common/breadcrumb-link";
 import { SwitcherLabel } from "@/components/common/switcher-label";
 import {
   DisplayFiltersSelection,
@@ -40,7 +40,7 @@ import { useAppRouter } from "@/hooks/use-app-router";
 import { useIssuesActions } from "@/hooks/use-issues-actions";
 import useLocalStorage from "@/hooks/use-local-storage";
 import { usePlatformOS } from "@/hooks/use-platform-os";
-// plane web imports
+// plane web
 import { CommonProjectBreadcrumbs } from "@/plane-web/components/breadcrumbs/common";
 
 export const ModuleIssuesHeader = observer(function ModuleIssuesHeader() {
@@ -128,17 +128,10 @@ export const ModuleIssuesHeader = observer(function ModuleIssuesHeader() {
         <Header.LeftItem>
           <div className="flex items-center gap-2">
             <Breadcrumbs onBack={router.back} isLoading={loader === "init-loader"}>
-              <CommonProjectBreadcrumbs workspaceSlug={workspaceSlug?.toString()} projectId={projectId?.toString()} />
-              <Breadcrumbs.Item
-                component={
-                  <BreadcrumbLink
-                    label="Modules"
-                    href={`/${workspaceSlug}/projects/${projectId}/modules/`}
-                    icon={<ModuleIcon className="h-4 w-4 text-custom-text-300" />}
-                    isLast
-                  />
-                }
-                isLast
+              <CommonProjectBreadcrumbs
+                workspaceSlug={workspaceSlug?.toString() ?? ""}
+                projectId={projectId?.toString() ?? ""}
+                featureKey={EProjectFeatureKey.MODULES}
               />
               <Breadcrumbs.Item
                 component={

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

@@ -1,22 +1,21 @@
 import { observer } from "mobx-react";
 import { useParams } from "next/navigation";
 // plane imports
-import { EUserPermissions, EUserPermissionsLevel, MODULE_TRACKER_ELEMENTS } from "@plane/constants";
+import { EProjectFeatureKey, EUserPermissions, EUserPermissionsLevel, MODULE_TRACKER_ELEMENTS } from "@plane/constants";
 import { useTranslation } from "@plane/i18n";
 // ui
 import { Button } from "@plane/propel/button";
-import { ModuleIcon } from "@plane/propel/icons";
 import { Breadcrumbs, Header } from "@plane/ui";
 // components
-import { BreadcrumbLink } from "@/components/common/breadcrumb-link";
 import { ModuleViewHeader } from "@/components/modules";
 // hooks
 import { useCommandPalette } from "@/hooks/store/use-command-palette";
 import { useProject } from "@/hooks/store/use-project";
 import { useUserPermissions } from "@/hooks/store/user";
 import { useAppRouter } from "@/hooks/use-app-router";
-// plane web imports
+// plane web
 import { CommonProjectBreadcrumbs } from "@/plane-web/components/breadcrumbs/common";
+// constants
 
 export const ModulesListHeader = observer(function ModulesListHeader() {
   // router
@@ -41,16 +40,10 @@ export const ModulesListHeader = observer(function ModulesListHeader() {
       <Header.LeftItem>
         <div>
           <Breadcrumbs onBack={router.back} isLoading={loader === "init-loader"}>
-            <CommonProjectBreadcrumbs workspaceSlug={workspaceSlug?.toString()} projectId={projectId?.toString()} />
-            <Breadcrumbs.Item
-              component={
-                <BreadcrumbLink
-                  label="Modules"
-                  href={`/${workspaceSlug}/projects/${projectId}/modules/`}
-                  icon={<ModuleIcon className="h-4 w-4 text-custom-text-300" />}
-                  isLast
-                />
-              }
+            <CommonProjectBreadcrumbs
+              workspaceSlug={workspaceSlug?.toString() ?? ""}
+              projectId={projectId?.toString() ?? ""}
+              featureKey={EProjectFeatureKey.MODULES}
               isLast
             />
           </Breadcrumbs>

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

@@ -1,21 +1,24 @@
 import { observer } from "mobx-react";
 import { useParams } from "next/navigation";
-// plane imports
+import { EProjectFeatureKey } from "@plane/constants";
 import { PageIcon } from "@plane/propel/icons";
+// types
 import type { ICustomSearchSelectOption } from "@plane/types";
+// ui
 import { Breadcrumbs, Header, BreadcrumbNavigationSearchDropdown } from "@plane/ui";
-import { getPageName } from "@plane/utils";
 // components
-import { BreadcrumbLink } from "@/components/common/breadcrumb-link";
+import { getPageName } from "@plane/utils";
 import { PageAccessIcon } from "@/components/common/page-access-icon";
 import { SwitcherIcon, SwitcherLabel } from "@/components/common/switcher-label";
 import { PageHeaderActions } from "@/components/pages/header/actions";
+// helpers
 // hooks
 import { useProject } from "@/hooks/store/use-project";
+// plane web components
 import { useAppRouter } from "@/hooks/use-app-router";
-// plane web imports
 import { CommonProjectBreadcrumbs } from "@/plane-web/components/breadcrumbs/common";
 import { PageDetailsHeaderExtraActions } from "@/plane-web/components/pages";
+// plane web hooks
 import { EPageStoreType, usePage, usePageStore } from "@/plane-web/hooks/store";
 
 export interface IPagesHeaderProps {
@@ -62,15 +65,10 @@ export const PageDetailsHeader = observer(function PageDetailsHeader() {
       <Header.LeftItem>
         <div>
           <Breadcrumbs isLoading={loader === "init-loader"}>
-            <CommonProjectBreadcrumbs workspaceSlug={workspaceSlug?.toString()} projectId={projectId?.toString()} />
-            <Breadcrumbs.Item
-              component={
-                <BreadcrumbLink
-                  label="Pages"
-                  href={`/${workspaceSlug}/projects/${projectId}/pages/`}
-                  icon={<PageIcon className="h-4 w-4 text-custom-text-300" />}
-                />
-              }
+            <CommonProjectBreadcrumbs
+              workspaceSlug={workspaceSlug?.toString()}
+              projectId={projectId?.toString()}
+              featureKey={EProjectFeatureKey.PAGES}
             />
 
             <Breadcrumbs.Item

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

@@ -2,21 +2,25 @@ import { useState } from "react";
 import { observer } from "mobx-react";
 import { useParams, useRouter, useSearchParams } from "next/navigation";
 // constants
-import { EPageAccess, PROJECT_PAGE_TRACKER_EVENTS, PROJECT_TRACKER_ELEMENTS } from "@plane/constants";
+import {
+  EPageAccess,
+  EProjectFeatureKey,
+  PROJECT_PAGE_TRACKER_EVENTS,
+  PROJECT_TRACKER_ELEMENTS,
+} from "@plane/constants";
 // plane types
 import { Button } from "@plane/propel/button";
-import { PageIcon } from "@plane/propel/icons";
 import { TOAST_TYPE, setToast } from "@plane/propel/toast";
 import type { TPage } from "@plane/types";
 // plane ui
 import { Breadcrumbs, Header } from "@plane/ui";
 // helpers
-import { BreadcrumbLink } from "@/components/common/breadcrumb-link";
 import { captureError, captureSuccess } from "@/helpers/event-tracker.helper";
 // hooks
 import { useProject } from "@/hooks/store/use-project";
-// plane web imports
+// plane web
 import { CommonProjectBreadcrumbs } from "@/plane-web/components/breadcrumbs/common";
+// plane web hooks
 import { EPageStoreType, usePageStore } from "@/plane-web/hooks/store";
 
 export const PagesListHeader = observer(function PagesListHeader() {
@@ -24,7 +28,7 @@ export const PagesListHeader = observer(function PagesListHeader() {
   const [isCreatingPage, setIsCreatingPage] = useState(false);
   // router
   const router = useRouter();
-  const { workspaceSlug, projectId } = useParams();
+  const { workspaceSlug } = useParams();
   const searchParams = useSearchParams();
   const pageType = searchParams.get("type");
   // store hooks
@@ -70,16 +74,10 @@ export const PagesListHeader = observer(function PagesListHeader() {
     <Header>
       <Header.LeftItem>
         <Breadcrumbs isLoading={loader === "init-loader"}>
-          <CommonProjectBreadcrumbs workspaceSlug={workspaceSlug?.toString()} projectId={projectId?.toString()} />
-          <Breadcrumbs.Item
-            component={
-              <BreadcrumbLink
-                label="Pages"
-                href={`/${workspaceSlug}/projects/${currentProjectDetails?.id}/pages/`}
-                icon={<PageIcon className="h-4 w-4 text-custom-text-300" />}
-                isLast
-              />
-            }
+          <CommonProjectBreadcrumbs
+            workspaceSlug={workspaceSlug?.toString() ?? ""}
+            projectId={currentProjectDetails?.id?.toString() ?? ""}
+            featureKey={EProjectFeatureKey.PAGES}
             isLast
           />
         </Breadcrumbs>

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

@@ -2,24 +2,27 @@ import { useCallback, useRef } from "react";
 import { observer } from "mobx-react";
 import { useParams } from "next/navigation";
 import { Lock } from "lucide-react";
-// plane imports
+// plane constants
 import {
   EIssueFilterType,
   ISSUE_DISPLAY_FILTERS_BY_PAGE,
   EUserPermissions,
   EUserPermissionsLevel,
+  EProjectFeatureKey,
   WORK_ITEM_TRACKER_ELEMENTS,
 } from "@plane/constants";
+// types
 import { Button } from "@plane/propel/button";
 import { ViewsIcon } from "@plane/propel/icons";
 import { Tooltip } from "@plane/propel/tooltip";
 import type { ICustomSearchSelectOption, IIssueDisplayFilterOptions, IIssueDisplayProperties } from "@plane/types";
 import { EIssuesStoreType, EViewAccess, EIssueLayoutTypes } from "@plane/types";
+// ui
 import { Breadcrumbs, Header, BreadcrumbNavigationSearchDropdown } from "@plane/ui";
 // components
-import { BreadcrumbLink } from "@/components/common/breadcrumb-link";
 import { SwitcherIcon, SwitcherLabel } from "@/components/common/switcher-label";
 import { DisplayFiltersSelection, FiltersDropdown, LayoutSelection } from "@/components/issues/issue-layouts/filters";
+// constants
 import { ViewQuickActions } from "@/components/views/quick-actions";
 import { WorkItemFiltersToggle } from "@/components/work-item-filters/filters-toggle";
 // hooks
@@ -28,8 +31,8 @@ import { useIssues } from "@/hooks/store/use-issues";
 import { useProject } from "@/hooks/store/use-project";
 import { useProjectView } from "@/hooks/store/use-project-view";
 import { useUserPermissions } from "@/hooks/store/user";
+// plane web
 import { useAppRouter } from "@/hooks/use-app-router";
-// plane web imports
 import { CommonProjectBreadcrumbs } from "@/plane-web/components/breadcrumbs/common";
 
 export const ProjectViewIssuesHeader = observer(function ProjectViewIssuesHeader() {
@@ -118,16 +121,12 @@ export const ProjectViewIssuesHeader = observer(function ProjectViewIssuesHeader
     <Header>
       <Header.LeftItem>
         <Breadcrumbs isLoading={loader === "init-loader"}>
-          <CommonProjectBreadcrumbs workspaceSlug={workspaceSlug?.toString()} projectId={projectId?.toString()} />
-          <Breadcrumbs.Item
-            component={
-              <BreadcrumbLink
-                label="Views"
-                href={`/${workspaceSlug}/projects/${projectId}/views/`}
-                icon={<ViewsIcon className="h-4 w-4 text-custom-text-300" />}
-              />
-            }
+          <CommonProjectBreadcrumbs
+            workspaceSlug={workspaceSlug?.toString() ?? ""}
+            projectId={projectId?.toString() ?? ""}
+            featureKey={EProjectFeatureKey.VIEWS}
           />
+
           <Breadcrumbs.Item
             component={
               <BreadcrumbNavigationSearchDropdown

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

@@ -1,17 +1,15 @@
 import { observer } from "mobx-react";
 import { useParams } from "next/navigation";
 // ui
-import { PROJECT_VIEW_TRACKER_ELEMENTS } from "@plane/constants";
+import { EProjectFeatureKey, PROJECT_VIEW_TRACKER_ELEMENTS } from "@plane/constants";
 import { Button } from "@plane/propel/button";
-import { ViewsIcon } from "@plane/propel/icons";
 import { Breadcrumbs, Header } from "@plane/ui";
 // components
-import { BreadcrumbLink } from "@/components/common/breadcrumb-link";
 import { ViewListHeader } from "@/components/views/view-list-header";
 // hooks
 import { useCommandPalette } from "@/hooks/store/use-command-palette";
 import { useProject } from "@/hooks/store/use-project";
-// plane web imports
+// plane web
 import { CommonProjectBreadcrumbs } from "@/plane-web/components/breadcrumbs/common";
 
 export const ProjectViewsHeader = observer(function ProjectViewsHeader() {
@@ -25,16 +23,10 @@ export const ProjectViewsHeader = observer(function ProjectViewsHeader() {
       <Header>
         <Header.LeftItem>
           <Breadcrumbs isLoading={loader === "init-loader"}>
-            <CommonProjectBreadcrumbs workspaceSlug={workspaceSlug?.toString()} projectId={projectId?.toString()} />
-            <Breadcrumbs.Item
-              component={
-                <BreadcrumbLink
-                  label="Views"
-                  href={`/${workspaceSlug}/projects/${projectId}/views/`}
-                  icon={<ViewsIcon className="h-4 w-4 text-custom-text-300" />}
-                  isLast
-                />
-              }
+            <CommonProjectBreadcrumbs
+              workspaceSlug={workspaceSlug?.toString() ?? ""}
+              projectId={projectId?.toString() ?? ""}
+              featureKey={EProjectFeatureKey.VIEWS}
               isLast
             />
           </Breadcrumbs>

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

@@ -1,4 +1,5 @@
 import { Outlet } from "react-router";
+import { AppRailProvider } from "@/hooks/context/app-rail-context";
 import { AuthenticationWrapper } from "@/lib/wrappers/authentication-wrapper";
 import { WorkspaceContentWrapper } from "@/plane-web/components/workspace/content-wrapper";
 import { WorkspaceAuthWrapper } from "@/plane-web/layouts/workspace-wrapper";
@@ -6,11 +7,13 @@ import { WorkspaceAuthWrapper } from "@/plane-web/layouts/workspace-wrapper";
 export default function WorkspaceLayout() {
   return (
     <AuthenticationWrapper>
-      <WorkspaceAuthWrapper>
-        <WorkspaceContentWrapper>
-          <Outlet />
-        </WorkspaceContentWrapper>
-      </WorkspaceAuthWrapper>
+      <AppRailProvider>
+        <WorkspaceAuthWrapper>
+          <WorkspaceContentWrapper>
+            <Outlet />
+          </WorkspaceContentWrapper>
+        </WorkspaceAuthWrapper>
+      </AppRailProvider>
     </AuthenticationWrapper>
   );
 }

apps/web/app/provider.tsx

@@ -1,3 +1,4 @@
+import type { FC, ReactNode } from "react";
 import { lazy, Suspense } from "react";
 import { useTheme, ThemeProvider } from "next-themes";
 import { SWRConfig } from "swr";
@@ -30,7 +31,7 @@ const IntercomProvider = lazy(function IntercomProvider() {
 });
 
 export interface IAppProvider {
-  children: React.ReactNode;
+  children: ReactNode;
 }
 
 function ToastWithTheme() {

apps/web/app/routes/core.ts

@@ -123,92 +123,6 @@ export const coreRoutes: RouteConfigEntry[] = [
 
         // Project Detail
         layout("./(all)/[workspaceSlug]/(projects)/projects/(detail)/layout.tsx", [
-          layout("./(all)/[workspaceSlug]/(projects)/projects/(detail)/[projectId]/layout.tsx", [
-            // Project Issues List
-            layout("./(all)/[workspaceSlug]/(projects)/projects/(detail)/[projectId]/issues/(list)/layout.tsx", [
-              route(
-                ":workspaceSlug/projects/:projectId/issues",
-                "./(all)/[workspaceSlug]/(projects)/projects/(detail)/[projectId]/issues/(list)/page.tsx"
-              ),
-            ]),
-            // Issue Detail
-            route(
-              ":workspaceSlug/projects/:projectId/issues/:issueId",
-              "./(all)/[workspaceSlug]/(projects)/projects/(detail)/[projectId]/issues/(detail)/[issueId]/page.tsx"
-            ),
-
-            // Cycle Detail
-            layout("./(all)/[workspaceSlug]/(projects)/projects/(detail)/[projectId]/cycles/(detail)/layout.tsx", [
-              route(
-                ":workspaceSlug/projects/:projectId/cycles/:cycleId",
-                "./(all)/[workspaceSlug]/(projects)/projects/(detail)/[projectId]/cycles/(detail)/[cycleId]/page.tsx"
-              ),
-            ]),
-
-            // Cycles List
-            layout("./(all)/[workspaceSlug]/(projects)/projects/(detail)/[projectId]/cycles/(list)/layout.tsx", [
-              route(
-                ":workspaceSlug/projects/:projectId/cycles",
-                "./(all)/[workspaceSlug]/(projects)/projects/(detail)/[projectId]/cycles/(list)/page.tsx"
-              ),
-            ]),
-
-            // Module Detail
-            layout("./(all)/[workspaceSlug]/(projects)/projects/(detail)/[projectId]/modules/(detail)/layout.tsx", [
-              route(
-                ":workspaceSlug/projects/:projectId/modules/:moduleId",
-                "./(all)/[workspaceSlug]/(projects)/projects/(detail)/[projectId]/modules/(detail)/[moduleId]/page.tsx"
-              ),
-            ]),
-
-            // Modules List
-            layout("./(all)/[workspaceSlug]/(projects)/projects/(detail)/[projectId]/modules/(list)/layout.tsx", [
-              route(
-                ":workspaceSlug/projects/:projectId/modules",
-                "./(all)/[workspaceSlug]/(projects)/projects/(detail)/[projectId]/modules/(list)/page.tsx"
-              ),
-            ]),
-
-            // View Detail
-            layout("./(all)/[workspaceSlug]/(projects)/projects/(detail)/[projectId]/views/(detail)/layout.tsx", [
-              route(
-                ":workspaceSlug/projects/:projectId/views/:viewId",
-                "./(all)/[workspaceSlug]/(projects)/projects/(detail)/[projectId]/views/(detail)/[viewId]/page.tsx"
-              ),
-            ]),
-
-            // Views List
-            layout("./(all)/[workspaceSlug]/(projects)/projects/(detail)/[projectId]/views/(list)/layout.tsx", [
-              route(
-                ":workspaceSlug/projects/:projectId/views",
-                "./(all)/[workspaceSlug]/(projects)/projects/(detail)/[projectId]/views/(list)/page.tsx"
-              ),
-            ]),
-
-            // Page Detail
-            layout("./(all)/[workspaceSlug]/(projects)/projects/(detail)/[projectId]/pages/(detail)/layout.tsx", [
-              route(
-                ":workspaceSlug/projects/:projectId/pages/:pageId",
-                "./(all)/[workspaceSlug]/(projects)/projects/(detail)/[projectId]/pages/(detail)/[pageId]/page.tsx"
-              ),
-            ]),
-
-            // Pages List
-            layout("./(all)/[workspaceSlug]/(projects)/projects/(detail)/[projectId]/pages/(list)/layout.tsx", [
-              route(
-                ":workspaceSlug/projects/:projectId/pages",
-                "./(all)/[workspaceSlug]/(projects)/projects/(detail)/[projectId]/pages/(list)/page.tsx"
-              ),
-            ]),
-            // Intake list
-            layout("./(all)/[workspaceSlug]/(projects)/projects/(detail)/[projectId]/intake/layout.tsx", [
-              route(
-                ":workspaceSlug/projects/:projectId/intake",
-                "./(all)/[workspaceSlug]/(projects)/projects/(detail)/[projectId]/intake/page.tsx"
-              ),
-            ]),
-          ]),
-
           // Archived Projects
           layout("./(all)/[workspaceSlug]/(projects)/projects/(detail)/archives/layout.tsx", [
             route(
@@ -217,6 +131,97 @@ export const coreRoutes: RouteConfigEntry[] = [
             ),
           ]),
 
+          // Project Issues
+          // Issues List
+          layout("./(all)/[workspaceSlug]/(projects)/projects/(detail)/[projectId]/issues/(list)/layout.tsx", [
+            route(
+              ":workspaceSlug/projects/:projectId/issues",
+              "./(all)/[workspaceSlug]/(projects)/projects/(detail)/[projectId]/issues/(list)/page.tsx"
+            ),
+          ]),
+
+          // Issue Detail
+          route(
+            ":workspaceSlug/projects/:projectId/issues/:issueId",
+            "./(all)/[workspaceSlug]/(projects)/projects/(detail)/[projectId]/issues/(detail)/[issueId]/page.tsx"
+          ),
+
+          // Project Cycles
+          // Cycles List
+          layout("./(all)/[workspaceSlug]/(projects)/projects/(detail)/[projectId]/cycles/(list)/layout.tsx", [
+            route(
+              ":workspaceSlug/projects/:projectId/cycles",
+              "./(all)/[workspaceSlug]/(projects)/projects/(detail)/[projectId]/cycles/(list)/page.tsx"
+            ),
+          ]),
+
+          // Cycle Detail
+          layout("./(all)/[workspaceSlug]/(projects)/projects/(detail)/[projectId]/cycles/(detail)/layout.tsx", [
+            route(
+              ":workspaceSlug/projects/:projectId/cycles/:cycleId",
+              "./(all)/[workspaceSlug]/(projects)/projects/(detail)/[projectId]/cycles/(detail)/[cycleId]/page.tsx"
+            ),
+          ]),
+
+          // Project Modules
+          // Modules List
+          layout("./(all)/[workspaceSlug]/(projects)/projects/(detail)/[projectId]/modules/(list)/layout.tsx", [
+            route(
+              ":workspaceSlug/projects/:projectId/modules",
+              "./(all)/[workspaceSlug]/(projects)/projects/(detail)/[projectId]/modules/(list)/page.tsx"
+            ),
+          ]),
+
+          // Module Detail
+          layout("./(all)/[workspaceSlug]/(projects)/projects/(detail)/[projectId]/modules/(detail)/layout.tsx", [
+            route(
+              ":workspaceSlug/projects/:projectId/modules/:moduleId",
+              "./(all)/[workspaceSlug]/(projects)/projects/(detail)/[projectId]/modules/(detail)/[moduleId]/page.tsx"
+            ),
+          ]),
+
+          // Project Views
+          // Views List
+          layout("./(all)/[workspaceSlug]/(projects)/projects/(detail)/[projectId]/views/(list)/layout.tsx", [
+            route(
+              ":workspaceSlug/projects/:projectId/views",
+              "./(all)/[workspaceSlug]/(projects)/projects/(detail)/[projectId]/views/(list)/page.tsx"
+            ),
+          ]),
+
+          // View Detail
+          layout("./(all)/[workspaceSlug]/(projects)/projects/(detail)/[projectId]/views/(detail)/layout.tsx", [
+            route(
+              ":workspaceSlug/projects/:projectId/views/:viewId",
+              "./(all)/[workspaceSlug]/(projects)/projects/(detail)/[projectId]/views/(detail)/[viewId]/page.tsx"
+            ),
+          ]),
+
+          // Project Pages
+          // Pages List
+          layout("./(all)/[workspaceSlug]/(projects)/projects/(detail)/[projectId]/pages/(list)/layout.tsx", [
+            route(
+              ":workspaceSlug/projects/:projectId/pages",
+              "./(all)/[workspaceSlug]/(projects)/projects/(detail)/[projectId]/pages/(list)/page.tsx"
+            ),
+          ]),
+
+          // Page Detail
+          layout("./(all)/[workspaceSlug]/(projects)/projects/(detail)/[projectId]/pages/(detail)/layout.tsx", [
+            route(
+              ":workspaceSlug/projects/:projectId/pages/:pageId",
+              "./(all)/[workspaceSlug]/(projects)/projects/(detail)/[projectId]/pages/(detail)/[pageId]/page.tsx"
+            ),
+          ]),
+
+          // Project Intake
+          layout("./(all)/[workspaceSlug]/(projects)/projects/(detail)/[projectId]/intake/layout.tsx", [
+            route(
+              ":workspaceSlug/projects/:projectId/intake",
+              "./(all)/[workspaceSlug]/(projects)/projects/(detail)/[projectId]/intake/page.tsx"
+            ),
+          ]),
+
           // Project Archives - Issues, Cycles, Modules
           // Project Archives - Issues - List
           layout("./(all)/[workspaceSlug]/(projects)/projects/(detail)/[projectId]/archives/issues/(list)/layout.tsx", [

apps/web/ce/components/analytics/use-analytics-tabs.tsx

@@ -1,11 +0,0 @@
-import { useMemo } from "react";
-import { useTranslation } from "@plane/i18n";
-import { getAnalyticsTabs } from "./tabs";
-
-export const useAnalyticsTabs = (workspaceSlug: string) => {
-  const { t } = useTranslation();
-
-  const analyticsTabs = useMemo(() => getAnalyticsTabs(t), [t]);
-
-  return analyticsTabs;
-};

apps/web/ce/components/app-rail/app-rail-hoc.tsx

@@ -1,34 +0,0 @@
-// hoc/withDockItems.tsx
-"use client";
-
-import React from "react";
-import { observer } from "mobx-react";
-import { useParams } from "next/navigation";
-import { PlaneNewIcon } from "@plane/propel/icons";
-import type { AppSidebarItemData } from "@/components/sidebar/sidebar-item";
-import { useWorkspacePaths } from "@/hooks/use-workspace-paths";
-
-type WithDockItemsProps = {
-  dockItems: (AppSidebarItemData & { shouldRender: boolean })[];
-};
-
-export function withDockItems<P extends WithDockItemsProps>(WrappedComponent: React.ComponentType<P>) {
-  const ComponentWithDockItems = observer((props: Omit<P, keyof WithDockItemsProps>) => {
-    const { workspaceSlug } = useParams();
-    const { isProjectsPath, isNotificationsPath } = useWorkspacePaths();
-
-    const dockItems: (AppSidebarItemData & { shouldRender: boolean })[] = [
-      {
-        label: "Projects",
-        icon: <PlaneNewIcon className="size-4" />,
-        href: `/${workspaceSlug}/`,
-        isActive: isProjectsPath && !isNotificationsPath,
-        shouldRender: true,
-      },
-    ];
-
-    return <WrappedComponent {...(props as P)} dockItems={dockItems} />;
-  });
-
-  return ComponentWithDockItems;
-}

apps/web/ce/components/app-rail/index.ts

@@ -1 +1 @@
-export * from "./app-rail-hoc";
+export * from "./root";

apps/web/ce/components/app-rail/root.tsx

@@ -0,0 +1,5 @@
+import React from "react";
+
+export function AppRailRoot() {
+  return <></>;
+}

apps/web/ce/components/breadcrumbs/common.tsx

@@ -1,17 +1,30 @@
+import type { FC } from "react";
+// plane imports
+import type { EProjectFeatureKey } from "@plane/constants";
 // local components
-import { useProjectNavigationPreferences } from "@/hooks/use-navigation-preferences";
 import { ProjectBreadcrumb } from "./project";
+import { ProjectFeatureBreadcrumb } from "./project-feature";
 
 type TCommonProjectBreadcrumbProps = {
   workspaceSlug: string;
   projectId: string;
+  featureKey?: EProjectFeatureKey;
+  isLast?: boolean;
 };
 
 export function CommonProjectBreadcrumbs(props: TCommonProjectBreadcrumbProps) {
-  const { workspaceSlug, projectId } = props;
-  // preferences
-  const { preferences: projectPreferences } = useProjectNavigationPreferences();
-
-  if (projectPreferences.navigationMode === "horizontal") return null;
-  return <ProjectBreadcrumb workspaceSlug={workspaceSlug} projectId={projectId} />;
+  const { workspaceSlug, projectId, featureKey, isLast = false } = props;
+  return (
+    <>
+      <ProjectBreadcrumb workspaceSlug={workspaceSlug} projectId={projectId} />
+      {featureKey && (
+        <ProjectFeatureBreadcrumb
+          workspaceSlug={workspaceSlug?.toString()}
+          projectId={projectId?.toString()}
+          featureKey={featureKey}
+          isLast={isLast}
+        />
+      )}
+    </>
+  );
 }

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

@@ -1,13 +1,15 @@
-import type { ReactNode } from "react";
+import type { FC } from "react";
 import { observer } from "mobx-react";
 // plane imports
-import type { EProjectFeatureKey } from "@plane/constants";
-import { Breadcrumbs } from "@plane/ui";
+import { EProjectFeatureKey } from "@plane/constants";
+import type { ISvgIcons } from "@plane/propel/icons";
+import { BreadcrumbNavigationDropdown, Breadcrumbs } from "@plane/ui";
 // components
-import { BreadcrumbLink } from "@/components/common/breadcrumb-link";
+import { SwitcherLabel } from "@/components/common/switcher-label";
 import type { TNavigationItem } from "@/components/workspace/sidebar/project-navigation";
 // hooks
 import { useProject } from "@/hooks/store/use-project";
+import { useAppRouter } from "@/hooks/use-app-router";
 // local imports
 import { getProjectFeatureNavigation } from "../projects/navigation/helper";
 
@@ -23,6 +25,8 @@ export const ProjectFeatureBreadcrumb = observer(function ProjectFeatureBreadcru
   props: TProjectFeatureBreadcrumbProps
 ) {
   const { workspaceSlug, projectId, featureKey, isLast = false, additionalNavigationItems } = props;
+  // router
+  const router = useAppRouter();
   // store hooks
   const { getPartialProjectById } = useProject();
   // derived values
@@ -35,21 +39,27 @@ export const ProjectFeatureBreadcrumb = observer(function ProjectFeatureBreadcru
   // if additional navigation items are provided, add them to the navigation items
   const allNavigationItems = [...(additionalNavigationItems || []), ...navigationItems];
 
-  const currentNavigationItem = allNavigationItems.find((item) => item.key === featureKey);
-  const icon = currentNavigationItem?.icon as ReactNode;
-  const name = currentNavigationItem?.name;
-  const href = currentNavigationItem?.href;
-
   return (
     <>
       <Breadcrumbs.Item
         component={
-          <BreadcrumbLink
-            key={featureKey}
-            label={name}
+          <BreadcrumbNavigationDropdown
+            selectedItemKey={featureKey}
+            navigationItems={allNavigationItems
+              .filter((item) => item.shouldRender)
+              .map((item) => ({
+                key: item.key,
+                title: item.name,
+                customContent: <SwitcherLabel name={item.name} LabelIcon={item.icon as FC<ISvgIcons>} />,
+                action: () => router.push(item.href),
+                icon: item.icon as FC<ISvgIcons>,
+              }))}
+            handleOnClick={() => {
+              router.push(
+                `/${workspaceSlug}/projects/${projectId}/${featureKey === EProjectFeatureKey.WORK_ITEMS ? "issues" : featureKey}/`
+              );
+            }}
             isLast={isLast}
-            href={href}
-            icon={<Breadcrumbs.Icon>{icon}</Breadcrumbs.Icon>}
           />
         }
         showSeparator={false}

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

@@ -49,7 +49,7 @@ export const ProjectBreadcrumb = observer(function ProjectBreadcrumb(props: TPro
 
   // helpers
   const renderIcon = (projectDetails: TProject) => (
-    <span className="grid place-items-center flex-shrink-0 size-4">
+    <span className="grid place-items-center flex-shrink-0 h-4 w-4">
       <Logo logo={projectDetails.logo_props} size={14} />
     </span>
   );

apps/web/ce/components/command-palette/power-k/hooks/use-extended-context-indicator.ts

@@ -1,8 +1,8 @@
 // local imports
-import type { TPowerKContextType } from "@/components/power-k/core/types";
+import type { TPowerKContextTypeExtended } from "../types";
 
 type TArgs = {
-  activeContext: TPowerKContextType | null;
+  activeContext: TPowerKContextTypeExtended | null;
 };
 
 export const useExtendedContextIndicator = (_args: TArgs): string | null => null;

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

@@ -1,9 +1,10 @@
-import type { ReactNode } from "react";
+import type { FC, ReactNode } from "react";
 import { useRef } from "react";
 import { observer } from "mobx-react";
 // plane imports
 import { useTranslation } from "@plane/i18n";
 import type { TIssueComment } from "@plane/types";
+import { EIssueCommentAccessSpecifier } from "@plane/types";
 import { Avatar, Tooltip } from "@plane/ui";
 import { calculateTimeAgo, cn, getFileURL, renderFormattedDate, renderFormattedTime } from "@plane/utils";
 // hooks
@@ -55,7 +56,9 @@ export const CommentBlock = observer(function CommentBlock(props: TCommentBlock)
         <div className="flex w-full gap-2">
           <div className="flex-1 flex flex-wrap items-center gap-1">
             <div className="flex items-center gap-1">
-              <span className="text-xs font-medium">{displayName}</span>
+              <span className="text-xs font-medium">
+                {`${displayName}${comment.access === EIssueCommentAccessSpecifier.EXTERNAL ? " (External User)" : ""}`}
+              </span>
             </div>
             <div className="text-xs text-custom-text-300">
               commented{" "}
@@ -64,7 +67,7 @@ export const CommentBlock = observer(function CommentBlock(props: TCommentBlock)
                 position="bottom"
               >
                 <span className="text-custom-text-350">
-                  {calculateTimeAgo(comment.created_at)}
+                  {calculateTimeAgo(comment.updated_at)}
                   {comment.edited_at && ` (${t("edited")})`}
                 </span>
               </Tooltip>

apps/web/ce/components/common/extended-app-header.tsx

@@ -1,26 +1,16 @@
 import type { ReactNode } from "react";
 import { observer } from "mobx-react";
-import { useParams } from "react-router";
-// components
 import { AppSidebarToggleButton } from "@/components/sidebar/sidebar-toggle-button";
-// hooks
 import { useAppTheme } from "@/hooks/store/use-app-theme";
-import { useProjectNavigationPreferences } from "@/hooks/use-navigation-preferences";
 
 export const ExtendedAppHeader = observer(function ExtendedAppHeader(props: { header: ReactNode }) {
   const { header } = props;
-  // params
-  const { projectId, workItem } = useParams();
-  // preferences
-  const { preferences: projectPreferences } = useProjectNavigationPreferences();
   // store hooks
   const { sidebarCollapsed } = useAppTheme();
-  // derived values
-  const shouldShowSidebarToggleButton = projectPreferences.navigationMode === "accordion" || (!projectId && !workItem);
 
   return (
     <>
-      {sidebarCollapsed && shouldShowSidebarToggleButton && <AppSidebarToggleButton />}
+      {sidebarCollapsed && <AppSidebarToggleButton />}
       <div className="w-full">{header}</div>
     </>
   );

apps/web/ce/components/desktop/helper.ts

@@ -1 +0,0 @@
-export const isSidebarToggleVisible = () => true;

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

@@ -1,2 +0,0 @@
-export * from "./helper";
-export * from "./sidebar-workspace-menu";

apps/web/ce/components/desktop/sidebar-workspace-menu.tsx

@@ -1,3 +0,0 @@
-export function DesktopSidebarWorkspaceMenu() {
-  return null;
-}

apps/web/ce/components/home/peek-overviews.tsx

@@ -1,9 +1,9 @@
-import { observer } from "mobx-react";
 import { IssuePeekOverview } from "@/components/issues/peek-overview";
-import { useIssueDetail } from "@/hooks/store/use-issue-detail";
 
-export const HomePeekOverviewsRoot = observer(function HomePeekOverviewsRoot() {
-  const { peekIssue } = useIssueDetail();
-
-  return peekIssue ? <IssuePeekOverview /> : null;
-});
+export function HomePeekOverviewsRoot() {
+  return (
+    <>
+      <IssuePeekOverview />
+    </>
+  );
+}

apps/web/ce/components/issues/header.tsx

@@ -9,15 +9,14 @@ import {
   SPACE_BASE_PATH,
   SPACE_BASE_URL,
   WORK_ITEM_TRACKER_ELEMENTS,
+  EProjectFeatureKey,
 } from "@plane/constants";
 import { useTranslation } from "@plane/i18n";
 import { Button } from "@plane/propel/button";
-import { WorkItemsIcon } from "@plane/propel/icons";
 import { Tooltip } from "@plane/propel/tooltip";
 import { EIssuesStoreType } from "@plane/types";
 import { Breadcrumbs, Header } from "@plane/ui";
 // components
-import { BreadcrumbLink } from "@/components/common/breadcrumb-link";
 import { CountChip } from "@/components/common/count-chip";
 // constants
 import { HeaderFilters } from "@/components/issues/filters";
@@ -29,8 +28,8 @@ import { useProject } from "@/hooks/store/use-project";
 import { useUserPermissions } from "@/hooks/store/user";
 import { useAppRouter } from "@/hooks/use-app-router";
 import { usePlatformOS } from "@/hooks/use-platform-os";
-// plane web imports
-import { CommonProjectBreadcrumbs } from "@/plane-web/components/breadcrumbs/common";
+// plane web
+import { CommonProjectBreadcrumbs } from "../breadcrumbs/common";
 
 export const IssuesHeader = observer(function IssuesHeader() {
   // router
@@ -63,16 +62,10 @@ export const IssuesHeader = observer(function IssuesHeader() {
       <Header.LeftItem>
         <div className="flex items-center gap-2.5">
           <Breadcrumbs onBack={() => router.back()} isLoading={loader === "init-loader"} className="flex-grow-0">
-            <CommonProjectBreadcrumbs workspaceSlug={workspaceSlug?.toString()} projectId={projectId?.toString()} />
-            <Breadcrumbs.Item
-              component={
-                <BreadcrumbLink
-                  label="Work Items"
-                  href={`/${workspaceSlug}/projects/${projectId}/issues/`}
-                  icon={<WorkItemsIcon className="h-4 w-4 text-custom-text-300" />}
-                  isLast
-                />
-              }
+            <CommonProjectBreadcrumbs
+              workspaceSlug={workspaceSlug?.toString()}
+              projectId={projectId?.toString()}
+              featureKey={EProjectFeatureKey.WORK_ITEMS}
               isLast
             />
           </Breadcrumbs>

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

@@ -1,2 +0,0 @@
-export * from "./use-navigation-items";
-export * from "./top-navigation-root";

apps/web/ce/components/navigations/top-navigation-root.tsx

@@ -1,38 +0,0 @@
-// components
-import { observer } from "mobx-react";
-import { cn } from "@plane/utils";
-import { TopNavPowerK } from "@/components/navigation";
-import { HelpMenuRoot } from "@/components/workspace/sidebar/help-section/root";
-import { UserMenuRoot } from "@/components/workspace/sidebar/user-menu-root";
-import { WorkspaceMenuRoot } from "@/components/workspace/sidebar/workspace-menu-root";
-import { useAppRailPreferences } from "@/hooks/use-navigation-preferences";
-
-export const TopNavigationRoot = observer(() => {
-  const { preferences } = useAppRailPreferences();
-
-  const showLabel = preferences.displayMode === "icon_with_label";
-
-  return (
-    <div
-      className={cn("flex items-center min-h-11 w-full px-3.5 z-[27] transition-all duration-300", {
-        "px-2": !showLabel,
-      })}
-    >
-      {/* Workspace Menu */}
-      <div className="shrink-0 flex-1">
-        <WorkspaceMenuRoot variant="top-navigation" />
-      </div>
-      {/* Power K Search */}
-      <div className="shrink-0">
-        <TopNavPowerK />
-      </div>
-      {/* Additional Actions */}
-      <div className="shrink-0 flex-1 flex gap-1 items-center justify-end">
-        <HelpMenuRoot />
-        <div className="flex items-center justify-center size-8 hover:bg-custom-background-80 rounded-md">
-          <UserMenuRoot size="xs" />
-        </div>
-      </div>
-    </div>
-  );
-});

apps/web/ce/components/navigations/use-navigation-items.ts

@@ -1,109 +0,0 @@
-import { useMemo, useCallback } from "react";
-// plane imports
-import { EUserPermissions, EUserPermissionsLevel } from "@plane/constants";
-import { CycleIcon, IntakeIcon, ModuleIcon, PageIcon, ViewsIcon, WorkItemsIcon } from "@plane/propel/icons";
-import type { EUserProjectRoles, IPartialProject } from "@plane/types";
-import type { TNavigationItem } from "@/components/navigation/tab-navigation-root";
-
-type UseNavigationItemsProps = {
-  workspaceSlug: string;
-  projectId: string;
-  project?: IPartialProject;
-  allowPermissions: (
-    access: EUserPermissions[] | EUserProjectRoles[],
-    level: EUserPermissionsLevel,
-    workspaceSlug: string,
-    projectId: string
-  ) => boolean;
-};
-
-export const useNavigationItems = ({
-  workspaceSlug,
-  projectId,
-  project,
-  allowPermissions,
-}: UseNavigationItemsProps): TNavigationItem[] => {
-  // Base navigation items
-  const baseNavigation = useCallback(
-    (workspaceSlug: string, projectId: string): TNavigationItem[] => [
-      {
-        i18n_key: "sidebar.work_items",
-        key: "work_items",
-        name: "Work items",
-        href: `/${workspaceSlug}/projects/${projectId}/issues`,
-        icon: WorkItemsIcon,
-        access: [EUserPermissions.ADMIN, EUserPermissions.MEMBER, EUserPermissions.GUEST],
-        shouldRender: true,
-        sortOrder: 1,
-      },
-      {
-        i18n_key: "sidebar.cycles",
-        key: "cycles",
-        name: "Cycles",
-        href: `/${workspaceSlug}/projects/${projectId}/cycles`,
-        icon: CycleIcon,
-        access: [EUserPermissions.ADMIN, EUserPermissions.MEMBER],
-        shouldRender: !!project?.cycle_view,
-        sortOrder: 2,
-      },
-      {
-        i18n_key: "sidebar.modules",
-        key: "modules",
-        name: "Modules",
-        href: `/${workspaceSlug}/projects/${projectId}/modules`,
-        icon: ModuleIcon,
-        access: [EUserPermissions.ADMIN, EUserPermissions.MEMBER],
-        shouldRender: !!project?.module_view,
-        sortOrder: 3,
-      },
-      {
-        i18n_key: "sidebar.views",
-        key: "views",
-        name: "Views",
-        href: `/${workspaceSlug}/projects/${projectId}/views`,
-        icon: ViewsIcon,
-        access: [EUserPermissions.ADMIN, EUserPermissions.MEMBER, EUserPermissions.GUEST],
-        shouldRender: !!project?.issue_views_view,
-        sortOrder: 4,
-      },
-      {
-        i18n_key: "sidebar.pages",
-        key: "pages",
-        name: "Pages",
-        href: `/${workspaceSlug}/projects/${projectId}/pages`,
-        icon: PageIcon,
-        access: [EUserPermissions.ADMIN, EUserPermissions.MEMBER, EUserPermissions.GUEST],
-        shouldRender: !!project?.page_view,
-        sortOrder: 5,
-      },
-      {
-        i18n_key: "sidebar.intake",
-        key: "intake",
-        name: "Intake",
-        href: `/${workspaceSlug}/projects/${projectId}/intake`,
-        icon: IntakeIcon,
-        access: [EUserPermissions.ADMIN, EUserPermissions.MEMBER, EUserPermissions.GUEST],
-        shouldRender: !!project?.inbox_view,
-        sortOrder: 6,
-      },
-    ],
-    [project]
-  );
-
-  // Combine, filter, and sort navigation items
-  const navigationItems = useMemo(() => {
-    const navItems = baseNavigation(workspaceSlug, projectId);
-
-    // Filter by permissions and shouldRender
-    const filteredItems = navItems.filter((item) => {
-      if (!item.shouldRender) return false;
-      const hasAccess = allowPermissions(item.access, EUserPermissionsLevel.PROJECT, workspaceSlug, project?.id ?? "");
-      return hasAccess;
-    });
-
-    // Sort by sortOrder
-    return filteredItems.sort((a, b) => (a.sortOrder || 0) - (b.sortOrder || 0));
-  }, [workspaceSlug, projectId, baseNavigation, allowPermissions, project?.id]);
-
-  return navigationItems;
-};

apps/web/ce/components/projects/settings/intake/header.tsx

@@ -1,20 +1,20 @@
+import type { FC } from "react";
 import { useState } from "react";
 import { observer } from "mobx-react";
 import { useParams } from "next/navigation";
-import { InboxIcon, RefreshCcw } from "lucide-react";
+import { RefreshCcw } from "lucide-react";
 // ui
-import { EUserPermissions, EUserPermissionsLevel } from "@plane/constants";
+import { EProjectFeatureKey, EUserPermissions, EUserPermissionsLevel } from "@plane/constants";
 import { useTranslation } from "@plane/i18n";
 import { Button } from "@plane/propel/button";
 import { Breadcrumbs, Header } from "@plane/ui";
 // components
-import { BreadcrumbLink } from "@/components/common/breadcrumb-link";
 import { InboxIssueCreateModalRoot } from "@/components/inbox/modals/create-modal";
 // hooks
 import { useProject } from "@/hooks/store/use-project";
 import { useProjectInbox } from "@/hooks/store/use-project-inbox";
 import { useUserPermissions } from "@/hooks/store/user";
-// plane web imports
+// plane web
 import { CommonProjectBreadcrumbs } from "@/plane-web/components/breadcrumbs/common";
 
 export const ProjectInboxHeader = observer(function ProjectInboxHeader() {
@@ -40,16 +40,10 @@ export const ProjectInboxHeader = observer(function ProjectInboxHeader() {
       <Header.LeftItem>
         <div className="flex items-center gap-4 flex-grow">
           <Breadcrumbs isLoading={currentProjectDetailsLoader === "init-loader"}>
-            <CommonProjectBreadcrumbs workspaceSlug={workspaceSlug?.toString()} projectId={projectId?.toString()} />
-            <Breadcrumbs.Item
-              component={
-                <BreadcrumbLink
-                  label="Intake"
-                  href={`/${workspaceSlug}/projects/${projectId}/intake/`}
-                  icon={<InboxIcon className="h-4 w-4 text-custom-text-300" />}
-                  isLast
-                />
-              }
+            <CommonProjectBreadcrumbs
+              workspaceSlug={workspaceSlug?.toString() ?? ""}
+              projectId={projectId?.toString() ?? ""}
+              featureKey={EProjectFeatureKey.INTAKE}
               isLast
             />
           </Breadcrumbs>

apps/web/ce/components/workspace/content-wrapper.tsx

@@ -1,10 +1,5 @@
 import React from "react";
 import { observer } from "mobx-react";
-// plane imports
-import { cn } from "@plane/utils";
-import { AppRailRoot } from "@/components/navigation";
-// plane web imports
-import { TopNavigationRoot } from "../navigations";
 
 export const WorkspaceContentWrapper = observer(function WorkspaceContentWrapper({
   children,
@@ -12,18 +7,8 @@ export const WorkspaceContentWrapper = observer(function WorkspaceContentWrapper
   children: React.ReactNode;
 }) {
   return (
-    <div className="flex flex-col relative size-full overflow-hidden bg-custom-background-90 transition-all ease-in-out duration-300">
-      <TopNavigationRoot />
-      <div className="relative flex size-full overflow-hidden">
-        <AppRailRoot />
-        <div
-          className={cn(
-            "relative size-full pb-2 pr-2 flex-grow transition-all ease-in-out duration-300 overflow-hidden"
-          )}
-        >
-          {children}
-        </div>
-      </div>
+    <div className="flex relative size-full overflow-hidden bg-custom-background-90 rounded-lg transition-all ease-in-out duration-300">
+      <div className="size-full p-2 flex-grow transition-all ease-in-out duration-300 overflow-hidden">{children}</div>
     </div>
   );
 });

apps/web/ce/components/workspace/sidebar/app-search.tsx

@@ -0,0 +1,24 @@
+import { observer } from "mobx-react";
+// plane imports
+import { useTranslation } from "@plane/i18n";
+// components
+import { SidebarSearchButton } from "@/components/sidebar/search-button";
+// hooks
+import { usePowerK } from "@/hooks/store/use-power-k";
+
+export const AppSearch = observer(function AppSearch() {
+  // store hooks
+  const { togglePowerKModal } = usePowerK();
+  // translation
+  const { t } = useTranslation();
+
+  return (
+    <button
+      type="button"
+      onClick={() => togglePowerKModal(true)}
+      aria-label={t("aria_labels.projects_sidebar.open_command_palette")}
+    >
+      <SidebarSearchButton isActive={false} />
+    </button>
+  );
+});

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

@@ -5,7 +5,6 @@ import {
   DraftIcon,
   HomeIcon,
   InboxIcon,
-  MultipleStickyIcon,
   ProjectIcon,
   ViewsIcon,
   YourWorkIcon,
@@ -32,7 +31,5 @@ export const getSidebarNavigationItemIcon = (key: string, className: string = ""
       return <DraftIcon className={cn("size-4 flex-shrink-0", className)} />;
     case "archives":
       return <ArchiveIcon className={cn("size-4 flex-shrink-0", className)} />;
-    case "stickies":
-      return <MultipleStickyIcon className={cn("size-4 flex-shrink-0", className)} />;
   }
 };

apps/web/ce/store/issue/issue-details/activity.store.ts

@@ -112,10 +112,11 @@ export class IssueActivityStore implements IIssueActivityStore {
     comments.forEach((commentId) => {
       const comment = currentStore.comment.getCommentById(commentId);
       if (!comment) return;
+      const commentTimestamp = comment.edited_at ?? comment.updated_at ?? comment.created_at;
       activityComments.push({
         id: comment.id,
         activity_type: EActivityFilterType.COMMENT,
-        created_at: comment.created_at,
+        created_at: commentTimestamp,
       });
     });
 

apps/web/core/components/account/auth-forms/form-root.tsx

@@ -91,7 +91,7 @@ export const AuthFormRoot = observer(function AuthFormRoot(props: TAuthFormRoot)
       .generateUniqueCode(payload)
       .then(() => ({ code: "" }))
       .catch((error) => {
-        const errorhandler = authErrorHandler(error?.error_code?.toString());
+        const errorhandler = authErrorHandler(error?.error_code.toString());
         if (errorhandler?.type) setErrorInfo(errorhandler);
         throw error;
       });

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

@@ -4,10 +4,11 @@ import { observer } from "mobx-react";
 import { useAnalytics } from "@/hooks/store/use-analytics";
 import { useProject } from "@/hooks/store/use-project";
 // components
+import DurationDropdown from "./select/duration";
 import { ProjectSelect } from "./select/project";
 
 const AnalyticsFilterActions = observer(function AnalyticsFilterActions() {
-  const { selectedProjects, updateSelectedProjects } = useAnalytics();
+  const { selectedProjects, selectedDuration, updateSelectedProjects, updateSelectedDuration } = useAnalytics();
   const { joinedProjectIds } = useProject();
   return (
     <div className="flex items-center justify-end gap-2">

apps/web/core/components/analytics/overview/active-project-item.tsx

@@ -1,7 +1,6 @@
 // plane package imports
 import { Logo } from "@plane/propel/emoji-icon-picker";
 import { ProjectIcon } from "@plane/propel/icons";
-import { Tooltip } from "@plane/propel/tooltip";
 import { cn } from "@plane/utils";
 // plane web hooks
 import { useProject } from "@/hooks/store/use-project";
@@ -34,9 +33,9 @@ function ActiveProjectItem(props: Props) {
   if (!projectDetails) return null;
 
   return (
-    <div className="flex items-center justify-between gap-2 w-full">
-      <div className="flex items-center gap-2 flex-1 overflow-hidden">
-        <div className="flex h-8 w-8 items-center justify-center rounded-xl bg-custom-background-80 shrink-0">
+    <div className="flex items-center justify-between gap-2  ">
+      <div className="flex items-center gap-2">
+        <div className="flex h-8  w-8 items-center justify-center rounded-xl bg-custom-background-80">
           <span className="grid h-4 w-4 flex-shrink-0 place-items-center">
             {projectDetails?.logo_props ? (
               <Logo logo={projectDetails?.logo_props} size={16} />
@@ -47,9 +46,7 @@ function ActiveProjectItem(props: Props) {
             )}
           </span>
         </div>
-        <Tooltip tooltipContent={projectDetails?.name} position="top-start">
-          <p className="text-sm font-medium truncate">{projectDetails?.name}</p>
-        </Tooltip>
+        <p className="text-sm font-medium">{projectDetails?.name}</p>
       </div>
       <CompletionPercentage
         percentage={completed_issues && total_issues ? Math.round((completed_issues / total_issues) * 100) : 0}

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

@@ -3,27 +3,19 @@ import { observer } from "mobx-react";
 // plane imports
 import { Row } from "@plane/ui";
 // components
-import { cn } from "@plane/utils";
 import { ExtendedAppHeader } from "@/plane-web/components/common/extended-app-header";
 
 export interface AppHeaderProps {
   header: ReactNode;
   mobileHeader?: ReactNode;
-  className?: string;
-  rowClassName?: string;
 }
 
 export const AppHeader = observer(function AppHeader(props: AppHeaderProps) {
-  const { header, mobileHeader, className, rowClassName } = props;
+  const { header, mobileHeader } = props;
 
   return (
-    <div className={cn("z-[18]", className)}>
-      <Row
-        className={cn(
-          "h-11 flex gap-2 w-full items-center border-b border-custom-border-200 bg-custom-sidebar-background-100",
-          rowClassName
-        )}
-      >
+    <div className="z-[18]">
+      <Row className="h-header flex gap-2 w-full items-center border-b border-custom-border-200 bg-custom-sidebar-background-100">
         <ExtendedAppHeader header={header} />
       </Row>
       {mobileHeader && mobileHeader}

apps/web/core/components/core/content-overflow-HOC.tsx

@@ -77,20 +77,19 @@ export const ContentOverflowWrapper = observer(function ContentOverflowWrapper(p
       resizeObserver.disconnect();
       mutationObserver.disconnect();
     };
-  }, []);
+  }, [contentRef?.current]);
 
   useEffect(() => {
-    const container = containerRef.current;
-    if (!container) return;
+    if (!containerRef.current) return;
 
     const handleTransitionEnd = () => {
       setIsTransitioning(false);
     };
 
-    container.addEventListener("transitionend", handleTransitionEnd);
+    containerRef.current.addEventListener("transitionend", handleTransitionEnd);
 
     return () => {
-      container.removeEventListener("transitionend", handleTransitionEnd);
+      containerRef.current?.removeEventListener("transitionend", handleTransitionEnd);
     };
   }, []);