chore: code refactor

* chore: improved the html validation

* chore: removed the models changes

* chore: removed extra filters

* chore: changed the protocols

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

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

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

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

apps/admin/core/components/common/breadcrumb-link.tsx

@@ -1,7 +1,7 @@
 "use client";
 
 import Link from "next/link";
-import { Tooltip } from "@plane/ui";
+import { Tooltip } from "@plane/propel/tooltip";
 
 type Props = {
   label?: string;

apps/admin/core/components/workspace/list-item.tsx

@@ -2,7 +2,7 @@ import { observer } from "mobx-react";
 import { ExternalLink } from "lucide-react";
 // plane internal packages
 import { WEB_BASE_URL } from "@plane/constants";
-import { Tooltip } from "@plane/ui";
+import { Tooltip } from "@plane/propel/tooltip";
 import { getFileURL } from "@plane/utils";
 // hooks
 import { useWorkspace } from "@/hooks/store";

apps/admin/package.json

@@ -26,26 +26,26 @@
     "@plane/ui": "workspace:*",
     "@plane/utils": "workspace:*",
     "autoprefixer": "10.4.14",
-    "axios": "1.11.0",
-    "lodash": "^4.17.21",
-    "lucide-react": "^0.469.0",
-    "mobx": "^6.12.0",
-    "mobx-react": "^9.1.1",
-    "next": "14.2.32",
+    "axios": "catalog:",
+    "lodash": "catalog:",
+    "lucide-react": "catalog:",
+    "mobx": "catalog:",
+    "mobx-react": "catalog:",
+    "next": "catalog:",
     "next-themes": "^0.2.1",
     "postcss": "^8.4.49",
     "react": "catalog:",
     "react-dom": "catalog:",
     "react-hook-form": "7.51.5",
-    "sharp": "^0.33.5",
-    "swr": "^2.2.4",
-    "uuid": "^9.0.1"
+    "sharp": "catalog:",
+    "swr": "catalog:",
+    "uuid": "catalog:"
   },
   "devDependencies": {
     "@plane/eslint-config": "workspace:*",
     "@plane/tailwind-config": "workspace:*",
     "@plane/typescript-config": "workspace:*",
-    "@types/lodash": "4.17.20",
+    "@types/lodash": "catalog:",
     "@types/node": "18.16.1",
     "@types/react": "catalog:",
     "@types/react-dom": "catalog:",

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

@@ -7,7 +7,6 @@ from plane.app.serializers import StateSerializer
 from plane.app.views.base import BaseAPIView
 from plane.db.models import State
 from plane.app.permissions import WorkspaceEntityPermission
-from plane.utils.cache import cache_response
 from collections import defaultdict
 
 
@@ -15,7 +14,6 @@ class WorkspaceStatesEndpoint(BaseAPIView):
     permission_classes = [WorkspaceEntityPermission]
     use_read_replica = True
 
-    @cache_response(60 * 60 * 2)
     def get(self, request, slug):
         states = State.objects.filter(
             workspace__slug=slug,

apps/api/plane/db/migrations/0103_fileasset_asset_entity_type_idx_and_more.py

@@ -0,0 +1,75 @@
+# Generated by Django 4.2.22 on 2025-09-01 14:33
+
+from django.db import migrations, models
+from django.contrib.postgres.operations import AddIndexConcurrently
+
+
+class Migration(migrations.Migration):
+    atomic = False
+
+    dependencies = [
+        ('db', '0102_page_sort_order_pagelog_entity_type_and_more'),
+    ]
+
+    operations = [
+        AddIndexConcurrently(
+            model_name='fileasset',
+            index=models.Index(fields=['entity_type'], name='asset_entity_type_idx'),
+        ),
+        AddIndexConcurrently(
+            model_name='fileasset',
+            index=models.Index(fields=['entity_identifier'], name='asset_entity_identifier_idx'),
+        ),
+        AddIndexConcurrently(
+            model_name='fileasset',
+            index=models.Index(fields=['entity_type', 'entity_identifier'], name='asset_entity_idx'),
+        ),
+        AddIndexConcurrently(
+            model_name='notification',
+            index=models.Index(fields=['entity_identifier'], name='notif_entity_identifier_idx'),
+        ),
+        AddIndexConcurrently(
+            model_name='notification',
+            index=models.Index(fields=['entity_name'], name='notif_entity_name_idx'),
+        ),
+        AddIndexConcurrently(
+            model_name='notification',
+            index=models.Index(fields=['read_at'], name='notif_read_at_idx'),
+        ),
+        AddIndexConcurrently(
+            model_name='notification',
+            index=models.Index(fields=['receiver', 'read_at'], name='notif_entity_idx'),
+        ),
+        AddIndexConcurrently(
+            model_name='pagelog',
+            index=models.Index(fields=['entity_type'], name='pagelog_entity_type_idx'),
+        ),
+        AddIndexConcurrently(
+            model_name='pagelog',
+            index=models.Index(fields=['entity_identifier'], name='pagelog_entity_id_idx'),
+        ),
+        AddIndexConcurrently(
+            model_name='pagelog',
+            index=models.Index(fields=['entity_name'], name='pagelog_entity_name_idx'),
+        ),
+        AddIndexConcurrently(
+            model_name='pagelog',
+            index=models.Index(fields=['entity_type', 'entity_identifier'], name='pagelog_type_id_idx'),
+        ),
+        AddIndexConcurrently(
+            model_name='pagelog',
+            index=models.Index(fields=['entity_name', 'entity_identifier'], name='pagelog_name_id_idx'),
+        ),
+        AddIndexConcurrently(
+            model_name='userfavorite',
+            index=models.Index(fields=['entity_type'], name='fav_entity_type_idx'),
+        ),
+        AddIndexConcurrently(
+            model_name='userfavorite',
+            index=models.Index(fields=['entity_identifier'], name='fav_entity_identifier_idx'),
+        ),
+        AddIndexConcurrently(
+            model_name='userfavorite',
+            index=models.Index(fields=['entity_type', 'entity_identifier'], name='fav_entity_idx'),
+        ),
+    ]

apps/api/plane/db/migrations/0104_cycleuserproperties_rich_filters_and_more.py

@@ -0,0 +1,43 @@
+# Generated by Django 4.2.22 on 2025-09-03 05:18
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('db', '0103_fileasset_asset_entity_type_idx_and_more'),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name='cycleuserproperties',
+            name='rich_filters',
+            field=models.JSONField(default=dict),
+        ),
+        migrations.AddField(
+            model_name='exporterhistory',
+            name='rich_filters',
+            field=models.JSONField(blank=True, default=dict, null=True),
+        ),
+        migrations.AddField(
+            model_name='issueuserproperty',
+            name='rich_filters',
+            field=models.JSONField(default=dict),
+        ),
+        migrations.AddField(
+            model_name='issueview',
+            name='rich_filters',
+            field=models.JSONField(default=dict),
+        ),
+        migrations.AddField(
+            model_name='moduleuserproperties',
+            name='rich_filters',
+            field=models.JSONField(default=dict),
+        ),
+        migrations.AddField(
+            model_name='workspaceuserproperties',
+            name='rich_filters',
+            field=models.JSONField(default=dict),
+        ),
+    ]

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

@@ -76,6 +76,15 @@ class FileAsset(BaseModel):
         verbose_name_plural = "File Assets"
         db_table = "file_assets"
         ordering = ("-created_at",)
+        indexes = [
+            models.Index(fields=["entity_type"], name="asset_entity_type_idx"),
+            models.Index(
+                fields=["entity_identifier"], name="asset_entity_identifier_idx"
+            ),
+            models.Index(
+                fields=["entity_type", "entity_identifier"], name="asset_entity_idx"
+            ),
+        ]
 
     def __str__(self):
         return str(self.asset)

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

@@ -139,6 +139,7 @@ class CycleUserProperties(ProjectBaseModel):
     filters = models.JSONField(default=get_default_filters)
     display_filters = models.JSONField(default=get_default_display_filters)
     display_properties = models.JSONField(default=get_default_display_properties)
+    rich_filters = models.JSONField(default=dict)
 
     class Meta:
         unique_together = ["cycle", "user", "deleted_at"]

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

@@ -56,6 +56,7 @@ class ExporterHistory(BaseModel):
         related_name="workspace_exporters",
     )
     filters = models.JSONField(blank=True, null=True)
+    rich_filters = models.JSONField(default=dict, blank=True, null=True)
 
     class Meta:
         verbose_name = "Exporter"

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

@@ -41,6 +41,15 @@ class UserFavorite(WorkspaceBaseModel):
         verbose_name_plural = "User Favorites"
         db_table = "user_favorites"
         ordering = ("-created_at",)
+        indexes = [
+            models.Index(fields=["entity_type"], name="fav_entity_type_idx"),
+            models.Index(
+                fields=["entity_identifier"], name="fav_entity_identifier_idx"
+            ),
+            models.Index(
+                fields=["entity_type", "entity_identifier"], name="fav_entity_idx"
+            ),
+        ]
 
     def save(self, *args, **kwargs):
         if self._state.adding:

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

@@ -509,6 +509,7 @@ class IssueUserProperty(ProjectBaseModel):
     filters = models.JSONField(default=get_default_filters)
     display_filters = models.JSONField(default=get_default_display_filters)
     display_properties = models.JSONField(default=get_default_display_properties)
+    rich_filters = models.JSONField(default=dict)
 
     class Meta:
         verbose_name = "Issue User Property"

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

@@ -207,6 +207,7 @@ class ModuleUserProperties(ProjectBaseModel):
     filters = models.JSONField(default=get_default_filters)
     display_filters = models.JSONField(default=get_default_display_filters)
     display_properties = models.JSONField(default=get_default_display_properties)
+    rich_filters = models.JSONField(default=dict)
 
     class Meta:
         unique_together = ["module", "user", "deleted_at"]

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

@@ -39,6 +39,14 @@ class Notification(BaseModel):
         verbose_name_plural = "Notifications"
         db_table = "notifications"
         ordering = ("-created_at",)
+        indexes = [
+            models.Index(
+                fields=["entity_identifier"], name="notif_entity_identifier_idx"
+            ),
+            models.Index(fields=["entity_name"], name="notif_entity_name_idx"),
+            models.Index(fields=["read_at"], name="notif_read_at_idx"),
+            models.Index(fields=["receiver", "read_at"], name="notif_entity_idx"),
+        ]
 
     def __str__(self):
         """Return name of the notifications"""

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

@@ -101,7 +101,9 @@ class PageLog(BaseModel):
     page = models.ForeignKey(Page, related_name="page_log", on_delete=models.CASCADE)
     entity_identifier = models.UUIDField(null=True, blank=True)
     entity_name = models.CharField(max_length=30, verbose_name="Transaction Type")
-    entity_type = models.CharField(max_length=30, verbose_name="Entity Type", null=True, blank=True)
+    entity_type = models.CharField(
+        max_length=30, verbose_name="Entity Type", null=True, blank=True
+    )
     workspace = models.ForeignKey(
         "db.Workspace", on_delete=models.CASCADE, related_name="workspace_page_log"
     )
@@ -112,6 +114,17 @@ class PageLog(BaseModel):
         verbose_name_plural = "Page Logs"
         db_table = "page_logs"
         ordering = ("-created_at",)
+        indexes = [
+            models.Index(fields=["entity_type"], name="pagelog_entity_type_idx"),
+            models.Index(fields=["entity_identifier"], name="pagelog_entity_id_idx"),
+            models.Index(fields=["entity_name"], name="pagelog_entity_name_idx"),
+            models.Index(
+                fields=["entity_type", "entity_identifier"], name="pagelog_type_id_idx"
+            ),
+            models.Index(
+                fields=["entity_name", "entity_identifier"], name="pagelog_name_id_idx"
+            ),
+        ]
 
     def __str__(self):
         return f"{self.page.name} {self.entity_name}"

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

@@ -58,6 +58,7 @@ class IssueView(WorkspaceBaseModel):
     filters = models.JSONField(default=dict)
     display_filters = models.JSONField(default=get_default_display_filters)
     display_properties = models.JSONField(default=get_default_display_properties)
+    rich_filters = models.JSONField(default=dict)
     access = models.PositiveSmallIntegerField(
         default=1, choices=((0, "Private"), (1, "Public"))
     )

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

@@ -332,6 +332,7 @@ class WorkspaceUserProperties(BaseModel):
     filters = models.JSONField(default=get_default_filters)
     display_filters = models.JSONField(default=get_default_display_filters)
     display_properties = models.JSONField(default=get_default_display_properties)
+    rich_filters = models.JSONField(default=dict)
 
     class Meta:
         unique_together = ["workspace", "user", "deleted_at"]

apps/api/plane/utils/content_validator.py

@@ -2,6 +2,9 @@
 import base64
 import nh3
 from plane.utils.exception_logger import log_exception
+from bs4 import BeautifulSoup
+from collections import defaultdict
+
 
 # Maximum allowed size for binary data (10MB)
 MAX_SIZE = 10 * 1024 * 1024
@@ -19,7 +22,8 @@ SUSPICIOUS_BINARY_PATTERNS = [
 
 def validate_binary_data(data):
     """
-    Validate that binary data appears to be valid document format and doesn't contain malicious content.
+    Validate that binary data appears to be a valid document format
+    and doesn't contain malicious content.
 
     Args:
         data (bytes or str): The binary data to validate, or base64-encoded string
@@ -60,6 +64,141 @@ def validate_binary_data(data):
     return True, None
 
 
+# Combine custom components and editor-specific nodes into a single set of tags
+CUSTOM_TAGS = {
+    # editor node/tag names
+    "imageComponent",
+    "image",
+    "mention",
+    "link",
+    "customColor",
+    "emoji",
+    "tableHeader",
+    "tableCell",
+    "tableRow",
+    "codeBlock",
+    "code",
+    "horizontalRule",
+    "calloutComponent",
+    # component-style tag used by editor embeds
+    "image-component",
+}
+ALLOWED_TAGS = nh3.ALLOWED_TAGS | CUSTOM_TAGS
+
+# Merge nh3 defaults with all attributes used across our custom components
+ATTRIBUTES = {
+    "*": {
+        "class",
+        "id",
+        "title",
+        "role",
+        "aria-label",
+        "aria-hidden",
+        "style",
+        # common editor data-* attributes seen in stored HTML
+        # (wildcards like data-* are NOT supported by nh3; we add known keys
+        # here and dynamically include all data-* seen in the input below)
+        "data-tight",
+        "data-node-type",
+        "data-type",
+        "data-checked",
+        "data-background",
+        "data-text-color",
+        "data-icon-name",
+        "data-icon-color",
+        "data-background-color",
+        "data-emoji-unicode",
+        "data-emoji-url",
+        "data-logo-in-use",
+        "data-block-type",
+        "data-name",
+        "data-entity-id",
+        "data-entity-group-id",
+    },
+    "a": {"href", "target"},
+    # editor node/tag attributes
+    "imageComponent": {"id", "width", "height", "aspectRatio", "src", "alignment"},
+    "image": {"width", "height", "aspectRatio", "alignment", "src", "alt", "title"},
+    "mention": {"id", "entity_identifier", "entity_name"},
+    "link": {"href", "target"},
+    "customColor": {"color", "backgroundColor"},
+    "emoji": {"name"},
+    "tableHeader": {"colspan", "rowspan", "colwidth", "background", "hideContent"},
+    "tableCell": {
+        "colspan",
+        "rowspan",
+        "colwidth",
+        "background",
+        "textColor",
+        "hideContent",
+    },
+    "tableRow": {"background", "textColor"},
+    "codeBlock": {"language"},
+    "calloutComponent": {
+        "data-icon-color",
+        "data-icon-name",
+        "data-emoji-unicode",
+        "data-emoji-url",
+        "data-logo-in-use",
+        "data-background",
+        "data-block-type",
+    },
+    # image-component (from editor extension and seeds)
+    "image-component": {"src", "id", "width", "height", "aspectratio", "alignment"},
+}
+
+SAFE_PROTOCOLS = {"http", "https", "mailto", "tel"}
+
+
+def _compute_html_sanitization_diff(before_html: str, after_html: str):
+    """
+    Compute a coarse diff between original and sanitized HTML.
+
+    Returns a dict with:
+    - removed_tags: mapping[tag] -> removed_count
+    - removed_attributes: mapping[tag] -> sorted list of attribute names removed
+    """
+    try:
+
+        def collect(soup):
+            tag_counts = defaultdict(int)
+            attrs_by_tag = defaultdict(set)
+            for el in soup.find_all(True):
+                tag_name = (el.name or "").lower()
+                if not tag_name:
+                    continue
+                tag_counts[tag_name] += 1
+                for attr_name in list(el.attrs.keys()):
+                    if isinstance(attr_name, str) and attr_name:
+                        attrs_by_tag[tag_name].add(attr_name.lower())
+            return tag_counts, attrs_by_tag
+
+        soup_before = BeautifulSoup(before_html or "", "html.parser")
+        soup_after = BeautifulSoup(after_html or "", "html.parser")
+
+        counts_before, attrs_before = collect(soup_before)
+        counts_after, attrs_after = collect(soup_after)
+
+        removed_tags = {}
+        for tag, cnt_before in counts_before.items():
+            cnt_after = counts_after.get(tag, 0)
+            if cnt_after < cnt_before:
+                removed = cnt_before - cnt_after
+                removed_tags[tag] = removed
+
+        removed_attributes = {}
+        for tag, before_set in attrs_before.items():
+            after_set = attrs_after.get(tag, set())
+            removed = before_set - after_set
+            if removed:
+                removed_attributes[tag] = sorted(list(removed))
+
+        return {"removed_tags": removed_tags, "removed_attributes": removed_attributes}
+    except Exception:
+        # Best-effort only; if diffing fails we don't block the request
+        return {"removed_tags": {}, "removed_attributes": {}}
+
+
 def validate_html_content(html_content: str):
     """
     Sanitize HTML content using nh3.
@@ -73,7 +212,25 @@ def validate_html_content(html_content: str):
         return False, "HTML content exceeds maximum size limit (10MB)", None
 
     try:
-        clean_html = nh3.clean(html_content)
+        clean_html = nh3.clean(
+            html_content,
+            tags=ALLOWED_TAGS,
+            attributes=ATTRIBUTES,
+            url_schemes=SAFE_PROTOCOLS,
+        )
+        # Report removals to logger (Sentry) if anything was stripped
+        diff = _compute_html_sanitization_diff(html_content, clean_html)
+        if diff.get("removed_tags") or diff.get("removed_attributes"):
+            try:
+                import json
+
+                summary = json.dumps(diff)
+            except Exception:
+                summary = str(diff)
+            log_exception(
+                f"HTML sanitization removals: {summary}",
+                warning=True,
+            )
         return True, None, clean_html
     except Exception as e:
         log_exception(e)

apps/api/plane/utils/grouper.py

@@ -1,7 +1,7 @@
 # Django imports
 from django.contrib.postgres.aggregates import ArrayAgg
 from django.contrib.postgres.fields import ArrayField
-from django.db.models import Q, UUIDField, Value, QuerySet
+from django.db.models import Q, UUIDField, Value, QuerySet, OuterRef, Subquery
 from django.db.models.functions import Coalesce
 
 # Module imports
@@ -14,6 +14,9 @@ from plane.db.models import (
     ProjectMember,
     State,
     WorkspaceMember,
+    IssueAssignee,
+    ModuleIssue,
+    IssueLabel,
 )
 from typing import Optional, Dict, Tuple, Any, Union, List
 
@@ -39,33 +42,52 @@ def issue_queryset_grouper(
         if group_key in GROUP_FILTER_MAPPER:
             queryset = queryset.filter(GROUP_FILTER_MAPPER[group_key])
 
+    issue_assignee_subquery = Subquery(
+        IssueAssignee.objects.filter(
+            issue_id=OuterRef("pk"),
+            deleted_at__isnull=True,
+        )
+        .values("issue_id")
+        .annotate(arr=ArrayAgg("assignee_id", distinct=True))
+        .values("arr")
+    )
+
+    issue_module_subquery = Subquery(
+        ModuleIssue.objects.filter(
+            issue_id=OuterRef("pk"),
+            deleted_at__isnull=True,
+            module__archived_at__isnull=True,
+        )
+        .values("issue_id")
+        .annotate(arr=ArrayAgg("module_id", distinct=True))
+        .values("arr")
+    )
+
+    issue_label_subquery = Subquery(
+        IssueLabel.objects.filter(issue_id=OuterRef("pk"), deleted_at__isnull=True)
+        .values("issue_id")
+        .annotate(arr=ArrayAgg("label_id", distinct=True))
+        .values("arr")
+    )
+
     annotations_map: Dict[str, Tuple[str, Q]] = {
-        "assignee_ids": (
-            "assignees__id",
-            ~Q(assignees__id__isnull=True) & Q(issue_assignee__deleted_at__isnull=True),
+        "assignee_ids": Coalesce(
+            issue_assignee_subquery, Value([], output_field=ArrayField(UUIDField()))
         ),
-        "label_ids": (
-            "labels__id",
-            ~Q(labels__id__isnull=True) & Q(label_issue__deleted_at__isnull=True),
+        "label_ids": Coalesce(
+            issue_label_subquery, Value([], output_field=ArrayField(UUIDField()))
         ),
-        "module_ids": (
-            "issue_module__module_id",
-            (
-                ~Q(issue_module__module_id__isnull=True)
-                & Q(issue_module__module__archived_at__isnull=True)
-                & Q(issue_module__deleted_at__isnull=True)
-            ),
+        "module_ids": Coalesce(
+            issue_module_subquery, Value([], output_field=ArrayField(UUIDField()))
         ),
     }
 
-    default_annotations: Dict[str, Any] = {
-        key: Coalesce(
-            ArrayAgg(field, distinct=True, filter=condition),
-            Value([], output_field=ArrayField(UUIDField())),
-        )
-        for key, (field, condition) in annotations_map.items()
-        if FIELD_MAPPER.get(key) != group_by or FIELD_MAPPER.get(key) != sub_group_by
-    }
+    default_annotations: Dict[str, Any] = {}
+
+    for key, expression in annotations_map.items():
+        if FIELD_MAPPER.get(key) in {group_by, sub_group_by}:
+            continue
+        default_annotations[key] = expression
 
     return queryset.annotate(**default_annotations)
 

apps/live/Dockerfile.live

@@ -61,4 +61,4 @@ ENV TURBO_TELEMETRY_DISABLED=1
 
 EXPOSE 3000
 
-CMD ["node", "apps/live/dist/server.js"]
+CMD ["node", "apps/live/dist/start.js"]

apps/live/package.json

@@ -7,8 +7,8 @@
   "private": true,
   "type": "module",
   "scripts": {
-    "dev": "tsup --watch --onSuccess 'node --env-file=.env dist/server.js'",
-    "build": "tsc --noEmit && tsup",
+    "build": "tsdown",
+    "dev": "tsdown --watch",
     "start": "node --env-file=.env dist/server.js",
     "check:lint": "eslint . --max-warnings 10",
     "check:types": "tsc --noEmit",
@@ -24,11 +24,13 @@
     "@hocuspocus/extension-logger": "^2.15.0",
     "@hocuspocus/extension-redis": "^2.15.0",
     "@hocuspocus/server": "^2.15.0",
+    "@plane/decorators": "workspace:*",
     "@plane/editor": "workspace:*",
+    "@plane/logger": "workspace:*",
     "@plane/types": "workspace:*",
     "@tiptap/core": "^2.22.3",
     "@tiptap/html": "^2.22.3",
-    "axios": "1.11.0",
+    "axios": "catalog:",
     "compression": "1.8.1",
     "cors": "^2.8.5",
     "dotenv": "^16.4.5",
@@ -36,11 +38,11 @@
     "express-ws": "^5.0.2",
     "helmet": "^7.1.0",
     "ioredis": "^5.4.1",
-    "lodash": "^4.17.21",
+    "lodash": "catalog:",
     "morgan": "1.10.1",
     "pino-http": "^10.3.0",
     "pino-pretty": "^11.2.2",
-    "uuid": "^10.0.0",
+    "uuid": "catalog:",
     "y-prosemirror": "^1.2.15",
     "y-protocols": "^1.0.6",
     "yjs": "^13.6.20"
@@ -58,7 +60,7 @@
     "concurrently": "^9.0.1",
     "nodemon": "^3.1.7",
     "ts-node": "^10.9.2",
-    "tsup": "catalog:",
+    "tsdown": "catalog:",
     "typescript": "catalog:",
     "ws": "^8.18.3"
   }

apps/live/src/ce/lib/fetch-document.ts

@@ -1,14 +0,0 @@
-// types
-import { TDocumentTypes } from "@/core/types/common.js";
-
-type TArgs = {
-  cookie: string | undefined;
-  documentType: TDocumentTypes | undefined;
-  pageId: string;
-  params: URLSearchParams;
-};
-
-export const fetchDocument = async (args: TArgs): Promise<Uint8Array | null> => {
-  const { documentType } = args;
-  throw Error(`Fetch failed: Invalid document type ${documentType} provided.`);
-};

apps/live/src/ce/lib/update-document.ts

@@ -1,15 +0,0 @@
-// types
-import { TDocumentTypes } from "@/core/types/common.js";
-
-type TArgs = {
-  cookie: string | undefined;
-  documentType: TDocumentTypes | undefined;
-  pageId: string;
-  params: URLSearchParams;
-  updatedDescription: Uint8Array;
-};
-
-export const updateDocument = async (args: TArgs): Promise<void> => {
-  const { documentType } = args;
-  throw Error(`Update failed: Invalid document type ${documentType} provided.`);
-};

apps/live/src/ce/types/common.d.ts

@@ -1 +0,0 @@
-export type TAdditionalDocumentTypes = never;

apps/live/src/controllers/collaboration.controller.ts

@@ -0,0 +1,30 @@
+import type { Request } from "express";
+import type { Hocuspocus } from "@hocuspocus/server";
+import { logger } from "@plane/logger";
+import { Controller, WebSocket } from "@plane/decorators";
+
+@Controller("/collaboration")
+export class CollaborationController {
+  private metrics = {
+    errors: 0,
+  };
+
+  constructor(private readonly hocusPocusServer: Hocuspocus) {}
+
+  @WebSocket("/")
+  handleConnection(ws: any, req: Request) {
+    try {
+      // Initialize the connection with Hocuspocus
+      this.hocusPocusServer.handleConnection(ws, req);
+
+      // Set up error handling for the connection
+      ws.on("error", (error: any) => {
+        logger.error("WebSocket connection error:", error);
+        ws.close();
+      });
+    } catch (error) {
+      logger.error("WebSocket connection error:", error);
+      ws.close();
+    }
+  }
+}

apps/live/src/controllers/convert-document.controller.ts

@@ -0,0 +1,36 @@
+import type { Request, Response } from "express";
+import { Controller, Post } from "@plane/decorators";
+import { logger } from "@plane/logger";
+// types
+import { TConvertDocumentRequestBody } from "@/types";
+// utils
+import { convertHTMLDocumentToAllFormats } from "@/utils";
+
+@Controller("/convert-document")
+export class ConvertDocumentController {
+  @Post("/")
+  handleConvertDocument(req: Request, res: Response) {
+    const { description_html, variant } = req.body as TConvertDocumentRequestBody;
+    try {
+      if (description_html === undefined || variant === undefined) {
+        res.status(400).send({
+          message: "Missing required fields",
+        });
+        return;
+      }
+      const { description, description_binary } = convertHTMLDocumentToAllFormats({
+        document_html: description_html,
+        variant,
+      });
+      res.status(200).json({
+        description,
+        description_binary,
+      });
+    } catch (error) {
+      logger.error("Error in /convert-document endpoint:", error);
+      res.status(500).json({
+        message: `Internal server error.`,
+      });
+    }
+  }
+}

apps/live/src/controllers/health.controller.ts

@@ -0,0 +1,14 @@
+import type { Request, Response } from "express";
+import { Controller, Get } from "@plane/decorators";
+
+@Controller("/health")
+export class HealthController {
+  @Get("/")
+  async healthCheck(_req: Request, res: Response) {
+    res.status(200).json({
+      status: "OK",
+      timestamp: new Date().toISOString(),
+      version: process.env.APP_VERSION || "1.0.0",
+    });
+  }
+}

apps/live/src/controllers/index.ts

@@ -0,0 +1,5 @@
+import { HealthController } from "./health.controller";
+import { CollaborationController } from "./collaboration.controller";
+import { ConvertDocumentController } from "./convert-document.controller";
+
+export const CONTROLLERS = [CollaborationController, ConvertDocumentController, HealthController];

apps/live/src/core/extensions/index.ts

@@ -1,117 +0,0 @@
-import { Database } from "@hocuspocus/extension-database";
-import { Logger } from "@hocuspocus/extension-logger";
-import { Redis as HocusPocusRedis } from "@hocuspocus/extension-redis";
-import { Extension } from "@hocuspocus/server";
-import { Redis } from "ioredis";
-// core helpers and utilities
-import { manualLogger } from "@/core/helpers/logger.js";
-// core libraries
-import { fetchPageDescriptionBinary, updatePageDescription } from "@/core/lib/page.js";
-import { getRedisUrl } from "@/core/lib/utils/redis-url.js";
-import { type HocusPocusServerContext, type TDocumentTypes } from "@/core/types/common.js";
-// plane live libraries
-import { fetchDocument } from "@/plane-live/lib/fetch-document.js";
-import { updateDocument } from "@/plane-live/lib/update-document.js";
-
-export const getExtensions: () => Promise<Extension[]> = async () => {
-  const extensions: Extension[] = [
-    new Logger({
-      onChange: false,
-      log: (message) => {
-        manualLogger.info(message);
-      },
-    }),
-    new Database({
-      fetch: async ({ context, documentName: pageId, requestParameters }) => {
-        const cookie = (context as HocusPocusServerContext).cookie;
-        // query params
-        const params = requestParameters;
-        const documentType = params.get("documentType")?.toString() as TDocumentTypes | undefined;
-        // TODO: Fix this lint error.
-        // eslint-disable-next-line no-async-promise-executor
-        return new Promise(async (resolve) => {
-          try {
-            let fetchedData = null;
-            if (documentType === "project_page") {
-              fetchedData = await fetchPageDescriptionBinary(params, pageId, cookie);
-            } else {
-              fetchedData = await fetchDocument({
-                cookie,
-                documentType,
-                pageId,
-                params,
-              });
-            }
-            resolve(fetchedData);
-          } catch (error) {
-            manualLogger.error("Error in fetching document", error);
-          }
-        });
-      },
-      store: async ({ context, state, documentName: pageId, requestParameters }) => {
-        const cookie = (context as HocusPocusServerContext).cookie;
-        // query params
-        const params = requestParameters;
-        const documentType = params.get("documentType")?.toString() as TDocumentTypes | undefined;
-
-        // TODO: Fix this lint error.
-        // eslint-disable-next-line no-async-promise-executor
-        return new Promise(async () => {
-          try {
-            if (documentType === "project_page") {
-              await updatePageDescription(params, pageId, state, cookie);
-            } else {
-              await updateDocument({
-                cookie,
-                documentType,
-                pageId,
-                params,
-                updatedDescription: state,
-              });
-            }
-          } catch (error) {
-            manualLogger.error("Error in updating document:", error);
-          }
-        });
-      },
-    }),
-  ];
-
-  const redisUrl = getRedisUrl();
-
-  if (redisUrl) {
-    try {
-      const redisClient = new Redis(redisUrl);
-
-      await new Promise<void>((resolve, reject) => {
-        redisClient.on("error", (error: any) => {
-          if (error?.code === "ENOTFOUND" || error.message.includes("WRONGPASS") || error.message.includes("NOAUTH")) {
-            redisClient.disconnect();
-          }
-          manualLogger.warn(
-            `Redis Client wasn't able to connect, continuing without Redis (you won't be able to sync data between multiple plane live servers)`,
-            error
-          );
-          reject(error);
-        });
-
-        redisClient.on("ready", () => {
-          extensions.push(new HocusPocusRedis({ redis: redisClient }));
-          manualLogger.info("Redis Client connected ✅");
-          resolve();
-        });
-      });
-    } catch (error) {
-      manualLogger.warn(
-        `Redis Client wasn't able to connect, continuing without Redis (you won't be able to sync data between multiple plane live servers)`,
-        error
-      );
-    }
-  } else {
-    manualLogger.warn(
-      "Redis URL is not set, continuing without Redis (you won't be able to sync data between multiple plane live servers)"
-    );
-  }
-
-  return extensions;
-};

apps/live/src/core/helpers/convert-document.ts

@@ -1,44 +0,0 @@
-// plane editor
-import {
-  getAllDocumentFormatsFromDocumentEditorBinaryData,
-  getAllDocumentFormatsFromRichTextEditorBinaryData,
-  getBinaryDataFromDocumentEditorHTMLString,
-  getBinaryDataFromRichTextEditorHTMLString,
-} from "@plane/editor";
-// plane types
-import { TDocumentPayload } from "@plane/types";
-
-type TArgs = {
-  document_html: string;
-  variant: "rich" | "document";
-};
-
-export const convertHTMLDocumentToAllFormats = (args: TArgs): TDocumentPayload => {
-  const { document_html, variant } = args;
-
-  let allFormats: TDocumentPayload;
-
-  if (variant === "rich") {
-    const contentBinary = getBinaryDataFromRichTextEditorHTMLString(document_html);
-    const { contentBinaryEncoded, contentHTML, contentJSON } =
-      getAllDocumentFormatsFromRichTextEditorBinaryData(contentBinary);
-    allFormats = {
-      description: contentJSON,
-      description_html: contentHTML,
-      description_binary: contentBinaryEncoded,
-    };
-  } else if (variant === "document") {
-    const contentBinary = getBinaryDataFromDocumentEditorHTMLString(document_html);
-    const { contentBinaryEncoded, contentHTML, contentJSON } =
-      getAllDocumentFormatsFromDocumentEditorBinaryData(contentBinary);
-    allFormats = {
-      description: contentJSON,
-      description_html: contentHTML,
-      description_binary: contentBinaryEncoded,
-    };
-  } else {
-    throw new Error(`Invalid variant provided: ${variant}`);
-  }
-
-  return allFormats;
-};

apps/live/src/core/helpers/error-handler.ts

@@ -1,18 +0,0 @@
-import { ErrorRequestHandler } from "express";
-import { manualLogger } from "@/core/helpers/logger.js";
-
-export const errorHandler: ErrorRequestHandler = (err, _req, res) => {
-  // Log the error
-  manualLogger.error(err);
-
-  // Set the response status
-  res.status(err.status || 500);
-
-  // Send the response
-  res.json({
-    error: {
-      message: process.env.NODE_ENV === "production" ? "An unexpected error occurred" : err.message,
-      ...(process.env.NODE_ENV !== "production" && { stack: err.stack }),
-    },
-  });
-};

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

@@ -1,39 +0,0 @@
-import { pinoHttp } from "pino-http";
-
-const transport = {
-  target: "pino-pretty",
-  options: {
-    colorize: true,
-  },
-};
-
-const hooks = {
-  // eslint-disable-next-line @typescript-eslint/no-explicit-any
-  logMethod(inputArgs: any, method: any): any {
-    if (inputArgs.length >= 2) {
-      const arg1 = inputArgs.shift();
-      const arg2 = inputArgs.shift();
-      return method.apply(this, [arg2, arg1, ...inputArgs]);
-    }
-    return method.apply(this, inputArgs);
-  },
-};
-
-export const logger = pinoHttp({
-  level: "info",
-  transport: transport,
-  hooks: hooks,
-  serializers: {
-    req(req) {
-      return `${req.method} ${req.url}`;
-    },
-    res(res) {
-      return `${res.statusCode} ${res?.statusMessage || ""}`;
-    },
-    responseTime(time) {
-      return `${time}ms`;
-    },
-  },
-});
-
-export const manualLogger: typeof logger.logger = logger.logger;

apps/live/src/core/hocuspocus-server.ts

@@ -1,69 +0,0 @@
-import { Server } from "@hocuspocus/server";
-import { v4 as uuidv4 } from "uuid";
-// editor types
-import { TUserDetails } from "@plane/editor";
-import { DocumentCollaborativeEvents, TDocumentEventsServer } from "@plane/editor/lib";
-// extensions
-import { getExtensions } from "@/core/extensions/index.js";
-// lib
-import { handleAuthentication } from "@/core/lib/authentication.js";
-// types
-import { type HocusPocusServerContext } from "@/core/types/common.js";
-
-export const getHocusPocusServer = async () => {
-  const extensions = await getExtensions();
-  const serverName = process.env.HOSTNAME || uuidv4();
-  return Server.configure({
-    name: serverName,
-    onAuthenticate: async ({
-      requestHeaders,
-      context,
-      // user id used as token for authentication
-      token,
-    }) => {
-      let cookie: string | undefined = undefined;
-      let userId: string | undefined = undefined;
-
-      // Extract cookie (fallback to request headers) and userId from token (for scenarios where
-      // the cookies are not passed in the request headers)
-      try {
-        const parsedToken = JSON.parse(token) as TUserDetails;
-        userId = parsedToken.id;
-        cookie = parsedToken.cookie;
-      } catch (error) {
-        // If token parsing fails, fallback to request headers
-        console.error("Token parsing failed, using request headers:", error);
-      } finally {
-        // If cookie is still not found, fallback to request headers
-        if (!cookie) {
-          cookie = requestHeaders.cookie?.toString();
-        }
-      }
-
-      if (!cookie || !userId) {
-        throw new Error("Credentials not provided");
-      }
-
-      // set cookie in context, so it can be used throughout the ws connection
-      (context as HocusPocusServerContext).cookie = cookie;
-
-      try {
-        await handleAuthentication({
-          cookie,
-          userId,
-        });
-      } catch (_error) {
-        throw Error("Authentication unsuccessful!");
-      }
-    },
-    async onStateless({ payload, document }) {
-      // broadcast the client event (derived from the server event) to all the clients so that they can update their state
-      const response = DocumentCollaborativeEvents[payload as TDocumentEventsServer].client;
-      if (response) {
-        document.broadcastStateless(response);
-      }
-    },
-    extensions,
-    debounce: 10000,
-  });
-};

apps/live/src/core/lib/authentication.ts

@@ -1,33 +0,0 @@
-// core helpers
-import { manualLogger } from "@/core/helpers/logger.js";
-// services
-import { UserService } from "@/core/services/user.service.js";
-
-const userService = new UserService();
-
-type Props = {
-  cookie: string;
-  userId: string;
-};
-
-export const handleAuthentication = async (props: Props) => {
-  const { cookie, userId } = props;
-  // fetch current user info
-  let response;
-  try {
-    response = await userService.currentUser(cookie);
-  } catch (error) {
-    manualLogger.error("Failed to fetch current user:", error);
-    throw error;
-  }
-  if (response.id !== userId) {
-    throw Error("Authentication failed: Token doesn't match the current user.");
-  }
-
-  return {
-    user: {
-      id: response.id,
-      name: response.display_name,
-    },
-  };
-};

apps/live/src/core/lib/utils/redis-url.ts

@@ -1,15 +0,0 @@
-export function getRedisUrl() {
-  const redisUrl = process.env.REDIS_URL?.trim();
-  const redisHost = process.env.REDIS_HOST?.trim();
-  const redisPort = process.env.REDIS_PORT?.trim();
-
-  if (redisUrl) {
-    return redisUrl;
-  }
-
-  if (redisHost && redisPort && !Number.isNaN(Number(redisPort))) {
-    return `redis://${redisHost}:${redisPort}`;
-  }
-
-  return "";
-}

apps/live/src/ee/lib/fetch-document.ts

@@ -1 +0,0 @@
-export * from "../../ce/lib/fetch-document.js";

apps/live/src/ee/lib/update-document.ts

@@ -1 +0,0 @@
-export * from "../../ce/lib/update-document.js";

apps/live/src/ee/types/common.d.ts

@@ -1 +0,0 @@
-export * from "../../ce/types/common.js";

apps/live/src/hocuspocus.ts

@@ -0,0 +1,191 @@
+import { Database } from "@hocuspocus/extension-database";
+import { Logger } from "@hocuspocus/extension-logger";
+import { Redis } from "@hocuspocus/extension-redis";
+import { Server, Hocuspocus } from "@hocuspocus/server";
+import { v4 as uuidv4 } from "uuid";
+// plane imports
+import type { TUserDetails } from "@plane/editor";
+import { DocumentCollaborativeEvents, TDocumentEventsServer } from "@plane/editor/lib";
+import { logger } from "@plane/logger";
+// lib
+import { fetchPageDescriptionBinary, updatePageDescription } from "@/lib/page";
+// redis
+import { redisManager } from "@/redis";
+// services
+import { UserService } from "@/services/user.service";
+// types
+import type { HocusPocusServerContext, TDocumentTypes } from "@/types";
+
+export class HocusPocusServerManager {
+  private static instance: HocusPocusServerManager | null = null;
+  private server: Hocuspocus | null = null;
+  private isInitialized: boolean = false;
+  // server options
+  private serverName = process.env.HOSTNAME || uuidv4();
+
+  private constructor() {
+    // Private constructor to prevent direct instantiation
+  }
+
+  /**
+   * Get the singleton instance of HocusPocusServerManager
+   */
+  public static getInstance(): HocusPocusServerManager {
+    if (!HocusPocusServerManager.instance) {
+      HocusPocusServerManager.instance = new HocusPocusServerManager();
+    }
+    return HocusPocusServerManager.instance;
+  }
+
+  /**
+   * Authenticate the user
+   * @param requestHeaders - The request headers
+   * @param context - The context
+   * @param token - The token
+   * @returns The authenticated user
+   */
+  private onAuthenticate = async ({ requestHeaders, context, token }: any) => {
+    let cookie: string | undefined = undefined;
+    let userId: string | undefined = undefined;
+
+    // Extract cookie (fallback to request headers) and userId from token (for scenarios where
+    // the cookies are not passed in the request headers)
+    try {
+      const parsedToken = JSON.parse(token) as TUserDetails;
+      userId = parsedToken.id;
+      cookie = parsedToken.cookie;
+    } catch (error) {
+      // If token parsing fails, fallback to request headers
+      logger.error("Token parsing failed, using request headers:", error);
+    } finally {
+      // If cookie is still not found, fallback to request headers
+      if (!cookie) {
+        cookie = requestHeaders.cookie?.toString();
+      }
+    }
+
+    if (!cookie || !userId) {
+      throw new Error("Credentials not provided");
+    }
+
+    // set cookie in context, so it can be used throughout the ws connection
+    (context as HocusPocusServerContext).cookie = cookie;
+
+    try {
+      const userService = new UserService();
+      const user = await userService.currentUser(cookie);
+      if (user.id !== userId) {
+        throw new Error("Authentication unsuccessful!");
+      }
+
+      return {
+        user: {
+          id: user.id,
+          name: user.display_name,
+        },
+      };
+    } catch (_error) {
+      throw Error("Authentication unsuccessful!");
+    }
+  };
+
+  private onStateless = async ({ payload, document }: any) => {
+    // broadcast the client event (derived from the server event) to all the clients so that they can update their state
+    const response = DocumentCollaborativeEvents[payload as TDocumentEventsServer].client;
+    if (response) {
+      document.broadcastStateless(response);
+    }
+  };
+
+  private onDatabaseFetch = async ({ context, documentName: pageId, requestParameters }: any) => {
+    try {
+      const cookie = (context as HocusPocusServerContext).cookie;
+      // query params
+      const params = requestParameters;
+      const documentType = params.get("documentType")?.toString() as TDocumentTypes | undefined;
+      // fetch document
+      if (documentType === "project_page") {
+        const data = await fetchPageDescriptionBinary(params, pageId, cookie);
+        return data;
+      }
+      throw new Error(`Invalid document type ${documentType} provided.`);
+    } catch (error) {
+      logger.error("Error in fetching document", error);
+      return null;
+    }
+  };
+
+  private onDatabaseStore = async ({ context, state, documentName: pageId, requestParameters }: any) => {
+    const cookie = (context as HocusPocusServerContext).cookie;
+    try {
+      // query params
+      const params = requestParameters;
+      const documentType = params.get("documentType")?.toString() as TDocumentTypes | undefined;
+
+      if (documentType === "project_page") {
+        await updatePageDescription(params, pageId, state, cookie);
+      }
+    } catch (error) {
+      logger.error("Error in updating document:", error);
+    }
+  };
+  /**
+   * Initialize and configure the HocusPocus server
+   */
+  public async initialize(): Promise<Hocuspocus> {
+    if (this.isInitialized && this.server) {
+      return this.server;
+    }
+
+    const redisClient = redisManager.getClient();
+    if (!redisClient) {
+      throw new Error("Redis client not initialized");
+    }
+
+    this.server = Server.configure({
+      name: this.serverName,
+      onAuthenticate: this.onAuthenticate,
+      onStateless: this.onStateless,
+      extensions: [
+        new Logger({
+          onChange: false,
+          log: (message) => {
+            logger.info(message);
+          },
+        }),
+        new Database({
+          fetch: this.onDatabaseFetch,
+          store: this.onDatabaseStore,
+        }),
+        new Redis({
+          redis: redisClient,
+        }),
+      ],
+      debounce: 10000,
+    });
+
+    this.isInitialized = true;
+    return this.server;
+  }
+
+  /**
+   * Get the configured server instance
+   */
+  public getServer(): Hocuspocus | null {
+    return this.server;
+  }
+
+  /**
+   * Check if the server has been initialized
+   */
+  public isServerInitialized(): boolean {
+    return this.isInitialized;
+  }
+
+  /**
+   * Reset the singleton instance (useful for testing)
+   */
+  public static resetInstance(): void {
+    HocusPocusServerManager.instance = null;
+  }
+}

apps/live/src/lib/page.ts

@@ -1,8 +1,9 @@
-// helpers
-import { getAllDocumentFormatsFromBinaryData, getBinaryDataFromHTMLString } from "@/core/helpers/page.js";
+import { logger } from "@plane/logger";
 // services
-import { PageService } from "@/core/services/page.service.js";
-import { manualLogger } from "../helpers/logger.js";
+import { PageService } from "@/services/page.service";
+// utils
+import { getAllDocumentFormatsFromBinaryData, getBinaryDataFromHTMLString } from "@/utils";
+
 const pageService = new PageService();
 
 export const updatePageDescription = async (
@@ -29,7 +30,7 @@ export const updatePageDescription = async (
 
     await pageService.updateDescription(workspaceSlug, projectId, pageId, payload, cookie);
   } catch (error) {
-    manualLogger.error("Update error:", error);
+    logger.error("Update error:", error);
     throw error;
   }
 };
@@ -47,7 +48,7 @@ const fetchDescriptionHTMLAndTransform = async (
     const { contentBinary } = getBinaryDataFromHTMLString(pageDetails.description_html ?? "<p></p>");
     return contentBinary;
   } catch (error) {
-    manualLogger.error("Error while transforming from HTML to Uint8Array", error);
+    logger.error("Error while transforming from HTML to Uint8Array", error);
     throw error;
   }
 };
@@ -74,7 +75,7 @@ export const fetchPageDescriptionBinary = async (
 
     return binaryData;
   } catch (error) {
-    manualLogger.error("Fetch error:", error);
+    logger.error("Fetch error:", error);
     throw error;
   }
 };

apps/live/src/redis.ts

@@ -0,0 +1,210 @@
+import Redis from "ioredis";
+import { logger } from "@plane/logger";
+
+export class RedisManager {
+  private static instance: RedisManager;
+  private redisClient: Redis | null = null;
+  private isConnected: boolean = false;
+  private connectionPromise: Promise<void> | null = null;
+
+  private constructor() {}
+
+  public static getInstance(): RedisManager {
+    if (!RedisManager.instance) {
+      RedisManager.instance = new RedisManager();
+    }
+    return RedisManager.instance;
+  }
+
+  public async initialize(): Promise<void> {
+    if (this.redisClient && this.isConnected) {
+      logger.info("Redis client already initialized and connected");
+      return;
+    }
+
+    if (this.connectionPromise) {
+      logger.info("Redis connection already in progress, waiting...");
+      await this.connectionPromise;
+      return;
+    }
+
+    this.connectionPromise = this.connect();
+    await this.connectionPromise;
+  }
+
+  private getRedisUrl(): string {
+    const redisUrl = process.env.REDIS_URL?.trim();
+    const redisHost = process.env.REDIS_HOST?.trim();
+    const redisPort = process.env.REDIS_PORT?.trim();
+
+    if (redisUrl) {
+      return redisUrl;
+    }
+
+    if (redisHost && redisPort && !Number.isNaN(Number(redisPort))) {
+      return `redis://${redisHost}:${redisPort}`;
+    }
+
+    return "";
+  }
+
+  private async connect(): Promise<void> {
+    try {
+      const redisUrl = this.getRedisUrl();
+
+      if (!redisUrl) {
+        logger.warn("No Redis URL provided, Redis functionality will be disabled");
+        this.isConnected = false;
+        return;
+      }
+
+      this.redisClient = new Redis(redisUrl, {
+        lazyConnect: true,
+        keepAlive: 30000,
+        connectTimeout: 10000,
+        commandTimeout: 5000,
+        enableOfflineQueue: false,
+        maxRetriesPerRequest: 3,
+      });
+
+      // Set up event listeners
+      this.redisClient.on("connect", () => {
+        logger.info("Redis client connected");
+        this.isConnected = true;
+      });
+
+      this.redisClient.on("ready", () => {
+        logger.info("Redis client ready");
+        this.isConnected = true;
+      });
+
+      this.redisClient.on("error", (error) => {
+        logger.error("Redis client error:", error);
+        this.isConnected = false;
+      });
+
+      this.redisClient.on("close", () => {
+        logger.warn("Redis client connection closed");
+        this.isConnected = false;
+      });
+
+      this.redisClient.on("reconnecting", () => {
+        logger.info("Redis client reconnecting...");
+        this.isConnected = false;
+      });
+
+      // Connect to Redis
+      await this.redisClient.connect();
+
+      // Test the connection
+      await this.redisClient.ping();
+      logger.info("Redis connection test successful");
+    } catch (error) {
+      logger.error("Failed to initialize Redis client:", error);
+      this.isConnected = false;
+      throw error;
+    } finally {
+      this.connectionPromise = null;
+    }
+  }
+
+  public getClient(): Redis | null {
+    if (!this.redisClient || !this.isConnected) {
+      logger.warn("Redis client not available or not connected");
+      return null;
+    }
+    return this.redisClient;
+  }
+
+  public isClientConnected(): boolean {
+    return this.isConnected && this.redisClient !== null;
+  }
+
+  public async disconnect(): Promise<void> {
+    if (this.redisClient) {
+      try {
+        await this.redisClient.quit();
+        logger.info("Redis client disconnected gracefully");
+      } catch (error) {
+        logger.error("Error disconnecting Redis client:", error);
+        // Force disconnect if quit fails
+        this.redisClient.disconnect();
+      } finally {
+        this.redisClient = null;
+        this.isConnected = false;
+      }
+    }
+  }
+
+  // Convenience methods for common Redis operations
+  public async set(key: string, value: string, ttl?: number): Promise<boolean> {
+    const client = this.getClient();
+    if (!client) return false;
+
+    try {
+      if (ttl) {
+        await client.setex(key, ttl, value);
+      } else {
+        await client.set(key, value);
+      }
+      return true;
+    } catch (error) {
+      logger.error(`Error setting Redis key ${key}:`, error);
+      return false;
+    }
+  }
+
+  public async get(key: string): Promise<string | null> {
+    const client = this.getClient();
+    if (!client) return null;
+
+    try {
+      return await client.get(key);
+    } catch (error) {
+      logger.error(`Error getting Redis key ${key}:`, error);
+      return null;
+    }
+  }
+
+  public async del(key: string): Promise<boolean> {
+    const client = this.getClient();
+    if (!client) return false;
+
+    try {
+      await client.del(key);
+      return true;
+    } catch (error) {
+      logger.error(`Error deleting Redis key ${key}:`, error);
+      return false;
+    }
+  }
+
+  public async exists(key: string): Promise<boolean> {
+    const client = this.getClient();
+    if (!client) return false;
+
+    try {
+      const result = await client.exists(key);
+      return result === 1;
+    } catch (error) {
+      logger.error(`Error checking Redis key ${key}:`, error);
+      return false;
+    }
+  }
+
+  public async expire(key: string, ttl: number): Promise<boolean> {
+    const client = this.getClient();
+    if (!client) return false;
+
+    try {
+      const result = await client.expire(key, ttl);
+      return result === 1;
+    } catch (error) {
+      logger.error(`Error setting expiry for Redis key ${key}:`, error);
+      return false;
+    }
+  }
+}
+
+// Export a default instance for convenience
+export const redisManager = RedisManager.getInstance();

apps/live/src/server.ts

@@ -3,13 +3,15 @@ import cors from "cors";
 import express, { Request, Response } from "express";
 import expressWs from "express-ws";
 import helmet from "helmet";
+// plane imports
+import { registerControllers } from "@plane/decorators";
+import { logger, loggerMiddleware } from "@plane/logger";
+// controllers
+import { CONTROLLERS } from "@/controllers";
 // hocuspocus server
-// helpers
-import { convertHTMLDocumentToAllFormats } from "@/core/helpers/convert-document.js";
-import { logger, manualLogger } from "@/core/helpers/logger.js";
-import { getHocusPocusServer } from "@/core/hocuspocus-server.js";
-// types
-import { TConvertDocumentRequestBody } from "@/core/types/common.js";
+import { HocusPocusServerManager } from "@/hocuspocus";
+// redis
+import { redisManager } from "@/redis";
 
 export class Server {
   private app: any;
@@ -20,74 +22,38 @@ export class Server {
   constructor() {
     this.app = express();
     this.router = express.Router();
-    expressWs(this.app);
     this.app.set("port", process.env.PORT || 3000);
+    this.app.use(process.env.LIVE_BASE_PATH || "/live", this.router);
+    expressWs(this.app);
     this.setupMiddleware();
-    this.setupHocusPocus();
     this.setupRoutes();
   }
 
+  public async initialize(): Promise<void> {
+    try {
+      redisManager.initialize();
+      logger.info("Redis setup completed");
+      const manager = HocusPocusServerManager.getInstance();
+      this.hocuspocusServer = await manager.initialize();
+      logger.info("HocusPocus setup completed");
+    } catch (error) {
+      logger.error("Failed to setup Redis:", error);
+      throw error;
+    }
+  }
+
   private setupMiddleware() {
     // Security middleware
     this.app.use(helmet());
     // Middleware for response compression
     this.app.use(compression({ level: 6, threshold: 5 * 1000 }));
     // Logging middleware
-    this.app.use(logger);
+    this.app.use(loggerMiddleware);
     // Body parsing middleware
     this.app.use(express.json());
     this.app.use(express.urlencoded({ extended: true }));
     // cors middleware
     this.app.use(cors());
-    this.app.use(process.env.LIVE_BASE_PATH || "/live", this.router);
-  }
-
-  private async setupHocusPocus() {
-    this.hocuspocusServer = await getHocusPocusServer().catch((err) => {
-      manualLogger.error("Failed to initialize HocusPocusServer:", err);
-      process.exit(1);
-    });
-  }
-
-  private setupRoutes() {
-    this.router.get("/health", (_req: Request, res: Response) => {
-      res.status(200).json({ status: "OK" });
-    });
-
-    this.router.ws("/collaboration", (ws: any, req: Request) => {
-      try {
-        this.hocuspocusServer.handleConnection(ws, req);
-      } catch (err) {
-        manualLogger.error("WebSocket connection error:", err);
-        ws.close();
-      }
-    });
-
-    this.router.post("/convert-document", (req: Request, res: Response) => {
-      const { description_html, variant } = req.body as TConvertDocumentRequestBody;
-      try {
-        if (description_html === undefined || variant === undefined) {
-          res.status(400).send({
-            message: "Missing required fields",
-          });
-          return;
-        }
-        const { description, description_binary } = convertHTMLDocumentToAllFormats({
-          document_html: description_html,
-          variant,
-        });
-        res.status(200).json({
-          description,
-          description_binary,
-        });
-      } catch (error) {
-        manualLogger.error("Error in /convert-document endpoint:", error);
-        res.status(500).json({
-          message: `Internal server error.`,
-        });
-      }
-    });
-
     this.app.use((_req: Request, res: Response) => {
       res.status(404).json({
         message: "Not Found",
@@ -95,37 +61,30 @@ export class Server {
     });
   }
 
+  private setupRoutes() {
+    CONTROLLERS.forEach((controller) => registerControllers(this.router, controller as any)); // TODO: fix this
+  }
+
   public listen() {
     this.serverInstance = this.app.listen(this.app.get("port"), () => {
-      manualLogger.info(`Plane Live server has started at port ${this.app.get("port")}`);
+      logger.info(`Plane Live server has started at port ${this.app.get("port")}`);
     });
   }
 
   public async destroy() {
     // Close the HocusPocus server WebSocket connections
-    await this.hocuspocusServer.destroy();
-    manualLogger.info("HocusPocus server WebSocket connections closed gracefully.");
+    if (this.hocuspocusServer) {
+      await this.hocuspocusServer.destroy();
+      logger.info("HocusPocus server WebSocket connections closed gracefully.");
+    }
+
+    // Disconnect Redis
+    await redisManager.disconnect();
+    logger.info("Redis connection closed gracefully.");
+
     // Close the Express server
     this.serverInstance.close(() => {
-      manualLogger.info("Express server closed gracefully.");
-      process.exit(1);
+      logger.info("Express server closed gracefully.");
     });
   }
 }
-
-const server = new Server();
-server.listen();
-
-// Graceful shutdown on unhandled rejection
-process.on("unhandledRejection", async (err: any) => {
-  manualLogger.info("Unhandled Rejection: ", err);
-  manualLogger.info(`UNHANDLED REJECTION! 💥 Shutting down...`);
-  await server.destroy();
-});
-
-// Graceful shutdown on uncaught exception
-process.on("uncaughtException", async (err: any) => {
-  manualLogger.info("Uncaught Exception: ", err);
-  manualLogger.info(`UNCAUGHT EXCEPTION! 💥 Shutting down...`);
-  await server.destroy();
-});

apps/live/src/services/page.service.ts

@@ -1,7 +1,7 @@
 // types
 import { TPage } from "@plane/types";
 // services
-import { API_BASE_URL, APIService } from "@/core/services/api.service.js";
+import { API_BASE_URL, APIService } from "@/services/api.service";
 
 export class PageService extends APIService {
   constructor() {

apps/live/src/services/user.service.ts

@@ -1,7 +1,7 @@
 // types
 import type { IUser } from "@plane/types";
 // services
-import { API_BASE_URL, APIService } from "@/core/services/api.service.js";
+import { API_BASE_URL, APIService } from "@/services/api.service";
 
 export class UserService extends APIService {
   constructor() {

apps/live/src/start.ts

@@ -0,0 +1,43 @@
+import { logger } from "@plane/logger";
+import { Server } from "./server";
+
+let server: Server;
+
+async function startServer() {
+  server = new Server();
+  try {
+    await server.initialize();
+    server.listen();
+  } catch (error) {
+    logger.error("Failed to start server:", error);
+    process.exit(1);
+  }
+}
+
+startServer();
+
+// Graceful shutdown on unhandled rejection
+process.on("unhandledRejection", async (err: any) => {
+  logger.error(`UNHANDLED REJECTION! 💥 Shutting down...`, err);
+  try {
+    if (server) {
+      await server.destroy();
+    }
+  } finally {
+    logger.info("Exiting process...");
+    process.exit(1);
+  }
+});
+
+// Graceful shutdown on uncaught exception
+process.on("uncaughtException", async (err: any) => {
+  logger.error(`UNCAUGHT EXCEPTION! 💥 Shutting down...`, err);
+  try {
+    if (server) {
+      await server.destroy();
+    }
+  } finally {
+    logger.info("Exiting process...");
+    process.exit(1);
+  }
+});

apps/live/src/types/index.ts

@@ -1,7 +1,4 @@
-// types
-import { TAdditionalDocumentTypes } from "@/plane-live/types/common.js";
-
-export type TDocumentTypes = "project_page" | TAdditionalDocumentTypes;
+export type TDocumentTypes = "project_page";
 
 export type HocusPocusServerContext = {
   cookie: string;

apps/live/src/utils/document.ts

@@ -3,11 +3,53 @@ import { generateHTML, generateJSON } from "@tiptap/html";
 import { prosemirrorJSONToYDoc, yXmlFragmentToProseMirrorRootNode } from "y-prosemirror";
 import * as Y from "yjs";
 // plane editor
+import {
+  getAllDocumentFormatsFromDocumentEditorBinaryData,
+  getAllDocumentFormatsFromRichTextEditorBinaryData,
+  getBinaryDataFromDocumentEditorHTMLString,
+  getBinaryDataFromRichTextEditorHTMLString,
+} from "@plane/editor";
+// plane types
+import { TDocumentPayload } from "@plane/types";
+// plane editor
 import { CoreEditorExtensionsWithoutProps, DocumentEditorExtensionsWithoutProps } from "@plane/editor/lib";
 
 const DOCUMENT_EDITOR_EXTENSIONS = [...CoreEditorExtensionsWithoutProps, ...DocumentEditorExtensionsWithoutProps];
 const documentEditorSchema = getSchema(DOCUMENT_EDITOR_EXTENSIONS);
 
+type TArgs = {
+  document_html: string;
+  variant: "rich" | "document";
+};
+
+export const convertHTMLDocumentToAllFormats = (args: TArgs): TDocumentPayload => {
+  const { document_html, variant } = args;
+
+  if (variant === "rich") {
+    const contentBinary = getBinaryDataFromRichTextEditorHTMLString(document_html);
+    const { contentBinaryEncoded, contentHTML, contentJSON } =
+      getAllDocumentFormatsFromRichTextEditorBinaryData(contentBinary);
+    return {
+      description: contentJSON,
+      description_html: contentHTML,
+      description_binary: contentBinaryEncoded,
+    };
+  }
+
+  if (variant === "document") {
+    const contentBinary = getBinaryDataFromDocumentEditorHTMLString(document_html);
+    const { contentBinaryEncoded, contentHTML, contentJSON } =
+      getAllDocumentFormatsFromDocumentEditorBinaryData(contentBinary);
+    return {
+      description: contentJSON,
+      description_html: contentHTML,
+      description_binary: contentBinaryEncoded,
+    };
+  }
+
+  throw new Error(`Invalid variant provided: ${variant}`);
+};
+
 export const getAllDocumentFormatsFromBinaryData = (
   description: Uint8Array
 ): {

apps/live/src/utils/index.ts

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

apps/live/tsconfig.json

@@ -21,6 +21,6 @@
     "emitDecoratorMetadata": true,
     "sourceRoot": "/"
   },
-  "include": ["src/**/*.ts", "tsup.config.ts"],
+  "include": ["src/**/*.ts", "tsdown.config.ts"],
   "exclude": ["./dist", "./build", "./node_modules"]
 }

apps/live/tsdown.config.ts

@@ -0,0 +1,7 @@
+import { defineConfig } from "tsdown";
+
+export default defineConfig({
+  entry: ["src/server.ts"],
+  outDir: "dist",
+  format: ["esm", "cjs"],
+});

apps/live/tsup.config.ts

@@ -1,15 +0,0 @@
-import { defineConfig } from "tsup";
-
-export default defineConfig({
-  entry: ["src/server.ts"],
-  format: ["esm", "cjs"],
-  dts: true,
-  splitting: false,
-  sourcemap: true,
-  minify: false,
-  target: "node18",
-  outDir: "dist",
-  env: {
-    NODE_ENV: process.env.NODE_ENV || "development",
-  },
-});

apps/space/core/components/account/auth-forms/auth-root.tsx

@@ -172,7 +172,7 @@ export const AuthRoot: FC = observer(() => {
       text: `${content} with GitHub`,
       icon: (
         <Image
-          src={resolvedTheme === "dark" ? GithubDarkLogo : GithubLightLogo}
+          src={resolvedTheme === "dark" ? GithubLightLogo : GithubDarkLogo}
           height={18}
           width={18}
           alt="GitHub Logo"

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

@@ -2,17 +2,16 @@ import React from "react";
 // plane imports
 import { type EditorRefApi, type ILiteTextEditorProps, LiteTextEditorWithRef, type TFileHandler } from "@plane/editor";
 import type { MakeOptional } from "@plane/types";
-import { cn } from "@plane/utils";
+import { cn, isCommentEmpty } from "@plane/utils";
 // helpers
 import { getEditorFileHandlers } from "@/helpers/editor.helper";
-import { isCommentEmpty } from "@/helpers/string.helper";
 import { useEditorFlagging } from "@/plane-web/hooks/use-editor-flagging";
 // local imports
 import { EditorMentionsRoot } from "./embeds/mentions";
 import { IssueCommentToolbar } from "./toolbar";
 
 type LiteTextEditorWrapperProps = MakeOptional<
-  Omit<ILiteTextEditorProps, "fileHandler" | "mentionHandler">,
+  Omit<ILiteTextEditorProps, "fileHandler" | "mentionHandler" | "extendedEditorProps">,
   "disabledExtensions" | "flaggedExtensions"
 > & {
   anchor: string;
@@ -63,6 +62,7 @@ export const LiteTextEditor = React.forwardRef<EditorRefApi, LiteTextEditorWrapp
         mentionHandler={{
           renderComponent: (props) => <EditorMentionsRoot {...props} />,
         }}
+        extendedEditorProps={{}}
         {...rest}
         // overriding the containerClassName to add relative class passed
         containerClassName={cn(containerClassName, "relative")}

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

@@ -12,7 +12,7 @@ import { useEditorFlagging } from "@/plane-web/hooks/use-editor-flagging";
 import { EditorMentionsRoot } from "./embeds/mentions";
 
 type RichTextEditorWrapperProps = MakeOptional<
-  Omit<IRichTextEditorProps, "editable" | "fileHandler" | "mentionHandler">,
+  Omit<IRichTextEditorProps, "editable" | "fileHandler" | "mentionHandler" | "extendedEditorProps">,
   "disabledExtensions" | "flaggedExtensions"
 > & {
   anchor: string;
@@ -56,6 +56,7 @@ export const RichTextEditor = forwardRef<EditorRefApi, RichTextEditorWrapperProp
         workspaceId,
       })}
       flaggedExtensions={richTextEditorExtensions.flagged}
+      extendedEditorProps={{}}
       {...rest}
       containerClassName={containerClassName}
       editorClassName="min-h-[100px] py-2 overflow-hidden"

apps/space/core/components/editor/toolbar.tsx

@@ -3,7 +3,8 @@
 import React, { useEffect, useState, useCallback } from "react";
 // plane imports
 import { TOOLBAR_ITEMS, type ToolbarMenuItem, type EditorRefApi } from "@plane/editor";
-import { Button, Tooltip } from "@plane/ui";
+import { Tooltip } from "@plane/propel/tooltip";
+import { Button } from "@plane/ui";
 import { cn } from "@plane/utils";
 
 type Props = {

apps/space/core/components/issues/issue-layouts/kanban/block.tsx

@@ -5,9 +5,9 @@ import { observer } from "mobx-react";
 import Link from "next/link";
 import { useParams, useSearchParams } from "next/navigation";
 // plane types
+import { Tooltip } from "@plane/propel/tooltip";
 import { IIssueDisplayProperties } from "@plane/types";
 // plane ui
-import { Tooltip } from "@plane/ui";
 // plane utils
 import { cn } from "@plane/utils";
 // components

apps/space/core/components/issues/issue-layouts/list/block.tsx

@@ -5,9 +5,9 @@ import { observer } from "mobx-react";
 import Link from "next/link";
 import { useParams, useSearchParams } from "next/navigation";
 // plane types
+import { Tooltip } from "@plane/propel/tooltip";
 import { IIssueDisplayProperties } from "@plane/types";
 // plane ui
-import { Tooltip } from "@plane/ui";
 // plane utils
 import { cn } from "@plane/utils";
 // helpers
@@ -75,7 +75,7 @@ export const IssueBlock = observer((props: IssueBlockProps) => {
             onClick={handleIssuePeekOverview}
             className="w-full truncate cursor-pointer text-sm text-custom-text-100"
           >
-            <Tooltip tooltipContent={issue.name} position="top-left">
+            <Tooltip tooltipContent={issue.name} position="top-start">
               <p className="truncate">{issue.name}</p>
             </Tooltip>
           </Link>

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

@@ -3,8 +3,8 @@
 import { observer } from "mobx-react";
 import { Layers, Link, Paperclip } from "lucide-react";
 // plane imports
+import { Tooltip } from "@plane/propel/tooltip";
 import type { IIssueDisplayProperties } from "@plane/types";
-import { Tooltip } from "@plane/ui";
 import { cn } from "@plane/utils";
 // components
 import { WithDisplayPropertiesHOC } from "@/components/issues/issue-layouts/with-display-properties-HOC";

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

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

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

@@ -2,7 +2,7 @@
 
 import { observer } from "mobx-react";
 import { CalendarCheck2 } from "lucide-react";
-import { Tooltip } from "@plane/ui";
+import { Tooltip } from "@plane/propel/tooltip";
 import { cn } from "@plane/utils";
 // helpers
 import { renderFormattedDate } from "@/helpers/date-time.helper";

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

@@ -3,7 +3,7 @@
 import { observer } from "mobx-react";
 import { Tags } from "lucide-react";
 // plane imports
-import { Tooltip } from "@plane/ui";
+import { Tooltip } from "@plane/propel/tooltip";
 // hooks
 import { useLabel } from "@/hooks/store/use-label";
 

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

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

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

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

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

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

apps/space/core/components/issues/navbar/layout-selection.tsx

@@ -7,7 +7,7 @@ import { useRouter, useSearchParams } from "next/navigation";
 import { SITES_ISSUE_LAYOUTS } from "@plane/constants";
 // plane i18n
 import { useTranslation } from "@plane/i18n";
-import { Tooltip } from "@plane/ui";
+import { Tooltip } from "@plane/propel/tooltip";
 // helpers
 import { queryParamGenerator } from "@/helpers/query-param-generator";
 // hooks

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

@@ -3,7 +3,7 @@
 import React from "react";
 import { observer } from "mobx-react";
 import { usePathname, useRouter, useSearchParams } from "next/navigation";
-import { Tooltip } from "@plane/ui";
+import { Tooltip } from "@plane/propel/tooltip";
 // plane imports
 import { cn } from "@plane/utils";
 // ui

apps/space/core/components/issues/reactions/issue-emoji-reactions.tsx

@@ -3,7 +3,7 @@
 import { observer } from "mobx-react";
 import { usePathname, useRouter, useSearchParams } from "next/navigation";
 // lib
-import { Tooltip } from "@plane/ui";
+import { Tooltip } from "@plane/propel/tooltip";
 import { ReactionSelector } from "@/components/ui";
 // helpers
 import { groupReactions, renderEmoji } from "@/helpers/emoji.helper";

apps/space/core/components/issues/reactions/issue-vote-reactions.tsx

@@ -4,7 +4,7 @@ import { useState } from "react";
 import { observer } from "mobx-react";
 import { usePathname, useRouter, useSearchParams } from "next/navigation";
 // plane imports
-import { Tooltip } from "@plane/ui";
+import { Tooltip } from "@plane/propel/tooltip";
 import { cn } from "@plane/utils";
 // helpers
 import { queryParamGenerator } from "@/helpers/query-param-generator";

apps/space/helpers/string.helper.ts

@@ -57,24 +57,6 @@ export const isEmptyHtmlString = (htmlString: string, allowedHTMLTags: string[]
   return cleanText.trim() === "";
 };
 
-/**
- * @description this function returns whether a comment is empty or not by checking for the following conditions-
- * 1. If comment is undefined
- * 2. If comment is an empty string
- * 3. If comment is "<p></p>"
- * @param {string | undefined} comment
- * @returns {boolean}
- */
-export const isCommentEmpty = (comment: string | undefined): boolean => {
-  // return true if comment is undefined
-  if (!comment) return true;
-  return (
-    comment?.trim() === "" ||
-    comment === "<p></p>" ||
-    isEmptyHtmlString(comment ?? "", ["img", "mention-component", "image-component", "embed-component"])
-  );
-};
-
 export const replaceUnderscoreIfSnakeCase = (str: string) => str.replace(/_/g, " ");
 
 export const capitalizeFirstLetter = (str: string) => str.charAt(0).toUpperCase() + str.slice(1);

apps/space/package.json

@@ -15,8 +15,6 @@
     "fix:format": "prettier --write \"**/*.{ts,tsx,md,json,css,scss}\""
   },
   "dependencies": {
-    "@blueprintjs/core": "^4.16.3",
-    "@blueprintjs/popover2": "^1.13.3",
     "@emotion/react": "^11.11.1",
     "@emotion/styled": "^11.11.0",
     "@headlessui/react": "^1.7.13",
@@ -30,18 +28,18 @@
     "@plane/ui": "workspace:*",
     "@plane/utils": "workspace:*",
     "@popperjs/core": "^2.11.8",
-    "axios": "1.11.0",
+    "axios": "catalog:",
     "clsx": "^2.0.0",
     "date-fns": "^4.1.0",
     "dompurify": "^3.0.11",
     "dotenv": "^16.3.1",
-    "lodash": "^4.17.21",
+    "lodash": "catalog:",
     "lowlight": "^2.9.0",
-    "lucide-react": "^0.469.0",
-    "mobx": "^6.10.0",
-    "mobx-react": "^9.1.1",
-    "mobx-utils": "^6.0.8",
-    "next": "14.2.32",
+    "lucide-react": "catalog:",
+    "mobx": "catalog:",
+    "mobx-react": "catalog:",
+    "mobx-utils": "catalog:",
+    "next": "catalog:",
     "next-themes": "^0.2.1",
     "nprogress": "^0.2.0",
     "react": "catalog:",
@@ -49,16 +47,16 @@
     "react-dropzone": "^14.2.3",
     "react-hook-form": "7.51.5",
     "react-popper": "^2.3.0",
-    "sharp": "^0.33.5",
-    "swr": "^2.2.2",
+    "sharp": "catalog:",
+    "swr": "catalog:",
     "tailwind-merge": "^2.0.0",
-    "uuid": "^9.0.0"
+    "uuid": "catalog:"
   },
   "devDependencies": {
     "@plane/eslint-config": "workspace:*",
     "@plane/tailwind-config": "workspace:*",
     "@plane/typescript-config": "workspace:*",
-    "@types/lodash": "4.17.20",
+    "@types/lodash": "catalog:",
     "@types/node": "18.14.1",
     "@types/nprogress": "^0.2.0",
     "@types/react": "catalog:",

apps/space/styles/globals.css

@@ -1,4 +1,5 @@
 @import "@plane/propel/styles/fonts";
+@import "@plane/editor/styles";
 
 @tailwind base;
 @tailwind components;

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

@@ -7,7 +7,8 @@ import { useParams } from "next/navigation";
 import { Plus, Search } from "lucide-react";
 import { EUserPermissions, EUserPermissionsLevel, PROJECT_TRACKER_ELEMENTS } from "@plane/constants";
 import { useTranslation } from "@plane/i18n";
-import { setToast, TOAST_TYPE, Tooltip } from "@plane/ui";
+import { Tooltip } from "@plane/propel/tooltip";
+import { setToast, TOAST_TYPE } from "@plane/ui";
 import { copyUrlToClipboard, orderJoinedProjects } from "@plane/utils";
 // components
 import { CreateProjectModal } from "@/components/project/create-project-modal";

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

@@ -1,28 +1,22 @@
 "use client";
 
 import { observer } from "mobx-react";
-import Image from "next/image";
-import { useTheme } from "next-themes";
 import { Home, Shapes } from "lucide-react";
-// images
-import githubBlackImage from "/public/logos/github-black.png";
-import githubWhiteImage from "/public/logos/github-white.png";
-// ui
-import { GITHUB_REDIRECTED_TRACKER_EVENT, HEADER_GITHUB_ICON } from "@plane/constants";
+// plane imports
 import { useTranslation } from "@plane/i18n";
 import { Breadcrumbs, Button, Header } from "@plane/ui";
 // components
 import { BreadcrumbLink } from "@/components/common/breadcrumb-link";
-// constants
 // hooks
-import { captureElementAndEvent } from "@/helpers/event-tracker.helper";
 import { useHome } from "@/hooks/store/use-home";
+// local imports
+import { StarUsOnGitHubLink } from "./star-us-link";
 
 export const WorkspaceDashboardHeader = observer(() => {
-  // hooks
-  const { resolvedTheme } = useTheme();
-  const { toggleWidgetSettings } = useHome();
+  // plane hooks
   const { t } = useTranslation();
+  // hooks
+  const { toggleWidgetSettings } = useHome();
 
   return (
     <>
@@ -48,31 +42,7 @@ export const WorkspaceDashboardHeader = observer(() => {
             <Shapes size={16} />
             <div className="hidden text-xs font-medium sm:hidden md:block">{t("home.manage_widgets")}</div>
           </Button>
-          <a
-            onClick={() =>
-              captureElementAndEvent({
-                element: {
-                  elementName: HEADER_GITHUB_ICON,
-                },
-                event: {
-                  eventName: GITHUB_REDIRECTED_TRACKER_EVENT,
-                  state: "SUCCESS",
-                },
-              })
-            }
-            className="flex flex-shrink-0 items-center gap-1.5 rounded bg-custom-background-80 px-3 py-1.5"
-            href="https://github.com/makeplane/plane"
-            target="_blank"
-            rel="noopener noreferrer"
-          >
-            <Image
-              src={resolvedTheme === "dark" ? githubWhiteImage : githubBlackImage}
-              height={16}
-              width={16}
-              alt="GitHub Logo"
-            />
-            <span className="hidden text-xs font-medium sm:hidden md:block">{t("home.star_us_on_github")}</span>
-          </a>
+          <StarUsOnGitHubLink />
         </Header.RightItem>
       </Header>
     </>

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

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

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

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

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

@@ -1,178 +0,0 @@
-"use client";
-
-import { FC, useCallback } from "react";
-import { observer } from "mobx-react";
-import { useParams } from "next/navigation";
-// plane constants
-import { EIssueFilterType, ISSUE_DISPLAY_FILTERS_BY_PAGE } from "@plane/constants";
-// i18n
-import { useTranslation } from "@plane/i18n";
-// types
-import {
-  EIssuesStoreType,
-  IIssueDisplayFilterOptions,
-  IIssueDisplayProperties,
-  IIssueFilterOptions,
-  EIssueLayoutTypes,
-} from "@plane/types";
-// ui
-import { Breadcrumbs, LayersIcon, Tooltip } from "@plane/ui";
-// components
-import { isIssueFilterActive } from "@plane/utils";
-import { BreadcrumbLink } from "@/components/common/breadcrumb-link";
-import {
-  DisplayFiltersSelection,
-  FiltersDropdown,
-  FilterSelection,
-  LayoutSelection,
-} from "@/components/issues/issue-layouts/filters";
-// helpers
-// hooks
-import { useIssues } from "@/hooks/store/use-issues";
-import { useLabel } from "@/hooks/store/use-label";
-import { useMember } from "@/hooks/store/use-member";
-import { useProject } from "@/hooks/store/use-project";
-import { useProjectState } from "@/hooks/store/use-project-state";
-import { usePlatformOS } from "@/hooks/use-platform-os";
-// plane web
-import { ProjectBreadcrumb } from "@/plane-web/components/breadcrumbs/project";
-
-// FIXME: Deprecated. Remove it
-export const ProjectDraftIssueHeader: FC = observer(() => {
-  // i18n
-  const { t } = useTranslation();
-  // router
-  const { workspaceSlug, projectId } = useParams() as { workspaceSlug: string; projectId: string };
-  // store hooks
-  const {
-    issuesFilter: { issueFilters, updateFilters },
-  } = useIssues(EIssuesStoreType.DRAFT);
-  const { currentProjectDetails, loader } = useProject();
-  const { projectStates } = useProjectState();
-  const { projectLabels } = useLabel();
-  const {
-    project: { projectMemberIds },
-  } = useMember();
-  const { isMobile } = usePlatformOS();
-  const activeLayout = issueFilters?.displayFilters?.layout;
-
-  const handleFiltersUpdate = useCallback(
-    (key: keyof IIssueFilterOptions, value: string | string[]) => {
-      if (!workspaceSlug || !projectId) return;
-      const newValues = issueFilters?.filters?.[key] ?? [];
-
-      if (Array.isArray(value)) {
-        // this validation is majorly for the filter start_date, target_date custom
-        value.forEach((val) => {
-          if (!newValues.includes(val)) newValues.push(val);
-          else newValues.splice(newValues.indexOf(val), 1);
-        });
-      } else {
-        if (issueFilters?.filters?.[key]?.includes(value)) newValues.splice(newValues.indexOf(value), 1);
-        else newValues.push(value);
-      }
-
-      updateFilters(workspaceSlug, projectId, EIssueFilterType.FILTERS, { [key]: newValues });
-    },
-    [workspaceSlug, projectId, issueFilters, updateFilters]
-  );
-
-  const handleLayoutChange = useCallback(
-    (layout: EIssueLayoutTypes) => {
-      if (!workspaceSlug || !projectId) return;
-      updateFilters(workspaceSlug, projectId, EIssueFilterType.DISPLAY_FILTERS, { layout: layout });
-    },
-    [workspaceSlug, projectId, updateFilters]
-  );
-
-  const handleDisplayFilters = useCallback(
-    (updatedDisplayFilter: Partial<IIssueDisplayFilterOptions>) => {
-      if (!workspaceSlug || !projectId) return;
-      updateFilters(workspaceSlug, projectId, EIssueFilterType.DISPLAY_FILTERS, updatedDisplayFilter);
-    },
-    [workspaceSlug, projectId, updateFilters]
-  );
-
-  const handleDisplayProperties = useCallback(
-    (property: Partial<IIssueDisplayProperties>) => {
-      if (!workspaceSlug || !projectId) return;
-      updateFilters(workspaceSlug, projectId, EIssueFilterType.DISPLAY_PROPERTIES, property);
-    },
-    [workspaceSlug, projectId, updateFilters]
-  );
-
-  const issueCount = undefined;
-
-  return (
-    <div className="relative z-10 flex h-header w-full flex-shrink-0 flex-row items-center justify-between gap-x-2 gap-y-4 bg-custom-sidebar-background-100 p-4">
-      <div className="flex w-full flex-grow items-center gap-2 overflow-ellipsis whitespace-nowrap">
-        <div className="flex items-center gap-2.5">
-          <Breadcrumbs isLoading={loader === "init-loader"}>
-            <ProjectBreadcrumb workspaceSlug={workspaceSlug} projectId={projectId} />
-
-            <Breadcrumbs.Item
-              component={
-                <BreadcrumbLink
-                  label="Draft work items"
-                  icon={<LayersIcon className="h-4 w-4 text-custom-text-300" />}
-                />
-              }
-            />
-          </Breadcrumbs>
-          {issueCount && issueCount > 0 ? (
-            <Tooltip
-              isMobile={isMobile}
-              tooltipContent={`There are ${issueCount} ${issueCount > 1 ? "work items" : "work item"} in project's draft`}
-              position="bottom"
-            >
-              <span className="cursor-default flex items-center text-center justify-center px-2.5 py-0.5 flex-shrink-0 bg-custom-primary-100/20 text-custom-primary-100 text-xs font-semibold rounded-xl">
-                {issueCount}
-              </span>
-            </Tooltip>
-          ) : null}
-        </div>
-
-        <div className="ml-auto flex items-center gap-2">
-          <LayoutSelection
-            layouts={[EIssueLayoutTypes.LIST, EIssueLayoutTypes.KANBAN]}
-            onChange={(layout) => handleLayoutChange(layout)}
-            selectedLayout={activeLayout}
-          />
-          <FiltersDropdown
-            title={t("common.filters")}
-            placement="bottom-end"
-            isFiltersApplied={isIssueFilterActive(issueFilters)}
-          >
-            <FilterSelection
-              filters={issueFilters?.filters ?? {}}
-              handleFiltersUpdate={handleFiltersUpdate}
-              displayFilters={issueFilters?.displayFilters ?? {}}
-              handleDisplayFiltersUpdate={handleDisplayFilters}
-              layoutDisplayFiltersOptions={
-                activeLayout ? ISSUE_DISPLAY_FILTERS_BY_PAGE.issues[activeLayout] : undefined
-              }
-              labels={projectLabels}
-              memberIds={projectMemberIds ?? undefined}
-              states={projectStates}
-              cycleViewDisabled={!currentProjectDetails?.cycle_view}
-              moduleViewDisabled={!currentProjectDetails?.module_view}
-            />
-          </FiltersDropdown>
-          <FiltersDropdown title={t("common.display")} placement="bottom-end">
-            <DisplayFiltersSelection
-              layoutDisplayFiltersOptions={
-                activeLayout ? ISSUE_DISPLAY_FILTERS_BY_PAGE.issues[activeLayout] : undefined
-              }
-              displayFilters={issueFilters?.displayFilters ?? {}}
-              handleDisplayFiltersUpdate={handleDisplayFilters}
-              displayProperties={issueFilters?.displayProperties ?? {}}
-              handleDisplayPropertiesUpdate={handleDisplayProperties}
-              cycleViewDisabled={!currentProjectDetails?.cycle_view}
-              moduleViewDisabled={!currentProjectDetails?.module_view}
-            />
-          </FiltersDropdown>
-        </div>
-      </div>
-    </div>
-  );
-});

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

@@ -1,15 +0,0 @@
-"use client";
-
-// components
-import { AppHeader } from "@/components/core/app-header";
-import { ContentWrapper } from "@/components/core/content-wrapper";
-import { ProjectDraftIssueHeader } from "./header";
-
-export default function ProjectDraftIssuesLayou({ children }: { children: React.ReactNode }) {
-  return (
-    <>
-      <AppHeader header={<ProjectDraftIssueHeader />} />
-      <ContentWrapper>{children}</ContentWrapper>
-    </>
-  );
-}

apps/web/app/(all)/[workspaceSlug]/(projects)/projects/(detail)/[projectId]/draft-issues/page.tsx

@@ -1,43 +0,0 @@
-"use client";
-
-import { observer } from "mobx-react";
-import { useParams } from "next/navigation";
-import { X, PenSquare } from "lucide-react";
-// components
-import { PageHead } from "@/components/core/page-title";
-import { DraftIssueLayoutRoot } from "@/components/issues/issue-layouts/roots/draft-issue-layout-root";
-// hooks
-import { useProject } from "@/hooks/store/use-project";
-import { useAppRouter } from "@/hooks/use-app-router";
-
-const ProjectDraftIssuesPage = observer(() => {
-  const router = useAppRouter();
-  const { workspaceSlug, projectId } = useParams();
-  // store
-  const { getProjectById } = useProject();
-  // derived values
-  const project = projectId ? getProjectById(projectId.toString()) : undefined;
-  const pageTitle = project?.name ? `${project?.name} - Draft work items` : undefined;
-
-  return (
-    <>
-      <PageHead title={pageTitle} />
-      <div className="flex h-full w-full flex-col">
-        <div className="gap-1 flex items-center border-b border-custom-border-200 px-4 py-2.5 shadow-sm bg-custom-background-100 z-[12]">
-          <button
-            type="button"
-            onClick={() => router.push(`/${workspaceSlug}/projects/${projectId}/issues/`)}
-            className="flex items-center gap-1.5 rounded-full border border-custom-border-200 px-3 py-1.5 text-xs"
-          >
-            <PenSquare className="h-4 w-4" />
-            <span>Draft work items</span>
-            <X className="h-3 w-3" />
-          </button>
-        </div>
-        <DraftIssueLayoutRoot />
-      </div>
-    </>
-  );
-});
-
-export default ProjectDraftIssuesPage;

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

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

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

@@ -1,6 +1,6 @@
 "use client";
 
-import { useCallback, useMemo } from "react";
+import { useCallback, useEffect, useMemo } from "react";
 import { observer } from "mobx-react";
 import Link from "next/link";
 import { useParams } from "next/navigation";
@@ -20,6 +20,7 @@ import { PageRoot, TPageRootConfig, TPageRootHandlers } from "@/components/pages
 import { useEditorConfig } from "@/hooks/editor";
 import { useEditorAsset } from "@/hooks/store/use-editor-asset";
 import { useWorkspace } from "@/hooks/store/use-workspace";
+import { useAppRouter } from "@/hooks/use-app-router";
 // plane web hooks
 import { EPageStoreType, usePage, usePageStore } from "@/plane-web/hooks/store";
 // plane web services
@@ -30,13 +31,17 @@ const workspaceService = new WorkspaceService();
 const projectPageService = new ProjectPageService();
 const projectPageVersionService = new ProjectPageVersionService();
 
+const storeType = EPageStoreType.PROJECT;
+
 const PageDetailsPage = observer(() => {
+  // router
+  const router = useAppRouter();
   const { workspaceSlug, projectId, pageId } = useParams();
   // store hooks
-  const { createPage, fetchPageDetails } = usePageStore(EPageStoreType.PROJECT);
+  const { createPage, fetchPageDetails } = usePageStore(storeType);
   const page = usePage({
     pageId: pageId?.toString() ?? "",
-    storeType: EPageStoreType.PROJECT,
+    storeType,
   });
   const { getWorkspaceBySlug } = useWorkspace();
   const { uploadEditorAsset } = useEditorAsset();
@@ -88,10 +93,25 @@ const PageDetailsPage = observer(() => {
           versionId
         );
       },
-      getRedirectionLink: (pageId) => `/${workspaceSlug}/projects/${projectId}/pages/${pageId}`,
+      restoreVersion: async (pageId, versionId) => {
+        if (!workspaceSlug || !projectId) return;
+        await projectPageVersionService.restoreVersion(
+          workspaceSlug.toString(),
+          projectId.toString(),
+          pageId,
+          versionId
+        );
+      },
+      getRedirectionLink: (pageId) => {
+        if (pageId) {
+          return `/${workspaceSlug}/projects/${projectId}/pages/${pageId}`;
+        } else {
+          return `/${workspaceSlug}/projects/${projectId}/pages`;
+        }
+      },
       updateDescription: updateDescription ?? (async () => {}),
     }),
-    [createPage, fetchEntityCallback, id, projectId, updateDescription, workspaceSlug]
+    [createPage, fetchEntityCallback, id, updateDescription, workspaceSlug, projectId]
   );
   // page root config
   const pageRootConfig: TPageRootConfig = useMemo(
@@ -115,7 +135,7 @@ const PageDetailsPage = observer(() => {
         workspaceSlug: workspaceSlug?.toString() ?? "",
       }),
     }),
-    [getEditorFileHandlers, id, projectId, uploadEditorAsset, workspaceId, workspaceSlug]
+    [getEditorFileHandlers, id, uploadEditorAsset, projectId, workspaceId, workspaceSlug]
   );
 
   const webhookConnectionParams: TWebhookConnectionQueryParams = useMemo(
@@ -127,6 +147,12 @@ const PageDetailsPage = observer(() => {
     [projectId, workspaceSlug]
   );
 
+  useEffect(() => {
+    if (page?.deleted_at && page?.id) {
+      router.push(pageRootHandlers.getRedirectionLink());
+    }
+  }, [page?.deleted_at, page?.id, router, pageRootHandlers]);
+
   if ((!page || !id) && !pageDetailsError)
     return (
       <div className="size-full grid place-items-center">
@@ -150,7 +176,7 @@ const PageDetailsPage = observer(() => {
       </div>
     );
 
-  if (!page) return null;
+  if (!page || !workspaceSlug || !projectId) return null;
 
   return (
     <>
@@ -160,9 +186,11 @@ const PageDetailsPage = observer(() => {
           <PageRoot
             config={pageRootConfig}
             handlers={pageRootHandlers}
+            storeType={storeType}
             page={page}
             webhookConnectionParams={webhookConnectionParams}
-            workspaceSlug={workspaceSlug?.toString() ?? ""}
+            workspaceSlug={workspaceSlug.toString()}
+            projectId={projectId?.toString()}
           />
           <IssuePeekOverview />
         </div>

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

@@ -14,6 +14,7 @@ import {
   WORK_ITEM_TRACKER_ELEMENTS,
 } from "@plane/constants";
 // types
+import { Tooltip } from "@plane/propel/tooltip";
 import {
   EIssuesStoreType,
   EViewAccess,
@@ -24,7 +25,7 @@ import {
   EIssueLayoutTypes,
 } from "@plane/types";
 // ui
-import { Breadcrumbs, Button, Tooltip, Header, BreadcrumbNavigationSearchDropdown } from "@plane/ui";
+import { Breadcrumbs, Button, Header, BreadcrumbNavigationSearchDropdown } from "@plane/ui";
 // components
 import { isIssueFilterActive } from "@plane/utils";
 import { SwitcherIcon, SwitcherLabel } from "@/components/common/switcher-label";

apps/web/app/(all)/[workspaceSlug]/(projects)/star-us-link.tsx

@@ -0,0 +1,44 @@
+"use client";
+
+import Image from "next/image";
+import { useTheme } from "next-themes";
+// plane imports
+import { HEADER_GITHUB_ICON, GITHUB_REDIRECTED_TRACKER_EVENT } from "@plane/constants";
+import { useTranslation } from "@plane/i18n";
+// helpers
+import { captureElementAndEvent } from "@/helpers/event-tracker.helper";
+// public imports
+import githubBlackImage from "@/public/logos/github-black.png";
+import githubWhiteImage from "@/public/logos/github-white.png";
+
+export const StarUsOnGitHubLink = () => {
+  // plane hooks
+  const { t } = useTranslation();
+  // hooks
+  const { resolvedTheme } = useTheme();
+  const imageSrc = resolvedTheme === "dark" ? githubWhiteImage : githubBlackImage;
+
+  return (
+    <a
+      aria-label={t("home.star_us_on_github")}
+      onClick={() =>
+        captureElementAndEvent({
+          element: {
+            elementName: HEADER_GITHUB_ICON,
+          },
+          event: {
+            eventName: GITHUB_REDIRECTED_TRACKER_EVENT,
+            state: "SUCCESS",
+          },
+        })
+      }
+      className="flex flex-shrink-0 items-center gap-1.5 rounded bg-custom-background-80 px-3 py-1.5"
+      href="https://github.com/makeplane/plane"
+      target="_blank"
+      rel="noopener noreferrer"
+    >
+      <Image src={imageSrc} height={16} width={16} alt="GitHub Logo" aria-hidden="true" />
+      <span className="hidden text-xs font-medium sm:hidden md:block">{t("home.star_us_on_github")}</span>
+    </a>
+  );
+};

apps/web/app/(all)/profile/sidebar.tsx

@@ -21,7 +21,8 @@ import {
 import { PROFILE_ACTION_LINKS } from "@plane/constants";
 import { useOutsideClickDetector } from "@plane/hooks";
 import { useTranslation } from "@plane/i18n";
-import { TOAST_TYPE, Tooltip, setToast } from "@plane/ui";
+import { Tooltip } from "@plane/propel/tooltip";
+import { TOAST_TYPE, setToast } from "@plane/ui";
 import { cn, getFileURL } from "@plane/utils";
 // components
 import { SidebarNavItem } from "@/components/sidebar/sidebar-navigation";

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

@@ -4,8 +4,9 @@ import { observer } from "mobx-react";
 import { Briefcase } from "lucide-react";
 // plane imports
 import { ICustomSearchSelectOption } from "@plane/types";
-import { BreadcrumbNavigationSearchDropdown, Breadcrumbs, Logo } from "@plane/ui";
+import { BreadcrumbNavigationSearchDropdown, Breadcrumbs } from "@plane/ui";
 // components
+import { Logo } from "@/components/common/logo";
 import { SwitcherLabel } from "@/components/common/switcher-label";
 // hooks
 import { useProject } from "@/hooks/store/use-project";

apps/web/ce/components/command-palette/modals/issue-level.tsx

@@ -1,6 +1,6 @@
 import { FC } from "react";
 import { observer } from "mobx-react";
-import { useParams, usePathname } from "next/navigation";
+import { useParams } from "next/navigation";
 // plane imports
 import { EIssueServiceType, EIssuesStoreType, TIssue } from "@plane/types";
 // components
@@ -22,7 +22,6 @@ export type TIssueLevelModalsProps = {
 export const IssueLevelModals: FC<TIssueLevelModalsProps> = observer((props) => {
   const { projectId, issueId } = props;
   // router
-  const pathname = usePathname();
   const { workspaceSlug, cycleId, moduleId } = useParams();
   const router = useAppRouter();
   // store hooks
@@ -45,7 +44,6 @@ export const IssueLevelModals: FC<TIssueLevelModalsProps> = observer((props) =>
   } = useCommandPalette();
   // derived values
   const issueDetails = issueId ? getIssueById(issueId) : undefined;
-  const isDraftIssue = pathname?.includes("draft-issues") || false;
   const { fetchSubIssues: fetchSubWorkItems } = useIssueDetail();
   const { fetchSubIssues: fetchEpicSubWorkItems } = useIssueDetail(EIssueServiceType.EPICS);
 
@@ -81,7 +79,6 @@ export const IssueLevelModals: FC<TIssueLevelModalsProps> = observer((props) =>
         isOpen={isCreateIssueModalOpen}
         onClose={() => toggleCreateIssueModal(false)}
         data={getCreateIssueModalData()}
-        isDraft={isDraftIssue}
         onSubmit={handleCreateIssueSubmit}
         allowedProjectIds={createWorkItemAllowedProjectIds}
       />

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

@@ -2,8 +2,9 @@ import { FC, ReactNode, useRef } from "react";
 import { observer } from "mobx-react";
 // plane imports
 import { useTranslation } from "@plane/i18n";
+import { Tooltip } from "@plane/propel/tooltip";
 import { TIssueComment } from "@plane/types";
-import { Avatar, Tooltip } from "@plane/ui";
+import { Avatar } from "@plane/ui";
 import { calculateTimeAgo, cn, getFileURL, renderFormattedDate, renderFormattedTime } from "@plane/utils";
 // hooks
 import { useMember } from "@/hooks/store/use-member";

apps/web/ce/components/de-dupe/duplicate-popover/root.tsx

@@ -18,15 +18,6 @@ type TDeDupeIssuePopoverRootProps = {
 };
 
 export const DeDupeIssuePopoverRoot: FC<TDeDupeIssuePopoverRootProps> = observer((props) => {
-  const {
-    workspaceSlug,
-    projectId,
-    rootIssueId,
-    issues,
-    issueOperations,
-    disabled = false,
-    renderDeDupeActionModals = true,
-    isIntakeIssue = false,
-  } = props;
+  const {} = props;
   return <></>;
 });

apps/web/ce/components/estimates/estimate-list-item-buttons.tsx

@@ -2,7 +2,7 @@ import { FC } from "react";
 import { observer } from "mobx-react";
 import { Pen, Trash } from "lucide-react";
 import { PROJECT_SETTINGS_TRACKER_ELEMENTS } from "@plane/constants";
-import { Tooltip } from "@plane/ui";
+import { Tooltip } from "@plane/propel/tooltip";
 // components
 import { ProIcon } from "@/components/common/pro-icon";
 

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

@@ -14,8 +14,9 @@ import {
   EProjectFeatureKey,
 } from "@plane/constants";
 import { useTranslation } from "@plane/i18n";
+import { Tooltip } from "@plane/propel/tooltip";
 import { EIssuesStoreType } from "@plane/types";
-import { Breadcrumbs, Button, Tooltip, Header } from "@plane/ui";
+import { Breadcrumbs, Button, Header } from "@plane/ui";
 // components
 import { CountChip } from "@/components/common/count-chip";
 // constants

apps/web/ce/components/issues/issue-details/issue-identifier.tsx

@@ -1,9 +1,10 @@
 import { FC } from "react";
 import { observer } from "mobx-react";
 // types
+import { Tooltip } from "@plane/propel/tooltip";
 import { IIssueDisplayProperties } from "@plane/types";
 // ui
-import { setToast, TOAST_TYPE, Tooltip } from "@plane/ui";
+import { setToast, TOAST_TYPE } from "@plane/ui";
 // helpers
 import { cn } from "@plane/utils";
 // hooks

apps/web/ce/components/pages/editor/ai/ask-pi-menu.tsx

@@ -1,7 +1,7 @@
 import { useState } from "react";
 import { CircleArrowUp, CornerDownRight, RefreshCcw, Sparkles } from "lucide-react";
 // ui
-import { Tooltip } from "@plane/ui";
+import { Tooltip } from "@plane/propel/tooltip";
 // components
 import { cn } from "@plane/utils";
 import { RichTextEditor } from "@/components/editor/rich-text";

apps/web/ce/components/pages/editor/ai/menu.tsx

@@ -5,7 +5,7 @@ import { ChevronRight, CornerDownRight, LucideIcon, RefreshCcw, Sparkles, Triang
 // plane editor
 import type { EditorRefApi } from "@plane/editor";
 // plane ui
-import { Tooltip } from "@plane/ui";
+import { Tooltip } from "@plane/propel/tooltip";
 // components
 import { cn } from "@plane/utils";
 import { RichTextEditor } from "@/components/editor/rich-text";

apps/web/ce/components/pages/header/lock-control.tsx

@@ -5,7 +5,7 @@ import { observer } from "mobx-react";
 import { LockKeyhole, LockKeyholeOpen } from "lucide-react";
 // plane imports
 import { PROJECT_PAGE_TRACKER_ELEMENTS } from "@plane/constants";
-import { Tooltip } from "@plane/ui";
+import { Tooltip } from "@plane/propel/tooltip";
 // helpers
 import { captureClick } from "@/helpers/event-tracker.helper";
 // hooks

apps/web/ce/components/pages/modals/index.ts

@@ -1 +1,2 @@
 export * from "./move-page-modal";
+export * from "./modals";

apps/web/ce/components/pages/modals/modals.tsx

@@ -0,0 +1,15 @@
+"use client";
+
+import React from "react";
+import { observer } from "mobx-react";
+// components
+import { EPageStoreType } from "@/plane-web/hooks/store";
+// store
+import { TPageInstance } from "@/store/pages/base-page";
+
+export type TPageModalsProps = {
+  page: TPageInstance;
+  storeType: EPageStoreType;
+};
+
+export const PageModals: React.FC<TPageModalsProps> = observer((props) => null);

apps/web/ce/components/workspace/edition-badge.tsx

@@ -2,7 +2,8 @@ import { useState } from "react";
 import { observer } from "mobx-react";
 // ui
 import { useTranslation } from "@plane/i18n";
-import { Button, Tooltip } from "@plane/ui";
+import { Tooltip } from "@plane/propel/tooltip";
+import { Button } from "@plane/ui";
 // hooks
 import { usePlatformOS } from "@/hooks/use-platform-os";
 import packageJson from "package.json";

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

@@ -9,7 +9,8 @@ import { Pin, PinOff } from "lucide-react";
 // plane imports
 import { EUserPermissionsLevel, IWorkspaceSidebarNavigationItem } from "@plane/constants";
 import { useTranslation } from "@plane/i18n";
-import { DragHandle, DropIndicator, Tooltip } from "@plane/ui";
+import { Tooltip } from "@plane/propel/tooltip";
+import { DragHandle, DropIndicator } from "@plane/ui";
 import { cn } from "@plane/utils";
 // components
 import { SidebarNavItem } from "@/components/sidebar/sidebar-navigation";
@@ -165,7 +166,7 @@ export const ExtendedSidebarItem: FC<TExtendedSidebarItemProps> = observer((prop
           <Tooltip
             // isMobile={isMobile}
             tooltipContent={t("drag_to_rearrange")}
-            position="top-right"
+            position="top-end"
             disabled={isDragging}
           >
             <button

apps/web/ce/hooks/pages/index.ts

@@ -0,0 +1,2 @@
+export * from "./use-pages-pane-extensions";
+export * from "./use-extended-editor-extensions";