feat: allowing cycles to accept back dates till created date

admin/app/authentication/github/form.tsx

@@ -98,7 +98,11 @@ export const InstanceGithubConfigForm: FC<Props> = (props) => {
       key: "GITHUB_ORGANIZATION_ID",
       type: "text",
       label: "Organization ID",
-      description: <>The organization github ID.</>,
+      description: (
+        <>
+          The organization github ID.
+        </>
+      ),
       placeholder: "123456789",
       error: Boolean(errors.GITHUB_ORGANIZATION_ID),
       required: false,

admin/app/globals.css

@@ -1,4 +1,5 @@
-@import "@plane/propel/styles/fonts";
+@import url("https://fonts.googleapis.com/css2?family=Inter:wght@200;300;400;500;600;700;800&display=swap");
+@import url("https://fonts.googleapis.com/css2?family=Material+Symbols+Rounded:opsz,wght,FILL,GRAD@48,400,0,0&display=swap");
 
 @tailwind base;
 @tailwind components;
@@ -59,31 +60,23 @@
     --color-border-300: 212, 212, 212; /* strong border- 1 */
     --color-border-400: 185, 185, 185; /* strong border- 2 */
 
-    --color-shadow-2xs:
-      0px 0px 1px 0px rgba(23, 23, 23, 0.06), 0px 1px 2px 0px rgba(23, 23, 23, 0.06),
+    --color-shadow-2xs: 0px 0px 1px 0px rgba(23, 23, 23, 0.06), 0px 1px 2px 0px rgba(23, 23, 23, 0.06),
       0px 1px 2px 0px rgba(23, 23, 23, 0.14);
-    --color-shadow-xs:
-      0px 1px 2px 0px rgba(0, 0, 0, 0.16), 0px 2px 4px 0px rgba(16, 24, 40, 0.12),
+    --color-shadow-xs: 0px 1px 2px 0px rgba(0, 0, 0, 0.16), 0px 2px 4px 0px rgba(16, 24, 40, 0.12),
       0px 1px 8px -1px rgba(16, 24, 40, 0.1);
-    --color-shadow-sm:
-      0px 1px 4px 0px rgba(0, 0, 0, 0.01), 0px 4px 8px 0px rgba(0, 0, 0, 0.02), 0px 1px 12px 0px rgba(0, 0, 0, 0.12);
-    --color-shadow-rg:
-      0px 3px 6px 0px rgba(0, 0, 0, 0.1), 0px 4px 4px 0px rgba(16, 24, 40, 0.08),
+    --color-shadow-sm: 0px 1px 4px 0px rgba(0, 0, 0, 0.01), 0px 4px 8px 0px rgba(0, 0, 0, 0.02),
+      0px 1px 12px 0px rgba(0, 0, 0, 0.12);
+    --color-shadow-rg: 0px 3px 6px 0px rgba(0, 0, 0, 0.1), 0px 4px 4px 0px rgba(16, 24, 40, 0.08),
       0px 1px 12px 0px rgba(16, 24, 40, 0.04);
-    --color-shadow-md:
-      0px 4px 8px 0px rgba(0, 0, 0, 0.12), 0px 6px 12px 0px rgba(16, 24, 40, 0.12),
+    --color-shadow-md: 0px 4px 8px 0px rgba(0, 0, 0, 0.12), 0px 6px 12px 0px rgba(16, 24, 40, 0.12),
       0px 1px 16px 0px rgba(16, 24, 40, 0.12);
-    --color-shadow-lg:
-      0px 6px 12px 0px rgba(0, 0, 0, 0.12), 0px 8px 16px 0px rgba(0, 0, 0, 0.12),
+    --color-shadow-lg: 0px 6px 12px 0px rgba(0, 0, 0, 0.12), 0px 8px 16px 0px rgba(0, 0, 0, 0.12),
       0px 1px 24px 0px rgba(16, 24, 40, 0.12);
-    --color-shadow-xl:
-      0px 0px 18px 0px rgba(0, 0, 0, 0.16), 0px 0px 24px 0px rgba(16, 24, 40, 0.16),
+    --color-shadow-xl: 0px 0px 18px 0px rgba(0, 0, 0, 0.16), 0px 0px 24px 0px rgba(16, 24, 40, 0.16),
       0px 0px 52px 0px rgba(16, 24, 40, 0.16);
-    --color-shadow-2xl:
-      0px 8px 16px 0px rgba(0, 0, 0, 0.12), 0px 12px 24px 0px rgba(16, 24, 40, 0.12),
+    --color-shadow-2xl: 0px 8px 16px 0px rgba(0, 0, 0, 0.12), 0px 12px 24px 0px rgba(16, 24, 40, 0.12),
       0px 1px 32px 0px rgba(16, 24, 40, 0.12);
-    --color-shadow-3xl:
-      0px 12px 24px 0px rgba(0, 0, 0, 0.12), 0px 16px 32px 0px rgba(0, 0, 0, 0.12),
+    --color-shadow-3xl: 0px 12px 24px 0px rgba(0, 0, 0, 0.12), 0px 16px 32px 0px rgba(0, 0, 0, 0.12),
       0px 1px 48px 0px rgba(16, 24, 40, 0.12);
     --color-shadow-4xl: 0px 8px 40px 0px rgba(0, 0, 61, 0.05), 0px 12px 32px -16px rgba(0, 0, 0, 0.05);
 

admin/app/layout.tsx

@@ -3,16 +3,18 @@
 import { ReactNode } from "react";
 import { ThemeProvider, useTheme } from "next-themes";
 import { SWRConfig } from "swr";
-// plane imports
+// ui
 import { ADMIN_BASE_PATH, DEFAULT_SWR_CONFIG } from "@plane/constants";
 import { Toast } from "@plane/ui";
 import { resolveGeneralTheme } from "@plane/utils";
+// constants
+// helpers
 // lib
 import { InstanceProvider } from "@/lib/instance-provider";
 import { StoreProvider } from "@/lib/store-provider";
 import { UserProvider } from "@/lib/user-provider";
 // styles
-import "@/styles/globals.css";
+import "./globals.css";
 
 const ToastWithTheme = () => {
   const { resolvedTheme } = useTheme();

admin/core/components/admin-sidebar/sidebar-dropdown.tsx

@@ -7,7 +7,7 @@ import { LogOut, UserCog2, Palette } from "lucide-react";
 import { Menu, Transition } from "@headlessui/react";
 // plane internal packages
 import { API_BASE_URL } from "@plane/constants";
-import { AuthService } from "@plane/services";
+import  {AuthService } from "@plane/services";
 import { Avatar } from "@plane/ui";
 import { getFileURL, cn } from "@plane/utils";
 // hooks

admin/core/store/instance.store.ts

@@ -2,7 +2,7 @@ import set from "lodash/set";
 import { observable, action, computed, makeObservable, runInAction } from "mobx";
 // plane internal packages
 import { EInstanceStatus, TInstanceStatus } from "@plane/constants";
-import { InstanceService } from "@plane/services";
+import {InstanceService} from "@plane/services";
 import {
   IInstance,
   IInstanceAdmin,

admin/ee/components/authentication/authentication-modes.tsx

@@ -1 +1 @@
-export * from "ce/components/authentication/authentication-modes";
+export * from "ce/components/authentication/authentication-modes";

admin/package.json

@@ -10,7 +10,6 @@
     "build": "next build",
     "preview": "next build && next start",
     "start": "next start",
-    "format": "prettier --write .",
     "lint": "eslint . --ext .ts,.tsx",
     "lint:errors": "eslint . --ext .ts,.tsx --quiet"
   },
@@ -18,7 +17,6 @@
     "@headlessui/react": "^1.7.19",
     "@plane/constants": "*",
     "@plane/hooks": "*",
-    "@plane/propel": "*",
     "@plane/services": "*",
     "@plane/types": "*",
     "@plane/ui": "*",

admin/postcss.config.js

@@ -1,2 +1,8 @@
-// eslint-disable-next-line @typescript-eslint/no-require-imports
-module.exports = require("@plane/tailwind-config/postcss.config.js");
+module.exports = {
+  plugins: {
+    "postcss-import": {},
+    "tailwindcss/nesting": {},
+    tailwindcss: {},
+    autoprefixer: {},
+  },
+};

admin/tsconfig.json

@@ -1,19 +1,13 @@
 {
   "extends": "@plane/typescript-config/nextjs.json",
   "compilerOptions": {
-    "plugins": [
-      {
-        "name": "next"
-      }
-    ],
+    "plugins": [{ "name": "next" }],
     "baseUrl": ".",
     "paths": {
       "@/*": ["core/*"],
       "@/public/*": ["public/*"],
-      "@/plane-admin/*": ["ce/*"],
-      "@/styles/*": ["styles/*"]
-    },
-    "strictNullChecks": true
+      "@/plane-admin/*": ["ce/*"]
+    }
   },
   "include": ["next-env.d.ts", "next.config.js", "**/*.ts", "**/*.tsx", ".next/types/**/*.ts"],
   "exclude": ["node_modules"]

apiserver/plane/api/serializers/__init__.py

@@ -15,4 +15,4 @@ from .state import StateLiteSerializer, StateSerializer
 from .cycle import CycleSerializer, CycleIssueSerializer, CycleLiteSerializer
 from .module import ModuleSerializer, ModuleIssueSerializer, ModuleLiteSerializer
 from .intake import IntakeIssueSerializer
-from .estimate import EstimatePointSerializer
+from .estimate import EstimatePointSerializer

apiserver/plane/api/serializers/issue.py

@@ -160,15 +160,12 @@ class IssueSerializer(BaseSerializer):
         else:
             try:
                 # Then assign it to default assignee, if it is a valid assignee
-                if (
-                    default_assignee_id is not None
-                    and ProjectMember.objects.filter(
-                        member_id=default_assignee_id,
-                        project_id=project_id,
-                        role__gte=15,
-                        is_active=True,
-                    ).exists()
-                ):
+                if default_assignee_id is not None and ProjectMember.objects.filter(
+                    member_id=default_assignee_id,
+                    project_id=project_id,
+                    role__gte=15,
+                    is_active=True
+                ).exists():
                     IssueAssignee.objects.create(
                         assignee_id=default_assignee_id,
                         issue=issue,

apiserver/plane/app/serializers/favorite.py

@@ -53,7 +53,6 @@ def get_entity_model_and_serializer(entity_type):
     }
     return entity_map.get(entity_type, (None, None))
 
-
 class UserFavoriteSerializer(serializers.ModelSerializer):
     entity_data = serializers.SerializerMethodField()
 

apiserver/plane/app/serializers/user.py

@@ -3,18 +3,11 @@ from rest_framework import serializers
 
 # Module import
 from plane.db.models import Account, Profile, User, Workspace, WorkspaceMemberInvite
-from plane.utils.url import clean_value
+
 from .base import BaseSerializer
 
 
 class UserSerializer(BaseSerializer):
-
-    def validate_first_name(self, value):
-        return clean_value(value)
-
-    def validate_last_name(self, value):
-        return clean_value(value)
-
     class Meta:
         model = User
         # Exclude password field from the serializer

apiserver/plane/app/serializers/workspace.py

@@ -1,11 +1,7 @@
-# Django imports
-from django.core.validators import URLValidator
-from django.core.exceptions import ValidationError
-from django.template.defaultfilters import slugify
-
-
 # Third party imports
 from rest_framework import serializers
+from rest_framework import status
+from rest_framework.response import Response
 
 # Module imports
 from .base import BaseSerializer, DynamicBaseSerializer
@@ -29,7 +25,10 @@ from plane.db.models import (
     WorkspaceUserPreference,
 )
 from plane.utils.constants import RESTRICTED_WORKSPACE_SLUGS
-from plane.utils.url import clean_value
+
+# Django imports
+from django.core.validators import URLValidator
+from django.core.exceptions import ValidationError
 
 
 class WorkSpaceSerializer(DynamicBaseSerializer):
@@ -41,30 +40,7 @@ class WorkSpaceSerializer(DynamicBaseSerializer):
         # Check if the slug is restricted
         if value in RESTRICTED_WORKSPACE_SLUGS:
             raise serializers.ValidationError("Slug is not valid")
-
-        # Clean the slug
-        slug = clean_value(value)
-
-        # If the slug is empty, return an error
-        if not slug:
-            raise serializers.ValidationError("Slug cannot be empty")
-
-        # Slugify the slug
-        slug = slugify(slug)
-
-        # Return the slug
-        return slug
-
-    def validate_name(self, value):
-        # Clean the name
-        name = clean_value(value)
-
-        # If the name is empty, return an error
-        if not name:
-            raise serializers.ValidationError("Name cannot be empty")
-
-        # Return the name
-        return name
+        return value
 
     class Meta:
         model = Workspace
@@ -172,6 +148,7 @@ class WorkspaceUserLinkSerializer(BaseSerializer):
 
         return value
 
+
     def create(self, validated_data):
         # Filtering the WorkspaceUserLink with the given url to check if the link already exists.
 
@@ -180,7 +157,7 @@ class WorkspaceUserLinkSerializer(BaseSerializer):
         workspace_user_link = WorkspaceUserLink.objects.filter(
             url=url,
             workspace_id=validated_data.get("workspace_id"),
-            owner_id=validated_data.get("owner_id"),
+            owner_id=validated_data.get("owner_id")
         )
 
         if workspace_user_link.exists():
@@ -196,8 +173,10 @@ class WorkspaceUserLinkSerializer(BaseSerializer):
         url = validated_data.get("url")
 
         workspace_user_link = WorkspaceUserLink.objects.filter(
-            url=url, workspace_id=instance.workspace_id, owner=instance.owner
-        )
+                url=url,
+                workspace_id=instance.workspace_id,
+                owner=instance.owner
+            )
 
         if workspace_user_link.exclude(pk=instance.id).exists():
             raise serializers.ValidationError(
@@ -206,7 +185,6 @@ class WorkspaceUserLinkSerializer(BaseSerializer):
 
         return super().update(instance, validated_data)
 
-
 class IssueRecentVisitSerializer(serializers.ModelSerializer):
     project_identifier = serializers.SerializerMethodField()
 

apiserver/plane/app/urls/analytic.py

@@ -6,9 +6,6 @@ from plane.app.views import (
     AnalyticViewViewset,
     SavedAnalyticEndpoint,
     ExportAnalyticsEndpoint,
-    AdvanceAnalyticsEndpoint,
-    AdvanceAnalyticsStatsEndpoint,
-    AdvanceAnalyticsChartEndpoint,
     DefaultAnalyticsEndpoint,
     ProjectStatsEndpoint,
 )
@@ -52,19 +49,4 @@ urlpatterns = [
         ProjectStatsEndpoint.as_view(),
         name="project-analytics",
     ),
-    path(
-        "workspaces/<str:slug>/advance-analytics/",
-        AdvanceAnalyticsEndpoint.as_view(),
-        name="advance-analytics",
-    ),
-    path(
-        "workspaces/<str:slug>/advance-analytics-stats/",
-        AdvanceAnalyticsStatsEndpoint.as_view(),
-        name="advance-analytics-stats",
-    ),
-    path(
-        "workspaces/<str:slug>/advance-analytics-charts/",
-        AdvanceAnalyticsChartEndpoint.as_view(),
-        name="advance-analytics-chart",
-    ),
 ]

apiserver/plane/app/views/__init__.py

@@ -199,12 +199,6 @@ from .analytic.base import (
     ProjectStatsEndpoint,
 )
 
-from .analytic.advance import (
-    AdvanceAnalyticsEndpoint,
-    AdvanceAnalyticsStatsEndpoint,
-    AdvanceAnalyticsChartEndpoint,
-)
-
 from .notification.base import (
     NotificationViewSet,
     UnreadNotificationEndpoint,

apiserver/plane/app/views/analytic/advance.py

@@ -1,570 +0,0 @@
-from rest_framework.response import Response
-from rest_framework import status
-from typing import Dict, List, Any
-from django.db.models import QuerySet, Q, Count
-from django.http import HttpRequest
-from django.db.models.functions import TruncMonth
-from django.utils import timezone
-from datetime import timedelta
-from plane.app.views.base import BaseAPIView
-from plane.app.permissions import ROLE, allow_permission
-from plane.db.models import (
-    WorkspaceMember,
-    Project,
-    Issue,
-    Cycle,
-    Module,
-    IssueView,
-    ProjectPage,
-    Workspace,
-    CycleIssue,
-    ModuleIssue,
-)
-from django.db import models
-from django.db.models import F, Case, When, Value
-from django.db.models.functions import Concat
-from plane.utils.build_chart import build_analytics_chart
-from plane.utils.date_utils import (
-    get_analytics_filters,
-)
-
-
-class AdvanceAnalyticsBaseView(BaseAPIView):
-    def initialize_workspace(self, slug: str, type: str) -> None:
-        self._workspace_slug = slug
-        self.filters = get_analytics_filters(
-            slug=slug,
-            type=type,
-            user=self.request.user,
-            date_filter=self.request.GET.get("date_filter", None),
-            project_ids=self.request.GET.get("project_ids", None),
-        )
-
-
-class AdvanceAnalyticsEndpoint(AdvanceAnalyticsBaseView):
-    def get_filtered_counts(self, queryset: QuerySet) -> Dict[str, int]:
-        def get_filtered_count() -> int:
-            if self.filters["analytics_date_range"]:
-                return queryset.filter(
-                    created_at__gte=self.filters["analytics_date_range"]["current"][
-                        "gte"
-                    ],
-                    created_at__lte=self.filters["analytics_date_range"]["current"][
-                        "lte"
-                    ],
-                ).count()
-            return queryset.count()
-
-        def get_previous_count() -> int:
-            if self.filters["analytics_date_range"] and self.filters[
-                "analytics_date_range"
-            ].get("previous"):
-                return queryset.filter(
-                    created_at__gte=self.filters["analytics_date_range"]["previous"][
-                        "gte"
-                    ],
-                    created_at__lte=self.filters["analytics_date_range"]["previous"][
-                        "lte"
-                    ],
-                ).count()
-            return 0
-
-        return {
-            "count": get_filtered_count(),
-            # "filter_count": get_previous_count(),
-        }
-
-    def get_overview_data(self) -> Dict[str, Dict[str, int]]:
-        return {
-            "total_users": self.get_filtered_counts(
-                WorkspaceMember.objects.filter(
-                    workspace__slug=self._workspace_slug, is_active=True
-                )
-            ),
-            "total_admins": self.get_filtered_counts(
-                WorkspaceMember.objects.filter(
-                    workspace__slug=self._workspace_slug,
-                    role=ROLE.ADMIN.value,
-                    is_active=True,
-                )
-            ),
-            "total_members": self.get_filtered_counts(
-                WorkspaceMember.objects.filter(
-                    workspace__slug=self._workspace_slug,
-                    role=ROLE.MEMBER.value,
-                    is_active=True,
-                )
-            ),
-            "total_guests": self.get_filtered_counts(
-                WorkspaceMember.objects.filter(
-                    workspace__slug=self._workspace_slug,
-                    role=ROLE.GUEST.value,
-                    is_active=True,
-                )
-            ),
-            "total_projects": self.get_filtered_counts(
-                Project.objects.filter(**self.filters["project_filters"])
-            ),
-            "total_work_items": self.get_filtered_counts(
-                Issue.issue_objects.filter(**self.filters["base_filters"])
-            ),
-            "total_cycles": self.get_filtered_counts(
-                Cycle.objects.filter(**self.filters["base_filters"])
-            ),
-            "total_intake": self.get_filtered_counts(
-                Issue.objects.filter(**self.filters["base_filters"]).filter(
-                    issue_intake__isnull=False
-                )
-            ),
-        }
-
-    def get_work_items_stats(
-        self, cycle_id=None, module_id=None
-    ) -> Dict[str, Dict[str, int]]:
-        """
-        Returns work item stats for the workspace, or filtered by cycle_id or module_id if provided.
-        """
-        base_queryset = None
-        if cycle_id is not None:
-            cycle_issues = CycleIssue.objects.filter(
-                **self.filters["base_filters"], cycle_id=cycle_id
-            ).values_list("issue_id", flat=True)
-            base_queryset = Issue.issue_objects.filter(id__in=cycle_issues)
-        elif module_id is not None:
-            module_issues = ModuleIssue.objects.filter(
-                **self.filters["base_filters"], module_id=module_id
-            ).values_list("issue_id", flat=True)
-            base_queryset = Issue.issue_objects.filter(id__in=module_issues)
-        else:
-            base_queryset = Issue.issue_objects.filter(**self.filters["base_filters"])
-
-        return {
-            "total_work_items": self.get_filtered_counts(base_queryset),
-            "started_work_items": self.get_filtered_counts(
-                base_queryset.filter(state__group="started")
-            ),
-            "backlog_work_items": self.get_filtered_counts(
-                base_queryset.filter(state__group="backlog")
-            ),
-            "un_started_work_items": self.get_filtered_counts(
-                base_queryset.filter(state__group="unstarted")
-            ),
-            "completed_work_items": self.get_filtered_counts(
-                base_queryset.filter(state__group="completed")
-            ),
-        }
-
-    @allow_permission([ROLE.ADMIN, ROLE.MEMBER], level="WORKSPACE")
-    def get(self, request: HttpRequest, slug: str) -> Response:
-        self.initialize_workspace(slug, type="analytics")
-        tab = request.GET.get("tab", "overview")
-
-        if tab == "overview":
-            return Response(
-                self.get_overview_data(),
-                status=status.HTTP_200_OK,
-            )
-        elif tab == "work-items":
-            # Optionally accept cycle_id or module_id as query params
-            cycle_id = request.GET.get("cycle_id", None)
-            module_id = request.GET.get("module_id", None)
-            return Response(
-                self.get_work_items_stats(cycle_id=cycle_id, module_id=module_id),
-                status=status.HTTP_200_OK,
-            )
-        return Response({"message": "Invalid tab"}, status=status.HTTP_400_BAD_REQUEST)
-
-
-class AdvanceAnalyticsStatsEndpoint(AdvanceAnalyticsBaseView):
-    def get_project_issues_stats(self) -> QuerySet:
-        # Get the base queryset with workspace and project filters
-        base_queryset = Issue.issue_objects.filter(**self.filters["base_filters"])
-
-        # Apply date range filter if available
-        if self.filters["chart_period_range"]:
-            start_date, end_date = self.filters["chart_period_range"]
-            base_queryset = base_queryset.filter(
-                created_at__date__gte=start_date, created_at__date__lte=end_date
-            )
-
-        return (
-            base_queryset.values("project_id", "project__name")
-            .annotate(
-                cancelled_work_items=Count("id", filter=Q(state__group="cancelled")),
-                completed_work_items=Count("id", filter=Q(state__group="completed")),
-                backlog_work_items=Count("id", filter=Q(state__group="backlog")),
-                un_started_work_items=Count("id", filter=Q(state__group="unstarted")),
-                started_work_items=Count("id", filter=Q(state__group="started")),
-            )
-            .order_by("project_id")
-        )
-
-    def get_work_items_stats(
-        self, cycle_id=None, module_id=None, peek_view=False
-    ) -> Dict[str, Dict[str, int]]:
-        base_queryset = None
-        if cycle_id is not None:
-            cycle_issues = CycleIssue.objects.filter(
-                **self.filters["base_filters"], cycle_id=cycle_id
-            ).values_list("issue_id", flat=True)
-            base_queryset = Issue.issue_objects.filter(id__in=cycle_issues)
-        elif module_id is not None:
-            module_issues = ModuleIssue.objects.filter(
-                **self.filters["base_filters"], module_id=module_id
-            ).values_list("issue_id", flat=True)
-            base_queryset = Issue.issue_objects.filter(id__in=module_issues)
-        elif peek_view:
-            base_queryset = Issue.issue_objects.filter(**self.filters["base_filters"])
-        else:
-            base_queryset = Issue.issue_objects.filter(**self.filters["base_filters"])
-            return (
-                base_queryset.values("project_id", "project__name")
-                .annotate(
-                    cancelled_work_items=Count(
-                        "id", filter=Q(state__group="cancelled")
-                    ),
-                    completed_work_items=Count(
-                        "id", filter=Q(state__group="completed")
-                    ),
-                    backlog_work_items=Count("id", filter=Q(state__group="backlog")),
-                    un_started_work_items=Count(
-                        "id", filter=Q(state__group="unstarted")
-                    ),
-                    started_work_items=Count("id", filter=Q(state__group="started")),
-                )
-                .order_by("project_id")
-            )
-
-        return (
-            base_queryset.annotate(display_name=F("assignees__display_name"))
-            .annotate(assignee_id=F("assignees__id"))
-            .annotate(avatar=F("assignees__avatar"))
-            .annotate(
-                avatar_url=Case(
-                    # If `avatar_asset` exists, use it to generate the asset URL
-                    When(
-                        assignees__avatar_asset__isnull=False,
-                        then=Concat(
-                            Value("/api/assets/v2/static/"),
-                            "assignees__avatar_asset",  # Assuming avatar_asset has an id or relevant field
-                            Value("/"),
-                        ),
-                    ),
-                    # If `avatar_asset` is None, fall back to using `avatar` field directly
-                    When(
-                        assignees__avatar_asset__isnull=True, then="assignees__avatar"
-                    ),
-                    default=Value(None),
-                    output_field=models.CharField(),
-                )
-            )
-            .values("display_name", "assignee_id", "avatar_url")
-            .annotate(
-                cancelled_work_items=Count(
-                    "id", filter=Q(state__group="cancelled"), distinct=True
-                ),
-                completed_work_items=Count(
-                    "id", filter=Q(state__group="completed"), distinct=True
-                ),
-                backlog_work_items=Count(
-                    "id", filter=Q(state__group="backlog"), distinct=True
-                ),
-                un_started_work_items=Count(
-                    "id", filter=Q(state__group="unstarted"), distinct=True
-                ),
-                started_work_items=Count(
-                    "id", filter=Q(state__group="started"), distinct=True
-                ),
-            )
-            .order_by("display_name")
-        )
-
-    @allow_permission([ROLE.ADMIN, ROLE.MEMBER], level="WORKSPACE")
-    def get(self, request: HttpRequest, slug: str) -> Response:
-        self.initialize_workspace(slug, type="chart")
-        type = request.GET.get("type", "work-items")
-
-        if type == "work-items":
-            # Optionally accept cycle_id or module_id as query params
-            cycle_id = request.GET.get("cycle_id", None)
-            module_id = request.GET.get("module_id", None)
-            peek_view = request.GET.get("peek_view", False)
-            return Response(
-                self.get_work_items_stats(
-                    cycle_id=cycle_id, module_id=module_id, peek_view=peek_view
-                ),
-                status=status.HTTP_200_OK,
-            )
-
-        return Response({"message": "Invalid type"}, status=status.HTTP_400_BAD_REQUEST)
-
-
-class AdvanceAnalyticsChartEndpoint(AdvanceAnalyticsBaseView):
-    def project_chart(self) -> List[Dict[str, Any]]:
-        # Get the base queryset with workspace and project filters
-        base_queryset = Issue.issue_objects.filter(**self.filters["base_filters"])
-        date_filter = {}
-
-        # Apply date range filter if available
-        if self.filters["chart_period_range"]:
-            start_date, end_date = self.filters["chart_period_range"]
-            date_filter = {
-                "created_at__date__gte": start_date,
-                "created_at__date__lte": end_date,
-            }
-
-        total_work_items = base_queryset.filter(**date_filter).count()
-        total_cycles = Cycle.objects.filter(
-            **self.filters["base_filters"], **date_filter
-        ).count()
-        total_modules = Module.objects.filter(
-            **self.filters["base_filters"], **date_filter
-        ).count()
-        total_intake = Issue.objects.filter(
-            issue_intake__isnull=False, **self.filters["base_filters"], **date_filter
-        ).count()
-        total_members = WorkspaceMember.objects.filter(
-            workspace__slug=self._workspace_slug, is_active=True, **date_filter
-        ).count()
-        total_pages = ProjectPage.objects.filter(
-            **self.filters["base_filters"], **date_filter
-        ).count()
-        total_views = IssueView.objects.filter(
-            **self.filters["base_filters"], **date_filter
-        ).count()
-
-        data = {
-            "work_items": total_work_items,
-            "cycles": total_cycles,
-            "modules": total_modules,
-            "intake": total_intake,
-            "members": total_members,
-            "pages": total_pages,
-            "views": total_views,
-        }
-
-        return [
-            {
-                "key": key,
-                "name": key.replace("_", " ").title(),
-                "count": value or 0,
-            }
-            for key, value in data.items()
-        ]
-
-    def work_item_completion_chart(
-        self, cycle_id=None, module_id=None, peek_view=False
-    ) -> Dict[str, Any]:
-        # Get the base queryset
-        queryset = (
-            Issue.issue_objects.filter(**self.filters["base_filters"])
-            .select_related("workspace", "state", "parent")
-            .prefetch_related(
-                "assignees", "labels", "issue_module__module", "issue_cycle__cycle"
-            )
-        )
-
-        if cycle_id is not None and peek_view:
-            cycle_issues = CycleIssue.objects.filter(
-                **self.filters["base_filters"], cycle_id=cycle_id
-            ).values_list("issue_id", flat=True)
-            cycle = Cycle.objects.filter(id=cycle_id).first()
-            if cycle and cycle.start_date:
-                start_date = cycle.start_date.date()
-                end_date = cycle.end_date.date()
-            else:
-                return {"data": [], "schema": {}}
-            queryset = cycle_issues
-        elif module_id is not None and peek_view:
-            module_issues = ModuleIssue.objects.filter(
-                **self.filters["base_filters"], module_id=module_id
-            ).values_list("issue_id", flat=True)
-            module = Module.objects.filter(id=module_id).first()
-            if module and module.start_date:
-                start_date = module.start_date
-                end_date = module.target_date
-            else:
-                return {"data": [], "schema": {}}
-            queryset = module_issues
-        elif peek_view:
-            project_ids_str = self.request.GET.get("project_ids")
-            if project_ids_str:
-                project_id_list = [
-                    pid.strip() for pid in project_ids_str.split(",") if pid.strip()
-                ]
-            else:
-                project_id_list = []
-                return {"data": [], "schema": {}}
-            project_id = project_id_list[0]
-            project = Project.objects.filter(id=project_id).first()
-            if project.created_at:
-                start_date = project.created_at.date().replace(day=1)
-            else:
-                return {"data": [], "schema": {}}
-        else:
-            workspace = Workspace.objects.get(slug=self._workspace_slug)
-            start_date = workspace.created_at.date().replace(day=1)
-
-        if cycle_id or module_id:
-            # Get daily stats with optimized query
-            daily_stats = (
-                queryset.values("created_at__date")
-                .annotate(
-                    created_count=Count("id"),
-                    completed_count=Count(
-                        "id", filter=Q(issue__state__group="completed")
-                    ),
-                )
-                .order_by("created_at__date")
-            )
-
-            # Create a dictionary of existing stats with summed counts
-            stats_dict = {
-                stat["created_at__date"].strftime("%Y-%m-%d"): {
-                    "created_count": stat["created_count"],
-                    "completed_count": stat["completed_count"],
-                }
-                for stat in daily_stats
-            }
-
-            # Generate data for all days in the range
-            data = []
-            current_date = start_date
-            while current_date <= end_date:
-                date_str = current_date.strftime("%Y-%m-%d")
-                stats = stats_dict.get(
-                    date_str, {"created_count": 0, "completed_count": 0}
-                )
-                data.append(
-                    {
-                        "key": date_str,
-                        "name": date_str,
-                        "count": stats["created_count"] + stats["completed_count"],
-                        "completed_issues": stats["completed_count"],
-                        "created_issues": stats["created_count"],
-                    }
-                )
-                current_date += timedelta(days=1)
-        else:
-            # Apply date range filter if available
-            if self.filters["chart_period_range"]:
-                start_date, end_date = self.filters["chart_period_range"]
-                queryset = queryset.filter(
-                    created_at__date__gte=start_date, created_at__date__lte=end_date
-                )
-
-            # Annotate by month and count
-            monthly_stats = (
-                queryset.annotate(month=TruncMonth("created_at"))
-                .values("month")
-                .annotate(
-                    created_count=Count("id"),
-                    completed_count=Count("id", filter=Q(state__group="completed")),
-                )
-                .order_by("month")
-            )
-
-            # Create dictionary of month -> counts
-            stats_dict = {
-                stat["month"].strftime("%Y-%m-%d"): {
-                    "created_count": stat["created_count"],
-                    "completed_count": stat["completed_count"],
-                }
-                for stat in monthly_stats
-            }
-
-            # Generate monthly data (ensure months with 0 count are included)
-            data = []
-            # include the current date at the end
-            end_date = timezone.now().date()
-            last_month = end_date.replace(day=1)
-            current_month = start_date
-
-            while current_month <= last_month:
-                date_str = current_month.strftime("%Y-%m-%d")
-                stats = stats_dict.get(
-                    date_str, {"created_count": 0, "completed_count": 0}
-                )
-                data.append(
-                    {
-                        "key": date_str,
-                        "name": date_str,
-                        "count": stats["created_count"],
-                        "completed_issues": stats["completed_count"],
-                        "created_issues": stats["created_count"],
-                    }
-                )
-                # Move to next month
-                if current_month.month == 12:
-                    current_month = current_month.replace(
-                        year=current_month.year + 1, month=1
-                    )
-                else:
-                    current_month = current_month.replace(month=current_month.month + 1)
-
-        schema = {
-            "completed_issues": "completed_issues",
-            "created_issues": "created_issues",
-        }
-
-        return {"data": data, "schema": schema}
-
-    @allow_permission([ROLE.ADMIN, ROLE.MEMBER], level="WORKSPACE")
-    def get(self, request: HttpRequest, slug: str) -> Response:
-        self.initialize_workspace(slug, type="chart")
-        type = request.GET.get("type", "projects")
-        group_by = request.GET.get("group_by", None)
-        x_axis = request.GET.get("x_axis", "PRIORITY")
-        cycle_id = request.GET.get("cycle_id", None)
-        module_id = request.GET.get("module_id", None)
-
-        if type == "projects":
-            return Response(self.project_chart(), status=status.HTTP_200_OK)
-
-        elif type == "custom-work-items":
-            queryset = (
-                Issue.issue_objects.filter(**self.filters["base_filters"])
-                .select_related("workspace", "state", "parent")
-                .prefetch_related(
-                    "assignees", "labels", "issue_module__module", "issue_cycle__cycle"
-                )
-            )
-
-            # Apply cycle/module filters if present
-            if cycle_id is not None:
-                cycle_issues = CycleIssue.objects.filter(
-                    **self.filters["base_filters"], cycle_id=cycle_id
-                ).values_list("issue_id", flat=True)
-                queryset = queryset.filter(id__in=cycle_issues)
-
-            elif module_id is not None:
-                module_issues = ModuleIssue.objects.filter(
-                    **self.filters["base_filters"], module_id=module_id
-                ).values_list("issue_id", flat=True)
-                queryset = queryset.filter(id__in=module_issues)
-
-            # Apply date range filter if available
-            if self.filters["chart_period_range"]:
-                start_date, end_date = self.filters["chart_period_range"]
-                queryset = queryset.filter(
-                    created_at__date__gte=start_date, created_at__date__lte=end_date
-                )
-
-            return Response(
-                build_analytics_chart(queryset, x_axis, group_by),
-                status=status.HTTP_200_OK,
-            )
-
-        elif type == "work-items":
-            # Optionally accept cycle_id or module_id as query params
-            cycle_id = request.GET.get("cycle_id", None)
-            module_id = request.GET.get("module_id", None)
-            peek_view = request.GET.get("peek_view", False)
-            return Response(
-                self.work_item_completion_chart(
-                    cycle_id=cycle_id, module_id=module_id, peek_view=peek_view
-                ),
-                status=status.HTTP_200_OK,
-            )
-
-        return Response({"message": "Invalid type"}, status=status.HTTP_400_BAD_REQUEST)

apiserver/plane/app/views/cycle/base.py

@@ -234,6 +234,7 @@ class CycleViewSet(BaseViewSet):
                 "status",
                 "version",
                 "created_by",
+                "created_at",
             )
             datetime_fields = ["start_date", "end_date"]
             data = user_timezone_converter(data, datetime_fields, project_timezone)
@@ -267,6 +268,7 @@ class CycleViewSet(BaseViewSet):
             "status",
             "version",
             "created_by",
+            "created_at",
         )
         datetime_fields = ["start_date", "end_date"]
         data = user_timezone_converter(data, datetime_fields, project_timezone)
@@ -314,6 +316,7 @@ class CycleViewSet(BaseViewSet):
                         "assignee_ids",
                         "status",
                         "created_by",
+                        "created_at",
                     )
                     .first()
                 )
@@ -476,6 +479,7 @@ class CycleViewSet(BaseViewSet):
                 "assignee_ids",
                 "status",
                 "created_by",
+                "created_at",
             )
             .first()
         )
@@ -1119,13 +1123,14 @@ class CycleUserPropertiesEndpoint(BaseAPIView):
 class CycleProgressEndpoint(BaseAPIView):
     @allow_permission([ROLE.ADMIN, ROLE.MEMBER, ROLE.GUEST])
     def get(self, request, slug, project_id, cycle_id):
+
         cycle = Cycle.objects.filter(
             workspace__slug=slug, project_id=project_id, id=cycle_id
         ).first()
         if not cycle:
             return Response(
                 {"error": "Cycle not found"}, status=status.HTTP_404_NOT_FOUND
-            )
+            ) 
         aggregate_estimates = (
             Issue.issue_objects.filter(
                 estimate_point__estimate__type="points",
@@ -1176,7 +1181,7 @@ class CycleProgressEndpoint(BaseAPIView):
                 ),
             )
         )
-        if cycle.progress_snapshot:
+        if cycle.progress_snapshot:      
             backlog_issues = cycle.progress_snapshot.get("backlog_issues", 0)
             unstarted_issues = cycle.progress_snapshot.get("unstarted_issues", 0)
             started_issues = cycle.progress_snapshot.get("started_issues", 0)

apiserver/plane/app/views/cycle/issue.py

@@ -29,7 +29,6 @@ from plane.utils.paginator import GroupedOffsetPaginator, SubGroupedOffsetPagina
 from plane.app.permissions import allow_permission, ROLE
 from plane.utils.host import base_host
 
-
 class CycleIssueViewSet(BaseViewSet):
     serializer_class = CycleIssueSerializer
     model = CycleIssue

apiserver/plane/app/views/external/base.py

@@ -11,7 +11,8 @@ from rest_framework.response import Response
 
 # Module import
 from plane.app.permissions import ROLE, allow_permission
-from plane.app.serializers import ProjectLiteSerializer, WorkspaceLiteSerializer
+from plane.app.serializers import (ProjectLiteSerializer,
+                                   WorkspaceLiteSerializer)
 from plane.db.models import Project, Workspace
 from plane.license.utils.instance_value import get_configuration_value
 from plane.utils.exception_logger import log_exception
@@ -21,7 +22,6 @@ from ..base import BaseAPIView
 
 class LLMProvider:
     """Base class for LLM provider configurations"""
-
     name: str = ""
     models: List[str] = []
     default_model: str = ""
@@ -34,13 +34,11 @@ class LLMProvider:
             "default_model": cls.default_model,
         }
 
-
 class OpenAIProvider(LLMProvider):
     name = "OpenAI"
     models = ["gpt-3.5-turbo", "gpt-4o-mini", "gpt-4o", "o1-mini", "o1-preview"]
     default_model = "gpt-4o-mini"
 
-
 class AnthropicProvider(LLMProvider):
     name = "Anthropic"
     models = [
@@ -51,45 +49,40 @@ class AnthropicProvider(LLMProvider):
         "claude-2.1",
         "claude-2",
         "claude-instant-1.2",
-        "claude-instant-1",
+        "claude-instant-1"
     ]
     default_model = "claude-3-sonnet-20240229"
 
-
 class GeminiProvider(LLMProvider):
     name = "Gemini"
     models = ["gemini-pro", "gemini-1.5-pro-latest", "gemini-pro-vision"]
     default_model = "gemini-pro"
 
-
 SUPPORTED_PROVIDERS = {
     "openai": OpenAIProvider,
     "anthropic": AnthropicProvider,
     "gemini": GeminiProvider,
 }
 
-
 def get_llm_config() -> Tuple[str | None, str | None, str | None]:
     """
     Helper to get LLM configuration values, returns:
         - api_key, model, provider
     """
-    api_key, provider_key, model = get_configuration_value(
-        [
-            {
-                "key": "LLM_API_KEY",
-                "default": os.environ.get("LLM_API_KEY", None),
-            },
-            {
-                "key": "LLM_PROVIDER",
-                "default": os.environ.get("LLM_PROVIDER", "openai"),
-            },
-            {
-                "key": "LLM_MODEL",
-                "default": os.environ.get("LLM_MODEL", None),
-            },
-        ]
-    )
+    api_key, provider_key, model = get_configuration_value([
+        {
+            "key": "LLM_API_KEY",
+            "default": os.environ.get("LLM_API_KEY", None),
+        },
+        {
+            "key": "LLM_PROVIDER",
+            "default": os.environ.get("LLM_PROVIDER", "openai"),
+        },
+        {
+            "key": "LLM_MODEL",
+            "default": os.environ.get("LLM_MODEL", None),
+        },
+    ])
 
     provider = SUPPORTED_PROVIDERS.get(provider_key.lower())
     if not provider:
@@ -106,20 +99,16 @@ def get_llm_config() -> Tuple[str | None, str | None, str | None]:
 
     # Validate model is supported by provider
     if model not in provider.models:
-        log_exception(
-            ValueError(
-                f"Model {model} not supported by {provider.name}. "
-                f"Supported models: {', '.join(provider.models)}"
-            )
-        )
+        log_exception(ValueError(
+            f"Model {model} not supported by {provider.name}. "
+            f"Supported models: {', '.join(provider.models)}"
+        ))
         return None, None, None
 
     return api_key, model, provider_key
 
 
-def get_llm_response(
-    task, prompt, api_key: str, model: str, provider: str
-) -> Tuple[str | None, str | None]:
+def get_llm_response(task, prompt, api_key: str, model: str, provider: str) -> Tuple[str | None, str | None]:
     """Helper to get LLM completion response"""
     final_text = task + "\n" + prompt
     try:
@@ -129,7 +118,10 @@ def get_llm_response(
 
         client = OpenAI(api_key=api_key)
         chat_completion = client.chat.completions.create(
-            model=model, messages=[{"role": "user", "content": final_text}]
+            model=model,
+            messages=[
+                {"role": "user", "content": final_text}
+            ]
         )
         text = chat_completion.choices[0].message.content
         return text, None
@@ -143,7 +135,6 @@ def get_llm_response(
         else:
             return None, f"Error occurred while generating response from {provider}"
 
-
 class GPTIntegrationEndpoint(BaseAPIView):
     @allow_permission([ROLE.ADMIN, ROLE.MEMBER])
     def post(self, request, slug, project_id):
@@ -161,9 +152,7 @@ class GPTIntegrationEndpoint(BaseAPIView):
                 {"error": "Task is required"}, status=status.HTTP_400_BAD_REQUEST
             )
 
-        text, error = get_llm_response(
-            task, request.data.get("prompt", False), api_key, model, provider
-        )
+        text, error = get_llm_response(task, request.data.get("prompt", False), api_key, model, provider)
         if not text and error:
             return Response(
                 {"error": "An internal error has occurred."},
@@ -201,9 +190,7 @@ class WorkspaceGPTIntegrationEndpoint(BaseAPIView):
                 {"error": "Task is required"}, status=status.HTTP_400_BAD_REQUEST
             )
 
-        text, error = get_llm_response(
-            task, request.data.get("prompt", False), api_key, model, provider
-        )
+        text, error = get_llm_response(task, request.data.get("prompt", False), api_key, model, provider)
         if not text and error:
             return Response(
                 {"error": "An internal error has occurred."},

apiserver/plane/app/views/issue/archive.py

@@ -38,7 +38,6 @@ from plane.utils.paginator import GroupedOffsetPaginator, SubGroupedOffsetPagina
 from plane.app.permissions import allow_permission, ROLE
 from plane.utils.error_codes import ERROR_CODES
 from plane.utils.host import base_host
-
 # Module imports
 from .. import BaseViewSet, BaseAPIView
 

apiserver/plane/app/views/issue/attachment.py

@@ -23,7 +23,6 @@ from plane.settings.storage import S3Storage
 from plane.bgtasks.storage_metadata_task import get_asset_object_metadata
 from plane.utils.host import base_host
 
-
 class IssueAttachmentEndpoint(BaseAPIView):
     serializer_class = IssueAttachmentSerializer
     model = FileAsset

apiserver/plane/app/views/issue/comment.py

@@ -19,7 +19,6 @@ from plane.db.models import IssueComment, ProjectMember, CommentReaction, Projec
 from plane.bgtasks.issue_activities_task import issue_activity
 from plane.utils.host import base_host
 
-
 class IssueCommentViewSet(BaseViewSet):
     serializer_class = IssueCommentSerializer
     model = IssueComment

apiserver/plane/app/views/issue/link.py

@@ -17,7 +17,6 @@ from plane.db.models import IssueLink
 from plane.bgtasks.issue_activities_task import issue_activity
 from plane.utils.host import base_host
 
-
 class IssueLinkViewSet(BaseViewSet):
     permission_classes = [ProjectEntityPermission]
 

apiserver/plane/app/views/issue/reaction.py

@@ -17,7 +17,6 @@ from plane.db.models import IssueReaction
 from plane.bgtasks.issue_activities_task import issue_activity
 from plane.utils.host import base_host
 
-
 class IssueReactionViewSet(BaseViewSet):
     serializer_class = IssueReactionSerializer
     model = IssueReaction

apiserver/plane/app/views/issue/relation.py

@@ -29,7 +29,6 @@ from plane.bgtasks.issue_activities_task import issue_activity
 from plane.utils.issue_relation_mapper import get_actual_relation
 from plane.utils.host import base_host
 
-
 class IssueRelationViewSet(BaseViewSet):
     serializer_class = IssueRelationSerializer
     model = IssueRelation

apiserver/plane/app/views/issue/sub_issue.py

@@ -25,7 +25,6 @@ from collections import defaultdict
 from plane.utils.host import base_host
 from plane.utils.order_queryset import order_issue_queryset
 
-
 class SubIssuesEndpoint(BaseAPIView):
     permission_classes = [ProjectEntityPermission]
 

apiserver/plane/app/views/module/base.py

@@ -63,7 +63,6 @@ from .. import BaseAPIView, BaseViewSet
 from plane.bgtasks.recent_visited_task import recent_visited_task
 from plane.utils.host import base_host
 
-
 class ModuleViewSet(BaseViewSet):
     model = Module
     webhook_event = "module"

apiserver/plane/app/views/module/issue.py

@@ -36,7 +36,6 @@ from plane.utils.paginator import GroupedOffsetPaginator, SubGroupedOffsetPagina
 from .. import BaseViewSet
 from plane.utils.host import base_host
 
-
 class ModuleIssueViewSet(BaseViewSet):
     serializer_class = ModuleIssueSerializer
     model = ModuleIssue
@@ -281,11 +280,7 @@ class ModuleIssueViewSet(BaseViewSet):
                 issue_id=str(issue_id),
                 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()),
                 notification=True,

apiserver/plane/app/views/project/invite.py

@@ -29,7 +29,6 @@ from plane.db.models import (
 from plane.db.models.project import ProjectNetwork
 from plane.utils.host import base_host
 
-
 class ProjectInvitationsViewset(BaseViewSet):
     serializer_class = ProjectMemberInviteSerializer
     model = ProjectMemberInvite

apiserver/plane/app/views/search/issue.py

@@ -1,5 +1,5 @@
 # Django imports
-from django.db.models import Q, QuerySet
+from django.db.models import Q
 
 # Third party imports
 from rest_framework import status
@@ -12,95 +12,6 @@ from plane.utils.issue_search import search_issues
 
 
 class IssueSearchEndpoint(BaseAPIView):
-    def filter_issues_by_project(self, project_id: int, issues: QuerySet) -> QuerySet:
-        """
-        Filter issues by project
-        """
-
-        issues = issues.filter(project_id=project_id)
-
-        return issues
-
-    def search_issues_by_query(self, query: str, issues: QuerySet) -> QuerySet:
-        """
-        Search issues by query
-        """
-
-        issues = search_issues(query, issues)
-
-        return issues
-
-    def search_issues_and_excluding_parent(
-        self, issues: QuerySet, issue_id: str
-    ) -> QuerySet:
-        """
-        Search issues and epics by query excluding the parent
-        """
-
-        issue = Issue.issue_objects.filter(pk=issue_id).first()
-        if issue:
-            issues = issues.filter(
-                ~Q(pk=issue_id), ~Q(pk=issue.parent_id), ~Q(parent_id=issue_id)
-            )
-        return issues
-
-    def filter_issues_excluding_related_issues(
-        self, issue_id: str, issues: QuerySet
-    ) -> QuerySet:
-        """
-        Filter issues excluding related issues
-        """
-
-        issue = Issue.issue_objects.filter(pk=issue_id).first()
-        related_issue_ids = (
-            IssueRelation.objects.filter(Q(related_issue=issue) | Q(issue=issue))
-            .values_list("issue_id", "related_issue_id")
-            .distinct()
-        )
-
-        related_issue_ids = [item for sublist in related_issue_ids for item in sublist]
-
-        if issue:
-            issues = issues.filter(~Q(pk=issue_id), ~Q(pk__in=related_issue_ids))
-
-        return issues
-
-    def filter_root_issues_only(self, issue_id: str, issues: QuerySet) -> QuerySet:
-        """
-        Filter root issues only
-        """
-        issue = Issue.issue_objects.filter(pk=issue_id).first()
-        if issue:
-            issues = issues.filter(~Q(pk=issue_id), parent__isnull=True)
-        if issue.parent:
-            issues = issues.filter(~Q(pk=issue.parent_id))
-        return issues
-
-    def exclude_issues_in_cycles(self, issues: QuerySet) -> QuerySet:
-        """
-        Exclude issues in cycles
-        """
-        issues = issues.exclude(
-            Q(issue_cycle__isnull=False) & Q(issue_cycle__deleted_at__isnull=True)
-        )
-        return issues
-
-    def exclude_issues_in_module(self, issues: QuerySet, module: str) -> QuerySet:
-        """
-        Exclude issues in a module
-        """
-        issues = issues.exclude(
-            Q(issue_module__module=module) & Q(issue_module__deleted_at__isnull=True)
-        )
-        return issues
-
-    def filter_issues_without_target_date(self, issues: QuerySet) -> QuerySet:
-        """
-        Filter issues without a target date
-        """
-        issues = issues.filter(target_date__isnull=True)
-        return issues
-
     def get(self, request, slug, project_id):
         query = request.query_params.get("search", False)
         workspace_search = request.query_params.get("workspace_search", "false")
@@ -110,6 +21,7 @@ class IssueSearchEndpoint(BaseAPIView):
         module = request.query_params.get("module", False)
         sub_issue = request.query_params.get("sub_issue", "false")
         target_date = request.query_params.get("target_date", True)
+
         issue_id = request.query_params.get("issue_id", False)
 
         issues = Issue.issue_objects.filter(
@@ -120,28 +32,52 @@ class IssueSearchEndpoint(BaseAPIView):
         )
 
         if workspace_search == "false":
-            issues = self.filter_issues_by_project(project_id, issues)
+            issues = issues.filter(project_id=project_id)
 
         if query:
-            issues = self.search_issues_by_query(query, issues)
+            issues = search_issues(query, issues)
 
         if parent == "true" and issue_id:
-            issues = self.search_issues_and_excluding_parent(issues, issue_id)
-
+            issue = Issue.issue_objects.filter(pk=issue_id).first()
+            if issue:
+                issues = issues.filter(
+                    ~Q(pk=issue_id), ~Q(pk=issue.parent_id), ~Q(parent_id=issue_id)
+                )
         if issue_relation == "true" and issue_id:
-            issues = self.filter_issues_excluding_related_issues(issue_id, issues)
+            issue = Issue.issue_objects.filter(pk=issue_id).first()
+            related_issue_ids = IssueRelation.objects.filter(
+                Q(related_issue=issue) | Q(issue=issue)
+            ).values_list(
+                "issue_id", "related_issue_id"
+            ).distinct()
 
+            related_issue_ids = [item for sublist in related_issue_ids for item in sublist]
+
+            if issue:
+                issues = issues.filter(
+                    ~Q(pk=issue_id),
+                    ~Q(pk__in=related_issue_ids),
+                )
         if sub_issue == "true" and issue_id:
-            issues = self.filter_root_issues_only(issue_id, issues)
+            issue = Issue.issue_objects.filter(pk=issue_id).first()
+            if issue:
+                issues = issues.filter(~Q(pk=issue_id), parent__isnull=True)
+            if issue.parent:
+                issues = issues.filter(~Q(pk=issue.parent_id))
 
         if cycle == "true":
-            issues = self.exclude_issues_in_cycles(issues)
+            issues = issues.exclude(
+                Q(issue_cycle__isnull=False) & Q(issue_cycle__deleted_at__isnull=True)
+            )
 
         if module:
-            issues = self.exclude_issues_in_module(issues, module)
+            issues = issues.exclude(
+                Q(issue_module__module=module)
+                & Q(issue_module__deleted_at__isnull=True)
+            )
 
         if target_date == "none":
-            issues = self.filter_issues_without_target_date(issues)
+            issues = issues.filter(target_date__isnull=True)
 
         if ProjectMember.objects.filter(
             project_id=project_id, member=self.request.user, is_active=True, role=5

apiserver/plane/app/views/timezone/base.py

@@ -24,152 +24,125 @@ class TimezoneEndpoint(APIView):
     @method_decorator(cache_page(60 * 60 * 2))
     def get(self, request):
         timezone_locations = [
-            ("Midway Island", "Pacific/Midway"),  # UTC-11:00
-            ("American Samoa", "Pacific/Pago_Pago"),  # UTC-11:00
-            ("Hawaii", "Pacific/Honolulu"),  # UTC-10:00
-            ("Aleutian Islands", "America/Adak"),  # UTC-10:00 (DST: UTC-09:00)
-            ("Marquesas Islands", "Pacific/Marquesas"),  # UTC-09:30
-            ("Alaska", "America/Anchorage"),  # UTC-09:00 (DST: UTC-08:00)
-            ("Gambier Islands", "Pacific/Gambier"),  # UTC-09:00
-            (
-                "Pacific Time (US and Canada)",
-                "America/Los_Angeles",
-            ),  # UTC-08:00 (DST: UTC-07:00)
-            ("Baja California", "America/Tijuana"),  # UTC-08:00 (DST: UTC-07:00)
-            (
-                "Mountain Time (US and Canada)",
-                "America/Denver",
-            ),  # UTC-07:00 (DST: UTC-06:00)
-            ("Arizona", "America/Phoenix"),  # UTC-07:00
-            ("Chihuahua, Mazatlan", "America/Chihuahua"),  # UTC-07:00 (DST: UTC-06:00)
-            (
-                "Central Time (US and Canada)",
-                "America/Chicago",
-            ),  # UTC-06:00 (DST: UTC-05:00)
-            ("Saskatchewan", "America/Regina"),  # UTC-06:00
-            (
-                "Guadalajara, Mexico City, Monterrey",
-                "America/Mexico_City",
-            ),  # UTC-06:00 (DST: UTC-05:00)
-            ("Tegucigalpa, Honduras", "America/Tegucigalpa"),  # UTC-06:00
-            ("Costa Rica", "America/Costa_Rica"),  # UTC-06:00
-            (
-                "Eastern Time (US and Canada)",
-                "America/New_York",
-            ),  # UTC-05:00 (DST: UTC-04:00)
-            ("Lima", "America/Lima"),  # UTC-05:00
-            ("Bogota", "America/Bogota"),  # UTC-05:00
-            ("Quito", "America/Guayaquil"),  # UTC-05:00
-            ("Chetumal", "America/Cancun"),  # UTC-05:00 (DST: UTC-04:00)
-            ("Caracas (Old Venezuela Time)", "America/Caracas"),  # UTC-04:30
-            ("Atlantic Time (Canada)", "America/Halifax"),  # UTC-04:00 (DST: UTC-03:00)
-            ("Caracas", "America/Caracas"),  # UTC-04:00
-            ("Santiago", "America/Santiago"),  # UTC-04:00 (DST: UTC-03:00)
-            ("La Paz", "America/La_Paz"),  # UTC-04:00
-            ("Manaus", "America/Manaus"),  # UTC-04:00
-            ("Georgetown", "America/Guyana"),  # UTC-04:00
-            ("Bermuda", "Atlantic/Bermuda"),  # UTC-04:00 (DST: UTC-03:00)
-            (
-                "Newfoundland Time (Canada)",
-                "America/St_Johns",
-            ),  # UTC-03:30 (DST: UTC-02:30)
-            ("Buenos Aires", "America/Argentina/Buenos_Aires"),  # UTC-03:00
-            ("Brasilia", "America/Sao_Paulo"),  # UTC-03:00
-            ("Greenland", "America/Godthab"),  # UTC-03:00 (DST: UTC-02:00)
-            ("Montevideo", "America/Montevideo"),  # UTC-03:00
-            ("Falkland Islands", "Atlantic/Stanley"),  # UTC-03:00
-            (
-                "South Georgia and the South Sandwich Islands",
-                "Atlantic/South_Georgia",
-            ),  # UTC-02:00
-            ("Azores", "Atlantic/Azores"),  # UTC-01:00 (DST: UTC+00:00)
-            ("Cape Verde Islands", "Atlantic/Cape_Verde"),  # UTC-01:00
-            ("Dublin", "Europe/Dublin"),  # UTC+00:00 (DST: UTC+01:00)
-            ("Reykjavik", "Atlantic/Reykjavik"),  # UTC+00:00
-            ("Lisbon", "Europe/Lisbon"),  # UTC+00:00 (DST: UTC+01:00)
-            ("Monrovia", "Africa/Monrovia"),  # UTC+00:00
-            ("Casablanca", "Africa/Casablanca"),  # UTC+00:00 (DST: UTC+01:00)
-            (
-                "Central European Time (Berlin, Rome, Paris)",
-                "Europe/Paris",
-            ),  # UTC+01:00 (DST: UTC+02:00)
-            ("West Central Africa", "Africa/Lagos"),  # UTC+01:00
-            ("Algiers", "Africa/Algiers"),  # UTC+01:00
-            ("Lagos", "Africa/Lagos"),  # UTC+01:00
-            ("Tunis", "Africa/Tunis"),  # UTC+01:00
-            (
-                "Eastern European Time (Cairo, Helsinki, Kyiv)",
-                "Europe/Kiev",
-            ),  # UTC+02:00 (DST: UTC+03:00)
-            ("Athens", "Europe/Athens"),  # UTC+02:00 (DST: UTC+03:00)
-            ("Jerusalem", "Asia/Jerusalem"),  # UTC+02:00 (DST: UTC+03:00)
-            ("Johannesburg", "Africa/Johannesburg"),  # UTC+02:00
-            ("Harare, Pretoria", "Africa/Harare"),  # UTC+02:00
-            ("Moscow Time", "Europe/Moscow"),  # UTC+03:00
-            ("Baghdad", "Asia/Baghdad"),  # UTC+03:00
-            ("Nairobi", "Africa/Nairobi"),  # UTC+03:00
-            ("Kuwait, Riyadh", "Asia/Riyadh"),  # UTC+03:00
-            ("Tehran", "Asia/Tehran"),  # UTC+03:30 (DST: UTC+04:30)
-            ("Abu Dhabi", "Asia/Dubai"),  # UTC+04:00
-            ("Baku", "Asia/Baku"),  # UTC+04:00 (DST: UTC+05:00)
-            ("Yerevan", "Asia/Yerevan"),  # UTC+04:00 (DST: UTC+05:00)
-            ("Astrakhan", "Europe/Astrakhan"),  # UTC+04:00
-            ("Tbilisi", "Asia/Tbilisi"),  # UTC+04:00
-            ("Mauritius", "Indian/Mauritius"),  # UTC+04:00
-            ("Islamabad", "Asia/Karachi"),  # UTC+05:00
-            ("Karachi", "Asia/Karachi"),  # UTC+05:00
-            ("Tashkent", "Asia/Tashkent"),  # UTC+05:00
-            ("Yekaterinburg", "Asia/Yekaterinburg"),  # UTC+05:00
-            ("Maldives", "Indian/Maldives"),  # UTC+05:00
-            ("Chagos", "Indian/Chagos"),  # UTC+05:00
-            ("Chennai", "Asia/Kolkata"),  # UTC+05:30
-            ("Kolkata", "Asia/Kolkata"),  # UTC+05:30
-            ("Mumbai", "Asia/Kolkata"),  # UTC+05:30
-            ("New Delhi", "Asia/Kolkata"),  # UTC+05:30
-            ("Sri Jayawardenepura", "Asia/Colombo"),  # UTC+05:30
-            ("Kathmandu", "Asia/Kathmandu"),  # UTC+05:45
-            ("Dhaka", "Asia/Dhaka"),  # UTC+06:00
-            ("Almaty", "Asia/Almaty"),  # UTC+06:00
-            ("Bishkek", "Asia/Bishkek"),  # UTC+06:00
-            ("Thimphu", "Asia/Thimphu"),  # UTC+06:00
-            ("Yangon (Rangoon)", "Asia/Yangon"),  # UTC+06:30
-            ("Cocos Islands", "Indian/Cocos"),  # UTC+06:30
-            ("Bangkok", "Asia/Bangkok"),  # UTC+07:00
-            ("Hanoi", "Asia/Ho_Chi_Minh"),  # UTC+07:00
-            ("Jakarta", "Asia/Jakarta"),  # UTC+07:00
-            ("Novosibirsk", "Asia/Novosibirsk"),  # UTC+07:00
-            ("Krasnoyarsk", "Asia/Krasnoyarsk"),  # UTC+07:00
-            ("Beijing", "Asia/Shanghai"),  # UTC+08:00
-            ("Singapore", "Asia/Singapore"),  # UTC+08:00
-            ("Perth", "Australia/Perth"),  # UTC+08:00
-            ("Hong Kong", "Asia/Hong_Kong"),  # UTC+08:00
-            ("Ulaanbaatar", "Asia/Ulaanbaatar"),  # UTC+08:00
-            ("Palau", "Pacific/Palau"),  # UTC+08:00
-            ("Eucla", "Australia/Eucla"),  # UTC+08:45
-            ("Tokyo", "Asia/Tokyo"),  # UTC+09:00
-            ("Seoul", "Asia/Seoul"),  # UTC+09:00
-            ("Yakutsk", "Asia/Yakutsk"),  # UTC+09:00
-            ("Adelaide", "Australia/Adelaide"),  # UTC+09:30 (DST: UTC+10:30)
-            ("Darwin", "Australia/Darwin"),  # UTC+09:30
-            ("Sydney", "Australia/Sydney"),  # UTC+10:00 (DST: UTC+11:00)
-            ("Brisbane", "Australia/Brisbane"),  # UTC+10:00
-            ("Guam", "Pacific/Guam"),  # UTC+10:00
-            ("Vladivostok", "Asia/Vladivostok"),  # UTC+10:00
-            ("Tahiti", "Pacific/Tahiti"),  # UTC+10:00
-            ("Lord Howe Island", "Australia/Lord_Howe"),  # UTC+10:30 (DST: UTC+11:00)
-            ("Solomon Islands", "Pacific/Guadalcanal"),  # UTC+11:00
-            ("Magadan", "Asia/Magadan"),  # UTC+11:00
-            ("Norfolk Island", "Pacific/Norfolk"),  # UTC+11:00
-            ("Bougainville Island", "Pacific/Bougainville"),  # UTC+11:00
-            ("Chokurdakh", "Asia/Srednekolymsk"),  # UTC+11:00
-            ("Auckland", "Pacific/Auckland"),  # UTC+12:00 (DST: UTC+13:00)
-            ("Wellington", "Pacific/Auckland"),  # UTC+12:00 (DST: UTC+13:00)
-            ("Fiji Islands", "Pacific/Fiji"),  # UTC+12:00 (DST: UTC+13:00)
-            ("Anadyr", "Asia/Anadyr"),  # UTC+12:00
-            ("Chatham Islands", "Pacific/Chatham"),  # UTC+12:45 (DST: UTC+13:45)
-            ("Nuku'alofa", "Pacific/Tongatapu"),  # UTC+13:00
-            ("Samoa", "Pacific/Apia"),  # UTC+13:00 (DST: UTC+14:00)
-            ("Kiritimati Island", "Pacific/Kiritimati"),  # UTC+14:00
+            ('Midway Island', 'Pacific/Midway'),  # UTC-11:00
+            ('American Samoa', 'Pacific/Pago_Pago'),  # UTC-11:00
+            ('Hawaii', 'Pacific/Honolulu'),  # UTC-10:00
+            ('Aleutian Islands', 'America/Adak'),  # UTC-10:00 (DST: UTC-09:00)
+            ('Marquesas Islands', 'Pacific/Marquesas'),  # UTC-09:30
+            ('Alaska', 'America/Anchorage'),  # UTC-09:00 (DST: UTC-08:00)
+            ('Gambier Islands', 'Pacific/Gambier'),  # UTC-09:00
+            ('Pacific Time (US and Canada)', 'America/Los_Angeles'),  # UTC-08:00 (DST: UTC-07:00)
+            ('Baja California', 'America/Tijuana'),  # UTC-08:00 (DST: UTC-07:00)
+            ('Mountain Time (US and Canada)', 'America/Denver'),  # UTC-07:00 (DST: UTC-06:00)
+            ('Arizona', 'America/Phoenix'),  # UTC-07:00
+            ('Chihuahua, Mazatlan', 'America/Chihuahua'),  # UTC-07:00 (DST: UTC-06:00)
+            ('Central Time (US and Canada)', 'America/Chicago'),  # UTC-06:00 (DST: UTC-05:00)
+            ('Saskatchewan', 'America/Regina'),  # UTC-06:00
+            ('Guadalajara, Mexico City, Monterrey', 'America/Mexico_City'),  # UTC-06:00 (DST: UTC-05:00)
+            ('Tegucigalpa, Honduras', 'America/Tegucigalpa'),  # UTC-06:00
+            ('Costa Rica', 'America/Costa_Rica'),  # UTC-06:00
+            ('Eastern Time (US and Canada)', 'America/New_York'),  # UTC-05:00 (DST: UTC-04:00)
+            ('Lima', 'America/Lima'),  # UTC-05:00
+            ('Bogota', 'America/Bogota'),  # UTC-05:00
+            ('Quito', 'America/Guayaquil'),  # UTC-05:00
+            ('Chetumal', 'America/Cancun'),  # UTC-05:00 (DST: UTC-04:00)
+            ('Caracas (Old Venezuela Time)', 'America/Caracas'),  # UTC-04:30
+            ('Atlantic Time (Canada)', 'America/Halifax'),  # UTC-04:00 (DST: UTC-03:00)
+            ('Caracas', 'America/Caracas'),  # UTC-04:00
+            ('Santiago', 'America/Santiago'),  # UTC-04:00 (DST: UTC-03:00)
+            ('La Paz', 'America/La_Paz'),  # UTC-04:00
+            ('Manaus', 'America/Manaus'),  # UTC-04:00
+            ('Georgetown', 'America/Guyana'),  # UTC-04:00
+            ('Bermuda', 'Atlantic/Bermuda'),  # UTC-04:00 (DST: UTC-03:00)
+            ('Newfoundland Time (Canada)', 'America/St_Johns'),  # UTC-03:30 (DST: UTC-02:30)
+            ('Buenos Aires', 'America/Argentina/Buenos_Aires'),  # UTC-03:00
+            ('Brasilia', 'America/Sao_Paulo'),  # UTC-03:00
+            ('Greenland', 'America/Godthab'),  # UTC-03:00 (DST: UTC-02:00)
+            ('Montevideo', 'America/Montevideo'),  # UTC-03:00
+            ('Falkland Islands', 'Atlantic/Stanley'),  # UTC-03:00
+            ('South Georgia and the South Sandwich Islands', 'Atlantic/South_Georgia'),  # UTC-02:00
+            ('Azores', 'Atlantic/Azores'),  # UTC-01:00 (DST: UTC+00:00)
+            ('Cape Verde Islands', 'Atlantic/Cape_Verde'),  # UTC-01:00
+            ('Dublin', 'Europe/Dublin'),  # UTC+00:00 (DST: UTC+01:00)
+            ('Reykjavik', 'Atlantic/Reykjavik'),  # UTC+00:00
+            ('Lisbon', 'Europe/Lisbon'),  # UTC+00:00 (DST: UTC+01:00)
+            ('Monrovia', 'Africa/Monrovia'),  # UTC+00:00
+            ('Casablanca', 'Africa/Casablanca'),  # UTC+00:00 (DST: UTC+01:00)
+            ('Central European Time (Berlin, Rome, Paris)', 'Europe/Paris'),  # UTC+01:00 (DST: UTC+02:00)
+            ('West Central Africa', 'Africa/Lagos'),  # UTC+01:00
+            ('Algiers', 'Africa/Algiers'),  # UTC+01:00
+            ('Lagos', 'Africa/Lagos'),  # UTC+01:00
+            ('Tunis', 'Africa/Tunis'),  # UTC+01:00
+            ('Eastern European Time (Cairo, Helsinki, Kyiv)', 'Europe/Kiev'),  # UTC+02:00 (DST: UTC+03:00)
+            ('Athens', 'Europe/Athens'),  # UTC+02:00 (DST: UTC+03:00)
+            ('Jerusalem', 'Asia/Jerusalem'),  # UTC+02:00 (DST: UTC+03:00)
+            ('Johannesburg', 'Africa/Johannesburg'),  # UTC+02:00
+            ('Harare, Pretoria', 'Africa/Harare'),  # UTC+02:00
+            ('Moscow Time', 'Europe/Moscow'),  # UTC+03:00
+            ('Baghdad', 'Asia/Baghdad'),  # UTC+03:00
+            ('Nairobi', 'Africa/Nairobi'),  # UTC+03:00
+            ('Kuwait, Riyadh', 'Asia/Riyadh'),  # UTC+03:00
+            ('Tehran', 'Asia/Tehran'),  # UTC+03:30 (DST: UTC+04:30)
+            ('Abu Dhabi', 'Asia/Dubai'),  # UTC+04:00
+            ('Baku', 'Asia/Baku'),  # UTC+04:00 (DST: UTC+05:00)
+            ('Yerevan', 'Asia/Yerevan'),  # UTC+04:00 (DST: UTC+05:00)
+            ('Astrakhan', 'Europe/Astrakhan'),  # UTC+04:00
+            ('Tbilisi', 'Asia/Tbilisi'),  # UTC+04:00
+            ('Mauritius', 'Indian/Mauritius'),  # UTC+04:00
+            ('Islamabad', 'Asia/Karachi'),  # UTC+05:00
+            ('Karachi', 'Asia/Karachi'),  # UTC+05:00
+            ('Tashkent', 'Asia/Tashkent'),  # UTC+05:00
+            ('Yekaterinburg', 'Asia/Yekaterinburg'),  # UTC+05:00
+            ('Maldives', 'Indian/Maldives'),  # UTC+05:00
+            ('Chagos', 'Indian/Chagos'),  # UTC+05:00
+            ('Chennai', 'Asia/Kolkata'),  # UTC+05:30
+            ('Kolkata', 'Asia/Kolkata'),  # UTC+05:30
+            ('Mumbai', 'Asia/Kolkata'),  # UTC+05:30
+            ('New Delhi', 'Asia/Kolkata'),  # UTC+05:30
+            ('Sri Jayawardenepura', 'Asia/Colombo'),  # UTC+05:30
+            ('Kathmandu', 'Asia/Kathmandu'),  # UTC+05:45
+            ('Dhaka', 'Asia/Dhaka'),  # UTC+06:00
+            ('Almaty', 'Asia/Almaty'),  # UTC+06:00
+            ('Bishkek', 'Asia/Bishkek'),  # UTC+06:00
+            ('Thimphu', 'Asia/Thimphu'),  # UTC+06:00
+            ('Yangon (Rangoon)', 'Asia/Yangon'),  # UTC+06:30
+            ('Cocos Islands', 'Indian/Cocos'),  # UTC+06:30
+            ('Bangkok', 'Asia/Bangkok'),  # UTC+07:00
+            ('Hanoi', 'Asia/Ho_Chi_Minh'),  # UTC+07:00
+            ('Jakarta', 'Asia/Jakarta'),  # UTC+07:00
+            ('Novosibirsk', 'Asia/Novosibirsk'),  # UTC+07:00
+            ('Krasnoyarsk', 'Asia/Krasnoyarsk'),  # UTC+07:00
+            ('Beijing', 'Asia/Shanghai'),  # UTC+08:00
+            ('Singapore', 'Asia/Singapore'),  # UTC+08:00
+            ('Perth', 'Australia/Perth'),  # UTC+08:00
+            ('Hong Kong', 'Asia/Hong_Kong'),  # UTC+08:00
+            ('Ulaanbaatar', 'Asia/Ulaanbaatar'),  # UTC+08:00
+            ('Palau', 'Pacific/Palau'),  # UTC+08:00
+            ('Eucla', 'Australia/Eucla'),  # UTC+08:45
+            ('Tokyo', 'Asia/Tokyo'),  # UTC+09:00
+            ('Seoul', 'Asia/Seoul'),  # UTC+09:00
+            ('Yakutsk', 'Asia/Yakutsk'),  # UTC+09:00
+            ('Adelaide', 'Australia/Adelaide'),  # UTC+09:30 (DST: UTC+10:30)
+            ('Darwin', 'Australia/Darwin'),  # UTC+09:30
+            ('Sydney', 'Australia/Sydney'),  # UTC+10:00 (DST: UTC+11:00)
+            ('Brisbane', 'Australia/Brisbane'),  # UTC+10:00
+            ('Guam', 'Pacific/Guam'),  # UTC+10:00
+            ('Vladivostok', 'Asia/Vladivostok'),  # UTC+10:00
+            ('Tahiti', 'Pacific/Tahiti'),  # UTC+10:00
+            ('Lord Howe Island', 'Australia/Lord_Howe'),  # UTC+10:30 (DST: UTC+11:00)
+            ('Solomon Islands', 'Pacific/Guadalcanal'),  # UTC+11:00
+            ('Magadan', 'Asia/Magadan'),  # UTC+11:00
+            ('Norfolk Island', 'Pacific/Norfolk'),  # UTC+11:00
+            ('Bougainville Island', 'Pacific/Bougainville'),  # UTC+11:00
+            ('Chokurdakh', 'Asia/Srednekolymsk'),  # UTC+11:00
+            ('Auckland', 'Pacific/Auckland'),  # UTC+12:00 (DST: UTC+13:00)
+            ('Wellington', 'Pacific/Auckland'),  # UTC+12:00 (DST: UTC+13:00)
+            ('Fiji Islands', 'Pacific/Fiji'),  # UTC+12:00 (DST: UTC+13:00)
+            ('Anadyr', 'Asia/Anadyr'),  # UTC+12:00
+            ('Chatham Islands', 'Pacific/Chatham'),  # UTC+12:45 (DST: UTC+13:45)
+            ("Nuku'alofa", 'Pacific/Tongatapu'),  # UTC+13:00
+            ('Samoa', 'Pacific/Apia'),  # UTC+13:00 (DST: UTC+14:00)
+            ('Kiritimati Island', 'Pacific/Kiritimati')  # UTC+14:00
         ]
 
         timezone_list = []
@@ -177,6 +150,7 @@ class TimezoneEndpoint(APIView):
 
         # Process timezone mapping
         for friendly_name, tz_identifier in timezone_locations:
+
             try:
                 tz = pytz.timezone(tz_identifier)
                 current_offset = now.astimezone(tz).strftime("%z")

apiserver/plane/app/views/workspace/base.py

@@ -92,6 +92,8 @@ class WorkSpaceViewSet(BaseViewSet):
                     status=status.HTTP_403_FORBIDDEN,
                 )
 
+            serializer = WorkSpaceSerializer(data=request.data)
+
             slug = request.data.get("slug", False)
             name = request.data.get("name", False)
 
@@ -107,9 +109,6 @@ class WorkSpaceViewSet(BaseViewSet):
                     status=status.HTTP_400_BAD_REQUEST,
                 )
 
-            # Validate the serializer
-            serializer = WorkSpaceSerializer(data=request.data)
-
             if serializer.is_valid(raise_exception=True):
                 serializer.save(owner=request.user)
                 # Create Workspace member

apiserver/plane/app/views/workspace/cycle.py

@@ -12,7 +12,6 @@ from plane.app.permissions import WorkspaceViewerPermission
 from plane.app.serializers.cycle import CycleSerializer
 from plane.utils.timezone_converter import user_timezone_converter
 
-
 class WorkspaceCyclesEndpoint(BaseAPIView):
     permission_classes = [WorkspaceViewerPermission]
 

apiserver/plane/app/views/workspace/draft.py

@@ -38,7 +38,6 @@ from plane.bgtasks.issue_activities_task import issue_activity
 from plane.utils.issue_filters import issue_filters
 from plane.utils.host import base_host
 
-
 class WorkspaceDraftIssueViewSet(BaseViewSet):
     model = DraftIssue
 

apiserver/plane/app/views/workspace/user_preference.py

@@ -27,7 +27,10 @@ class WorkspaceUserPreferenceViewSet(BaseAPIView):
 
         create_preference_keys = []
 
-        keys = [key for key, _ in WorkspaceUserPreference.UserPreferenceKeys.choices]
+        keys = [
+            key
+            for key, _ in WorkspaceUserPreference.UserPreferenceKeys.choices
+        ]
 
         for preference in keys:
             if preference not in get_preference.values_list("key", flat=True):
@@ -36,10 +39,7 @@ class WorkspaceUserPreferenceViewSet(BaseAPIView):
                 preference = WorkspaceUserPreference.objects.bulk_create(
                     [
                         WorkspaceUserPreference(
-                            key=key,
-                            user=request.user,
-                            workspace=workspace,
-                            sort_order=(65535 + (i * 10000)),
+                            key=key, user=request.user, workspace=workspace, sort_order=(65535 + (i*10000))
                         )
                         for i, key in enumerate(create_preference_keys)
                     ],
@@ -47,13 +47,10 @@ class WorkspaceUserPreferenceViewSet(BaseAPIView):
                     ignore_conflicts=True,
                 )
 
-        preferences = (
-            WorkspaceUserPreference.objects.filter(
-                user=request.user, workspace_id=workspace.id
-            )
-            .order_by("sort_order")
-            .values("key", "is_pinned", "sort_order")
-        )
+        preferences = WorkspaceUserPreference.objects.filter(
+            user=request.user, workspace_id=workspace.id
+        ).order_by("sort_order").values("key", "is_pinned", "sort_order")
+
 
         user_preferences = {}
 
@@ -61,7 +58,7 @@ class WorkspaceUserPreferenceViewSet(BaseAPIView):
             user_preferences[(str(preference["key"]))] = {
                 "is_pinned": preference["is_pinned"],
                 "sort_order": preference["sort_order"],
-            }
+        }
         return Response(
             user_preferences,
             status=status.HTTP_200_OK,

apiserver/plane/authentication/adapter/base.py

@@ -18,7 +18,6 @@ from plane.bgtasks.user_activation_email_task import user_activation_email
 from plane.utils.host import base_host
 from plane.utils.ip_address import get_client_ip
 
-
 class Adapter:
     """Common interface for all auth providers"""
 

apiserver/plane/authentication/adapter/error.py

@@ -41,6 +41,7 @@ AUTHENTICATION_ERROR_CODES = {
     "GOOGLE_OAUTH_PROVIDER_ERROR": 5115,
     "GITHUB_OAUTH_PROVIDER_ERROR": 5120,
     "GITLAB_OAUTH_PROVIDER_ERROR": 5121,
+
     # Reset Password
     "INVALID_PASSWORD_TOKEN": 5125,
     "EXPIRED_PASSWORD_TOKEN": 5130,

apiserver/plane/authentication/provider/oauth/github.py

@@ -25,24 +25,23 @@ class GitHubOAuthProvider(OauthAdapter):
 
     organization_scope = "read:org"
 
+
     def __init__(self, request, code=None, state=None, callback=None):
-        GITHUB_CLIENT_ID, GITHUB_CLIENT_SECRET, GITHUB_ORGANIZATION_ID = (
-            get_configuration_value(
-                [
-                    {
-                        "key": "GITHUB_CLIENT_ID",
-                        "default": os.environ.get("GITHUB_CLIENT_ID"),
-                    },
-                    {
-                        "key": "GITHUB_CLIENT_SECRET",
-                        "default": os.environ.get("GITHUB_CLIENT_SECRET"),
-                    },
-                    {
-                        "key": "GITHUB_ORGANIZATION_ID",
-                        "default": os.environ.get("GITHUB_ORGANIZATION_ID"),
-                    },
-                ]
-            )
+        GITHUB_CLIENT_ID, GITHUB_CLIENT_SECRET, GITHUB_ORGANIZATION_ID = get_configuration_value(
+            [
+                {
+                    "key": "GITHUB_CLIENT_ID",
+                    "default": os.environ.get("GITHUB_CLIENT_ID"),
+                },
+                {
+                    "key": "GITHUB_CLIENT_SECRET",
+                    "default": os.environ.get("GITHUB_CLIENT_SECRET"),
+                },
+                {
+                    "key": "GITHUB_ORGANIZATION_ID",
+                    "default": os.environ.get("GITHUB_ORGANIZATION_ID"),
+                },
+            ]
         )
 
         if not (GITHUB_CLIENT_ID and GITHUB_CLIENT_SECRET):
@@ -129,10 +128,7 @@ class GitHubOAuthProvider(OauthAdapter):
 
     def is_user_in_organization(self, github_username):
         headers = {"Authorization": f"Bearer {self.token_data.get('access_token')}"}
-        response = requests.get(
-            f"{self.org_membership_url}/{self.organization_id}/memberships/{github_username}",
-            headers=headers,
-        )
+        response = requests.get(f"{self.org_membership_url}/{self.organization_id}/memberships/{github_username}", headers=headers)
         return response.status_code == 200  # 200 means the user is a member
 
     def set_user_data(self):
@@ -149,6 +145,7 @@ class GitHubOAuthProvider(OauthAdapter):
                     error_message="GITHUB_USER_NOT_IN_ORG",
                 )
 
+
         email = self.__get_email(headers=headers)
         super().set_user_data(
             {

apiserver/plane/authentication/utils/host.py

@@ -21,9 +21,7 @@ def base_host(
 
     # Admin redirection
     if is_admin:
-        admin_base_path = getattr(settings, "ADMIN_BASE_PATH", None)
-        if not isinstance(admin_base_path, str):
-            admin_base_path = "/god-mode/"
+        admin_base_path = getattr(settings, "ADMIN_BASE_PATH", "/god-mode/")
         if not admin_base_path.startswith("/"):
             admin_base_path = "/" + admin_base_path
         if not admin_base_path.endswith("/"):
@@ -36,9 +34,7 @@ def base_host(
 
     # Space redirection
     if is_space:
-        space_base_path = getattr(settings, "SPACE_BASE_PATH", None)
-        if not isinstance(space_base_path, str):
-            space_base_path = "/spaces/"
+        space_base_path = getattr(settings, "SPACE_BASE_PATH", "/spaces/")
         if not space_base_path.startswith("/"):
             space_base_path = "/" + space_base_path
         if not space_base_path.endswith("/"):

apiserver/plane/authentication/utils/login.py

@@ -6,7 +6,6 @@ from django.conf import settings
 from plane.utils.host import base_host
 from plane.utils.ip_address import get_client_ip
 
-
 def user_login(request, user, is_app=False, is_admin=False, is_space=False):
     login(request=request, user=user)
 

apiserver/plane/authentication/views/app/email.py

@@ -21,7 +21,6 @@ from plane.authentication.adapter.error import (
 )
 from plane.utils.path_validator import validate_next_path
 
-
 class SignInAuthEndpoint(View):
     def post(self, request):
         next_path = request.POST.get("next_path")

apiserver/plane/authentication/views/app/github.py

@@ -18,7 +18,6 @@ from plane.authentication.adapter.error import (
 )
 from plane.utils.path_validator import validate_next_path
 
-
 class GitHubOauthInitiateEndpoint(View):
     def get(self, request):
         # Get host and next path

apiserver/plane/authentication/views/app/gitlab.py

@@ -18,7 +18,6 @@ from plane.authentication.adapter.error import (
 )
 from plane.utils.path_validator import validate_next_path
 
-
 class GitLabOauthInitiateEndpoint(View):
     def get(self, request):
         # Get host and next path

apiserver/plane/authentication/views/app/google.py

@@ -20,7 +20,6 @@ from plane.authentication.adapter.error import (
 )
 from plane.utils.path_validator import validate_next_path
 
-
 class GoogleOauthInitiateEndpoint(View):
     def get(self, request):
         request.session["host"] = base_host(request=request, is_app=True)
@@ -96,9 +95,7 @@ class GoogleCallbackEndpoint(View):
             # Get the redirection path
             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
-            )
+            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()

apiserver/plane/authentication/views/common.py

@@ -53,14 +53,12 @@ class ChangePasswordEndpoint(APIView):
                     error_message="MISSING_PASSWORD",
                     payload={"error": "Old password is missing"},
                 )
-                return Response(
-                    exc.get_error_dict(), status=status.HTTP_400_BAD_REQUEST
-                )
+                return Response(exc.get_error_dict(), status=status.HTTP_400_BAD_REQUEST)
 
         # Get the new password
         new_password = request.data.get("new_password", False)
 
-        if not new_password:
+        if  not new_password:
             exc = AuthenticationException(
                 error_code=AUTHENTICATION_ERROR_CODES["MISSING_PASSWORD"],
                 error_message="MISSING_PASSWORD",
@@ -68,6 +66,7 @@ class ChangePasswordEndpoint(APIView):
             )
             return Response(exc.get_error_dict(), status=status.HTTP_400_BAD_REQUEST)
 
+
         # If the user password is not autoset then we need to check the old passwords
         if not user.is_password_autoset and not user.check_password(old_password):
             exc = AuthenticationException(

apiserver/plane/authentication/views/space/magic.py

@@ -25,7 +25,6 @@ from plane.authentication.adapter.error import (
 )
 from plane.utils.path_validator import validate_next_path
 
-
 class MagicGenerateSpaceEndpoint(APIView):
     permission_classes = [AllowAny]
 
@@ -39,6 +38,7 @@ class MagicGenerateSpaceEndpoint(APIView):
             )
             return Response(exc.get_error_dict(), status=status.HTTP_400_BAD_REQUEST)
 
+
         email = request.data.get("email", "").strip().lower()
         try:
             validate_email(email)

apiserver/plane/bgtasks/analytic_plot_export.py

@@ -459,37 +459,8 @@ def analytic_export_task(email, data, slug):
 
         csv_buffer = generate_csv_from_rows(rows)
         send_export_email(email, slug, csv_buffer, rows)
-        logging.getLogger("plane.worker").info("Email sent successfully.")
+        logging.getLogger("plane").info("Email sent succesfully.")
         return
     except Exception as e:
         log_exception(e)
         return
-
-
-@shared_task
-def export_analytics_to_csv_email(data, headers, keys, email, slug):
-    try:
-        """
-        Prepares a CSV from data and sends it as an email attachment.
-
-        Parameters:
-        - data: List of dictionaries (e.g. from .values())
-        - headers: List of CSV column headers
-        - keys: Keys to extract from each data item (dict)
-        - email: Email address to send to
-        - slug: Used for the filename
-        """
-        # Prepare rows: header + data rows
-        rows = [headers]
-        for item in data:
-            row = [item.get(key, "") for key in keys]
-            rows.append(row)
-
-        # Generate CSV buffer
-        csv_buffer = generate_csv_from_rows(rows)
-
-        # Send email with CSV attachment
-        send_export_email(email=email, slug=slug, csv_buffer=csv_buffer, rows=rows)
-    except Exception as e:
-        log_exception(e)
-        return

apiserver/plane/bgtasks/email_notification_task.py

@@ -309,7 +309,7 @@ def send_email_notification(
                 )
                 msg.attach_alternative(html_content, "text/html")
                 msg.send()
-                logging.getLogger("plane.worker").info("Email Sent Successfully")
+                logging.getLogger("plane").info("Email Sent Successfully")
 
                 # Update the logs
                 EmailNotificationLog.objects.filter(
@@ -325,7 +325,7 @@ def send_email_notification(
                 release_lock(lock_id=lock_id)
                 return
         else:
-            logging.getLogger("plane.worker").info("Duplicate email received skipping")
+            logging.getLogger("plane").info("Duplicate email received skipping")
             return
     except (Issue.DoesNotExist, User.DoesNotExist):
         release_lock(lock_id=lock_id)

apiserver/plane/bgtasks/export_task.py

@@ -3,49 +3,34 @@ import csv
 import io
 import json
 import zipfile
-from typing import List
+
 import boto3
 from botocore.client import Config
-from uuid import UUID
-from datetime import datetime, date
 
 # Third party imports
 from celery import shared_task
 
-
 # Django imports
 from django.conf import settings
 from django.utils import timezone
 from openpyxl import Workbook
-from django.db.models import F, Prefetch
-
-from collections import defaultdict
 
 # Module imports
-from plane.db.models import ExporterHistory, Issue, FileAsset, Label, User, IssueComment
+from plane.db.models import ExporterHistory, Issue
 from plane.utils.exception_logger import log_exception
 
 
-def dateTimeConverter(time: datetime) -> str | None:
-    """
-    Convert a datetime object to a formatted string.
-    """
+def dateTimeConverter(time):
     if time:
         return time.strftime("%a, %d %b %Y %I:%M:%S %Z%z")
 
 
-def dateConverter(time: date) -> str | None:
-    """
-    Convert a date object to a formatted string.
-    """
+def dateConverter(time):
     if time:
         return time.strftime("%a, %d %b %Y")
 
 
-def create_csv_file(data: List[List[str]]) -> str:
-    """
-    Create a CSV file from the provided data.
-    """
+def create_csv_file(data):
     csv_buffer = io.StringIO()
     csv_writer = csv.writer(csv_buffer, delimiter=",", quoting=csv.QUOTE_ALL)
 
@@ -56,17 +41,11 @@ def create_csv_file(data: List[List[str]]) -> str:
     return csv_buffer.getvalue()
 
 
-def create_json_file(data: List[dict]) -> str:
-    """
-    Create a JSON file from the provided data.
-    """
+def create_json_file(data):
     return json.dumps(data)
 
 
-def create_xlsx_file(data: List[List[str]]) -> bytes:
-    """
-    Create an XLSX file from the provided data.
-    """
+def create_xlsx_file(data):
     workbook = Workbook()
     sheet = workbook.active
 
@@ -79,10 +58,7 @@ def create_xlsx_file(data: List[List[str]]) -> bytes:
     return xlsx_buffer.getvalue()
 
 
-def create_zip_file(files: List[tuple[str, str | bytes]]) -> io.BytesIO:
-    """
-    Create a ZIP file from the provided files.
-    """
+def create_zip_file(files):
     zip_buffer = io.BytesIO()
     with zipfile.ZipFile(zip_buffer, "w", zipfile.ZIP_DEFLATED) as zipf:
         for filename, file_content in files:
@@ -92,13 +68,7 @@ def create_zip_file(files: List[tuple[str, str | bytes]]) -> io.BytesIO:
     return zip_buffer
 
 
-# TODO: Change the upload_to_s3 function to use the new storage method with entry in file asset table
-def upload_to_s3(
-    zip_file: io.BytesIO, workspace_id: UUID, token_id: str, slug: str
-) -> None:
-    """
-    Upload a ZIP file to S3 and generate a presigned URL.
-    """
+def upload_to_s3(zip_file, workspace_id, token_id, slug):
     file_name = (
         f"{workspace_id}/export-{slug}-{token_id[:6]}-{str(timezone.now().date())}.zip"
     )
@@ -180,85 +150,75 @@ def upload_to_s3(
     exporter_instance.save(update_fields=["status", "url", "key"])
 
 
-def generate_table_row(issue: dict) -> List[str]:
-    """
-    Generate a table row from an issue dictionary.
-    """
+def generate_table_row(issue):
     return [
-        f"""{issue["project_identifier"]}-{issue["sequence_id"]}""",
-        issue["project_name"],
+        f"""{issue["project__identifier"]}-{issue["sequence_id"]}""",
+        issue["project__name"],
         issue["name"],
-        issue["description"],
-        issue["state_name"],
+        issue["description_stripped"],
+        issue["state__name"],
         dateConverter(issue["start_date"]),
         dateConverter(issue["target_date"]),
         issue["priority"],
-        issue["created_by"],
-        ", ".join(issue["labels"]) if issue["labels"] else "",
-        issue["cycle_name"],
-        issue["cycle_start_date"],
-        issue["cycle_end_date"],
-        ", ".join(issue.get("module_name", "")) if issue.get("module_name") else "",
+        (
+            f"{issue['created_by__first_name']} {issue['created_by__last_name']}"
+            if issue["created_by__first_name"] and issue["created_by__last_name"]
+            else ""
+        ),
+        (
+            f"{issue['assignees__first_name']} {issue['assignees__last_name']}"
+            if issue["assignees__first_name"] and issue["assignees__last_name"]
+            else ""
+        ),
+        issue["labels__name"] if issue["labels__name"] else "",
+        issue["issue_cycle__cycle__name"],
+        dateConverter(issue["issue_cycle__cycle__start_date"]),
+        dateConverter(issue["issue_cycle__cycle__end_date"]),
+        issue["issue_module__module__name"],
+        dateConverter(issue["issue_module__module__start_date"]),
+        dateConverter(issue["issue_module__module__target_date"]),
         dateTimeConverter(issue["created_at"]),
         dateTimeConverter(issue["updated_at"]),
         dateTimeConverter(issue["completed_at"]),
         dateTimeConverter(issue["archived_at"]),
-        (
-            ", ".join(
-                [
-                    f"{comment['comment']} ({comment['created_at']} by {comment['created_by']})"
-                    for comment in issue["comments"]
-                ]
-            )
-            if issue["comments"]
-            else ""
-        ),
-        issue["estimate"] if issue["estimate"] else "",
-        ", ".join(issue["link"]) if issue["link"] else "",
-        ", ".join(issue["assignees"]) if issue["assignees"] else "",
-        issue["subscribers_count"] if issue["subscribers_count"] else "",
-        issue["attachment_count"] if issue["attachment_count"] else "",
-        ", ".join(issue["attachment_links"]) if issue["attachment_links"] else "",
     ]
 
 
-def generate_json_row(issue: dict) -> dict:
-    """
-    Generate a JSON row from an issue dictionary.
-    """
+def generate_json_row(issue):
     return {
-        "ID": f"""{issue["project_identifier"]}-{issue["sequence_id"]}""",
-        "Project": issue["project_name"],
+        "ID": f"""{issue["project__identifier"]}-{issue["sequence_id"]}""",
+        "Project": issue["project__name"],
         "Name": issue["name"],
-        "Description": issue["description"],
-        "State": issue["state_name"],
+        "Description": issue["description_stripped"],
+        "State": issue["state__name"],
         "Start Date": dateConverter(issue["start_date"]),
         "Target Date": dateConverter(issue["target_date"]),
         "Priority": issue["priority"],
-        "Created By": (f"{issue['created_by']}" if issue["created_by"] else ""),
-        "Assignee": issue["assignees"],
-        "Labels": issue["labels"],
-        "Cycle Name": issue["cycle_name"],
-        "Cycle Start Date": issue["cycle_start_date"],
-        "Cycle End Date": issue["cycle_end_date"],
-        "Module Name": issue["module_name"],
+        "Created By": (
+            f"{issue['created_by__first_name']} {issue['created_by__last_name']}"
+            if issue["created_by__first_name"] and issue["created_by__last_name"]
+            else ""
+        ),
+        "Assignee": (
+            f"{issue['assignees__first_name']} {issue['assignees__last_name']}"
+            if issue["assignees__first_name"] and issue["assignees__last_name"]
+            else ""
+        ),
+        "Labels": issue["labels__name"] if issue["labels__name"] else "",
+        "Cycle Name": issue["issue_cycle__cycle__name"],
+        "Cycle Start Date": dateConverter(issue["issue_cycle__cycle__start_date"]),
+        "Cycle End Date": dateConverter(issue["issue_cycle__cycle__end_date"]),
+        "Module Name": issue["issue_module__module__name"],
+        "Module Start Date": dateConverter(issue["issue_module__module__start_date"]),
+        "Module Target Date": dateConverter(issue["issue_module__module__target_date"]),
         "Created At": dateTimeConverter(issue["created_at"]),
         "Updated At": dateTimeConverter(issue["updated_at"]),
         "Completed At": dateTimeConverter(issue["completed_at"]),
         "Archived At": dateTimeConverter(issue["archived_at"]),
-        "Comments": issue["comments"],
-        "Estimate": issue["estimate"],
-        "Link": issue["link"],
-        "Subscribers Count": issue["subscribers_count"],
-        "Attachment Count": issue["attachment_count"],
-        "Attachment Links": issue["attachment_links"],
     }
 
 
-def update_json_row(rows: List[dict], row: dict) -> None:
-    """
-    Update the json row with the new assignee and label.
-    """
+def update_json_row(rows, row):
     matched_index = next(
         (
             index
@@ -287,10 +247,7 @@ def update_json_row(rows: List[dict], row: dict) -> None:
         rows.append(row)
 
 
-def update_table_row(rows: List[List[str]], row: List[str]) -> None:
-    """
-    Update the table row with the new assignee and label.
-    """
+def update_table_row(rows, row):
     matched_index = next(
         (index for index, existing_row in enumerate(rows) if existing_row[0] == row[0]),
         None,
@@ -312,12 +269,7 @@ def update_table_row(rows: List[List[str]], row: List[str]) -> None:
         rows.append(row)
 
 
-def generate_csv(
-    header: List[str],
-    project_id: str,
-    issues: List[dict],
-    files: List[tuple[str, str | bytes]],
-) -> None:
+def generate_csv(header, project_id, issues, files):
     """
     Generate CSV export for all the passed issues.
     """
@@ -329,15 +281,7 @@ def generate_csv(
     files.append((f"{project_id}.csv", csv_file))
 
 
-def generate_json(
-    header: List[str],
-    project_id: str,
-    issues: List[dict],
-    files: List[tuple[str, str | bytes]],
-) -> None:
-    """
-    Generate JSON export for all the passed issues.
-    """
+def generate_json(header, project_id, issues, files):
     rows = []
     for issue in issues:
         row = generate_json_row(issue)
@@ -346,169 +290,68 @@ def generate_json(
     files.append((f"{project_id}.json", json_file))
 
 
-def generate_xlsx(
-    header: List[str],
-    project_id: str,
-    issues: List[dict],
-    files: List[tuple[str, str | bytes]],
-) -> None:
-    """
-    Generate XLSX export for all the passed issues.
-    """
+def generate_xlsx(header, project_id, issues, files):
     rows = [header]
     for issue in issues:
         row = generate_table_row(issue)
-
         update_table_row(rows, row)
     xlsx_file = create_xlsx_file(rows)
     files.append((f"{project_id}.xlsx", xlsx_file))
 
 
-def get_created_by(obj: Issue | IssueComment) -> str:
-    """
-    Get the created by user for the given object.
-    """
-    if obj.created_by:
-        return f"{obj.created_by.first_name} {obj.created_by.last_name}"
-    return ""
-
-
 @shared_task
-def issue_export_task(
-    provider: str,
-    workspace_id: UUID,
-    project_ids: List[str],
-    token_id: str,
-    multiple: bool,
-    slug: str,
-):
-    """
-    Export issues from the workspace.
-    provider (str): The provider to export the issues to csv | json | xlsx.
-    token_id (str): The export object token id.
-    multiple (bool): Whether to export the issues to multiple files per project.
-    """
+def issue_export_task(provider, workspace_id, project_ids, token_id, multiple, slug):
     try:
         exporter_instance = ExporterHistory.objects.get(token=token_id)
         exporter_instance.status = "processing"
         exporter_instance.save(update_fields=["status"])
 
-        # Base query to get the issues
         workspace_issues = (
-            Issue.objects.filter(
-                workspace__id=workspace_id,
-                project_id__in=project_ids,
-                project__project_projectmember__member=exporter_instance.initiated_by_id,
-                project__project_projectmember__is_active=True,
-                project__archived_at__isnull=True,
-            )
-            .select_related(
-                "project",
-                "workspace",
-                "state",
-                "parent",
-                "created_by",
-                "estimate_point",
-            )
-            .prefetch_related(
-                "labels",
-                "issue_cycle__cycle",
-                "issue_module__module",
-                "issue_comments",
-                "assignees",
-                Prefetch(
-                    "assignees",
-                    queryset=User.objects.only("first_name", "last_name").distinct(),
-                    to_attr="assignee_details",
-                ),
-                Prefetch(
-                    "labels",
-                    queryset=Label.objects.only("name").distinct(),
-                    to_attr="label_details",
-                ),
-                "issue_subscribers",
-                "issue_link",
+            (
+                Issue.objects.filter(
+                    workspace__id=workspace_id,
+                    project_id__in=project_ids,
+                    project__project_projectmember__member=exporter_instance.initiated_by_id,
+                    project__project_projectmember__is_active=True,
+                    project__archived_at__isnull=True,
+                )
+                .select_related("project", "workspace", "state", "parent", "created_by")
+                .prefetch_related(
+                    "assignees", "labels", "issue_cycle__cycle", "issue_module__module"
+                )
+                .values(
+                    "id",
+                    "project__identifier",
+                    "project__name",
+                    "project__id",
+                    "sequence_id",
+                    "name",
+                    "description_stripped",
+                    "priority",
+                    "start_date",
+                    "target_date",
+                    "state__name",
+                    "created_at",
+                    "updated_at",
+                    "completed_at",
+                    "archived_at",
+                    "issue_cycle__cycle__name",
+                    "issue_cycle__cycle__start_date",
+                    "issue_cycle__cycle__end_date",
+                    "issue_module__module__name",
+                    "issue_module__module__start_date",
+                    "issue_module__module__target_date",
+                    "created_by__first_name",
+                    "created_by__last_name",
+                    "assignees__first_name",
+                    "assignees__last_name",
+                    "labels__name",
+                )
             )
+            .order_by("project__identifier", "sequence_id")
+            .distinct()
         )
-
-        # Get the attachments for the issues
-        file_assets = FileAsset.objects.filter(
-            issue_id__in=workspace_issues.values_list("id", flat=True),
-            entity_type=FileAsset.EntityTypeContext.ISSUE_ATTACHMENT,
-        ).annotate(work_item_id=F("issue_id"), asset_id=F("id"))
-
-        # Create a dictionary to store the attachments for the issues
-        attachment_dict = defaultdict(list)
-        for asset in file_assets:
-            attachment_dict[asset.work_item_id].append(asset.asset_id)
-
-        # Create a list to store the issues data
-        issues_data = []
-
-        # Iterate over the issues
-        for issue in workspace_issues:
-            attachments = attachment_dict.get(issue.id, [])
-
-            issue_data = {
-                "id": issue.id,
-                "project_identifier": issue.project.identifier,
-                "project_name": issue.project.name,
-                "project_id": issue.project.id,
-                "sequence_id": issue.sequence_id,
-                "name": issue.name,
-                "description": issue.description_stripped,
-                "priority": issue.priority,
-                "start_date": issue.start_date,
-                "target_date": issue.target_date,
-                "state_name": issue.state.name if issue.state else None,
-                "created_at": issue.created_at,
-                "updated_at": issue.updated_at,
-                "completed_at": issue.completed_at,
-                "archived_at": issue.archived_at,
-                "module_name": [
-                    module.module.name for module in issue.issue_module.all()
-                ],
-                "created_by": get_created_by(issue),
-                "labels": [label.name for label in issue.label_details],
-                "comments": [
-                    {
-                        "comment": comment.comment_stripped,
-                        "created_at": dateConverter(comment.created_at),
-                        "created_by": get_created_by(comment),
-                    }
-                    for comment in issue.issue_comments.all()
-                ],
-                "estimate": issue.estimate_point.value
-                if issue.estimate_point and issue.estimate_point.value
-                else "",
-                "link": [link.url for link in issue.issue_link.all()],
-                "assignees": [
-                    f"{assignee.first_name} {assignee.last_name}"
-                    for assignee in issue.assignee_details
-                ],
-                "subscribers_count": issue.issue_subscribers.count(),
-                "attachment_count": len(attachments),
-                "attachment_links": [
-                    f"/api/assets/v2/workspaces/{issue.workspace.slug}/projects/{issue.project_id}/issues/{issue.id}/attachments/{asset}/"
-                    for asset in attachments
-                ],
-            }
-
-            # Get Cycles data for the issue
-            cycle = issue.issue_cycle.last()
-            if cycle:
-                # Update cycle data
-                issue_data["cycle_name"] = cycle.cycle.name
-                issue_data["cycle_start_date"] = dateConverter(cycle.cycle.start_date)
-                issue_data["cycle_end_date"] = dateConverter(cycle.cycle.end_date)
-            else:
-                issue_data["cycle_name"] = ""
-                issue_data["cycle_start_date"] = ""
-                issue_data["cycle_end_date"] = ""
-
-            issues_data.append(issue_data)
-
-            # CSV header
+        # CSV header
         header = [
             "ID",
             "Project",
@@ -519,25 +362,20 @@ def issue_export_task(
             "Target Date",
             "Priority",
             "Created By",
+            "Assignee",
             "Labels",
             "Cycle Name",
             "Cycle Start Date",
             "Cycle End Date",
             "Module Name",
+            "Module Start Date",
+            "Module Target Date",
             "Created At",
             "Updated At",
             "Completed At",
             "Archived At",
-            "Comments",
-            "Estimate",
-            "Link",
-            "Assignees",
-            "Subscribers Count",
-            "Attachment Count",
-            "Attachment Links",
         ]
 
-        # Map the provider to the function
         EXPORTER_MAPPER = {
             "csv": generate_csv,
             "json": generate_json,
@@ -546,13 +384,8 @@ def issue_export_task(
 
         files = []
         if multiple:
-            project_dict = defaultdict(list)
-            for issue in issues_data:
-                project_dict[str(issue["project_id"])].append(issue)
-
             for project_id in project_ids:
-                issues = project_dict.get(str(project_id), [])
-
+                issues = workspace_issues.filter(project__id=project_id)
                 exporter = EXPORTER_MAPPER.get(provider)
                 if exporter is not None:
                     exporter(header, project_id, issues, files)
@@ -560,7 +393,7 @@ def issue_export_task(
         else:
             exporter = EXPORTER_MAPPER.get(provider)
             if exporter is not None:
-                exporter(header, workspace_id, issues_data, files)
+                exporter(header, workspace_id, workspace_issues, files)
 
         zip_buffer = create_zip_file(files)
         upload_to_s3(zip_buffer, workspace_id, token_id, slug)

apiserver/plane/bgtasks/forgot_password_task.py

@@ -63,7 +63,7 @@ def forgot_password(first_name, email, uidb64, token, current_site):
         )
         msg.attach_alternative(html_content, "text/html")
         msg.send()
-        logging.getLogger("plane.worker").info("Email sent successfully")
+        logging.getLogger("plane").info("Email sent successfully")
         return
     except Exception as e:
         log_exception(e)

apiserver/plane/bgtasks/magic_link_code_task.py

@@ -53,7 +53,7 @@ def magic_link(email, key, token):
         )
         msg.attach_alternative(html_content, "text/html")
         msg.send()
-        logging.getLogger("plane.worker").info("Email sent successfully.")
+        logging.getLogger("plane").info("Email sent successfully.")
         return
     except Exception as e:
         log_exception(e)

apiserver/plane/bgtasks/project_add_user_email_task.py

@@ -80,7 +80,7 @@ def project_add_user_email(current_site, project_member_id, invitor_id):
         # Send the email
         msg.send()
         # Log the success
-        logging.getLogger("plane.worker").info("Email sent successfully.")
+        logging.getLogger("plane").info("Email sent successfully.")
         return
     except Exception as e:
         log_exception(e)

apiserver/plane/bgtasks/project_invitation_task.py

@@ -76,7 +76,7 @@ def project_invitation(email, project_id, token, current_site, invitor):
 
         msg.attach_alternative(html_content, "text/html")
         msg.send()
-        logging.getLogger("plane.worker").info("Email sent successfully.")
+        logging.getLogger("plane").info("Email sent successfully.")
         return
     except (Project.DoesNotExist, ProjectMemberInvite.DoesNotExist):
         return

apiserver/plane/bgtasks/user_activation_email_task.py

@@ -58,7 +58,7 @@ def user_activation_email(current_site, user_id):
 
         msg.attach_alternative(html_content, "text/html")
         msg.send()
-        logging.getLogger("plane.worker").info("Email sent successfully.")
+        logging.getLogger("plane").info("Email sent successfully.")
         return
     except Exception as e:
         log_exception(e)

apiserver/plane/bgtasks/user_deactivation_email_task.py

@@ -60,7 +60,7 @@ def user_deactivation_email(current_site, user_id):
         # Attach HTML content
         msg.attach_alternative(html_content, "text/html")
         msg.send()
-        logging.getLogger("plane.worker").info("Email sent successfully.")
+        logging.getLogger("plane").info("Email sent successfully.")
         return
     except Exception as e:
         log_exception(e)

apiserver/plane/bgtasks/workspace_invitation_task.py

@@ -78,7 +78,7 @@ def workspace_invitation(email, workspace_id, token, current_site, inviter):
         )
         msg.attach_alternative(html_content, "text/html")
         msg.send()
-        logging.getLogger("plane.worker").info("Email sent successfully")
+        logging.getLogger("plane").info("Email sent successfully")
         return
     except (Workspace.DoesNotExist, WorkspaceMemberInvite.DoesNotExist):
         return

apiserver/plane/db/management/commands/update_deleted_workspace_slug.py

@@ -5,9 +5,7 @@ from plane.db.models import Workspace
 
 
 class Command(BaseCommand):
-    help = (
-        "Updates the slug of a soft-deleted workspace by appending the epoch timestamp"
-    )
+    help = "Updates the slug of a soft-deleted workspace by appending the epoch timestamp"
 
     def add_arguments(self, parser):
         parser.add_argument(
@@ -77,4 +75,4 @@ class Command(BaseCommand):
                     self.style.ERROR(
                         f"Error updating workspace '{workspace.name}': {str(e)}"
                     )
-                )
+                )

apiserver/plane/db/migrations/0095_page_external_id_page_external_source.py

@@ -1,23 +0,0 @@
-# Generated by Django 4.2.14 on 2025-05-09 11:31
-
-from django.db import migrations, models
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('db', '0094_auto_20250425_0902'),
-    ]
-
-    operations = [
-        migrations.AddField(
-            model_name='page',
-            name='external_id',
-            field=models.CharField(blank=True, max_length=255, null=True),
-        ),
-        migrations.AddField(
-            model_name='page',
-            name='external_source',
-            field=models.CharField(blank=True, max_length=255, null=True),
-        ),
-    ]

apiserver/plane/db/models/__init__.py

@@ -82,4 +82,4 @@ from .label import Label
 
 from .device import Device, DeviceSession
 
-from .sticky import Sticky
+from .sticky import Sticky

apiserver/plane/db/models/base.py

@@ -18,28 +18,22 @@ class BaseModel(AuditModel):
     class Meta:
         abstract = True
 
-    def save(self, *args, created_by_id=None, disable_auto_set_user=False, **kwargs):
-        if not disable_auto_set_user:
-            # Check if created_by_id is provided
-            if created_by_id:
-                self.created_by_id = created_by_id
-            else:
-                user = get_current_user()
+    def save(self, *args, **kwargs):
+        user = get_current_user()
 
-                if user is None or user.is_anonymous:
-                    self.created_by = None
-                    self.updated_by = None
-                else:
-                    # Check if the model is being created or updated
-                    if self._state.adding:
-                        # If creating, set created_by and leave updated_by as None
-                        self.created_by = user
-                        self.updated_by = None
-                    else:
-                        # If updating, set updated_by only
-                        self.updated_by = user
-
-        super(BaseModel, self).save(*args, **kwargs)
+        if user is None or user.is_anonymous:
+            self.created_by = None
+            self.updated_by = None
+            super(BaseModel, self).save(*args, **kwargs)
+        else:
+            # Check if the model is being created or updated
+            if self._state.adding:
+                # If created only set created_by value: set updated_by to None
+                self.created_by = user
+                self.updated_by = None
+            # If updated only set updated_by value don't touch created_by
+            self.updated_by = user
+            super(BaseModel, self).save(*args, **kwargs)
 
     def __str__(self):
         return str(self.id)

apiserver/plane/db/models/page.py

@@ -58,9 +58,6 @@ class Page(BaseModel):
     moved_to_page = models.UUIDField(null=True, blank=True)
     moved_to_project = models.UUIDField(null=True, blank=True)
 
-    external_id = models.CharField(max_length=255, null=True, blank=True)
-    external_source = models.CharField(max_length=255, null=True, blank=True)
-
     class Meta:
         verbose_name = "Page"
         verbose_name_plural = "Pages"

apiserver/plane/db/models/workspace.py

@@ -153,8 +153,12 @@ class Workspace(BaseModel):
         return None
 
     def delete(
-        self, using: Optional[str] = None, soft: bool = True, *args: Any, **kwargs: Any
-    ):
+            self,
+            using: Optional[str] = None,
+            soft: bool = True,
+            *args: Any,
+            **kwargs: Any
+        ):
         """
         Override the delete method to append epoch timestamp to the slug when soft deleting.
 
@@ -168,7 +172,7 @@ class Workspace(BaseModel):
         result = super().delete(using=using, soft=soft, *args, **kwargs)
 
         # If it's a soft delete and the model still exists (not hard deleted)
-        if soft and hasattr(self, "deleted_at") and self.deleted_at:
+        if soft and hasattr(self, 'deleted_at') and self.deleted_at:
             # Use the deleted_at timestamp to update the slug
             deletion_timestamp: int = int(self.deleted_at.timestamp())
             self.slug = f"{self.slug}__{deletion_timestamp}"

apiserver/plane/license/management/commands/configure_instance.py

@@ -157,7 +157,7 @@ class Command(BaseCommand):
             },
             # Deprecated, use LLM_MODEL
             {
-                "key": "GPT_ENGINE",
+                "key": "GPT_ENGINE",  
                 "value": os.environ.get("GPT_ENGINE", "gpt-3.5-turbo"),
                 "category": "SMTP",
                 "is_encrypted": False,

apiserver/plane/settings/storage.py

@@ -32,6 +32,7 @@ class S3Storage(S3Boto3Storage):
         ) or os.environ.get("MINIO_ENDPOINT_URL")
 
         if os.environ.get("USE_MINIO") == "1":
+
             # Determine protocol based on environment variable
             if os.environ.get("MINIO_ENDPOINT_SSL") == "1":
                 endpoint_protocol = "https"

apiserver/plane/space/utils/grouper.py

@@ -135,7 +135,7 @@ def issue_on_results(
                 default=None,
                 output_field=JSONField(),
             ),
-            filter=Q(votes__isnull=False, votes__deleted_at__isnull=True),
+            filter=Q(votes__isnull=False,votes__deleted_at__isnull=True),
             distinct=True,
         ),
         reaction_items=ArrayAgg(
@@ -169,9 +169,7 @@ def issue_on_results(
                 default=None,
                 output_field=JSONField(),
             ),
-            filter=Q(
-                issue_reactions__isnull=False, issue_reactions__deleted_at__isnull=True
-            ),
+            filter=Q(issue_reactions__isnull=False, issue_reactions__deleted_at__isnull=True),
             distinct=True,
         ),
     ).values(*required_fields, "vote_items", "reaction_items")

apiserver/plane/space/views/meta.py

@@ -14,7 +14,9 @@ class ProjectMetaDataEndpoint(BaseAPIView):
 
     def get(self, request, anchor):
         try:
-            deploy_board = DeployBoard.objects.get(anchor=anchor, entity_name="project")
+            deploy_board = DeployBoard.objects.get(
+                anchor=anchor, entity_name="project"
+            )
         except DeployBoard.DoesNotExist:
             return Response(
                 {"error": "Project is not published"}, status=status.HTTP_404_NOT_FOUND

apiserver/plane/urls.py

@@ -2,10 +2,12 @@
 
 from django.conf import settings
 from django.urls import include, path, re_path
+from django.views.generic import TemplateView
 
 handler404 = "plane.app.views.error_404.custom_404_view"
 
 urlpatterns = [
+    path("", TemplateView.as_view(template_name="index.html")),
     path("api/", include("plane.app.urls")),
     path("api/public/", include("plane.space.urls")),
     path("api/instances/", include("plane.license.urls")),

apiserver/plane/utils/analytics_plot.py

@@ -182,7 +182,9 @@ def burndown_plot(queryset, slug, project_id, plot_type, cycle_id=None, module_i
         # Get all dates between the two dates
         date_range = [
             (queryset.start_date + timedelta(days=x))
-            for x in range((queryset.target_date - queryset.start_date).days + 1)
+            for x in range(
+                (queryset.target_date - queryset.start_date).days + 1
+            )
         ]
 
         chart_data = {str(date): 0 for date in date_range}

apiserver/plane/utils/build_chart.py

@@ -1,204 +0,0 @@
-from typing import Dict, Any, Tuple, Optional, List, Union
-
-
-# Django imports
-from django.db.models import (
-    Count,
-    F,
-    QuerySet,
-    Aggregate,
-)
-
-from plane.db.models import Issue
-from rest_framework.exceptions import ValidationError
-
-
-x_axis_mapper = {
-    "STATES": "STATES",
-    "STATE_GROUPS": "STATE_GROUPS",
-    "LABELS": "LABELS",
-    "ASSIGNEES": "ASSIGNEES",
-    "ESTIMATE_POINTS": "ESTIMATE_POINTS",
-    "CYCLES": "CYCLES",
-    "MODULES": "MODULES",
-    "PRIORITY": "PRIORITY",
-    "START_DATE": "START_DATE",
-    "TARGET_DATE": "TARGET_DATE",
-    "CREATED_AT": "CREATED_AT",
-    "COMPLETED_AT": "COMPLETED_AT",
-    "CREATED_BY": "CREATED_BY",
-}
-
-
-def get_y_axis_filter(y_axis: str) -> Dict[str, Any]:
-    filter_mapping = {
-        "WORK_ITEM_COUNT": {"id": F("id")},
-    }
-    return filter_mapping.get(y_axis, {})
-
-
-def get_x_axis_field() -> Dict[str, Tuple[str, str, Optional[Dict[str, Any]]]]:
-    return {
-        "STATES": ("state__id", "state__name", None),
-        "STATE_GROUPS": ("state__group", "state__group", None),
-        "LABELS": (
-            "labels__id",
-            "labels__name",
-            {"label_issue__deleted_at__isnull": True},
-        ),
-        "ASSIGNEES": (
-            "assignees__id",
-            "assignees__display_name",
-            {"issue_assignee__deleted_at__isnull": True},
-        ),
-        "ESTIMATE_POINTS": ("estimate_point__value", "estimate_point__key", None),
-        "CYCLES": (
-            "issue_cycle__cycle_id",
-            "issue_cycle__cycle__name",
-            {"issue_cycle__deleted_at__isnull": True},
-        ),
-        "MODULES": (
-            "issue_module__module_id",
-            "issue_module__module__name",
-            {"issue_module__deleted_at__isnull": True},
-        ),
-        "PRIORITY": ("priority", "priority", None),
-        "START_DATE": ("start_date", "start_date", None),
-        "TARGET_DATE": ("target_date", "target_date", None),
-        "CREATED_AT": ("created_at__date", "created_at__date", None),
-        "COMPLETED_AT": ("completed_at__date", "completed_at__date", None),
-        "CREATED_BY": ("created_by_id", "created_by__display_name", None),
-    }
-
-
-def process_grouped_data(
-    data: List[Dict[str, Any]],
-) -> Tuple[List[Dict[str, Any]], Dict[str, str]]:
-    response = {}
-    schema = {}
-
-    for item in data:
-        key = item["key"]
-        if key not in response:
-            response[key] = {
-                "key": key if key else "none",
-                "name": (
-                    item.get("display_name", key)
-                    if item.get("display_name", key)
-                    else "None"
-                ),
-                "count": 0,
-            }
-        group_key = str(item["group_key"]) if item["group_key"] else "none"
-        schema[group_key] = item.get("group_name", item["group_key"])
-        schema[group_key] = schema[group_key] if schema[group_key] else "None"
-        response[key][group_key] = response[key].get(group_key, 0) + item["count"]
-        response[key]["count"] += item["count"]
-
-    return list(response.values()), schema
-
-
-def build_number_chart_response(
-    queryset: QuerySet[Issue],
-    y_axis_filter: Dict[str, Any],
-    y_axis: str,
-    aggregate_func: Aggregate,
-) -> List[Dict[str, Any]]:
-    count = (
-        queryset.filter(**y_axis_filter).aggregate(total=aggregate_func).get("total", 0)
-    )
-    return [{"key": y_axis, "name": y_axis, "count": count}]
-
-
-def build_grouped_chart_response(
-    queryset: QuerySet[Issue],
-    id_field: str,
-    name_field: str,
-    group_field: str,
-    group_name_field: str,
-    aggregate_func: Aggregate,
-) -> Tuple[List[Dict[str, Any]], Dict[str, str]]:
-    data = (
-        queryset.annotate(
-            key=F(id_field),
-            group_key=F(group_field),
-            group_name=F(group_name_field),
-            display_name=F(name_field) if name_field else F(id_field),
-        )
-        .values("key", "group_key", "group_name", "display_name")
-        .annotate(count=aggregate_func)
-        .order_by("-count")
-    )
-    return process_grouped_data(data)
-
-
-def build_simple_chart_response(
-    queryset: QuerySet, id_field: str, name_field: str, aggregate_func: Aggregate
-) -> List[Dict[str, Any]]:
-    data = (
-        queryset.annotate(
-            key=F(id_field), display_name=F(name_field) if name_field else F(id_field)
-        )
-        .values("key", "display_name")
-        .annotate(count=aggregate_func)
-        .order_by("key")
-    )
-
-    return [
-        {
-            "key": item["key"] if item["key"] else "None",
-            "name": item["display_name"] if item["display_name"] else "None",
-            "count": item["count"],
-        }
-        for item in data
-    ]
-
-
-def build_analytics_chart(
-    queryset: QuerySet[Issue],
-    x_axis: str,
-    group_by: Optional[str] = None,
-    date_filter: Optional[str] = None,
-) -> Dict[str, Union[List[Dict[str, Any]], Dict[str, str]]]:
-    # Validate x_axis
-    if x_axis not in x_axis_mapper:
-        raise ValidationError(f"Invalid x_axis field: {x_axis}")
-
-    # Validate group_by
-    if group_by and group_by not in x_axis_mapper:
-        raise ValidationError(f"Invalid group_by field: {group_by}")
-
-    field_mapping = get_x_axis_field()
-
-    id_field, name_field, additional_filter = field_mapping.get(
-        x_axis, (None, None, {})
-    )
-    group_field, group_name_field, group_additional_filter = field_mapping.get(
-        group_by, (None, None, {})
-    )
-
-    # Apply additional filters if they exist
-    if additional_filter or {}:
-        queryset = queryset.filter(**additional_filter)
-
-    if group_additional_filter or {}:
-        queryset = queryset.filter(**group_additional_filter)
-
-    aggregate_func = Count("id", distinct=True)
-
-    if group_field:
-        response, schema = build_grouped_chart_response(
-            queryset,
-            id_field,
-            name_field,
-            group_field,
-            group_name_field,
-            aggregate_func,
-        )
-    else:
-        response = build_simple_chart_response(
-            queryset, id_field, name_field, aggregate_func
-        )
-        schema = {}
-
-    return {"data": response, "schema": schema}

apiserver/plane/utils/date_utils.py

@@ -1,201 +0,0 @@
-from datetime import datetime, timedelta, date
-from django.utils import timezone
-from typing import Dict, Optional, List, Union, Tuple, Any
-
-from plane.db.models import User
-
-
-def get_analytics_date_range(
-    date_filter: Optional[str] = None,
-    start_date: Optional[str] = None,
-    end_date: Optional[str] = None,
-) -> Optional[Dict[str, Dict[str, datetime]]]:
-    """
-    Get date range for analytics with current and previous periods for comparison.
-    Returns a dictionary with current and previous date ranges.
-
-    Args:
-        date_filter (str): The type of date filter to apply
-        start_date (str): Start date for custom range (format: YYYY-MM-DD)
-        end_date (str): End date for custom range (format: YYYY-MM-DD)
-
-    Returns:
-        dict: Dictionary containing current and previous date ranges
-    """
-    if not date_filter:
-        return None
-
-    today = timezone.now().date()
-
-    if date_filter == "yesterday":
-        yesterday = today - timedelta(days=1)
-        return {
-            "current": {
-                "gte": datetime.combine(yesterday, datetime.min.time()),
-                "lte": datetime.combine(yesterday, datetime.max.time()),
-            }
-        }
-    elif date_filter == "last_7_days":
-        return {
-            "current": {
-                "gte": datetime.combine(today - timedelta(days=7), datetime.min.time()),
-                "lte": datetime.combine(today, datetime.max.time()),
-            },
-            "previous": {
-                "gte": datetime.combine(
-                    today - timedelta(days=14), datetime.min.time()
-                ),
-                "lte": datetime.combine(today - timedelta(days=8), datetime.max.time()),
-            },
-        }
-    elif date_filter == "last_30_days":
-        return {
-            "current": {
-                "gte": datetime.combine(
-                    today - timedelta(days=30), datetime.min.time()
-                ),
-                "lte": datetime.combine(today, datetime.max.time()),
-            },
-            "previous": {
-                "gte": datetime.combine(
-                    today - timedelta(days=60), datetime.min.time()
-                ),
-                "lte": datetime.combine(
-                    today - timedelta(days=31), datetime.max.time()
-                ),
-            },
-        }
-    elif date_filter == "last_3_months":
-        return {
-            "current": {
-                "gte": datetime.combine(
-                    today - timedelta(days=90), datetime.min.time()
-                ),
-                "lte": datetime.combine(today, datetime.max.time()),
-            },
-            "previous": {
-                "gte": datetime.combine(
-                    today - timedelta(days=180), datetime.min.time()
-                ),
-                "lte": datetime.combine(
-                    today - timedelta(days=91), datetime.max.time()
-                ),
-            },
-        }
-    elif date_filter == "custom" and start_date and end_date:
-        try:
-            start = datetime.strptime(start_date, "%Y-%m-%d").date()
-            end = datetime.strptime(end_date, "%Y-%m-%d").date()
-            return {
-                "current": {
-                    "gte": datetime.combine(start, datetime.min.time()),
-                    "lte": datetime.combine(end, datetime.max.time()),
-                }
-            }
-        except (ValueError, TypeError):
-            return None
-    return None
-
-
-def get_chart_period_range(
-    date_filter: Optional[str] = None,
-) -> Optional[Tuple[date, date]]:
-    """
-    Get date range for chart visualization.
-    Returns a tuple of (start_date, end_date) for the specified period.
-
-    Args:
-        date_filter (str): The type of date filter to apply. Options are:
-            - "yesterday": Yesterday's date
-            - "last_7_days": Last 7 days
-            - "last_30_days": Last 30 days
-            - "last_3_months": Last 90 days
-            Defaults to "last_7_days" if not specified or invalid.
-
-    Returns:
-        tuple: A tuple containing (start_date, end_date) as date objects
-    """
-    if not date_filter:
-        return None
-
-    today = timezone.now().date()
-    period_ranges = {
-        "yesterday": (
-            today - timedelta(days=1),
-            today - timedelta(days=1),
-        ),
-        "last_7_days": (today - timedelta(days=7), today),
-        "last_30_days": (today - timedelta(days=30), today),
-        "last_3_months": (today - timedelta(days=90), today),
-    }
-
-    return period_ranges.get(date_filter, None)
-
-
-def get_analytics_filters(
-    slug: str,
-    user: User,
-    type: str,
-    date_filter: Optional[str] = None,
-    project_ids: Optional[Union[str, List[str]]] = None,
-) -> Dict[str, Any]:
-    """
-    Get combined project and date filters for analytics endpoints
-
-    Args:
-        slug: The workspace slug
-        user: The current user
-        type: The type of filter ("analytics" or "chart")
-        date_filter: Optional date filter string
-        project_ids: Optional list of project IDs or comma-separated string of project IDs
-
-    Returns:
-        dict: A dictionary containing:
-            - base_filters: Base filters for the workspace and user
-            - project_filters: Project-specific filters
-            - analytics_date_range: Date range filters for analytics comparison
-            - chart_period_range: Date range for chart visualization
-    """
-    # Get project IDs from request
-    if project_ids and isinstance(project_ids, str):
-        project_ids = [str(project_id) for project_id in project_ids.split(",")]
-
-    # Base filters for workspace and user
-    base_filters = {
-        "workspace__slug": slug,
-        "project__project_projectmember__member": user,
-        "project__project_projectmember__is_active": True,
-        "project__deleted_at__isnull": True,
-        "project__archived_at__isnull": True,
-    }
-
-    # Project filters
-    project_filters = {
-        "workspace__slug": slug,
-        "project_projectmember__member": user,
-        "project_projectmember__is_active": True,
-        "deleted_at__isnull": True,
-        "archived_at__isnull": True,
-    }
-
-    # Add project IDs to filters if provided
-    if project_ids:
-        base_filters["project_id__in"] = project_ids
-        project_filters["id__in"] = project_ids
-
-    # Initialize date range variables
-    analytics_date_range = None
-    chart_period_range = None
-
-    # Get date range filters based on type
-    if type == "analytics":
-        analytics_date_range = get_analytics_date_range(date_filter)
-    elif type == "chart":
-        chart_period_range = get_chart_period_range(date_filter)
-
-    return {
-        "base_filters": base_filters,
-        "project_filters": project_filters,
-        "analytics_date_range": analytics_date_range,
-        "chart_period_range": chart_period_range,
-    }

apiserver/plane/utils/host.py

@@ -25,9 +25,7 @@ def base_host(
 
     # Admin redirection
     if is_admin:
-        admin_base_path = getattr(settings, "ADMIN_BASE_PATH", None)
-        if not isinstance(admin_base_path, str):
-            admin_base_path = "/god-mode/"
+        admin_base_path = getattr(settings, "ADMIN_BASE_PATH", "/god-mode/")
         if not admin_base_path.startswith("/"):
             admin_base_path = "/" + admin_base_path
         if not admin_base_path.endswith("/"):
@@ -40,9 +38,7 @@ def base_host(
 
     # Space redirection
     if is_space:
-        space_base_path = getattr(settings, "SPACE_BASE_PATH", None)
-        if not isinstance(space_base_path, str):
-            space_base_path = "/spaces/"
+        space_base_path = getattr(settings, "SPACE_BASE_PATH", "/spaces/")
         if not space_base_path.startswith("/"):
             space_base_path = "/" + space_base_path
         if not space_base_path.endswith("/"):

apiserver/plane/utils/timezone_converter.py

@@ -35,7 +35,9 @@ def user_timezone_converter(queryset, datetime_fields, user_timezone):
         return queryset_values
 
 
-def convert_to_utc(date, project_id, is_start_date=False):
+def convert_to_utc(
+    date, project_id, is_start_date=False
+):
     """
     Converts a start date string to the project's local timezone at 12:00 AM
     and then converts it to UTC for storage.

apiserver/plane/utils/url.py

@@ -77,31 +77,3 @@ def normalize_url_path(url: str) -> str:
     normalized_path = re.sub(r"/+", "/", parts.path)
     # Reconstruct the URL
     return urlunparse(parts._replace(path=normalized_path))
-
-
-def clean_value(value: str) -> str:
-    """
-    Clean the value by removing URLs and domain patterns.
-
-    Args:
-        value (str): The value to clean.
-
-    Returns:
-        str: The cleaned value.
-    """
-
-    if not value:
-        return value
-
-    url_pattern = r"(https?:\/\/)?(www\.)?[-a-zA-Z0-9@:%._\+~#=]{1,256}\.[a-zA-Z0-9()]{1,6}\b([-a-zA-Z0-9()@:%_\+.~#?&//=]*)|[a-zA-Z0-9._%+-]+@[a-zA-Z0-9.-]+\.[a-zA-Z]{2,}"  # noqa
-
-    # Remove URLs and domains
-    cleaned_value = re.sub(url_pattern, "", value)
-
-    # Keep only alphanumeric characters and spaces
-    cleaned_value = re.sub(r"[^a-zA-Z0-9\s]", "", cleaned_value)
-
-    # Remove extra spaces and trim
-    cleaned_value = " ".join(cleaned_value.split())
-
-    return cleaned_value

apiserver/plane/web/urls.py

@@ -1,4 +1,4 @@
 from django.urls import path
-from plane.web.views import robots_txt, health_check
+from django.views.generic import TemplateView
 
-urlpatterns = [path("robots.txt", robots_txt), path("", health_check)]
+urlpatterns = [path("about/", TemplateView.as_view(template_name="about.html"))]

apiserver/plane/web/views.py

@@ -1,9 +1 @@
-from django.http import HttpResponse, JsonResponse
-
-
-def health_check(request):
-    return JsonResponse({"status": "OK"})
-
-
-def robots_txt(request):
-    return HttpResponse("User-agent: *\nDisallow: /", content_type="text/plain")
+# Create your views here.

apiserver/pyproject.toml

@@ -42,7 +42,7 @@ quote-style = "double"
 indent-style = "space"
 
 # Respect magic trailing commas.
-# skip-magic-trailing-comma = true
+skip-magic-trailing-comma = true
 
 # Automatically detect the appropriate line ending.
 line-ending = "auto"

apiserver/requirements/base.txt

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

apiserver/templates/about.html

@@ -0,0 +1,9 @@
+
+{% extends 'base.html' %}
+{% load static %}
+
+
+{% block content %}
+<h1>Hello from plane!</h1>
+<p>Made with Django</p>
+{% endblock content %}

apiserver/templates/index.html

@@ -0,0 +1,5 @@
+ {% extends 'base.html' %} {% load static %}  {% block content %}
+<div class="container mt-5">
+  <h1>Hello from plane!</h1>
+</div>
+{% endblock content %}

deploy/selfhost/install.sh

@@ -366,7 +366,7 @@ function startServices() {
 
     local api_container_id=$(docker container ls -q -f "name=$SERVICE_FOLDER-api")
     local idx2=0
-    while ! docker exec $api_container_id python3 -c "import urllib.request; urllib.request.urlopen('http://localhost:8000/')" > /dev/null 2>&1;
+    while ! docker logs $api_container_id 2>&1 | grep -m 1 -i "Application startup complete" | grep -q ".";
     do
         local message=">> Waiting for API Service to Start"
         local dots=$(printf '%*s' $idx2 | tr ' ' '.')    
@@ -508,69 +508,43 @@ function viewLogs(){
         echo "INVALID SERVICE NAME SUPPLIED"
     fi
 }
-function backup_container_dir() {
-    local BACKUP_FOLDER=$1
-    local CONTAINER_NAME=$2
-    local CONTAINER_DATA_DIR=$3
-    local SERVICE_FOLDER=$4
+function backupSingleVolume() {
+    backupFolder=$1
+    selectedVolume=$2
+    # Backup data from Docker volume to the backup folder
+    # docker run --rm -v "$selectedVolume":/source -v "$backupFolder":/backup busybox sh -c 'cp -r /source/* /backup/'
+    local tobereplaced="plane-app_"
+    local replacewith=""
 
-    echo "Backing up $CONTAINER_NAME data..."
-    local CONTAINER_ID=$(/bin/bash -c "$COMPOSE_CMD -f $DOCKER_FILE_PATH ps -q $CONTAINER_NAME")
-    if [ -z "$CONTAINER_ID" ]; then
-        echo "Error: $CONTAINER_NAME container not found. Make sure the services are running."
-        return 1
-    fi
+    local svcName="${selectedVolume//$tobereplaced/$replacewith}"
 
-    # Create a temporary directory for the backup
-    mkdir -p "$BACKUP_FOLDER/$SERVICE_FOLDER"
-
-    # Copy the data directory from the running container
-    echo "Copying $CONTAINER_NAME data directory..."
-    docker cp -q "$CONTAINER_ID:$CONTAINER_DATA_DIR/." "$BACKUP_FOLDER/$SERVICE_FOLDER/"
-    local cp_status=$?
-
-    if [ $cp_status -ne 0 ]; then
-        echo "Error: Failed to copy $SERVICE_FOLDER data"
-        rm -rf $BACKUP_FOLDER/$SERVICE_FOLDER
-        return 1
-    fi
-
-    # Create tar.gz of the data
-    cd "$BACKUP_FOLDER"
-    tar -czf "${SERVICE_FOLDER}.tar.gz" "$SERVICE_FOLDER/"
-    local tar_status=$?
-    if [ $tar_status -eq 0 ]; then
-        rm -rf "$SERVICE_FOLDER/"
-    fi
-    cd - > /dev/null
-
-    if [ $tar_status -ne 0 ]; then
-        echo "Error: Failed to create tar archive"
-        return 1
-    fi
-
-    echo "Successfully backed up $SERVICE_FOLDER data"
+    docker run --rm \
+        -e TAR_NAME="$svcName" \
+        -v "$selectedVolume":/"$svcName" \
+        -v "$backupFolder":/backup \
+        busybox sh -c 'tar -czf "/backup/${TAR_NAME}.tar.gz" /${TAR_NAME}'
 }
-
 function backupData() {
     local datetime=$(date +"%Y%m%d-%H%M")
     local BACKUP_FOLDER=$PLANE_INSTALL_DIR/backup/$datetime
     mkdir -p "$BACKUP_FOLDER"
 
-    # Check if docker-compose.yml exists
-    if [ ! -f "$DOCKER_FILE_PATH" ]; then
-        echo "Error: docker-compose.yml not found at $DOCKER_FILE_PATH"
+    volumes=$(docker volume ls -f "name=$SERVICE_FOLDER" --format "{{.Name}}" | grep -E "_pgdata|_redisdata|_uploads")
+    # Check if there are any matching volumes
+    if [ -z "$volumes" ]; then
+        echo "No volumes found starting with '$SERVICE_FOLDER'"
         exit 1
     fi
 
-    backup_container_dir "$BACKUP_FOLDER" "plane-db" "/var/lib/postgresql/data" "pgdata" || exit 1
-    backup_container_dir "$BACKUP_FOLDER" "plane-minio" "/export" "uploads" || exit 1
-    backup_container_dir "$BACKUP_FOLDER" "plane-mq" "/var/lib/rabbitmq" "rabbitmq_data" || exit 1
-    backup_container_dir "$BACKUP_FOLDER" "plane-redis" "/data" "redisdata" || exit 1
+    for vol in $volumes; do
+        echo "Backing Up $vol"
+        backupSingleVolume "$BACKUP_FOLDER" "$vol"
+    done
 
     echo ""
     echo "Backup completed successfully. Backup files are stored in $BACKUP_FOLDER"
     echo ""
+
 }
 function askForAction() {
     local DEFAULT_ACTION=$1

deploy/selfhost/restore.sh

@@ -66,10 +66,8 @@ function restoreData() {
         exit 1
     fi
 
-    local volume_suffix
-    volume_suffix="_pgdata|_redisdata|_uploads|_rabbitmq_data"
     local volumes
-    volumes=$(docker volume ls -f "name=plane-app" --format "{{.Name}}" | grep -E "$volume_suffix")
+    volumes=$(docker volume ls -f "name=plane-app" --format "{{.Name}}" | grep -E "_pgdata|_redisdata|_uploads")
     # Check if there are any matching volumes
     if [ -z "$volumes" ]; then
         echo ".....No volumes found starting with 'plane-app'"
@@ -89,7 +87,7 @@ function restoreData() {
             echo "Found $BACKUP_FILE"
 
             local docVol
-            docVol=$(docker volume ls -f "name=$restoreVolName" --format "{{.Name}}" | grep -E "$volume_suffix")
+            docVol=$(docker volume ls -f "name=$restoreVolName" --format "{{.Name}}" | grep -E "_pgdata|_redisdata|_uploads")
 
             if [ -z "$docVol" ]; then
                 echo "Skipping: No volume found with name $restoreVolName"

package.json

@@ -24,7 +24,7 @@
   "devDependencies": {
     "prettier": "latest",
     "prettier-plugin-tailwindcss": "^0.5.4",
-    "turbo": "^2.5.3"
+    "turbo": "^2.5.2"
   },
   "resolutions": {
     "nanoid": "3.3.8",

packages/constants/src/analytics-v2/common.ts

@@ -1,105 +0,0 @@
-import { TAnalyticsTabsV2Base } from "@plane/types";
-import { ChartXAxisProperty, ChartYAxisMetric } from "../chart";
-
-export const insightsFields: Record<TAnalyticsTabsV2Base, string[]> = {
-  overview: [
-    "total_users",
-    "total_admins",
-    "total_members",
-    "total_guests",
-    "total_projects",
-    "total_work_items",
-    "total_cycles",
-    "total_intake",
-  ],
-  "work-items": [
-    "total_work_items",
-    "started_work_items",
-    "backlog_work_items",
-    "un_started_work_items",
-    "completed_work_items",
-  ],
-};
-
-export const ANALYTICS_V2_DURATION_FILTER_OPTIONS = [
-  {
-    name: "Yesterday",
-    value: "yesterday",
-  },
-  {
-    name: "Last 7 days",
-    value: "last_7_days",
-  },
-  {
-    name: "Last 30 days",
-    value: "last_30_days",
-  },
-  {
-    name: "Last 3 months",
-    value: "last_3_months",
-  },
-];
-
-export const ANALYTICS_V2_X_AXIS_VALUES: { value: ChartXAxisProperty; label: string }[] = [
-  {
-    value: ChartXAxisProperty.STATES,
-    label: "State name",
-  },
-  {
-    value: ChartXAxisProperty.STATE_GROUPS,
-    label: "State group",
-  },
-  {
-    value: ChartXAxisProperty.PRIORITY,
-    label: "Priority",
-  },
-  {
-    value: ChartXAxisProperty.LABELS,
-    label: "Label",
-  },
-  {
-    value: ChartXAxisProperty.ASSIGNEES,
-    label: "Assignee",
-  },
-  {
-    value: ChartXAxisProperty.ESTIMATE_POINTS,
-    label: "Estimate point",
-  },
-  {
-    value: ChartXAxisProperty.CYCLES,
-    label: "Cycle",
-  },
-  {
-    value: ChartXAxisProperty.MODULES,
-    label: "Module",
-  },
-  {
-    value: ChartXAxisProperty.COMPLETED_AT,
-    label: "Completed date",
-  },
-  {
-    value: ChartXAxisProperty.TARGET_DATE,
-    label: "Due date",
-  },
-  {
-    value: ChartXAxisProperty.START_DATE,
-    label: "Start date",
-  },
-  {
-    value: ChartXAxisProperty.CREATED_AT,
-    label: "Created date",
-  },
-];
-
-export const ANALYTICS_V2_Y_AXIS_VALUES: { value: ChartYAxisMetric; label: string }[] = [
-  {
-    value: ChartYAxisMetric.WORK_ITEM_COUNT,
-    label: "Work item",
-  },
-  {
-    value: ChartYAxisMetric.ESTIMATE_POINT_COUNT,
-    label: "Estimate",
-  },
-];
-
-export const ANALYTICS_V2_DATE_KEYS = ["completed_at", "target_date", "start_date", "created_at"];

packages/constants/src/analytics-v2/index.ts

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

packages/constants/src/chart.ts

@@ -1,157 +1,2 @@
-import { TChartColorScheme } from "@plane/types";
-
 export const LABEL_CLASSNAME = "uppercase text-custom-text-300/60 text-sm tracking-wide";
 export const AXIS_LABEL_CLASSNAME = "uppercase text-custom-text-300/60 text-sm tracking-wide";
-
-
-export enum ChartXAxisProperty {
-  STATES = "STATES",
-  STATE_GROUPS = "STATE_GROUPS",
-  LABELS = "LABELS",
-  ASSIGNEES = "ASSIGNEES",
-  ESTIMATE_POINTS = "ESTIMATE_POINTS",
-  CYCLES = "CYCLES",
-  MODULES = "MODULES",
-  PRIORITY = "PRIORITY",
-  START_DATE = "START_DATE",
-  TARGET_DATE = "TARGET_DATE",
-  CREATED_AT = "CREATED_AT",
-  COMPLETED_AT = "COMPLETED_AT",
-  CREATED_BY = "CREATED_BY",
-  WORK_ITEM_TYPES = "WORK_ITEM_TYPES",
-  PROJECTS = "PROJECTS",
-  EPICS = "EPICS",
-}
-
-export enum ChartYAxisMetric {
-  WORK_ITEM_COUNT = "WORK_ITEM_COUNT",
-  ESTIMATE_POINT_COUNT = "ESTIMATE_POINT_COUNT",
-  PENDING_WORK_ITEM_COUNT = "PENDING_WORK_ITEM_COUNT",
-  COMPLETED_WORK_ITEM_COUNT = "COMPLETED_WORK_ITEM_COUNT",
-  IN_PROGRESS_WORK_ITEM_COUNT = "IN_PROGRESS_WORK_ITEM_COUNT",
-  WORK_ITEM_DUE_THIS_WEEK_COUNT = "WORK_ITEM_DUE_THIS_WEEK_COUNT",
-  WORK_ITEM_DUE_TODAY_COUNT = "WORK_ITEM_DUE_TODAY_COUNT",
-  BLOCKED_WORK_ITEM_COUNT = "BLOCKED_WORK_ITEM_COUNT",
-}
-
-
-export enum ChartXAxisDateGrouping {
-  DAY = "DAY",
-  WEEK = "WEEK",
-  MONTH = "MONTH",
-  YEAR = "YEAR",
-}
-
-export const TO_CAPITALIZE_PROPERTIES: ChartXAxisProperty[] = [
-  ChartXAxisProperty.PRIORITY,
-  ChartXAxisProperty.STATE_GROUPS,
-];
-
-export const CHART_X_AXIS_DATE_PROPERTIES: ChartXAxisProperty[] = [
-  ChartXAxisProperty.START_DATE,
-  ChartXAxisProperty.TARGET_DATE,
-  ChartXAxisProperty.CREATED_AT,
-  ChartXAxisProperty.COMPLETED_AT,
-];
-
-
-export enum EChartModels {
-  BASIC = "BASIC",
-  STACKED = "STACKED",
-  GROUPED = "GROUPED",
-  MULTI_LINE = "MULTI_LINE",
-  COMPARISON = "COMPARISON",
-  PROGRESS = "PROGRESS",
-}
-
-export const CHART_COLOR_PALETTES: {
-  key: TChartColorScheme;
-  i18n_label: string;
-  light: string[];
-  dark: string[];
-}[] = [
-    {
-      key: "modern",
-      i18n_label: "dashboards.widget.color_palettes.modern",
-      light: [
-        "#6172E8",
-        "#8B6EDB",
-        "#E05F99",
-        "#29A383",
-        "#CB8A37",
-        "#3AA7C1",
-        "#F1B24A",
-        "#E84855",
-        "#50C799",
-        "#B35F9E",
-      ],
-      dark: [
-        "#6B7CDE",
-        "#8E9DE6",
-        "#D45D9E",
-        "#2EAF85",
-        "#D4A246",
-        "#29A7C1",
-        "#B89F6A",
-        "#D15D64",
-        "#4ED079",
-        "#A169A4",
-      ],
-    },
-    {
-      key: "horizon",
-      i18n_label: "dashboards.widget.color_palettes.horizon",
-      light: [
-        "#E76E50",
-        "#289D90",
-        "#F3A362",
-        "#E9C368",
-        "#264753",
-        "#8A6FA0",
-        "#5B9EE5",
-        "#7CC474",
-        "#BA7DB5",
-        "#CF8640",
-      ],
-      dark: [
-        "#E05A3A",
-        "#1D8A7E",
-        "#D98B4D",
-        "#D1AC50",
-        "#3A6B7C",
-        "#7D6297",
-        "#4D8ACD",
-        "#569C64",
-        "#C16A8C",
-        "#B77436",
-      ],
-    },
-    {
-      key: "earthen",
-      i18n_label: "dashboards.widget.color_palettes.earthen",
-      light: [
-        "#386641",
-        "#6A994E",
-        "#A7C957",
-        "#E97F4E",
-        "#BC4749",
-        "#9E2A2B",
-        "#80CED1",
-        "#5C3E79",
-        "#526EAB",
-        "#6B5B95",
-      ],
-      dark: [
-        "#497752",
-        "#7BAA5F",
-        "#B8DA68",
-        "#FA905F",
-        "#CD585A",
-        "#AF3B3C",
-        "#91DFE2",
-        "#6D4F8A",
-        "#637FBC",
-        "#7C6CA6",
-      ],
-    },
-  ];

packages/constants/src/index.ts

@@ -33,4 +33,3 @@ export * from "./page";
 export * from "./emoji";
 export * from "./subscription";
 export * from "./icon";
-export * from "./analytics-v2";

packages/constants/src/issue/common.ts

@@ -1,10 +1,4 @@
-import {
-  TIssueGroupByOptions,
-  TIssueOrderByOptions,
-  IIssueDisplayProperties,
-  IIssueFilterOptions,
-  TIssue,
-} from "@plane/types";
+import { TIssueGroupByOptions, TIssueOrderByOptions, IIssueDisplayProperties } from "@plane/types";
 
 export const ALL_ISSUES = "All Issues";
 
@@ -367,17 +361,3 @@ export const SPREADSHEET_PROPERTY_DETAILS: {
     icon: "LayersIcon",
   },
 };
-
-// Map filter keys to their corresponding issue property keys
-export const FILTER_TO_ISSUE_MAP: Partial<Record<keyof IIssueFilterOptions, keyof TIssue>> = {
-  assignees: "assignee_ids",
-  created_by: "created_by",
-  labels: "label_ids",
-  priority: "priority",
-  cycle: "cycle_id",
-  module: "module_ids",
-  project: "project_id",
-  state: "state_id",
-  issue_type: "type_id",
-  state_group: "state__group",
-} as const;

packages/constants/src/issue/filter.ts

@@ -1,4 +1,7 @@
-import { ILayoutDisplayFiltersOptions, TIssueActivityComment } from "@plane/types";
+import {
+  ILayoutDisplayFiltersOptions,
+  TIssueActivityComment,
+} from "@plane/types";
 import {
   TIssueFilterPriorityObject,
   ISSUE_DISPLAY_PROPERTIES_KEYS,
@@ -355,10 +358,9 @@ export const ISSUE_DISPLAY_FILTERS_BY_PAGE: TIssueFiltersToDisplayByPageType = {
   sub_work_items: {
     list: {
       display_properties: SUB_ISSUES_DISPLAY_PROPERTIES_KEYS,
-      filters: ["priority", "state", "project", "issue_type", "assignees", "start_date", "target_date"],
+      filters: [],
       display_filters: {
         order_by: ["-created_at", "-updated_at", "start_date", "-priority"],
-        group_by: ["state", "priority", "assignees", null],
       },
       extra_options: {
         access: true,
@@ -368,7 +370,9 @@ export const ISSUE_DISPLAY_FILTERS_BY_PAGE: TIssueFiltersToDisplayByPageType = {
   },
 };
 
-export const ISSUE_STORE_TO_FILTERS_MAP: Partial<Record<EIssuesStoreType, TFiltersByLayout>> = {
+export const ISSUE_STORE_TO_FILTERS_MAP: Partial<
+  Record<EIssuesStoreType, TFiltersByLayout>
+> = {
   [EIssuesStoreType.PROJECT]: ISSUE_DISPLAY_FILTERS_BY_PAGE.issues,
 };
 
@@ -379,7 +383,10 @@ export enum EActivityFilterType {
 
 export type TActivityFilters = EActivityFilterType;
 
-export const ACTIVITY_FILTER_TYPE_OPTIONS: Record<TActivityFilters, { labelTranslationKey: string }> = {
+export const ACTIVITY_FILTER_TYPE_OPTIONS: Record<
+  TActivityFilters,
+  { labelTranslationKey: string }
+> = {
   [EActivityFilterType.ACTIVITY]: {
     labelTranslationKey: "common.updates",
   },
@@ -395,12 +402,17 @@ export type TActivityFilterOption = {
   onClick: () => void;
 };
 
-export const defaultActivityFilters: TActivityFilters[] = [EActivityFilterType.ACTIVITY, EActivityFilterType.COMMENT];
+export const defaultActivityFilters: TActivityFilters[] = [
+  EActivityFilterType.ACTIVITY,
+  EActivityFilterType.COMMENT,
+];
 
 export const filterActivityOnSelectedFilters = (
   activity: TIssueActivityComment[],
   filters: TActivityFilters[]
 ): TIssueActivityComment[] =>
-  activity.filter((activity) => filters.includes(activity.activity_type as TActivityFilters));
+  activity.filter((activity) =>
+    filters.includes(activity.activity_type as TActivityFilters)
+  );
 
 export const ENABLE_ISSUE_DEPENDENCIES = false;

packages/constants/src/profile.ts

@@ -71,53 +71,3 @@ export const PROFILE_ADMINS_TAB = [
     selected: "/activity/",
   },
 ];
-
-/**
- * @description The start of the week for the user
- * @enum {number}
- */
-export enum EStartOfTheWeek {
-  SUNDAY = 0,
-  MONDAY = 1,
-  TUESDAY = 2,
-  WEDNESDAY = 3,
-  THURSDAY = 4,
-  FRIDAY = 5,
-  SATURDAY = 6,
-}
-
-/**
- * @description The options for the start of the week
- * @type {Array<{value: EStartOfTheWeek, label: string}>}
- * @constant
- */
-export const START_OF_THE_WEEK_OPTIONS = [
-  {
-    value: EStartOfTheWeek.SUNDAY,
-    label: "Sunday",
-  },
-  {
-    value: EStartOfTheWeek.MONDAY,
-    label: "Monday",
-  },
-  {
-    value: EStartOfTheWeek.TUESDAY,
-    label: "Tuesday",
-  },
-  {
-    value: EStartOfTheWeek.WEDNESDAY,
-    label: "Wednesday",
-  },
-  {
-    value: EStartOfTheWeek.THURSDAY,
-    label: "Thursday",
-  },
-  {
-    value: EStartOfTheWeek.FRIDAY,
-    label: "Friday",
-  },
-  {
-    value: EStartOfTheWeek.SATURDAY,
-    label: "Saturday",
-  },
-];

packages/constants/src/state.ts

@@ -1,4 +1,3 @@
-"use client"
 export type TStateGroups = "backlog" | "unstarted" | "started" | "completed" | "cancelled";
 
 export type TDraggableData = {
@@ -78,5 +77,4 @@ export const PROGRESS_STATE_GROUPS_DETAILS = [
   },
 ];
 
-
 export const DISPLAY_WORKFLOW_PRO_CTA = false;

packages/editor/src/ce/extensions/core/extensions.ts

@@ -1,10 +1,9 @@
 import { Extensions } from "@tiptap/core";
 // types
-import { TExtensions, TFileHandler } from "@/types";
+import { TExtensions } from "@/types";
 
 type Props = {
   disabledExtensions: TExtensions[];
-  fileHandler: TFileHandler;
 };
 
 export const CoreEditorAdditionalExtensions = (props: Props): Extensions => {

packages/editor/src/ce/types/storage.ts

@@ -1,13 +0,0 @@
-import { HeadingExtensionStorage } from "@/extensions";
-import { CustomImageExtensionStorage } from "@/extensions/custom-image";
-import { CustomLinkStorage } from "@/extensions/custom-link";
-import { MentionExtensionStorage } from "@/extensions/mentions";
-import { ImageExtensionStorage } from "@/plugins/image";
-
-export type ExtensionStorageMap = {
-  imageComponent: CustomImageExtensionStorage;
-  image: ImageExtensionStorage;
-  link: CustomLinkStorage;
-  headingList: HeadingExtensionStorage;
-  mention: MentionExtensionStorage;
-};

packages/editor/src/core/constants/config.ts

@@ -8,55 +8,5 @@ export const DEFAULT_DISPLAY_CONFIG: TDisplayConfig = {
   wideLayout: false,
 };
 
-export const ACCEPTED_IMAGE_MIME_TYPES = ["image/jpeg", "image/jpg", "image/png", "image/webp", "image/gif"];
-
-export const ACCEPTED_ATTACHMENT_MIME_TYPES = [
-  "image/jpeg",
-  "image/png",
-  "image/gif",
-  "image/svg+xml",
-  "image/webp",
-  "image/tiff",
-  "image/bmp",
-  "application/pdf",
-  "application/msword",
-  "application/vnd.openxmlformats-officedocument.wordprocessingml.document",
-  "application/vnd.ms-excel",
-  "application/vnd.openxmlformats-officedocument.spreadsheetml.sheet",
-  "application/vnd.ms-powerpoint",
-  "application/vnd.openxmlformats-officedocument.presentationml.presentation",
-  "text/plain",
-  "application/rtf",
-  "audio/mpeg",
-  "audio/wav",
-  "audio/ogg",
-  "audio/midi",
-  "audio/x-midi",
-  "audio/aac",
-  "audio/flac",
-  "audio/x-m4a",
-  "video/mp4",
-  "video/mpeg",
-  "video/ogg",
-  "video/webm",
-  "video/quicktime",
-  "video/x-msvideo",
-  "video/x-ms-wmv",
-  "application/zip",
-  "application/x-rar-compressed",
-  "application/x-tar",
-  "application/gzip",
-  "model/gltf-binary",
-  "model/gltf+json",
-  "application/octet-stream",
-  "font/ttf",
-  "font/otf",
-  "font/woff",
-  "font/woff2",
-  "text/css",
-  "text/javascript",
-  "application/json",
-  "text/xml",
-  "text/csv",
-  "application/xml",
-];
+export const ACCEPTED_FILE_MIME_TYPES = ["image/jpeg", "image/jpg", "image/png", "image/webp", "image/gif"];
+export const ACCEPTED_FILE_EXTENSIONS = ACCEPTED_FILE_MIME_TYPES.map((type) => `.${type.split("/")[1]}`);

packages/editor/src/core/extensions/custom-image/components/image-uploader.tsx

@@ -3,11 +3,11 @@ import { ChangeEvent, useCallback, useEffect, useMemo, useRef } from "react";
 // plane utils
 import { cn } from "@plane/utils";
 // constants
-import { ACCEPTED_IMAGE_MIME_TYPES } from "@/constants/config";
+import { ACCEPTED_FILE_EXTENSIONS } from "@/constants/config";
 // extensions
 import { CustoBaseImageNodeViewProps, getImageComponentImageFileMap } from "@/extensions/custom-image";
 // hooks
-import { useUploader, useDropZone, uploadFirstFileAndInsertRemaining } from "@/hooks/use-file-upload";
+import { useUploader, useDropZone, uploadFirstImageAndInsertRemaining } from "@/hooks/use-file-upload";
 
 type CustomImageUploaderProps = CustoBaseImageNodeViewProps & {
   maxFileSize: number;
@@ -41,9 +41,7 @@ export const CustomImageUploader = (props: CustomImageUploaderProps) => {
         if (!imageEntityId) return;
         setIsUploaded(true);
         // Update the node view's src attribute post upload
-        updateAttributes({
-          src: url,
-        });
+        updateAttributes({ src: url });
         imageComponentImageFileMap?.delete(imageEntityId);
 
         const pos = getPos();
@@ -53,7 +51,7 @@ export const CustomImageUploader = (props: CustomImageUploaderProps) => {
 
         // only if the cursor is at the current image component, manipulate
         // the cursor position
-        if (currentNode && currentNode.type.name === node.type.name && currentNode.attrs.src === url) {
+        if (currentNode && currentNode.type.name === "imageComponent" && currentNode.attrs.src === url) {
           // control cursor position after upload
           const nextNode = editor.state.doc.nodeAt(pos + 1);
 
@@ -70,23 +68,17 @@ export const CustomImageUploader = (props: CustomImageUploaderProps) => {
     [imageComponentImageFileMap, imageEntityId, updateAttributes, getPos]
   );
   // hooks
-  const { isUploading: isImageBeingUploaded, uploadFile } = useUploader({
-    acceptedMimeTypes: ACCEPTED_IMAGE_MIME_TYPES,
-    // @ts-expect-error - TODO: fix typings, and don't remove await from here for now
-    editorCommand: async (file) => await editor?.commands.uploadImage(imageEntityId, file),
-    handleProgressStatus: (isUploading) => {
-      editor.storage.imageComponent.uploadInProgress = isUploading;
-    },
-    loadFileFromFileSystem: loadImageFromFileSystem,
+  const { uploading: isImageBeingUploaded, uploadFile } = useUploader({
+    blockId: imageEntityId ?? "",
+    editor,
+    loadImageFromFileSystem,
     maxFileSize,
     onUpload,
   });
   const { draggedInside, onDrop, onDragEnter, onDragLeave } = useDropZone({
-    acceptedMimeTypes: ACCEPTED_IMAGE_MIME_TYPES,
     editor,
     maxFileSize,
     pos: getPos(),
-    type: "image",
     uploader: uploadFile,
   });
 
@@ -118,13 +110,11 @@ export const CustomImageUploader = (props: CustomImageUploaderProps) => {
       if (!filesList) {
         return;
       }
-      await uploadFirstFileAndInsertRemaining({
-        acceptedMimeTypes: ACCEPTED_IMAGE_MIME_TYPES,
+      await uploadFirstImageAndInsertRemaining({
         editor,
         filesList,
         maxFileSize,
         pos: getPos(),
-        type: "image",
         uploader: uploadFile,
       });
     },
@@ -180,7 +170,7 @@ export const CustomImageUploader = (props: CustomImageUploaderProps) => {
         ref={fileInputRef}
         hidden
         type="file"
-        accept={ACCEPTED_IMAGE_MIME_TYPES.join(",")}
+        accept={ACCEPTED_FILE_EXTENSIONS.join(",")}
         onChange={onFileChange}
         multiple
       />

packages/editor/src/core/extensions/custom-image/custom-image.ts

@@ -2,16 +2,12 @@ import { Editor, mergeAttributes } from "@tiptap/core";
 import { Image } from "@tiptap/extension-image";
 import { ReactNodeViewRenderer } from "@tiptap/react";
 import { v4 as uuidv4 } from "uuid";
-// constants
-import { ACCEPTED_IMAGE_MIME_TYPES } from "@/constants/config";
 // extensions
 import { CustomImageNode } from "@/extensions/custom-image";
 // helpers
-import { isFileValid } from "@/helpers/file";
-import { getExtensionStorage } from "@/helpers/get-extension-storage";
 import { insertEmptyParagraphAtNodeBoundaries } from "@/helpers/insert-empty-paragraph-at-node-boundary";
 // plugins
-import { TrackImageDeletionPlugin, TrackImageRestorationPlugin } from "@/plugins/image";
+import { TrackImageDeletionPlugin, TrackImageRestorationPlugin, isFileValid } from "@/plugins/image";
 // types
 import { TFileHandler } from "@/types";
 
@@ -33,9 +29,10 @@ declare module "@tiptap/core" {
   }
 }
 
-export const getImageComponentImageFileMap = (editor: Editor) => getExtensionStorage(editor, "imageComponent")?.fileMap;
+export const getImageComponentImageFileMap = (editor: Editor) =>
+  (editor.storage.imageComponent as UploadImageExtensionStorage | undefined)?.fileMap;
 
-export interface CustomImageExtensionStorage {
+export interface UploadImageExtensionStorage {
   assetsUploadStatus: TFileHandler["assetsUploadStatus"];
   fileMap: Map<string, UploadEntity>;
   deletedImageSet: Map<string, boolean>;
@@ -55,7 +52,7 @@ export const CustomImageExtension = (props: TFileHandler) => {
     validation: { maxFileSize },
   } = props;
 
-  return Image.extend<Record<string, unknown>, CustomImageExtensionStorage>({
+  return Image.extend<Record<string, unknown>, UploadImageExtensionStorage>({
     name: "imageComponent",
     selectable: true,
     group: "block",
@@ -149,7 +146,6 @@ export const CustomImageExtension = (props: TFileHandler) => {
             if (
               props?.file &&
               !isFileValid({
-                acceptedMimeTypes: ACCEPTED_IMAGE_MIME_TYPES,
                 file: props.file,
                 maxFileSize,
               })

packages/editor/src/core/extensions/custom-image/read-only-custom-image.ts

@@ -2,14 +2,14 @@ import { mergeAttributes } from "@tiptap/core";
 import { Image } from "@tiptap/extension-image";
 import { ReactNodeViewRenderer } from "@tiptap/react";
 // components
-import { CustomImageNode, CustomImageExtensionStorage } from "@/extensions/custom-image";
+import { CustomImageNode, UploadImageExtensionStorage } from "@/extensions/custom-image";
 // types
 import { TReadOnlyFileHandler } from "@/types";
 
 export const CustomReadOnlyImageExtension = (props: TReadOnlyFileHandler) => {
   const { getAssetSrc, restore: restoreImageFn } = props;
 
-  return Image.extend<Record<string, unknown>, CustomImageExtensionStorage>({
+  return Image.extend<Record<string, unknown>, UploadImageExtensionStorage>({
     name: "imageComponent",
     selectable: false,
     group: "block",

packages/editor/src/core/extensions/drop.ts

@@ -1,127 +0,0 @@
-import { Extension, Editor } from "@tiptap/core";
-import { Plugin, PluginKey } from "@tiptap/pm/state";
-// constants
-import { ACCEPTED_ATTACHMENT_MIME_TYPES, ACCEPTED_IMAGE_MIME_TYPES } from "@/constants/config";
-// types
-import { TEditorCommands } from "@/types";
-
-export const DropHandlerExtension = Extension.create({
-  name: "dropHandler",
-  priority: 1000,
-
-  addProseMirrorPlugins() {
-    const editor = this.editor;
-    return [
-      new Plugin({
-        key: new PluginKey("drop-handler-plugin"),
-        props: {
-          handlePaste: (view, event) => {
-            if (
-              editor.isEditable &&
-              event.clipboardData &&
-              event.clipboardData.files &&
-              event.clipboardData.files.length > 0
-            ) {
-              event.preventDefault();
-              const files = Array.from(event.clipboardData.files);
-              const acceptedFiles = files.filter(
-                (f) => ACCEPTED_IMAGE_MIME_TYPES.includes(f.type) || ACCEPTED_ATTACHMENT_MIME_TYPES.includes(f.type)
-              );
-
-              if (acceptedFiles.length) {
-                const pos = view.state.selection.from;
-                insertFilesSafely({
-                  editor,
-                  files: acceptedFiles,
-                  initialPos: pos,
-                  event: "drop",
-                });
-              }
-              return true;
-            }
-            return false;
-          },
-          handleDrop: (view, event, _slice, moved) => {
-            if (
-              editor.isEditable &&
-              !moved &&
-              event.dataTransfer &&
-              event.dataTransfer.files &&
-              event.dataTransfer.files.length > 0
-            ) {
-              event.preventDefault();
-              const files = Array.from(event.dataTransfer.files);
-              const acceptedFiles = files.filter(
-                (f) => ACCEPTED_IMAGE_MIME_TYPES.includes(f.type) || ACCEPTED_ATTACHMENT_MIME_TYPES.includes(f.type)
-              );
-
-              if (acceptedFiles.length) {
-                const coordinates = view.posAtCoords({
-                  left: event.clientX,
-                  top: event.clientY,
-                });
-
-                if (coordinates) {
-                  const pos = coordinates.pos;
-                  insertFilesSafely({
-                    editor,
-                    files: acceptedFiles,
-                    initialPos: pos,
-                    event: "drop",
-                  });
-                }
-                return true;
-              }
-            }
-            return false;
-          },
-        },
-      }),
-    ];
-  },
-});
-
-type InsertFilesSafelyArgs = {
-  editor: Editor;
-  event: "insert" | "drop";
-  files: File[];
-  initialPos: number;
-  type?: Extract<TEditorCommands, "attachment" | "image">;
-};
-
-export const insertFilesSafely = async (args: InsertFilesSafelyArgs) => {
-  const { editor, event, files, initialPos, type } = args;
-  let pos = initialPos;
-
-  for (const file of files) {
-    // safe insertion
-    const docSize = editor.state.doc.content.size;
-    pos = Math.min(pos, docSize);
-
-    let fileType: "image" | "attachment" | null = null;
-
-    try {
-      if (type) {
-        if (["image", "attachment"].includes(type)) fileType = type;
-        else throw new Error("Wrong file type passed");
-      } else {
-        if (ACCEPTED_IMAGE_MIME_TYPES.includes(file.type)) fileType = "image";
-        else if (ACCEPTED_ATTACHMENT_MIME_TYPES.includes(file.type)) fileType = "attachment";
-      }
-      // insert file depending on the type at the current position
-      if (fileType === "image") {
-        editor.commands.insertImageComponent({
-          file,
-          pos,
-          event,
-        });
-      } else if (fileType === "attachment") {
-      }
-    } catch (error) {
-      console.error(`Error while ${event}ing file:`, error);
-    }
-
-    // Move to the next position
-    pos += 1;
-  }
-};

packages/editor/src/core/extensions/drop.tsx

@@ -0,0 +1,94 @@
+import { Extension, Editor } from "@tiptap/core";
+import { Plugin, PluginKey } from "@tiptap/pm/state";
+import { EditorView } from "@tiptap/pm/view";
+
+export const DropHandlerExtension = Extension.create({
+  name: "dropHandler",
+  priority: 1000,
+
+  addProseMirrorPlugins() {
+    const editor = this.editor;
+    return [
+      new Plugin({
+        key: new PluginKey("drop-handler-plugin"),
+        props: {
+          handlePaste: (view: EditorView, event: ClipboardEvent) => {
+            if (
+              editor.isEditable &&
+              event.clipboardData &&
+              event.clipboardData.files &&
+              event.clipboardData.files.length > 0
+            ) {
+              event.preventDefault();
+              const files = Array.from(event.clipboardData.files);
+              const imageFiles = files.filter((file) => file.type.startsWith("image"));
+
+              if (imageFiles.length > 0) {
+                const pos = view.state.selection.from;
+                insertImagesSafely({ editor, files: imageFiles, initialPos: pos, event: "drop" });
+              }
+              return true;
+            }
+            return false;
+          },
+          handleDrop: (view: EditorView, event: DragEvent, _slice: any, moved: boolean) => {
+            if (
+              editor.isEditable &&
+              !moved &&
+              event.dataTransfer &&
+              event.dataTransfer.files &&
+              event.dataTransfer.files.length > 0
+            ) {
+              event.preventDefault();
+              const files = Array.from(event.dataTransfer.files);
+              const imageFiles = files.filter((file) => file.type.startsWith("image"));
+
+              if (imageFiles.length > 0) {
+                const coordinates = view.posAtCoords({
+                  left: event.clientX,
+                  top: event.clientY,
+                });
+
+                if (coordinates) {
+                  const pos = coordinates.pos;
+                  insertImagesSafely({ editor, files: imageFiles, initialPos: pos, event: "drop" });
+                }
+                return true;
+              }
+            }
+            return false;
+          },
+        },
+      }),
+    ];
+  },
+});
+export const insertImagesSafely = async ({
+  editor,
+  files,
+  initialPos,
+  event,
+}: {
+  editor: Editor;
+  files: File[];
+  initialPos: number;
+  event: "insert" | "drop";
+}) => {
+  let pos = initialPos;
+
+  for (const file of files) {
+    // safe insertion
+    const docSize = editor.state.doc.content.size;
+    pos = Math.min(pos, docSize);
+
+    try {
+      // Insert the image at the current position
+      editor.commands.insertImageComponent({ file, pos, event });
+    } catch (error) {
+      console.error(`Error while ${event}ing image:`, error);
+    }
+
+    // Move to the next position
+    pos += 1;
+  }
+};

packages/editor/src/core/extensions/extensions.tsx

@@ -172,7 +172,6 @@ export const CoreEditorExtensions = (args: TArguments): Extensions => {
     CustomColorExtension,
     ...CoreEditorAdditionalExtensions({
       disabledExtensions,
-      fileHandler,
     }),
   ];