refactor command palette into modular command system

.github/workflows/codeql.yml

@@ -3,9 +3,11 @@ name: "CodeQL"
 on:
   workflow_dispatch:
   push:
-    branches: ["preview", "canary", "master"]
+    branches: ["preview", "master"]
   pull_request:
-    branches: ["preview", "canary", "master"]
+    branches: ["develop", "preview", "master"]
+  schedule:
+    - cron: "53 19 * * 5"
 
 jobs:
   analyze:

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

@@ -66,7 +66,7 @@ class IntakeIssueListCreateAPIEndpoint(BaseAPIView):
             workspace__slug=self.kwargs.get("slug"), pk=self.kwargs.get("project_id")
         )
 
-        if intake is None or not project.intake_view:
+        if intake is None and not project.intake_view:
             return IntakeIssue.objects.none()
 
         return (
@@ -230,7 +230,7 @@ class IntakeIssueDetailAPIEndpoint(BaseAPIView):
             workspace__slug=self.kwargs.get("slug"), pk=self.kwargs.get("project_id")
         )
 
-        if intake is None or not project.intake_view:
+        if intake is None and not project.intake_view:
             return IntakeIssue.objects.none()
 
         return (

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

@@ -13,4 +13,3 @@ from .project import (
     ProjectLitePermission,
 )
 from .base import allow_permission, ROLE
-from .page import ProjectPagePermission

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

@@ -1,125 +0,0 @@
-from plane.db.models import ProjectMember, Page
-from plane.app.permissions import ROLE
-
-
-from rest_framework.permissions import BasePermission, SAFE_METHODS
-
-
-# Permission Mappings for workspace members
-ADMIN = ROLE.ADMIN.value
-MEMBER = ROLE.MEMBER.value
-GUEST = ROLE.GUEST.value
-
-
-class ProjectPagePermission(BasePermission):
-    """
-    Custom permission to control access to pages within a workspace
-    based on user roles, page visibility (public/private), and feature flags.
-    """
-
-    def has_permission(self, request, view):
-        """
-        Check basic project-level permissions before checking object-level permissions.
-        """
-        if request.user.is_anonymous:
-            return False
-
-        user_id = request.user.id
-        slug = view.kwargs.get("slug")
-        page_id = view.kwargs.get("page_id")
-        project_id = view.kwargs.get("project_id")
-
-        # Hook for extended validation
-        extended_access, role = self._check_access_and_get_role(
-            request, slug, project_id
-        )
-        if extended_access is False:
-            return False
-
-        if page_id:
-            page = Page.objects.get(id=page_id, workspace__slug=slug)
-
-            # Allow access if the user is the owner of the page
-            if page.owned_by_id == user_id:
-                return True
-
-            # Handle private page access
-            if page.access == Page.PRIVATE_ACCESS:
-                return self._has_private_page_action_access(
-                    request, slug, page, project_id
-                )
-
-        # Handle public page access
-        return self._has_public_page_action_access(request, role)
-
-    def _check_project_member_access(self, request, slug, project_id):
-        """
-        Check if the user is a project member.
-        """
-        return (
-            ProjectMember.objects.filter(
-                member=request.user,
-                workspace__slug=slug,
-                is_active=True,
-                project_id=project_id,
-            )
-            .values_list("role", flat=True)
-            .first()
-        )
-
-    def _check_access_and_get_role(self, request, slug, project_id):
-        """
-        Hook for extended access checking
-        Returns: True (allow), False (deny), None (continue with normal flow)
-        """
-        role = self._check_project_member_access(request, slug, project_id)
-        if not role:
-            return False, None
-        return True, role
-
-    def _has_private_page_action_access(self, request, slug, page, project_id):
-        """
-        Check access to private pages. Override for feature flag logic.
-        """
-        # Base implementation: only owner can access private pages
-        return False
-
-    def _check_project_action_access(self, request, role):
-        method = request.method
-
-        # Only admins can create (POST) pages
-        if method == "POST":
-            if role in [ADMIN, MEMBER]:
-                return True
-            return False
-
-        # Safe methods (GET, HEAD, OPTIONS) allowed for all active roles
-        if method in SAFE_METHODS:
-            if role in [ADMIN, MEMBER, GUEST]:
-                return True
-            return False
-
-        # PUT/PATCH: Admins and members can update
-        if method in ["PUT", "PATCH"]:
-            if role in [ADMIN, MEMBER]:
-                return True
-            return False
-
-        # DELETE: Only admins can delete
-        if method == "DELETE":
-            if role in [ADMIN]:
-                return True
-            return False
-
-        # Deny by default
-        return False
-
-    def _has_public_page_action_access(self, request, role):
-        """
-        Check if the user has permission to access a public page
-        and can perform operations on the page.
-        """
-        project_member_exists = self._check_project_action_access(request, role)
-        if not project_member_exists:
-            return False
-        return True

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

@@ -92,6 +92,8 @@ from .importer import ImporterSerializer
 
 from .page import (
     PageSerializer,
+    PageLogSerializer,
+    SubPageSerializer,
     PageDetailSerializer,
     PageVersionSerializer,
     PageBinaryUpdateSerializer,

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

@@ -130,6 +130,32 @@ class PageDetailSerializer(PageSerializer):
         fields = PageSerializer.Meta.fields + ["description_html"]
 
 
+class SubPageSerializer(BaseSerializer):
+    entity_details = serializers.SerializerMethodField()
+
+    class Meta:
+        model = PageLog
+        fields = "__all__"
+        read_only_fields = ["workspace", "page"]
+
+    def get_entity_details(self, obj):
+        entity_name = obj.entity_name
+        if entity_name == "forward_link" or entity_name == "back_link":
+            try:
+                page = Page.objects.get(pk=obj.entity_identifier)
+                return PageSerializer(page).data
+            except Page.DoesNotExist:
+                return None
+        return None
+
+
+class PageLogSerializer(BaseSerializer):
+    class Meta:
+        model = PageLog
+        fields = "__all__"
+        read_only_fields = ["workspace", "page"]
+
+
 class PageVersionSerializer(BaseSerializer):
     class Meta:
         model = PageVersion

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

@@ -4,24 +4,22 @@ from django.urls import path
 from plane.app.views import (
     PageViewSet,
     PageFavoriteViewSet,
+    PageLogEndpoint,
+    SubPagesEndpoint,
     PagesDescriptionViewSet,
     PageVersionEndpoint,
     PageDuplicateEndpoint,
 )
 
+
 urlpatterns = [
-    path(
-        "workspaces/<str:slug>/projects/<uuid:project_id>/pages-summary/",
-        PageViewSet.as_view({"get": "summary"}),
-        name="project-pages-summary",
-    ),
     path(
         "workspaces/<str:slug>/projects/<uuid:project_id>/pages/",
         PageViewSet.as_view({"get": "list", "post": "create"}),
         name="project-pages",
     ),
     path(
-        "workspaces/<str:slug>/projects/<uuid:project_id>/pages/<uuid:page_id>/",
+        "workspaces/<str:slug>/projects/<uuid:project_id>/pages/<uuid:pk>/",
         PageViewSet.as_view(
             {"get": "retrieve", "patch": "partial_update", "delete": "destroy"}
         ),
@@ -29,30 +27,45 @@ urlpatterns = [
     ),
     # favorite pages
     path(
-        "workspaces/<str:slug>/projects/<uuid:project_id>/favorite-pages/<uuid:page_id>/",
+        "workspaces/<str:slug>/projects/<uuid:project_id>/favorite-pages/<uuid:pk>/",
         PageFavoriteViewSet.as_view({"post": "create", "delete": "destroy"}),
         name="user-favorite-pages",
     ),
     # archived pages
     path(
-        "workspaces/<str:slug>/projects/<uuid:project_id>/pages/<uuid:page_id>/archive/",
+        "workspaces/<str:slug>/projects/<uuid:project_id>/pages/<uuid:pk>/archive/",
         PageViewSet.as_view({"post": "archive", "delete": "unarchive"}),
         name="project-page-archive-unarchive",
     ),
     # lock and unlock
     path(
-        "workspaces/<str:slug>/projects/<uuid:project_id>/pages/<uuid:page_id>/lock/",
+        "workspaces/<str:slug>/projects/<uuid:project_id>/pages/<uuid:pk>/lock/",
         PageViewSet.as_view({"post": "lock", "delete": "unlock"}),
         name="project-pages-lock-unlock",
     ),
     # private and public page
     path(
-        "workspaces/<str:slug>/projects/<uuid:project_id>/pages/<uuid:page_id>/access/",
+        "workspaces/<str:slug>/projects/<uuid:project_id>/pages/<uuid:pk>/access/",
         PageViewSet.as_view({"post": "access"}),
         name="project-pages-access",
     ),
     path(
-        "workspaces/<str:slug>/projects/<uuid:project_id>/pages/<uuid:page_id>/description/",
+        "workspaces/<str:slug>/projects/<uuid:project_id>/pages/<uuid:pk>/transactions/",
+        PageLogEndpoint.as_view(),
+        name="page-transactions",
+    ),
+    path(
+        "workspaces/<str:slug>/projects/<uuid:project_id>/pages/<uuid:pk>/transactions/<uuid:transaction>/",
+        PageLogEndpoint.as_view(),
+        name="page-transactions",
+    ),
+    path(
+        "workspaces/<str:slug>/projects/<uuid:project_id>/pages/<uuid:pk>/sub-pages/",
+        SubPagesEndpoint.as_view(),
+        name="sub-page",
+    ),
+    path(
+        "workspaces/<str:slug>/projects/<uuid:project_id>/pages/<uuid:pk>/description/",
         PagesDescriptionViewSet.as_view({"get": "retrieve", "patch": "partial_update"}),
         name="page-description",
     ),

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

@@ -165,6 +165,8 @@ from .api import ApiTokenEndpoint, ServiceApiTokenEndpoint
 from .page.base import (
     PageViewSet,
     PageFavoriteViewSet,
+    PageLogEndpoint,
+    SubPagesEndpoint,
     PagesDescriptionViewSet,
     PageDuplicateEndpoint,
 )

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

@@ -504,6 +504,19 @@ class CycleViewSet(BaseViewSet):
     @allow_permission([ROLE.ADMIN], creator=True, model=Cycle)
     def destroy(self, request, slug, project_id, pk):
         cycle = Cycle.objects.get(workspace__slug=slug, project_id=project_id, pk=pk)
+        if cycle.owned_by_id != request.user.id and not (
+            ProjectMember.objects.filter(
+                workspace__slug=slug,
+                member=request.user,
+                role=20,
+                project_id=project_id,
+                is_active=True,
+            ).exists()
+        ):
+            return Response(
+                {"error": "Only admin or owner can delete the cycle"},
+                status=status.HTTP_403_FORBIDDEN,
+            )
 
         cycle_issues = list(
             CycleIssue.objects.filter(cycle_id=self.kwargs.get("pk")).values_list(
@@ -1080,9 +1093,6 @@ class CycleUserPropertiesEndpoint(BaseAPIView):
         )
 
         cycle_properties.filters = request.data.get("filters", cycle_properties.filters)
-        cycle_properties.rich_filters = request.data.get(
-            "rich_filters", cycle_properties.rich_filters
-        )
         cycle_properties.display_filters = request.data.get(
             "display_filters", cycle_properties.display_filters
         )

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

@@ -1,5 +1,4 @@
 # Python imports
-import copy
 import json
 
 # Django imports
@@ -29,15 +28,11 @@ from plane.utils.order_queryset import order_issue_queryset
 from plane.utils.paginator import GroupedOffsetPaginator, SubGroupedOffsetPaginator
 from plane.app.permissions import allow_permission, ROLE
 from plane.utils.host import base_host
-from plane.utils.filters import ComplexFilterBackend
-from plane.utils.filters import IssueFilterSet
 
 
 class CycleIssueViewSet(BaseViewSet):
     serializer_class = CycleIssueSerializer
     model = CycleIssue
-    filter_backends = (ComplexFilterBackend,)
-    filterset_class = IssueFilterSet
 
     webhook_event = "cycle_issue"
     bulk = True
@@ -70,9 +65,24 @@ class CycleIssueViewSet(BaseViewSet):
             .distinct()
         )
 
-    def apply_annotations(self, issues):
-        return (
-            issues.annotate(
+    @method_decorator(gzip_page)
+    @allow_permission([ROLE.ADMIN, ROLE.MEMBER])
+    def list(self, request, slug, project_id, cycle_id):
+        order_by_param = request.GET.get("order_by", "created_at")
+        filters = issue_filters(request.query_params, "GET")
+        issue_queryset = (
+            Issue.issue_objects.filter(
+                issue_cycle__cycle_id=cycle_id, issue_cycle__deleted_at__isnull=True
+            )
+            .filter(project_id=project_id)
+            .filter(workspace__slug=slug)
+            .filter(**filters)
+            .select_related("workspace", "project", "state", "parent")
+            .prefetch_related(
+                "assignees", "labels", "issue_module__module", "issue_cycle__cycle"
+            )
+            .filter(**filters)
+            .annotate(
                 cycle_id=Subquery(
                     CycleIssue.objects.filter(
                         issue=OuterRef("id"), deleted_at__isnull=True
@@ -100,36 +110,11 @@ class CycleIssueViewSet(BaseViewSet):
                 .annotate(count=Func(F("id"), function="Count"))
                 .values("count")
             )
-            .prefetch_related(
-                "assignees", "labels", "issue_module__module", "issue_cycle__cycle"
-            )
         )
-
-    @method_decorator(gzip_page)
-    @allow_permission([ROLE.ADMIN, ROLE.MEMBER])
-    def list(self, request, slug, project_id, cycle_id):
         filters = issue_filters(request.query_params, "GET")
-        issue_queryset = (
-            Issue.issue_objects.filter(
-                issue_cycle__cycle_id=cycle_id, issue_cycle__deleted_at__isnull=True
-            )
-            .filter(project_id=project_id)
-            .filter(workspace__slug=slug)
-        )
-
-        # Apply filtering from filterset
-        issue_queryset = self.filter_queryset(issue_queryset)
-
-        # Apply legacy filters
-        issue_queryset = issue_queryset.filter(**filters)
-
-        # Total count queryset
-        total_issue_queryset = copy.deepcopy(issue_queryset)
-
-        # Applying annotations to the issue queryset
-        issue_queryset = self.apply_annotations(issue_queryset)
 
         order_by_param = request.GET.get("order_by", "-created_at")
+        issue_queryset = issue_queryset.filter(**filters)
         # Issue queryset
         issue_queryset, order_by_param = order_issue_queryset(
             issue_queryset=issue_queryset, order_by_param=order_by_param
@@ -160,7 +145,6 @@ class CycleIssueViewSet(BaseViewSet):
                         request=request,
                         order_by=order_by_param,
                         queryset=issue_queryset,
-                        total_count_queryset=total_issue_queryset,
                         on_results=lambda issues: issue_on_results(
                             group_by=group_by, issues=issues, sub_group_by=sub_group_by
                         ),
@@ -195,7 +179,6 @@ class CycleIssueViewSet(BaseViewSet):
                     request=request,
                     order_by=order_by_param,
                     queryset=issue_queryset,
-                    total_count_queryset=total_issue_queryset,
                     on_results=lambda issues: issue_on_results(
                         group_by=group_by, issues=issues, sub_group_by=sub_group_by
                     ),
@@ -222,7 +205,6 @@ class CycleIssueViewSet(BaseViewSet):
                 order_by=order_by_param,
                 request=request,
                 queryset=issue_queryset,
-                total_count_queryset=total_issue_queryset,
                 on_results=lambda issues: issue_on_results(
                     group_by=group_by, issues=issues, sub_group_by=sub_group_by
                 ),

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

@@ -28,7 +28,6 @@ from plane.db.models import (
     ProjectMember,
     CycleIssue,
     IssueDescriptionVersion,
-    WorkspaceMember,
 )
 from plane.app.serializers import (
     IssueCreateSerializer,
@@ -349,32 +348,17 @@ class IntakeIssueViewSet(BaseViewSet):
             project_id=project_id,
             intake_id=intake_id,
         )
-
-        project_member = ProjectMember.objects.filter(
+        # Get the project member
+        project_member = ProjectMember.objects.get(
             workspace__slug=slug,
             project_id=project_id,
             member=request.user,
             is_active=True,
-        ).first()
-
-        is_workspace_admin = WorkspaceMember.objects.filter(
-            workspace__slug=slug,
-            is_active=True,
-            member=request.user,
-            role=ROLE.ADMIN.value,
-        ).exists()
-
-        if not project_member and not is_workspace_admin:
-            return Response(
-                {"error": "Only admin or creator can update the intake work items"},
-                status=status.HTTP_403_FORBIDDEN,
-            )
-
+        )
         # Only project members admins and created_by users can access this endpoint
-        if (
-            (project_member and project_member.role <= ROLE.GUEST.value)
-            and not is_workspace_admin
-        ) and str(intake_issue.created_by_id) != str(request.user.id):
+        if project_member.role <= 5 and str(intake_issue.created_by_id) != str(
+            request.user.id
+        ):
             return Response(
                 {"error": "You cannot edit intake issues"},
                 status=status.HTTP_400_BAD_REQUEST,
@@ -407,8 +391,8 @@ class IntakeIssueViewSet(BaseViewSet):
                     Value([], output_field=ArrayField(UUIDField())),
                 ),
             ).get(pk=intake_issue.issue_id, workspace__slug=slug, project_id=project_id)
-
-            if project_member and project_member.role <= ROLE.GUEST.value:
+            # Only allow guests to edit name and description
+            if project_member.role <= 5:
                 issue_data = {
                     "name": issue_data.get("name", issue.name),
                     "description_html": issue_data.get(
@@ -416,7 +400,6 @@ class IntakeIssueViewSet(BaseViewSet):
                     ),
                     "description": issue_data.get("description", issue.description),
                 }
-
             current_instance = json.dumps(
                 IssueDetailSerializer(issue).data, cls=DjangoJSONEncoder
             )
@@ -453,10 +436,8 @@ class IntakeIssueViewSet(BaseViewSet):
                     issue_serializer.errors, status=status.HTTP_400_BAD_REQUEST
                 )
 
-        # Only project admins can edit intake issue attributes
-        if (
-            project_member and project_member.role > ROLE.MEMBER.value
-        ) or is_workspace_admin:
+        # Only project admins and members can edit intake issue attributes
+        if project_member.role > 15:
             serializer = IntakeIssueSerializer(
                 intake_issue, data=request.data, partial=True
             )

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

@@ -1,5 +1,4 @@
 # Python imports
-import copy
 import json
 
 # Django imports
@@ -42,20 +41,27 @@ from plane.utils.host import base_host
 
 # Module imports
 from .. import BaseViewSet, BaseAPIView
-from plane.utils.filters import ComplexFilterBackend
-from plane.utils.filters import IssueFilterSet
 
 
 class IssueArchiveViewSet(BaseViewSet):
     serializer_class = IssueFlatSerializer
     model = Issue
 
-    filter_backends = (ComplexFilterBackend,)
-    filterset_class = IssueFilterSet
-
-    def apply_annotations(self, issues):
+    def get_queryset(self):
         return (
-            issues.annotate(
+            Issue.objects.annotate(
+                sub_issues_count=Issue.objects.filter(parent=OuterRef("id"))
+                .order_by()
+                .annotate(count=Func(F("id"), function="Count"))
+                .values("count")
+            )
+            .filter(deleted_at__isnull=True)
+            .filter(archived_at__isnull=False)
+            .filter(project_id=self.kwargs.get("project_id"))
+            .filter(workspace__slug=self.kwargs.get("slug"))
+            .select_related("workspace", "project", "state", "parent")
+            .prefetch_related("assignees", "labels", "issue_module__module")
+            .annotate(
                 cycle_id=Subquery(
                     CycleIssue.objects.filter(
                         issue=OuterRef("id"), deleted_at__isnull=True
@@ -89,15 +95,6 @@ class IssueArchiveViewSet(BaseViewSet):
                     .values("count")
                 )
             )
-            .prefetch_related("assignees", "labels", "issue_module__module")
-        )
-
-    def get_queryset(self):
-        return (
-            Issue.objects.filter(Q(type__isnull=True) | Q(type__is_epic=False))
-            .filter(archived_at__isnull=False)
-            .filter(project_id=self.kwargs.get("project_id"))
-            .filter(workspace__slug=self.kwargs.get("slug"))
         )
 
     @method_decorator(gzip_page)
@@ -108,25 +105,26 @@ class IssueArchiveViewSet(BaseViewSet):
 
         order_by_param = request.GET.get("order_by", "-created_at")
 
-        issue_queryset = self.get_queryset()
+        issue_queryset = self.get_queryset().filter(**filters)
+
+        total_issue_queryset = Issue.objects.filter(
+            deleted_at__isnull=True,
+            archived_at__isnull=False,
+            project_id=project_id,
+            workspace__slug=slug,
+        ).filter(**filters)
+
+        total_issue_queryset = (
+            total_issue_queryset
+            if show_sub_issues == "true"
+            else total_issue_queryset.filter(parent__isnull=True)
+        )
 
         issue_queryset = (
             issue_queryset
             if show_sub_issues == "true"
             else issue_queryset.filter(parent__isnull=True)
         )
-        # Apply filtering from filterset
-        issue_queryset = self.filter_queryset(issue_queryset)
-
-        # Apply legacy filters
-        issue_queryset = issue_queryset.filter(**filters)
-
-        # Total count queryset
-        total_issue_queryset = copy.deepcopy(issue_queryset)
-
-        # Applying annotations to the issue queryset
-        issue_queryset = self.apply_annotations(issue_queryset)
-
         # Issue queryset
         issue_queryset, order_by_param = order_issue_queryset(
             issue_queryset=issue_queryset, order_by_param=order_by_param

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

@@ -1,5 +1,4 @@
 # Python imports
-import copy
 import json
 
 # Django imports
@@ -7,16 +6,16 @@ from django.contrib.postgres.aggregates import ArrayAgg
 from django.contrib.postgres.fields import ArrayField
 from django.core.serializers.json import DjangoJSONEncoder
 from django.db.models import (
-    Count,
     Exists,
     F,
     Func,
     OuterRef,
     Prefetch,
     Q,
-    Subquery,
     UUIDField,
     Value,
+    Subquery,
+    Count,
 )
 from django.db.models.functions import Coalesce
 from django.utils import timezone
@@ -28,55 +27,50 @@ from rest_framework import status
 from rest_framework.response import Response
 
 # Module imports
-from plane.app.permissions import ROLE, allow_permission
+from plane.app.permissions import allow_permission, ROLE
 from plane.app.serializers import (
     IssueCreateSerializer,
     IssueDetailSerializer,
-    IssueListDetailSerializer,
-    IssueSerializer,
     IssueUserPropertySerializer,
+    IssueSerializer,
+    IssueListDetailSerializer,
 )
 from plane.bgtasks.issue_activities_task import issue_activity
-from plane.bgtasks.issue_description_version_task import issue_description_version_task
-from plane.bgtasks.recent_visited_task import recent_visited_task
-from plane.bgtasks.webhook_task import model_activity
 from plane.db.models import (
-    CycleIssue,
-    FileAsset,
-    IntakeIssue,
     Issue,
-    IssueAssignee,
-    IssueLabel,
+    FileAsset,
     IssueLink,
-    IssueReaction,
-    IssueRelation,
-    IssueSubscriber,
     IssueUserProperty,
-    ModuleIssue,
+    IssueReaction,
+    IssueSubscriber,
     Project,
     ProjectMember,
+    CycleIssue,
     UserRecentVisit,
+    ModuleIssue,
+    IssueRelation,
+    IssueAssignee,
+    IssueLabel,
+    IntakeIssue,
 )
-from plane.utils.filters import ComplexFilterBackend, IssueFilterSet
-from plane.utils.global_paginator import paginate
 from plane.utils.grouper import (
     issue_group_values,
     issue_on_results,
     issue_queryset_grouper,
 )
-from plane.utils.host import base_host
 from plane.utils.issue_filters import issue_filters
 from plane.utils.order_queryset import order_issue_queryset
 from plane.utils.paginator import GroupedOffsetPaginator, SubGroupedOffsetPaginator
-from plane.utils.timezone_converter import user_timezone_converter
-
 from .. import BaseAPIView, BaseViewSet
+from plane.utils.timezone_converter import user_timezone_converter
+from plane.bgtasks.recent_visited_task import recent_visited_task
+from plane.utils.global_paginator import paginate
+from plane.bgtasks.webhook_task import model_activity
+from plane.bgtasks.issue_description_version_task import issue_description_version_task
+from plane.utils.host import base_host
 
 
 class IssueListEndpoint(BaseAPIView):
-    filter_backends = (ComplexFilterBackend,)
-    filterset_class = IssueFilterSet
-
     @allow_permission([ROLE.ADMIN, ROLE.MEMBER, ROLE.GUEST])
     def get(self, request, slug, project_id):
         issue_ids = request.GET.get("issues", False)
@@ -88,27 +82,14 @@ class IssueListEndpoint(BaseAPIView):
 
         issue_ids = [issue_id for issue_id in issue_ids.split(",") if issue_id != ""]
 
-        # Base queryset with basic filters
-        queryset = Issue.issue_objects.filter(
-            workspace__slug=slug, project_id=project_id, pk__in=issue_ids
-        )
-
-        # Apply filtering from filterset
-        queryset = self.filter_queryset(queryset)
-
-        # Apply legacy filters
-        filters = issue_filters(request.query_params, "GET")
-        issue_queryset = queryset.filter(**filters)
-
-        # Add select_related, prefetch_related if fields or expand is not None
-        if self.fields or self.expand:
-            issue_queryset = issue_queryset.select_related(
-                "workspace", "project", "state", "parent"
-            ).prefetch_related("assignees", "labels", "issue_module__module")
-
-        # Add annotations
-        issue_queryset = (
-            issue_queryset.annotate(
+        queryset = (
+            Issue.issue_objects.filter(
+                workspace__slug=slug, project_id=project_id, pk__in=issue_ids
+            )
+            .filter(workspace__slug=self.kwargs.get("slug"))
+            .select_related("workspace", "project", "state", "parent")
+            .prefetch_related("assignees", "labels", "issue_module__module")
+            .annotate(
                 cycle_id=Subquery(
                     CycleIssue.objects.filter(
                         issue=OuterRef("id"), deleted_at__isnull=True
@@ -136,10 +117,12 @@ class IssueListEndpoint(BaseAPIView):
                 .annotate(count=Func(F("id"), function="Count"))
                 .values("count")
             )
-            .distinct()
-        )
+        ).distinct()
+
+        filters = issue_filters(request.query_params, "GET")
 
         order_by_param = request.GET.get("order_by", "-created_at")
+        issue_queryset = queryset.filter(**filters)
         # Issue queryset
         issue_queryset, _ = order_issue_queryset(
             issue_queryset=issue_queryset, order_by_param=order_by_param
@@ -203,12 +186,6 @@ class IssueListEndpoint(BaseAPIView):
 
 
 class IssueViewSet(BaseViewSet):
-    model = Issue
-    webhook_event = "issue"
-    search_fields = ["name"]
-    filter_backends = (ComplexFilterBackend,)
-    filterset_class = IssueFilterSet
-
     def get_serializer_class(self):
         return (
             IssueCreateSerializer
@@ -216,17 +193,20 @@ class IssueViewSet(BaseViewSet):
             else IssueSerializer
         )
 
+    model = Issue
+    webhook_event = "issue"
+
+    search_fields = ["name"]
+
+    filterset_fields = ["state__name", "assignees__id", "workspace__id"]
+
     def get_queryset(self):
-        issues = Issue.issue_objects.filter(
-            project_id=self.kwargs.get("project_id"),
-            workspace__slug=self.kwargs.get("slug"),
-        ).distinct()
-
-        return issues
-
-    def apply_annotations(self, issues):
-        issues = (
-            issues.annotate(
+        return (
+            Issue.issue_objects.filter(project_id=self.kwargs.get("project_id"))
+            .filter(workspace__slug=self.kwargs.get("slug"))
+            .select_related("workspace", "project", "state", "parent")
+            .prefetch_related("assignees", "labels", "issue_module__module")
+            .annotate(
                 cycle_id=Subquery(
                     CycleIssue.objects.filter(
                         issue=OuterRef("id"), deleted_at__isnull=True
@@ -262,8 +242,6 @@ class IssueViewSet(BaseViewSet):
             )
         )
 
-        return issues
-
     @method_decorator(gzip_page)
     @allow_permission([ROLE.ADMIN, ROLE.MEMBER, ROLE.GUEST])
     def list(self, request, slug, project_id):
@@ -272,24 +250,15 @@ class IssueViewSet(BaseViewSet):
             extra_filters = {"updated_at__gt": request.GET.get("updated_at__gt")}
 
         project = Project.objects.get(pk=project_id, workspace__slug=slug)
-        query_params = request.query_params.copy()
-
-        filters = issue_filters(query_params, "GET")
+        filters = issue_filters(request.query_params, "GET")
         order_by_param = request.GET.get("order_by", "-created_at")
 
-        issue_queryset = self.get_queryset()
+        issue_queryset = self.get_queryset().filter(**filters, **extra_filters)
+        # Custom ordering for priority and state
 
-        # Apply rich filters
-        issue_queryset = self.filter_queryset(issue_queryset)
-
-        # Apply legacy filters
-        issue_queryset = issue_queryset.filter(**filters, **extra_filters)
-
-        # Keeping a copy of the queryset before applying annotations
-        filtered_issue_queryset = copy.deepcopy(issue_queryset)
-
-        # Applying annotations to the issue queryset
-        issue_queryset = self.apply_annotations(issue_queryset)
+        total_issue_queryset = Issue.issue_objects.filter(
+            project_id=project_id, workspace__slug=slug
+        ).filter(**filters, **extra_filters)
 
         # Issue queryset
         issue_queryset, order_by_param = order_issue_queryset(
@@ -323,16 +292,14 @@ class IssueViewSet(BaseViewSet):
             and not project.guest_view_all_features
         ):
             issue_queryset = issue_queryset.filter(created_by=request.user)
-            filtered_issue_queryset = filtered_issue_queryset.filter(
-                created_by=request.user
-            )
+            total_issue_queryset = total_issue_queryset.filter(created_by=request.user)
 
         if group_by:
             if sub_group_by:
                 if group_by == sub_group_by:
                     return Response(
                         {
-                            "error": "Group by and sub group by cannot have same parameters"  # noqa: E501
+                            "error": "Group by and sub group by cannot have same parameters"
                         },
                         status=status.HTTP_400_BAD_REQUEST,
                     )
@@ -341,7 +308,7 @@ class IssueViewSet(BaseViewSet):
                         request=request,
                         order_by=order_by_param,
                         queryset=issue_queryset,
-                        total_count_queryset=filtered_issue_queryset,
+                        total_count_queryset=total_issue_queryset,
                         on_results=lambda issues: issue_on_results(
                             group_by=group_by, issues=issues, sub_group_by=sub_group_by
                         ),
@@ -351,14 +318,12 @@ class IssueViewSet(BaseViewSet):
                             slug=slug,
                             project_id=project_id,
                             filters=filters,
-                            queryset=filtered_issue_queryset,
                         ),
                         sub_group_by_fields=issue_group_values(
                             field=sub_group_by,
                             slug=slug,
                             project_id=project_id,
                             filters=filters,
-                            queryset=filtered_issue_queryset,
                         ),
                         group_by_field_name=group_by,
                         sub_group_by_field_name=sub_group_by,
@@ -377,7 +342,7 @@ class IssueViewSet(BaseViewSet):
                     request=request,
                     order_by=order_by_param,
                     queryset=issue_queryset,
-                    total_count_queryset=filtered_issue_queryset,
+                    total_count_queryset=total_issue_queryset,
                     on_results=lambda issues: issue_on_results(
                         group_by=group_by, issues=issues, sub_group_by=sub_group_by
                     ),
@@ -387,7 +352,6 @@ class IssueViewSet(BaseViewSet):
                         slug=slug,
                         project_id=project_id,
                         filters=filters,
-                        queryset=filtered_issue_queryset,
                     ),
                     group_by_field_name=group_by,
                     count_filter=Q(
@@ -404,7 +368,7 @@ class IssueViewSet(BaseViewSet):
                 order_by=order_by_param,
                 request=request,
                 queryset=issue_queryset,
-                total_count_queryset=filtered_issue_queryset,
+                total_count_queryset=total_issue_queryset,
                 on_results=lambda issues: issue_on_results(
                     group_by=group_by, issues=issues, sub_group_by=sub_group_by
                 ),
@@ -438,11 +402,9 @@ class IssueViewSet(BaseViewSet):
                 notification=True,
                 origin=base_host(request=request, is_app=True),
             )
-            queryset = self.get_queryset()
-            queryset = self.apply_annotations(queryset)
             issue = (
                 issue_queryset_grouper(
-                    queryset=queryset.filter(pk=serializer.data["id"]),
+                    queryset=self.get_queryset().filter(pk=serializer.data["id"]),
                     group_by=None,
                     sub_group_by=None,
                 )
@@ -647,10 +609,9 @@ class IssueViewSet(BaseViewSet):
         allowed_roles=[ROLE.ADMIN, ROLE.MEMBER], creator=True, model=Issue
     )
     def partial_update(self, request, slug, project_id, pk=None):
-        queryset = self.get_queryset()
-        queryset = self.apply_annotations(queryset)
         issue = (
-            queryset.annotate(
+            self.get_queryset()
+            .annotate(
                 label_ids=Coalesce(
                     ArrayAgg(
                         "labels__id",
@@ -769,9 +730,6 @@ class IssueUserDisplayPropertyEndpoint(BaseAPIView):
             user=request.user, project_id=project_id
         )
 
-        issue_property.rich_filters = request.data.get(
-            "rich_filters", issue_property.rich_filters
-        )
         issue_property.filters = request.data.get("filters", issue_property.filters)
         issue_property.display_filters = request.data.get(
             "display_filters", issue_property.display_filters
@@ -1011,59 +969,6 @@ class IssuePaginatedViewSet(BaseViewSet):
 
 
 class IssueDetailEndpoint(BaseAPIView):
-    filter_backends = (ComplexFilterBackend,)
-    filterset_class = IssueFilterSet
-
-    def apply_annotations(self, issues):
-        return (
-            issues.annotate(
-                cycle_id=Subquery(
-                    CycleIssue.objects.filter(
-                        issue=OuterRef("id"), deleted_at__isnull=True
-                    ).values("cycle_id")[:1]
-                )
-            )
-            .annotate(
-                link_count=IssueLink.objects.filter(issue=OuterRef("id"))
-                .order_by()
-                .annotate(count=Func(F("id"), function="Count"))
-                .values("count")
-            )
-            .annotate(
-                attachment_count=FileAsset.objects.filter(
-                    issue_id=OuterRef("id"),
-                    entity_type=FileAsset.EntityTypeContext.ISSUE_ATTACHMENT,
-                )
-                .order_by()
-                .annotate(count=Func(F("id"), function="Count"))
-                .values("count")
-            )
-            .annotate(
-                sub_issues_count=Issue.issue_objects.filter(parent=OuterRef("id"))
-                .order_by()
-                .annotate(count=Func(F("id"), function="Count"))
-                .values("count")
-            )
-            .prefetch_related(
-                Prefetch(
-                    "issue_assignee",
-                    queryset=IssueAssignee.objects.all(),
-                )
-            )
-            .prefetch_related(
-                Prefetch(
-                    "label_issue",
-                    queryset=IssueLabel.objects.all(),
-                )
-            )
-            .prefetch_related(
-                Prefetch(
-                    "issue_module",
-                    queryset=ModuleIssue.objects.all(),
-                )
-            )
-        )
-
     @allow_permission([ROLE.ADMIN, ROLE.MEMBER, ROLE.GUEST])
     def get(self, request, slug, project_id):
         filters = issue_filters(request.query_params, "GET")
@@ -1097,9 +1002,56 @@ class IssueDetailEndpoint(BaseAPIView):
             .values("id")
         )
         # Main issue query
-        issue = Issue.issue_objects.filter(
-            workspace__slug=slug, project_id=project_id
-        ).filter(Exists(permission_subquery))
+        issue = (
+            Issue.issue_objects.filter(workspace__slug=slug, project_id=project_id)
+            .filter(Exists(permission_subquery))
+            .prefetch_related(
+                Prefetch(
+                    "issue_assignee",
+                    queryset=IssueAssignee.objects.all(),
+                )
+            )
+            .prefetch_related(
+                Prefetch(
+                    "label_issue",
+                    queryset=IssueLabel.objects.all(),
+                )
+            )
+            .prefetch_related(
+                Prefetch(
+                    "issue_module",
+                    queryset=ModuleIssue.objects.all(),
+                )
+            )
+            .annotate(
+                cycle_id=Subquery(
+                    CycleIssue.objects.filter(
+                        issue=OuterRef("id"), deleted_at__isnull=True
+                    ).values("cycle_id")[:1]
+                )
+            )
+            .annotate(
+                link_count=IssueLink.objects.filter(issue=OuterRef("id"))
+                .order_by()
+                .annotate(count=Func(F("id"), function="Count"))
+                .values("count")
+            )
+            .annotate(
+                attachment_count=FileAsset.objects.filter(
+                    issue_id=OuterRef("id"),
+                    entity_type=FileAsset.EntityTypeContext.ISSUE_ATTACHMENT,
+                )
+                .order_by()
+                .annotate(count=Func(F("id"), function="Count"))
+                .values("count")
+            )
+            .annotate(
+                sub_issues_count=Issue.issue_objects.filter(parent=OuterRef("id"))
+                .order_by()
+                .annotate(count=Func(F("id"), function="Count"))
+                .values("count")
+            )
+        )
 
         # Add additional prefetch based on expand parameter
         if self.expand:
@@ -1118,20 +1070,8 @@ class IssueDetailEndpoint(BaseAPIView):
                     )
                 )
 
-        # Apply filtering from filterset
-        issue = self.filter_queryset(issue)
-
-        # Apply legacy filters
         issue = issue.filter(**filters)
-
-        # Total count queryset
-        total_issue_queryset = copy.deepcopy(issue)
-
-        # Applying annotations to the issue queryset
-        issue = self.apply_annotations(issue)
-
         order_by_param = request.GET.get("order_by", "-created_at")
-
         # Issue queryset
         issue, order_by_param = order_issue_queryset(
             issue_queryset=issue, order_by_param=order_by_param
@@ -1139,8 +1079,7 @@ class IssueDetailEndpoint(BaseAPIView):
         return self.paginate(
             request=request,
             order_by=order_by_param,
-            queryset=issue,
-            total_count_queryset=total_issue_queryset,
+            queryset=(issue),
             on_results=lambda issue: IssueListDetailSerializer(
                 issue, many=True, fields=self.fields, expand=self.expand
             ).data,

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

@@ -232,6 +232,9 @@ class ModuleViewSet(BaseViewSet):
             .filter(project_id=self.kwargs.get("project_id"))
             .filter(workspace__slug=self.kwargs.get("slug"))
             .annotate(is_favorite=Exists(favorite_subquery))
+            .select_related("project")
+            .select_related("workspace")
+            .select_related("lead")
             .prefetch_related("members")
             .prefetch_related(
                 Prefetch(
@@ -312,10 +315,7 @@ class ModuleViewSet(BaseViewSet):
                     ArrayAgg(
                         "members__id",
                         distinct=True,
-                        filter=Q(
-                            members__id__isnull=False,
-                            modulemember__deleted_at__isnull=True,
-                        ),
+                        filter=~Q(members__id__isnull=True),
                     ),
                     Value([], output_field=ArrayField(UUIDField())),
                 )
@@ -904,9 +904,6 @@ class ModuleUserPropertiesEndpoint(BaseAPIView):
         module_properties.filters = request.data.get(
             "filters", module_properties.filters
         )
-        module_properties.rich_filters = request.data.get(
-            "rich_filters", module_properties.rich_filters
-        )
         module_properties.display_filters = request.data.get(
             "display_filters", module_properties.display_filters
         )

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

@@ -1,5 +1,4 @@
 # Python imports
-import copy
 import json
 
 from django.db.models import F, Func, OuterRef, Q, Subquery
@@ -32,8 +31,8 @@ from plane.utils.grouper import (
 from plane.utils.issue_filters import issue_filters
 from plane.utils.order_queryset import order_issue_queryset
 from plane.utils.paginator import GroupedOffsetPaginator, SubGroupedOffsetPaginator
-from plane.utils.filters import ComplexFilterBackend
-from plane.utils.filters import IssueFilterSet
+
+# Module imports
 from .. import BaseViewSet
 from plane.utils.host import base_host
 
@@ -43,12 +42,20 @@ class ModuleIssueViewSet(BaseViewSet):
     model = ModuleIssue
     webhook_event = "module_issue"
     bulk = True
-    filter_backends = (ComplexFilterBackend,)
-    filterset_class = IssueFilterSet
 
-    def apply_annotations(self, issues):
+    filterset_fields = ["issue__labels__id", "issue__assignees__id"]
+
+    def get_queryset(self):
         return (
-            issues.annotate(
+            Issue.issue_objects.filter(
+                project_id=self.kwargs.get("project_id"),
+                workspace__slug=self.kwargs.get("slug"),
+                issue_module__module_id=self.kwargs.get("module_id"),
+                issue_module__deleted_at__isnull=True,
+            )
+            .select_related("workspace", "project", "state", "parent")
+            .prefetch_related("assignees", "labels", "issue_module__module")
+            .annotate(
                 cycle_id=Subquery(
                     CycleIssue.objects.filter(
                         issue=OuterRef("id"), deleted_at__isnull=True
@@ -76,37 +83,13 @@ class ModuleIssueViewSet(BaseViewSet):
                 .annotate(count=Func(F("id"), function="Count"))
                 .values("count")
             )
-            .prefetch_related("assignees", "labels", "issue_module__module")
-        )
-
-    def get_queryset(self):
-        return (
-            Issue.issue_objects.filter(
-                project_id=self.kwargs.get("project_id"),
-                workspace__slug=self.kwargs.get("slug"),
-                issue_module__module_id=self.kwargs.get("module_id"),
-                issue_module__deleted_at__isnull=True,
-            )
         ).distinct()
 
     @method_decorator(gzip_page)
     @allow_permission([ROLE.ADMIN, ROLE.MEMBER])
     def list(self, request, slug, project_id, module_id):
         filters = issue_filters(request.query_params, "GET")
-        issue_queryset = self.get_queryset()
-
-        # Apply filtering from filterset
-        issue_queryset = self.filter_queryset(issue_queryset)
-
-        # Apply legacy filters
-        issue_queryset = issue_queryset.filter(**filters)
-
-        # Total count queryset
-        total_issue_queryset = copy.deepcopy(issue_queryset)
-
-        # Apply annotations to the issue queryset
-        issue_queryset = self.apply_annotations(issue_queryset)
-
+        issue_queryset = self.get_queryset().filter(**filters)
         order_by_param = request.GET.get("order_by", "created_at")
 
         # Issue queryset
@@ -139,7 +122,6 @@ class ModuleIssueViewSet(BaseViewSet):
                         request=request,
                         order_by=order_by_param,
                         queryset=issue_queryset,
-                        total_count_queryset=total_issue_queryset,
                         on_results=lambda issues: issue_on_results(
                             group_by=group_by, issues=issues, sub_group_by=sub_group_by
                         ),
@@ -149,14 +131,12 @@ class ModuleIssueViewSet(BaseViewSet):
                             slug=slug,
                             project_id=project_id,
                             filters=filters,
-                            queryset=total_issue_queryset,
                         ),
                         sub_group_by_fields=issue_group_values(
                             field=sub_group_by,
                             slug=slug,
                             project_id=project_id,
                             filters=filters,
-                            queryset=total_issue_queryset,
                         ),
                         group_by_field_name=group_by,
                         sub_group_by_field_name=sub_group_by,
@@ -176,7 +156,6 @@ class ModuleIssueViewSet(BaseViewSet):
                     request=request,
                     order_by=order_by_param,
                     queryset=issue_queryset,
-                    total_count_queryset=total_issue_queryset,
                     on_results=lambda issues: issue_on_results(
                         group_by=group_by, issues=issues, sub_group_by=sub_group_by
                     ),
@@ -186,7 +165,6 @@ class ModuleIssueViewSet(BaseViewSet):
                         slug=slug,
                         project_id=project_id,
                         filters=filters,
-                        queryset=total_issue_queryset,
                     ),
                     group_by_field_name=group_by,
                     count_filter=Q(
@@ -204,7 +182,6 @@ class ModuleIssueViewSet(BaseViewSet):
                 order_by=order_by_param,
                 request=request,
                 queryset=issue_queryset,
-                total_count_queryset=total_issue_queryset,
                 on_results=lambda issues: issue_on_results(
                     group_by=group_by, issues=issues, sub_group_by=sub_group_by
                 ),
@@ -305,11 +282,9 @@ class ModuleIssueViewSet(BaseViewSet):
                 project_id=str(project_id),
                 current_instance=json.dumps(
                     {
-                        "module_name": (
-                            module_issue.first().module.name
-                            if (module_issue.first() and module_issue.first().module)
-                            else None
-                        )
+                        "module_name": module_issue.first().module.name
+                        if (module_issue.first() and module_issue.first().module)
+                        else None
                     }
                 ),
                 epoch=int(timezone.now().timestamp()),

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

@@ -6,17 +6,9 @@ from django.core.serializers.json import DjangoJSONEncoder
 
 # Django imports
 from django.db import connection
-from django.db.models import (
-    Exists,
-    OuterRef,
-    Q,
-    Value,
-    UUIDField,
-    Count,
-    Case,
-    When,
-    IntegerField,
-)
+from django.db.models import Exists, OuterRef, Q, Value, UUIDField
+from django.utils.decorators import method_decorator
+from django.views.decorators.gzip import gzip_page
 from django.http import StreamingHttpResponse
 from django.contrib.postgres.aggregates import ArrayAgg
 from django.contrib.postgres.fields import ArrayField
@@ -29,7 +21,9 @@ from rest_framework.response import Response
 # Module imports
 from plane.app.permissions import allow_permission, ROLE
 from plane.app.serializers import (
+    PageLogSerializer,
     PageSerializer,
+    SubPageSerializer,
     PageDetailSerializer,
     PageBinaryUpdateSerializer,
 )
@@ -43,14 +37,11 @@ from plane.db.models import (
     UserRecentVisit,
 )
 from plane.utils.error_codes import ERROR_CODES
-
-# Local imports
 from ..base import BaseAPIView, BaseViewSet
 from plane.bgtasks.page_transaction_task import page_transaction
 from plane.bgtasks.page_version_task import page_version
 from plane.bgtasks.recent_visited_task import recent_visited_task
 from plane.bgtasks.copy_s3_object import copy_s3_objects_of_description_and_assets
-from plane.app.permissions import ProjectPagePermission
 
 
 def unarchive_archive_page_and_descendants(page_id, archived_at):
@@ -72,7 +63,6 @@ def unarchive_archive_page_and_descendants(page_id, archived_at):
 class PageViewSet(BaseViewSet):
     serializer_class = PageSerializer
     model = Page
-    permission_classes = [ProjectPagePermission]
     search_fields = ["name"]
 
     def get_queryset(self):
@@ -127,6 +117,7 @@ class PageViewSet(BaseViewSet):
             .distinct()
         )
 
+    @allow_permission([ROLE.ADMIN, ROLE.MEMBER])
     def create(self, request, slug, project_id):
         serializer = PageSerializer(
             data=request.data,
@@ -148,10 +139,11 @@ class PageViewSet(BaseViewSet):
             return Response(serializer.data, status=status.HTTP_201_CREATED)
         return Response(serializer.errors, status=status.HTTP_400_BAD_REQUEST)
 
-    def partial_update(self, request, slug, project_id, page_id):
+    @allow_permission([ROLE.ADMIN, ROLE.MEMBER])
+    def partial_update(self, request, slug, project_id, pk):
         try:
             page = Page.objects.get(
-                pk=page_id, workspace__slug=slug, projects__id=project_id
+                pk=pk, workspace__slug=slug, projects__id=project_id
             )
 
             if page.is_locked:
@@ -189,7 +181,7 @@ class PageViewSet(BaseViewSet):
                             {"description_html": page_description},
                             cls=DjangoJSONEncoder,
                         ),
-                        page_id=page_id,
+                        page_id=pk,
                     )
 
                 return Response(serializer.data, status=status.HTTP_200_OK)
@@ -202,8 +194,9 @@ class PageViewSet(BaseViewSet):
                 status=status.HTTP_400_BAD_REQUEST,
             )
 
-    def retrieve(self, request, slug, project_id, page_id=None):
-        page = self.get_queryset().filter(pk=page_id).first()
+    @allow_permission([ROLE.ADMIN, ROLE.MEMBER, ROLE.GUEST])
+    def retrieve(self, request, slug, project_id, pk=None):
+        page = self.get_queryset().filter(pk=pk).first()
         project = Project.objects.get(pk=project_id)
         track_visit = request.query_params.get("track_visit", "true").lower() == "true"
 
@@ -234,7 +227,7 @@ class PageViewSet(BaseViewSet):
             )
         else:
             issue_ids = PageLog.objects.filter(
-                page_id=page_id, entity_name="issue"
+                page_id=pk, entity_name="issue"
             ).values_list("entity_identifier", flat=True)
             data = PageDetailSerializer(page).data
             data["issue_ids"] = issue_ids
@@ -242,24 +235,26 @@ class PageViewSet(BaseViewSet):
                 recent_visited_task.delay(
                     slug=slug,
                     entity_name="page",
-                    entity_identifier=page_id,
+                    entity_identifier=pk,
                     user_id=request.user.id,
                     project_id=project_id,
                 )
             return Response(data, status=status.HTTP_200_OK)
 
-    def lock(self, request, slug, project_id, page_id):
+    @allow_permission([ROLE.ADMIN], model=Page, creator=True)
+    def lock(self, request, slug, project_id, pk):
         page = Page.objects.filter(
-            pk=page_id, workspace__slug=slug, projects__id=project_id
+            pk=pk, 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):
+    @allow_permission([ROLE.ADMIN], model=Page, creator=True)
+    def unlock(self, request, slug, project_id, pk):
         page = Page.objects.filter(
-            pk=page_id, workspace__slug=slug, projects__id=project_id
+            pk=pk, workspace__slug=slug, projects__id=project_id
         ).first()
 
         page.is_locked = False
@@ -267,10 +262,11 @@ class PageViewSet(BaseViewSet):
 
         return Response(status=status.HTTP_204_NO_CONTENT)
 
-    def access(self, request, slug, project_id, page_id):
+    @allow_permission([ROLE.ADMIN], model=Page, creator=True)
+    def access(self, request, slug, project_id, pk):
         access = request.data.get("access", 0)
         page = Page.objects.filter(
-            pk=page_id, workspace__slug=slug, projects__id=project_id
+            pk=pk, workspace__slug=slug, projects__id=project_id
         ).first()
 
         # Only update access if the page owner is the requesting user
@@ -289,6 +285,7 @@ class PageViewSet(BaseViewSet):
         page.save()
         return Response(status=status.HTTP_204_NO_CONTENT)
 
+    @allow_permission([ROLE.ADMIN, ROLE.MEMBER, ROLE.GUEST])
     def list(self, request, slug, project_id):
         queryset = self.get_queryset()
         project = Project.objects.get(pk=project_id)
@@ -306,10 +303,9 @@ class PageViewSet(BaseViewSet):
         pages = PageSerializer(queryset, many=True).data
         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
-        )
+    @allow_permission([ROLE.ADMIN], model=Page, creator=True)
+    def archive(self, request, slug, project_id, pk):
+        page = Page.objects.get(pk=pk, workspace__slug=slug, projects__id=project_id)
 
         # only the owner or admin can archive the page
         if (
@@ -325,19 +321,18 @@ class PageViewSet(BaseViewSet):
 
         UserFavorite.objects.filter(
             entity_type="page",
-            entity_identifier=page_id,
+            entity_identifier=pk,
             project_id=project_id,
             workspace__slug=slug,
         ).delete()
 
-        unarchive_archive_page_and_descendants(page_id, datetime.now())
+        unarchive_archive_page_and_descendants(pk, datetime.now())
 
         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
-        )
+    @allow_permission([ROLE.ADMIN], model=Page, creator=True)
+    def unarchive(self, request, slug, project_id, pk):
+        page = Page.objects.get(pk=pk, workspace__slug=slug, projects__id=project_id)
 
         # only the owner or admin can un archive the page
         if (
@@ -351,19 +346,18 @@ class PageViewSet(BaseViewSet):
                 status=status.HTTP_400_BAD_REQUEST,
             )
 
-        # if parent archived then page will be un archived breaking hierarchy
+        # if parent page is archived then the page will be un archived breaking the hierarchy
         if page.parent_id and page.parent.archived_at:
             page.parent = None
             page.save(update_fields=["parent"])
 
-        unarchive_archive_page_and_descendants(page_id, None)
+        unarchive_archive_page_and_descendants(pk, None)
 
         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
-        )
+    @allow_permission([ROLE.ADMIN], model=Page, creator=True)
+    def destroy(self, request, slug, project_id, pk):
+        page = Page.objects.get(pk=pk, workspace__slug=slug, projects__id=project_id)
 
         if page.archived_at is None:
             return Response(
@@ -387,7 +381,7 @@ class PageViewSet(BaseViewSet):
 
         # remove parent from all the children
         _ = Page.objects.filter(
-            parent_id=page_id, projects__id=project_id, workspace__slug=slug
+            parent_id=pk, projects__id=project_id, workspace__slug=slug
         ).update(parent=None)
 
         page.delete()
@@ -395,109 +389,105 @@ class PageViewSet(BaseViewSet):
         UserFavorite.objects.filter(
             project=project_id,
             workspace__slug=slug,
-            entity_identifier=page_id,
+            entity_identifier=pk,
             entity_type="page",
         ).delete()
         # Delete the page from recent visit
         UserRecentVisit.objects.filter(
             project_id=project_id,
             workspace__slug=slug,
-            entity_identifier=page_id,
+            entity_identifier=pk,
             entity_name="page",
         ).delete(soft=False)
         return Response(status=status.HTTP_204_NO_CONTENT)
 
-    def summary(self, request, slug, project_id):
-        queryset = (
-            Page.objects.filter(workspace__slug=slug)
-            .filter(
-                projects__project_projectmember__member=self.request.user,
-                projects__project_projectmember__is_active=True,
-                projects__archived_at__isnull=True,
-            )
-            .filter(parent__isnull=True)
-            .filter(Q(owned_by=request.user) | Q(access=0))
-            .annotate(
-                project=Exists(
-                    ProjectPage.objects.filter(
-                        page_id=OuterRef("id"), project_id=self.kwargs.get("project_id")
-                    )
-                )
-            )
-            .filter(project=True)
-            .distinct()
-        )
-
-        project = Project.objects.get(pk=project_id)
-        if (
-            ProjectMember.objects.filter(
-                workspace__slug=slug,
-                project_id=project_id,
-                member=request.user,
-                role=ROLE.GUEST.value,
-                is_active=True,
-            ).exists()
-            and not project.guest_view_all_features
-        ):
-            queryset = queryset.filter(owned_by=request.user)
-
-        stats = queryset.aggregate(
-            public_pages=Count(
-                Case(
-                    When(access=Page.PUBLIC_ACCESS, archived_at__isnull=True, then=1),
-                    output_field=IntegerField(),
-                )
-            ),
-            private_pages=Count(
-                Case(
-                    When(access=Page.PRIVATE_ACCESS, archived_at__isnull=True, then=1),
-                    output_field=IntegerField(),
-                )
-            ),
-            archived_pages=Count(
-                Case(
-                    When(archived_at__isnull=False, then=1), output_field=IntegerField()
-                )
-            ),
-        )
-
-        return Response(stats, status=status.HTTP_200_OK)
-
 
 class PageFavoriteViewSet(BaseViewSet):
     model = UserFavorite
 
     @allow_permission([ROLE.ADMIN, ROLE.MEMBER])
-    def create(self, request, slug, project_id, page_id):
+    def create(self, request, slug, project_id, pk):
         _ = UserFavorite.objects.create(
             project_id=project_id,
-            entity_identifier=page_id,
+            entity_identifier=pk,
             entity_type="page",
             user=request.user,
         )
         return Response(status=status.HTTP_204_NO_CONTENT)
 
     @allow_permission([ROLE.ADMIN, ROLE.MEMBER])
-    def destroy(self, request, slug, project_id, page_id):
+    def destroy(self, request, slug, project_id, pk):
         page_favorite = UserFavorite.objects.get(
             project=project_id,
             user=request.user,
             workspace__slug=slug,
-            entity_identifier=page_id,
+            entity_identifier=pk,
             entity_type="page",
         )
         page_favorite.delete(soft=False)
         return Response(status=status.HTTP_204_NO_CONTENT)
 
 
-class PagesDescriptionViewSet(BaseViewSet):
-    permission_classes = [ProjectPagePermission]
+class PageLogEndpoint(BaseAPIView):
+    serializer_class = PageLogSerializer
+    model = PageLog
 
-    def retrieve(self, request, slug, project_id, page_id):
-        page = (
-            Page.objects.filter(
-                pk=page_id, workspace__slug=slug, projects__id=project_id
+    def post(self, request, slug, project_id, page_id):
+        serializer = PageLogSerializer(data=request.data)
+        if serializer.is_valid():
+            serializer.save(project_id=project_id, page_id=page_id)
+            return Response(serializer.data, status=status.HTTP_201_CREATED)
+        return Response(serializer.errors, status=status.HTTP_400_BAD_REQUEST)
+
+    def patch(self, request, slug, project_id, page_id, transaction):
+        page_transaction = PageLog.objects.get(
+            workspace__slug=slug,
+            project_id=project_id,
+            page_id=page_id,
+            transaction=transaction,
+        )
+        serializer = PageLogSerializer(
+            page_transaction, 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)
+
+    def delete(self, request, slug, project_id, page_id, transaction):
+        transaction = PageLog.objects.get(
+            workspace__slug=slug,
+            project_id=project_id,
+            page_id=page_id,
+            transaction=transaction,
+        )
+        # Delete the transaction object
+        transaction.delete()
+        return Response(status=status.HTTP_204_NO_CONTENT)
+
+
+class SubPagesEndpoint(BaseAPIView):
+    @method_decorator(gzip_page)
+    def get(self, request, slug, project_id, page_id):
+        pages = (
+            PageLog.objects.filter(
+                page_id=page_id,
+                workspace__slug=slug,
+                entity_name__in=["forward_link", "back_link"],
             )
+            .select_related("project")
+            .select_related("workspace")
+        )
+        return Response(
+            SubPageSerializer(pages, many=True).data, status=status.HTTP_200_OK
+        )
+
+
+class PagesDescriptionViewSet(BaseViewSet):
+    @allow_permission([ROLE.ADMIN, ROLE.MEMBER, ROLE.GUEST])
+    def retrieve(self, request, slug, project_id, pk):
+        page = (
+            Page.objects.filter(pk=pk, workspace__slug=slug, projects__id=project_id)
             .filter(Q(owned_by=self.request.user) | Q(access=0))
             .first()
         )
@@ -517,11 +507,10 @@ class PagesDescriptionViewSet(BaseViewSet):
         response["Content-Disposition"] = 'attachment; filename="page_description.bin"'
         return response
 
-    def partial_update(self, request, slug, project_id, page_id):
+    @allow_permission([ROLE.ADMIN, ROLE.MEMBER, ROLE.GUEST])
+    def partial_update(self, request, slug, project_id, pk):
         page = (
-            Page.objects.filter(
-                pk=page_id, workspace__slug=slug, projects__id=project_id
-            )
+            Page.objects.filter(pk=pk, workspace__slug=slug, projects__id=project_id)
             .filter(Q(owned_by=self.request.user) | Q(access=0))
             .first()
         )
@@ -558,7 +547,7 @@ class PagesDescriptionViewSet(BaseViewSet):
             # Capture the page transaction
             if request.data.get("description_html"):
                 page_transaction.delay(
-                    new_value=request.data, old_value=existing_instance, page_id=page_id
+                    new_value=request.data, old_value=existing_instance, page_id=pk
                 )
 
             # Update the page using serializer
@@ -576,8 +565,7 @@ class PagesDescriptionViewSet(BaseViewSet):
 
 
 class PageDuplicateEndpoint(BaseAPIView):
-    permission_classes = [ProjectPagePermission]
-
+    @allow_permission([ROLE.ADMIN, ROLE.MEMBER, ROLE.GUEST])
     def post(self, request, slug, project_id, page_id):
         page = Page.objects.filter(
             pk=page_id, workspace__slug=slug, projects__id=project_id

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

@@ -7,12 +7,10 @@ from plane.db.models import PageVersion
 from ..base import BaseAPIView
 from plane.app.serializers import PageVersionSerializer, PageVersionDetailSerializer
 from plane.app.permissions import allow_permission, ROLE
-from plane.app.permissions import ProjectPagePermission
+
 
 class PageVersionEndpoint(BaseAPIView):
-
-    permission_classes = [ProjectPagePermission]
-
+    @allow_permission(allowed_roles=[ROLE.ADMIN, ROLE.MEMBER, ROLE.GUEST])
     def get(self, request, slug, project_id, page_id, pk=None):
         # Check if pk is provided
         if pk:

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

@@ -1,5 +1,3 @@
-import copy
-
 # Django imports
 from django.db.models import (
     Exists,
@@ -41,8 +39,6 @@ from plane.utils.order_queryset import order_issue_queryset
 from plane.bgtasks.recent_visited_task import recent_visited_task
 from .. import BaseViewSet
 from plane.db.models import UserFavorite
-from plane.utils.filters import ComplexFilterBackend
-from plane.utils.filters import IssueFilterSet
 
 
 class WorkspaceViewViewSet(BaseViewSet):
@@ -60,6 +56,7 @@ class WorkspaceViewViewSet(BaseViewSet):
             .filter(workspace__slug=self.kwargs.get("slug"))
             .filter(project__isnull=True)
             .filter(Q(owned_by=self.request.user) | Q(access=1))
+            .select_related("workspace")
             .order_by(self.request.GET.get("order_by", "-created_at"))
             .distinct()
         )
@@ -148,9 +145,6 @@ class WorkspaceViewViewSet(BaseViewSet):
 
 
 class WorkspaceViewIssuesViewSet(BaseViewSet):
-    filter_backends = (ComplexFilterBackend,)
-    filterset_class = IssueFilterSet
-
     def _get_project_permission_filters(self):
         """
         Get common project permission filters for guest users and role-based access control.
@@ -173,9 +167,35 @@ class WorkspaceViewIssuesViewSet(BaseViewSet):
             project__project_projectmember__is_active=True,
         )
 
-    def apply_annotations(self, issues):
+    def get_queryset(self):
         return (
-            issues.annotate(
+            Issue.issue_objects.annotate(
+                sub_issues_count=Issue.issue_objects.filter(parent=OuterRef("id"))
+                .order_by()
+                .annotate(count=Func(F("id"), function="Count"))
+                .values("count")
+            )
+            .filter(workspace__slug=self.kwargs.get("slug"))
+            .select_related("state")
+            .prefetch_related(
+                Prefetch(
+                    "issue_assignee",
+                    queryset=IssueAssignee.objects.all(),
+                )
+            )
+            .prefetch_related(
+                Prefetch(
+                    "label_issue",
+                    queryset=IssueLabel.objects.all(),
+                )
+            )
+            .prefetch_related(
+                Prefetch(
+                    "issue_module",
+                    queryset=ModuleIssue.objects.all(),
+                )
+            )
+            .annotate(
                 cycle_id=Subquery(
                     CycleIssue.objects.filter(
                         issue=OuterRef("id"), deleted_at__isnull=True
@@ -203,56 +223,31 @@ class WorkspaceViewIssuesViewSet(BaseViewSet):
                 .annotate(count=Func(F("id"), function="Count"))
                 .values("count")
             )
-            .prefetch_related(
-                Prefetch(
-                    "issue_assignee",
-                    queryset=IssueAssignee.objects.all(),
-                )
-            )
-            .prefetch_related(
-                Prefetch(
-                    "label_issue",
-                    queryset=IssueLabel.objects.all(),
-                )
-            )
-            .prefetch_related(
-                Prefetch(
-                    "issue_module",
-                    queryset=ModuleIssue.objects.all(),
-                )
-            )
         )
 
-    def get_queryset(self):
-        return Issue.issue_objects.filter(workspace__slug=self.kwargs.get("slug"))
-
     @method_decorator(gzip_page)
     @allow_permission(
         allowed_roles=[ROLE.ADMIN, ROLE.MEMBER, ROLE.GUEST], level="WORKSPACE"
     )
     def list(self, request, slug):
-        issue_queryset = self.get_queryset()
-
-        # Apply filtering from filterset
-        issue_queryset = self.filter_queryset(issue_queryset)
-
+        filters = issue_filters(request.query_params, "GET")
         order_by_param = request.GET.get("order_by", "-created_at")
 
-        # Apply legacy filters
-        filters = issue_filters(request.query_params, "GET")
-        issue_queryset = issue_queryset.filter(**filters)
+        issue_queryset = self.get_queryset().filter(**filters)
 
         # Get common project permission filters
         permission_filters = self._get_project_permission_filters()
-        # Apply project permission filters to the issue queryset
-        issue_queryset = issue_queryset.filter(permission_filters)
 
         # Base query for the counts
-        total_issue_count_queryset = copy.deepcopy(issue_queryset)
-        total_issue_count_queryset = total_issue_count_queryset.only("id")
+        total_issue_count = (
+            Issue.issue_objects.filter(**filters)
+            .filter(workspace__slug=slug)
+            .filter(permission_filters)
+            .only("id")
+        )
 
-        # Apply annotations to the issue queryset
-        issue_queryset = self.apply_annotations(issue_queryset)
+        # Apply project permission filters to the issue queryset
+        issue_queryset = issue_queryset.filter(permission_filters)
 
         # Issue queryset
         issue_queryset, order_by_param = order_issue_queryset(
@@ -265,7 +260,7 @@ class WorkspaceViewIssuesViewSet(BaseViewSet):
             request=request,
             queryset=issue_queryset,
             on_results=lambda issues: ViewIssueListSerializer(issues, many=True).data,
-            total_count_queryset=total_issue_count_queryset,
+            total_count_queryset=total_issue_count,
         )
 
 

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

@@ -1,5 +1,4 @@
 # Python imports
-import copy
 from datetime import date
 
 from dateutil.relativedelta import relativedelta
@@ -57,8 +56,6 @@ from plane.utils.grouper import (
 from plane.utils.issue_filters import issue_filters
 from plane.utils.order_queryset import order_issue_queryset
 from plane.utils.paginator import GroupedOffsetPaginator, SubGroupedOffsetPaginator
-from plane.utils.filters import ComplexFilterBackend
-from plane.utils.filters import IssueFilterSet
 
 
 class UserLastProjectWithWorkspaceEndpoint(BaseAPIView):
@@ -94,12 +91,23 @@ class UserLastProjectWithWorkspaceEndpoint(BaseAPIView):
 class WorkspaceUserProfileIssuesEndpoint(BaseAPIView):
     permission_classes = [WorkspaceViewerPermission]
 
-    filter_backends = (ComplexFilterBackend,)
-    filterset_class = IssueFilterSet
+    def get(self, request, slug, user_id):
+        filters = issue_filters(request.query_params, "GET")
 
-    def apply_annotations(self, issues):
-        return (
-            issues.annotate(
+        order_by_param = request.GET.get("order_by", "-created_at")
+        issue_queryset = (
+            Issue.issue_objects.filter(
+                Q(assignees__in=[user_id])
+                | Q(created_by_id=user_id)
+                | Q(issue_subscribers__subscriber_id=user_id),
+                workspace__slug=slug,
+                project__project_projectmember__member=request.user,
+                project__project_projectmember__is_active=True,
+            )
+            .filter(**filters)
+            .select_related("workspace", "project", "state", "parent")
+            .prefetch_related("assignees", "labels", "issue_module__module")
+            .annotate(
                 cycle_id=Subquery(
                     CycleIssue.objects.filter(
                         issue=OuterRef("id"), deleted_at__isnull=True
@@ -127,36 +135,8 @@ class WorkspaceUserProfileIssuesEndpoint(BaseAPIView):
                 .annotate(count=Func(F("id"), function="Count"))
                 .values("count")
             )
-            .prefetch_related("assignees", "labels", "issue_module__module")
-        )
-
-    def get(self, request, slug, user_id):
-        filters = issue_filters(request.query_params, "GET")
-
-        order_by_param = request.GET.get("order_by", "-created_at")
-        issue_queryset = Issue.issue_objects.filter(
-            id__in=Issue.issue_objects.filter(
-                Q(assignees__in=[user_id])
-                | Q(created_by_id=user_id)
-                | Q(issue_subscribers__subscriber_id=user_id),
-                workspace__slug=slug,
-            ).values_list("id", flat=True),
-            workspace__slug=slug,
-            project__project_projectmember__member=request.user,
-            project__project_projectmember__is_active=True,
-        )
-
-        # Apply filtering from filterset
-        issue_queryset = self.filter_queryset(issue_queryset)
-
-        # Apply legacy filters
-        issue_queryset = issue_queryset.filter(**filters)
-
-        # Total count queryset
-        total_issue_queryset = copy.deepcopy(issue_queryset)
-
-        # Apply annotations to the issue queryset
-        issue_queryset = self.apply_annotations(issue_queryset)
+            .order_by("created_at")
+        ).distinct()
 
         # Issue queryset
         issue_queryset, order_by_param = order_issue_queryset(
@@ -177,7 +157,7 @@ class WorkspaceUserProfileIssuesEndpoint(BaseAPIView):
                 if group_by == sub_group_by:
                     return Response(
                         {
-                            "error": "Group by and sub group by cannot have same parameters"  # noqa: E501
+                            "error": "Group by and sub group by cannot have same parameters"
                         },
                         status=status.HTTP_400_BAD_REQUEST,
                     )
@@ -186,22 +166,15 @@ class WorkspaceUserProfileIssuesEndpoint(BaseAPIView):
                         request=request,
                         order_by=order_by_param,
                         queryset=issue_queryset,
-                        total_count_queryset=total_issue_queryset,
                         on_results=lambda issues: issue_on_results(
                             group_by=group_by, issues=issues, sub_group_by=sub_group_by
                         ),
                         paginator_cls=SubGroupedOffsetPaginator,
                         group_by_fields=issue_group_values(
-                            field=group_by,
-                            slug=slug,
-                            filters=filters,
-                            queryset=total_issue_queryset,
+                            field=group_by, slug=slug, filters=filters
                         ),
                         sub_group_by_fields=issue_group_values(
-                            field=sub_group_by,
-                            slug=slug,
-                            filters=filters,
-                            queryset=total_issue_queryset,
+                            field=sub_group_by, slug=slug, filters=filters
                         ),
                         group_by_field_name=group_by,
                         sub_group_by_field_name=sub_group_by,
@@ -220,16 +193,12 @@ class WorkspaceUserProfileIssuesEndpoint(BaseAPIView):
                     request=request,
                     order_by=order_by_param,
                     queryset=issue_queryset,
-                    total_count_queryset=total_issue_queryset,
                     on_results=lambda issues: issue_on_results(
                         group_by=group_by, issues=issues, sub_group_by=sub_group_by
                     ),
                     paginator_cls=GroupedOffsetPaginator,
                     group_by_fields=issue_group_values(
-                        field=group_by,
-                        slug=slug,
-                        filters=filters,
-                        queryset=total_issue_queryset,
+                        field=group_by, slug=slug, filters=filters
                     ),
                     group_by_field_name=group_by,
                     count_filter=Q(
@@ -246,7 +215,6 @@ class WorkspaceUserProfileIssuesEndpoint(BaseAPIView):
                 order_by=order_by_param,
                 request=request,
                 queryset=issue_queryset,
-                total_count_queryset=total_issue_queryset,
                 on_results=lambda issues: issue_on_results(
                     group_by=group_by, issues=issues, sub_group_by=sub_group_by
                 ),
@@ -264,9 +232,6 @@ class WorkspaceUserPropertiesEndpoint(BaseAPIView):
         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
         )

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

@@ -1,3 +1,6 @@
+# Python imports
+from urllib.parse import urlencode, urljoin
+
 # Django imports
 from django.core.exceptions import ValidationError
 from django.core.validators import validate_email
@@ -16,7 +19,7 @@ from plane.authentication.adapter.error import (
     AuthenticationException,
     AUTHENTICATION_ERROR_CODES,
 )
-from plane.utils.path_validator import get_safe_redirect_url
+from plane.utils.path_validator import validate_next_path
 
 
 class SignInAuthEndpoint(View):
@@ -31,11 +34,11 @@ class SignInAuthEndpoint(View):
                 error_message="INSTANCE_NOT_CONFIGURED",
             )
             params = exc.get_error_dict()
+            if next_path:
+                params["next_path"] = str(validate_next_path(next_path))
             # Base URL join
-            url = get_safe_redirect_url(
-                base_url=base_host(request=request, is_app=True),
-                next_path=next_path,
-                params=params,
+            url = urljoin(
+                base_host(request=request, is_app=True), "sign-in?" + urlencode(params)
             )
             return HttpResponseRedirect(url)
 
@@ -55,10 +58,10 @@ class SignInAuthEndpoint(View):
             )
             params = exc.get_error_dict()
             # Next path
-            url = get_safe_redirect_url(
-                base_url=base_host(request=request, is_app=True),
-                next_path=next_path,
-                params=params,
+            if next_path:
+                params["next_path"] = str(validate_next_path(next_path))
+            url = urljoin(
+                base_host(request=request, is_app=True), "sign-in?" + urlencode(params)
             )
             return HttpResponseRedirect(url)
 
@@ -73,10 +76,10 @@ class SignInAuthEndpoint(View):
                 payload={"email": str(email)},
             )
             params = exc.get_error_dict()
-            url = get_safe_redirect_url(
-                base_url=base_host(request=request, is_app=True),
-                next_path=next_path,
-                params=params,
+            if next_path:
+                params["next_path"] = str(validate_next_path(next_path))
+            url = urljoin(
+                base_host(request=request, is_app=True), "sign-in?" + urlencode(params)
             )
             return HttpResponseRedirect(url)
 
@@ -89,10 +92,10 @@ class SignInAuthEndpoint(View):
                 payload={"email": str(email)},
             )
             params = exc.get_error_dict()
-            url = get_safe_redirect_url(
-                base_url=base_host(request=request, is_app=True),
-                next_path=next_path,
-                params=params,
+            if next_path:
+                params["next_path"] = str(validate_next_path(next_path))
+            url = urljoin(
+                base_host(request=request, is_app=True), "sign-in?" + urlencode(params)
             )
             return HttpResponseRedirect(url)
 
@@ -109,23 +112,19 @@ class SignInAuthEndpoint(View):
             user_login(request=request, user=user, is_app=True)
             # Get the redirection path
             if next_path:
-                path = next_path
+                path = str(validate_next_path(next_path))
             else:
                 path = get_redirection_path(user=user)
 
-            # Get the safe redirect URL
-            url = get_safe_redirect_url(
-                base_url=base_host(request=request, is_app=True),
-                next_path=path,
-                params={},
-            )
+            # redirect to referer path
+            url = urljoin(base_host(request=request, is_app=True), path)
             return HttpResponseRedirect(url)
         except AuthenticationException as e:
             params = e.get_error_dict()
-            url = get_safe_redirect_url(
-                base_url=base_host(request=request, is_app=True),
-                next_path=next_path,
-                params=params,
+            if next_path:
+                params["next_path"] = str(validate_next_path(next_path))
+            url = urljoin(
+                base_host(request=request, is_app=True), "sign-in?" + urlencode(params)
             )
             return HttpResponseRedirect(url)
 
@@ -142,10 +141,10 @@ class SignUpAuthEndpoint(View):
                 error_message="INSTANCE_NOT_CONFIGURED",
             )
             params = exc.get_error_dict()
-            url = get_safe_redirect_url(
-                base_url=base_host(request=request, is_app=True),
-                next_path=next_path,
-                params=params,
+            if next_path:
+                params["next_path"] = str(validate_next_path(next_path))
+            url = urljoin(
+                base_host(request=request, is_app=True), "?" + urlencode(params)
             )
             return HttpResponseRedirect(url)
 
@@ -162,10 +161,10 @@ class SignUpAuthEndpoint(View):
                 payload={"email": str(email)},
             )
             params = exc.get_error_dict()
-            url = get_safe_redirect_url(
-                base_url=base_host(request=request, is_app=True),
-                next_path=next_path,
-                params=params,
+            if next_path:
+                params["next_path"] = str(validate_next_path(next_path))
+            url = urljoin(
+                base_host(request=request, is_app=True), "?" + urlencode(params)
             )
             return HttpResponseRedirect(url)
         # Validate the email
@@ -180,10 +179,10 @@ class SignUpAuthEndpoint(View):
                 payload={"email": str(email)},
             )
             params = exc.get_error_dict()
-            url = get_safe_redirect_url(
-                base_url=base_host(request=request, is_app=True),
-                next_path=next_path,
-                params=params,
+            if next_path:
+                params["next_path"] = str(validate_next_path(next_path))
+            url = urljoin(
+                base_host(request=request, is_app=True), "?" + urlencode(params)
             )
             return HttpResponseRedirect(url)
 
@@ -198,10 +197,10 @@ class SignUpAuthEndpoint(View):
                 payload={"email": str(email)},
             )
             params = exc.get_error_dict()
-            url = get_safe_redirect_url(
-                base_url=base_host(request=request, is_app=True),
-                next_path=next_path,
-                params=params,
+            if next_path:
+                params["next_path"] = str(validate_next_path(next_path))
+            url = urljoin(
+                base_host(request=request, is_app=True), "?" + urlencode(params)
             )
             return HttpResponseRedirect(url)
 
@@ -218,21 +217,17 @@ class SignUpAuthEndpoint(View):
             user_login(request=request, user=user, is_app=True)
             # Get the redirection path
             if next_path:
-                path = next_path
+                path = str(validate_next_path(next_path))
             else:
                 path = get_redirection_path(user=user)
-
-            url = get_safe_redirect_url(
-                base_url=base_host(request=request, is_app=True),
-                next_path=path,
-                params={},
-            )
+            # redirect to referer path
+            url = urljoin(base_host(request=request, is_app=True), path)
             return HttpResponseRedirect(url)
         except AuthenticationException as e:
             params = e.get_error_dict()
-            url = get_safe_redirect_url(
-                base_url=base_host(request=request, is_app=True),
-                next_path=next_path,
-                params=params,
+            if next_path:
+                params["next_path"] = str(validate_next_path(next_path))
+            url = urljoin(
+                base_host(request=request, is_app=True), "?" + urlencode(params)
             )
             return HttpResponseRedirect(url)

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

@@ -1,5 +1,5 @@
-# Python imports
 import uuid
+from urllib.parse import urlencode, urljoin
 
 # Django import
 from django.http import HttpResponseRedirect
@@ -16,7 +16,8 @@ from plane.authentication.adapter.error import (
     AuthenticationException,
     AUTHENTICATION_ERROR_CODES,
 )
-from plane.utils.path_validator import get_safe_redirect_url
+from plane.utils.path_validator import validate_next_path
+
 
 class GitHubOauthInitiateEndpoint(View):
     def get(self, request):
@@ -34,10 +35,10 @@ class GitHubOauthInitiateEndpoint(View):
                 error_message="INSTANCE_NOT_CONFIGURED",
             )
             params = exc.get_error_dict()
-            url = get_safe_redirect_url(
-                base_url=base_host(request=request, is_app=True),
-                next_path=next_path,
-                params=params
+            if next_path:
+                params["next_path"] = str(validate_next_path(next_path))
+            url = urljoin(
+                base_host(request=request, is_app=True), "?" + urlencode(params)
             )
             return HttpResponseRedirect(url)
         try:
@@ -48,10 +49,10 @@ class GitHubOauthInitiateEndpoint(View):
             return HttpResponseRedirect(auth_url)
         except AuthenticationException as e:
             params = e.get_error_dict()
-            url = get_safe_redirect_url(
-                base_url=base_host(request=request, is_app=True),
-                next_path=next_path,
-                params=params
+            if next_path:
+                params["next_path"] = str(validate_next_path(next_path))
+            url = urljoin(
+                base_host(request=request, is_app=True), "?" + urlencode(params)
             )
             return HttpResponseRedirect(url)
 
@@ -60,6 +61,7 @@ class GitHubCallbackEndpoint(View):
     def get(self, request):
         code = request.GET.get("code")
         state = request.GET.get("state")
+        base_host = request.session.get("host")
         next_path = request.session.get("next_path")
 
         if state != request.session.get("state", ""):
@@ -68,11 +70,9 @@ class GitHubCallbackEndpoint(View):
                 error_message="GITHUB_OAUTH_PROVIDER_ERROR",
             )
             params = exc.get_error_dict()
-            url = get_safe_redirect_url(
-                base_url=base_host(request=request, is_app=True),
-                next_path=next_path,
-                params=params
-            )
+            if next_path:
+                params["next_path"] = str(validate_next_path(next_path))
+            url = urljoin(base_host, "?" + urlencode(params))
             return HttpResponseRedirect(url)
 
         if not code:
@@ -81,11 +81,9 @@ class GitHubCallbackEndpoint(View):
                 error_message="GITHUB_OAUTH_PROVIDER_ERROR",
             )
             params = exc.get_error_dict()
-            url = get_safe_redirect_url(
-                base_url=base_host(request=request, is_app=True),
-                next_path=next_path,
-                params=params
-            )
+            if next_path:
+                params["next_path"] = str(validate_next_path(next_path))
+            url = urljoin(base_host, "?" + urlencode(params))
             return HttpResponseRedirect(url)
 
         try:
@@ -95,23 +93,17 @@ class GitHubCallbackEndpoint(View):
             user = provider.authenticate()
             # Login the user and record his device info
             user_login(request=request, user=user, is_app=True)
+            # Get the redirection path
             if next_path:
-                path = next_path
+                path = str(validate_next_path(next_path))
             else:
                 path = get_redirection_path(user=user)
-
-            # Get the safe redirect URL
-            url = get_safe_redirect_url(
-                base_url=base_host(request=request, is_app=True),
-                next_path=path,
-                params={}
-            )
+            # redirect to referer path
+            url = urljoin(base_host, path)
             return HttpResponseRedirect(url)
         except AuthenticationException as e:
             params = e.get_error_dict()
-            url = get_safe_redirect_url(
-                base_url=base_host(request=request, is_app=True),
-                next_path=next_path,
-                params=params
-            )
+            if next_path:
+                params["next_path"] = str(validate_next_path(next_path))
+            url = urljoin(base_host, "?" + urlencode(params))
             return HttpResponseRedirect(url)

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

@@ -1,5 +1,5 @@
-# Python imports
 import uuid
+from urllib.parse import urlencode, urljoin
 
 # Django import
 from django.http import HttpResponseRedirect
@@ -16,7 +16,7 @@ from plane.authentication.adapter.error import (
     AuthenticationException,
     AUTHENTICATION_ERROR_CODES,
 )
-from plane.utils.path_validator import get_safe_redirect_url
+from plane.utils.path_validator import validate_next_path
 
 
 class GitLabOauthInitiateEndpoint(View):
@@ -25,7 +25,7 @@ class GitLabOauthInitiateEndpoint(View):
         request.session["host"] = base_host(request=request, is_app=True)
         next_path = request.GET.get("next_path")
         if next_path:
-            request.session["next_path"] = str(next_path)
+            request.session["next_path"] = str(validate_next_path(next_path))
 
         # Check instance configuration
         instance = Instance.objects.first()
@@ -35,10 +35,10 @@ class GitLabOauthInitiateEndpoint(View):
                 error_message="INSTANCE_NOT_CONFIGURED",
             )
             params = exc.get_error_dict()
-            url = get_safe_redirect_url(
-                base_url=base_host(request=request, is_app=True),
-                next_path=next_path,
-                params=params
+            if next_path:
+                params["next_path"] = str(validate_next_path(next_path))
+            url = urljoin(
+                base_host(request=request, is_app=True), "?" + urlencode(params)
             )
             return HttpResponseRedirect(url)
         try:
@@ -49,10 +49,10 @@ class GitLabOauthInitiateEndpoint(View):
             return HttpResponseRedirect(auth_url)
         except AuthenticationException as e:
             params = e.get_error_dict()
-            url = get_safe_redirect_url(
-                base_url=base_host(request=request, is_app=True),
-                next_path=next_path,
-                params=params
+            if next_path:
+                params["next_path"] = str(validate_next_path(next_path))
+            url = urljoin(
+                base_host(request=request, is_app=True), "?" + urlencode(params)
             )
             return HttpResponseRedirect(url)
 
@@ -61,6 +61,7 @@ class GitLabCallbackEndpoint(View):
     def get(self, request):
         code = request.GET.get("code")
         state = request.GET.get("state")
+        base_host = request.session.get("host")
         next_path = request.session.get("next_path")
 
         if state != request.session.get("state", ""):
@@ -69,11 +70,9 @@ class GitLabCallbackEndpoint(View):
                 error_message="GITLAB_OAUTH_PROVIDER_ERROR",
             )
             params = exc.get_error_dict()
-            url = get_safe_redirect_url(
-                base_url=base_host(request=request, is_app=True),
-                next_path=next_path,
-                params=params
-            )
+            if next_path:
+                params["next_path"] = str(next_path)
+            url = urljoin(base_host, "?" + urlencode(params))
             return HttpResponseRedirect(url)
 
         if not code:
@@ -82,11 +81,9 @@ class GitLabCallbackEndpoint(View):
                 error_message="GITLAB_OAUTH_PROVIDER_ERROR",
             )
             params = exc.get_error_dict()
-            url = get_safe_redirect_url(
-                base_url=base_host(request=request, is_app=True),
-                next_path=next_path,
-                params=params
-            )
+            if next_path:
+                params["next_path"] = str(validate_next_path(next_path))
+            url = urljoin(base_host, "?" + urlencode(params))
             return HttpResponseRedirect(url)
 
         try:
@@ -97,23 +94,16 @@ class GitLabCallbackEndpoint(View):
             # Login the user and record his device info
             user_login(request=request, user=user, is_app=True)
             # Get the redirection path
-
             if next_path:
-                path = next_path
+                path = str(validate_next_path(next_path))
             else:
                 path = get_redirection_path(user=user)
             # redirect to referer path
-            url = get_safe_redirect_url(
-                base_url=base_host(request=request, is_app=True),
-                next_path=path,
-                params={}
-            )
+            url = urljoin(base_host, path)
             return HttpResponseRedirect(url)
         except AuthenticationException as e:
             params = e.get_error_dict()
-            url = get_safe_redirect_url(
-                base_url=base_host(request=request, is_app=True),
-                next_path=next_path,
-                params=params
-            )
+            if next_path:
+                params["next_path"] = str(validate_next_path(next_path))
+            url = urljoin(base_host, "?" + urlencode(params))
             return HttpResponseRedirect(url)

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

@@ -1,5 +1,6 @@
 # Python imports
 import uuid
+from urllib.parse import urlencode, urljoin
 
 # Django import
 from django.http import HttpResponseRedirect
@@ -17,7 +18,7 @@ from plane.authentication.adapter.error import (
     AuthenticationException,
     AUTHENTICATION_ERROR_CODES,
 )
-from plane.utils.path_validator import get_safe_redirect_url
+from plane.utils.path_validator import validate_next_path
 
 
 class GoogleOauthInitiateEndpoint(View):
@@ -35,10 +36,10 @@ class GoogleOauthInitiateEndpoint(View):
                 error_message="INSTANCE_NOT_CONFIGURED",
             )
             params = exc.get_error_dict()
-            url = get_safe_redirect_url(
-                base_url=base_host(request=request, is_app=True),
-                next_path=next_path,
-                params=params
+            if next_path:
+                params["next_path"] = str(validate_next_path(next_path))
+            url = urljoin(
+                base_host(request=request, is_app=True), "?" + urlencode(params)
             )
             return HttpResponseRedirect(url)
 
@@ -50,10 +51,10 @@ class GoogleOauthInitiateEndpoint(View):
             return HttpResponseRedirect(auth_url)
         except AuthenticationException as e:
             params = e.get_error_dict()
-            url = get_safe_redirect_url(
-                base_url=base_host(request=request, is_app=True),
-                next_path=next_path,
-                params=params
+            if next_path:
+                params["next_path"] = str(validate_next_path(next_path))
+            url = urljoin(
+                base_host(request=request, is_app=True), "?" + urlencode(params)
             )
             return HttpResponseRedirect(url)
 
@@ -62,6 +63,7 @@ class GoogleCallbackEndpoint(View):
     def get(self, request):
         code = request.GET.get("code")
         state = request.GET.get("state")
+        base_host = request.session.get("host")
         next_path = request.session.get("next_path")
 
         if state != request.session.get("state", ""):
@@ -70,11 +72,9 @@ class GoogleCallbackEndpoint(View):
                 error_message="GOOGLE_OAUTH_PROVIDER_ERROR",
             )
             params = exc.get_error_dict()
-            url = get_safe_redirect_url(
-                base_url=base_host(request=request, is_app=True),
-                next_path=next_path,
-                params=params
-            )
+            if next_path:
+                params["next_path"] = str(validate_next_path(next_path))
+            url = urljoin(base_host, "?" + urlencode(params))
             return HttpResponseRedirect(url)
         if not code:
             exc = AuthenticationException(
@@ -82,11 +82,9 @@ class GoogleCallbackEndpoint(View):
                 error_message="GOOGLE_OAUTH_PROVIDER_ERROR",
             )
             params = exc.get_error_dict()
-            url = get_safe_redirect_url(
-                base_url=base_host(request=request, is_app=True),
-                next_path=next_path,
-                params=params
-            )
+            if next_path:
+                params["next_path"] = str(validate_next_path(next_path))
+            url = urljoin(base_host, "?" + urlencode(params))
             return HttpResponseRedirect(url)
         try:
             provider = GoogleOAuthProvider(
@@ -96,21 +94,15 @@ class GoogleCallbackEndpoint(View):
             # Login the user and record his device info
             user_login(request=request, user=user, is_app=True)
             # Get the redirection path
-            if next_path:
-                path = next_path
-            else:
-                path = get_redirection_path(user=user)
-            url = get_safe_redirect_url(
-                base_url=base_host(request=request, is_app=True),
-                next_path=path,
-                params={}
+            path = get_redirection_path(user=user)
+            # redirect to referer path
+            url = urljoin(
+                base_host, str(validate_next_path(next_path)) if next_path else path
             )
             return HttpResponseRedirect(url)
         except AuthenticationException as e:
             params = e.get_error_dict()
-            url = get_safe_redirect_url(
-                base_url=base_host(request=request, is_app=True),
-                next_path=next_path,
-                params=params
-            )
+            if next_path:
+                params["next_path"] = str(validate_next_path(next_path))
+            url = urljoin(base_host, "?" + urlencode(params))
             return HttpResponseRedirect(url)

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

@@ -1,3 +1,6 @@
+# Python imports
+from urllib.parse import urlencode, urljoin
+
 # Django imports
 from django.core.validators import validate_email
 from django.http import HttpResponseRedirect
@@ -23,7 +26,7 @@ from plane.authentication.adapter.error import (
     AUTHENTICATION_ERROR_CODES,
 )
 from plane.authentication.rate_limit import AuthenticationThrottle
-from plane.utils.path_validator import get_safe_redirect_url
+from plane.utils.path_validator import validate_next_path
 
 
 class MagicGenerateEndpoint(APIView):
@@ -69,10 +72,10 @@ class MagicSignInEndpoint(View):
                 error_message="MAGIC_SIGN_IN_EMAIL_CODE_REQUIRED",
             )
             params = exc.get_error_dict()
-            url = get_safe_redirect_url(
-                base_url=base_host(request=request, is_app=True),
-                next_path=next_path,
-                params=params,
+            if next_path:
+                params["next_path"] = str(validate_next_path(next_path))
+            url = urljoin(
+                base_host(request=request, is_app=True), "sign-in?" + urlencode(params)
             )
             return HttpResponseRedirect(url)
 
@@ -85,10 +88,10 @@ class MagicSignInEndpoint(View):
                 error_message="USER_DOES_NOT_EXIST",
             )
             params = exc.get_error_dict()
-            url = get_safe_redirect_url(
-                base_url=base_host(request=request, is_app=True),
-                next_path=next_path,
-                params=params,
+            if next_path:
+                params["next_path"] = str(validate_next_path(next_path))
+            url = urljoin(
+                base_host(request=request, is_app=True), "sign-in?" + urlencode(params)
             )
             return HttpResponseRedirect(url)
 
@@ -114,19 +117,15 @@ class MagicSignInEndpoint(View):
                     else str(get_redirection_path(user=user))
                 )
             # redirect to referer path
-            url = get_safe_redirect_url(
-                base_url=base_host(request=request, is_app=True),
-                next_path=path,
-                params={},
-            )
+            url = urljoin(base_host(request=request, is_app=True), path)
             return HttpResponseRedirect(url)
 
         except AuthenticationException as e:
             params = e.get_error_dict()
-            url = get_safe_redirect_url(
-                base_url=base_host(request=request, is_app=True),
-                next_path=next_path,
-                params=params,
+            if next_path:
+                params["next_path"] = str(validate_next_path(next_path))
+            url = urljoin(
+                base_host(request=request, is_app=True), "sign-in?" + urlencode(params)
             )
             return HttpResponseRedirect(url)
 
@@ -146,10 +145,10 @@ class MagicSignUpEndpoint(View):
                 error_message="MAGIC_SIGN_UP_EMAIL_CODE_REQUIRED",
             )
             params = exc.get_error_dict()
-            url = get_safe_redirect_url(
-                base_url=base_host(request=request, is_app=True),
-                next_path=next_path,
-                params=params,
+            if next_path:
+                params["next_path"] = str(validate_next_path(next_path))
+            url = urljoin(
+                base_host(request=request, is_app=True), "?" + urlencode(params)
             )
             return HttpResponseRedirect(url)
         # Existing user
@@ -160,10 +159,10 @@ class MagicSignUpEndpoint(View):
                 error_message="USER_ALREADY_EXIST",
             )
             params = exc.get_error_dict()
-            url = get_safe_redirect_url(
-                base_url=base_host(request=request, is_app=True),
-                next_path=next_path,
-                params=params,
+            if next_path:
+                params["next_path"] = str(validate_next_path(next_path))
+            url = urljoin(
+                base_host(request=request, is_app=True), "?" + urlencode(params)
             )
             return HttpResponseRedirect(url)
 
@@ -179,22 +178,18 @@ class MagicSignUpEndpoint(View):
             user_login(request=request, user=user, is_app=True)
             # Get the redirection path
             if next_path:
-                path = next_path
+                path = str(validate_next_path(next_path))
             else:
                 path = get_redirection_path(user=user)
             # redirect to referer path
-            url = get_safe_redirect_url(
-                base_url=base_host(request=request, is_app=True),
-                next_path=path,
-                params={},
-            )
+            url = urljoin(base_host(request=request, is_app=True), path)
             return HttpResponseRedirect(url)
 
         except AuthenticationException as e:
             params = e.get_error_dict()
-            url = get_safe_redirect_url(
-                base_url=base_host(request=request, is_app=True),
-                next_path=next_path,
-                params=params,
+            if next_path:
+                params["next_path"] = str(validate_next_path(next_path))
+            url = urljoin(
+                base_host(request=request, is_app=True), "?" + urlencode(params)
             )
             return HttpResponseRedirect(url)

apps/api/plane/authentication/views/space/email.py

@@ -1,9 +1,11 @@
+# Python imports
+from urllib.parse import urlencode
+
 # Django imports
 from django.core.exceptions import ValidationError
 from django.core.validators import validate_email
 from django.http import HttpResponseRedirect
 from django.views import View
-from django.utils.http import url_has_allowed_host_and_scheme
 
 # Module imports
 from plane.authentication.provider.credentials.email import EmailProvider
@@ -15,7 +17,7 @@ from plane.authentication.adapter.error import (
     AUTHENTICATION_ERROR_CODES,
     AuthenticationException,
 )
-from plane.utils.path_validator import get_safe_redirect_url, validate_next_path, get_allowed_hosts
+from plane.utils.path_validator import validate_next_path
 
 
 class SignInAuthSpaceEndpoint(View):
@@ -30,11 +32,9 @@ class SignInAuthSpaceEndpoint(View):
                 error_message="INSTANCE_NOT_CONFIGURED",
             )
             params = exc.get_error_dict()
-            url = get_safe_redirect_url(
-                base_url=base_host(request=request, is_space=True),
-                next_path=next_path,
-                params=params
-            )
+            if next_path:
+                params["next_path"] = str(validate_next_path(next_path))
+            url = f"{base_host(request=request, is_space=True)}?{urlencode(params)}"
             return HttpResponseRedirect(url)
 
         # set the referer as session to redirect after login
@@ -51,11 +51,9 @@ class SignInAuthSpaceEndpoint(View):
                 payload={"email": str(email)},
             )
             params = exc.get_error_dict()
-            url = get_safe_redirect_url(
-                base_url=base_host(request=request, is_space=True),
-                next_path=next_path,
-                params=params
-            )
+            if next_path:
+                params["next_path"] = str(validate_next_path(next_path))
+            url = f"{base_host(request=request, is_space=True)}?{urlencode(params)}"
             return HttpResponseRedirect(url)
 
         # Validate email
@@ -69,11 +67,9 @@ class SignInAuthSpaceEndpoint(View):
                 payload={"email": str(email)},
             )
             params = exc.get_error_dict()
-            url = get_safe_redirect_url(
-                base_url=base_host(request=request, is_space=True),
-                next_path=next_path,
-                params=params
-            )
+            if next_path:
+                params["next_path"] = str(validate_next_path(next_path))
+            url = f"{base_host(request=request, is_space=True)}?{urlencode(params)}"
             return HttpResponseRedirect(url)
 
         # Existing User
@@ -86,11 +82,9 @@ class SignInAuthSpaceEndpoint(View):
                 payload={"email": str(email)},
             )
             params = exc.get_error_dict()
-            url = get_safe_redirect_url(
-                base_url=base_host(request=request, is_space=True),
-                next_path=next_path,
-                params=params
-            )
+            if next_path:
+                params["next_path"] = str(validate_next_path(next_path))
+            url = f"{base_host(request=request, is_space=True)}?{urlencode(params)}"
             return HttpResponseRedirect(url)
 
         try:
@@ -100,20 +94,14 @@ class SignInAuthSpaceEndpoint(View):
             user = provider.authenticate()
             # Login the user and record his device info
             user_login(request=request, user=user, is_space=True)
-            # redirect to referer path
-            next_path = validate_next_path(next_path=next_path)
-            url = f"{base_host(request=request, is_space=True).rstrip('/')}{next_path}"
-            if url_has_allowed_host_and_scheme(url, allowed_hosts=get_allowed_hosts()):
-                return HttpResponseRedirect(url)
-            else:
-                return HttpResponseRedirect(base_host(request=request, is_space=True))
+            # redirect to next path
+            url = f"{base_host(request=request, is_space=True)}{str(next_path) if next_path else ''}"
+            return HttpResponseRedirect(url)
         except AuthenticationException as e:
             params = e.get_error_dict()
-            url = get_safe_redirect_url(
-                base_url=base_host(request=request, is_space=True),
-                next_path=next_path,
-                params=params
-            )
+            if next_path:
+                params["next_path"] = str(validate_next_path(next_path))
+            url = f"{base_host(request=request, is_space=True)}?{urlencode(params)}"
             return HttpResponseRedirect(url)
 
 
@@ -129,11 +117,9 @@ class SignUpAuthSpaceEndpoint(View):
                 error_message="INSTANCE_NOT_CONFIGURED",
             )
             params = exc.get_error_dict()
-            url = get_safe_redirect_url(
-                base_url=base_host(request=request, is_space=True),
-                next_path=next_path,
-                params=params
-            )
+            if next_path:
+                params["next_path"] = str(validate_next_path(next_path))
+            url = f"{base_host(request=request, is_space=True)}?{urlencode(params)}"
             return HttpResponseRedirect(url)
 
         email = request.POST.get("email", False)
@@ -149,11 +135,9 @@ class SignUpAuthSpaceEndpoint(View):
                 payload={"email": str(email)},
             )
             params = exc.get_error_dict()
-            url = get_safe_redirect_url(
-                base_url=base_host(request=request, is_space=True),
-                next_path=next_path,
-                params=params
-            )
+            if next_path:
+                params["next_path"] = str(validate_next_path(next_path))
+            url = f"{base_host(request=request, is_space=True)}?{urlencode(params)}"
             return HttpResponseRedirect(url)
         # Validate the email
         email = email.strip().lower()
@@ -167,11 +151,9 @@ class SignUpAuthSpaceEndpoint(View):
                 payload={"email": str(email)},
             )
             params = exc.get_error_dict()
-            url = get_safe_redirect_url(
-                base_url=base_host(request=request, is_space=True),
-                next_path=next_path,
-                params=params
-            )
+            if next_path:
+                params["next_path"] = str(validate_next_path(next_path))
+            url = f"{base_host(request=request, is_space=True)}?{urlencode(params)}"
             return HttpResponseRedirect(url)
 
         # Existing User
@@ -184,11 +166,9 @@ class SignUpAuthSpaceEndpoint(View):
                 payload={"email": str(email)},
             )
             params = exc.get_error_dict()
-            url = get_safe_redirect_url(
-                base_url=base_host(request=request, is_space=True),
-                next_path=next_path,
-                params=params
-            )
+            if next_path:
+                params["next_path"] = str(validate_next_path(next_path))
+            url = f"{base_host(request=request, is_space=True)}?{urlencode(params)}"
             return HttpResponseRedirect(url)
 
         try:
@@ -199,17 +179,11 @@ class SignUpAuthSpaceEndpoint(View):
             # Login the user and record his device info
             user_login(request=request, user=user, is_space=True)
             # redirect to referer path
-            next_path = validate_next_path(next_path=next_path)
-            url = f"{base_host(request=request, is_space=True).rstrip('/')}{next_path}"
-            if url_has_allowed_host_and_scheme(url, allowed_hosts=get_allowed_hosts()):
-                return HttpResponseRedirect(url)
-            else:
-                return HttpResponseRedirect(base_host(request=request, is_space=True))
+            url = f"{base_host(request=request, is_space=True)}{str(next_path) if next_path else ''}"
+            return HttpResponseRedirect(url)
         except AuthenticationException as e:
             params = e.get_error_dict()
-            url = get_safe_redirect_url(
-                base_url=base_host(request=request, is_space=True),
-                next_path=next_path,
-                params=params
-            )
+            if next_path:
+                params["next_path"] = str(validate_next_path(next_path))
+            url = f"{base_host(request=request, is_space=True)}?{urlencode(params)}"
             return HttpResponseRedirect(url)

apps/api/plane/authentication/views/space/github.py

@@ -1,10 +1,10 @@
 # Python imports
 import uuid
+from urllib.parse import urlencode
 
 # Django import
 from django.http import HttpResponseRedirect
 from django.views import View
-from django.utils.http import url_has_allowed_host_and_scheme
 
 # Module imports
 from plane.authentication.provider.oauth.github import GitHubOAuthProvider
@@ -15,7 +15,7 @@ from plane.authentication.adapter.error import (
     AUTHENTICATION_ERROR_CODES,
     AuthenticationException,
 )
-from plane.utils.path_validator import get_safe_redirect_url, validate_next_path, get_allowed_hosts
+from plane.utils.path_validator import validate_next_path
 
 
 class GitHubOauthInitiateSpaceEndpoint(View):
@@ -23,6 +23,9 @@ class GitHubOauthInitiateSpaceEndpoint(View):
         # Get host and next path
         request.session["host"] = base_host(request=request, is_space=True)
         next_path = request.GET.get("next_path")
+        if next_path:
+            request.session["next_path"] = str(next_path)
+
         # Check instance configuration
         instance = Instance.objects.first()
         if instance is None or not instance.is_setup_done:
@@ -31,11 +34,9 @@ class GitHubOauthInitiateSpaceEndpoint(View):
                 error_message="INSTANCE_NOT_CONFIGURED",
             )
             params = exc.get_error_dict()
-            url = get_safe_redirect_url(
-                base_url=base_host(request=request, is_space=True),
-                next_path=next_path,
-                params=params
-            )
+            if next_path:
+                params["next_path"] = str(validate_next_path(next_path))
+            url = f"{base_host(request=request, is_space=True)}?{urlencode(params)}"
             return HttpResponseRedirect(url)
 
         try:
@@ -46,11 +47,9 @@ class GitHubOauthInitiateSpaceEndpoint(View):
             return HttpResponseRedirect(auth_url)
         except AuthenticationException as e:
             params = e.get_error_dict()
-            url = get_safe_redirect_url(
-                base_url=base_host(request=request, is_space=True),
-                next_path=next_path,
-                params=params
-            )
+            if next_path:
+                params["next_path"] = str(next_path)
+            url = f"{base_host(request=request, is_space=True)}?{urlencode(params)}"
             return HttpResponseRedirect(url)
 
 
@@ -67,11 +66,9 @@ class GitHubCallbackSpaceEndpoint(View):
                 error_message="GITHUB_OAUTH_PROVIDER_ERROR",
             )
             params = exc.get_error_dict()
-            url = get_safe_redirect_url(
-                base_url=base_host(request=request, is_space=True),
-                next_path=next_path,
-                params=params
-            )
+            if next_path:
+                params["next_path"] = str(validate_next_path(next_path))
+            url = f"{base_host(request=request, is_space=True)}?{urlencode(params)}"
             return HttpResponseRedirect(url)
 
         if not code:
@@ -80,11 +77,9 @@ class GitHubCallbackSpaceEndpoint(View):
                 error_message="GITHUB_OAUTH_PROVIDER_ERROR",
             )
             params = exc.get_error_dict()
-            url = get_safe_redirect_url(
-                base_url=base_host(request=request, is_space=True),
-                next_path=next_path,
-                params=params
-            )
+            if next_path:
+                params["next_path"] = str(validate_next_path(next_path))
+            url = f"{base_host(request=request, is_space=True)}?{urlencode(params)}"
             return HttpResponseRedirect(url)
 
         try:
@@ -94,18 +89,11 @@ class GitHubCallbackSpaceEndpoint(View):
             user_login(request=request, user=user, is_space=True)
             # Process workspace and project invitations
             # redirect to referer path
-            next_path = validate_next_path(next_path=next_path)
-            
-            url = f"{base_host(request=request, is_space=True).rstrip('/')}{next_path}"
-            if url_has_allowed_host_and_scheme(url, allowed_hosts=get_allowed_hosts()):
-                return HttpResponseRedirect(url)
-            else:
-                return HttpResponseRedirect(base_host(request=request, is_space=True))
+            url = f"{base_host(request=request, is_space=True)}{str(next_path) if next_path else ''}"
+            return HttpResponseRedirect(url)
         except AuthenticationException as e:
             params = e.get_error_dict()
-            url = get_safe_redirect_url(
-                base_url=base_host(request=request, is_space=True),
-                next_path=next_path,
-                params=params
-            )
+            if next_path:
+                params["next_path"] = str(validate_next_path(next_path))
+            url = f"{base_host(request=request, is_space=True)}?{urlencode(params)}"
             return HttpResponseRedirect(url)

apps/api/plane/authentication/views/space/gitlab.py

@@ -1,10 +1,10 @@
 # Python imports
 import uuid
+from urllib.parse import urlencode
 
 # Django import
 from django.http import HttpResponseRedirect
 from django.views import View
-from django.utils.http import url_has_allowed_host_and_scheme
 
 # Module imports
 from plane.authentication.provider.oauth.gitlab import GitLabOAuthProvider
@@ -15,8 +15,7 @@ from plane.authentication.adapter.error import (
     AUTHENTICATION_ERROR_CODES,
     AuthenticationException,
 )
-from plane.utils.path_validator import get_safe_redirect_url, validate_next_path, get_allowed_hosts
-
+from plane.utils.path_validator import validate_next_path
 
 
 class GitLabOauthInitiateSpaceEndpoint(View):
@@ -24,6 +23,8 @@ class GitLabOauthInitiateSpaceEndpoint(View):
         # Get host and next path
         request.session["host"] = base_host(request=request, is_space=True)
         next_path = request.GET.get("next_path")
+        if next_path:
+            request.session["next_path"] = str(next_path)
 
         # Check instance configuration
         instance = Instance.objects.first()
@@ -33,11 +34,9 @@ class GitLabOauthInitiateSpaceEndpoint(View):
                 error_message="INSTANCE_NOT_CONFIGURED",
             )
             params = exc.get_error_dict()
-            url = get_safe_redirect_url(
-                base_url=base_host(request=request, is_space=True),
-                next_path=next_path,
-                params=params
-            )
+            if next_path:
+                params["next_path"] = str(validate_next_path(next_path))
+            url = f"{base_host(request=request, is_space=True)}?{urlencode(params)}"
             return HttpResponseRedirect(url)
 
         try:
@@ -48,11 +47,9 @@ class GitLabOauthInitiateSpaceEndpoint(View):
             return HttpResponseRedirect(auth_url)
         except AuthenticationException as e:
             params = e.get_error_dict()
-            url = get_safe_redirect_url(
-                base_url=base_host(request=request, is_space=True),
-                next_path=next_path,
-                params=params
-            )
+            if next_path:
+                params["next_path"] = str(next_path)
+            url = f"{base_host(request=request, is_space=True)}?{urlencode(params)}"
             return HttpResponseRedirect(url)
 
 
@@ -69,11 +66,9 @@ class GitLabCallbackSpaceEndpoint(View):
                 error_message="GITLAB_OAUTH_PROVIDER_ERROR",
             )
             params = exc.get_error_dict()
-            url = get_safe_redirect_url(
-                base_url=base_host(request=request, is_space=True),
-                next_path=next_path,
-                params=params
-            )
+            if next_path:
+                params["next_path"] = str(validate_next_path(next_path))
+            url = f"{base_host(request=request, is_space=True)}?{urlencode(params)}"
             return HttpResponseRedirect(url)
 
         if not code:
@@ -82,11 +77,9 @@ class GitLabCallbackSpaceEndpoint(View):
                 error_message="GITLAB_OAUTH_PROVIDER_ERROR",
             )
             params = exc.get_error_dict()
-            url = get_safe_redirect_url(
-                base_url=base_host(request=request, is_space=True),
-                next_path=next_path,
-                params=params
-            )
+            if next_path:
+                params["next_path"] = str(validate_next_path(next_path))
+            url = f"{base_host(request=request, is_space=True)}?{urlencode(params)}"
             return HttpResponseRedirect(url)
 
         try:
@@ -96,18 +89,11 @@ class GitLabCallbackSpaceEndpoint(View):
             user_login(request=request, user=user, is_space=True)
             # Process workspace and project invitations
             # redirect to referer path
-            next_path = validate_next_path(next_path=next_path)
-
-            url = f"{base_host(request=request, is_space=True).rstrip('/')}{next_path}"
-            if url_has_allowed_host_and_scheme(url, allowed_hosts=get_allowed_hosts()):
-                return HttpResponseRedirect(url)
-            else:
-                return HttpResponseRedirect(base_host(request=request, is_space=True))
+            url = f"{base_host(request=request, is_space=True)}{str(next_path) if next_path else ''}"
+            return HttpResponseRedirect(url)
         except AuthenticationException as e:
             params = e.get_error_dict()
-            url = get_safe_redirect_url(
-                base_url=base_host(request=request, is_space=True),
-                next_path=next_path,
-                params=params
-            )
+            if next_path:
+                params["next_path"] = str(validate_next_path(next_path))
+            url = f"{base_host(request=request, is_space=True)}?{urlencode(params)}"
             return HttpResponseRedirect(url)

apps/api/plane/authentication/views/space/google.py

@@ -1,10 +1,10 @@
 # Python imports
 import uuid
+from urllib.parse import urlencode
 
 # Django import
 from django.http import HttpResponseRedirect
 from django.views import View
-from django.utils.http import url_has_allowed_host_and_scheme
 
 # Module imports
 from plane.authentication.provider.oauth.google import GoogleOAuthProvider
@@ -15,13 +15,15 @@ from plane.authentication.adapter.error import (
     AuthenticationException,
     AUTHENTICATION_ERROR_CODES,
 )
-from plane.utils.path_validator import get_safe_redirect_url, validate_next_path, get_allowed_hosts
+from plane.utils.path_validator import validate_next_path
 
 
 class GoogleOauthInitiateSpaceEndpoint(View):
     def get(self, request):
         request.session["host"] = base_host(request=request, is_space=True)
         next_path = request.GET.get("next_path")
+        if next_path:
+            request.session["next_path"] = str(next_path)
 
         # Check instance configuration
         instance = Instance.objects.first()
@@ -31,11 +33,9 @@ class GoogleOauthInitiateSpaceEndpoint(View):
                 error_message="INSTANCE_NOT_CONFIGURED",
             )
             params = exc.get_error_dict()
-            url = get_safe_redirect_url(
-                base_url=base_host(request=request, is_space=True),
-                next_path=next_path,
-                params=params
-            )
+            if next_path:
+                params["next_path"] = str(validate_next_path(next_path))
+            url = f"{base_host(request=request, is_space=True)}?{urlencode(params)}"
             return HttpResponseRedirect(url)
 
         try:
@@ -46,11 +46,9 @@ class GoogleOauthInitiateSpaceEndpoint(View):
             return HttpResponseRedirect(auth_url)
         except AuthenticationException as e:
             params = e.get_error_dict()
-            url = get_safe_redirect_url(
-                base_url=base_host(request=request, is_space=True),
-                next_path=next_path,
-                params=params
-            )
+            if next_path:
+                params["next_path"] = str(validate_next_path(next_path))
+            url = f"{base_host(request=request, is_space=True)}?{urlencode(params)}"
             return HttpResponseRedirect(url)
 
 
@@ -67,11 +65,9 @@ class GoogleCallbackSpaceEndpoint(View):
                 error_message="GOOGLE_OAUTH_PROVIDER_ERROR",
             )
             params = exc.get_error_dict()
-            url = get_safe_redirect_url(
-                base_url=base_host(request=request, is_space=True),
-                next_path=next_path,
-                params=params
-            )
+            if next_path:
+                params["next_path"] = str(validate_next_path(next_path))
+            url = f"{base_host(request=request, is_space=True)}?{urlencode(params)}"
             return HttpResponseRedirect(url)
         if not code:
             exc = AuthenticationException(
@@ -79,11 +75,9 @@ class GoogleCallbackSpaceEndpoint(View):
                 error_message="GOOGLE_OAUTH_PROVIDER_ERROR",
             )
             params = exc.get_error_dict()
-            url = get_safe_redirect_url(
-                base_url=base_host(request=request, is_space=True),
-                next_path=next_path,
-                params=params
-            )
+            if next_path:
+                params["next_path"] = str(validate_next_path(next_path))
+            url = f"{base_host(request=request, is_space=True)}?{urlencode(params)}"
             return HttpResponseRedirect(url)
         try:
             provider = GoogleOAuthProvider(request=request, code=code)
@@ -91,18 +85,11 @@ class GoogleCallbackSpaceEndpoint(View):
             # Login the user and record his device info
             user_login(request=request, user=user, is_space=True)
             # redirect to referer path
-            next_path = validate_next_path(next_path=next_path)
-
-            url = f"{base_host(request=request, is_space=True).rstrip('/')}{next_path}"
-            if url_has_allowed_host_and_scheme(url, allowed_hosts=get_allowed_hosts()):
-                return HttpResponseRedirect(url)
-            else:
-                return HttpResponseRedirect(base_host(request=request, is_space=True))
+            url = f"{base_host(request=request, is_space=True)}{str(next_path) if next_path else ''}"
+            return HttpResponseRedirect(url)
         except AuthenticationException as e:
             params = e.get_error_dict()
-            url = get_safe_redirect_url(
-                base_url=base_host(request=request, is_space=True),
-                next_path=next_path,
-                params=params
-            )
+            if next_path:
+                params["next_path"] = str(validate_next_path(next_path))
+            url = f"{base_host(request=request, is_space=True)}?{urlencode(params)}"
             return HttpResponseRedirect(url)

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

@@ -1,8 +1,10 @@
+# Python imports
+from urllib.parse import urlencode
+
 # Django imports
 from django.core.validators import validate_email
 from django.http import HttpResponseRedirect
 from django.views import View
-from django.utils.http import url_has_allowed_host_and_scheme
 
 # Third party imports
 from rest_framework import status
@@ -21,7 +23,7 @@ from plane.authentication.adapter.error import (
     AuthenticationException,
     AUTHENTICATION_ERROR_CODES,
 )
-from plane.utils.path_validator import get_safe_redirect_url, validate_next_path, get_allowed_hosts
+from plane.utils.path_validator import validate_next_path
 
 
 class MagicGenerateSpaceEndpoint(APIView):
@@ -64,11 +66,9 @@ class MagicSignInSpaceEndpoint(View):
                 error_message="MAGIC_SIGN_IN_EMAIL_CODE_REQUIRED",
             )
             params = exc.get_error_dict()
-            url = get_safe_redirect_url(
-                base_url=base_host(request=request, is_space=True),
-                next_path=next_path,
-                params=params,
-            )
+            if next_path:
+                params["next_path"] = str(validate_next_path(next_path))
+            url = f"{base_host(request=request, is_space=True)}?{urlencode(params)}"
             return HttpResponseRedirect(url)
 
         existing_user = User.objects.filter(email=email).first()
@@ -79,11 +79,9 @@ class MagicSignInSpaceEndpoint(View):
                 error_message="USER_DOES_NOT_EXIST",
             )
             params = exc.get_error_dict()
-            url = get_safe_redirect_url(
-                base_url=base_host(request=request, is_space=True),
-                next_path=next_path,
-                params=params,
-            )
+            if next_path:
+                params["next_path"] = str(validate_next_path(next_path))
+            url = f"{base_host(request=request, is_space=True)}?{urlencode(params)}"
             return HttpResponseRedirect(url)
 
         # Active User
@@ -95,20 +93,15 @@ class MagicSignInSpaceEndpoint(View):
             # Login the user and record his device info
             user_login(request=request, user=user, is_space=True)
             # redirect to referer path
-            next_path = validate_next_path(next_path=next_path)
-            url = f"{base_host(request=request, is_space=True).rstrip('/')}{next_path}"
-            if url_has_allowed_host_and_scheme(url, allowed_hosts=get_allowed_hosts()):
-                return HttpResponseRedirect(url)
-            else:
-                return HttpResponseRedirect(base_host(request=request, is_space=True))
+            path = str(next_path) if next_path else ""
+            url = f"{base_host(request=request, is_space=True)}{path}"
+            return HttpResponseRedirect(url)
 
         except AuthenticationException as e:
             params = e.get_error_dict()
-            url = get_safe_redirect_url(
-                base_url=base_host(request=request, is_space=True),
-                next_path=next_path,
-                params=params,
-            )
+            if next_path:
+                params["next_path"] = str(next_path)
+            url = f"{base_host(request=request, is_space=True)}?{urlencode(params)}"
             return HttpResponseRedirect(url)
 
 
@@ -127,11 +120,9 @@ class MagicSignUpSpaceEndpoint(View):
                 error_message="MAGIC_SIGN_UP_EMAIL_CODE_REQUIRED",
             )
             params = exc.get_error_dict()
-            url = get_safe_redirect_url(
-                base_url=base_host(request=request, is_space=True),
-                next_path=next_path,
-                params=params,
-            )
+            if next_path:
+                params["next_path"] = str(validate_next_path(next_path))
+            url = f"{base_host(request=request, is_space=True)}?{urlencode(params)}"
             return HttpResponseRedirect(url)
         # Existing User
         existing_user = User.objects.filter(email=email).first()
@@ -142,11 +133,9 @@ class MagicSignUpSpaceEndpoint(View):
                 error_message="USER_ALREADY_EXIST",
             )
             params = exc.get_error_dict()
-            url = get_safe_redirect_url(
-                base_url=base_host(request=request, is_space=True),
-                next_path=next_path,
-                params=params,
-            )
+            if next_path:
+                params["next_path"] = str(validate_next_path(next_path))
+            url = f"{base_host(request=request, is_space=True)}?{urlencode(params)}"
             return HttpResponseRedirect(url)
 
         try:
@@ -157,18 +146,12 @@ class MagicSignUpSpaceEndpoint(View):
             # Login the user and record his device info
             user_login(request=request, user=user, is_space=True)
             # redirect to referer path
-            next_path = validate_next_path(next_path=next_path)
-            url = f"{base_host(request=request, is_space=True).rstrip('/')}{next_path}"
-            if url_has_allowed_host_and_scheme(url, allowed_hosts=get_allowed_hosts()):
-                return HttpResponseRedirect(url)
-            else:
-                return HttpResponseRedirect(base_host(request=request, is_space=True))
+            url = f"{base_host(request=request, is_space=True)}{str(next_path) if next_path else ''}"
+            return HttpResponseRedirect(url)
 
         except AuthenticationException as e:
             params = e.get_error_dict()
-            url = get_safe_redirect_url(
-                base_url=base_host(request=request, is_space=True),
-                next_path=next_path,
-                params=params,
-            )
+            if next_path:
+                params["next_path"] = str(validate_next_path(next_path))
+            url = f"{base_host(request=request, is_space=True)}?{urlencode(params)}"
             return HttpResponseRedirect(url)

apps/api/plane/authentication/views/space/signout.py

@@ -7,7 +7,7 @@ from django.utils import timezone
 # Module imports
 from plane.authentication.utils.host import base_host, user_ip
 from plane.db.models import User
-from plane.utils.path_validator import get_safe_redirect_url
+from plane.utils.path_validator import validate_next_path
 
 
 class SignOutAuthSpaceEndpoint(View):
@@ -22,14 +22,8 @@ class SignOutAuthSpaceEndpoint(View):
             user.save()
             # Log the user out
             logout(request)
-            url = get_safe_redirect_url(
-                base_url=base_host(request=request, is_space=True),
-                next_path=next_path
-            )
+            url = f"{base_host(request=request, is_space=True)}{str(validate_next_path(next_path)) if next_path else ''}"
             return HttpResponseRedirect(url)
         except Exception:
-            url = get_safe_redirect_url(
-                base_url=base_host(request=request, is_space=True),
-                next_path=next_path
-            )
+            url = f"{base_host(request=request, is_space=True)}{str(validate_next_path(next_path)) if next_path else ''}"
             return HttpResponseRedirect(url)

apps/api/plane/bgtasks/cleanup_task.py

@@ -21,14 +21,13 @@ from plane.db.models import (
     PageVersion,
     APIActivityLog,
     IssueDescriptionVersion,
-    WebhookLog,
 )
 from plane.settings.mongo import MongoConnection
 from plane.utils.exception_logger import log_exception
 
 
 logger = logging.getLogger("plane.worker")
-BATCH_SIZE = 500
+BATCH_SIZE = 1000
 
 
 def get_mongo_collection(collection_name: str) -> Optional[Collection]:
@@ -248,27 +247,6 @@ def transform_issue_description_version(record: Dict) -> Dict:
     }
 
 
-def transform_webhook_log(record: Dict):
-    """Transfer webhook logs to a new destination."""
-    return {
-        "id": str(record["id"]),
-        "created_at": str(record["created_at"]) if record.get("created_at") else None,
-        "workspace_id": str(record["workspace_id"]),
-        "webhook": str(record["webhook"]),
-        # Request
-        "event_type": str(record["event_type"]),
-        "request_method": str(record["request_method"]),
-        "request_headers": str(record["request_headers"]),
-        "request_body": str(record["request_body"]),
-        # Response
-        "response_status": str(record["response_status"]),
-        "response_body": str(record["response_body"]),
-        "response_headers": str(record["response_headers"]),
-        # retry count
-        "retry_count": str(record["retry_count"]),
-    }
-
-
 # Queryset functions for each cleanup task
 def get_api_logs_queryset():
     """Get API logs older than cutoff days."""
@@ -396,34 +374,7 @@ def get_issue_description_versions_queryset():
     )
 
 
-def get_webhook_logs_queryset():
-    """Get email logs older than cutoff days."""
-    cutoff_days = int(os.environ.get("HARD_DELETE_AFTER_DAYS", 30))
-    cutoff_time = timezone.now() - timedelta(days=cutoff_days)
-    logger.info(f"Webhook logs cutoff time: {cutoff_time}")
-
-    return (
-        WebhookLog.all_objects.filter(created_at__lte=cutoff_time)
-        .values(
-            "id",
-            "created_at",
-            "workspace_id",
-            "webhook",
-            "event_type",
-            # Request
-            "request_method",
-            "request_headers",
-            "request_body",
-            # Response
-            "response_status",
-            "response_body",
-            "response_headers",
-            "retry_count",
-        )
-        .iterator(chunk_size=BATCH_SIZE)
-    )
-
-
+# Celery tasks - now much simpler!
 @shared_task
 def delete_api_logs():
     """Delete old API activity logs."""
@@ -470,15 +421,3 @@ def delete_issue_description_versions():
         task_name="Issue Description Version",
         collection_name="issue_description_versions",
     )
-
-
-@shared_task
-def delete_webhook_logs():
-    """Delete old webhook logs"""
-    process_cleanup_task(
-        queryset_func=get_webhook_logs_queryset,
-        transform_func=transform_webhook_log,
-        model=WebhookLog,
-        task_name="Webhook Log",
-        collection_name="webhook_logs",
-    )

apps/api/plane/bgtasks/issue_activities_task.py

@@ -34,14 +34,6 @@ from plane.utils.issue_relation_mapper import get_inverse_relation
 from plane.utils.uuid import is_valid_uuid
 
 
-def extract_ids(data: dict | None, primary_key: str, fallback_key: str) -> set[str]:
-    if not data:
-        return set()
-    if primary_key in data:
-        return {str(x) for x in data.get(primary_key, [])}
-    return {str(x) for x in data.get(fallback_key, [])}
-
-
 # Track Changes in name
 def track_name(
     requested_data,
@@ -124,32 +116,18 @@ def track_parent(
     issue_activities,
     epoch,
 ):
-    current_parent_id = current_instance.get("parent_id") or current_instance.get(
-        "parent"
-    )
-    requested_parent_id = requested_data.get("parent_id") or requested_data.get(
-        "parent"
-    )
-
-    # Validate UUIDs before database queries
-    if current_parent_id is not None and not is_valid_uuid(current_parent_id):
-        return
-    if requested_parent_id is not None and not is_valid_uuid(requested_parent_id):
-        return
-
-    if current_parent_id != requested_parent_id:
+    if current_instance.get("parent_id") != requested_data.get("parent_id"):
         old_parent = (
-            Issue.objects.filter(pk=current_parent_id).first()
-            if current_parent_id is not None
+            Issue.objects.filter(pk=current_instance.get("parent_id")).first()
+            if current_instance.get("parent_id") is not None
             else None
         )
         new_parent = (
-            Issue.objects.filter(pk=requested_parent_id).first()
-            if requested_parent_id is not None
+            Issue.objects.filter(pk=requested_data.get("parent_id")).first()
+            if requested_data.get("parent_id") is not None
             else None
         )
 
-
         issue_activities.append(
             IssueActivity(
                 issue_id=issue_id,
@@ -215,31 +193,23 @@ def track_state(
     issue_activities,
     epoch,
 ):
-    current_state_id = current_instance.get("state_id") or current_instance.get("state")
-    requested_state_id = requested_data.get("state_id") or requested_data.get("state")
-
-    if current_state_id is not None and not is_valid_uuid(current_state_id):
-        current_state_id = None
-    if requested_state_id is not None and not is_valid_uuid(requested_state_id):
-        requested_state_id = None
-
-    if current_state_id != requested_state_id:
-        new_state = State.objects.filter(pk=requested_state_id, project_id=project_id).first()
-        old_state = State.objects.filter(pk=current_state_id, project_id=project_id).first()
+    if current_instance.get("state_id") != requested_data.get("state_id"):
+        new_state = State.objects.get(pk=requested_data.get("state_id", None))
+        old_state = State.objects.get(pk=current_instance.get("state_id", None))
 
         issue_activities.append(
             IssueActivity(
                 issue_id=issue_id,
                 actor_id=actor_id,
                 verb="updated",
-                old_value=old_state.name if old_state else None,
-                new_value=new_state.name if new_state else None,
+                old_value=old_state.name,
+                new_value=new_state.name,
                 field="state",
                 project_id=project_id,
                 workspace_id=workspace_id,
                 comment="updated the state to",
-                old_identifier=old_state.id if old_state else None,
-                new_identifier=new_state.id if new_state else None,
+                old_identifier=old_state.id,
+                new_identifier=new_state.id,
                 epoch=epoch,
             )
         )
@@ -328,10 +298,8 @@ def track_labels(
     issue_activities,
     epoch,
 ):
-
-    # Labels
-    requested_labels = extract_ids(requested_data, "label_ids", "labels")
-    current_labels = extract_ids(current_instance, "label_ids", "labels")
+    requested_labels = set([str(lab) for lab in requested_data.get("label_ids", [])])
+    current_labels = set([str(lab) for lab in current_instance.get("label_ids", [])])
 
     added_labels = requested_labels - current_labels
     dropped_labels = current_labels - requested_labels
@@ -396,9 +364,16 @@ def track_assignees(
     issue_activities,
     epoch,
 ):
-    # Assignees
-    requested_assignees = extract_ids(requested_data, "assignee_ids", "assignees")
-    current_assignees = extract_ids(current_instance, "assignee_ids", "assignees")
+    requested_assignees = (
+        set([str(asg) for asg in requested_data.get("assignee_ids", [])])
+        if requested_data is not None
+        else set()
+    )
+    current_assignees = (
+        set([str(asg) for asg in current_instance.get("assignee_ids", [])])
+        if current_instance is not None
+        else set()
+    )
 
     added_assignees = requested_assignees - current_assignees
     dropped_assginees = current_assignees - requested_assignees
@@ -656,11 +631,6 @@ def update_issue_activity(
         "estimate_point": track_estimate_points,
         "archived_at": track_archive_at,
         "closed_to": track_closed_to,
-        # External endpoint keys
-        "parent": track_parent,
-        "state": track_state,
-        "assignees": track_assignees,
-        "labels": track_labels,
     }
 
     requested_data = json.loads(requested_data) if requested_data is not None else None

apps/api/plane/celery.py

@@ -55,23 +55,15 @@ app.conf.beat_schedule = {
     },
     "check-every-day-to-delete-email-notification-logs": {
         "task": "plane.bgtasks.cleanup_task.delete_email_notification_logs",
-        "schedule": crontab(hour=2, minute=45),  # UTC 02:45
+        "schedule": crontab(hour=3, minute=0),  # UTC 03:00
     },
     "check-every-day-to-delete-page-versions": {
         "task": "plane.bgtasks.cleanup_task.delete_page_versions",
-        "schedule": crontab(hour=3, minute=0),  # UTC 03:00
+        "schedule": crontab(hour=3, minute=30),  # UTC 03:30
     },
     "check-every-day-to-delete-issue-description-versions": {
         "task": "plane.bgtasks.cleanup_task.delete_issue_description_versions",
-        "schedule": crontab(hour=3, minute=15),  # UTC 03:15
-    },
-    "check-every-day-to-delete-webhook-logs": {
-        "task": "plane.bgtasks.cleanup_task.delete_webhook_logs",
-        "schedule": crontab(hour=3, minute=30),  # UTC 03:30
-    },
-    "check-every-day-to-delete-exporter-history": {
-        "task": "plane.bgtasks.exporter_expired_task.delete_old_s3_link",
-        "schedule": crontab(hour=3, minute=45),  # UTC 03:45
+        "schedule": crontab(hour=4, minute=0),  # UTC 04:00
     },
 }
 

apps/api/plane/db/migrations/0106_auto_20250912_0845.py

@@ -1,152 +0,0 @@
-# Generated by Django 4.2.22 on 2025-09-12 08:45
-import uuid
-import django
-from django.conf import settings
-from django.db import migrations, models
-
-
-def set_page_sort_order(apps, schema_editor):
-    Page = apps.get_model("db", "Page")
-
-    batch_size = 3000
-    sort_order = 100
-
-    # Get page IDs ordered by name using the historical model
-    # This should include all pages regardless of soft-delete status
-    page_ids = list(Page.objects.all().order_by("name").values_list("id", flat=True))
-
-    updated_pages = []
-    for page_id in page_ids:
-        # Create page instance with minimal data
-        updated_pages.append(Page(id=page_id, sort_order=sort_order))
-        sort_order += 100
-
-        # Bulk update when batch is full
-        if len(updated_pages) >= batch_size:
-            Page.objects.bulk_update(
-                updated_pages, ["sort_order"], batch_size=batch_size
-            )
-            updated_pages = []
-
-    # Update remaining pages
-    if updated_pages:
-        Page.objects.bulk_update(updated_pages, ["sort_order"], batch_size=batch_size)
-
-
-def reverse_set_page_sort_order(apps, schema_editor):
-    Page = apps.get_model("db", "Page")
-    Page.objects.update(sort_order=Page.DEFAULT_SORT_ORDER)
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ("db", "0105_alter_project_cycle_view_and_more"),
-    ]
-
-    operations = [
-        migrations.CreateModel(
-            name="ProjectWebhook",
-            fields=[
-                (
-                    "created_at",
-                    models.DateTimeField(auto_now_add=True, verbose_name="Created At"),
-                ),
-                (
-                    "updated_at",
-                    models.DateTimeField(
-                        auto_now=True, verbose_name="Last Modified At"
-                    ),
-                ),
-                (
-                    "deleted_at",
-                    models.DateTimeField(
-                        blank=True, null=True, verbose_name="Deleted At"
-                    ),
-                ),
-                (
-                    "id",
-                    models.UUIDField(
-                        db_index=True,
-                        default=uuid.uuid4,
-                        editable=False,
-                        primary_key=True,
-                        serialize=False,
-                        unique=True,
-                    ),
-                ),
-                (
-                    "created_by",
-                    models.ForeignKey(
-                        null=True,
-                        on_delete=django.db.models.deletion.SET_NULL,
-                        related_name="%(class)s_created_by",
-                        to=settings.AUTH_USER_MODEL,
-                        verbose_name="Created By",
-                    ),
-                ),
-                (
-                    "project",
-                    models.ForeignKey(
-                        on_delete=django.db.models.deletion.CASCADE,
-                        related_name="project_%(class)s",
-                        to="db.project",
-                    ),
-                ),
-                (
-                    "updated_by",
-                    models.ForeignKey(
-                        null=True,
-                        on_delete=django.db.models.deletion.SET_NULL,
-                        related_name="%(class)s_updated_by",
-                        to=settings.AUTH_USER_MODEL,
-                        verbose_name="Last Modified By",
-                    ),
-                ),
-                (
-                    "webhook",
-                    models.ForeignKey(
-                        on_delete=django.db.models.deletion.CASCADE,
-                        related_name="project_webhooks",
-                        to="db.webhook",
-                    ),
-                ),
-                (
-                    "workspace",
-                    models.ForeignKey(
-                        on_delete=django.db.models.deletion.CASCADE,
-                        related_name="workspace_%(class)s",
-                        to="db.workspace",
-                    ),
-                ),
-            ],
-            options={
-                "verbose_name": "Project Webhook",
-                "verbose_name_plural": "Project Webhooks",
-                "db_table": "project_webhooks",
-                "ordering": ("-created_at",),
-            },
-        ),
-        migrations.AddConstraint(
-            model_name="projectwebhook",
-            constraint=models.UniqueConstraint(
-                condition=models.Q(("deleted_at__isnull", True)),
-                fields=("project", "webhook"),
-                name="project_webhook_unique_project_webhook_when_deleted_at_null",
-            ),
-        ),
-        migrations.AlterUniqueTogether(
-            name="projectwebhook",
-            unique_together={("project", "webhook", "deleted_at")},
-        ),
-        migrations.AlterField(
-            model_name="issuerelation",
-            name="relation_type",
-            field=models.CharField(
-                default="blocked_by", max_length=20, verbose_name="Issue Relation Type"
-            ),
-        ),
-        migrations.RunPython(
-            set_page_sort_order, reverse_code=reverse_set_page_sort_order
-        ),
-    ]

apps/api/plane/db/migrations/0107_migrate_filters_to_rich_filters.py

@@ -1,74 +0,0 @@
-from django.db import migrations
-
-from plane.utils.filters import LegacyToRichFiltersConverter
-from plane.utils.filters.filter_migrations import (
-    migrate_models_filters_to_rich_filters,
-    clear_models_rich_filters,
-)
-
-
-# Define all models that need migration in one place
-MODEL_NAMES = [
-    "IssueView",
-    "WorkspaceUserProperties",
-    "ModuleUserProperties", 
-    "IssueUserProperty",
-    "CycleUserProperties",
-]
-
-
-def migrate_filters_to_rich_filters(apps, schema_editor):
-    """
-    Migrate legacy filters to rich_filters format for all models that have both fields.
-    """
-    # Get the model classes from model names
-    models_to_migrate = {}
-    
-    for model_name in MODEL_NAMES:
-        try:
-            model_class = apps.get_model("db", model_name)
-            models_to_migrate[model_name] = model_class
-        except Exception as e:
-            # Log error but continue with other models
-            import logging
-            logger = logging.getLogger(__name__)
-            logger.error(f"Failed to get model {model_name}: {str(e)}")
-    
-    converter = LegacyToRichFiltersConverter()
-    # Migrate all models
-    migrate_models_filters_to_rich_filters(models_to_migrate, converter)
-
-
-def reverse_migrate_rich_filters_to_filters(apps, schema_editor):
-    """
-    Reverse migration to clear rich_filters field for all models.
-    """
-    # Get the model classes from model names
-    models_to_clear = {}
-    
-    for model_name in MODEL_NAMES:
-        try:
-            model_class = apps.get_model("db", model_name)
-            models_to_clear[model_name] = model_class
-        except Exception as e:
-            # Log error but continue with other models
-            import logging
-            logger = logging.getLogger(__name__)
-            logger.error(f"Failed to get model {model_name}: {str(e)}")
-    
-    # Clear rich_filters for all models
-    clear_models_rich_filters(models_to_clear)
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('db', '0106_auto_20250912_0845'),
-    ]
-
-    operations = [
-        migrations.RunPython(
-            migrate_filters_to_rich_filters,
-            reverse_code=reverse_migrate_rich_filters_to_filters,
-        ),
-    ]

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

@@ -284,7 +284,6 @@ class IssueRelationChoices(models.TextChoices):
     BLOCKED_BY = "blocked_by", "Blocked By"
     START_BEFORE = "start_before", "Start Before"
     FINISH_BEFORE = "finish_before", "Finish Before"
-    IMPLEMENTED_BY = "implemented_by", "Implemented By"
 
 
 class IssueRelation(ProjectBaseModel):
@@ -296,6 +295,7 @@ class IssueRelation(ProjectBaseModel):
     )
     relation_type = models.CharField(
         max_length=20,
+        choices=IssueRelationChoices.choices,
         verbose_name="Issue Relation Type",
         default=IssueRelationChoices.BLOCKED_BY,
     )

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

@@ -19,7 +19,6 @@ def get_view_props():
 class Page(BaseModel):
     PRIVATE_ACCESS = 1
     PUBLIC_ACCESS = 0
-    DEFAULT_SORT_ORDER = 65535
 
     ACCESS_CHOICES = ((PRIVATE_ACCESS, "Private"), (PUBLIC_ACCESS, "Public"))
 
@@ -58,7 +57,7 @@ class Page(BaseModel):
     )
     moved_to_page = models.UUIDField(null=True, blank=True)
     moved_to_project = models.UUIDField(null=True, blank=True)
-    sort_order = models.FloatField(default=DEFAULT_SORT_ORDER)
+    sort_order = models.FloatField(default=65535)
 
     external_id = models.CharField(max_length=255, null=True, blank=True)
     external_source = models.CharField(max_length=255, null=True, blank=True)

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

@@ -7,7 +7,7 @@ from django.db import models
 from django.core.exceptions import ValidationError
 
 # Module imports
-from plane.db.models import BaseModel, ProjectBaseModel
+from plane.db.models import BaseModel
 
 
 def generate_token():
@@ -90,24 +90,3 @@ class WebhookLog(BaseModel):
 
     def __str__(self):
         return f"{self.event_type} {str(self.webhook)}"
-
-
-
-class ProjectWebhook(ProjectBaseModel):
-    webhook = models.ForeignKey(
-        "db.Webhook", on_delete=models.CASCADE, related_name="project_webhooks"
-    )
-
-    class Meta:
-        unique_together = ["project", "webhook", "deleted_at"]
-        constraints = [
-            models.UniqueConstraint(
-                fields=["project", "webhook"],
-                condition=models.Q(deleted_at__isnull=True),
-                name="project_webhook_unique_project_webhook_when_deleted_at_null",
-            )
-        ]
-        verbose_name = "Project Webhook"
-        verbose_name_plural = "Project Webhooks"
-        db_table = "project_webhooks"
-        ordering = ("-created_at",)

apps/api/plane/license/api/views/admin.py

@@ -34,7 +34,6 @@ from plane.authentication.adapter.error import (
     AuthenticationException,
 )
 from plane.utils.ip_address import get_client_ip
-from plane.utils.path_validator import get_safe_redirect_url
 
 
 class InstanceAdminEndpoint(BaseAPIView):
@@ -393,14 +392,7 @@ class InstanceAdminSignOutEndpoint(View):
             user.save()
             # Log the user out
             logout(request)
-            url = get_safe_redirect_url(
-                base_url=base_host(request=request, is_admin=True),
-                next_path=""
-            )
+            url = urljoin(base_host(request=request, is_admin=True))
             return HttpResponseRedirect(url)
         except Exception:
-            url = get_safe_redirect_url(
-                base_url=base_host(request=request, is_admin=True),
-                next_path=""
-            )
-            return HttpResponseRedirect(url)
+            return HttpResponseRedirect(base_host(request=request, is_admin=True))

apps/api/plane/space/utils/grouper.py

@@ -184,7 +184,6 @@ def issue_group_values(
     slug: str,
     project_id: Optional[str] = None,
     filters: Dict[str, Any] = {},
-    queryset: Optional[QuerySet] = None,
 ) -> List[Union[str, Any]]:
     if field == "state_id":
         queryset = State.objects.filter(
@@ -239,20 +238,35 @@ def issue_group_values(
     if field == "state__group":
         return ["backlog", "unstarted", "started", "completed", "cancelled"]
     if field == "target_date":
-        queryset = queryset.values_list("target_date", flat=True).distinct()
+        queryset = (
+            Issue.issue_objects.filter(workspace__slug=slug)
+            .filter(**filters)
+            .values_list("target_date", flat=True)
+            .distinct()
+        )
         if project_id:
             return list(queryset.filter(project_id=project_id))
         else:
             return list(queryset)
     if field == "start_date":
-        queryset = queryset.values_list("start_date", flat=True).distinct()
+        queryset = (
+            Issue.issue_objects.filter(workspace__slug=slug)
+            .filter(**filters)
+            .values_list("start_date", flat=True)
+            .distinct()
+        )
         if project_id:
             return list(queryset.filter(project_id=project_id))
         else:
             return list(queryset)
 
     if field == "created_by":
-        queryset = queryset.values_list("created_by", flat=True).distinct()
+        queryset = (
+            Issue.issue_objects.filter(workspace__slug=slug)
+            .filter(**filters)
+            .values_list("created_by", flat=True)
+            .distinct()
+        )
         if project_id:
             return list(queryset.filter(project_id=project_id))
         else:

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

@@ -1,10 +0,0 @@
-# Filters module for handling complex filtering operations
-
-# Import all utilities from base modules
-from .filter_backend import ComplexFilterBackend
-from .converters import LegacyToRichFiltersConverter
-from .filterset import IssueFilterSet
-
-
-# Public API exports
-__all__ = ["ComplexFilterBackend", "LegacyToRichFiltersConverter", "IssueFilterSet"]

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

@@ -1,438 +0,0 @@
-import re
-import uuid
-from datetime import datetime
-from typing import Any, Dict, List, Union
-
-from dateutil.parser import parse as dateutil_parse
-
-
-class LegacyToRichFiltersConverter:
-    # Default mapping from legacy filter names to new rich filter field names
-    DEFAULT_FIELD_MAPPINGS = {
-        "state": "state_id",
-        "labels": "label_id",
-        "cycle": "cycle_id",
-        "module": "module_id",
-        "assignees": "assignee_id",
-        "mentions": "mention_id",
-        "created_by": "created_by_id",
-        "state_group": "state_group",
-        "priority": "priority",
-        "project": "project_id",
-        "start_date": "start_date",
-        "target_date": "target_date",
-    }
-
-    # Default fields that expect UUID values
-    DEFAULT_UUID_FIELDS = {
-        "state_id",
-        "label_id",
-        "cycle_id",
-        "module_id",
-        "assignee_id",
-        "mention_id",
-        "created_by_id",
-        "project_id",
-    }
-
-    # Default valid choices for choice fields
-    DEFAULT_VALID_CHOICES = {
-        "state_group": ["backlog", "unstarted", "started", "completed", "cancelled"],
-        "priority": ["urgent", "high", "medium", "low", "none"],
-    }
-
-    # Default date fields
-    DEFAULT_DATE_FIELDS = {"start_date", "target_date"}
-
-    # Pattern for relative date strings like "2_weeks" or "3_months"
-    DATE_PATTERN = re.compile(r"(\d+)_(weeks|months)$")
-
-    def __init__(
-        self,
-        field_mappings: Dict[str, str] = None,
-        uuid_fields: set = None,
-        valid_choices: Dict[str, List[str]] = None,
-        date_fields: set = None,
-        extend_defaults: bool = True,
-    ):
-        """
-        Initialize the converter with optional custom configurations.
-
-        Args:
-            field_mappings: Custom field mappings (legacy_key -> rich_field_name)
-            uuid_fields: Set of field names that should be validated as UUIDs
-            valid_choices: Dict of valid choices for choice fields
-            date_fields: Set of field names that should be treated as dates
-            extend_defaults: If True, merge with defaults; if False, replace defaults
-
-        Examples:
-            # Use defaults
-            converter = LegacyToRichFiltersConverter()
-
-            # Add custom field mapping
-            converter = LegacyToRichFiltersConverter(
-                field_mappings={"custom_field": "custom_field_id"}
-            )
-
-            # Override priority choices
-            converter = LegacyToRichFiltersConverter(
-                valid_choices={"priority": ["critical", "high", "medium", "low"]}
-            )
-
-            # Complete replacement (not extending defaults)
-            converter = LegacyToRichFiltersConverter(
-                field_mappings={"state": "status_id"},
-                extend_defaults=False
-            )
-        """
-        if extend_defaults:
-            # Merge with defaults
-            self.FIELD_MAPPINGS = {**self.DEFAULT_FIELD_MAPPINGS}
-            if field_mappings:
-                self.FIELD_MAPPINGS.update(field_mappings)
-
-            self.UUID_FIELDS = {*self.DEFAULT_UUID_FIELDS}
-            if uuid_fields:
-                self.UUID_FIELDS.update(uuid_fields)
-
-            self.VALID_CHOICES = {**self.DEFAULT_VALID_CHOICES}
-            if valid_choices:
-                self.VALID_CHOICES.update(valid_choices)
-
-            self.DATE_FIELDS = {*self.DEFAULT_DATE_FIELDS}
-            if date_fields:
-                self.DATE_FIELDS.update(date_fields)
-        else:
-            # Replace defaults entirely
-            self.FIELD_MAPPINGS = field_mappings or {}
-            self.UUID_FIELDS = uuid_fields or set()
-            self.VALID_CHOICES = valid_choices or {}
-            self.DATE_FIELDS = date_fields or set()
-
-    def add_field_mapping(self, legacy_key: str, rich_field_name: str) -> None:
-        """Add or update a single field mapping."""
-        self.FIELD_MAPPINGS[legacy_key] = rich_field_name
-
-    def add_uuid_field(self, field_name: str) -> None:
-        """Add a field that should be validated as UUID."""
-        self.UUID_FIELDS.add(field_name)
-
-    def add_choice_field(self, field_name: str, choices: List[str]) -> None:
-        """Add or update valid choices for a choice field."""
-        self.VALID_CHOICES[field_name] = choices
-
-    def add_date_field(self, field_name: str) -> None:
-        """Add a field that should be treated as a date field."""
-        self.DATE_FIELDS.add(field_name)
-
-    def update_mappings(
-        self,
-        field_mappings: Dict[str, str] = None,
-        uuid_fields: set = None,
-        valid_choices: Dict[str, List[str]] = None,
-        date_fields: set = None,
-    ) -> None:
-        """
-        Update multiple configurations at once.
-
-        Args:
-            field_mappings: Additional field mappings to add/update
-            uuid_fields: Additional UUID fields to add
-            valid_choices: Additional choice fields to add/update
-            date_fields: Additional date fields to add
-        """
-        if field_mappings:
-            self.FIELD_MAPPINGS.update(field_mappings)
-        if uuid_fields:
-            self.UUID_FIELDS.update(uuid_fields)
-        if valid_choices:
-            self.VALID_CHOICES.update(valid_choices)
-        if date_fields:
-            self.DATE_FIELDS.update(date_fields)
-
-    def _validate_uuid(self, value: str) -> bool:
-        """Validate if a string is a valid UUID"""
-        try:
-            uuid.UUID(str(value))
-            return True
-        except (ValueError, TypeError):
-            return False
-
-    def _validate_choice(self, field_name: str, value: str) -> bool:
-        """Validate if a value is valid for a choice field"""
-        if field_name not in self.VALID_CHOICES:
-            return True  # No validation needed for this field
-        return value in self.VALID_CHOICES[field_name]
-
-    def _validate_date(self, value: Union[str, datetime]) -> bool:
-        """Validate if a value is a valid date using dateutil parser"""
-        if isinstance(value, datetime):
-            return True
-        if isinstance(value, str):
-            try:
-                # Use dateutil for flexible date parsing
-                dateutil_parse(value)
-                return True
-            except (ValueError, TypeError):
-                return False
-        return False
-
-    def _validate_value(self, rich_field_name: str, value: Any) -> bool:
-        """Validate a single value based on field type"""
-        if rich_field_name in self.UUID_FIELDS:
-            return self._validate_uuid(value)
-        elif rich_field_name in self.VALID_CHOICES:
-            return self._validate_choice(rich_field_name, value)
-        elif rich_field_name in self.DATE_FIELDS:
-            return self._validate_date(value)
-        return True  # No specific validation needed
-
-    def _filter_valid_values(
-        self, rich_field_name: str, values: List[Any]
-    ) -> List[Any]:
-        """Filter out invalid values from a list and return only valid ones"""
-        valid_values = []
-        for value in values:
-            if self._validate_value(rich_field_name, value):
-                valid_values.append(value)
-        return valid_values
-
-    def _add_validation_error(
-        self, strict: bool, validation_errors: List[str], message: str
-    ) -> None:
-        """Add validation error if in strict mode."""
-        if strict:
-            validation_errors.append(message)
-
-    def _add_rich_filter(
-        self, rich_filters: Dict[str, Any], field_name: str, operator: str, value: Any
-    ) -> None:
-        """Add a rich filter with proper field name formatting."""
-        # Convert lists to comma-separated strings for 'in' and 'range' operations
-        if operator in ("in", "range") and isinstance(value, list):
-            value = ",".join(str(v) for v in value)
-        rich_filters[f"{field_name}__{operator}"] = value
-
-    def _handle_value_error(
-        self, e: ValueError, strict: bool, validation_errors: List[str]
-    ) -> None:
-        """Handle ValueError with consistent strict/non-strict behavior."""
-        if strict:
-            validation_errors.append(str(e))
-        # In non-strict mode, we just skip (no action needed)
-
-    def _process_date_field(
-        self,
-        rich_field_name: str,
-        values: List[str],
-        strict: bool,
-        validation_errors: List[str],
-        rich_filters: Dict[str, Any],
-    ) -> bool:
-        """Process date field with basic functionality (exact, range)."""
-        if rich_field_name not in self.DATE_FIELDS:
-            return False
-
-        try:
-            date_filter_result = self._convert_date_value(
-                rich_field_name, values, strict
-            )
-            if date_filter_result:
-                rich_filters.update(date_filter_result)
-            return True
-        except ValueError as e:
-            self._handle_value_error(e, strict, validation_errors)
-            return True
-
-    def _convert_date_value(
-        self, field_name: str, values: List[str], strict: bool = False
-    ) -> Dict[str, Any]:
-        """
-        Convert legacy date values to rich filter format - basic implementation.
-
-        Supports:
-        - Simple dates: "2023-01-01" -> __exact
-        - Basic ranges: ["2023-01-01;after", "2023-12-31;before"] -> __range
-        - Skips complex or relative date patterns
-
-        Args:
-            field_name: Name of the rich filter field
-            values: List of legacy date values
-            strict: If True, raise errors for validation failures
-
-        Raises:
-            ValueError: For malformed date patterns (strict mode)
-        """
-        # Check for relative dates and skip the entire field if found
-        for value in values:
-            if ";" in value:
-                parts = value.split(";")
-                if len(parts) > 0 and self.DATE_PATTERN.match(parts[0]):
-                    # Skip relative date patterns entirely
-                    return {}
-
-        # Skip complex conditions (more than 2 values)
-        if len(values) > 2:
-            return {}
-
-        # Process each date value
-        exact_dates = []
-        after_dates = []
-        before_dates = []
-
-        for value in values:
-            if ";" not in value:
-                # Simple date string
-                if not self._validate_date(value):
-                    if strict:
-                        raise ValueError(f"Invalid date format: {value}")
-                    continue
-                exact_dates.append(value)
-            else:
-                # Directional date - only handle basic after/before
-                parts = value.split(";")
-                if len(parts) < 2:
-                    if strict:
-                        raise ValueError(f"Invalid date format: {value}")
-                    continue
-
-                date_part = parts[0]
-                direction = parts[1]
-
-                if not self._validate_date(date_part):
-                    if strict:
-                        raise ValueError(f"Invalid date format: {date_part}")
-                    continue
-
-                if direction == "after":
-                    after_dates.append(date_part)
-                elif direction == "before":
-                    before_dates.append(date_part)
-                # Skip unsupported directions
-
-        # Determine return format
-        result = {}
-        if len(after_dates) == 1 and len(before_dates) == 1 and len(exact_dates) == 0:
-            # Simple range: one after and one before
-            start_date = min(after_dates[0], before_dates[0])
-            end_date = max(after_dates[0], before_dates[0])
-            self._add_rich_filter(result, field_name, "range", [start_date, end_date])
-        elif len(exact_dates) == 1 and len(after_dates) == 0 and len(before_dates) == 0:
-            # Single exact date
-            self._add_rich_filter(result, field_name, "exact", exact_dates[0])
-        # Skip all other combinations
-
-        return result
-
-    def convert(self, legacy_filters: dict, strict: bool = False) -> Dict[str, Any]:
-        """
-        Convert legacy filters to rich filters format with validation
-
-        Args:
-            legacy_filters: Dictionary of legacy filters
-            strict: If True, raise exception on validation errors.
-                   If False, skip invalid values (default behavior)
-
-        Returns:
-            Dictionary of rich filters
-
-        Raises:
-            ValueError: If strict=True and validation fails
-        """
-        rich_filters = {}
-        validation_errors = []
-
-        for legacy_key, value in legacy_filters.items():
-            # Skip if value is None or empty
-            if value is None or (isinstance(value, list) and len(value) == 0):
-                continue
-
-            # Skip if legacy key is not in our mappings (not supported in filterset)
-            if legacy_key not in self.FIELD_MAPPINGS:
-                self._add_validation_error(
-                    strict, validation_errors, f"Unsupported filter key: {legacy_key}"
-                )
-                continue
-
-            # Get the new field name
-            rich_field_name = self.FIELD_MAPPINGS[legacy_key]
-
-            # Handle list values
-            if isinstance(value, list):
-                # Process date fields with helper method
-                if self._process_date_field(
-                    rich_field_name, value, strict, validation_errors, rich_filters
-                ):
-                    continue
-
-                # Regular non-date field processing
-                # Filter out invalid values
-                valid_values = self._filter_valid_values(rich_field_name, value)
-
-                if not valid_values:
-                    self._add_validation_error(
-                        strict,
-                        validation_errors,
-                        f"No valid values found for {legacy_key}: {value}",
-                    )
-                    continue
-
-                # Check for invalid values if in strict mode
-                if strict and len(valid_values) != len(value):
-                    invalid_values = [v for v in value if v not in valid_values]
-                    self._add_validation_error(
-                        strict,
-                        validation_errors,
-                        f"Invalid values for {legacy_key}: {invalid_values}",
-                    )
-
-                # For list values, always use __in operator for non-date fields
-                self._add_rich_filter(rich_filters, rich_field_name, "in", valid_values)
-
-            else:
-                # Handle single values
-                # Process date fields with helper method
-                if self._process_date_field(
-                    rich_field_name, [value], strict, validation_errors, rich_filters
-                ):
-                    continue
-
-                # For non-list values, use __exact operator for non-date fields
-                if self._validate_value(rich_field_name, value):
-                    self._add_rich_filter(rich_filters, rich_field_name, "exact", value)
-                else:
-                    error_msg = f"Invalid value for {legacy_key}: {value}"
-                    self._add_validation_error(strict, validation_errors, error_msg)
-
-        # Raise validation errors if in strict mode
-        if strict and validation_errors:
-            error_message = f"Filter validation errors: {'; '.join(validation_errors)}"
-            raise ValueError(error_message)
-
-        # Convert flat dict to rich filter format
-        return self._format_as_rich_filter(rich_filters)
-
-    def _format_as_rich_filter(self, flat_filters: Dict[str, Any]) -> Dict[str, Any]:
-        """
-        Convert a flat dictionary of filters to the proper rich filter format.
-
-        Args:
-            flat_filters: Dictionary with field__lookup keys and values
-
-        Returns:
-            Rich filter format using logical operators (and/or/not)
-        """
-        if not flat_filters:
-            return {}
-
-        # If only one filter, return as leaf node
-        if len(flat_filters) == 1:
-            key, value = next(iter(flat_filters.items()))
-            return {key: value}
-
-        # Multiple filters: wrap in 'and' operator
-        filter_conditions = []
-        for key, value in flat_filters.items():
-            filter_conditions.append({key: value})
-
-        return {"and": filter_conditions}

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

@@ -1,380 +0,0 @@
-import json
-
-from django.core.exceptions import ValidationError
-from django.http import QueryDict
-from django_filters.rest_framework import DjangoFilterBackend
-from rest_framework import filters
-
-
-class ComplexFilterBackend(filters.BaseFilterBackend):
-    """
-    Filter backend that supports complex JSON filtering.
-
-    For full, up-to-date examples and usage, see the package README
-    at `plane/utils/filters/README.md`.
-    """
-
-    filter_param = "filters"
-    default_max_depth = 5
-
-    def filter_queryset(self, request, queryset, view, filter_data=None):
-        """Normalize filter input and apply JSON-based filtering.
-
-        Accepts explicit `filter_data` (dict or JSON string) or reads the
-        `filter` query parameter. Enforces JSON-only filtering.
-        """
-        try:
-            if filter_data is not None:
-                normalized = self._normalize_filter_data(filter_data, "filter_data")
-                return self._apply_json_filter(queryset, normalized, view)
-
-            filter_string = request.query_params.get(self.filter_param, None)
-            if not filter_string:
-                return queryset
-
-            normalized = self._normalize_filter_data(filter_string, "filter")
-            return self._apply_json_filter(queryset, normalized, view)
-        except ValidationError:
-            # Propagate validation errors unchanged
-            raise
-        except Exception as 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.
-
-        - raw_filter may be a dict or a JSON string
-        - source_label is used in error messages (e.g., 'filter_data' or 'filter')
-        """
-        try:
-            if isinstance(raw_filter, str):
-                return json.loads(raw_filter)
-            if isinstance(raw_filter, dict):
-                return raw_filter
-            raise ValidationError(f"'{source_label}' must be a dict or a JSON string.")
-        except json.JSONDecodeError:
-            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 OR/AND/NOT set operations."""
-        if not filter_data:
-            return queryset
-
-        # Validate structure and depth before field allowlist checks
-        max_depth = self._get_max_depth(view)
-        self._validate_structure(filter_data, max_depth=max_depth, current_depth=1)
-
-        # Validate against the view's FilterSet (only declared filters are allowed)
-        self._validate_fields(filter_data, view)
-
-        # Build combined queryset using FilterSet-driven leaf evaluation
-        combined_qs = self._evaluate_node(filter_data, queryset, view)
-        if combined_qs is None:
-            return queryset
-        return combined_qs
-
-    def _validate_fields(self, filter_data, view):
-        """Validate that filtered fields are defined in the view's FilterSet."""
-        filterset_class = getattr(view, "filterset_class", None)
-        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 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)
-
-        # Check if all fields are allowed
-        for field in fields:
-            # Field keys must match FilterSet filter names (including any lookups)
-            # 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 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"""
-        if isinstance(filter_data, dict):
-            fields = []
-            for key, value in filter_data.items():
-                if key.lower() in ("or", "and", "not"):
-                    # This is a logical operator, process its children
-                    if key.lower() == "not":
-                        # 'not' has a dict as its value, not a list
-                        if isinstance(value, dict):
-                            fields.extend(self._extract_field_names(value))
-                    else:
-                        # 'or' and 'and' have lists as their values
-                        for item in value:
-                            fields.extend(self._extract_field_names(item))
-                else:
-                    # This is a field name
-                    fields.append(key)
-            return fields
-        return []
-
-    def _evaluate_node(self, node, base_queryset, view):
-        """
-        Recursively evaluate a JSON node into a combined queryset using branch-based filtering.
-
-        Rules:
-        - leaf dict → evaluated through DjangoFilterBackend as a mini-querystring
-        - {"or": [...]} → union (|) of children
-        - {"and": [...]} → collect field conditions per branch and apply together
-        - {"not": {...}} → exclude child's rows from the base queryset
-          (complement within base scope)
-        """
-        if not isinstance(node, dict):
-            return None
-
-        # 'or' combination - requires set operations between children
-        if "or" in node:
-            children = node["or"]
-            if not isinstance(children, list) or not children:
-                return None
-            combined = None
-            for child in children:
-                child_qs = self._evaluate_node(child, base_queryset, view)
-                if child_qs is None:
-                    continue
-                combined = child_qs if combined is None else (combined | child_qs)
-            return combined
-
-        # 'and' combination - collect field conditions per branch
-        if "and" in node:
-            children = node["and"]
-            if not isinstance(children, list) or not children:
-                return None
-            return self._evaluate_and_branch(children, base_queryset, view)
-
-        # 'not' negation
-        if "not" in node:
-            child = node["not"]
-            if not isinstance(child, dict):
-                return None
-            child_qs = self._evaluate_node(child, base_queryset, view)
-            if child_qs is None:
-                return None
-            # Use subquery instead of pk__in for better performance
-            # This avoids evaluating child_qs and creating large IN clauses
-            return base_queryset.exclude(pk__in=child_qs.values("pk"))
-
-        # Leaf dict: evaluate via DjangoFilterBackend using FilterSet
-        return self._filter_leaf_via_backend(node, base_queryset, view)
-
-    def _evaluate_and_branch(self, children, base_queryset, view):
-        """
-        Evaluate an AND branch by collecting field conditions and applying them together.
-
-        This approach is more efficient than individual leaf evaluation because:
-        - Field conditions within the same AND branch are collected and applied together
-        - Only logical operation children require separate evaluation and set intersection
-        - Reduces the number of intermediate querysets and database queries
-        """
-        collected_conditions = {}
-        logical_querysets = []
-
-        # Separate field conditions from logical operations
-        for child in children:
-            if not isinstance(child, dict):
-                continue
-
-            # Check if this child contains logical operators
-            has_logical = any(
-                k.lower() in ("or", "and", "not")
-                for k in child.keys()
-                if isinstance(k, str)
-            )
-
-            if has_logical:
-                # This child has logical operators, evaluate separately
-                child_qs = self._evaluate_node(child, base_queryset, view)
-                if child_qs is not None:
-                    logical_querysets.append(child_qs)
-            else:
-                # This is a leaf with field conditions, collect them
-                collected_conditions.update(child)
-
-        # Start with base queryset
-        result_qs = base_queryset
-
-        # Apply collected field conditions together if any exist
-        if collected_conditions:
-            result_qs = self._filter_leaf_via_backend(
-                collected_conditions, result_qs, view
-            )
-            if result_qs is None:
-                return None
-
-        # Intersect with any logical operation results
-        for logical_qs in logical_querysets:
-            result_qs = result_qs & logical_qs
-
-        return result_qs
-
-    def _filter_leaf_via_backend(self, leaf_conditions, base_queryset, view):
-        """Evaluate a leaf dict by delegating to DjangoFilterBackend once.
-
-        We serialize the leaf dict into a mini querystring and let the view's
-        filterset_class perform validation, conversion, and filtering. This returns
-        a lazy queryset suitable for set-operations with siblings.
-        """
-        if not leaf_conditions:
-            return None
-
-        # Build a QueryDict from the leaf conditions
-        qd = QueryDict(mutable=True)
-        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)
-                qd.setlist(key, [str(v) for v in value])
-            else:
-                qd[key] = "" if value is None else str(value)
-
-        qd = qd.copy()
-        qd._mutable = False
-
-        # Temporarily patch request.GET and delegate to DjangoFilterBackend
-        backend = DjangoFilterBackend()
-        request = view.request
-        original_get = request._request.GET if hasattr(request, "_request") else None
-        try:
-            if hasattr(request, "_request"):
-                request._request.GET = qd
-            return backend.filter_queryset(request, base_queryset, view)
-        finally:
-            if hasattr(request, "_request") and original_get is not None:
-                request._request.GET = original_get
-
-    def _get_max_depth(self, view):
-        """Return the maximum allowed nesting depth for complex filters.
-
-        Falls back to class default if the view does not specify it or has
-        an invalid value.
-        """
-        value = getattr(view, "complex_filter_max_depth", self.default_max_depth)
-        try:
-            value_int = int(value)
-            if value_int <= 0:
-                return self.default_max_depth
-            return value_int
-        except Exception:
-            return self.default_max_depth
-
-    def _validate_structure(self, node, max_depth, current_depth):
-        """Validate JSON structure and enforce nesting depth.
-
-        Rules:
-        - Each object may contain only one logical operator:
-          or/and/not (case-insensitive)
-        - Logical operator objects cannot contain field keys alongside the
-          operator
-        - or/and values must be non-empty lists of dicts
-        - not value must be a dict
-        - Leaf objects must only contain field keys and acceptable values
-        - Depth must not exceed max_depth
-        """
-        if current_depth > max_depth:
-            raise ValidationError(
-                f"Filter nesting is too deep (max {max_depth}); found depth"
-                f" {current_depth}"
-            )
-
-        if not isinstance(node, dict):
-            raise ValidationError("Each filter node must be a JSON object")
-
-        if not node:
-            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 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 ValidationError(
-                    f"Cannot mix logical operator '{op_key}' with field keys at"
-                    f" 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 ValidationError(
-                        f"'{op}' must be a non-empty list of filter objects"
-                    )
-                for child in value:
-                    if not isinstance(child, dict):
-                        raise ValidationError(
-                            f"All children of '{op}' must be JSON objects"
-                        )
-                    self._validate_structure(
-                        child,
-                        max_depth=max_depth,
-                        current_depth=current_depth + 1,
-                    )
-                return
-
-            if op == "not":
-                if not isinstance(value, dict):
-                    raise ValidationError("'not' must be a single JSON object")
-                self._validate_structure(
-                    value, max_depth=max_depth, current_depth=current_depth + 1
-                )
-                return
-
-        # Leaf node: validate fields and values
-        self._validate_leaf(node)
-
-    def _validate_leaf(self, leaf):
-        """Validate a leaf dict containing field lookups and values."""
-        if not isinstance(leaf, dict) or not 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 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 ValidationError(f"List value for '{key}' must not be empty")
-                for item in value:
-                    if not self._is_scalar(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 ValidationError(
-                    f"Value for '{key}' must be a scalar, null, or list/tuple of"
-                    f" scalars"
-                )
-
-    def _is_scalar(self, value):
-        return value is None or isinstance(value, (str, int, float, bool))

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

@@ -1,146 +0,0 @@
-"""
-Utilities for migrating legacy filters to rich filters format.
-
-This module contains helper functions for data migrations that convert
-filters fields to rich_filters fields using the LegacyToRichFiltersConverter.
-"""
-
-import logging
-from typing import Any, Dict, Tuple
-
-from .converters import LegacyToRichFiltersConverter
-
-
-logger = logging.getLogger("plane.api.filters.migration")
-
-
-def migrate_single_model_filters(
-    model_class, model_name: str, converter: LegacyToRichFiltersConverter
-) -> Tuple[int, int]:
-    """
-    Migrate filters to rich_filters for a single model.
-
-    Args:
-        model_class: Django model class
-        model_name: Human-readable name for logging
-        converter: Instance of LegacyToRichFiltersConverter
-
-    Returns:
-        Tuple of (updated_count, error_count)
-    """
-    # Find records that need migration - have filters but empty rich_filters
-    records_to_migrate = model_class.objects.exclude(filters={}).filter(rich_filters={})
-
-    if records_to_migrate.count() == 0:
-        logger.info(f"No {model_name} records need migration")
-        return 0, 0
-
-    logger.info(f"Found {records_to_migrate.count()} {model_name} records to migrate")
-
-    updated_records = []
-    conversion_errors = 0
-
-    for record in records_to_migrate:
-        try:
-            if record.filters:  # Double check that filters is not empty
-                rich_filters = converter.convert(record.filters, strict=False)
-                record.rich_filters = rich_filters
-                updated_records.append(record)
-
-        except Exception as e:
-            logger.warning(
-                f"Failed to convert filters for {model_name} ID {record.id}: {str(e)}"
-            )
-            conversion_errors += 1
-            continue
-
-    # Bulk update all successfully converted records
-    if updated_records:
-        model_class.objects.bulk_update(
-            updated_records, ["rich_filters"], batch_size=1000
-        )
-        logger.info(f"Successfully updated {len(updated_records)} {model_name} records")
-
-    return len(updated_records), conversion_errors
-
-
-def migrate_models_filters_to_rich_filters(
-    models_to_migrate: Dict[str, Any],
-    converter: LegacyToRichFiltersConverter,
-) -> Dict[str, Tuple[int, int]]:
-    """
-    Migrate legacy filters to rich_filters format for provided models.
-
-    Args:
-        models_to_migrate: Dict mapping model names to model classes
-
-    Returns:
-        Dictionary mapping model names to (updated_count, error_count) tuples
-    """
-    # Initialize the converter with default settings
-
-    logger.info("Starting filters to rich_filters migration for all models")
-
-    results = {}
-    total_updated = 0
-    total_errors = 0
-
-    for model_name, model_class in models_to_migrate.items():
-        try:
-            updated_count, error_count = migrate_single_model_filters(
-                model_class, model_name, converter
-            )
-
-            results[model_name] = (updated_count, error_count)
-            total_updated += updated_count
-            total_errors += error_count
-
-        except Exception as e:
-            logger.error(f"Failed to migrate {model_name}: {str(e)}")
-            results[model_name] = (0, 1)
-            total_errors += 1
-            continue
-
-    # Log final summary
-    logger.info(
-        f"Migration completed for all models. Total updated: {total_updated}, "
-        f"Total errors: {total_errors}"
-    )
-
-    return results
-
-
-def clear_models_rich_filters(models_to_clear: Dict[str, Any]) -> Dict[str, int]:
-    """
-    Clear rich_filters field for provided models (for reverse migration).
-
-    Args:
-        models_to_clear: Dictionary mapping model names to model classes
-
-    Returns:
-        Dictionary mapping model names to count of cleared records
-    """
-    logger.info("Starting reverse migration - clearing rich_filters for all models")
-
-    results = {}
-    total_cleared = 0
-
-    for model_name, model_class in models_to_clear.items():
-        try:
-            # Clear rich_filters for all records that have them
-            updated_count = model_class.objects.exclude(rich_filters={}).update(
-                rich_filters={}
-            )
-            results[model_name] = updated_count
-            total_cleared += updated_count
-            logger.info(
-                f"Cleared rich_filters for {updated_count} {model_name} records"
-            )
-
-        except Exception as e:
-            logger.error(f"Failed to clear rich_filters for {model_name}: {str(e)}")
-            results[model_name] = 0
-            continue
-
-    logger.info(f"Reverse migration completed. Total cleared: {total_cleared}")
-    return results

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

@@ -1,180 +0,0 @@
-import copy
-
-from django_filters import FilterSet, filters
-
-from plane.db.models import Issue
-
-
-class UUIDInFilter(filters.BaseInFilter, filters.UUIDFilter):
-    pass
-
-
-class CharInFilter(filters.BaseInFilter, filters.CharFilter):
-    pass
-
-
-class BaseFilterSet(FilterSet):
-    @classmethod
-    def get_filters(cls):
-        """
-        Get all filters for the filterset, including dynamically created __exact filters.
-        """
-        # Get the standard filters first
-        filters = super().get_filters()
-
-        # Add __exact versions for filters that have 'exact' lookup
-        exact_filters = {}
-        for filter_name, filter_obj in filters.items():
-            if hasattr(filter_obj, "lookup_expr") and filter_obj.lookup_expr == "exact":
-                exact_field_name = f"{filter_name}__exact"
-                if exact_field_name not in filters:
-                    # Copy the filter object as-is and assign it to the new name
-                    exact_filters[exact_field_name] = copy.deepcopy(filter_obj)
-
-        # Add the exact filters to the main filters dict
-        filters.update(exact_filters)
-        return filters
-
-
-class IssueFilterSet(BaseFilterSet):
-    # Custom filter methods to handle soft delete exclusion for relations
-
-    assignee_id = filters.UUIDFilter(method="filter_assignee_id")
-    assignee_id__in = UUIDInFilter(method="filter_assignee_id_in", lookup_expr="in")
-
-    cycle_id = filters.UUIDFilter(method="filter_cycle_id")
-    cycle_id__in = UUIDInFilter(method="filter_cycle_id_in", lookup_expr="in")
-
-    module_id = filters.UUIDFilter(method="filter_module_id")
-    module_id__in = UUIDInFilter(method="filter_module_id_in", lookup_expr="in")
-
-    mention_id = filters.UUIDFilter(method="filter_mention_id")
-    mention_id__in = UUIDInFilter(method="filter_mention_id_in", lookup_expr="in")
-
-    label_id = filters.UUIDFilter(method="filter_label_id")
-    label_id__in = UUIDInFilter(method="filter_label_id_in", lookup_expr="in")
-
-    # Direct field lookups remain the same
-    created_by_id = filters.UUIDFilter(field_name="created_by_id")
-    created_by_id__in = UUIDInFilter(field_name="created_by_id", lookup_expr="in")
-
-    is_archived = filters.BooleanFilter(method="filter_is_archived")
-
-    state_group = filters.CharFilter(field_name="state__group")
-    state_group__in = CharInFilter(field_name="state__group", lookup_expr="in")
-
-    state_id = filters.UUIDFilter(field_name="state_id")
-    state_id__in = UUIDInFilter(field_name="state_id", lookup_expr="in")
-
-    project_id = filters.UUIDFilter(field_name="project_id")
-    project_id__in = UUIDInFilter(field_name="project_id", lookup_expr="in")
-
-    subscriber_id = filters.UUIDFilter(method="filter_subscriber_id")
-    subscriber_id__in = UUIDInFilter(method="filter_subscriber_id_in", lookup_expr="in")
-
-    class Meta:
-        model = Issue
-        fields = {
-            "start_date": ["exact", "range"],
-            "target_date": ["exact", "range"],
-            "created_at": ["exact", "range"],
-            "is_draft": ["exact"],
-            "priority": ["exact", "in"],
-        }
-
-    def filter_is_archived(self, queryset, name, value):
-        """
-        Convenience filter: archived=true -> archived_at is not null,
-        archived=false -> archived_at is null
-        """
-        if value in (True, "true", "True", 1, "1"):
-            return queryset.filter(archived_at__isnull=False)
-        if value in (False, "false", "False", 0, "0"):
-            return queryset.filter(archived_at__isnull=True)
-        return queryset
-
-    # Filter methods with soft delete exclusion for relations
-
-    def filter_assignee_id(self, queryset, name, value):
-        """Filter by assignee ID, excluding soft deleted users"""
-        return queryset.filter(
-            issue_assignee__assignee_id=value,
-            issue_assignee__deleted_at__isnull=True,
-        )
-
-    def filter_assignee_id_in(self, queryset, name, value):
-        """Filter by assignee IDs (in), excluding soft deleted users"""
-        return queryset.filter(
-            issue_assignee__assignee_id__in=value,
-            issue_assignee__deleted_at__isnull=True,
-        )
-
-    def filter_cycle_id(self, queryset, name, value):
-        """Filter by cycle ID, excluding soft deleted cycles"""
-        return queryset.filter(
-            issue_cycle__cycle_id=value,
-            issue_cycle__deleted_at__isnull=True,
-        )
-
-    def filter_cycle_id_in(self, queryset, name, value):
-        """Filter by cycle IDs (in), excluding soft deleted cycles"""
-        return queryset.filter(
-            issue_cycle__cycle_id__in=value,
-            issue_cycle__deleted_at__isnull=True,
-        )
-
-    def filter_module_id(self, queryset, name, value):
-        """Filter by module ID, excluding soft deleted modules"""
-        return queryset.filter(
-            issue_module__module_id=value,
-            issue_module__deleted_at__isnull=True,
-        )
-
-    def filter_module_id_in(self, queryset, name, value):
-        """Filter by module IDs (in), excluding soft deleted modules"""
-        return queryset.filter(
-            issue_module__module_id__in=value,
-            issue_module__deleted_at__isnull=True,
-        )
-
-    def filter_mention_id(self, queryset, name, value):
-        """Filter by mention ID, excluding soft deleted users"""
-        return queryset.filter(
-            issue_mention__mention_id=value,
-            issue_mention__deleted_at__isnull=True,
-        )
-
-    def filter_mention_id_in(self, queryset, name, value):
-        """Filter by mention IDs (in), excluding soft deleted users"""
-        return queryset.filter(
-            issue_mention__mention_id__in=value,
-            issue_mention__deleted_at__isnull=True,
-        )
-
-    def filter_label_id(self, queryset, name, value):
-        """Filter by label ID, excluding soft deleted labels"""
-        return queryset.filter(
-            label_issue__label_id=value,
-            label_issue__deleted_at__isnull=True,
-        )
-
-    def filter_label_id_in(self, queryset, name, value):
-        """Filter by label IDs (in), excluding soft deleted labels"""
-        return queryset.filter(
-            label_issue__label_id__in=value,
-            label_issue__deleted_at__isnull=True,
-        )
-
-    def filter_subscriber_id(self, queryset, name, value):
-        """Filter by subscriber ID, excluding soft deleted users"""
-        return queryset.filter(
-            issue_subscribers__subscriber_id=value,
-            issue_subscribers__deleted_at__isnull=True,
-        )
-
-    def filter_subscriber_id_in(self, queryset, name, value):
-        """Filter by subscriber IDs (in), excluding soft deleted users"""
-        return queryset.filter(
-            issue_subscribers__subscriber_id__in=value,
-            issue_subscribers__deleted_at__isnull=True,
-        )

apps/api/plane/utils/grouper.py

@@ -148,7 +148,6 @@ def issue_group_values(
     slug: str,
     project_id: Optional[str] = None,
     filters: Dict[str, Any] = {},
-    queryset: Optional[QuerySet] = None,
 ) -> List[Union[str, Any]]:
     if field == "state_id":
         queryset = State.objects.filter(
@@ -208,24 +207,36 @@ def issue_group_values(
         return ["backlog", "unstarted", "started", "completed", "cancelled"]
 
     if field == "target_date":
-        queryset = queryset.values_list("target_date", flat=True).distinct()
+        queryset = (
+            Issue.issue_objects.filter(workspace__slug=slug)
+            .filter(**filters)
+            .values_list("target_date", flat=True)
+            .distinct()
+        )
         if project_id:
             return list(queryset.filter(project_id=project_id))
-        else:
-            return list(queryset)
+        return list(queryset)
 
     if field == "start_date":
-        queryset = queryset.values_list("start_date", flat=True).distinct()
+        queryset = (
+            Issue.issue_objects.filter(workspace__slug=slug)
+            .filter(**filters)
+            .values_list("start_date", flat=True)
+            .distinct()
+        )
         if project_id:
             return list(queryset.filter(project_id=project_id))
-        else:
-            return list(queryset)
+        return list(queryset)
 
     if field == "created_by":
-        queryset = queryset.values_list("created_by", flat=True).distinct()
+        queryset = (
+            Issue.issue_objects.filter(workspace__slug=slug)
+            .filter(**filters)
+            .values_list("created_by", flat=True)
+            .distinct()
+        )
         if project_id:
             return list(queryset.filter(project_id=project_id))
-        else:
-            return list(queryset)
+        return list(queryset)
 
     return []

apps/api/plane/utils/issue_relation_mapper.py

@@ -6,14 +6,12 @@ def get_inverse_relation(relation_type):
         "blocking": "blocked_by",
         "start_before": "start_after",
         "finish_before": "finish_after",
-        "implemented_by": "implements",
-        "implements": "implemented_by",
     }
     return relation_mapping.get(relation_type, relation_type)
 
 
 def get_actual_relation(relation_type):
-    # This function is used to get the actual relation type which is stored in database
+    # This function is used to get the actual relation type which is store in database
     actual_relation = {
         "start_after": "start_before",
         "finish_after": "finish_before",
@@ -21,8 +19,6 @@ def get_actual_relation(relation_type):
         "blocked_by": "blocked_by",
         "start_before": "start_before",
         "finish_before": "finish_before",
-        "implemented_by": "implemented_by",
-        "implements": "implemented_by",
     }
 
     return actual_relation.get(relation_type, relation_type)

apps/api/plane/utils/path_validator.py

@@ -1,79 +1,10 @@
-# Django imports
-from django.utils.http import url_has_allowed_host_and_scheme
-from django.conf import settings
-
 # Python imports
 from urllib.parse import urlparse
 
 
-def _contains_suspicious_patterns(path: str) -> bool:
-    """
-    Check for suspicious patterns that might indicate malicious intent.
-    
-    Args:
-        path (str): The path to check
-        
-    Returns:
-        bool: True if suspicious patterns found, False otherwise
-    """
-    suspicious_patterns = [
-        r'javascript:',  # JavaScript injection
-        r'data:',  # Data URLs
-        r'vbscript:',  # VBScript injection
-        r'file:',  # File protocol
-        r'ftp:',  # FTP protocol
-        r'%2e%2e',  # URL encoded path traversal
-        r'%2f%2f',  # URL encoded double slash
-        r'%5c%5c',  # URL encoded backslashes
-        r'<script',  # Script tags
-        r'<iframe',  # Iframe tags
-        r'<object',  # Object tags
-        r'<embed',  # Embed tags
-        r'<form',  # Form tags
-        r'onload=',  # Event handlers
-        r'onerror=',  # Event handlers
-        r'onclick=',  # Event handlers
-    ]
-    
-    path_lower = path.lower()
-    for pattern in suspicious_patterns:
-        if pattern in path_lower:
-            return True
-    
-    return False
-
-
-def get_allowed_hosts() -> list[str]:
-    """Get the allowed hosts from the settings."""
-    base_origin = settings.WEB_URL or settings.APP_BASE_URL
-
-    allowed_hosts = []
-    if base_origin:
-        host = urlparse(base_origin).netloc
-        allowed_hosts.append(host)
-    if settings.ADMIN_BASE_URL:
-        # Get only the host
-        host = urlparse(settings.ADMIN_BASE_URL).netloc
-        allowed_hosts.append(host)
-    if settings.SPACE_BASE_URL:
-        # Get only the host
-        host = urlparse(settings.SPACE_BASE_URL).netloc
-        allowed_hosts.append(host)
-    return allowed_hosts
-
-
 def validate_next_path(next_path: str) -> str:
     """Validates that next_path is a safe relative path for redirection."""
     # Browsers interpret backslashes as forward slashes. Remove all backslashes.
-    if not next_path or not isinstance(next_path, str):
-        return ""
-
-
-    # Limit input length to prevent DoS attacks
-    if len(next_path) > 500:
-        return ""
-
-
     next_path = next_path.replace("\\", "")
     parsed_url = urlparse(next_path)
 
@@ -89,55 +20,4 @@ def validate_next_path(next_path: str) -> str:
     if ".." in next_path:
         return ""
 
-    # Additional security checks
-    if _contains_suspicious_patterns(next_path):
-        return ""
-
     return next_path
-
- 
-def get_safe_redirect_url(base_url: str, next_path: str = "", params: dict = {}) -> str:
-    """
-    Safely construct a redirect URL with validated next_path.
-    
-    Args:
-        base_url (str): The base URL to redirect to
-        next_path (str): The next path to append
-        params (dict): The parameters to append
-    Returns:
-        str: The safe redirect URL
-    """
-    from urllib.parse import urlencode, quote
-
-    # Validate the next path
-    validated_path = validate_next_path(next_path)
-
-    # Add the next path to the parameters
-    base_url = base_url.rstrip('/')
-
-    # Prepare the query parameters
-    query_parts = []
-    encoded_params = ""
-
-    # Add the next path to the parameters
-    if validated_path:
-        query_parts.append(f"next_path={validated_path}")
-
-    # Add additional parameters
-    if params:
-        encoded_params = urlencode(params)
-        query_parts.append(encoded_params)
-
-    # Construct the url query string
-    if query_parts:
-        query_string = "&".join(query_parts)
-        url = f"{base_url}/?{query_string}"
-    else:
-        url = base_url
-
-    # Check if the URL is allowed
-    if url_has_allowed_host_and_scheme(url, allowed_hosts=get_allowed_hosts()):
-        return url
-    
-    # Return the base URL if the URL is not allowed
-    return base_url + (f"?{encoded_params}" if encoded_params else "")

apps/space/app/page.tsx

@@ -1,9 +1,6 @@
 "use client";
-import { useEffect } from "react";
+
 import { observer } from "mobx-react";
-import { useSearchParams, useRouter } from "next/navigation";
-// plane imports
-import { isValidNextPath } from "@plane/utils";
 // components
 import { UserLoggedIn } from "@/components/account/user-logged-in";
 import { LogoSpinner } from "@/components/common/logo-spinner";
@@ -13,15 +10,6 @@ import { useUser } from "@/hooks/store/use-user";
 
 const HomePage = observer(() => {
   const { data: currentUser, isAuthenticated, isInitializing } = useUser();
-  const searchParams = useSearchParams();
-  const router = useRouter();
-  const nextPath = searchParams.get("next_path");
-
-  useEffect(() => {
-    if (currentUser && isAuthenticated && nextPath && isValidNextPath(nextPath)) {
-      router.replace(nextPath);
-    }
-  }, [currentUser, isAuthenticated, nextPath, router]);
 
   if (isInitializing)
     return (
@@ -30,16 +18,7 @@ const HomePage = observer(() => {
       </div>
     );
 
-  if (currentUser && isAuthenticated) {
-    if (nextPath && isValidNextPath(nextPath)) {
-      return (
-        <div className="flex h-screen min-h-[500px] w-full justify-center items-center">
-          <LogoSpinner />
-        </div>
-      );
-    }
-    return <UserLoggedIn />;
-  }
+  if (currentUser && isAuthenticated) return <UserLoggedIn />;
 
   return <AuthView />;
 });

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

@@ -25,12 +25,18 @@ export const PeekOverviewIssueDetails: React.FC<Props> = observer((props) => {
         {project_details?.identifier}-{issueDetails?.sequence_id}
       </h6>
       <h4 className="break-words text-2xl font-medium">{issueDetails.name}</h4>
-      {description && description !== "" && description !== "<p></p>" && (
+      {description !== "" && description !== "<p></p>" && (
         <RichTextEditor
           editable={false}
           anchor={anchor}
           id={issueDetails.id}
-          initialValue={description}
+          initialValue={
+            !description ||
+            description === "" ||
+            (typeof description === "object" && Object.keys(description).length === 0)
+              ? "<p></p>"
+              : description
+          }
           workspaceId={workspaceID?.toString() ?? ""}
         />
       )}

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

@@ -14,16 +14,19 @@ import {
   EIssuesStoreType,
   IIssueDisplayFilterOptions,
   IIssueDisplayProperties,
+  IIssueFilterOptions,
   TIssueLayouts,
   EIssueLayoutTypes,
 } from "@plane/types";
 // ui
 import { CustomMenu } from "@plane/ui";
 // components
-import { DisplayFiltersSelection, FiltersDropdown } from "@/components/issues/issue-layouts/filters";
+import { isIssueFilterActive } from "@plane/utils";
+import { DisplayFiltersSelection, FilterSelection, FiltersDropdown } from "@/components/issues/issue-layouts/filters";
 import { IssueLayoutIcon } from "@/components/issues/issue-layouts/layout-icon";
 // hooks
 import { useIssues } from "@/hooks/store/use-issues";
+import { useLabel } from "@/hooks/store/use-label";
 
 export const ProfileIssuesMobileHeader = observer(() => {
   // plane i18n
@@ -34,7 +37,14 @@ export const ProfileIssuesMobileHeader = observer(() => {
   const {
     issuesFilter: { issueFilters, updateFilters },
   } = useIssues(EIssuesStoreType.PROFILE);
+
+  const { workspaceLabels } = useLabel();
   // derived values
+  const states = undefined;
+  // const members = undefined;
+  // const activeLayout = issueFilters?.displayFilters?.layout;
+  // const states = undefined;
+  const members = undefined;
   const activeLayout = issueFilters?.displayFilters?.layout;
 
   const handleLayoutChange = useCallback(
@@ -51,6 +61,31 @@ export const ProfileIssuesMobileHeader = observer(() => {
     [workspaceSlug, updateFilters, userId]
   );
 
+  const handleFiltersUpdate = useCallback(
+    (key: keyof IIssueFilterOptions, value: string | string[]) => {
+      if (!workspaceSlug || !userId) return;
+      const newValues = issueFilters?.filters?.[key] ?? [];
+
+      if (Array.isArray(value)) {
+        value.forEach((val) => {
+          if (!newValues.includes(val)) newValues.push(val);
+        });
+      } else {
+        if (issueFilters?.filters?.[key]?.includes(value)) newValues.splice(newValues.indexOf(value), 1);
+        else newValues.push(value);
+      }
+
+      updateFilters(
+        workspaceSlug.toString(),
+        undefined,
+        EIssueFilterType.FILTERS,
+        { [key]: newValues },
+        userId.toString()
+      );
+    },
+    [workspaceSlug, issueFilters, updateFilters, userId]
+  );
+
   const handleDisplayFilters = useCallback(
     (updatedDisplayFilter: Partial<IIssueDisplayFilterOptions>) => {
       if (!workspaceSlug || !userId) return;
@@ -110,6 +145,32 @@ export const ProfileIssuesMobileHeader = observer(() => {
           );
         })}
       </CustomMenu>
+      <div className="flex flex-grow items-center justify-center border-l border-custom-border-200 text-sm text-custom-text-200">
+        <FiltersDropdown
+          title={t("common.filters")}
+          placement="bottom-end"
+          menuButton={
+            <div className="flex flex-center text-sm text-custom-text-200">
+              {t("common.filters")}
+              <ChevronDown className="ml-2  h-4 w-4 text-custom-text-200" strokeWidth={2} />
+            </div>
+          }
+          isFiltersApplied={isIssueFilterActive(issueFilters)}
+        >
+          <FilterSelection
+            layoutDisplayFiltersOptions={
+              activeLayout ? ISSUE_DISPLAY_FILTERS_BY_PAGE.profile_issues[activeLayout] : undefined
+            }
+            filters={issueFilters?.filters ?? {}}
+            handleFiltersUpdate={handleFiltersUpdate}
+            displayFilters={issueFilters?.displayFilters ?? {}}
+            handleDisplayFiltersUpdate={handleDisplayFilters}
+            states={states}
+            labels={workspaceLabels}
+            memberIds={members}
+          />
+        </FiltersDropdown>
+      </div>
       <div className="flex flex-grow items-center justify-center border-l border-custom-border-200 text-sm text-custom-text-200">
         <FiltersDropdown
           title={t("common.display")}
@@ -123,7 +184,7 @@ export const ProfileIssuesMobileHeader = observer(() => {
         >
           <DisplayFiltersSelection
             layoutDisplayFiltersOptions={
-              activeLayout ? ISSUE_DISPLAY_FILTERS_BY_PAGE.profile_issues.layoutOptions[activeLayout] : undefined
+              activeLayout ? ISSUE_DISPLAY_FILTERS_BY_PAGE.profile_issues[activeLayout] : undefined
             }
             displayFilters={issueFilters?.displayFilters ?? {}}
             handleDisplayFiltersUpdate={handleDisplayFilters}

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

@@ -4,7 +4,7 @@ import { useCallback, useRef, useState } from "react";
 import { observer } from "mobx-react";
 import { useParams } from "next/navigation";
 // icons
-import { ChartNoAxesColumn, PanelRight, SlidersHorizontal } from "lucide-react";
+import { ChartNoAxesColumn, ListFilter, PanelRight, SlidersHorizontal } from "lucide-react";
 // plane imports
 import {
   EIssueFilterType,
@@ -23,10 +23,11 @@ import {
   ICustomSearchSelectOption,
   IIssueDisplayFilterOptions,
   IIssueDisplayProperties,
+  IIssueFilterOptions,
   EIssueLayoutTypes,
 } from "@plane/types";
 import { Breadcrumbs, Button, BreadcrumbNavigationSearchDropdown, Header } from "@plane/ui";
-import { cn } from "@plane/utils";
+import { cn, isIssueFilterActive } from "@plane/utils";
 // components
 import { WorkItemsModal } from "@/components/analytics/work-items/modal";
 import { SwitcherLabel } from "@/components/common/switcher-label";
@@ -34,6 +35,7 @@ import { CycleQuickActions } from "@/components/cycles/quick-actions";
 import {
   DisplayFiltersSelection,
   FiltersDropdown,
+  FilterSelection,
   LayoutSelection,
   MobileLayoutSelection,
 } from "@/components/issues/issue-layouts/filters";
@@ -41,7 +43,10 @@ import {
 import { useCommandPalette } from "@/hooks/store/use-command-palette";
 import { useCycle } from "@/hooks/store/use-cycle";
 import { useIssues } from "@/hooks/store/use-issues";
+import { useLabel } from "@/hooks/store/use-label";
+import { useMember } from "@/hooks/store/use-member";
 import { useProject } from "@/hooks/store/use-project";
+import { useProjectState } from "@/hooks/store/use-project-state";
 import { useUserPermissions } from "@/hooks/store/user";
 import { useAppRouter } from "@/hooks/use-app-router";
 import useLocalStorage from "@/hooks/use-local-storage";
@@ -70,6 +75,11 @@ export const CycleIssuesHeader: React.FC = observer(() => {
   const { currentProjectCycleIds, getCycleById } = useCycle();
   const { toggleCreateIssueModal } = useCommandPalette();
   const { currentProjectDetails, loader } = useProject();
+  const { projectStates } = useProjectState();
+  const { projectLabels } = useLabel();
+  const {
+    project: { projectMemberIds },
+  } = useMember();
   const { isMobile } = usePlatformOS();
   const { allowPermissions } = useUserPermissions();
 
@@ -90,6 +100,27 @@ export const CycleIssuesHeader: React.FC = observer(() => {
     [workspaceSlug, projectId, cycleId, updateFilters]
   );
 
+  const handleFiltersUpdate = useCallback(
+    (key: keyof IIssueFilterOptions, value: string | string[]) => {
+      if (!workspaceSlug || !projectId) return;
+      const newValues = issueFilters?.filters?.[key] ?? [];
+
+      if (Array.isArray(value)) {
+        // this validation is majorly for the filter start_date, target_date custom
+        value.forEach((val) => {
+          if (!newValues.includes(val)) newValues.push(val);
+          else newValues.splice(newValues.indexOf(val), 1);
+        });
+      } else {
+        if (issueFilters?.filters?.[key]?.includes(value)) newValues.splice(newValues.indexOf(value), 1);
+        else newValues.push(value);
+      }
+
+      updateFilters(workspaceSlug, projectId, EIssueFilterType.FILTERS, { [key]: newValues }, cycleId);
+    },
+    [workspaceSlug, projectId, cycleId, issueFilters, updateFilters]
+  );
+
   const handleDisplayFilters = useCallback(
     (updatedDisplayFilter: Partial<IIssueDisplayFilterOptions>) => {
       if (!workspaceSlug || !projectId) return;
@@ -208,6 +239,27 @@ export const CycleIssuesHeader: React.FC = observer(() => {
                 activeLayout={activeLayout}
               />
             </div>
+            <FiltersDropdown
+              title={t("common.filters")}
+              placement="bottom-end"
+              isFiltersApplied={isIssueFilterActive(issueFilters)}
+              miniIcon={<ListFilter className="size-3.5" />}
+            >
+              <FilterSelection
+                filters={issueFilters?.filters ?? {}}
+                handleFiltersUpdate={handleFiltersUpdate}
+                layoutDisplayFiltersOptions={
+                  activeLayout ? ISSUE_DISPLAY_FILTERS_BY_PAGE.issues[activeLayout] : undefined
+                }
+                displayFilters={issueFilters?.displayFilters ?? {}}
+                handleDisplayFiltersUpdate={handleDisplayFilters}
+                labels={projectLabels}
+                memberIds={projectMemberIds ?? undefined}
+                states={projectStates}
+                cycleViewDisabled={!currentProjectDetails?.cycle_view}
+                moduleViewDisabled={!currentProjectDetails?.module_view}
+              />
+            </FiltersDropdown>
             <FiltersDropdown
               title={t("common.display")}
               placement="bottom-end"
@@ -215,7 +267,7 @@ export const CycleIssuesHeader: React.FC = observer(() => {
             >
               <DisplayFiltersSelection
                 layoutDisplayFiltersOptions={
-                  activeLayout ? ISSUE_DISPLAY_FILTERS_BY_PAGE.issues.layoutOptions[activeLayout] : undefined
+                  activeLayout ? ISSUE_DISPLAY_FILTERS_BY_PAGE.issues[activeLayout] : undefined
                 }
                 displayFilters={issueFilters?.displayFilters ?? {}}
                 handleDisplayFiltersUpdate={handleDisplayFilters}

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

@@ -7,39 +7,48 @@ import { Calendar, ChevronDown, Kanban, List } from "lucide-react";
 // plane imports
 import { EIssueFilterType, ISSUE_LAYOUTS, ISSUE_DISPLAY_FILTERS_BY_PAGE } from "@plane/constants";
 import { useTranslation } from "@plane/i18n";
-import { EIssuesStoreType, IIssueDisplayFilterOptions, IIssueDisplayProperties, EIssueLayoutTypes } from "@plane/types";
+import {
+  EIssuesStoreType,
+  IIssueDisplayFilterOptions,
+  IIssueDisplayProperties,
+  IIssueFilterOptions,
+  EIssueLayoutTypes,
+} from "@plane/types";
 import { CustomMenu } from "@plane/ui";
+import { isIssueFilterActive } from "@plane/utils";
 // components
 import { WorkItemsModal } from "@/components/analytics/work-items/modal";
-import { DisplayFiltersSelection, FiltersDropdown } from "@/components/issues/issue-layouts/filters";
+import { DisplayFiltersSelection, FilterSelection, FiltersDropdown } from "@/components/issues/issue-layouts/filters";
 import { IssueLayoutIcon } from "@/components/issues/issue-layouts/layout-icon";
 // hooks
 import { useCycle } from "@/hooks/store/use-cycle";
 import { useIssues } from "@/hooks/store/use-issues";
+import { useLabel } from "@/hooks/store/use-label";
+import { useMember } from "@/hooks/store/use-member";
 import { useProject } from "@/hooks/store/use-project";
-
-const SUPPORTED_LAYOUTS = [
-  { key: "list", titleTranslationKey: "issue.layouts.list", icon: List },
-  { key: "kanban", titleTranslationKey: "issue.layouts.kanban", icon: Kanban },
-  { key: "calendar", titleTranslationKey: "issue.layouts.calendar", icon: Calendar },
-];
+import { useProjectState } from "@/hooks/store/use-project-state";
 
 export const CycleIssuesMobileHeader = () => {
-  // router
-  const { workspaceSlug, projectId, cycleId } = useParams();
-  // states
-  const [analyticsModal, setAnalyticsModal] = useState(false);
-  // plane hooks
+  // i18n
   const { t } = useTranslation();
+
+  const [analyticsModal, setAnalyticsModal] = useState(false);
+  const { getCycleById } = useCycle();
+  const layouts = [
+    { key: "list", titleTranslationKey: "issue.layouts.list", icon: List },
+    { key: "kanban", titleTranslationKey: "issue.layouts.kanban", icon: Kanban },
+    { key: "calendar", titleTranslationKey: "issue.layouts.calendar", icon: Calendar },
+  ];
+
+  const { workspaceSlug, projectId, cycleId } = useParams();
+  const cycleDetails = cycleId ? getCycleById(cycleId.toString()) : undefined;
+
   // store hooks
   const { currentProjectDetails } = useProject();
-  const { getCycleById } = useCycle();
   const {
     issuesFilter: { issueFilters, updateFilters },
   } = useIssues(EIssuesStoreType.CYCLE);
-  // derived values
   const activeLayout = issueFilters?.displayFilters?.layout;
-  const cycleDetails = cycleId ? getCycleById(cycleId.toString()) : undefined;
 
   const handleLayoutChange = useCallback(
     (layout: EIssueLayoutTypes) => {
@@ -55,6 +64,37 @@ export const CycleIssuesMobileHeader = () => {
     [workspaceSlug, projectId, cycleId, updateFilters]
   );
 
+  const { projectStates } = useProjectState();
+  const { projectLabels } = useLabel();
+  const {
+    project: { projectMemberIds },
+  } = useMember();
+
+  const handleFiltersUpdate = useCallback(
+    (key: keyof IIssueFilterOptions, value: string | string[]) => {
+      if (!workspaceSlug || !projectId || !cycleId) return;
+      const newValues = issueFilters?.filters?.[key] ?? [];
+
+      if (Array.isArray(value)) {
+        value.forEach((val) => {
+          if (!newValues.includes(val)) newValues.push(val);
+        });
+      } else {
+        if (issueFilters?.filters?.[key]?.includes(value)) newValues.splice(newValues.indexOf(value), 1);
+        else newValues.push(value);
+      }
+
+      updateFilters(
+        workspaceSlug.toString(),
+        projectId.toString(),
+        EIssueFilterType.FILTERS,
+        { [key]: newValues },
+        cycleId.toString()
+      );
+    },
+    [workspaceSlug, projectId, cycleId, issueFilters, updateFilters]
+  );
+
   const handleDisplayFilters = useCallback(
     (updatedDisplayFilter: Partial<IIssueDisplayFilterOptions>) => {
       if (!workspaceSlug || !projectId || !cycleId) return;
@@ -102,7 +142,7 @@ export const CycleIssuesMobileHeader = () => {
           customButtonClassName="flex flex-grow justify-center text-custom-text-200 text-sm"
           closeOnSelect
         >
-          {SUPPORTED_LAYOUTS.map((layout, index) => (
+          {layouts.map((layout, index) => (
             <CustomMenu.MenuItem
               key={ISSUE_LAYOUTS[index].key}
               onClick={() => {
@@ -115,6 +155,34 @@ export const CycleIssuesMobileHeader = () => {
             </CustomMenu.MenuItem>
           ))}
         </CustomMenu>
+        <div className="flex flex-grow justify-center border-l border-custom-border-200 items-center text-custom-text-200 text-sm">
+          <FiltersDropdown
+            title={t("common.filters")}
+            placement="bottom-end"
+            menuButton={
+              <span className="flex items-center text-custom-text-200 text-sm">
+                {t("common.filters")}
+                <ChevronDown className="text-custom-text-200  h-4 w-4 ml-2" />
+              </span>
+            }
+            isFiltersApplied={isIssueFilterActive(issueFilters)}
+          >
+            <FilterSelection
+              filters={issueFilters?.filters ?? {}}
+              handleFiltersUpdate={handleFiltersUpdate}
+              layoutDisplayFiltersOptions={
+                activeLayout ? ISSUE_DISPLAY_FILTERS_BY_PAGE.issues[activeLayout] : undefined
+              }
+              displayFilters={issueFilters?.displayFilters ?? {}}
+              handleDisplayFiltersUpdate={handleDisplayFilters}
+              labels={projectLabels}
+              memberIds={projectMemberIds ?? undefined}
+              states={projectStates}
+              cycleViewDisabled={!currentProjectDetails?.cycle_view}
+              moduleViewDisabled={!currentProjectDetails?.module_view}
+            />
+          </FiltersDropdown>
+        </div>
         <div className="flex flex-grow justify-center border-l border-custom-border-200 items-center text-custom-text-200 text-sm">
           <FiltersDropdown
             title={t("common.display")}
@@ -128,7 +196,7 @@ export const CycleIssuesMobileHeader = () => {
           >
             <DisplayFiltersSelection
               layoutDisplayFiltersOptions={
-                activeLayout ? ISSUE_DISPLAY_FILTERS_BY_PAGE.issues.layoutOptions[activeLayout] : undefined
+                activeLayout ? ISSUE_DISPLAY_FILTERS_BY_PAGE.issues[activeLayout] : undefined
               }
               displayFilters={issueFilters?.displayFilters ?? {}}
               handleDisplayFiltersUpdate={handleDisplayFilters}

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

@@ -7,17 +7,28 @@ import { ChevronDown } from "lucide-react";
 // plane imports
 import { EIssueFilterType, ISSUE_DISPLAY_FILTERS_BY_PAGE } from "@plane/constants";
 import { useTranslation } from "@plane/i18n";
-import { EIssuesStoreType, IIssueDisplayFilterOptions, IIssueDisplayProperties, EIssueLayoutTypes } from "@plane/types";
+import {
+  EIssuesStoreType,
+  IIssueDisplayFilterOptions,
+  IIssueDisplayProperties,
+  IIssueFilterOptions,
+  EIssueLayoutTypes,
+} from "@plane/types";
+import { isIssueFilterActive } from "@plane/utils";
 // components
 import { WorkItemsModal } from "@/components/analytics/work-items/modal";
 import {
   DisplayFiltersSelection,
+  FilterSelection,
   FiltersDropdown,
   MobileLayoutSelection,
 } from "@/components/issues/issue-layouts/filters";
 // hooks
 import { useIssues } from "@/hooks/store/use-issues";
+import { useLabel } from "@/hooks/store/use-label";
+import { useMember } from "@/hooks/store/use-member";
 import { useProject } from "@/hooks/store/use-project";
+import { useProjectState } from "@/hooks/store/use-project-state";
 
 export const ProjectIssuesMobileHeader = observer(() => {
   // i18n
@@ -28,11 +39,16 @@ export const ProjectIssuesMobileHeader = observer(() => {
     projectId: string;
   };
   const { currentProjectDetails } = useProject();
+  const { projectStates } = useProjectState();
+  const { projectLabels } = useLabel();
 
   // store hooks
   const {
     issuesFilter: { issueFilters, updateFilters },
   } = useIssues(EIssuesStoreType.PROJECT);
+  const {
+    project: { projectMemberIds },
+  } = useMember();
   const activeLayout = issueFilters?.displayFilters?.layout;
 
   const handleLayoutChange = useCallback(
@@ -43,6 +59,27 @@ export const ProjectIssuesMobileHeader = observer(() => {
     [workspaceSlug, projectId, updateFilters]
   );
 
+  const handleFiltersUpdate = useCallback(
+    (key: keyof IIssueFilterOptions, value: string | string[]) => {
+      if (!workspaceSlug || !projectId) return;
+      const newValues = issueFilters?.filters?.[key] ?? [];
+
+      if (Array.isArray(value)) {
+        // this validation is majorly for the filter start_date, target_date custom
+        value.forEach((val) => {
+          if (!newValues.includes(val)) newValues.push(val);
+          else newValues.splice(newValues.indexOf(val), 1);
+        });
+      } else {
+        if (issueFilters?.filters?.[key]?.includes(value)) newValues.splice(newValues.indexOf(value), 1);
+        else newValues.push(value);
+      }
+
+      updateFilters(workspaceSlug, projectId, EIssueFilterType.FILTERS, { [key]: newValues });
+    },
+    [workspaceSlug, projectId, issueFilters, updateFilters]
+  );
+
   const handleDisplayFilters = useCallback(
     (updatedDisplayFilter: Partial<IIssueDisplayFilterOptions>) => {
       if (!workspaceSlug || !projectId) return;
@@ -71,6 +108,34 @@ export const ProjectIssuesMobileHeader = observer(() => {
           layouts={[EIssueLayoutTypes.LIST, EIssueLayoutTypes.KANBAN, EIssueLayoutTypes.CALENDAR]}
           onChange={handleLayoutChange}
         />
+        <div className="flex flex-grow items-center justify-center border-l border-custom-border-200 text-sm text-custom-text-200">
+          <FiltersDropdown
+            title={t("common.filters")}
+            placement="bottom-end"
+            menuButton={
+              <span className="flex items-center text-sm text-custom-text-200">
+                {t("common.filters")}
+                <ChevronDown className="ml-2  h-4 w-4 text-custom-text-200" />
+              </span>
+            }
+            isFiltersApplied={isIssueFilterActive(issueFilters)}
+          >
+            <FilterSelection
+              filters={issueFilters?.filters ?? {}}
+              handleFiltersUpdate={handleFiltersUpdate}
+              displayFilters={issueFilters?.displayFilters ?? {}}
+              handleDisplayFiltersUpdate={handleDisplayFilters}
+              layoutDisplayFiltersOptions={
+                activeLayout ? ISSUE_DISPLAY_FILTERS_BY_PAGE.issues[activeLayout] : undefined
+              }
+              labels={projectLabels}
+              memberIds={projectMemberIds ?? undefined}
+              states={projectStates}
+              cycleViewDisabled={!currentProjectDetails?.cycle_view}
+              moduleViewDisabled={!currentProjectDetails?.module_view}
+            />
+          </FiltersDropdown>
+        </div>
         <div className="flex flex-grow items-center justify-center border-l border-custom-border-200 text-sm text-custom-text-200">
           <FiltersDropdown
             title={t("common.display")}
@@ -84,7 +149,7 @@ export const ProjectIssuesMobileHeader = observer(() => {
           >
             <DisplayFiltersSelection
               layoutDisplayFiltersOptions={
-                activeLayout ? ISSUE_DISPLAY_FILTERS_BY_PAGE.issues.layoutOptions[activeLayout] : undefined
+                activeLayout ? ISSUE_DISPLAY_FILTERS_BY_PAGE.issues[activeLayout] : undefined
               }
               displayFilters={issueFilters?.displayFilters ?? {}}
               handleDisplayFiltersUpdate={handleDisplayFilters}

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

@@ -4,7 +4,7 @@ import { useCallback, useRef, useState } from "react";
 import { observer } from "mobx-react";
 import { useParams } from "next/navigation";
 // icons
-import { ChartNoAxesColumn, PanelRight, SlidersHorizontal } from "lucide-react";
+import { ChartNoAxesColumn, ListFilter, PanelRight, SlidersHorizontal } from "lucide-react";
 // plane imports
 import {
   EIssueFilterType,
@@ -21,16 +21,18 @@ import {
   ICustomSearchSelectOption,
   IIssueDisplayFilterOptions,
   IIssueDisplayProperties,
+  IIssueFilterOptions,
   EIssueLayoutTypes,
 } from "@plane/types";
 import { Breadcrumbs, Button, Header, BreadcrumbNavigationSearchDropdown } from "@plane/ui";
-import { cn } from "@plane/utils";
+import { cn, isIssueFilterActive } from "@plane/utils";
 // components
 import { WorkItemsModal } from "@/components/analytics/work-items/modal";
 import { SwitcherLabel } from "@/components/common/switcher-label";
 import {
   DisplayFiltersSelection,
   FiltersDropdown,
+  FilterSelection,
   LayoutSelection,
   MobileLayoutSelection,
 } from "@/components/issues/issue-layouts/filters";
@@ -39,8 +41,11 @@ import { ModuleQuickActions } from "@/components/modules";
 // hooks
 import { useCommandPalette } from "@/hooks/store/use-command-palette";
 import { useIssues } from "@/hooks/store/use-issues";
+import { useLabel } from "@/hooks/store/use-label";
+import { useMember } from "@/hooks/store/use-member";
 import { useModule } from "@/hooks/store/use-module";
 import { useProject } from "@/hooks/store/use-project";
+import { useProjectState } from "@/hooks/store/use-project-state";
 import { useUserPermissions } from "@/hooks/store/user";
 import { useAppRouter } from "@/hooks/use-app-router";
 import { useIssuesActions } from "@/hooks/use-issues-actions";
@@ -69,22 +74,21 @@ export const ModuleIssuesHeader: React.FC = observer(() => {
   const { toggleCreateIssueModal } = useCommandPalette();
   const { allowPermissions } = useUserPermissions();
   const { currentProjectDetails, loader } = useProject();
-  // local storage
-  const { setValue, storedValue } = useLocalStorage("module_sidebar_collapsed", "false");
-  // derived values
-  const isSidebarCollapsed = storedValue ? (storedValue === "true" ? true : false) : false;
-  const activeLayout = issueFilters?.displayFilters?.layout;
-  const moduleDetails = moduleId ? getModuleById(moduleId.toString()) : undefined;
-  const canUserCreateIssue = allowPermissions(
-    [EUserPermissions.ADMIN, EUserPermissions.MEMBER],
-    EUserPermissionsLevel.PROJECT
-  );
-  const workItemsCount = getGroupIssueCount(undefined, undefined, false);
+  const { projectLabels } = useLabel();
+  const { projectStates } = useProjectState();
+  const {
+    project: { projectMemberIds },
+  } = useMember();
 
+  const { setValue, storedValue } = useLocalStorage("module_sidebar_collapsed", "false");
+
+  const isSidebarCollapsed = storedValue ? (storedValue === "true" ? true : false) : false;
   const toggleSidebar = () => {
     setValue(`${!isSidebarCollapsed}`);
   };
 
+  const activeLayout = issueFilters?.displayFilters?.layout;
+
   const handleLayoutChange = useCallback(
     (layout: EIssueLayoutTypes) => {
       if (!projectId) return;
@@ -93,6 +97,27 @@ export const ModuleIssuesHeader: React.FC = observer(() => {
     [projectId, updateFilters]
   );
 
+  const handleFiltersUpdate = useCallback(
+    (key: keyof IIssueFilterOptions, value: string | string[]) => {
+      if (!projectId) return;
+      const newValues = issueFilters?.filters?.[key] ?? [];
+
+      if (Array.isArray(value)) {
+        // this validation is majorly for the filter start_date, target_date custom
+        value.forEach((val) => {
+          if (!newValues.includes(val)) newValues.push(val);
+          else newValues.splice(newValues.indexOf(val), 1);
+        });
+      } else {
+        if (issueFilters?.filters?.[key]?.includes(value)) newValues.splice(newValues.indexOf(value), 1);
+        else newValues.push(value);
+      }
+
+      updateFilters(projectId.toString(), EIssueFilterType.FILTERS, { [key]: newValues });
+    },
+    [projectId, issueFilters, updateFilters]
+  );
+
   const handleDisplayFilters = useCallback(
     (updatedDisplayFilter: Partial<IIssueDisplayFilterOptions>) => {
       if (!projectId) return;
@@ -109,6 +134,15 @@ export const ModuleIssuesHeader: React.FC = observer(() => {
     [projectId, updateFilters]
   );
 
+  // derived values
+  const moduleDetails = moduleId ? getModuleById(moduleId.toString()) : undefined;
+  const canUserCreateIssue = allowPermissions(
+    [EUserPermissions.ADMIN, EUserPermissions.MEMBER],
+    EUserPermissionsLevel.PROJECT
+  );
+
+  const workItemsCount = getGroupIssueCount(undefined, undefined, false);
+
   const switcherOptions = projectModuleIds
     ?.map((id) => {
       const _module = id === moduleId ? moduleDetails : getModuleById(id);
@@ -196,6 +230,27 @@ export const ModuleIssuesHeader: React.FC = observer(() => {
                 activeLayout={activeLayout}
               />
             </div>
+            <FiltersDropdown
+              title="Filters"
+              placement="bottom-end"
+              isFiltersApplied={isIssueFilterActive(issueFilters)}
+              miniIcon={<ListFilter className="size-3.5" />}
+            >
+              <FilterSelection
+                filters={issueFilters?.filters ?? {}}
+                handleFiltersUpdate={handleFiltersUpdate}
+                displayFilters={issueFilters?.displayFilters ?? {}}
+                handleDisplayFiltersUpdate={handleDisplayFilters}
+                layoutDisplayFiltersOptions={
+                  activeLayout ? ISSUE_DISPLAY_FILTERS_BY_PAGE.issues[activeLayout] : undefined
+                }
+                labels={projectLabels}
+                memberIds={projectMemberIds ?? undefined}
+                states={projectStates}
+                cycleViewDisabled={!currentProjectDetails?.cycle_view}
+                moduleViewDisabled={!currentProjectDetails?.module_view}
+              />
+            </FiltersDropdown>
             <FiltersDropdown
               title="Display"
               placement="bottom-end"
@@ -203,7 +258,7 @@ export const ModuleIssuesHeader: React.FC = observer(() => {
             >
               <DisplayFiltersSelection
                 layoutDisplayFiltersOptions={
-                  activeLayout ? ISSUE_DISPLAY_FILTERS_BY_PAGE.issues.layoutOptions[activeLayout] : undefined
+                  activeLayout ? ISSUE_DISPLAY_FILTERS_BY_PAGE.issues[activeLayout] : undefined
                 }
                 displayFilters={issueFilters?.displayFilters ?? {}}
                 handleDisplayFiltersUpdate={handleDisplayFilters}

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

@@ -8,43 +8,53 @@ import { Calendar, ChevronDown, Kanban, List } from "lucide-react";
 // plane imports
 import { EIssueFilterType, ISSUE_LAYOUTS, ISSUE_DISPLAY_FILTERS_BY_PAGE } from "@plane/constants";
 import { useTranslation } from "@plane/i18n";
-import { EIssuesStoreType, IIssueDisplayFilterOptions, IIssueDisplayProperties, EIssueLayoutTypes } from "@plane/types";
+import {
+  EIssuesStoreType,
+  IIssueDisplayFilterOptions,
+  IIssueDisplayProperties,
+  IIssueFilterOptions,
+  EIssueLayoutTypes,
+} from "@plane/types";
 import { CustomMenu } from "@plane/ui";
+import { isIssueFilterActive } from "@plane/utils";
 // components
 import { WorkItemsModal } from "@/components/analytics/work-items/modal";
-import { DisplayFiltersSelection, FiltersDropdown } from "@/components/issues/issue-layouts/filters";
+import { DisplayFiltersSelection, FilterSelection, FiltersDropdown } from "@/components/issues/issue-layouts/filters";
 import { IssueLayoutIcon } from "@/components/issues/issue-layouts/layout-icon";
 // hooks
 import { useIssues } from "@/hooks/store/use-issues";
+import { useLabel } from "@/hooks/store/use-label";
+import { useMember } from "@/hooks/store/use-member";
 import { useModule } from "@/hooks/store/use-module";
 import { useProject } from "@/hooks/store/use-project";
-
-const SUPPORTED_LAYOUTS = [
-  { key: "list", i18n_title: "issue.layouts.list", icon: List },
-  { key: "kanban", i18n_title: "issue.layouts.kanban", icon: Kanban },
-  { key: "calendar", i18n_title: "issue.layouts.calendar", icon: Calendar },
-];
+import { useProjectState } from "@/hooks/store/use-project-state";
 
 export const ModuleIssuesMobileHeader = observer(() => {
-  // router
+  const [analyticsModal, setAnalyticsModal] = useState(false);
+  const { currentProjectDetails } = useProject();
+  const { getModuleById } = useModule();
+  const { t } = useTranslation();
+  const layouts = [
+    { key: "list", i18n_title: "issue.layouts.list", icon: List },
+    { key: "kanban", i18n_title: "issue.layouts.kanban", icon: Kanban },
+    { key: "calendar", i18n_title: "issue.layouts.calendar", icon: Calendar },
+  ];
   const { workspaceSlug, projectId, moduleId } = useParams() as {
     workspaceSlug: string;
     projectId: string;
     moduleId: string;
   };
-  // states
-  const [analyticsModal, setAnalyticsModal] = useState(false);
-  // plane hooks
-  const { t } = useTranslation();
-  // store hooks
-  const { currentProjectDetails } = useProject();
-  const { getModuleById } = useModule();
+  const moduleDetails = moduleId ? getModuleById(moduleId.toString()) : undefined;
+
   const {
     issuesFilter: { issueFilters, updateFilters },
   } = useIssues(EIssuesStoreType.MODULE);
-  // derived values
   const activeLayout = issueFilters?.displayFilters?.layout;
-  const moduleDetails = moduleId ? getModuleById(moduleId.toString()) : undefined;
+  const { projectStates } = useProjectState();
+  const { projectLabels } = useLabel();
+  const {
+    project: { projectMemberIds },
+  } = useMember();
 
   const handleLayoutChange = useCallback(
     (layout: EIssueLayoutTypes) => {
@@ -54,6 +64,27 @@ export const ModuleIssuesMobileHeader = observer(() => {
     [workspaceSlug, projectId, moduleId, updateFilters]
   );
 
+  const handleFiltersUpdate = useCallback(
+    (key: keyof IIssueFilterOptions, value: string | string[]) => {
+      if (!workspaceSlug || !projectId) return;
+      const newValues = issueFilters?.filters?.[key] ?? [];
+
+      if (Array.isArray(value)) {
+        // this validation is majorly for the filter start_date, target_date custom
+        value.forEach((val) => {
+          if (!newValues.includes(val)) newValues.push(val);
+          else newValues.splice(newValues.indexOf(val), 1);
+        });
+      } else {
+        if (issueFilters?.filters?.[key]?.includes(value)) newValues.splice(newValues.indexOf(value), 1);
+        else newValues.push(value);
+      }
+
+      updateFilters(workspaceSlug, projectId, EIssueFilterType.FILTERS, { [key]: newValues }, moduleId);
+    },
+    [workspaceSlug, projectId, moduleId, issueFilters, updateFilters]
+  );
+
   const handleDisplayFilters = useCallback(
     (updatedDisplayFilter: Partial<IIssueDisplayFilterOptions>) => {
       if (!workspaceSlug || !projectId) return;
@@ -87,7 +118,7 @@ export const ModuleIssuesMobileHeader = observer(() => {
           customButtonClassName="flex flex-grow justify-center text-custom-text-200 text-sm"
           closeOnSelect
         >
-          {SUPPORTED_LAYOUTS.map((layout, index) => (
+          {layouts.map((layout, index) => (
             <CustomMenu.MenuItem
               key={layout.key}
               onClick={() => {
@@ -100,6 +131,34 @@ export const ModuleIssuesMobileHeader = observer(() => {
             </CustomMenu.MenuItem>
           ))}
         </CustomMenu>
+        <div className="flex flex-grow items-center justify-center border-l border-custom-border-200 text-sm text-custom-text-200">
+          <FiltersDropdown
+            title="Filters"
+            placement="bottom-end"
+            menuButton={
+              <span className="flex items-center text-sm text-custom-text-200">
+                Filters
+                <ChevronDown className="ml-2  h-4 w-4 text-custom-text-200" />
+              </span>
+            }
+            isFiltersApplied={isIssueFilterActive(issueFilters)}
+          >
+            <FilterSelection
+              filters={issueFilters?.filters ?? {}}
+              handleFiltersUpdate={handleFiltersUpdate}
+              displayFilters={issueFilters?.displayFilters ?? {}}
+              handleDisplayFiltersUpdate={handleDisplayFilters}
+              layoutDisplayFiltersOptions={
+                activeLayout ? ISSUE_DISPLAY_FILTERS_BY_PAGE.issues[activeLayout] : undefined
+              }
+              labels={projectLabels}
+              memberIds={projectMemberIds ?? undefined}
+              states={projectStates}
+              cycleViewDisabled={!currentProjectDetails?.cycle_view}
+              moduleViewDisabled={!currentProjectDetails?.module_view}
+            />
+          </FiltersDropdown>
+        </div>
         <div className="flex flex-grow items-center justify-center border-l border-custom-border-200 text-sm text-custom-text-200">
           <FiltersDropdown
             title="Display"
@@ -113,7 +172,7 @@ export const ModuleIssuesMobileHeader = observer(() => {
           >
             <DisplayFiltersSelection
               layoutDisplayFiltersOptions={
-                activeLayout ? ISSUE_DISPLAY_FILTERS_BY_PAGE.issues.layoutOptions[activeLayout] : undefined
+                activeLayout ? ISSUE_DISPLAY_FILTERS_BY_PAGE.issues[activeLayout] : undefined
               }
               displayFilters={issueFilters?.displayFilters ?? {}}
               handleDisplayFiltersUpdate={handleDisplayFilters}

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

@@ -21,19 +21,29 @@ import {
   ICustomSearchSelectOption,
   IIssueDisplayFilterOptions,
   IIssueDisplayProperties,
+  IIssueFilterOptions,
   EIssueLayoutTypes,
 } from "@plane/types";
 // ui
 import { Breadcrumbs, Button, Header, BreadcrumbNavigationSearchDropdown } from "@plane/ui";
 // components
+import { isIssueFilterActive } from "@plane/utils";
 import { SwitcherIcon, SwitcherLabel } from "@/components/common/switcher-label";
-import { DisplayFiltersSelection, FiltersDropdown, LayoutSelection } from "@/components/issues/issue-layouts/filters";
+import {
+  DisplayFiltersSelection,
+  FiltersDropdown,
+  FilterSelection,
+  LayoutSelection,
+} from "@/components/issues/issue-layouts/filters";
 // constants
 import { ViewQuickActions } from "@/components/views/quick-actions";
 // hooks
 import { useCommandPalette } from "@/hooks/store/use-command-palette";
 import { useIssues } from "@/hooks/store/use-issues";
+import { useLabel } from "@/hooks/store/use-label";
+import { useMember } from "@/hooks/store/use-member";
 import { useProject } from "@/hooks/store/use-project";
+import { useProjectState } from "@/hooks/store/use-project-state";
 import { useProjectView } from "@/hooks/store/use-project-view";
 import { useUserPermissions } from "@/hooks/store/user";
 // plane web
@@ -55,6 +65,11 @@ export const ProjectViewIssuesHeader: React.FC = observer(() => {
 
   const { currentProjectDetails, loader } = useProject();
   const { projectViewIds, getViewById } = useProjectView();
+  const { projectStates } = useProjectState();
+  const { projectLabels } = useLabel();
+  const {
+    project: { projectMemberIds },
+  } = useMember();
 
   const activeLayout = issueFilters?.displayFilters?.layout;
 
@@ -72,6 +87,33 @@ export const ProjectViewIssuesHeader: React.FC = observer(() => {
     [workspaceSlug, projectId, viewId, updateFilters]
   );
 
+  const handleFiltersUpdate = useCallback(
+    (key: keyof IIssueFilterOptions, value: string | string[]) => {
+      if (!workspaceSlug || !projectId || !viewId) return;
+      const newValues = issueFilters?.filters?.[key] ?? [];
+
+      if (Array.isArray(value)) {
+        // this validation is majorly for the filter start_date, target_date custom
+        value.forEach((val) => {
+          if (!newValues.includes(val)) newValues.push(val);
+          else newValues.splice(newValues.indexOf(val), 1);
+        });
+      } else {
+        if (issueFilters?.filters?.[key]?.includes(value)) newValues.splice(newValues.indexOf(value), 1);
+        else newValues.push(value);
+      }
+
+      updateFilters(
+        workspaceSlug.toString(),
+        projectId.toString(),
+        EIssueFilterType.FILTERS,
+        { [key]: newValues },
+        viewId.toString()
+      );
+    },
+    [workspaceSlug, projectId, viewId, issueFilters, updateFilters]
+  );
+
   const handleDisplayFilters = useCallback(
     (updatedDisplayFilter: Partial<IIssueDisplayFilterOptions>) => {
       if (!workspaceSlug || !projectId || !viewId) return;
@@ -175,10 +217,33 @@ export const ProjectViewIssuesHeader: React.FC = observer(() => {
               onChange={(layout) => handleLayoutChange(layout)}
               selectedLayout={activeLayout}
             />
+
+            <FiltersDropdown
+              title="Filters"
+              placement="bottom-end"
+              disabled={!canUserCreateIssue}
+              isFiltersApplied={isIssueFilterActive(issueFilters)}
+            >
+              <FilterSelection
+                filters={issueFilters?.filters ?? {}}
+                handleFiltersUpdate={handleFiltersUpdate}
+                displayFilters={issueFilters?.displayFilters ?? {}}
+                handleDisplayFiltersUpdate={handleDisplayFilters}
+                layoutDisplayFiltersOptions={
+                  activeLayout ? ISSUE_DISPLAY_FILTERS_BY_PAGE.issues[activeLayout] : undefined
+                }
+                projectId={projectId.toString()}
+                labels={projectLabels}
+                memberIds={projectMemberIds ?? undefined}
+                states={projectStates}
+                cycleViewDisabled={!currentProjectDetails?.cycle_view}
+                moduleViewDisabled={!currentProjectDetails?.module_view}
+              />
+            </FiltersDropdown>
             <FiltersDropdown title="Display" placement="bottom-end">
               <DisplayFiltersSelection
                 layoutDisplayFiltersOptions={
-                  activeLayout ? ISSUE_DISPLAY_FILTERS_BY_PAGE.issues.layoutOptions[activeLayout] : undefined
+                  activeLayout ? ISSUE_DISPLAY_FILTERS_BY_PAGE.issues[activeLayout] : undefined
                 }
                 displayFilters={issueFilters?.displayFilters ?? {}}
                 handleDisplayFiltersUpdate={handleDisplayFilters}

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

@@ -7,6 +7,7 @@ import { useParams } from "next/navigation";
 import { DEFAULT_GLOBAL_VIEWS_LIST } from "@plane/constants";
 // components
 import { PageHead } from "@/components/core/page-title";
+import { GlobalViewsAppliedFiltersRoot } from "@/components/issues/issue-layouts/filters";
 import { AllIssueLayoutRoot } from "@/components/issues/issue-layouts/roots/all-issue-layout-root";
 // hooks
 import { useWorkspace } from "@/hooks/store/use-workspace";
@@ -28,7 +29,14 @@ const GlobalViewIssuesPage = observer(() => {
   return (
     <>
       <PageHead title={pageTitle} />
-      <AllIssueLayoutRoot isDefaultView={!!defaultView} isLoading={isLoading} toggleLoading={toggleLoading} />
+      <div className="h-full overflow-hidden bg-custom-background-100">
+        <div className="flex h-full w-full flex-col border-b border-custom-border-300">
+          {globalViewId && (
+            <GlobalViewsAppliedFiltersRoot globalViewId={globalViewId.toString()} isLoading={isLoading} />
+          )}
+          <AllIssueLayoutRoot isDefaultView={!!defaultView} isLoading={isLoading} toggleLoading={toggleLoading} />
+        </div>
+      </div>
     </>
   );
 });

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

@@ -16,20 +16,24 @@ import {
   EIssuesStoreType,
   IIssueDisplayFilterOptions,
   IIssueDisplayProperties,
+  IIssueFilterOptions,
   ICustomSearchSelectOption,
   EIssueLayoutTypes,
 } from "@plane/types";
 import { Breadcrumbs, Button, Header, BreadcrumbNavigationSearchDropdown } from "@plane/ui";
+import { isIssueFilterActive } from "@plane/utils";
 // components
 import { BreadcrumbLink } from "@/components/common/breadcrumb-link";
 import { SwitcherLabel } from "@/components/common/switcher-label";
-import { DisplayFiltersSelection, FiltersDropdown } from "@/components/issues/issue-layouts/filters";
+import { DisplayFiltersSelection, FiltersDropdown, FilterSelection } from "@/components/issues/issue-layouts/filters";
 import { DefaultWorkspaceViewQuickActions } from "@/components/workspace/views/default-view-quick-action";
 import { CreateUpdateWorkspaceViewModal } from "@/components/workspace/views/modal";
 import { WorkspaceViewQuickActions } from "@/components/workspace/views/quick-action";
 // hooks
 import { useGlobalView } from "@/hooks/store/use-global-view";
 import { useIssues } from "@/hooks/store/use-issues";
+import { useLabel } from "@/hooks/store/use-label";
+import { useMember } from "@/hooks/store/use-member";
 import { useAppRouter } from "@/hooks/use-app-router";
 import { GlobalViewLayoutSelection } from "@/plane-web/components/views/helper";
 
@@ -44,6 +48,10 @@ export const GlobalIssuesHeader = observer(() => {
     issuesFilter: { filters, updateFilters },
   } = useIssues(EIssuesStoreType.GLOBAL);
   const { getViewDetailsById, currentWorkspaceViews } = useGlobalView();
+  const { workspaceLabels } = useLabel();
+  const {
+    workspace: { workspaceMemberIds },
+  } = useMember();
   const { t } = useTranslation();
 
   const issueFilters = globalViewId ? filters[globalViewId.toString()] : undefined;
@@ -51,6 +59,33 @@ export const GlobalIssuesHeader = observer(() => {
   const activeLayout = issueFilters?.displayFilters?.layout;
   const viewDetails = getViewDetailsById(globalViewId.toString());
 
+  const handleFiltersUpdate = useCallback(
+    (key: keyof IIssueFilterOptions, value: string | string[]) => {
+      if (!workspaceSlug || !globalViewId) return;
+      const newValues = issueFilters?.filters?.[key] ?? [];
+
+      if (Array.isArray(value)) {
+        // this validation is majorly for the filter start_date, target_date custom
+        value.forEach((val) => {
+          if (!newValues.includes(val)) newValues.push(val);
+          else newValues.splice(newValues.indexOf(val), 1);
+        });
+      } else {
+        if (issueFilters?.filters?.[key]?.includes(value)) newValues.splice(newValues.indexOf(value), 1);
+        else newValues.push(value);
+      }
+
+      updateFilters(
+        workspaceSlug.toString(),
+        undefined,
+        EIssueFilterType.FILTERS,
+        { [key]: newValues },
+        globalViewId.toString()
+      );
+    },
+    [workspaceSlug, issueFilters, updateFilters, globalViewId]
+  );
+
   const handleDisplayFilters = useCallback(
     (updatedDisplayFilter: Partial<IIssueDisplayFilterOptions>) => {
       if (!workspaceSlug || !globalViewId) return;
@@ -120,7 +155,7 @@ export const GlobalIssuesHeader = observer(() => {
   ) as ICustomSearchSelectOption[];
   const currentLayoutFilters = useMemo(() => {
     const layout = activeLayout ?? EIssueLayoutTypes.SPREADSHEET;
-    return ISSUE_DISPLAY_FILTERS_BY_PAGE.my_issues.layoutOptions[layout];
+    return ISSUE_DISPLAY_FILTERS_BY_PAGE.my_issues[layout];
   }, [activeLayout]);
 
   return (
@@ -164,6 +199,21 @@ export const GlobalIssuesHeader = observer(() => {
                 selectedLayout={activeLayout ?? EIssueLayoutTypes.SPREADSHEET}
                 workspaceSlug={workspaceSlug.toString()}
               />
+              <FiltersDropdown
+                title={t("common.filters")}
+                placement="bottom-end"
+                isFiltersApplied={isIssueFilterActive(issueFilters)}
+              >
+                <FilterSelection
+                  layoutDisplayFiltersOptions={currentLayoutFilters}
+                  filters={issueFilters?.filters ?? {}}
+                  handleFiltersUpdate={handleFiltersUpdate}
+                  displayFilters={issueFilters?.displayFilters ?? {}}
+                  handleDisplayFiltersUpdate={handleDisplayFilters}
+                  labels={workspaceLabels ?? undefined}
+                  memberIds={workspaceMemberIds ?? undefined}
+                />
+              </FiltersDropdown>
               <FiltersDropdown title={t("common.display")} placement="bottom-end">
                 <DisplayFiltersSelection
                   layoutDisplayFiltersOptions={currentLayoutFilters}

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

@@ -20,7 +20,6 @@ import { cn } from "@plane/utils";
 import { NotAuthorizedView } from "@/components/auth-screens/not-authorized-view";
 import { CountChip } from "@/components/common/count-chip";
 import { PageHead } from "@/components/core/page-title";
-import { MemberListFiltersDropdown } from "@/components/project/dropdowns/filters/member-list";
 import { SettingsContentWrapper } from "@/components/settings/content-wrapper";
 import { WorkspaceMembersList } from "@/components/workspace/settings/members-list";
 // helpers
@@ -42,7 +41,7 @@ const WorkspaceMembersSettingsPage = observer(() => {
   // store hooks
   const { workspaceUserInfo, allowPermissions } = useUserPermissions();
   const {
-    workspace: { workspaceMemberIds, inviteMembersToWorkspace, filtersStore },
+    workspace: { workspaceMemberIds, inviteMembersToWorkspace },
   } = useMember();
   const { currentWorkspace } = useWorkspace();
   const { t } = useTranslation();
@@ -89,20 +88,8 @@ const WorkspaceMembersSettingsPage = observer(() => {
       });
   };
 
-  // Handler for role filter updates
-  const handleRoleFilterUpdate = (role: string) => {
-    const currentFilters = filtersStore.filters;
-    const currentRoles = currentFilters?.roles || [];
-    const updatedRoles = currentRoles.includes(role) ? currentRoles.filter((r) => r !== role) : [...currentRoles, role];
-
-    filtersStore.updateFilters({
-      roles: updatedRoles.length > 0 ? updatedRoles : undefined,
-    });
-  };
-
   // derived values
   const pageTitle = currentWorkspace?.name ? `${currentWorkspace.name} - Members` : undefined;
-  const appliedRoleFilters = filtersStore.filters?.roles || [];
 
   // if user is not authorized to view this page
   if (workspaceUserInfo && !canPerformWorkspaceMemberActions) {
@@ -129,34 +116,27 @@ const WorkspaceMembersSettingsPage = observer(() => {
               <CountChip count={workspaceMemberIds.length} className="h-5 m-auto" />
             )}
           </h4>
-          <div className="flex items-center gap-2">
-            <div className="flex items-center gap-1.5 rounded-md border border-custom-border-200 bg-custom-background-100 px-2.5 py-1.5">
-              <Search className="h-3.5 w-3.5 text-custom-text-400" />
-              <input
-                className="w-full max-w-[234px] border-none bg-transparent text-sm outline-none placeholder:text-custom-text-400"
-                placeholder={`${t("search")}...`}
-                value={searchQuery}
-                autoFocus
-                onChange={(e) => setSearchQuery(e.target.value)}
-              />
-            </div>
-            <MemberListFiltersDropdown
-              appliedFilters={appliedRoleFilters}
-              handleUpdate={handleRoleFilterUpdate}
-              memberType="workspace"
+          <div className="ml-auto flex items-center gap-1.5 rounded-md border border-custom-border-200 bg-custom-background-100 px-2.5 py-1.5">
+            <Search className="h-3.5 w-3.5 text-custom-text-400" />
+            <input
+              className="w-full max-w-[234px] border-none bg-transparent text-sm outline-none placeholder:text-custom-text-400"
+              placeholder={`${t("search")}...`}
+              value={searchQuery}
+              autoFocus
+              onChange={(e) => setSearchQuery(e.target.value)}
             />
-            {canPerformWorkspaceAdminActions && (
-              <Button
-                variant="primary"
-                size="sm"
-                onClick={() => setInviteModal(true)}
-                data-ph-element={MEMBER_TRACKER_ELEMENTS.HEADER_ADD_BUTTON}
-              >
-                {t("workspace_settings.settings.members.add_member")}
-              </Button>
-            )}
-            <BillingActionsButton canPerformWorkspaceAdminActions={canPerformWorkspaceAdminActions} />
           </div>
+          {canPerformWorkspaceAdminActions && (
+            <Button
+              variant="primary"
+              size="sm"
+              onClick={() => setInviteModal(true)}
+              data-ph-element={MEMBER_TRACKER_ELEMENTS.HEADER_ADD_BUTTON}
+            >
+              {t("workspace_settings.settings.members.add_member")}
+            </Button>
+          )}
+          <BillingActionsButton canPerformWorkspaceAdminActions={canPerformWorkspaceAdminActions} />
         </div>
         <WorkspaceMembersList searchQuery={searchQuery} isAdmin={canPerformWorkspaceAdminActions} />
       </section>

apps/web/ce/components/projects/settings/useProjectColumns.tsx

@@ -2,14 +2,10 @@ import { useState } from "react";
 // plane imports
 import { EUserPermissions, EUserPermissionsLevel } from "@plane/constants";
 import { IWorkspaceMember, TProjectMembership } from "@plane/types";
-import { renderFormattedDate } from "@plane/utils";
 // components
-import { MemberHeaderColumn } from "@/components/project/member-header-column";
 import { AccountTypeColumn, NameColumn } from "@/components/project/settings/member-columns";
 // hooks
-import { useMember } from "@/hooks/store/use-member";
 import { useUser, useUserPermissions } from "@/hooks/store/user";
-import { IMemberFilters } from "@/store/member/utils";
 
 export interface RowData extends Pick<TProjectMembership, "original_role"> {
   member: IWorkspaceMember;
@@ -24,15 +20,9 @@ export const useProjectColumns = (props: TUseProjectColumnsProps) => {
   const { projectId, workspaceSlug } = props;
   // states
   const [removeMemberModal, setRemoveMemberModal] = useState<RowData | null>(null);
-
   // store hooks
   const { data: currentUser } = useUser();
   const { allowPermissions, getProjectRoleByWorkspaceSlugAndProjectId } = useUserPermissions();
-  const {
-    project: {
-      filters: { getFilters, updateFilters },
-    },
-  } = useMember();
   // derived values
   const isAdmin = allowPermissions(
     [EUserPermissions.ADMIN],
@@ -43,11 +33,11 @@ export const useProjectColumns = (props: TUseProjectColumnsProps) => {
   const currentProjectRole =
     getProjectRoleByWorkspaceSlugAndProjectId(workspaceSlug.toString(), projectId.toString()) ?? EUserPermissions.GUEST;
 
-  const displayFilters = getFilters(projectId);
+  const getFormattedDate = (dateStr: string) => {
+    const date = new Date(dateStr);
 
-  // handlers
-  const handleDisplayFilterUpdate = (filters: Partial<IMemberFilters>) => {
-    updateFilters(projectId, filters);
+    const options: Intl.DateTimeFormatOptions = { year: "numeric", month: "long", day: "numeric" };
+    return date.toLocaleDateString("en-US", options);
   };
 
   const columns = [
@@ -55,13 +45,6 @@ export const useProjectColumns = (props: TUseProjectColumnsProps) => {
       key: "Full Name",
       content: "Full name",
       thClassName: "text-left",
-      thRender: () => (
-        <MemberHeaderColumn
-          property="full_name"
-          displayFilters={displayFilters}
-          handleDisplayFilterUpdate={handleDisplayFilterUpdate}
-        />
-      ),
       tdRender: (rowData: RowData) => (
         <NameColumn
           rowData={rowData}
@@ -75,37 +58,12 @@ export const useProjectColumns = (props: TUseProjectColumnsProps) => {
     {
       key: "Display Name",
       content: "Display name",
-      thRender: () => (
-        <MemberHeaderColumn
-          property="display_name"
-          displayFilters={displayFilters}
-          handleDisplayFilterUpdate={handleDisplayFilterUpdate}
-        />
-      ),
       tdRender: (rowData: RowData) => <div className="w-32">{rowData.member.display_name}</div>,
     },
-    {
-      key: "Email",
-      content: "Email",
-      thRender: () => (
-        <MemberHeaderColumn
-          property="email"
-          displayFilters={displayFilters}
-          handleDisplayFilterUpdate={handleDisplayFilterUpdate}
-        />
-      ),
-      tdRender: (rowData: RowData) => <div className="w-48 text-custom-text-200">{rowData.member.email}</div>,
-    },
+
     {
       key: "Account Type",
       content: "Account type",
-      thRender: () => (
-        <MemberHeaderColumn
-          property="role"
-          displayFilters={displayFilters}
-          handleDisplayFilterUpdate={handleDisplayFilterUpdate}
-        />
-      ),
       tdRender: (rowData: RowData) => (
         <AccountTypeColumn
           rowData={rowData}
@@ -118,21 +76,8 @@ export const useProjectColumns = (props: TUseProjectColumnsProps) => {
     {
       key: "Joining Date",
       content: "Joining date",
-      thRender: () => (
-        <MemberHeaderColumn
-          property="joining_date"
-          displayFilters={displayFilters}
-          handleDisplayFilterUpdate={handleDisplayFilterUpdate}
-        />
-      ),
-      tdRender: (rowData: RowData) => <div>{renderFormattedDate(rowData?.member?.joining_date)}</div>,
+      tdRender: (rowData: RowData) => <div>{getFormattedDate(rowData?.member?.joining_date || "")}</div>,
     },
   ];
-  return {
-    columns,
-    removeMemberModal,
-    setRemoveMemberModal,
-    displayFilters,
-    handleDisplayFilterUpdate,
-  };
+  return { columns, removeMemberModal, setRemoveMemberModal };
 };

apps/web/ce/components/workspace/settings/useMemberColumns.tsx

@@ -2,12 +2,8 @@ import { useState } from "react";
 import { useParams } from "next/navigation";
 import { EUserPermissions, EUserPermissionsLevel } from "@plane/constants";
 import { useTranslation } from "@plane/i18n";
-import { renderFormattedDate } from "@plane/utils";
-import { MemberHeaderColumn } from "@/components/project/member-header-column";
 import { AccountTypeColumn, NameColumn, RowData } from "@/components/workspace/settings/member-columns";
-import { useMember } from "@/hooks/store/use-member";
 import { useUser, useUserPermissions } from "@/hooks/store/user";
-import { IMemberFilters } from "@/store/member/utils";
 
 export const useMemberColumns = () => {
   // states
@@ -17,33 +13,23 @@ export const useMemberColumns = () => {
 
   const { data: currentUser } = useUser();
   const { allowPermissions } = useUserPermissions();
-  const {
-    workspace: {
-      filtersStore: { filters, updateFilters },
-    },
-  } = useMember();
   const { t } = useTranslation();
 
+  const getFormattedDate = (dateStr: string) => {
+    const date = new Date(dateStr);
+
+    const options: Intl.DateTimeFormatOptions = { year: "numeric", month: "long", day: "numeric" };
+    return date.toLocaleDateString("en-US", options);
+  };
+
   // derived values
   const isAdmin = allowPermissions([EUserPermissions.ADMIN], EUserPermissionsLevel.WORKSPACE);
 
-  // handlers
-  const handleDisplayFilterUpdate = (filterUpdates: Partial<IMemberFilters>) => {
-    updateFilters(filterUpdates);
-  };
-
   const columns = [
     {
       key: "Full name",
       content: t("workspace_settings.settings.members.details.full_name"),
       thClassName: "text-left",
-      thRender: () => (
-        <MemberHeaderColumn
-          property="full_name"
-          displayFilters={filters}
-          handleDisplayFilterUpdate={handleDisplayFilterUpdate}
-        />
-      ),
       tdRender: (rowData: RowData) => (
         <NameColumn
           rowData={rowData}
@@ -58,39 +44,18 @@ export const useMemberColumns = () => {
     {
       key: "Display name",
       content: t("workspace_settings.settings.members.details.display_name"),
-      thRender: () => (
-        <MemberHeaderColumn
-          property="display_name"
-          displayFilters={filters}
-          handleDisplayFilterUpdate={handleDisplayFilterUpdate}
-        />
-      ),
       tdRender: (rowData: RowData) => <div className="w-32">{rowData.member.display_name}</div>,
     },
 
     {
       key: "Email address",
       content: t("workspace_settings.settings.members.details.email_address"),
-      thRender: () => (
-        <MemberHeaderColumn
-          property="email"
-          displayFilters={filters}
-          handleDisplayFilterUpdate={handleDisplayFilterUpdate}
-        />
-      ),
       tdRender: (rowData: RowData) => <div className="w-48 truncate">{rowData.member.email}</div>,
     },
 
     {
       key: "Account type",
       content: t("workspace_settings.settings.members.details.account_type"),
-      thRender: () => (
-        <MemberHeaderColumn
-          property="role"
-          displayFilters={filters}
-          handleDisplayFilterUpdate={handleDisplayFilterUpdate}
-        />
-      ),
       tdRender: (rowData: RowData) => <AccountTypeColumn rowData={rowData} workspaceSlug={workspaceSlug as string} />,
     },
 
@@ -105,14 +70,7 @@ export const useMemberColumns = () => {
     {
       key: "Joining date",
       content: t("workspace_settings.settings.members.details.joining_date"),
-      thRender: () => (
-        <MemberHeaderColumn
-          property="joining_date"
-          displayFilters={filters}
-          handleDisplayFilterUpdate={handleDisplayFilterUpdate}
-        />
-      ),
-      tdRender: (rowData: RowData) => <div>{renderFormattedDate(rowData?.member?.joining_date)}</div>,
+      tdRender: (rowData: RowData) => <div>{getFormattedDate(rowData?.member?.joining_date || "")}</div>,
     },
   ];
   return { columns, workspaceSlug, removeMemberModal, setRemoveMemberModal };

apps/web/ce/helpers/work-item-filters/project-level.ts

@@ -1,16 +0,0 @@
-import { TWorkItemFiltersEntityProps } from "@/plane-web/hooks/work-item-filters/use-work-item-filters-config";
-
-export type TGetAdditionalPropsForProjectLevelFiltersHOCParams = {
-  workspaceSlug: string;
-  projectId: string;
-};
-
-export type TGetAdditionalPropsForProjectLevelFiltersHOC = (
-  params: TGetAdditionalPropsForProjectLevelFiltersHOCParams
-) => TWorkItemFiltersEntityProps;
-
-export const getAdditionalProjectLevelFiltersHOCProps: TGetAdditionalPropsForProjectLevelFiltersHOC = ({
-  workspaceSlug,
-}) => ({
-  workspaceSlug,
-});

apps/web/ce/hooks/pages/use-pages-pane-extensions.ts

@@ -4,7 +4,6 @@ import type { EditorRefApi } from "@plane/editor";
 import {
   PAGE_NAVIGATION_PANE_TAB_KEYS,
   PAGE_NAVIGATION_PANE_TABS_QUERY_PARAM,
-  PAGE_NAVIGATION_PANE_VERSION_QUERY_PARAM,
 } from "@/components/pages/navigation-pane";
 import { useAppRouter } from "@/hooks/use-app-router";
 import { useQueryParams } from "@/hooks/use-query-params";
@@ -44,18 +43,10 @@ export const usePagesPaneExtensions = (_params: TPageExtensionHookParams) => {
 
   const navigationPaneExtensions: INavigationPaneExtension[] = [];
 
-  const handleCloseNavigationPane = useCallback(() => {
-    const updatedRoute = updateQueryParams({
-      paramsToRemove: [PAGE_NAVIGATION_PANE_TABS_QUERY_PARAM, PAGE_NAVIGATION_PANE_VERSION_QUERY_PARAM],
-    });
-    router.push(updatedRoute);
-  }, [router, updateQueryParams]);
-
   return {
     editorExtensionHandlers,
     navigationPaneExtensions,
     handleOpenNavigationPane,
     isNavigationPaneOpen,
-    handleCloseNavigationPane,
   };
 };

apps/web/ce/hooks/rich-filters/use-filters-operator-configs.ts

@@ -1,15 +0,0 @@
-import { CORE_OPERATORS, TSupportedOperators } from "@plane/types";
-
-export type TFiltersOperatorConfigs = {
-  allowedOperators: Set<TSupportedOperators>;
-  allowNegative: boolean;
-};
-
-export type TUseFiltersOperatorConfigsProps = {
-  workspaceSlug: string;
-};
-
-export const useFiltersOperatorConfigs = (_props: TUseFiltersOperatorConfigsProps): TFiltersOperatorConfigs => ({
-  allowedOperators: new Set(Object.values(CORE_OPERATORS)),
-  allowNegative: false,
-});

apps/web/ce/hooks/work-item-filters/use-work-item-filters-config.tsx

@@ -1,366 +0,0 @@
-import { useCallback, useMemo } from "react";
-import {
-  AtSign,
-  Briefcase,
-  CalendarCheck2,
-  CalendarClock,
-  CircleUserRound,
-  SignalHigh,
-  Tag,
-  Users,
-} from "lucide-react";
-// plane imports
-import {
-  ContrastIcon,
-  CycleGroupIcon,
-  DiceIcon,
-  DoubleCircleIcon,
-  PriorityIcon,
-  StateGroupIcon,
-} from "@plane/propel/icons";
-import {
-  ICycle,
-  IState,
-  IUserLite,
-  TFilterConfig,
-  TFilterValue,
-  IIssueLabel,
-  IModule,
-  IProject,
-  TWorkItemFilterProperty,
-} from "@plane/types";
-import { Avatar, Logo } from "@plane/ui";
-import {
-  getAssigneeFilterConfig,
-  getCreatedByFilterConfig,
-  getCycleFilterConfig,
-  getFileURL,
-  getLabelFilterConfig,
-  getMentionFilterConfig,
-  getModuleFilterConfig,
-  getPriorityFilterConfig,
-  getProjectFilterConfig,
-  getStartDateFilterConfig,
-  getStateFilterConfig,
-  getStateGroupFilterConfig,
-  getSubscriberFilterConfig,
-  getTargetDateFilterConfig,
-} from "@plane/utils";
-// store hooks
-import { useCycle } from "@/hooks/store/use-cycle";
-import { useLabel } from "@/hooks/store/use-label";
-import { useMember } from "@/hooks/store/use-member";
-import { useModule } from "@/hooks/store/use-module";
-import { useProject } from "@/hooks/store/use-project";
-import { useProjectState } from "@/hooks/store/use-project-state";
-// plane web imports
-import { useFiltersOperatorConfigs } from "@/plane-web/hooks/rich-filters/use-filters-operator-configs";
-
-export type TWorkItemFiltersEntityProps = {
-  workspaceSlug: string;
-  cycleIds?: string[];
-  labelIds?: string[];
-  memberIds?: string[];
-  moduleIds?: string[];
-  projectId?: string;
-  projectIds?: string[];
-  stateIds?: string[];
-};
-
-export type TUseWorkItemFiltersConfigProps = {
-  allowedFilters: TWorkItemFilterProperty[];
-} & TWorkItemFiltersEntityProps;
-
-export type TWorkItemFiltersConfig = {
-  configs: TFilterConfig<TWorkItemFilterProperty, TFilterValue>[];
-  configMap: {
-    [key in TWorkItemFilterProperty]?: TFilterConfig<TWorkItemFilterProperty, TFilterValue>;
-  };
-  isFilterEnabled: (key: TWorkItemFilterProperty) => boolean;
-};
-
-export const useWorkItemFiltersConfig = (props: TUseWorkItemFiltersConfigProps): TWorkItemFiltersConfig => {
-  const { allowedFilters, cycleIds, labelIds, memberIds, moduleIds, projectId, projectIds, stateIds, workspaceSlug } =
-    props;
-  // store hooks
-  const { getProjectById } = useProject();
-  const { getCycleById } = useCycle();
-  const { getLabelById } = useLabel();
-  const { getModuleById } = useModule();
-  const { getStateById } = useProjectState();
-  const { getUserDetails } = useMember();
-  // derived values
-  const operatorConfigs = useFiltersOperatorConfigs({ workspaceSlug });
-  const filtersToShow = useMemo(() => new Set(allowedFilters), [allowedFilters]);
-  const project = useMemo(() => getProjectById(projectId), [projectId, getProjectById]);
-  const members: IUserLite[] | undefined = useMemo(
-    () =>
-      memberIds
-        ? (memberIds.map((memberId) => getUserDetails(memberId)).filter((member) => member) as IUserLite[])
-        : undefined,
-    [memberIds, getUserDetails]
-  );
-  const workItemStates: IState[] | undefined = useMemo(
-    () =>
-      stateIds ? (stateIds.map((stateId) => getStateById(stateId)).filter((state) => state) as IState[]) : undefined,
-    [stateIds, getStateById]
-  );
-  const workItemLabels: IIssueLabel[] | undefined = useMemo(
-    () =>
-      labelIds
-        ? (labelIds.map((labelId) => getLabelById(labelId)).filter((label) => label) as IIssueLabel[])
-        : undefined,
-    [labelIds, getLabelById]
-  );
-  const cycles = useMemo(
-    () => (cycleIds ? (cycleIds.map((cycleId) => getCycleById(cycleId)).filter((cycle) => cycle) as ICycle[]) : []),
-    [cycleIds, getCycleById]
-  );
-  const modules = useMemo(
-    () =>
-      moduleIds ? (moduleIds.map((moduleId) => getModuleById(moduleId)).filter((module) => module) as IModule[]) : [],
-    [moduleIds, getModuleById]
-  );
-  const projects = useMemo(
-    () =>
-      projectIds
-        ? (projectIds.map((projectId) => getProjectById(projectId)).filter((project) => project) as IProject[])
-        : [],
-    [projectIds, getProjectById]
-  );
-
-  /**
-   * Checks if a filter is enabled based on the filters to show.
-   * @param key - The filter key.
-   * @param level - The level of the filter.
-   * @returns True if the filter is enabled, false otherwise.
-   */
-  const isFilterEnabled = useCallback((key: TWorkItemFilterProperty) => filtersToShow.has(key), [filtersToShow]);
-
-  // state group filter config
-  const stateGroupFilterConfig = useMemo(
-    () =>
-      getStateGroupFilterConfig<TWorkItemFilterProperty>("state_group")({
-        isEnabled: isFilterEnabled("state_group"),
-        filterIcon: DoubleCircleIcon,
-        getOptionIcon: (stateGroupKey) => <StateGroupIcon stateGroup={stateGroupKey} />,
-        ...operatorConfigs,
-      }),
-    [isFilterEnabled, operatorConfigs]
-  );
-
-  // state filter config
-  const stateFilterConfig = useMemo(
-    () =>
-      getStateFilterConfig<TWorkItemFilterProperty>("state_id")({
-        isEnabled: isFilterEnabled("state_id") && workItemStates !== undefined,
-        filterIcon: DoubleCircleIcon,
-        getOptionIcon: (state) => <StateGroupIcon stateGroup={state.group} color={state.color} />,
-        states: workItemStates ?? [],
-        ...operatorConfigs,
-      }),
-    [isFilterEnabled, workItemStates, operatorConfigs]
-  );
-
-  // label filter config
-  const labelFilterConfig = useMemo(
-    () =>
-      getLabelFilterConfig<TWorkItemFilterProperty>("label_id")({
-        isEnabled: isFilterEnabled("label_id") && workItemLabels !== undefined,
-        filterIcon: Tag,
-        labels: workItemLabels ?? [],
-        getOptionIcon: (color) => (
-          <span className="flex flex-shrink-0 size-2.5 rounded-full" style={{ backgroundColor: color }} />
-        ),
-        ...operatorConfigs,
-      }),
-    [isFilterEnabled, workItemLabels, operatorConfigs]
-  );
-
-  // cycle filter config
-  const cycleFilterConfig = useMemo(
-    () =>
-      getCycleFilterConfig<TWorkItemFilterProperty>("cycle_id")({
-        isEnabled: isFilterEnabled("cycle_id") && project?.cycle_view === true && cycles !== undefined,
-        filterIcon: ContrastIcon,
-        getOptionIcon: (cycleGroup) => <CycleGroupIcon cycleGroup={cycleGroup} className="h-3.5 w-3.5 flex-shrink-0" />,
-        cycles: cycles ?? [],
-        ...operatorConfigs,
-      }),
-    [isFilterEnabled, project?.cycle_view, cycles, operatorConfigs]
-  );
-
-  // module filter config
-  const moduleFilterConfig = useMemo(
-    () =>
-      getModuleFilterConfig<TWorkItemFilterProperty>("module_id")({
-        isEnabled: isFilterEnabled("module_id") && project?.module_view === true && modules !== undefined,
-        filterIcon: DiceIcon,
-        getOptionIcon: () => <DiceIcon className="h-3 w-3 flex-shrink-0" />,
-        modules: modules ?? [],
-        ...operatorConfigs,
-      }),
-    [isFilterEnabled, project?.module_view, modules, operatorConfigs]
-  );
-
-  // assignee filter config
-  const assigneeFilterConfig = useMemo(
-    () =>
-      getAssigneeFilterConfig<TWorkItemFilterProperty>("assignee_id")({
-        isEnabled: isFilterEnabled("assignee_id") && members !== undefined,
-        filterIcon: Users,
-        members: members ?? [],
-        getOptionIcon: (memberDetails) => (
-          <Avatar
-            name={memberDetails.display_name}
-            src={getFileURL(memberDetails.avatar_url)}
-            showTooltip={false}
-            size="sm"
-          />
-        ),
-        ...operatorConfigs,
-      }),
-    [isFilterEnabled, members, operatorConfigs]
-  );
-
-  // mention filter config
-  const mentionFilterConfig = useMemo(
-    () =>
-      getMentionFilterConfig<TWorkItemFilterProperty>("mention_id")({
-        isEnabled: isFilterEnabled("mention_id") && members !== undefined,
-        filterIcon: AtSign,
-        members: members ?? [],
-        getOptionIcon: (memberDetails) => (
-          <Avatar
-            name={memberDetails.display_name}
-            src={getFileURL(memberDetails.avatar_url)}
-            showTooltip={false}
-            size="sm"
-          />
-        ),
-        ...operatorConfigs,
-      }),
-    [isFilterEnabled, members, operatorConfigs]
-  );
-
-  // created by filter config
-  const createdByFilterConfig = useMemo(
-    () =>
-      getCreatedByFilterConfig<TWorkItemFilterProperty>("created_by_id")({
-        isEnabled: isFilterEnabled("created_by_id") && members !== undefined,
-        filterIcon: CircleUserRound,
-        members: members ?? [],
-        getOptionIcon: (memberDetails) => (
-          <Avatar
-            name={memberDetails.display_name}
-            src={getFileURL(memberDetails.avatar_url)}
-            showTooltip={false}
-            size="sm"
-          />
-        ),
-        ...operatorConfigs,
-      }),
-    [isFilterEnabled, members, operatorConfigs]
-  );
-
-  // subscriber filter config
-  const subscriberFilterConfig = useMemo(
-    () =>
-      getSubscriberFilterConfig<TWorkItemFilterProperty>("subscriber_id")({
-        isEnabled: isFilterEnabled("subscriber_id") && members !== undefined,
-        filterIcon: Users,
-        members: members ?? [],
-        getOptionIcon: (memberDetails) => (
-          <Avatar
-            name={memberDetails.display_name}
-            src={getFileURL(memberDetails.avatar_url)}
-            showTooltip={false}
-            size="sm"
-          />
-        ),
-        ...operatorConfigs,
-      }),
-    [isFilterEnabled, members, operatorConfigs]
-  );
-
-  // priority filter config
-  const priorityFilterConfig = useMemo(
-    () =>
-      getPriorityFilterConfig<TWorkItemFilterProperty>("priority")({
-        isEnabled: isFilterEnabled("priority"),
-        filterIcon: SignalHigh,
-        getOptionIcon: (priority) => <PriorityIcon priority={priority} />,
-        ...operatorConfigs,
-      }),
-    [isFilterEnabled, operatorConfigs]
-  );
-
-  // start date filter config
-  const startDateFilterConfig = useMemo(
-    () =>
-      getStartDateFilterConfig<TWorkItemFilterProperty>("start_date")({
-        isEnabled: true,
-        filterIcon: CalendarClock,
-        ...operatorConfigs,
-      }),
-    [operatorConfigs]
-  );
-
-  // target date filter config
-  const targetDateFilterConfig = useMemo(
-    () =>
-      getTargetDateFilterConfig<TWorkItemFilterProperty>("target_date")({
-        isEnabled: true,
-        filterIcon: CalendarCheck2,
-        ...operatorConfigs,
-      }),
-    [operatorConfigs]
-  );
-
-  // project filter config
-  const projectFilterConfig = useMemo(
-    () =>
-      getProjectFilterConfig<TWorkItemFilterProperty>("project_id")({
-        isEnabled: isFilterEnabled("project_id") && projects !== undefined,
-        filterIcon: Briefcase,
-        projects: projects,
-        getOptionIcon: (project) => <Logo logo={project.logo_props} size={12} />,
-        ...operatorConfigs,
-      }),
-    [isFilterEnabled, projects, operatorConfigs]
-  );
-
-  return {
-    configs: [
-      stateFilterConfig,
-      stateGroupFilterConfig,
-      assigneeFilterConfig,
-      priorityFilterConfig,
-      projectFilterConfig,
-      mentionFilterConfig,
-      labelFilterConfig,
-      cycleFilterConfig,
-      moduleFilterConfig,
-      startDateFilterConfig,
-      targetDateFilterConfig,
-      createdByFilterConfig,
-      subscriberFilterConfig,
-    ],
-    configMap: {
-      project_id: projectFilterConfig,
-      state_group: stateGroupFilterConfig,
-      state_id: stateFilterConfig,
-      label_id: labelFilterConfig,
-      cycle_id: cycleFilterConfig,
-      module_id: moduleFilterConfig,
-      assignee_id: assigneeFilterConfig,
-      mention_id: mentionFilterConfig,
-      created_by_id: createdByFilterConfig,
-      subscriber_id: subscriberFilterConfig,
-      priority: priorityFilterConfig,
-      start_date: startDateFilterConfig,
-      target_date: targetDateFilterConfig,
-    },
-    isFilterEnabled,
-  };
-};

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

@@ -5,7 +5,7 @@ import { EUserProjectRoles } from "@plane/types";
 import type { RootStore } from "@/plane-web/store/root.store";
 // store
 import type { IMemberRootStore } from "@/store/member";
-import { BaseProjectMemberStore, IBaseProjectMemberStore } from "@/store/member/project/base-project-member.store";
+import { BaseProjectMemberStore, IBaseProjectMemberStore } from "@/store/member/base-project-member.store";
 
 export type IProjectMemberStore = IBaseProjectMemberStore;
 

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

@@ -1,8 +1,9 @@
 import React, { useEffect, useState } from "react";
 import { observer } from "mobx-react";
 // plane package imports
-import { ModalPortal, EPortalWidth, EPortalPosition } from "@plane/propel/portal";
+import { createPortal } from "react-dom";
 import { ICycle, IModule, IProject } from "@plane/types";
+import { cn } from "@plane/utils";
 import { useAnalytics } from "@/hooks/store/use-analytics";
 // plane web components
 import { WorkItemsModalMainContent } from "./content";
@@ -31,35 +32,41 @@ export const WorkItemsModal: React.FC<Props> = observer((props) => {
     updateIsEpic(isPeekView ? (isEpic ?? false) : false);
   }, [isEpic, updateIsEpic, isPeekView]);
 
-  return (
-    <ModalPortal
-      isOpen={isOpen}
-      onClose={handleClose}
-      width={fullScreen ? EPortalWidth.FULL : EPortalWidth.THREE_QUARTER}
-      position={EPortalPosition.RIGHT}
-      fullScreen={fullScreen}
-    >
+  const portalContainer = document.getElementById("full-screen-portal") as HTMLElement;
+
+  if (!isOpen) return null;
+
+  const content = (
+    <div className={cn("z-[25] h-full w-full overflow-y-auto absolute")}>
       <div
-        className={`flex h-full flex-col overflow-hidden border-custom-border-200 bg-custom-background-100 text-left ${
-          fullScreen ? "rounded-lg border" : "border-l"
+        className={`top-0 right-0 z-[25] h-full bg-custom-background-100 shadow-custom-shadow-md absolute ${
+          fullScreen ? "w-full p-2" : "w-1/2"
         }`}
       >
-        <WorkItemsModalHeader
-          fullScreen={fullScreen}
-          handleClose={handleClose}
-          setFullScreen={setFullScreen}
-          title={projectDetails?.name ?? ""}
-          cycle={cycleDetails}
-          module={moduleDetails}
-        />
-        <WorkItemsModalMainContent
-          fullScreen={fullScreen}
-          projectDetails={projectDetails}
-          cycleDetails={cycleDetails}
-          moduleDetails={moduleDetails}
-          isEpic={isEpic}
-        />
+        <div
+          className={`flex h-full flex-col overflow-hidden border-custom-border-200 bg-custom-background-100 text-left ${
+            fullScreen ? "rounded-lg border" : "border-l"
+          }`}
+        >
+          <WorkItemsModalHeader
+            fullScreen={fullScreen}
+            handleClose={handleClose}
+            setFullScreen={setFullScreen}
+            title={projectDetails?.name ?? ""}
+            cycle={cycleDetails}
+            module={moduleDetails}
+          />
+          <WorkItemsModalMainContent
+            fullScreen={fullScreen}
+            projectDetails={projectDetails}
+            cycleDetails={cycleDetails}
+            moduleDetails={moduleDetails}
+            isEpic={isEpic}
+          />
+        </div>
       </div>
-    </ModalPortal>
+    </div>
   );
+
+  return portalContainer ? createPortal(content, portalContainer) : content;
 });

apps/web/core/components/archives/archive-tabs-list.tsx

@@ -48,7 +48,7 @@ export const ArchiveTabsList: FC = observer(() => {
           tab.shouldRender(projectDetails) && (
             <Link key={tab.key} href={`/${workspaceSlug}/projects/${projectId}/archives/${tab.key}`}>
               <span
-                className={`flex min-w-min flex-shrink-0 whitespace-nowrap border-b-2 py-4 px-4 text-sm font-medium outline-none ${
+                className={`flex min-w-min flex-shrink-0 whitespace-nowrap border-b-2 py-3 px-4 text-sm font-medium outline-none ${
                   pathname.includes(tab.key)
                     ? "border-custom-primary-100 text-custom-primary-100"
                     : "border-transparent hover:border-custom-border-200 text-custom-text-300 hover:text-custom-text-400"

apps/web/core/components/command-palette/command-config.ts

@@ -0,0 +1,135 @@
+import React from "react";
+import { FolderPlus, Settings } from "lucide-react";
+import { LayersIcon } from "@plane/propel/icons";
+import {
+  PROJECT_TRACKER_ELEMENTS,
+  WORK_ITEM_TRACKER_ELEMENTS,
+} from "@plane/constants";
+import { captureClick } from "@/helpers/event-tracker.helper";
+import { PaletteCommandGroup } from "./types";
+
+interface BuildParams {
+  workspaceSlug?: string | string[];
+  pages: string[];
+  workspaceProjectIds?: string[];
+  canPerformAnyCreateAction: boolean;
+  canPerformWorkspaceActions: boolean;
+  closePalette: () => void;
+  toggleCreateIssueModal: (v: boolean) => void;
+  toggleCreateProjectModal: (v: boolean) => void;
+  setPages: React.Dispatch<React.SetStateAction<string[]>>;
+  setPlaceholder: (v: string) => void;
+  setSearchTerm: (v: string) => void;
+  createNewWorkspace: () => void;
+}
+
+export const buildCommandGroups = (params: BuildParams): PaletteCommandGroup[] => {
+  const {
+    workspaceSlug,
+    pages,
+    workspaceProjectIds,
+    canPerformAnyCreateAction,
+    canPerformWorkspaceActions,
+    closePalette,
+    toggleCreateIssueModal,
+    toggleCreateProjectModal,
+    setPages,
+    setPlaceholder,
+    setSearchTerm,
+    createNewWorkspace,
+  } = params;
+
+  const groups: PaletteCommandGroup[] = [];
+
+  if (
+    workspaceSlug &&
+    workspaceProjectIds &&
+    workspaceProjectIds.length > 0 &&
+    canPerformAnyCreateAction
+  ) {
+    groups.push({
+      id: "work-item",
+      heading: "Work item",
+      commands: [
+        {
+          id: "create-work-item",
+          label: "Create new work item",
+          shortcut: "C",
+          icon: LayersIcon,
+          perform: () => {
+            closePalette();
+            captureClick({ elementName: WORK_ITEM_TRACKER_ELEMENTS.COMMAND_PALETTE_ADD_BUTTON });
+            toggleCreateIssueModal(true);
+          },
+          enabled: true,
+        },
+      ],
+    });
+  }
+
+  if (workspaceSlug && canPerformWorkspaceActions) {
+    groups.push({
+      id: "project",
+      heading: "Project",
+      commands: [
+        {
+          id: "create-project",
+          label: "Create new project",
+          shortcut: "P",
+          icon: FolderPlus,
+          perform: () => {
+            closePalette();
+            captureClick({ elementName: PROJECT_TRACKER_ELEMENTS.COMMAND_PALETTE_CREATE_BUTTON });
+            toggleCreateProjectModal(true);
+          },
+          enabled: true,
+        },
+      ],
+    });
+  }
+
+  groups.push({
+    id: "workspace-settings",
+    heading: "Workspace Settings",
+    commands: [
+      {
+        id: "search-settings",
+        label: "Search settings...",
+        icon: Settings,
+        perform: () => {
+          setPlaceholder("Search workspace settings...");
+          setSearchTerm("");
+          setPages((p) => [...p, "settings"]);
+        },
+        enabled: !!(canPerformWorkspaceActions && workspaceSlug),
+      },
+    ],
+  });
+
+  groups.push({
+    id: "account",
+    heading: "Account",
+    commands: [
+      {
+        id: "create-workspace",
+        label: "Create new workspace",
+        icon: FolderPlus,
+        perform: createNewWorkspace,
+        enabled: true,
+      },
+      {
+        id: "change-interface-theme",
+        label: "Change interface theme...",
+        icon: Settings,
+        perform: () => {
+          setPlaceholder("Change interface theme...");
+          setSearchTerm("");
+          setPages((p) => [...p, "change-interface-theme"]);
+        },
+        enabled: true,
+      },
+    ],
+  });
+
+  return groups;
+};

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

@@ -1,6 +1,6 @@
 "use client";
 
-import React, { useEffect, useState } from "react";
+import React, { useEffect, useMemo, useState } from "react";
 import { Command } from "cmdk";
 import { observer } from "mobx-react";
 import { useParams } from "next/navigation";
@@ -35,7 +35,6 @@ import {
 import { SimpleEmptyState } from "@/components/empty-state/simple-empty-state-root";
 // helpers
 // hooks
-import { captureClick } from "@/helpers/event-tracker.helper";
 import { useCommandPalette } from "@/hooks/store/use-command-palette";
 import { useIssueDetail } from "@/hooks/store/use-issue-detail";
 import { useProject } from "@/hooks/store/use-project";
@@ -46,6 +45,8 @@ import { usePlatformOS } from "@/hooks/use-platform-os";
 // plane web components
 import { useResolvedAssetPath } from "@/hooks/use-resolved-asset-path";
 import { IssueIdentifier } from "@/plane-web/components/issues/issue-details/issue-identifier";
+import { buildCommandGroups } from "./command-config";
+import { PaletteCommandGroup } from "./types";
 // plane web services
 import { WorkspaceService } from "@/plane-web/services";
 
@@ -124,6 +125,38 @@ export const CommandModal: React.FC = observer(() => {
     router.push("/create-workspace");
   };
 
+  const commandGroups: PaletteCommandGroup[] = useMemo(
+    () =>
+      buildCommandGroups({
+        workspaceSlug,
+        pages,
+        workspaceProjectIds,
+        canPerformAnyCreateAction,
+        canPerformWorkspaceActions,
+        closePalette,
+        toggleCreateIssueModal,
+        toggleCreateProjectModal,
+        setPages,
+        setPlaceholder,
+        setSearchTerm,
+        createNewWorkspace,
+      }),
+    [
+      workspaceSlug,
+      pages,
+      workspaceProjectIds,
+      canPerformAnyCreateAction,
+      canPerformWorkspaceActions,
+      closePalette,
+      toggleCreateIssueModal,
+      toggleCreateProjectModal,
+      setPages,
+      setPlaceholder,
+      setSearchTerm,
+      createNewWorkspace,
+    ]
+  );
+
   useEffect(
     () => {
       if (!workspaceSlug) return;
@@ -341,91 +374,32 @@ export const CommandModal: React.FC = observer(() => {
                               setSearchTerm={(newSearchTerm) => setSearchTerm(newSearchTerm)}
                             />
                           )}
-                          {workspaceSlug &&
-                            workspaceProjectIds &&
-                            workspaceProjectIds.length > 0 &&
-                            canPerformAnyCreateAction && (
-                              <Command.Group heading="Work item">
-                                <Command.Item
-                                  onSelect={() => {
-                                    closePalette();
-                                    captureClick({
-                                      elementName: WORK_ITEM_TRACKER_ELEMENTS.COMMAND_PALETTE_ADD_BUTTON,
-                                    });
-                                    toggleCreateIssueModal(true);
-                                  }}
-                                  className="focus:bg-custom-background-80"
-                                >
-                                  <div className="flex items-center gap-2 text-custom-text-200">
-                                    <LayersIcon className="h-3.5 w-3.5" />
-                                    Create new work item
-                                  </div>
-                                  <kbd>C</kbd>
-                                </Command.Item>
+                          {commandGroups.map((group) => (
+                            <React.Fragment key={group.id}>
+                              {group.id === "workspace-settings" &&
+                                projectId &&
+                                canPerformAnyCreateAction && (
+                                  <CommandPaletteProjectActions closePalette={closePalette} />
+                                )}
+                              <Command.Group heading={group.heading}>
+                                {group.commands
+                                  .filter((c) => c.enabled !== false)
+                                  .map((c) => (
+                                    <Command.Item
+                                      key={c.id}
+                                      onSelect={() => c.perform()}
+                                      className="focus:outline-none"
+                                    >
+                                      <div className="flex items-center gap-2 text-custom-text-200">
+                                        {c.icon && <c.icon className="h-3.5 w-3.5" />}
+                                        {c.label}
+                                      </div>
+                                      {c.shortcut && <kbd>{c.shortcut}</kbd>}
+                                    </Command.Item>
+                                  ))}
                               </Command.Group>
-                            )}
-                          {workspaceSlug && canPerformWorkspaceActions && (
-                            <Command.Group heading="Project">
-                              <Command.Item
-                                onSelect={() => {
-                                  closePalette();
-                                  captureClick({ elementName: PROJECT_TRACKER_ELEMENTS.COMMAND_PALETTE_CREATE_BUTTON });
-                                  toggleCreateProjectModal(true);
-                                }}
-                                className="focus:outline-none"
-                              >
-                                <div className="flex items-center gap-2 text-custom-text-200">
-                                  <FolderPlus className="h-3.5 w-3.5" />
-                                  Create new project
-                                </div>
-                                <kbd>P</kbd>
-                              </Command.Item>
-                            </Command.Group>
-                          )}
-
-                          {/* project actions */}
-                          {projectId && canPerformAnyCreateAction && (
-                            <CommandPaletteProjectActions closePalette={closePalette} />
-                          )}
-                          {canPerformWorkspaceActions && (
-                            <Command.Group heading="Workspace Settings">
-                              <Command.Item
-                                onSelect={() => {
-                                  setPlaceholder("Search workspace settings...");
-                                  setSearchTerm("");
-                                  setPages([...pages, "settings"]);
-                                }}
-                                className="focus:outline-none"
-                              >
-                                <div className="flex items-center gap-2 text-custom-text-200">
-                                  <Settings className="h-3.5 w-3.5" />
-                                  Search settings...
-                                </div>
-                              </Command.Item>
-                            </Command.Group>
-                          )}
-                          <Command.Group heading="Account">
-                            <Command.Item onSelect={createNewWorkspace} className="focus:outline-none">
-                              <div className="flex items-center gap-2 text-custom-text-200">
-                                <FolderPlus className="h-3.5 w-3.5" />
-                                Create new workspace
-                              </div>
-                            </Command.Item>
-                            <Command.Item
-                              onSelect={() => {
-                                setPlaceholder("Change interface theme...");
-                                setSearchTerm("");
-                                setPages([...pages, "change-interface-theme"]);
-                              }}
-                              className="focus:outline-none"
-                            >
-                              <div className="flex items-center gap-2 text-custom-text-200">
-                                <Settings className="h-3.5 w-3.5" />
-                                Change interface theme...
-                              </div>
-                            </Command.Item>
-                          </Command.Group>
-
+                            </React.Fragment>
+                          ))}
                           {/* help options */}
                           <CommandPaletteHelpActions closePalette={closePalette} />
                         </>

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

@@ -1,6 +1,6 @@
 "use client";
 
-import React, { useCallback, useEffect, FC, useMemo } from "react";
+import React, { useCallback, FC, useMemo } from "react";
 import { observer } from "mobx-react";
 import { useParams } from "next/navigation";
 import useSWR from "swr";
@@ -10,6 +10,7 @@ import { TOAST_TYPE, setToast } from "@plane/ui";
 // components
 import { copyTextToClipboard } from "@plane/utils";
 import { CommandModal, ShortcutsModal } from "@/components/command-palette";
+import { useShortcuts, Shortcut } from "./use-shortcuts";
 // helpers
 // hooks
 import { captureClick } from "@/helpers/event-tracker.helper";
@@ -38,7 +39,7 @@ export const CommandPalette: FC = observer(() => {
   const { workspaceSlug, projectId: paramsProjectId, workItem } = useParams();
   // store hooks
   const { fetchIssueWithIdentifier } = useIssueDetail();
-  const { toggleSidebar, toggleExtendedSidebar } = useAppTheme();
+  const { toggleSidebar } = useAppTheme();
   const { platform } = usePlatformOS();
   const { data: currentUser, canPerformAnyCreateAction } = useUser();
   const { toggleCommandPaletteModal, isShortcutModalOpen, toggleShortcutModal, isAnyModalOpen } = useCommandPalette();
@@ -158,100 +159,119 @@ export const CommandPalette: FC = observer(() => {
     []
   );
 
-  const handleKeyDown = useCallback(
-    (e: KeyboardEvent) => {
-      const { key, ctrlKey, metaKey, altKey, shiftKey } = e;
-      if (!key) return;
+  const isEditable = (e: KeyboardEvent) => {
+    const target = e.target as HTMLElement;
+    return (
+      target instanceof HTMLTextAreaElement ||
+      target instanceof HTMLInputElement ||
+      target.isContentEditable ||
+      target.classList.contains("ProseMirror")
+    );
+  };
 
-      const keyPressed = key.toLowerCase();
-      const cmdClicked = ctrlKey || metaKey;
-      const shiftClicked = shiftKey;
-      const deleteKey = keyPressed === "backspace" || keyPressed === "delete";
+  const shortcuts: Shortcut[] = useMemo(() => {
+    const list: Shortcut[] = [
+      {
+        keys: ["meta", "k"],
+        handler: () => toggleCommandPaletteModal(true),
+        enabled: () => !isAnyModalOpen,
+      },
+      {
+        keys: ["control", "k"],
+        handler: () => toggleCommandPaletteModal(true),
+        enabled: () => !isAnyModalOpen,
+      },
+      {
+        keys: ["shift", "?"],
+        handler: () => toggleShortcutModal(true),
+        enabled: () => !isAnyModalOpen,
+      },
+      {
+        keys: ["shift", "/"],
+        handler: () => toggleShortcutModal(true),
+        enabled: () => !isAnyModalOpen,
+      },
+      {
+        keys: platform === "MacOS" ? ["control", "meta", "c"] : ["control", "alt", "c"],
+        handler: () => copyIssueUrlToClipboard(),
+        enabled: () => !!workItem,
+      },
+      {
+        keys: ["meta", "b"],
+        handler: () => toggleSidebar(),
+        enabled: (e) => !isEditable(e),
+      },
+      {
+        keys: ["control", "b"],
+        handler: () => toggleSidebar(),
+        enabled: (e) => !isEditable(e),
+      },
+    ];
 
-      if (cmdClicked && keyPressed === "k" && !isAnyModalOpen) {
-        e.preventDefault();
-        toggleCommandPaletteModal(true);
-      }
+    Object.keys(shortcutsList.global).forEach((k) => {
+      list.push({
+        sequence: [k],
+        handler: () => {
+          captureClick({ elementName: COMMAND_PALETTE_TRACKER_ELEMENTS.COMMAND_PALETTE_SHORTCUT_KEY });
+          shortcutsList.global[k].action();
+        },
+        enabled: (e) =>
+          !isEditable(e) &&
+          !isAnyModalOpen &&
+          (((!projectId && performAnyProjectCreateActions()) || performProjectCreateActions())),
+      });
+    });
 
-      // if on input, textarea or editor, don't do anything
-      if (
-        e.target instanceof HTMLTextAreaElement ||
-        e.target instanceof HTMLInputElement ||
-        (e.target as Element)?.classList?.contains("ProseMirror")
-      )
-        return;
+    Object.keys(shortcutsList.workspace).forEach((k) => {
+      list.push({
+        sequence: [k],
+        handler: () => {
+          captureClick({ elementName: COMMAND_PALETTE_TRACKER_ELEMENTS.COMMAND_PALETTE_SHORTCUT_KEY });
+          shortcutsList.workspace[k].action();
+        },
+        enabled: (e) =>
+          !isEditable(e) &&
+          !isAnyModalOpen &&
+          !!workspaceSlug &&
+          performWorkspaceCreateActions(),
+      });
+    });
 
-      if (shiftClicked && (keyPressed === "?" || keyPressed === "/") && !isAnyModalOpen) {
-        e.preventDefault();
-        toggleShortcutModal(true);
-      }
+    Object.entries(shortcutsList.project).forEach(([k, v]) => {
+      const isDeleteKey = k === "delete" || k === "backspace";
+      list.push({
+        sequence: [k],
+        handler: () => {
+          captureClick({ elementName: COMMAND_PALETTE_TRACKER_ELEMENTS.COMMAND_PALETTE_SHORTCUT_KEY });
+          v.action();
+        },
+        enabled: (e) =>
+          !isEditable(e) &&
+          !isAnyModalOpen &&
+          !!projectId &&
+          (isDeleteKey ? performProjectBulkDeleteActions() : performProjectCreateActions()),
+      });
+    });
 
-      if (deleteKey) {
-        if (performProjectBulkDeleteActions()) {
-          shortcutsList.project.delete.action();
-        }
-      } else if (cmdClicked) {
-        if (keyPressed === "c" && ((platform === "MacOS" && ctrlKey) || altKey)) {
-          e.preventDefault();
-          copyIssueUrlToClipboard();
-        } else if (keyPressed === "b") {
-          e.preventDefault();
-          toggleSidebar();
-          toggleExtendedSidebar(false);
-        }
-      } else if (!isAnyModalOpen) {
-        captureClick({ elementName: COMMAND_PALETTE_TRACKER_ELEMENTS.COMMAND_PALETTE_SHORTCUT_KEY });
-        if (
-          Object.keys(shortcutsList.global).includes(keyPressed) &&
-          ((!projectId && performAnyProjectCreateActions()) || performProjectCreateActions())
-        ) {
-          shortcutsList.global[keyPressed].action();
-        }
-        // workspace authorized actions
-        else if (
-          Object.keys(shortcutsList.workspace).includes(keyPressed) &&
-          workspaceSlug &&
-          performWorkspaceCreateActions()
-        ) {
-          e.preventDefault();
-          shortcutsList.workspace[keyPressed].action();
-        }
-        // project authorized actions
-        else if (
-          Object.keys(shortcutsList.project).includes(keyPressed) &&
-          projectId &&
-          performProjectCreateActions()
-        ) {
-          e.preventDefault();
-          // actions that can be performed only inside a project
-          shortcutsList.project[keyPressed].action();
-        }
-      }
-      // Additional keydown events
-      handleAdditionalKeyDownEvents(e);
-    },
-    [
-      copyIssueUrlToClipboard,
-      isAnyModalOpen,
-      platform,
-      performAnyProjectCreateActions,
-      performProjectBulkDeleteActions,
-      performProjectCreateActions,
-      performWorkspaceCreateActions,
-      projectId,
-      shortcutsList,
-      toggleCommandPaletteModal,
-      toggleShortcutModal,
-      toggleSidebar,
-      toggleExtendedSidebar,
-      workspaceSlug,
-    ]
-  );
+    return list;
+  }, [
+    copyIssueUrlToClipboard,
+    isAnyModalOpen,
+    performAnyProjectCreateActions,
+    performProjectBulkDeleteActions,
+    performProjectCreateActions,
+    performWorkspaceCreateActions,
+    platform,
+    projectId,
+    shortcutsList,
+    toggleCommandPaletteModal,
+    toggleShortcutModal,
+    toggleSidebar,
+    workspaceSlug,
+    workItem,
+  ]);
 
-  useEffect(() => {
-    document.addEventListener("keydown", handleKeyDown);
-    return () => document.removeEventListener("keydown", handleKeyDown);
-  }, [handleKeyDown]);
+  useShortcuts(shortcuts, { additional: handleAdditionalKeyDownEvents });
 
   if (!currentUser) return null;
 

apps/web/core/components/command-palette/types.ts

@@ -0,0 +1,16 @@
+import React from "react";
+
+export interface PaletteCommand {
+  id: string;
+  label: string;
+  shortcut?: string;
+  icon?: React.ComponentType<{ className?: string }>;
+  perform: () => void;
+  enabled?: boolean;
+}
+
+export interface PaletteCommandGroup {
+  id: string;
+  heading: string;
+  commands: PaletteCommand[];
+}

apps/web/core/components/command-palette/use-shortcuts.ts

@@ -0,0 +1,67 @@
+import { useCallback, useEffect, useRef } from "react";
+
+export interface Shortcut {
+  keys?: string[]; // simultaneous combination
+  sequence?: string[]; // sequential keys
+  handler: (e: KeyboardEvent) => void;
+  enabled?: (e: KeyboardEvent) => boolean;
+  preventDefault?: boolean;
+}
+
+const matchCombo = (pressed: string[], combo: string[]) => {
+  if (pressed.length !== combo.length) return false;
+  return combo.every((k) => pressed.includes(k));
+};
+
+const matchSequence = (buffer: string[], sequence: string[]) => {
+  if (buffer.length < sequence.length) return false;
+  const start = buffer.length - sequence.length;
+  return sequence.every((k, i) => buffer[start + i] === k);
+};
+
+export const useShortcuts = (
+  shortcuts: Shortcut[],
+  options?: { filter?: (e: KeyboardEvent) => boolean; additional?: (e: KeyboardEvent) => void }
+) => {
+  const bufferRef = useRef<string[]>([]);
+  const timerRef = useRef<NodeJS.Timeout>();
+
+  const listener = useCallback(
+    (e: KeyboardEvent) => {
+      if (options?.filter && !options.filter(e)) return;
+
+      const pressed: string[] = [];
+      if (e.metaKey) pressed.push("meta");
+      if (e.ctrlKey) pressed.push("control");
+      if (e.altKey) pressed.push("alt");
+      if (e.shiftKey) pressed.push("shift");
+      pressed.push(e.key.toLowerCase());
+
+      bufferRef.current.push(e.key.toLowerCase());
+      clearTimeout(timerRef.current);
+      timerRef.current = setTimeout(() => {
+        bufferRef.current = [];
+      }, 1000);
+
+      shortcuts.forEach((s) => {
+        if (s.enabled && !s.enabled(e)) return;
+        if (s.keys && matchCombo(pressed, s.keys)) {
+          if (s.preventDefault ?? true) e.preventDefault();
+          s.handler(e);
+        } else if (s.sequence && matchSequence(bufferRef.current, s.sequence)) {
+          if (s.preventDefault ?? true) e.preventDefault();
+          bufferRef.current = [];
+          s.handler(e);
+        }
+      });
+
+      options?.additional?.(e);
+    },
+    [shortcuts, options]
+  );
+
+  useEffect(() => {
+    document.addEventListener("keydown", listener);
+    return () => document.removeEventListener("keydown", listener);
+  }, [listener]);
+};

apps/web/core/components/core/sidebar/progress-stats/assignee.tsx

@@ -1,79 +0,0 @@
-import { observer } from "mobx-react";
-import Image from "next/image";
-// plane imports
-import { useTranslation } from "@plane/i18n";
-import { Avatar } from "@plane/ui";
-import { getFileURL } from "@plane/utils";
-// components
-import { SingleProgressStats } from "@/components/core/sidebar/single-progress-stats";
-// public
-import emptyMembers from "@/public/empty-state/empty_members.svg";
-
-export type TAssigneeData = {
-  id: string | undefined;
-  title: string | undefined;
-  avatar_url: string | undefined;
-  completed: number;
-  total: number;
-}[];
-
-type TAssigneeStatComponent = {
-  selectedAssigneeIds: string[];
-  handleAssigneeFiltersUpdate: (assigneeId: string | undefined) => void;
-  distribution: TAssigneeData;
-  isEditable?: boolean;
-};
-
-export const AssigneeStatComponent = observer((props: TAssigneeStatComponent) => {
-  const { distribution, isEditable, selectedAssigneeIds, handleAssigneeFiltersUpdate } = props;
-  const { t } = useTranslation();
-  return (
-    <div>
-      {distribution && distribution.length > 0 ? (
-        distribution.map((assignee, index) => {
-          if (assignee?.id)
-            return (
-              <SingleProgressStats
-                key={assignee?.id}
-                title={
-                  <div className="flex items-center gap-2">
-                    <Avatar name={assignee?.title ?? undefined} src={getFileURL(assignee?.avatar_url ?? "")} />
-                    <span>{assignee?.title ?? ""}</span>
-                  </div>
-                }
-                completed={assignee?.completed ?? 0}
-                total={assignee?.total ?? 0}
-                {...(isEditable && {
-                  onClick: () => handleAssigneeFiltersUpdate(assignee.id),
-                  selected: assignee.id ? selectedAssigneeIds.includes(assignee.id) : false,
-                })}
-              />
-            );
-          else
-            return (
-              <SingleProgressStats
-                key={`unassigned-${index}`}
-                title={
-                  <div className="flex items-center gap-2">
-                    <div className="h-4 w-4 rounded-full border-2 border-custom-border-200 bg-custom-background-80">
-                      <img src="/user.png" height="100%" width="100%" className="rounded-full" alt="User" />
-                    </div>
-                    <span>{t("no_assignee")}</span>
-                  </div>
-                }
-                completed={assignee?.completed ?? 0}
-                total={assignee?.total ?? 0}
-              />
-            );
-        })
-      ) : (
-        <div className="flex h-full flex-col items-center justify-center gap-2">
-          <div className="flex h-20 w-20 items-center justify-center rounded-full bg-custom-background-80">
-            <Image src={emptyMembers} className="h-12 w-12" alt="empty members" />
-          </div>
-          <h6 className="text-base text-custom-text-300">{t("no_assignee")}</h6>
-        </div>
-      )}
-    </div>
-  );
-});

apps/web/core/components/core/sidebar/progress-stats/label.tsx

@@ -1,86 +0,0 @@
-import { observer } from "mobx-react";
-import Image from "next/image";
-// plane imports
-import { useTranslation } from "@plane/i18n";
-// components
-import { SingleProgressStats } from "@/components/core/sidebar/single-progress-stats";
-// public
-import emptyLabel from "@/public/empty-state/empty_label.svg";
-
-export type TLabelData = {
-  id: string | undefined;
-  title: string | undefined;
-  color: string | undefined;
-  completed: number;
-  total: number;
-}[];
-
-type TLabelStatComponent = {
-  selectedLabelIds: string[];
-  handleLabelFiltersUpdate: (labelId: string | undefined) => void;
-  distribution: TLabelData;
-  isEditable?: boolean;
-};
-
-export const LabelStatComponent = observer((props: TLabelStatComponent) => {
-  const { distribution, isEditable, selectedLabelIds, handleLabelFiltersUpdate } = props;
-  const { t } = useTranslation();
-  return (
-    <div>
-      {distribution && distribution.length > 0 ? (
-        distribution.map((label, index) => {
-          if (label.id) {
-            return (
-              <SingleProgressStats
-                key={label.id}
-                title={
-                  <div className="flex items-center gap-2 truncate">
-                    <span
-                      className="block h-3 w-3 rounded-full flex-shrink-0"
-                      style={{
-                        backgroundColor: label.color ?? "transparent",
-                      }}
-                    />
-                    <span className="text-xs text-ellipsis truncate">{label.title ?? t("no_labels_yet")}</span>
-                  </div>
-                }
-                completed={label.completed}
-                total={label.total}
-                {...(isEditable && {
-                  onClick: () => handleLabelFiltersUpdate(label.id),
-                  selected: label.id ? selectedLabelIds.includes(label.id) : false,
-                })}
-              />
-            );
-          } else {
-            return (
-              <SingleProgressStats
-                key={`no-label-${index}`}
-                title={
-                  <div className="flex items-center gap-2">
-                    <span
-                      className="block h-3 w-3 rounded-full"
-                      style={{
-                        backgroundColor: label.color ?? "transparent",
-                      }}
-                    />
-                    <span className="text-xs">{label.title ?? t("no_labels_yet")}</span>
-                  </div>
-                }
-                completed={label.completed}
-                total={label.total}
-              />
-            );
-          }
-        })
-      ) : (
-        <div className="flex h-full flex-col items-center justify-center gap-2">
-          <div className="flex h-20 w-20 items-center justify-center rounded-full bg-custom-background-80">
-            <Image src={emptyLabel} className="h-12 w-12" alt="empty label" />
-          </div>
-          <h6 className="text-base text-custom-text-300">{t("no_labels_yet")}</h6>
-        </div>
-      )}
-    </div>
-  );
-});

apps/web/core/components/core/sidebar/progress-stats/shared.ts

@@ -1,45 +0,0 @@
-import { TWorkItemFilterCondition } from "@plane/shared-state";
-import { TFilterConditionNodeForDisplay, TFilterValue, TWorkItemFilterProperty } from "@plane/types";
-
-export const PROGRESS_STATS = [
-  {
-    key: "stat-states",
-    i18n_title: "common.states",
-  },
-  {
-    key: "stat-assignees",
-    i18n_title: "common.assignees",
-  },
-  {
-    key: "stat-labels",
-    i18n_title: "common.labels",
-  },
-];
-
-type TSelectedFilterProgressStatsType = TFilterConditionNodeForDisplay<TWorkItemFilterProperty, TFilterValue>;
-
-export type TSelectedFilterProgressStats = {
-  assignees: TSelectedFilterProgressStatsType | undefined;
-  labels: TSelectedFilterProgressStatsType | undefined;
-  stateGroups: TSelectedFilterProgressStatsType | undefined;
-};
-
-export const createFilterUpdateHandler =
-  <T extends string>(
-    property: TWorkItemFilterProperty,
-    selectedValues: T[],
-    handleFiltersUpdate: (condition: TWorkItemFilterCondition) => void
-  ) =>
-  (value: T | undefined) => {
-    const updatedValues = value ? [...selectedValues] : [];
-
-    if (value) {
-      if (updatedValues.includes(value)) {
-        updatedValues.splice(updatedValues.indexOf(value), 1);
-      } else {
-        updatedValues.push(value);
-      }
-    }
-
-    handleFiltersUpdate({ property, operator: "in", value: updatedValues });
-  };

apps/web/core/components/core/sidebar/progress-stats/state_group.tsx

@@ -1,46 +0,0 @@
-import { observer } from "mobx-react";
-// plane imports
-import { StateGroupIcon } from "@plane/propel/icons";
-import { TStateGroups } from "@plane/types";
-// components
-import { SingleProgressStats } from "@/components/core/sidebar/single-progress-stats";
-
-export type TStateGroupData = {
-  state: string | undefined;
-  completed: number;
-  total: number;
-}[];
-
-type TStateGroupStatComponent = {
-  selectedStateGroups: string[];
-  handleStateGroupFiltersUpdate: (stateGroup: string | undefined) => void;
-  distribution: TStateGroupData;
-  totalIssuesCount: number;
-  isEditable?: boolean;
-};
-
-export const StateGroupStatComponent = observer((props: TStateGroupStatComponent) => {
-  const { distribution, isEditable, totalIssuesCount, selectedStateGroups, handleStateGroupFiltersUpdate } = props;
-
-  return (
-    <div>
-      {distribution.map((group, index) => (
-        <SingleProgressStats
-          key={index}
-          title={
-            <div className="flex items-center gap-2">
-              <StateGroupIcon stateGroup={group.state as TStateGroups} />
-              <span className="text-xs capitalize">{group.state}</span>
-            </div>
-          }
-          completed={group.completed}
-          total={totalIssuesCount}
-          {...(isEditable && {
-            onClick: () => group.state && handleStateGroupFiltersUpdate(group.state),
-            selected: group.state ? selectedStateGroups.includes(group.state) : false,
-          })}
-        />
-      ))}
-    </div>
-  );
-});

apps/web/core/components/core/sidebar/single-progress-stats.tsx

@@ -18,7 +18,7 @@ export const SingleProgressStats: React.FC<TSingleProgressStatsProps> = ({
   <div
     className={`flex w-full items-center justify-between gap-4 rounded-sm p-1 text-xs ${
       onClick ? "cursor-pointer hover:bg-custom-background-90" : ""
-    } ${selected ? "bg-custom-background-80" : ""}`}
+    } ${selected ? "bg-custom-background-90" : ""}`}
     onClick={onClick}
   >
     <div className="w-4/6">{title}</div>

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

@@ -10,8 +10,7 @@ import { Tab } from "@headlessui/react";
 import { useTranslation } from "@plane/i18n";
 import { PriorityIcon } from "@plane/propel/icons";
 import { Tooltip } from "@plane/propel/tooltip";
-import { TWorkItemFilterCondition } from "@plane/shared-state";
-import { EIssuesStoreType, ICycle } from "@plane/types";
+import { EIssuesStoreType, ICycle, IIssueFilterOptions } from "@plane/types";
 // ui
 import { Loader, Avatar } from "@plane/ui";
 import { cn, renderFormattedDate, renderFormattedDateWithoutYear, getFileURL } from "@plane/utils";
@@ -36,7 +35,7 @@ export type ActiveCycleStatsProps = {
   projectId: string;
   cycle: ICycle | null;
   cycleId?: string | null;
-  handleFiltersUpdate: (conditions: TWorkItemFilterCondition[]) => void;
+  handleFiltersUpdate: (key: keyof IIssueFilterOptions, value: string[], redirect?: boolean) => void;
   cycleIssueDetails: ActiveCycleIssueDetails;
 };
 
@@ -186,9 +185,7 @@ export const ActiveCycleStats: FC<ActiveCycleStatsProps> = observer((props) => {
                                 issueId: issue.id,
                                 isArchived: !!issue.archived_at,
                               });
-                              handleFiltersUpdate([
-                                { property: "priority", operator: "in", value: ["urgent", "high"] },
-                              ]);
+                              handleFiltersUpdate("priority", ["urgent", "high"], true);
                             }
                           }}
                         >
@@ -278,9 +275,7 @@ export const ActiveCycleStats: FC<ActiveCycleStatsProps> = observer((props) => {
                         total={assignee.total_issues}
                         onClick={() => {
                           if (assignee.assignee_id) {
-                            handleFiltersUpdate([
-                              { property: "assignee_id", operator: "in", value: [assignee.assignee_id] },
-                            ]);
+                            handleFiltersUpdate("assignees", [assignee.assignee_id], true);
                           }
                         }}
                       />
@@ -337,15 +332,11 @@ export const ActiveCycleStats: FC<ActiveCycleStatsProps> = observer((props) => {
                     }
                     completed={label.completed_issues}
                     total={label.total_issues}
-                    onClick={
-                      label.label_id
-                        ? () => {
-                            if (label.label_id) {
-                              handleFiltersUpdate([{ property: "label_id", operator: "in", value: [label.label_id] }]);
-                            }
-                          }
-                        : undefined
-                    }
+                    onClick={() => {
+                      if (label.label_id) {
+                        handleFiltersUpdate("labels", [label.label_id], true);
+                      }
+                    }}
                   />
                 ))
               ) : (

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

@@ -2,28 +2,30 @@
 
 import { FC } from "react";
 import { observer } from "mobx-react";
-// plane imports
+// plane package imports
 import { PROGRESS_STATE_GROUPS_DETAILS } from "@plane/constants";
 import { useTranslation } from "@plane/i18n";
-import { TWorkItemFilterCondition } from "@plane/shared-state";
-import { ICycle } from "@plane/types";
+import { ICycle, IIssueFilterOptions } from "@plane/types";
 import { LinearProgressIndicator, Loader } from "@plane/ui";
 // components
 import { SimpleEmptyState } from "@/components/empty-state/simple-empty-state-root";
 // hooks
+import { useProjectState } from "@/hooks/store/use-project-state";
 import { useResolvedAssetPath } from "@/hooks/use-resolved-asset-path";
 
 export type ActiveCycleProgressProps = {
   cycle: ICycle | null;
   workspaceSlug: string;
   projectId: string;
-  handleFiltersUpdate: (conditions: TWorkItemFilterCondition[]) => void;
+  handleFiltersUpdate: (key: keyof IIssueFilterOptions, value: string[], redirect?: boolean) => void;
 };
 
 export const ActiveCycleProgress: FC<ActiveCycleProgressProps> = observer((props) => {
   const { handleFiltersUpdate, cycle } = props;
   // plane hooks
   const { t } = useTranslation();
+  // store hooks
+  const { groupedProjectStates } = useProjectState();
   // derived values
   const progressIndicatorData = PROGRESS_STATE_GROUPS_DETAILS.map((group, index) => ({
     id: index,
@@ -66,7 +68,10 @@ export const ActiveCycleProgress: FC<ActiveCycleProgressProps> = observer((props
                   <div
                     className="flex items-center justify-between gap-2 text-sm cursor-pointer"
                     onClick={() => {
-                      handleFiltersUpdate([{ property: "state_group", operator: "in", value: [group] }]);
+                      if (groupedProjectStates) {
+                        const states = groupedProjectStates[group].map((state) => state.id);
+                        handleFiltersUpdate("state", states, true);
+                      }
                     }}
                   >
                     <div className="flex items-center gap-1.5">

apps/web/core/components/cycles/active-cycle/use-cycles-details.ts

@@ -1,15 +1,12 @@
 import { useCallback } from "react";
+import isEqual from "lodash/isEqual";
 import { useRouter } from "next/navigation";
 import useSWR from "swr";
-// plane imports
-import { TWorkItemFilterCondition } from "@plane/shared-state";
-import { EIssuesStoreType } from "@plane/types";
-// constants
+import { EIssueFilterType } from "@plane/constants";
+import { EIssuesStoreType, IIssueFilterOptions } from "@plane/types";
 import { CYCLE_ISSUES_WITH_PARAMS } from "@/constants/fetch-keys";
-// hooks
 import { useCycle } from "@/hooks/store/use-cycle";
 import { useIssues } from "@/hooks/store/use-issues";
-import { useWorkItemFilters } from "@/hooks/store/work-item-filters/use-work-item-filters";
 
 interface IActiveCycleDetails {
   workspaceSlug: string;
@@ -24,10 +21,9 @@ const useCyclesDetails = (props: IActiveCycleDetails) => {
   const router = useRouter();
   // store hooks
   const {
-    issuesFilter: { updateFilterExpression },
+    issuesFilter: { issueFilters, updateFilters },
     issues: { getActiveCycleById: getActiveCycleByIdFromIssue, fetchActiveCycleIssues },
   } = useIssues(EIssuesStoreType.CYCLE);
-  const { updateFilterExpressionFromConditions } = useWorkItemFilters();
 
   const { fetchActiveCycleProgress, getCycleById, fetchActiveCycleAnalytics } = useCycle();
   // derived values
@@ -66,19 +62,29 @@ const useCyclesDetails = (props: IActiveCycleDetails) => {
   const cycleIssueDetails = cycle?.id ? getActiveCycleByIdFromIssue(cycle?.id) : { nextPageResults: false };
 
   const handleFiltersUpdate = useCallback(
-    async (conditions: TWorkItemFilterCondition[]) => {
+    (key: keyof IIssueFilterOptions, value: string[], redirect?: boolean) => {
       if (!workspaceSlug || !projectId || !cycleId) return;
 
-      await updateFilterExpressionFromConditions(
-        EIssuesStoreType.CYCLE,
-        cycleId,
-        conditions,
-        updateFilterExpression.bind(updateFilterExpression, workspaceSlug, projectId, cycleId)
-      );
+      const newFilters: IIssueFilterOptions = {};
+      Object.keys(issueFilters?.filters ?? {}).forEach((key) => {
+        newFilters[key as keyof IIssueFilterOptions] = [];
+      });
 
-      router.push(`/${workspaceSlug}/projects/${projectId}/cycles/${cycleId}`);
+      let newValues: string[] = [];
+
+      if (isEqual(newValues, value)) newValues = [];
+      else newValues = value;
+
+      updateFilters(
+        workspaceSlug.toString(),
+        projectId.toString(),
+        EIssueFilterType.FILTERS,
+        { ...newFilters, [key]: newValues },
+        cycleId.toString()
+      );
+      if (redirect) router.push(`/${workspaceSlug}/projects/${projectId}/cycles/${cycleId}`);
     },
-    [workspaceSlug, projectId, cycleId, updateFilterExpressionFromConditions, updateFilterExpression, router]
+    [workspaceSlug, projectId, cycleId, issueFilters, updateFilters, router]
   );
   return {
     cycle,

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

@@ -1,19 +1,21 @@
 "use client";
 
-import { FC, useMemo } from "react";
+import { FC, useCallback, useMemo } from "react";
 import isEmpty from "lodash/isEmpty";
+import isEqual from "lodash/isEqual";
 import { observer } from "mobx-react";
 import { useSearchParams } from "next/navigation";
 import { ChevronUp, ChevronDown } from "lucide-react";
 import { Disclosure, Transition } from "@headlessui/react";
 // plane imports
+import { EIssueFilterType } from "@plane/constants";
 import { useTranslation } from "@plane/i18n";
-import { EIssuesStoreType, ICycle, TCyclePlotType, TProgressSnapshot } from "@plane/types";
+import { EIssuesStoreType, ICycle, IIssueFilterOptions, TCyclePlotType, TProgressSnapshot } from "@plane/types";
 import { getDate } from "@plane/utils";
 // hooks
 import { useCycle } from "@/hooks/store/use-cycle";
+import { useIssues } from "@/hooks/store/use-issues";
 // plane web components
-import { useWorkItemFilters } from "@/hooks/store/work-item-filters/use-work-item-filters";
 import { SidebarChartRoot } from "@/plane-web/components/cycles";
 // local imports
 import { CycleProgressStats } from "./progress-stats";
@@ -58,23 +60,23 @@ export const CycleAnalyticsProgress: FC<TCycleAnalyticsProgress> = observer((pro
   // router
   const searchParams = useSearchParams();
   const peekCycle = searchParams.get("peekCycle") || undefined;
-  // plane hooks
-  const { t } = useTranslation();
-  // store hooks
   const { getPlotTypeByCycleId, getEstimateTypeByCycleId, getCycleById } = useCycle();
-  const { getFilter, updateFilterValueFromSidebar } = useWorkItemFilters();
+  const {
+    issuesFilter: { issueFilters, updateFilters },
+  } = useIssues(EIssuesStoreType.CYCLE);
+  const { t } = useTranslation();
+
   // derived values
-  const cycleFilter = getFilter(EIssuesStoreType.CYCLE, cycleId);
-  const selectedAssignees = cycleFilter?.findFirstConditionByPropertyAndOperator("assignee_id", "in");
-  const selectedLabels = cycleFilter?.findFirstConditionByPropertyAndOperator("label_id", "in");
-  const selectedStateGroups = cycleFilter?.findFirstConditionByPropertyAndOperator("state_group", "in");
   const cycleDetails = validateCycleSnapshot(getCycleById(cycleId));
   const plotType: TCyclePlotType = getPlotTypeByCycleId(cycleId);
   const estimateType = getEstimateTypeByCycleId(cycleId);
+
   const totalIssues = cycleDetails?.total_issues || 0;
   const totalEstimatePoints = cycleDetails?.total_estimate_points || 0;
+
   const chartDistributionData =
     estimateType === "points" ? cycleDetails?.estimate_distribution : cycleDetails?.distribution || undefined;
+
   const groupedIssues = useMemo(
     () => ({
       backlog:
@@ -90,12 +92,44 @@ export const CycleAnalyticsProgress: FC<TCycleAnalyticsProgress> = observer((pro
     }),
     [estimateType, cycleDetails]
   );
+
   const cycleStartDate = getDate(cycleDetails?.start_date);
   const cycleEndDate = getDate(cycleDetails?.end_date);
   const isCycleStartDateValid = cycleStartDate && cycleStartDate <= new Date();
   const isCycleEndDateValid = cycleStartDate && cycleEndDate && cycleEndDate >= cycleStartDate;
   const isCycleDateValid = isCycleStartDateValid && isCycleEndDateValid;
 
+  const handleFiltersUpdate = useCallback(
+    (key: keyof IIssueFilterOptions, value: string | string[]) => {
+      if (!workspaceSlug || !projectId) return;
+
+      let newValues = issueFilters?.filters?.[key] ?? [];
+
+      if (Array.isArray(value)) {
+        if (key === "state") {
+          if (isEqual(newValues, value)) newValues = [];
+          else newValues = value;
+        } else {
+          value.forEach((val) => {
+            if (!newValues.includes(val)) newValues.push(val);
+            else newValues.splice(newValues.indexOf(val), 1);
+          });
+        }
+      } else {
+        if (issueFilters?.filters?.[key]?.includes(value)) newValues.splice(newValues.indexOf(value), 1);
+        else newValues.push(value);
+      }
+      updateFilters(
+        workspaceSlug.toString(),
+        projectId.toString(),
+        EIssueFilterType.FILTERS,
+        { [key]: newValues },
+        cycleId
+      );
+    },
+    [workspaceSlug, projectId, cycleId, issueFilters, updateFilters]
+  );
+
   if (!cycleDetails) return <></>;
   return (
     <div className="border-t border-custom-border-200 space-y-4 py-5">
@@ -125,6 +159,7 @@ export const CycleAnalyticsProgress: FC<TCycleAnalyticsProgress> = observer((pro
                 </div>
               </div>
             )}
+
             <Transition show={open}>
               <Disclosure.Panel className="flex flex-col divide-y divide-custom-border-200">
                 {cycleStartDate && cycleEndDate ? (
@@ -137,24 +172,16 @@ export const CycleAnalyticsProgress: FC<TCycleAnalyticsProgress> = observer((pro
                       <div className="w-full py-4">
                         <CycleProgressStats
                           cycleId={cycleId}
+                          plotType={plotType}
                           distribution={chartDistributionData}
                           groupedIssues={groupedIssues}
-                          handleFiltersUpdate={updateFilterValueFromSidebar.bind(
-                            updateFilterValueFromSidebar,
-                            EIssuesStoreType.CYCLE,
-                            cycleId
-                          )}
-                          isEditable={Boolean(!peekCycle) && cycleFilter !== undefined}
-                          noBackground={false}
-                          plotType={plotType}
-                          roundedTab={false}
-                          selectedFilters={{
-                            assignees: selectedAssignees,
-                            labels: selectedLabels,
-                            stateGroups: selectedStateGroups,
-                          }}
-                          size="xs"
                           totalIssuesCount={estimateType === "points" ? totalEstimatePoints || 0 : totalIssues || 0}
+                          isEditable={Boolean(!peekCycle)}
+                          size="xs"
+                          roundedTab={false}
+                          noBackground={false}
+                          filters={issueFilters}
+                          handleFiltersUpdate={handleFiltersUpdate}
                         />
                       </div>
                     )}

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

@@ -2,67 +2,280 @@
 
 import { FC } from "react";
 import { observer } from "mobx-react";
+import Image from "next/image";
 import { Tab } from "@headlessui/react";
 // plane imports
 import { useTranslation } from "@plane/i18n";
-import { TWorkItemFilterCondition } from "@plane/shared-state";
-import { TCycleDistribution, TCycleEstimateDistribution, TCyclePlotType } from "@plane/types";
-import { cn, toFilterArray } from "@plane/utils";
-// components
-import { AssigneeStatComponent, TAssigneeData } from "@/components/core/sidebar/progress-stats/assignee";
-import { LabelStatComponent, TLabelData } from "@/components/core/sidebar/progress-stats/label";
+import { StateGroupIcon } from "@plane/propel/icons";
 import {
-  createFilterUpdateHandler,
-  PROGRESS_STATS,
-  TSelectedFilterProgressStats,
-} from "@/components/core/sidebar/progress-stats/shared";
-import { StateGroupStatComponent, TStateGroupData } from "@/components/core/sidebar/progress-stats/state_group";
-// helpers
+  IIssueFilterOptions,
+  IIssueFilters,
+  TCycleDistribution,
+  TCycleEstimateDistribution,
+  TCyclePlotType,
+  TStateGroups,
+} from "@plane/types";
+import { Avatar } from "@plane/ui";
+import { cn, getFileURL } from "@plane/utils";
+// components
+import { SingleProgressStats } from "@/components/core/sidebar/single-progress-stats";
 // hooks
+import { useProjectState } from "@/hooks/store/use-project-state";
 import useLocalStorage from "@/hooks/use-local-storage";
+// public
+import emptyLabel from "@/public/empty-state/empty_label.svg";
+import emptyMembers from "@/public/empty-state/empty_members.svg";
+
+// assignee types
+type TAssigneeData = {
+  id: string | undefined;
+  title: string | undefined;
+  avatar_url: string | undefined;
+  completed: number;
+  total: number;
+}[];
+
+type TAssigneeStatComponent = {
+  distribution: TAssigneeData;
+  isEditable?: boolean;
+  filters?: IIssueFilters | undefined;
+  handleFiltersUpdate: (key: keyof IIssueFilterOptions, value: string | string[]) => void;
+};
+
+// labelTypes
+type TLabelData = {
+  id: string | undefined;
+  title: string | undefined;
+  color: string | undefined;
+  completed: number;
+  total: number;
+}[];
+
+type TLabelStatComponent = {
+  distribution: TLabelData;
+  isEditable?: boolean;
+  filters?: IIssueFilters | undefined;
+  handleFiltersUpdate: (key: keyof IIssueFilterOptions, value: string | string[]) => void;
+};
+
+// stateTypes
+type TStateData = {
+  state: string | undefined;
+  completed: number;
+  total: number;
+}[];
+
+type TStateStatComponent = {
+  distribution: TStateData;
+  totalIssuesCount: number;
+  isEditable?: boolean;
+  handleFiltersUpdate: (key: keyof IIssueFilterOptions, value: string | string[]) => void;
+};
+
+export const AssigneeStatComponent = observer((props: TAssigneeStatComponent) => {
+  const { distribution, isEditable, filters, handleFiltersUpdate } = props;
+  const { t } = useTranslation();
+  return (
+    <div>
+      {distribution && distribution.length > 0 ? (
+        distribution.map((assignee, index) => {
+          if (assignee?.id)
+            return (
+              <SingleProgressStats
+                key={assignee?.id}
+                title={
+                  <div className="flex items-center gap-2">
+                    <Avatar name={assignee?.title ?? undefined} src={getFileURL(assignee?.avatar_url ?? "")} />
+                    <span>{assignee?.title ?? ""}</span>
+                  </div>
+                }
+                completed={assignee?.completed ?? 0}
+                total={assignee?.total ?? 0}
+                {...(isEditable && {
+                  onClick: () => handleFiltersUpdate("assignees", assignee.id ?? ""),
+                  selected: filters?.filters?.assignees?.includes(assignee.id ?? ""),
+                })}
+              />
+            );
+          else
+            return (
+              <SingleProgressStats
+                key={`unassigned-${index}`}
+                title={
+                  <div className="flex items-center gap-2">
+                    <div className="h-4 w-4 rounded-full border-2 border-custom-border-200 bg-custom-background-80">
+                      <img src="/user.png" height="100%" width="100%" className="rounded-full" alt="User" />
+                    </div>
+                    <span>{t("no_assignee")}</span>
+                  </div>
+                }
+                completed={assignee?.completed ?? 0}
+                total={assignee?.total ?? 0}
+              />
+            );
+        })
+      ) : (
+        <div className="flex h-full flex-col items-center justify-center gap-2">
+          <div className="flex h-20 w-20 items-center justify-center rounded-full bg-custom-background-80">
+            <Image src={emptyMembers} className="h-12 w-12" alt="empty members" />
+          </div>
+          <h6 className="text-base text-custom-text-300">{t("no_assignee")}</h6>
+        </div>
+      )}
+    </div>
+  );
+});
+
+export const LabelStatComponent = observer((props: TLabelStatComponent) => {
+  const { distribution, isEditable, filters, handleFiltersUpdate } = props;
+  const { t } = useTranslation();
+  return (
+    <div>
+      {distribution && distribution.length > 0 ? (
+        distribution.map((label, index) => {
+          if (label.id) {
+            return (
+              <SingleProgressStats
+                key={label.id}
+                title={
+                  <div className="flex items-center gap-2 truncate">
+                    <span
+                      className="block h-3 w-3 rounded-full flex-shrink-0"
+                      style={{
+                        backgroundColor: label.color ?? "transparent",
+                      }}
+                    />
+                    <span className="text-xs text-ellipsis truncate">{label.title ?? t("no_labels_yet")}</span>
+                  </div>
+                }
+                completed={label.completed}
+                total={label.total}
+                {...(isEditable && {
+                  onClick: () => handleFiltersUpdate("labels", label.id ?? ""),
+                  selected: filters?.filters?.labels?.includes(label.id ?? `no-label-${index}`),
+                })}
+              />
+            );
+          } else {
+            return (
+              <SingleProgressStats
+                key={`no-label-${index}`}
+                title={
+                  <div className="flex items-center gap-2">
+                    <span
+                      className="block h-3 w-3 rounded-full"
+                      style={{
+                        backgroundColor: label.color ?? "transparent",
+                      }}
+                    />
+                    <span className="text-xs">{label.title ?? t("no_labels_yet")}</span>
+                  </div>
+                }
+                completed={label.completed}
+                total={label.total}
+              />
+            );
+          }
+        })
+      ) : (
+        <div className="flex h-full flex-col items-center justify-center gap-2">
+          <div className="flex h-20 w-20 items-center justify-center rounded-full bg-custom-background-80">
+            <Image src={emptyLabel} className="h-12 w-12" alt="empty label" />
+          </div>
+          <h6 className="text-base text-custom-text-300">{t("no_labels_yet")}</h6>
+        </div>
+      )}
+    </div>
+  );
+});
+
+export const StateStatComponent = observer((props: TStateStatComponent) => {
+  const { distribution, isEditable, totalIssuesCount, handleFiltersUpdate } = props;
+  // hooks
+  const { groupedProjectStates } = useProjectState();
+  // derived values
+  const getStateGroupState = (stateGroup: string) => {
+    const stateGroupStates = groupedProjectStates?.[stateGroup];
+    const stateGroupStatesId = stateGroupStates?.map((state) => state.id);
+    return stateGroupStatesId;
+  };
+
+  return (
+    <div>
+      {distribution.map((group, index) => (
+        <SingleProgressStats
+          key={index}
+          title={
+            <div className="flex items-center gap-2">
+              <StateGroupIcon stateGroup={group.state as TStateGroups} />
+              <span className="text-xs capitalize">{group.state}</span>
+            </div>
+          }
+          completed={group.completed}
+          total={totalIssuesCount}
+          {...(isEditable && {
+            onClick: () => group.state && handleFiltersUpdate("state", getStateGroupState(group.state) ?? []),
+          })}
+        />
+      ))}
+    </div>
+  );
+});
+
+const progressStats = [
+  {
+    key: "stat-states",
+    i18n_title: "common.states",
+  },
+  {
+    key: "stat-assignees",
+    i18n_title: "common.assignees",
+  },
+  {
+    key: "stat-labels",
+    i18n_title: "common.labels",
+  },
+];
 
 type TCycleProgressStats = {
   cycleId: string;
+  plotType: TCyclePlotType;
   distribution: TCycleDistribution | TCycleEstimateDistribution | undefined;
   groupedIssues: Record<string, number>;
-  handleFiltersUpdate: (condition: TWorkItemFilterCondition) => void;
-  isEditable?: boolean;
-  noBackground?: boolean;
-  plotType: TCyclePlotType;
-  roundedTab?: boolean;
-  selectedFilters: TSelectedFilterProgressStats;
-  size?: "xs" | "sm";
   totalIssuesCount: number;
+  isEditable?: boolean;
+  filters?: IIssueFilters | undefined;
+  handleFiltersUpdate: (key: keyof IIssueFilterOptions, value: string | string[]) => void;
+  size?: "xs" | "sm";
+  roundedTab?: boolean;
+  noBackground?: boolean;
 };
 
 export const CycleProgressStats: FC<TCycleProgressStats> = observer((props) => {
   const {
     cycleId,
+    plotType,
     distribution,
     groupedIssues,
-    handleFiltersUpdate,
-    isEditable = false,
-    noBackground = false,
-    plotType,
-    roundedTab = false,
-    selectedFilters,
-    size = "sm",
     totalIssuesCount,
+    isEditable = false,
+    filters,
+    handleFiltersUpdate,
+    size = "sm",
+    roundedTab = false,
+    noBackground = false,
   } = props;
-  // plane imports
-  const { t } = useTranslation();
-  // store imports
+  // hooks
   const { storedValue: currentTab, setValue: setCycleTab } = useLocalStorage(
     `cycle-analytics-tab-${cycleId}`,
     "stat-assignees"
   );
+  const { t } = useTranslation();
   // derived values
-  const currentTabIndex = (tab: string): number => PROGRESS_STATS.findIndex((stat) => stat.key === tab);
+  const currentTabIndex = (tab: string): number => progressStats.findIndex((stat) => stat.key === tab);
+
   const currentDistribution = distribution as TCycleDistribution;
   const currentEstimateDistribution = distribution as TCycleEstimateDistribution;
-  const selectedAssigneeIds = toFilterArray(selectedFilters?.assignees?.value || []) as string[];
-  const selectedLabelIds = toFilterArray(selectedFilters?.labels?.value || []) as string[];
-  const selectedStateGroups = toFilterArray(selectedFilters?.stateGroups?.value || []) as string[];
 
   const distributionAssigneeData: TAssigneeData =
     plotType === "burndown"
@@ -98,24 +311,12 @@ export const CycleProgressStats: FC<TCycleProgressStats> = observer((props) => {
           total: label.total_estimates,
         }));
 
-  const distributionStateData: TStateGroupData = Object.keys(groupedIssues || {}).map((state) => ({
+  const distributionStateData: TStateData = Object.keys(groupedIssues || {}).map((state) => ({
     state: state,
     completed: groupedIssues?.[state] || 0,
     total: totalIssuesCount || 0,
   }));
 
-  const handleAssigneeFiltersUpdate = createFilterUpdateHandler(
-    "assignee_id",
-    selectedAssigneeIds,
-    handleFiltersUpdate
-  );
-  const handleLabelFiltersUpdate = createFilterUpdateHandler("label_id", selectedLabelIds, handleFiltersUpdate);
-  const handleStateGroupFiltersUpdate = createFilterUpdateHandler(
-    "state_group",
-    selectedStateGroups,
-    handleFiltersUpdate
-  );
-
   return (
     <div>
       <Tab.Group defaultIndex={currentTabIndex(currentTab ? currentTab : "stat-assignees")}>
@@ -128,7 +329,7 @@ export const CycleProgressStats: FC<TCycleProgressStats> = observer((props) => {
             size === "xs" ? `text-xs` : `text-sm`
           )}
         >
-          {PROGRESS_STATS.map((stat) => (
+          {progressStats.map((stat) => (
             <Tab
               className={cn(
                 `p-1 w-full text-custom-text-100 outline-none focus:outline-none cursor-pointer transition-all`,
@@ -146,28 +347,27 @@ export const CycleProgressStats: FC<TCycleProgressStats> = observer((props) => {
         </Tab.List>
         <Tab.Panels className="py-3 text-custom-text-200">
           <Tab.Panel key={"stat-states"}>
-            <StateGroupStatComponent
+            <StateStatComponent
               distribution={distributionStateData}
-              handleStateGroupFiltersUpdate={handleStateGroupFiltersUpdate}
-              isEditable={isEditable}
-              selectedStateGroups={selectedStateGroups}
               totalIssuesCount={totalIssuesCount}
+              isEditable={isEditable}
+              handleFiltersUpdate={handleFiltersUpdate}
             />
           </Tab.Panel>
           <Tab.Panel key={"stat-assignees"}>
             <AssigneeStatComponent
               distribution={distributionAssigneeData}
-              handleAssigneeFiltersUpdate={handleAssigneeFiltersUpdate}
               isEditable={isEditable}
-              selectedAssigneeIds={selectedAssigneeIds}
+              filters={filters}
+              handleFiltersUpdate={handleFiltersUpdate}
             />
           </Tab.Panel>
           <Tab.Panel key={"stat-labels"}>
             <LabelStatComponent
               distribution={distributionLabelData}
-              handleLabelFiltersUpdate={handleLabelFiltersUpdate}
               isEditable={isEditable}
-              selectedLabelIds={selectedLabelIds}
+              filters={filters}
+              handleFiltersUpdate={handleFiltersUpdate}
             />
           </Tab.Panel>
         </Tab.Panels>

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

@@ -8,7 +8,7 @@ import { Check } from "lucide-react";
 import type { TCycleGroups } from "@plane/types";
 import { CircularProgressIndicator } from "@plane/ui";
 // components
-import { generateQueryParams, calculateCycleProgress } from "@plane/utils";
+import { generateQueryParams } from "@plane/utils";
 import { ListItem } from "@/components/core/list";
 // hooks
 import { useCycle } from "@/hooks/store/use-cycle";
@@ -50,6 +50,7 @@ export const CyclesListItem: FC<TCyclesListItem> = observer((props) => {
   // computed
   // TODO: change this logic once backend fix the response
   const cycleStatus = cycleDetails.status ? (cycleDetails.status.toLocaleLowerCase() as TCycleGroups) : "draft";
+  const isCompleted = cycleStatus === "completed";
   const isActive = cycleStatus === "current";
 
   // handlers
@@ -72,7 +73,20 @@ export const CyclesListItem: FC<TCyclesListItem> = observer((props) => {
 
   const handleItemClick = cycleDetails.archived_at ? handleArchivedCycleClick : undefined;
 
-  const progress = calculateCycleProgress(cycleDetails);
+  const getCycleProgress = () => {
+    let completionPercentage =
+      ((cycleDetails.completed_issues + cycleDetails.cancelled_issues) / cycleDetails.total_issues) * 100;
+
+    if (isCompleted && !isEmpty(cycleDetails.progress_snapshot)) {
+      completionPercentage =
+        ((cycleDetails.progress_snapshot.completed_issues + cycleDetails.progress_snapshot.cancelled_issues) /
+          cycleDetails.progress_snapshot.total_issues) *
+        100;
+    }
+    return isNaN(completionPercentage) ? 0 : Math.floor(completionPercentage);
+  };
+
+  const progress = getCycleProgress();
 
   return (
     <ListItem
@@ -82,10 +96,16 @@ export const CyclesListItem: FC<TCyclesListItem> = observer((props) => {
       className={className}
       prependTitleElement={
         <CircularProgressIndicator size={30} percentage={progress} strokeWidth={3}>
-          {progress === 100 ? (
+          {isCompleted ? (
+            progress === 100 ? (
+              <Check className="h-3 w-3 stroke-[2] text-custom-primary-100" />
+            ) : (
+              <span className="text-sm text-custom-primary-100">{`!`}</span>
+            )
+          ) : progress === 100 ? (
             <Check className="h-3 w-3 stroke-[2] text-custom-primary-100" />
           ) : (
-            <span className="text-[9px] text-custom-text-100">{`${progress}%`}</span>
+            <span className="text-[9px] text-custom-text-300">{`${progress}%`}</span>
           )}
         </CircularProgressIndicator>
       }

apps/web/core/components/cycles/modal.tsx

@@ -1,5 +1,7 @@
 "use client";
+
 import React, { useEffect, useState } from "react";
+import { format } from "date-fns";
 import { mutate } from "swr";
 // types
 import { CYCLE_TRACKER_EVENTS } from "@plane/constants";
@@ -7,7 +9,6 @@ import type { CycleDateCheckData, ICycle, TCycleTabOptions } from "@plane/types"
 // ui
 import { EModalPosition, EModalWidth, ModalCore, TOAST_TYPE, setToast } from "@plane/ui";
 // hooks
-import { renderFormattedPayloadDate } from "@plane/utils";
 import { captureError, captureSuccess } from "@/helpers/event-tracker.helper";
 import { useCycle } from "@/hooks/store/use-cycle";
 import { useProject } from "@/hooks/store/use-project";
@@ -128,31 +129,26 @@ export const CycleCreateUpdateModal: React.FC<CycleModalProps> = (props) => {
 
     const payload: Partial<ICycle> = {
       ...formData,
-      start_date: renderFormattedPayloadDate(formData.start_date) ?? null,
-      end_date: renderFormattedPayloadDate(formData.end_date) ?? null,
     };
 
     let isDateValid: boolean = true;
 
     if (payload.start_date && payload.end_date) {
-      if (data?.id) {
-        // Update existing cycle - always include cycle_id for validation
-        isDateValid = await dateChecker(projectId, {
-          start_date: payload.start_date,
-          end_date: payload.end_date,
+      if (data?.start_date && data?.end_date)
+        isDateValid = await dateChecker(payload.project_id ?? projectId, {
+          start_date: format(payload.start_date, "yyyy-MM-dd"),
+          end_date: format(payload.end_date, "yyyy-MM-dd"),
           cycle_id: data.id,
         });
-      } else {
-        // Create new cycle - no cycle_id needed
-        isDateValid = await dateChecker(projectId, {
+      else
+        isDateValid = await dateChecker(payload.project_id ?? projectId, {
           start_date: payload.start_date,
           end_date: payload.end_date,
         });
-      }
     }
 
     if (isDateValid) {
-      if (data?.id) await handleUpdateCycle(data.id, payload);
+      if (data) await handleUpdateCycle(data.id, payload);
       else {
         await handleCreateCycle(payload).then(() => {
           setCycleTab("all");

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

@@ -3,7 +3,6 @@
 import React, { useEffect, useRef, useState } from "react";
 import { Placement } from "@popperjs/core";
 import { observer } from "mobx-react";
-import { createPortal } from "react-dom";
 import { usePopper } from "react-popper";
 import { ArrowRight, CalendarCheck2, CalendarDays, X } from "lucide-react";
 import { Combobox } from "@headlessui/react";
@@ -60,8 +59,6 @@ type Props = {
   renderPlaceholder?: boolean;
   customTooltipContent?: React.ReactNode;
   customTooltipHeading?: string;
-  defaultOpen?: boolean;
-  renderInPortal?: boolean;
 };
 
 export const DateRangeDropdown: React.FC<Props> = observer((props) => {
@@ -96,11 +93,9 @@ export const DateRangeDropdown: React.FC<Props> = observer((props) => {
     renderPlaceholder = true,
     customTooltipContent,
     customTooltipHeading,
-    defaultOpen = false,
-    renderInPortal = false,
   } = props;
   // states
-  const [isOpen, setIsOpen] = useState(defaultOpen);
+  const [isOpen, setIsOpen] = useState(false);
   const [dateRange, setDateRange] = useState<DateRange>(value);
   // hooks
   const { data } = useUserProfile();
@@ -198,9 +193,7 @@ export const DateRangeDropdown: React.FC<Props> = observer((props) => {
               renderPlaceholder && (
                 <>
                   <span className="text-custom-text-400">{placeholder.from}</span>
-                  {placeholder.from && placeholder.to && (
-                    <ArrowRight className="h-3 w-3 flex-shrink-0 text-custom-text-400" />
-                  )}
+                  <ArrowRight className="h-3 w-3 flex-shrink-0 text-custom-text-400" />
                   <span className="text-custom-text-400">{placeholder.to}</span>
                 </>
               )
@@ -254,34 +247,6 @@ export const DateRangeDropdown: React.FC<Props> = observer((props) => {
     </button>
   );
 
-  const comboOptions = (
-    <Combobox.Options data-prevent-outside-click static>
-      <div
-        className="my-1 bg-custom-background-100 shadow-custom-shadow-rg border-[0.5px] border-custom-border-300 rounded-md overflow-hidden z-30"
-        ref={setPopperElement}
-        style={styles.popper}
-        {...attributes.popper}
-      >
-        <Calendar
-          className="rounded-md border border-custom-border-200 p-3"
-          captionLayout="dropdown"
-          selected={dateRange}
-          onSelect={(val: DateRange | undefined) => {
-            onSelect?.(val);
-          }}
-          mode="range"
-          disabled={disabledDays}
-          showOutsideDays
-          fixedWeeks
-          weekStartsOn={startOfWeek}
-          initialFocus
-        />
-      </div>
-    </Combobox.Options>
-  );
-
-  const Options = renderInPortal ? createPortal(comboOptions, document.body) : comboOptions;
-
   return (
     <ComboDropDown
       as="div"
@@ -297,7 +262,31 @@ export const DateRangeDropdown: React.FC<Props> = observer((props) => {
       disabled={disabled}
       renderByDefault={renderByDefault}
     >
-      {isOpen && Options}
+      {isOpen && (
+        <Combobox.Options className="fixed z-10" static>
+          <div
+            className="my-1 bg-custom-background-100 shadow-custom-shadow-rg border-[0.5px] border-custom-border-300 rounded-md overflow-hidden"
+            ref={setPopperElement}
+            style={styles.popper}
+            {...attributes.popper}
+          >
+            <Calendar
+              className="rounded-md border border-custom-border-200 p-3"
+              captionLayout="dropdown"
+              selected={dateRange}
+              onSelect={(val: DateRange | undefined) => {
+                onSelect?.(val);
+              }}
+              mode="range"
+              disabled={disabledDays}
+              showOutsideDays
+              fixedWeeks
+              weekStartsOn={startOfWeek}
+              initialFocus
+            />
+          </div>
+        </Combobox.Options>
+      )}
     </ComboDropDown>
   );
 });

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

@@ -1,5 +1,3 @@
-"use client";
-
 import React, { useRef, useState } from "react";
 import { observer } from "mobx-react";
 import { createPortal } from "react-dom";
@@ -23,7 +21,6 @@ import { TDropdownProps } from "./types";
 
 type Props = TDropdownProps & {
   clearIconClassName?: string;
-  defaultOpen?: boolean;
   optionsClassName?: string;
   icon?: React.ReactNode;
   isClearable?: boolean;
@@ -44,7 +41,6 @@ export const DateDropdown: React.FC<Props> = observer((props) => {
     buttonVariant,
     className = "",
     clearIconClassName = "",
-    defaultOpen = false,
     optionsClassName = "",
     closeOnSelect = true,
     disabled = false,
@@ -64,7 +60,7 @@ export const DateDropdown: React.FC<Props> = observer((props) => {
     renderByDefault = true,
   } = props;
   // states
-  const [isOpen, setIsOpen] = useState(defaultOpen);
+  const [isOpen, setIsOpen] = useState(false);
   // refs
   const dropdownRef = useRef<HTMLDivElement | null>(null);
   // hooks

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

@@ -14,9 +14,8 @@ import { useEditorConfig, useEditorMention } from "@/hooks/editor";
 import { useMember } from "@/hooks/store/use-member";
 // plane web hooks
 import { useEditorFlagging } from "@/plane-web/hooks/use-editor-flagging";
-// plane web service
+// plane web services
 import { WorkspaceService } from "@/plane-web/services";
-import { LiteToolbar } from "./lite-toolbar";
 const workspaceService = new WorkspaceService();
 
 type LiteTextEditorWrapperProps = MakeOptional<
@@ -32,10 +31,9 @@ type LiteTextEditorWrapperProps = MakeOptional<
   showSubmitButton?: boolean;
   isSubmitting?: boolean;
   showToolbarInitially?: boolean;
-  variant?: "full" | "lite" | "none";
+  showToolbar?: boolean;
   issue_id?: string;
   parentClassName?: string;
-  editorClassName?: string;
 } & (
     | {
         editable: false;
@@ -61,17 +59,14 @@ export const LiteTextEditor = React.forwardRef<EditorRefApi, LiteTextEditorWrapp
     showSubmitButton = true,
     isSubmitting = false,
     showToolbarInitially = true,
-    variant = "full",
+    showToolbar = true,
     parentClassName = "",
     placeholder = t("issue.comments.placeholder"),
     disabledExtensions: additionalDisabledExtensions = [],
-    editorClassName = "",
     ...rest
   } = props;
   // states
-  const isLiteVariant = variant === "lite";
-  const isFullVariant = variant === "full";
-  const [isFocused, setIsFocused] = useState(isFullVariant ? showToolbarInitially : true);
+  const [isFocused, setIsFocused] = useState(showToolbarInitially);
   // editor flaggings
   const { liteText: liteTextEditorExtensions } = useEditorFlagging({
     workspaceSlug: workspaceSlug?.toString() ?? "",
@@ -100,69 +95,43 @@ export const LiteTextEditor = React.forwardRef<EditorRefApi, LiteTextEditorWrapp
       className={cn(
         "relative border border-custom-border-200 rounded",
         {
-          "p-3": editable && !isLiteVariant,
+          "p-3": editable,
         },
         parentClassName
       )}
-      onFocus={() => isFullVariant && !showToolbarInitially && setIsFocused(true)}
-      onBlur={() => isFullVariant && !showToolbarInitially && setIsFocused(false)}
+      onFocus={() => !showToolbarInitially && setIsFocused(true)}
+      onBlur={() => !showToolbarInitially && setIsFocused(false)}
     >
-      {/* Wrapper for lite toolbar layout */}
-      <div className={cn(isLiteVariant && editable ? "flex items-end gap-1" : "")}>
-        {/* Main Editor - always rendered once */}
-        <div className={cn(isLiteVariant && editable ? "flex-1 min-w-0" : "")}>
-          <LiteTextEditorWithRef
-            ref={ref}
-            disabledExtensions={[...liteTextEditorExtensions.disabled, ...additionalDisabledExtensions]}
-            editable={editable}
-            flaggedExtensions={liteTextEditorExtensions.flagged}
-            fileHandler={getEditorFileHandlers({
-              projectId,
-              uploadFile: editable ? props.uploadFile : async () => "",
-              workspaceId,
-              workspaceSlug,
-            })}
-            mentionHandler={{
-              searchCallback: async (query) => {
-                const res = await fetchMentions(query);
-                if (!res) throw new Error("Failed in fetching mentions");
-                return res;
-              },
-              renderComponent: EditorMentionsRoot,
-              getMentionedEntityDetails: (id) => ({
-                display_name: getUserDetails(id)?.display_name ?? "",
-              }),
-            }}
-            placeholder={placeholder}
-            containerClassName={cn(containerClassName, "relative", {
-              "p-2": !editable,
-            })}
-            extendedEditorProps={{}}
-            editorClassName={editorClassName}
-            {...rest}
-          />
-        </div>
-
-        {/* Lite Toolbar - conditionally rendered */}
-        {isLiteVariant && editable && (
-          <LiteToolbar
-            executeCommand={(item) => {
-              // TODO: update this while toolbar homogenization
-              // @ts-expect-error type mismatch here
-              editorRef?.executeMenuItemCommand({
-                itemKey: item.itemKey,
-                ...item.extraProps,
-              });
-            }}
-            onSubmit={(e) => rest.onEnterKeyPress?.(e)}
-            isSubmitting={isSubmitting}
-            isEmpty={isEmpty}
-          />
-        )}
-      </div>
-
-      {/* Full Toolbar - conditionally rendered */}
-      {isFullVariant && editable && (
+      <LiteTextEditorWithRef
+        ref={ref}
+        disabledExtensions={[...liteTextEditorExtensions.disabled, ...additionalDisabledExtensions]}
+        editable={editable}
+        flaggedExtensions={liteTextEditorExtensions.flagged}
+        fileHandler={getEditorFileHandlers({
+          projectId,
+          uploadFile: editable ? props.uploadFile : async () => "",
+          workspaceId,
+          workspaceSlug,
+        })}
+        mentionHandler={{
+          searchCallback: async (query) => {
+            const res = await fetchMentions(query);
+            if (!res) throw new Error("Failed in fetching mentions");
+            return res;
+          },
+          renderComponent: EditorMentionsRoot,
+          getMentionedEntityDetails: (id) => ({
+            display_name: getUserDetails(id)?.display_name ?? "",
+          }),
+        }}
+        placeholder={placeholder}
+        containerClassName={cn(containerClassName, "relative", {
+          "p-2": !editable,
+        })}
+        extendedEditorProps={{}}
+        {...rest}
+      />
+      {showToolbar && editable && (
         <div
           className={cn(
             "transition-all duration-300 ease-out origin-top overflow-hidden",

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

@@ -1,33 +0,0 @@
-import React from "react";
-import { ArrowUp, Paperclip } from "lucide-react";
-// constants
-import { IMAGE_ITEM, ToolbarMenuItem } from "@/constants/editor";
-
-type LiteToolbarProps = {
-  onSubmit: (e: React.KeyboardEvent<HTMLDivElement> | React.MouseEvent<HTMLButtonElement>) => void;
-  isSubmitting: boolean;
-  isEmpty: boolean;
-  executeCommand: (item: ToolbarMenuItem) => void;
-};
-
-export const LiteToolbar = ({ onSubmit, isSubmitting, isEmpty, executeCommand }: LiteToolbarProps) => (
-  <div className="flex items-center gap-2 pb-1">
-    <button
-      onClick={() => executeCommand(IMAGE_ITEM)}
-      type="button"
-      className="p-1 text-custom-text-300 hover:text-custom-text-200 transition-colors"
-    >
-      <Paperclip className="size-3" />
-    </button>
-    <button
-      type="button"
-      onClick={(e) => onSubmit(e)}
-      disabled={isEmpty || isSubmitting}
-      className="p-1 bg-custom-primary-100 hover:bg-custom-primary-200 disabled:bg-custom-text-400 disabled:text-custom-text-200 text-custom-text-100 rounded transition-colors"
-    >
-      <ArrowUp className="size-3" />
-    </button>
-  </div>
-);
-
-export type { LiteToolbarProps };

apps/web/core/components/issues/archived-issues-header.tsx

@@ -1,17 +1,28 @@
 import { FC } from "react";
 import { observer } from "mobx-react";
 import { useParams } from "next/navigation";
-// plane imports
+// plane constants
 import { EIssueFilterType, ISSUE_DISPLAY_FILTERS_BY_PAGE } from "@plane/constants";
+// i18n
 import { useTranslation } from "@plane/i18n";
-import { EIssuesStoreType, IIssueDisplayFilterOptions, IIssueDisplayProperties } from "@plane/types";
-import { EHeaderVariant, Header } from "@plane/ui";
+// types
+import {
+  EIssuesStoreType,
+  IIssueDisplayFilterOptions,
+  IIssueDisplayProperties,
+  IIssueFilterOptions,
+} from "@plane/types";
 // components
+import { isIssueFilterActive } from "@plane/utils";
 import { ArchiveTabsList } from "@/components/archives";
-import { DisplayFiltersSelection, FiltersDropdown } from "@/components/issues/issue-layouts/filters";
+import { DisplayFiltersSelection, FilterSelection, FiltersDropdown } from "@/components/issues/issue-layouts/filters";
+// helpers
 // hooks
 import { useIssues } from "@/hooks/store/use-issues";
+import { useLabel } from "@/hooks/store/use-label";
+import { useMember } from "@/hooks/store/use-member";
 import { useProject } from "@/hooks/store/use-project";
+import { useProjectState } from "@/hooks/store/use-project-state";
 
 export const ArchivedIssuesHeader: FC = observer(() => {
   // router
@@ -21,10 +32,34 @@ export const ArchivedIssuesHeader: FC = observer(() => {
   const {
     issuesFilter: { issueFilters, updateFilters },
   } = useIssues(EIssuesStoreType.ARCHIVED);
+  const { projectStates } = useProjectState();
+  const { projectLabels } = useLabel();
+  const {
+    project: { projectMemberIds },
+  } = useMember();
   // i18n
   const { t } = useTranslation();
   // for archived issues list layout is the only option
   const activeLayout = "list";
+  // hooks
+  const handleFiltersUpdate = (key: keyof IIssueFilterOptions, value: string | string[]) => {
+    if (!workspaceSlug || !projectId) return;
+
+    const newValues = issueFilters?.filters?.[key] ?? [];
+
+    if (Array.isArray(value)) {
+      value.forEach((val) => {
+        if (!newValues.includes(val)) newValues.push(val);
+      });
+    } else {
+      if (issueFilters?.filters?.[key]?.includes(value)) newValues.splice(newValues.indexOf(value), 1);
+      else newValues.push(value);
+    }
+
+    updateFilters(workspaceSlug.toString(), projectId.toString(), EIssueFilterType.FILTERS, {
+      [key]: newValues,
+    });
+  };
 
   const handleDisplayFiltersUpdate = (updatedDisplayFilter: Partial<IIssueDisplayFilterOptions>) => {
     if (!workspaceSlug || !projectId) return;
@@ -42,25 +77,42 @@ export const ArchivedIssuesHeader: FC = observer(() => {
   };
 
   return (
-    <Header variant={EHeaderVariant.SECONDARY}>
-      <Header.LeftItem>
+    <div className="group relative flex border-b border-custom-border-200">
+      <div className="flex w-full items-center overflow-x-auto px-4 gap-2 horizontal-scrollbar scrollbar-sm">
         <ArchiveTabsList />
-      </Header.LeftItem>
-      <Header.RightItem className="items-center">
+      </div>
+      {/* filter options */}
+      <div className="flex items-center gap-2 px-8">
+        <FiltersDropdown
+          title={t("common.filters")}
+          placement="bottom-end"
+          isFiltersApplied={isIssueFilterActive(issueFilters)}
+        >
+          <FilterSelection
+            filters={issueFilters?.filters || {}}
+            handleFiltersUpdate={handleFiltersUpdate}
+            displayFilters={issueFilters?.displayFilters ?? {}}
+            handleDisplayFiltersUpdate={handleDisplayFiltersUpdate}
+            layoutDisplayFiltersOptions={
+              activeLayout ? ISSUE_DISPLAY_FILTERS_BY_PAGE.archived_issues[activeLayout] : undefined
+            }
+            labels={projectLabels}
+            memberIds={projectMemberIds ?? undefined}
+            states={projectStates}
+          />
+        </FiltersDropdown>
         <FiltersDropdown title={t("common.display")} placement="bottom-end">
           <DisplayFiltersSelection
             displayFilters={issueFilters?.displayFilters || {}}
             displayProperties={issueFilters?.displayProperties || {}}
             handleDisplayFiltersUpdate={handleDisplayFiltersUpdate}
             handleDisplayPropertiesUpdate={handleDisplayPropertiesUpdate}
-            layoutDisplayFiltersOptions={
-              activeLayout ? ISSUE_DISPLAY_FILTERS_BY_PAGE.archived_issues.layoutOptions[activeLayout] : undefined
-            }
+            layoutDisplayFiltersOptions={activeLayout ? ISSUE_DISPLAY_FILTERS_BY_PAGE.issues[activeLayout] : undefined}
             cycleViewDisabled={!currentProjectDetails?.cycle_view}
             moduleViewDisabled={!currentProjectDetails?.module_view}
           />
         </FiltersDropdown>
-      </Header.RightItem>
-    </Header>
+      </div>
+    </div>
   );
 });

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

@@ -2,21 +2,35 @@
 
 import { useCallback, useState } from "react";
 import { observer } from "mobx-react";
-import { ChartNoAxesColumn, SlidersHorizontal } from "lucide-react";
-// plane imports
+import { ChartNoAxesColumn, ListFilter, SlidersHorizontal } from "lucide-react";
+// plane constants
 import { EIssueFilterType, ISSUE_STORE_TO_FILTERS_MAP } from "@plane/constants";
+// i18n
 import { useTranslation } from "@plane/i18n";
-import { EIssueLayoutTypes, EIssuesStoreType, IIssueDisplayFilterOptions, IIssueDisplayProperties } from "@plane/types";
+// types
+import {
+  EIssuesStoreType,
+  IIssueDisplayFilterOptions,
+  IIssueDisplayProperties,
+  IIssueFilterOptions,
+  EIssueLayoutTypes,
+} from "@plane/types";
 import { Button } from "@plane/ui";
+// components
+import { isIssueFilterActive } from "@plane/utils";
+// helpers
 // hooks
 import { useIssues } from "@/hooks/store/use-issues";
-// plane web imports
+import { useLabel } from "@/hooks/store/use-label";
+import { useMember } from "@/hooks/store/use-member";
+import { useProjectState } from "@/hooks/store/use-project-state";
+// plane web types
 import { TProject } from "@/plane-web/types";
-// local imports
 import { WorkItemsModal } from "../analytics/work-items/modal";
 import {
   DisplayFiltersSelection,
   FiltersDropdown,
+  FilterSelection,
   LayoutSelection,
   MobileLayoutSelection,
 } from "./issue-layouts/filters";
@@ -49,13 +63,38 @@ export const HeaderFilters = observer((props: Props) => {
   // states
   const [analyticsModal, setAnalyticsModal] = useState(false);
   // store hooks
+  const {
+    project: { projectMemberIds },
+  } = useMember();
   const {
     issuesFilter: { issueFilters, updateFilters },
   } = useIssues(storeType);
+  const { projectStates } = useProjectState();
+  const { projectLabels } = useLabel();
   // derived values
   const activeLayout = issueFilters?.displayFilters?.layout;
-  const layoutDisplayFiltersOptions = ISSUE_STORE_TO_FILTERS_MAP[storeType]?.layoutOptions[activeLayout];
+  const layoutDisplayFiltersOptions = ISSUE_STORE_TO_FILTERS_MAP[storeType]?.[activeLayout];
 
+  const handleFiltersUpdate = useCallback(
+    (key: keyof IIssueFilterOptions, value: string | string[]) => {
+      if (!workspaceSlug || !projectId) return;
+      const newValues = issueFilters?.filters?.[key] ?? [];
+
+      if (Array.isArray(value)) {
+        // this validation is majorly for the filter start_date, target_date custom
+        value.forEach((val) => {
+          if (!newValues.includes(val)) newValues.push(val);
+          else newValues.splice(newValues.indexOf(val), 1);
+        });
+      } else {
+        if (issueFilters?.filters?.[key]?.includes(value)) newValues.splice(newValues.indexOf(value), 1);
+        else newValues.push(value);
+      }
+
+      updateFilters(workspaceSlug, projectId, EIssueFilterType.FILTERS, { [key]: newValues });
+    },
+    [workspaceSlug, projectId, issueFilters, updateFilters]
+  );
   const handleLayoutChange = useCallback(
     (layout: EIssueLayoutTypes) => {
       if (!workspaceSlug || !projectId) return;
@@ -102,6 +141,27 @@ export const HeaderFilters = observer((props: Props) => {
           activeLayout={activeLayout}
         />
       </div>
+      <FiltersDropdown
+        title={t("common.filters")}
+        placement="bottom-end"
+        isFiltersApplied={isIssueFilterActive(issueFilters)}
+        miniIcon={<ListFilter className="size-3.5" />}
+      >
+        <FilterSelection
+          filters={issueFilters?.filters ?? {}}
+          handleFiltersUpdate={handleFiltersUpdate}
+          displayFilters={issueFilters?.displayFilters ?? {}}
+          handleDisplayFiltersUpdate={handleDisplayFilters}
+          layoutDisplayFiltersOptions={layoutDisplayFiltersOptions}
+          labels={projectLabels}
+          memberIds={projectMemberIds ?? undefined}
+          projectId={projectId}
+          states={projectStates}
+          cycleViewDisabled={!currentProjectDetails?.cycle_view}
+          moduleViewDisabled={!currentProjectDetails?.module_view}
+          isEpic={storeType === EIssuesStoreType.EPIC}
+        />
+      </FiltersDropdown>
       <FiltersDropdown
         miniIcon={<SlidersHorizontal className="size-3.5" />}
         title={t("common.display")}

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

@@ -135,7 +135,7 @@ export const RelationsCollapsibleContent: FC<Props> = observer((props) => {
             <Collapsible
               buttonClassName="w-full"
               title={
-                <div className={`flex items-center gap-1 px-2.5 py-1 h-9  w-full ${relation.className}`}>
+                <div className={`flex items-center gap-1 px-3 py-1 h-9  w-full pl-9 ${relation.className}`}>
                   <span>{relation.icon ? relation.icon(14) : null}</span>
                   <span className="text-sm font-medium leading-5">{relation.label}</span>
                 </div>

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

@@ -122,7 +122,7 @@ export const SubIssuesCollapsibleContent: FC<Props> = observer((props) => {
           parentIssueId={parentIssueId}
           rootIssueId={parentIssueId}
           spacingLeft={6}
-          canEdit={!disabled}
+          disabled={!disabled}
           handleIssueCrudState={handleIssueCrudState}
           subIssueOperations={subIssueOperations}
           issueServiceType={issueServiceType}

apps/web/core/components/issues/issue-detail-widgets/sub-issues/display-filters.tsx

@@ -13,6 +13,7 @@ import {
   FiltersDropdown,
 } from "@/components/issues/issue-layouts/filters";
 import { isDisplayFiltersApplied } from "@/components/issues/issue-layouts/utils";
+
 type TSubIssueDisplayFiltersProps = {
   displayProperties: IIssueDisplayProperties;
   displayFilters: IIssueDisplayFilterOptions;

apps/web/core/components/issues/issue-detail-widgets/sub-issues/filters.tsx

@@ -2,7 +2,7 @@ import { FC, useMemo, useState } from "react";
 import { observer } from "mobx-react";
 import { ListFilter, Search, X } from "lucide-react";
 import { useTranslation } from "@plane/i18n";
-import { IIssueFilterOptions, IState } from "@plane/types";
+import { IIssueFilterOptions, ILayoutDisplayFiltersOptions, IState } from "@plane/types";
 import { cn } from "@plane/utils";
 import {
   FilterAssignees,
@@ -16,24 +16,26 @@ import {
 } from "@/components/issues/issue-layouts/filters";
 import { isFiltersApplied } from "@/components/issues/issue-layouts/utils";
 import { FilterIssueTypes } from "@/plane-web/components/issues/filters/issue-types";
+
 type TSubIssueFiltersProps = {
   handleFiltersUpdate: (key: keyof IIssueFilterOptions, value: string | string[]) => void;
   filters: IIssueFilterOptions;
   memberIds: string[] | undefined;
   states?: IState[];
-  availableFilters: (keyof IIssueFilterOptions)[];
+  layoutDisplayFiltersOptions: ILayoutDisplayFiltersOptions | undefined;
 };
 
 export const SubIssueFilters: FC<TSubIssueFiltersProps> = observer((props) => {
-  const { handleFiltersUpdate, filters, memberIds, states, availableFilters } = props;
-  // plane hooks
-  const { t } = useTranslation();
+  const { handleFiltersUpdate, filters, memberIds, states, layoutDisplayFiltersOptions } = props;
+
   // states
   const [filtersSearchQuery, setFiltersSearchQuery] = useState("");
 
-  const isFilterEnabled = (filter: keyof IIssueFilterOptions) => !!availableFilters.includes(filter);
-
+  const isFilterEnabled = (filter: keyof IIssueFilterOptions) =>
+    !!layoutDisplayFiltersOptions?.filters.includes(filter);
   const isFilterApplied = useMemo(() => isFiltersApplied(filters), [filters]);
+  // hooks
+  const { t } = useTranslation();
 
   return (
     <>

apps/web/core/components/issues/issue-detail-widgets/sub-issues/index.ts

@@ -3,4 +3,3 @@ export * from "./title";
 export * from "./root";
 export * from "./quick-action-button";
 export * from "./display-filters";
-export * from "./content";

apps/web/core/components/issues/issue-detail-widgets/sub-issues/issues-list/list-group.tsx

@@ -13,7 +13,7 @@ interface TSubIssuesListGroupProps {
   workspaceSlug: string;
   group: IGroupByColumn;
   serviceType: TIssueServiceType;
-  canEdit: boolean;
+  disabled: boolean;
   parentIssueId: string;
   rootIssueId: string;
   handleIssueCrudState: (
@@ -30,7 +30,7 @@ export const SubIssuesListGroup: FC<TSubIssuesListGroupProps> = observer((props)
   const {
     group,
     serviceType,
-    canEdit,
+    disabled,
     parentIssueId,
     rootIssueId,
     projectId,
@@ -73,22 +73,25 @@ export const SubIssuesListGroup: FC<TSubIssuesListGroupProps> = observer((props)
         }
         buttonClassName={cn("hidden", !isAllIssues && "block")}
       >
-        {workItemIds?.map((workItemId) => (
-          <SubIssuesListItem
-            key={workItemId}
-            workspaceSlug={workspaceSlug}
-            projectId={projectId}
-            parentIssueId={parentIssueId}
-            rootIssueId={rootIssueId}
-            issueId={workItemId}
-            canEdit={canEdit}
-            handleIssueCrudState={handleIssueCrudState}
-            subIssueOperations={subIssueOperations}
-            issueServiceType={serviceType}
-            spacingLeft={spacingLeft}
-            storeType={storeType}
-          />
-        ))}
+        {/* Work items list */}
+        <div className="pl-2">
+          {workItemIds?.map((workItemId) => (
+            <SubIssuesListItem
+              key={workItemId}
+              workspaceSlug={workspaceSlug}
+              projectId={projectId}
+              parentIssueId={parentIssueId}
+              rootIssueId={rootIssueId}
+              issueId={workItemId}
+              disabled={disabled}
+              handleIssueCrudState={handleIssueCrudState}
+              subIssueOperations={subIssueOperations}
+              issueServiceType={serviceType}
+              spacingLeft={spacingLeft}
+              storeType={storeType}
+            />
+          ))}
+        </div>
       </Collapsible>
     </>
   );

apps/web/core/components/issues/issue-detail-widgets/sub-issues/issues-list/list-item.tsx

@@ -28,7 +28,7 @@ type Props = {
   parentIssueId: string;
   rootIssueId: string;
   spacingLeft: number;
-  canEdit: boolean;
+  disabled: boolean;
   handleIssueCrudState: (
     key: "create" | "existing" | "update" | "delete",
     issueId: string,
@@ -48,7 +48,7 @@ export const SubIssuesListItem: React.FC<Props> = observer((props) => {
     rootIssueId,
     issueId,
     spacingLeft = 10,
-    canEdit,
+    disabled,
     handleIssueCrudState,
     subIssueOperations,
     issueServiceType = EIssueServiceType.ISSUES,
@@ -107,7 +107,7 @@ export const SubIssuesListItem: React.FC<Props> = observer((props) => {
       >
         {issue && (
           <div
-            className="group relative flex min-h-11 h-full w-full items-center pr-2 py-1 transition-all hover:bg-custom-background-90"
+            className="group relative flex min-h-11 h-full w-full items-center gap-3 pr-2 py-1 transition-all hover:bg-custom-background-90"
             style={{ paddingLeft: `${spacingLeft}px` }}
           >
             <div className="flex size-5 items-center justify-center flex-shrink-0">
@@ -174,7 +174,7 @@ export const SubIssuesListItem: React.FC<Props> = observer((props) => {
                 workspaceSlug={workspaceSlug}
                 parentIssueId={parentIssueId}
                 issueId={issueId}
-                canEdit={canEdit}
+                disabled={disabled}
                 updateSubIssue={subIssueOperations.updateSubIssue}
                 displayProperties={displayProperties}
                 issue={issue}
@@ -183,7 +183,7 @@ export const SubIssuesListItem: React.FC<Props> = observer((props) => {
 
             <div className="flex-shrink-0 text-sm">
               <CustomMenu placement="bottom-end" ellipsis>
-                {canEdit && (
+                {disabled && (
                   <CustomMenu.MenuItem
                     onClick={(e) => {
                       e.preventDefault();
@@ -212,7 +212,7 @@ export const SubIssuesListItem: React.FC<Props> = observer((props) => {
                   </div>
                 </CustomMenu.MenuItem>
 
-                {canEdit && (
+                {disabled && (
                   <CustomMenu.MenuItem
                     onClick={(e) => {
                       e.stopPropagation();
@@ -230,7 +230,7 @@ export const SubIssuesListItem: React.FC<Props> = observer((props) => {
                   </CustomMenu.MenuItem>
                 )}
 
-                {canEdit && (
+                {disabled && (
                   <CustomMenu.MenuItem
                     onClick={(e) => {
                       e.stopPropagation();
@@ -263,7 +263,7 @@ export const SubIssuesListItem: React.FC<Props> = observer((props) => {
             parentIssueId={issue.id}
             rootIssueId={rootIssueId}
             spacingLeft={spacingLeft + 22}
-            canEdit={canEdit}
+            disabled={disabled}
             handleIssueCrudState={handleIssueCrudState}
             subIssueOperations={subIssueOperations}
           />

apps/web/core/components/issues/issue-detail-widgets/sub-issues/issues-list/properties.tsx

@@ -19,7 +19,7 @@ type Props = {
   workspaceSlug: string;
   parentIssueId: string;
   issueId: string;
-  canEdit: boolean;
+  disabled: boolean;
   updateSubIssue: (
     workspaceSlug: string,
     projectId: string,
@@ -33,7 +33,7 @@ type Props = {
 };
 
 export const SubIssuesListItemProperties: React.FC<Props> = observer((props) => {
-  const { workspaceSlug, parentIssueId, issueId, canEdit, updateSubIssue, displayProperties, issue } = props;
+  const { workspaceSlug, parentIssueId, issueId, disabled, updateSubIssue, displayProperties, issue } = props;
   const { t } = useTranslation();
   const { getStateById } = useProjectState();
 
@@ -94,7 +94,7 @@ export const SubIssuesListItemProperties: React.FC<Props> = observer((props) =>
                 { ...issue }
               )
             }
-            disabled={!canEdit}
+            disabled={!disabled}
             buttonVariant="transparent-without-text"
             buttonClassName="hover:bg-transparent px-0"
             iconSize="size-5"
@@ -113,7 +113,7 @@ export const SubIssuesListItemProperties: React.FC<Props> = observer((props) =>
                 priority: val,
               })
             }
-            disabled={!canEdit}
+            disabled={!disabled}
             buttonVariant="border-without-text"
             buttonClassName="border"
             showTooltip
@@ -144,7 +144,7 @@ export const SubIssuesListItemProperties: React.FC<Props> = observer((props) =>
             mergeDates
             buttonVariant={issue.start_date || issue.target_date ? "border-with-text" : "border-without-text"}
             buttonClassName={shouldHighlight ? "text-red-500" : ""}
-            disabled={!canEdit}
+            disabled={!disabled}
             showTooltip
             customTooltipHeading="Date Range"
             renderPlaceholder={false}
@@ -167,7 +167,7 @@ export const SubIssuesListItemProperties: React.FC<Props> = observer((props) =>
             icon={<CalendarClock className="h-3 w-3 flex-shrink-0" />}
             buttonVariant={issue.start_date ? "border-with-text" : "border-without-text"}
             optionsClassName="z-30"
-            disabled={!canEdit}
+            disabled={!disabled}
             showTooltip
           />
         </div>
@@ -190,7 +190,7 @@ export const SubIssuesListItemProperties: React.FC<Props> = observer((props) =>
             buttonClassName={shouldHighlight ? "text-red-500" : ""}
             clearIconClassName="text-custom-text-100"
             optionsClassName="z-30"
-            disabled={!canEdit}
+            disabled={!disabled}
             showTooltip
           />
         </div>
@@ -207,7 +207,7 @@ export const SubIssuesListItemProperties: React.FC<Props> = observer((props) =>
                 assignee_ids: val,
               })
             }
-            disabled={!canEdit}
+            disabled={!disabled}
             multiple
             buttonVariant={(issue?.assignee_ids || []).length > 0 ? "transparent-without-text" : "border-without-text"}
             buttonClassName={(issue?.assignee_ids || []).length > 0 ? "hover:bg-transparent px-0" : ""}