feat(ee): space control to hide comments from viewers role

Dockerfile

@@ -1,7 +1,7 @@
 FROM node:26-slim AS base
 LABEL org.opencontainers.image.source="https://github.com/docmost/docmost"
 
-RUN npm install -g pnpm@11.23.0
+RUN npm install -g pnpm@11.15.1
 
 FROM base AS builder
 
@@ -18,15 +18,6 @@ RUN apt-get update \
   && apt-get install -y --no-install-recommends curl bash \
   && rm -rf /var/lib/apt/lists/*
 
-# drop npm and corepack
-RUN rm -rf /usr/local/lib/node_modules/npm \
-  && rm -rf /usr/local/lib/node_modules/corepack \
-  && rm -rf /usr/local/bin/npm \
-  && rm -rf /usr/local/bin/npx \
-  && rm -rf /usr/local/bin/corepack \
-  && rm -rf /root/.npm \
-  && rm -rf /root/.node-gyp
-
 WORKDIR /app
 
 # Copy apps
@@ -51,7 +42,7 @@ RUN chown -R node:node /app
 
 USER node
 
-RUN pnpm install --frozen-lockfile --prod && rm -rf /home/node/.cache/pnpm
+RUN pnpm install --frozen-lockfile --prod
 
 RUN mkdir -p /app/data/storage
 

apps/client/package.json

@@ -52,7 +52,7 @@
     "mantine-form-zod-resolver": "1.3.0",
     "mermaid": "11.16.1",
     "mitt": "3.0.1",
-    "nanoid": "3.3.18",
+    "nanoid": "3.3.17",
     "posthog-js": "1.391.2",
     "react": "19.2.7",
     "react-clear-modal": "^2.0.18",
@@ -64,7 +64,6 @@
     "react-router-dom": "7.18.2",
     "semver": "7.7.4",
     "socket.io-client": "4.8.3",
-    "yet-another-react-lightbox": "^3.32.2",
     "zod": "4.3.6"
   },
   "devDependencies": {

apps/client/public/locales/de-DE/translation.json

@@ -696,7 +696,7 @@
   "Upgrade your plan": "Upgrade Ihres Plans",
   "Available with a paid license": "Verfügbar mit einer kostenpflichtigen Lizenz",
   "Upgrade your license tier.": "Stufen Sie Ihre Lizenz hoch.",
-  "AI is available in the Docmost paid editions. Contact sales@docmost.com.": "KI ist in den kostenpflichtigen Docmost-Editionen verfügbar. Kontaktieren Sie sales@docmost.com.",
+  "AI is only available in the Docmost enterprise edition. Contact sales@docmost.com.": "KI ist nur in der Docmost Enterprise-Edition verfügbar. Kontaktieren Sie sales@docmost.com.",
   "AI & MCP": "KI & MCP",
   "AI": "KI",
   "MCP": "MCP",

apps/client/public/locales/en-US/translation.json

@@ -294,7 +294,6 @@
   "Export space": "Export space",
   "Export {{type}}": "Export {{type}}",
   "File exceeds the {{limit}} attachment limit": "File exceeds the {{limit}} attachment limit",
-  "Media": "Media",
   "Align left": "Align left",
   "Align right": "Align right",
   "Align center": "Align center",
@@ -388,8 +387,6 @@
   "Insert horizontal rule divider": "Insert horizontal rule divider",
   "Page break": "Page break",
   "Insert a page break for printing.": "Insert a page break for printing.",
-  "Footnote": "Footnote",
-  "Insert a footnote reference.": "Insert a footnote reference.",
   "Upload any image from your device.": "Upload any image from your device.",
   "Upload any video from your device.": "Upload any video from your device.",
   "Upload any audio from your device.": "Upload any audio from your device.",
@@ -511,6 +508,11 @@
   "Allow viewers to comment": "Allow viewers to comment",
   "Allow viewers to add comments on pages in this space.": "Allow viewers to add comments on pages in this space.",
   "Toggle viewer comments": "Toggle viewer comments",
+  "Hide comments from viewers": "Hide comments from viewers",
+  "Viewers cannot see or add comments on pages in this space.": "Viewers cannot see or add comments on pages in this space.",
+  "Toggle hide comments from viewers": "Toggle hide comments from viewers",
+  "Turn off 'Allow viewers to comment' first": "Turn off 'Allow viewers to comment' first",
+  "Turn off 'Hide comments from viewers' first": "Turn off 'Hide comments from viewers' first",
   "Public sharing is disabled at the workspace level": "Public sharing is disabled at the workspace level",
   "Prevent pages in this space from being shared publicly.": "Prevent pages in this space from being shared publicly.",
   "Page permissions": "Page permissions",
@@ -699,7 +701,7 @@
   "Upgrade your plan": "Upgrade your plan",
   "Available with a paid license": "Available with a paid license",
   "Upgrade your license tier.": "Upgrade your license tier.",
-  "AI is available in the Docmost paid editions. Contact sales@docmost.com.": "AI is available in the Docmost paid editions. Contact sales@docmost.com.",
+  "AI is only available in the Docmost enterprise edition. Contact sales@docmost.com.": "AI is only available in the Docmost enterprise edition. Contact sales@docmost.com.",
   "AI & MCP": "AI & MCP",
   "AI": "AI",
   "MCP": "MCP",
@@ -1292,24 +1294,5 @@
   "{{count}} rows deleted_one": "1 row deleted",
   "{{count}} rows deleted_other": "{{count}} rows deleted",
   "{{count}} selected_one": "1 selected",
-  "{{count}} selected_other": "{{count}} selected",
+  "{{count}} selected_other": "{{count}} selected"
-  "Compare": "Compare",
-  "Compare versions": "Compare versions",
-  "Select version from {{date}}": "Select version from {{date}}",
-  "Version actions for {{date}}": "Version actions for {{date}}",
-  "Comparing {{newer}} and {{older}}": "Comparing {{newer}} and {{older}}",
-  "Exit compare": "Exit compare",
-  "Search attachments...": "Search attachments...",
-  "Error loading attachments.": "Error loading attachments.",
-  "No attachments on this page yet.": "No attachments on this page yet.",
-  "Uploaded by {{name}}": "Uploaded by {{name}}",
-  "Download {{name}}": "Download {{name}}",
-  "Workspace knowledge only": "Workspace knowledge only",
-  "Restrict AI Chat to answering from your workspace pages and uploaded files only. It will not use outside knowledge.": "Restrict AI Chat to answering from your workspace pages and uploaded files only. It will not use outside knowledge.",
-  "Toggle workspace knowledge only": "Toggle workspace knowledge only",
-  "Read-only mode": "Read-only mode",
-  "AI Chat can search and read workspace content, but cannot create or edit pages.": "AI Chat can search and read workspace content, but cannot create or edit pages.",
-  "Toggle AI Chat read-only mode": "Toggle AI Chat read-only mode",
-  "Title only": "Title only",
-  "you": "you"
 }

apps/client/public/locales/es-ES/translation.json

@@ -696,7 +696,7 @@
   "Upgrade your plan": "Mejora tu plan",
   "Available with a paid license": "Disponible con una licencia de pago",
   "Upgrade your license tier.": "Mejora el nivel de tu licencia.",
-  "AI is available in the Docmost paid editions. Contact sales@docmost.com.": "La IA está disponible en las ediciones de pago de Docmost. Contacte con sales@docmost.com.",
+  "AI is only available in the Docmost enterprise edition. Contact sales@docmost.com.": "La IA solo está disponible en la edición empresarial de Docmost. Contacte con sales@docmost.com.",
   "AI & MCP": "IA y MCP",
   "AI": "IA",
   "MCP": "MCP",

apps/client/public/locales/fr-FR/translation.json

@@ -696,7 +696,7 @@
   "Upgrade your plan": "Mettez à niveau votre forfait",
   "Available with a paid license": "Disponible avec une licence payante",
   "Upgrade your license tier.": "Mettez à niveau votre niveau de licence.",
-  "AI is available in the Docmost paid editions. Contact sales@docmost.com.": "L'IA est disponible dans les éditions payantes de Docmost. Contactez sales@docmost.com.",
+  "AI is only available in the Docmost enterprise edition. Contact sales@docmost.com.": "L'IA n'est disponible que dans l'édition Entreprise de Docmost. Contactez sales@docmost.com.",
   "AI & MCP": "IA & MCP",
   "AI": "IA",
   "MCP": "MCP",

apps/client/public/locales/it-IT/translation.json

@@ -696,7 +696,7 @@
   "Upgrade your plan": "Aggiorna il tuo piano",
   "Available with a paid license": "Disponibile con una licenza a pagamento",
   "Upgrade your license tier.": "Aggiorna il livello della tua licenza.",
-  "AI is available in the Docmost paid editions. Contact sales@docmost.com.": "L'IA è disponibile nelle edizioni a pagamento di Docmost. Contatta sales@docmost.com.",
+  "AI is only available in the Docmost enterprise edition. Contact sales@docmost.com.": "L'IA è disponibile solo nell'edizione Enterprise di Docmost. Contatta sales@docmost.com.",
   "AI & MCP": "IA e MCP",
   "AI": "IA",
   "MCP": "MCP",

apps/client/public/locales/ja-JP/translation.json

@@ -696,7 +696,7 @@
   "Upgrade your plan": "プランをアップグレードする",
   "Available with a paid license": "有料ライセンスで利用可能",
   "Upgrade your license tier.": "ライセンスタイアをアップグレードしてください。",
-  "AI is available in the Docmost paid editions. Contact sales@docmost.com.": "AI は Docmost の有料版で利用可能です。sales@docmost.com までお問い合わせください。",
+  "AI is only available in the Docmost enterprise edition. Contact sales@docmost.com.": "AI は Docmost のエンタープライズ版でのみ利用可能です。sales@docmost.com までお問い合わせください。",
   "AI & MCP": "AI と MCP",
   "AI": "AI",
   "MCP": "MCP",

apps/client/public/locales/ko-KR/translation.json

@@ -696,7 +696,7 @@
   "Upgrade your plan": "요금제를 업그레이드하세요",
   "Available with a paid license": "유료 라이선스에서만 사용 가능합니다",
   "Upgrade your license tier.": "라이선스 등급을 업그레이드하세요.",
-  "AI is available in the Docmost paid editions. Contact sales@docmost.com.": "AI는 Docmost 유료 에디션에서 제공됩니다. sales@docmost.com으로 문의하세요.",
+  "AI is only available in the Docmost enterprise edition. Contact sales@docmost.com.": "AI는 Docmost 엔터프라이즈 에디션에서만 제공됩니다. sales@docmost.com으로 문의하세요.",
   "AI & MCP": "AI 및 MCP",
   "AI": "AI",
   "MCP": "MCP",

apps/client/public/locales/nl-NL/translation.json

@@ -696,7 +696,7 @@
   "Upgrade your plan": "Upgrade je abonnement",
   "Available with a paid license": "Beschikbaar met een betaalde licentie",
   "Upgrade your license tier.": "Upgrade je licentieniveau.",
-  "AI is available in the Docmost paid editions. Contact sales@docmost.com.": "AI is beschikbaar in de betaalde edities van Docmost. Neem contact op met sales@docmost.com.",
+  "AI is only available in the Docmost enterprise edition. Contact sales@docmost.com.": "AI is alleen beschikbaar in de Docmost Enterprise-editie. Neem contact op met sales@docmost.com.",
   "AI & MCP": "AI & MCP",
   "AI": "AI",
   "MCP": "MCP",

apps/client/public/locales/pt-BR/translation.json

@@ -696,7 +696,7 @@
   "Upgrade your plan": "Faça upgrade do seu plano",
   "Available with a paid license": "Disponível com uma licença paga",
   "Upgrade your license tier.": "Faça upgrade do seu nível de licença.",
-  "AI is available in the Docmost paid editions. Contact sales@docmost.com.": "A IA está disponível nas edições pagas do Docmost. Contate sales@docmost.com.",
+  "AI is only available in the Docmost enterprise edition. Contact sales@docmost.com.": "A IA está disponível apenas na edição empresarial do Docmost. Contate sales@docmost.com.",
   "AI & MCP": "IA e MCP",
   "AI": "IA",
   "MCP": "MCP",

apps/client/public/locales/ru-RU/translation.json

@@ -696,7 +696,7 @@
   "Upgrade your plan": "Обновите свой тарифный план",
   "Available with a paid license": "Доступно с платной лицензией",
   "Upgrade your license tier.": "Обновите уровень вашей лицензии.",
-  "AI is available in the Docmost paid editions. Contact sales@docmost.com.": "ИИ доступен в платных версиях Docmost. Свяжитесь по адресу sales@docmost.com.",
+  "AI is only available in the Docmost enterprise edition. Contact sales@docmost.com.": "ИИ доступен только в корпоративной версии Docmost. Свяжитесь по адресу sales@docmost.com.",
   "AI & MCP": "ИИ и MCP",
   "AI": "ИИ",
   "MCP": "MCP",

apps/client/public/locales/uk-UA/translation.json

@@ -696,7 +696,7 @@
   "Upgrade your plan": "Оновіть свій тарифний план",
   "Available with a paid license": "Доступно за платною ліцензією",
   "Upgrade your license tier.": "Оновіть рівень своєї ліцензії.",
-  "AI is available in the Docmost paid editions. Contact sales@docmost.com.": "ШІ доступний у платних редакціях Docmost. Зверніться до sales@docmost.com.",
+  "AI is only available in the Docmost enterprise edition. Contact sales@docmost.com.": "ШІ доступний лише в корпоративній редакції Docmost. Зверніться до sales@docmost.com.",
   "AI & MCP": "ШІ та MCP",
   "AI": "ШІ",
   "MCP": "MCP",

apps/client/public/locales/zh-CN/translation.json

@@ -696,7 +696,7 @@
   "Upgrade your plan": "升级您的方案",
   "Available with a paid license": "需付费许可才可用",
   "Upgrade your license tier.": "升级您的许可等级。",
-  "AI is available in the Docmost paid editions. Contact sales@docmost.com.": "AI 在 Docmost 付费版中提供。请联系 sales@docmost.com。",
+  "AI is only available in the Docmost enterprise edition. Contact sales@docmost.com.": "AI 仅在 Docmost 企业版中提供。请联系 sales@docmost.com。",
   "AI & MCP": "AI 与 MCP",
   "AI": "AI",
   "MCP": "MCP",

apps/client/src/App.tsx

@@ -1,92 +1,60 @@
-import { lazy, Suspense, useEffect } from "react";
 import { Navigate, Route, Routes } from "react-router-dom";
-import Layout from "@/components/layouts/global/layout.tsx";
+import SetupWorkspace from "@/pages/auth/setup-workspace.tsx";
+import LoginPage from "@/pages/auth/login";
+import Home from "@/pages/dashboard/home";
+import Page from "@/pages/page/page";
+import AccountSettings from "@/pages/settings/account/account-settings";
+import WorkspaceMembers from "@/pages/settings/workspace/workspace-members";
+import WorkspaceSettings from "@/pages/settings/workspace/workspace-settings";
+import Groups from "@/pages/settings/group/groups";
+import GroupInfo from "./pages/settings/group/group-info";
+import Spaces from "@/pages/settings/space/spaces.tsx";
 import { Error404 } from "@/components/ui/error-404.tsx";
+import AccountPreferences from "@/pages/settings/account/account-preferences.tsx";
+import SpaceHome from "@/pages/space/space-home.tsx";
+import PageRedirect from "@/pages/page/page-redirect.tsx";
+import Layout from "@/components/layouts/global/layout.tsx";
+import InviteSignup from "@/pages/auth/invite-signup.tsx";
+import ForgotPassword from "@/pages/auth/forgot-password.tsx";
+import PasswordReset from "./pages/auth/password-reset";
+import Billing from "@/ee/billing/pages/billing.tsx";
+import CloudLogin from "@/ee/pages/cloud-login.tsx";
+import CreateWorkspace from "@/ee/pages/create-workspace.tsx";
 import { isCloud } from "@/lib/config.ts";
 import { useTranslation } from "react-i18next";
+import Security from "@/ee/security/pages/security.tsx";
+import License from "@/ee/licence/pages/license.tsx";
 import { useRedirectToCloudSelect } from "@/ee/hooks/use-redirect-to-cloud-select.tsx";
+import SharedPage from "@/pages/share/shared-page.tsx";
+import PdfRenderPage from "@/ee/pdf-export/pdf-render-page.tsx";
+import Shares from "@/pages/settings/shares/shares.tsx";
+import ShareLayout from "@/features/share/components/share-layout.tsx";
+import ShareRedirect from "@/pages/share/share-redirect.tsx";
 import { useTrackOrigin } from "@/hooks/use-track-origin";
-
+import SpacesPage from "@/pages/spaces/spaces.tsx";
-const SetupWorkspace = lazy(() => import("@/pages/auth/setup-workspace.tsx"));
+import { MfaChallengePage } from "@/ee/mfa/pages/mfa-challenge-page";
-const LoginPage = lazy(() => import("@/pages/auth/login"));
+import { MfaSetupRequiredPage } from "@/ee/mfa/pages/mfa-setup-required-page";
-const Home = lazy(() => import("@/pages/dashboard/home"));
+import SpaceTrash from "@/pages/space/space-trash.tsx";
-const Page = lazy(() => import("@/pages/page/page"));
+import UserApiKeys from "@/ee/api-key/pages/user-api-keys";
-const AccountSettings = lazy(
+import WorkspaceApiKeys from "@/ee/api-key/pages/workspace-api-keys";
-  () => import("@/pages/settings/account/account-settings"),
+import AiSettings from "@/ee/ai/pages/ai-settings.tsx";
-);
+import BasePage from "@/ee/base/pages/base-page.tsx";
-const WorkspaceMembers = lazy(
+import AuditLogs from "@/ee/audit/pages/audit-logs.tsx";
-  () => import("@/pages/settings/workspace/workspace-members"),
+import VerifiedPages from "@/ee/page-verification/pages/verified-pages.tsx";
-);
+import TemplateList from "@/ee/template/pages/template-list";
-const WorkspaceSettings = lazy(
+import TemplateEditor from "@/ee/template/pages/template-editor";
-  () => import("@/pages/settings/workspace/workspace-settings"),
+import FavoritesPage from "@/pages/favorites/favorites-page";
-);
+import AiChat from "@/ee/ai-chat/pages/ai-chat.tsx";
-const Groups = lazy(() => import("@/pages/settings/group/groups"));
+import VerifyEmail from "@/ee/pages/verify-email.tsx";
-const GroupInfo = lazy(() => import("./pages/settings/group/group-info"));
+import LabelPage from "@/pages/label/label-page";
-const Spaces = lazy(() => import("@/pages/settings/space/spaces.tsx"));
-const AccountPreferences = lazy(
-  () => import("@/pages/settings/account/account-preferences.tsx"),
-);
-const SpaceHome = lazy(() => import("@/pages/space/space-home.tsx"));
-const PageRedirect = lazy(() => import("@/pages/page/page-redirect.tsx"));
-const InviteSignup = lazy(() => import("@/pages/auth/invite-signup.tsx"));
-const ForgotPassword = lazy(() => import("@/pages/auth/forgot-password.tsx"));
-const PasswordReset = lazy(() => import("./pages/auth/password-reset"));
-const Billing = lazy(() => import("@/ee/billing/pages/billing.tsx"));
-const CloudLogin = lazy(() => import("@/ee/pages/cloud-login.tsx"));
-const CreateWorkspace = lazy(() => import("@/ee/pages/create-workspace.tsx"));
-const Security = lazy(() => import("@/ee/security/pages/security.tsx"));
-const License = lazy(() => import("@/ee/licence/pages/license.tsx"));
-const SharedPage = lazy(() => import("@/pages/share/shared-page.tsx"));
-const PdfRenderPage = lazy(() => import("@/ee/pdf-export/pdf-render-page.tsx"));
-const Shares = lazy(() => import("@/pages/settings/shares/shares.tsx"));
-const ShareLayout = lazy(
-  () => import("@/features/share/components/share-layout.tsx"),
-);
-const ShareRedirect = lazy(() => import("@/pages/share/share-redirect.tsx"));
-const SpacesPage = lazy(() => import("@/pages/spaces/spaces.tsx"));
-const MfaChallengePage = lazy(() =>
-  import("@/ee/mfa/pages/mfa-challenge-page").then((m) => ({
-    default: m.MfaChallengePage,
-  })),
-);
-const MfaSetupRequiredPage = lazy(() =>
-  import("@/ee/mfa/pages/mfa-setup-required-page").then((m) => ({
-    default: m.MfaSetupRequiredPage,
-  })),
-);
-const SpaceTrash = lazy(() => import("@/pages/space/space-trash.tsx"));
-const UserApiKeys = lazy(() => import("@/ee/api-key/pages/user-api-keys"));
-const WorkspaceApiKeys = lazy(
-  () => import("@/ee/api-key/pages/workspace-api-keys"),
-);
-const AiSettings = lazy(() => import("@/ee/ai/pages/ai-settings.tsx"));
-const BasePage = lazy(() => import("@/ee/base/pages/base-page.tsx"));
-const AuditLogs = lazy(() => import("@/ee/audit/pages/audit-logs.tsx"));
-const VerifiedPages = lazy(
-  () => import("@/ee/page-verification/pages/verified-pages.tsx"),
-);
-const TemplateList = lazy(() => import("@/ee/template/pages/template-list"));
-const TemplateEditor = lazy(
-  () => import("@/ee/template/pages/template-editor"),
-);
-const FavoritesPage = lazy(() => import("@/pages/favorites/favorites-page"));
-const AiChat = lazy(() => import("@/ee/ai-chat/pages/ai-chat.tsx"));
-const VerifyEmail = lazy(() => import("@/ee/pages/verify-email.tsx"));
-const LabelPage = lazy(() => import("@/pages/label/label-page"));
 
 export default function App() {
   const { t } = useTranslation();
   useRedirectToCloudSelect();
   useTrackOrigin();
 
-  useEffect(() => {
-    // warm the editor chunk so opening a page doesn't wait on the network
-    const timer = setTimeout(() => import("@/pages/page/page"), 3000);
-    return () => clearTimeout(timer);
-  }, []);
-
   return (
-    <Suspense fallback={null}>
+    <>
       <Routes>
         <Route index element={<Navigate to="/home" />} />
         <Route path={"/login"} element={<LoginPage />} />
@@ -167,6 +135,6 @@ export default function App() {
 
         <Route path="*" element={<Error404 />} />
       </Routes>
-    </Suspense>
+    </>
   );
 }

apps/client/src/components/layouts/global/aside.tsx

@@ -1,34 +1,23 @@
 import { ActionIcon, Box, Group, ScrollArea, Title, Tooltip } from "@mantine/core";
 import { IconX } from "@tabler/icons-react";
+import CommentListWithTabs from "@/features/comment/components/comment-list-with-tabs.tsx";
 import { useAtom } from "jotai";
 import { asideStateAtom } from "@/components/layouts/global/hooks/atoms/sidebar-atom.ts";
-import React, { lazy, ReactNode, Suspense, useEffect } from "react";
+import React, { ReactNode, useEffect } from "react";
 import { useTranslation } from "react-i18next";
+import { TableOfContents } from "@/features/editor/components/table-of-contents/table-of-contents.tsx";
 import { useAtomValue } from "jotai";
 import { pageEditorAtom } from "@/features/editor/atoms/editor-atoms.ts";
+import AsideChatPanel from "@/ee/ai-chat/components/aside-chat-panel";
+import { PageDetailsAside } from "@/features/page-details/components/page-details-aside.tsx";
 import { ASIDE_PANEL_ID } from "@/hooks/use-toggle-aside.tsx";
-
+import { useCanViewComments } from "@/features/comment/hooks/use-can-view-comments.ts";
-const CommentListWithTabs = lazy(
-  () => import("@/features/comment/components/comment-list-with-tabs.tsx"),
-);
-const TableOfContents = lazy(() =>
-  import(
-    "@/features/editor/components/table-of-contents/table-of-contents.tsx"
-  ).then((m) => ({ default: m.TableOfContents })),
-);
-const AsideChatPanel = lazy(
-  () => import("@/ee/ai-chat/components/aside-chat-panel"),
-);
-const PageDetailsAside = lazy(() =>
-  import("@/features/page-details/components/page-details-aside.tsx").then(
-    (m) => ({ default: m.PageDetailsAside }),
-  ),
-);
 
 export default function Aside() {
   const [{ tab, isAsideOpen }, setAsideState] = useAtom(asideStateAtom);
   const { t } = useTranslation();
   const pageEditor = useAtomValue(pageEditorAtom);
+  const canViewComments = useCanViewComments();
   const closeAside = () => setAsideState((s) => ({ ...s, isAsideOpen: false }));
 
   useEffect(() => {
@@ -36,12 +25,18 @@ export default function Aside() {
     document.getElementById(ASIDE_PANEL_ID)?.focus();
   }, [isAsideOpen, tab]);
 
+  useEffect(() => {
+    if (isAsideOpen && tab === "comments" && !canViewComments) {
+      setAsideState({ tab: "", isAsideOpen: false });
+    }
+  }, [isAsideOpen, tab, canViewComments, setAsideState]);
+
   let title: string;
   let component: ReactNode;
 
   switch (tab) {
     case "comments":
-      component = <CommentListWithTabs />;
+      component = canViewComments ? <CommentListWithTabs /> : null;
       title = "Comments";
       break;
     case "toc":
@@ -81,19 +76,17 @@ export default function Aside() {
             </Group>
           )}
 
-          <Suspense fallback={null}>
+          {tab === "comments" || tab === "chat" ? (
-            {tab === "comments" || tab === "chat" ? (
+            component
-              component
+          ) : (
-            ) : (
+            <ScrollArea
-              <ScrollArea
+              style={{ height: "85vh" }}
-                style={{ height: "85vh" }}
+              scrollbarSize={5}
-                scrollbarSize={5}
+              type="scroll"
-                type="scroll"
+            >
-              >
+              <div style={{ paddingBottom: "200px" }}>{component}</div>
-                <div style={{ paddingBottom: "200px" }}>{component}</div>
+            </ScrollArea>
-              </ScrollArea>
+          )}
-            )}
-          </Suspense>
         </>
       )}
     </Box>

apps/client/src/components/layouts/global/global-app-shell.tsx

@@ -11,10 +11,7 @@ import {
   sidebarWidthAtom,
 } from "@/components/layouts/global/hooks/atoms/sidebar-atom.ts";
 import { SpaceSidebar } from "@/features/space/components/sidebar/space-sidebar.tsx";
-
+import AiChatSidebar from "@/ee/ai-chat/components/ai-chat-sidebar.tsx";
-const AiChatSidebar = React.lazy(
-  () => import("@/ee/ai-chat/components/ai-chat-sidebar.tsx"),
-);
 import { AppHeader } from "@/components/layouts/global/app-header.tsx";
 import Aside from "@/components/layouts/global/aside.tsx";
 import classes from "./app-shell.module.css";
@@ -129,11 +126,7 @@ export default function GlobalAppShell({
         )}
         {isSpaceRoute && <SpaceSidebar />}
         {isSettingsRoute && <SettingsSidebar />}
-        {isAiRoute && (
+        {isAiRoute && <AiChatSidebar />}
-          <React.Suspense fallback={null}>
-            <AiChatSidebar />
-          </React.Suspense>
-        )}
         {showGlobalSidebar && <GlobalSidebar />}
       </AppShell.Navbar>
       <AppShell.Main id={MAIN_CONTENT_ID} tabIndex={-1}>

apps/client/src/components/ui/checkbox-menu-item.tsx

@@ -1,12 +0,0 @@
-import { UnstyledButton } from "@mantine/core";
-import { type ComponentPropsWithoutRef, forwardRef } from "react";
-
-// Menu.Item hard-codes role="menuitem"; use as its `component` to restore role="menuitemcheckbox" so aria-checked works.
-export const CheckboxMenuItem = forwardRef<
-  HTMLButtonElement,
-  ComponentPropsWithoutRef<"button">
->((props, ref) => (
-  <UnstyledButton ref={ref} {...props} role="menuitemcheckbox" />
-));
-
-CheckboxMenuItem.displayName = "CheckboxMenuItem";

apps/client/src/ee/ai-chat/components/ai-chat-read-only.tsx

@@ -1,74 +0,0 @@
-import { Badge, Group, Text, Switch, Tooltip } from "@mantine/core";
-import { useAtom } from "jotai";
-import { workspaceAtom } from "@/features/user/atoms/current-user-atom.ts";
-import { useState } from "react";
-import { useTranslation } from "react-i18next";
-import { updateWorkspace } from "@/features/workspace/services/workspace-service.ts";
-import { notifications } from "@mantine/notifications";
-import { useHasFeature } from "@/ee/hooks/use-feature";
-import { Feature } from "@/ee/features";
-import { useUpgradeLabel } from "@/ee/hooks/use-upgrade-label";
-
-export default function AiChatReadOnly() {
-  const { t } = useTranslation();
-  const hasAccess = useHasFeature(Feature.AI_CONTROLS);
-
-  return (
-    <Group justify="space-between" wrap="nowrap" gap="xl">
-      <div>
-        <Group gap="xs" align="center">
-          <Text size="md">{t("Read-only mode")}</Text>
-          {!hasAccess && (
-            <Badge variant="light" size="sm" radius="sm">
-              {t("Enterprise")}
-            </Badge>
-          )}
-        </Group>
-        <Text size="sm" c="dimmed">
-          {t(
-            "AI Chat can search and read workspace content, but cannot create or edit pages.",
-          )}
-        </Text>
-      </div>
-
-      <AiChatReadOnlyToggle />
-    </Group>
-  );
-}
-
-function AiChatReadOnlyToggle() {
-  const { t } = useTranslation();
-  const [workspace, setWorkspace] = useAtom(workspaceAtom);
-  const [checked, setChecked] = useState(
-    workspace?.settings?.ai?.chatReadOnly,
-  );
-  const hasAccess = useHasFeature(Feature.AI_CONTROLS);
-  const upgradeLabel = useUpgradeLabel();
-
-  const handleChange = async (event: React.ChangeEvent<HTMLInputElement>) => {
-    const value = event.currentTarget.checked;
-    try {
-      const updatedWorkspace = await updateWorkspace({
-        aiChatReadOnly: value,
-      });
-      setChecked(value);
-      setWorkspace(updatedWorkspace);
-    } catch (err: any) {
-      notifications.show({
-        message: err?.response?.data?.message,
-        color: "red",
-      });
-    }
-  };
-
-  return (
-    <Tooltip label={upgradeLabel} disabled={hasAccess} refProp="rootRef">
-      <Switch
-        defaultChecked={checked}
-        onChange={handleChange}
-        disabled={!hasAccess}
-        aria-label={t("Toggle AI Chat read-only mode")}
-      />
-    </Tooltip>
-  );
-}

apps/client/src/ee/ai-chat/components/ai-chat-workspace-knowledge-only.tsx

@@ -1,74 +0,0 @@
-import { Badge, Group, Text, Switch, Tooltip } from "@mantine/core";
-import { useAtom } from "jotai";
-import { workspaceAtom } from "@/features/user/atoms/current-user-atom.ts";
-import { useState } from "react";
-import { useTranslation } from "react-i18next";
-import { updateWorkspace } from "@/features/workspace/services/workspace-service.ts";
-import { notifications } from "@mantine/notifications";
-import { useHasFeature } from "@/ee/hooks/use-feature";
-import { Feature } from "@/ee/features";
-import { useUpgradeLabel } from "@/ee/hooks/use-upgrade-label";
-
-export default function AiChatWorkspaceKnowledgeOnly() {
-  const { t } = useTranslation();
-  const hasAccess = useHasFeature(Feature.AI_CONTROLS);
-
-  return (
-    <Group justify="space-between" wrap="nowrap" gap="xl">
-      <div>
-        <Group gap="xs" align="center">
-          <Text size="md">{t("Workspace knowledge only")}</Text>
-          {!hasAccess && (
-            <Badge variant="light" size="sm" radius="sm">
-              {t("Enterprise")}
-            </Badge>
-          )}
-        </Group>
-        <Text size="sm" c="dimmed">
-          {t(
-            "Restrict AI Chat to answering from your workspace pages and uploaded files only. It will not use outside knowledge.",
-          )}
-        </Text>
-      </div>
-
-      <AiChatWorkspaceKnowledgeOnlyToggle />
-    </Group>
-  );
-}
-
-function AiChatWorkspaceKnowledgeOnlyToggle() {
-  const { t } = useTranslation();
-  const [workspace, setWorkspace] = useAtom(workspaceAtom);
-  const [checked, setChecked] = useState(
-    workspace?.settings?.ai?.chatWorkspaceKnowledgeOnly,
-  );
-  const hasAccess = useHasFeature(Feature.AI_CONTROLS);
-  const upgradeLabel = useUpgradeLabel();
-
-  const handleChange = async (event: React.ChangeEvent<HTMLInputElement>) => {
-    const value = event.currentTarget.checked;
-    try {
-      const updatedWorkspace = await updateWorkspace({
-        aiChatWorkspaceKnowledgeOnly: value,
-      });
-      setChecked(value);
-      setWorkspace(updatedWorkspace);
-    } catch (err: any) {
-      notifications.show({
-        message: err?.response?.data?.message,
-        color: "red",
-      });
-    }
-  };
-
-  return (
-    <Tooltip label={upgradeLabel} disabled={hasAccess} refProp="rootRef">
-      <Switch
-        defaultChecked={checked}
-        onChange={handleChange}
-        disabled={!hasAccess}
-        aria-label={t("Toggle workspace knowledge only")}
-      />
-    </Tooltip>
-  );
-}

apps/client/src/ee/ai-chat/components/chat-empty-state.tsx

@@ -6,10 +6,7 @@ import {
   IconFileText,
 } from "@tabler/icons-react";
 import { useTranslation } from "react-i18next";
-import { useAtomValue } from "jotai";
+import ChatInput from "./chat-input";
-import { workspaceAtom } from "@/features/user/atoms/current-user-atom.ts";
-import { useRef } from "react";
-import ChatInput, { ChatInputHandle } from "./chat-input";
 import type { ChatAttachment, PageMention } from "../types/ai-chat.types";
 import classes from "../styles/ai-chat.module.css";
 
@@ -17,7 +14,6 @@ type Suggestion = {
   icon: React.ReactNode;
   text: string;
   prompt: string;
-  write?: boolean;
 };
 
 const SUGGESTIONS: Suggestion[] = [
@@ -30,7 +26,6 @@ const SUGGESTIONS: Suggestion[] = [
     icon: <IconFilePlus size={16} />,
     text: "Create a new page",
     prompt: "Create a new page titled ",
-    write: true,
   },
   {
     icon: <IconFileText size={16} />,
@@ -41,7 +36,6 @@ const SUGGESTIONS: Suggestion[] = [
     icon: <IconEdit size={16} />,
     text: "Update page content",
     prompt: "Update the page @",
-    write: true,
   },
 ];
 
@@ -53,13 +47,9 @@ type Props = {
 
 export default function ChatEmptyState({ isStreaming, onSend, onStop }: Props) {
   const { t } = useTranslation();
-  const workspace = useAtomValue(workspaceAtom);
-  const writesDisabled = workspace?.settings?.ai?.chatReadOnly === true;
-
-  const inputRef = useRef<ChatInputHandle>(null);
 
   const handleSuggestionClick = (prompt: string) => {
-    inputRef.current?.prefill(prompt);
+    onSend(prompt, [], []);
   };
 
   return (
@@ -72,7 +62,6 @@ export default function ChatEmptyState({ isStreaming, onSend, onStop }: Props) {
 
       <div className={classes.emptyStateInput}>
         <ChatInput
-          ref={inputRef}
           isStreaming={isStreaming}
           onSend={onSend}
           onStop={onStop}
@@ -84,7 +73,7 @@ export default function ChatEmptyState({ isStreaming, onSend, onStop }: Props) {
       <div className={classes.suggestionsSection}>
         <h2 className={classes.suggestionsLabel}>{t("Get started")}</h2>
         <div className={classes.suggestionsGrid}>
-          {SUGGESTIONS.filter((s) => !writesDisabled || !s.write).map((s) => (
+          {SUGGESTIONS.map((s) => (
             <button
               key={s.text}
               type="button"

apps/client/src/ee/ai-chat/components/chat-input.tsx

@@ -1,12 +1,4 @@
-import {
+import { useCallback, useId, useRef, useEffect, useState } from "react";
-  forwardRef,
-  useCallback,
-  useId,
-  useImperativeHandle,
-  useRef,
-  useEffect,
-  useState,
-} from "react";
 import { useTranslation } from "react-i18next";
 import { IconArrowUp, IconPaperclip, IconPlayerStopFilled, IconX, IconFile, IconPhoto, IconPlus, IconAt, IconFileText } from "@tabler/icons-react";
 import { Popover } from "@mantine/core";
@@ -43,10 +35,6 @@ type Props = {
   chatId?: string;
 };
 
-export type ChatInputHandle = {
-  prefill: (text: string) => void;
-};
-
 function extractMentions(json: any): PageMention[] {
   const mentions: PageMention[] = [];
   const seen = new Set<string>();
@@ -101,7 +89,7 @@ function editorJsonToText(json: any): string {
   return text;
 }
 
-const ChatInput = forwardRef<ChatInputHandle, Props>(function ChatInput({
+export default function ChatInput({
   isStreaming,
   onSend,
   onStop,
@@ -112,7 +100,7 @@ const ChatInput = forwardRef<ChatInputHandle, Props>(function ChatInput({
   variant = "card",
   showDisclaimer = true,
   chatId,
-}: Props, ref) {
+}: Props) {
   const chatIdRef = useRef(chatId);
   chatIdRef.current = chatId;
   const { t } = useTranslation();
@@ -267,7 +255,6 @@ const ChatInput = forwardRef<ChatInputHandle, Props>(function ChatInput({
     },
     content: "",
     editable: true,
-    textDirection: "auto",
     immediatelyRender: true,
     shouldRerenderOnTransaction: false,
     autofocus: autofocus ? "end" : false,
@@ -282,19 +269,6 @@ const ChatInput = forwardRef<ChatInputHandle, Props>(function ChatInput({
     }
   }, [editor]);
 
-  useImperativeHandle(
-    ref,
-    () => ({
-      prefill: (text: string) => {
-        if (!editor || editor.isDestroyed) return;
-        editor.commands.clearContent();
-        editor.commands.insertContent(text);
-        editor.commands.focus();
-      },
-    }),
-    [editor],
-  );
-
   const hasContent = !isEmpty || pendingAttachments.some((a) => !a.uploading) || (contextPages?.length ?? 0) > 0;
 
   const wrapperClass = variant === "flat" ? classes.inputWrapperFlat : classes.inputWrapper;
@@ -454,6 +428,4 @@ const ChatInput = forwardRef<ChatInputHandle, Props>(function ChatInput({
     )}
     </>
   );
-});
+}
-
-export default ChatInput;

apps/client/src/ee/ai/pages/ai-settings.tsx

@@ -5,10 +5,8 @@ import { useTranslation } from "react-i18next";
 import EnableAiSearch from "@/ee/ai/components/enable-ai-search.tsx";
 import EnableGenerativeAi from "@/ee/ai/components/enable-generative-ai.tsx";
 import EnableAiChat from "@/ee/ai-chat/components/enable-ai-chat.tsx";
-import AiChatReadOnly from "@/ee/ai-chat/components/ai-chat-read-only.tsx";
-import AiChatWorkspaceKnowledgeOnly from "@/ee/ai-chat/components/ai-chat-workspace-knowledge-only.tsx";
 import McpSettings from "@/ee/ai/components/mcp-settings.tsx";
-import { Alert, Collapse, Stack, Tabs } from "@mantine/core";
+import { Alert, Stack, Tabs } from "@mantine/core";
 import { IconInfoCircle } from "@tabler/icons-react";
 import { useHasFeature } from "@/ee/hooks/use-feature";
 import { Feature } from "@/ee/features";
@@ -16,16 +14,12 @@ import { useUpgradeLabel } from "@/ee/hooks/use-upgrade-label";
 import { isCloud } from "@/lib/config.ts";
 import { useLocation, useNavigate } from "react-router-dom";
 import { DocumentTitle } from "@/components/ui/document-title.tsx";
-import { useAtomValue } from "jotai";
-import { workspaceAtom } from "@/features/user/atoms/current-user-atom.ts";
 
 export default function AiSettings() {
   const { t } = useTranslation();
   const { isAdmin } = useUserRole();
   const hasAccess = useHasFeature(Feature.AI);
   const upgradeLabel = useUpgradeLabel();
-  const workspace = useAtomValue(workspaceAtom);
-  const aiChatEnabled = workspace?.settings?.ai?.chat === true;
   const location = useLocation();
   const navigate = useNavigate();
 
@@ -67,7 +61,7 @@ export default function AiSettings() {
               mb="lg"
             >
               {t(
-                "AI is available in the Docmost paid editions. Contact sales@docmost.com.",
+                "AI is only available in the Docmost enterprise edition. Contact sales@docmost.com.",
               )}
             </Alert>
           )}
@@ -76,20 +70,6 @@ export default function AiSettings() {
             {!isCloud() && <EnableAiSearch />}
             <EnableGenerativeAi />
             <EnableAiChat />
-            <Collapse expanded={aiChatEnabled}>
-              <Stack
-                gap="md"
-                pl="md"
-                ml="xs"
-                style={{
-                  borderLeft:
-                    "2px solid light-dark(var(--mantine-color-gray-3), var(--mantine-color-dark-4))",
-                }}
-              >
-                <AiChatReadOnly />
-                <AiChatWorkspaceKnowledgeOnly />
-              </Stack>
-            </Collapse>
           </Stack>
         </Tabs.Panel>
 

apps/client/src/ee/ai/services/ai-search-service.ts

@@ -15,14 +15,6 @@ export interface IAiSearchResponse {
   }>;
 }
 
-export async function hintVectorCache(): Promise<void> {
-  try {
-    await api.post("/ai/vector-cache-hint");
-  } catch {
-    // best-effort cache hint
-  }
-}
-
 export async function aiAnswers(
   params: IPageSearchParams,
   onChunk?: (chunk: { content?: string; sources?: any[] }) => void,

apps/client/src/ee/base/components/views/view-filter-config.tsx

@@ -9,7 +9,6 @@ import {
   Text,
   UnstyledButton,
   Button,
-  MultiSelect,
 } from "@mantine/core";
 import { IconPlus, IconTrash } from "@tabler/icons-react";
 import {
@@ -53,9 +52,6 @@ const NO_VALUE_OPERATORS: FilterOperator[] = ["isEmpty", "isNotEmpty"];
 // stored value so a stale shape isn't sent to the engine.
 function valueClass(op: FilterOperator, inputKind: string): string {
   if (NO_VALUE_OPERATORS.includes(op)) return "none";
-  if (inputKind === "choices") {
-    return op === "any" || op === "none" ? "choicesMulti" : "choicesSingle";
-  }
   if (inputKind === "person") {
     return op === "any" || op === "none" ? "personMulti" : "personSingle";
   }
@@ -74,10 +70,6 @@ function getOperatorsForType(type: string): FilterOperator[] {
     DEFAULT_FILTER_OPERATORS) as FilterOperator[];
 }
 
-function isMultiChoice(op: FilterCondition["op"]): boolean {
-  return op === "any" || op === "none";
-}
-
 function FilterValueInput({
   condition,
   property,
@@ -129,32 +121,6 @@ function FilterValueInput({
     const typeOptions = property.typeOptions as SelectTypeOptions | undefined;
     const choices = typeOptions?.choices ?? [];
     const choiceOptions = choices.map((c) => ({ value: c.id, label: c.name }));
-
-    if (isMultiChoice(condition.op)) {
-      const { value } = condition;
-      const selected = (
-        Array.isArray(value) ? value : value ? [value] : []
-      ).filter((id) => choices.some((c) => c.id === id));
-
-      return (
-        <MultiSelect
-          size="xs"
-          data={choiceOptions}
-          comboboxProps={{ withinPortal: false }}
-          value={selected}
-          onChange={(values) => onChange(values)}
-          w={160}
-          styles={{
-            pillsList: {
-              maxHeight: 70,
-              overflowY: "auto",
-            },
-          }}
-          maxDropdownHeight={220}
-        />
-      );
-    }
-
     return (
       <Select
         size="xs"
@@ -233,18 +199,11 @@ export function ViewFilterConfigPopover({
     label: p.name,
   }));
 
-  const [unSaved, setUnSaved] = useState(false)
   const [draft, setDraft] = useState<FilterCondition | null>(null);
-  const [draftConditions, setDraftConditions] =
-    useState<FilterCondition[]>(conditions);
 
   useEffect(() => {
-    if (opened) {
+    if (!opened) setDraft(null);
-      setDraftConditions(conditions);
+  }, [opened]);
-      setDraft(null);
-      setUnSaved(false)
-    }
-  }, [opened, conditions]);
 
   const handleStartDraft = useCallback(() => {
     const firstProperty = properties[0];
@@ -257,21 +216,14 @@ export function ViewFilterConfigPopover({
   }, [properties]);
 
   const handleSaveDraft = useCallback(() => {
-    const nextConditions = draft
+    if (!draft) return;
-      ? [...draftConditions, draft]
+    onChange([...conditions, draft]);
-      : draftConditions;
-
-    onChange(nextConditions);
     setDraft(null);
-    setUnSaved(false)
+  }, [draft, conditions, onChange]);
-
-  }, [draft, draftConditions, onChange]);
 
   const handleCancelDraft = useCallback(() => {
-    setDraftConditions(conditions)
     setDraft(null);
-    setUnSaved(false)
+  }, []);
-  }, [conditions]);
 
   const handleDraftPropertyChange = useCallback(
     (propertyId: string | null) => {
@@ -320,19 +272,17 @@ export function ViewFilterConfigPopover({
 
   const handleRemove = useCallback(
     (index: number) => {
-      setUnSaved(true);
+      onChange(conditions.filter((_, i) => i !== index));
-      setDraftConditions((current) => current.filter((_, i) => i !== index));
     },
-    [],
+    [conditions, onChange],
   );
 
   const handlePropertyChange = useCallback(
     (index: number, propertyId: string | null) => {
       if (!propertyId) return;
       const newProperty = properties.find((p) => p.id === propertyId);
-      setUnSaved(true)
+      onChange(
-      setDraftConditions((current) =>
+        conditions.map((f, i) => {
-        current.map((f, i) => {
           if (i !== index) return f;
           if (newProperty) {
             const validOperators = getOperatorsForType(newProperty.type);
@@ -352,16 +302,15 @@ export function ViewFilterConfigPopover({
         }),
       );
     },
-    [properties],
+    [conditions, properties, onChange],
   );
 
   const handleOperatorChange = useCallback(
     (index: number, operator: string | null) => {
       if (!operator) return;
       const op = operator as FilterOperator;
-      setUnSaved(true)
+      onChange(
-      setDraftConditions((current) =>
+        conditions.map((f, i) => {
-        current.map((f, i) => {
           if (i !== index) return f;
           const kind = inputKindForProperty(
             properties.find((p) => p.id === f.propertyId),
@@ -371,17 +320,16 @@ export function ViewFilterConfigPopover({
         }),
       );
     },
-    [properties],
+    [conditions, properties, onChange],
   );
 
   const handleValueChange = useCallback(
     (index: number, value: unknown) => {
-      setUnSaved(true)
+      onChange(
-      setDraftConditions((current) =>
+        conditions.map((f, i) => (i === index ? { ...f, value } : f)),
-        current.map((f, i) => (i === index ? { ...f, value } : f)),
       );
     },
-    [],
+    [conditions, onChange],
   );
 
   return (
@@ -414,13 +362,13 @@ export function ViewFilterConfigPopover({
             {t("Filter by")}
           </Text>
 
-          {draftConditions.length === 0 && !draft && (
+          {conditions.length === 0 && !draft && (
             <Text size="xs" c="dimmed">
               {t("No filters applied")}
             </Text>
           )}
 
-          {draftConditions.map((condition, index) => {
+          {conditions.map((condition, index) => {
             const needsValue = !NO_VALUE_OPERATORS.includes(condition.op);
             const property = properties.find(
               (p) => p.id === condition.propertyId,
@@ -523,6 +471,14 @@ export function ViewFilterConfigPopover({
                     />
                   )}
                 </Group>
+                <Group justify="flex-end" gap="xs">
+                  <Button variant="default" size="xs" onClick={handleCancelDraft}>
+                    {t("Cancel")}
+                  </Button>
+                  <Button size="xs" onClick={handleSaveDraft}>
+                    {t("Save")}
+                  </Button>
+                </Group>
               </Stack>
             );
           })()}
@@ -536,20 +492,6 @@ export function ViewFilterConfigPopover({
               {t("Add filter")}
             </UnstyledButton>
           )}
-          <Group justify="flex-end" gap="xs">
-            <Button
-              variant="default"
-              size="xs"
-              onClick={handleCancelDraft}
-              disabled={!draft && !unSaved}
-            >
-              {t("Cancel")}
-            </Button>
-
-            <Button size="xs" onClick={handleSaveDraft} disabled={!draft && !unSaved}>
-              {t("Save")}
-            </Button>
-          </Group>
         </Stack>
       </Popover.Dropdown>
     </Popover>

apps/client/src/ee/features.ts

@@ -19,8 +19,8 @@ export const Feature = {
   SHARING_CONTROLS: 'sharing:controls',
   TEMPLATES: 'templates',
   VIEWER_COMMENTS: 'comment:viewer',
+  HIDE_COMMENTS: 'comment:hide',
   PERSONAL_SPACES: 'spaces:personal',
   DOCX_EXPORT: 'export:docx',
   BASES: 'bases',
-  AI_CONTROLS: 'ai:controls',
 } as const;

apps/client/src/ee/security/components/space-hide-comments-toggle.tsx

@@ -0,0 +1,62 @@
+import { Group, Text, Switch, Tooltip } from "@mantine/core";
+import React, { useState } from "react";
+import { useTranslation } from "react-i18next";
+import { ISpace } from "@/features/space/types/space.types.ts";
+import { useUpdateSpaceMutation } from "@/features/space/queries/space-query.ts";
+import { useHasFeature } from "@/ee/hooks/use-feature.ts";
+import { Feature } from "@/ee/features.ts";
+import { useUpgradeLabel } from "@/ee/hooks/use-upgrade-label.ts";
+
+type SpaceHideCommentsToggleProps = {
+  space: ISpace;
+};
+
+export default function SpaceHideCommentsToggle({
+  space,
+}: SpaceHideCommentsToggleProps) {
+  const { t } = useTranslation();
+  const hasHideComments = useHasFeature(Feature.HIDE_COMMENTS);
+  const upgradeLabel = useUpgradeLabel();
+  const allowViewerCommentsEnabled =
+    space.settings?.comments?.allowViewerComments === true;
+  const isDisabled = !hasHideComments || allowViewerCommentsEnabled;
+  const tooltipLabel = !hasHideComments
+    ? upgradeLabel
+    : t("Turn off 'Allow viewers to comment' first");
+  const [checked, setChecked] = useState(
+    space.settings?.comments?.hideCommentsFromViewers === true,
+  );
+  const updateSpaceMutation = useUpdateSpaceMutation();
+
+  const handleChange = async (event: React.ChangeEvent<HTMLInputElement>) => {
+    const value = event.currentTarget.checked;
+    try {
+      await updateSpaceMutation.mutateAsync({
+        spaceId: space.id,
+        hideCommentsFromViewers: value,
+      });
+      setChecked(value);
+    } catch {
+      // error handled by mutation
+    }
+  };
+
+  return (
+    <Group justify="space-between" wrap="nowrap" gap="xl">
+      <div>
+        <Text size="md">{t("Hide comments from viewers")}</Text>
+        <Text size="sm" c="dimmed">
+          {t("Viewers cannot see or add comments on pages in this space.")}
+        </Text>
+      </div>
+      <Tooltip label={tooltipLabel} disabled={!isDisabled} refProp="rootRef">
+        <Switch
+          checked={checked}
+          onChange={handleChange}
+          disabled={isDisabled}
+          aria-label={t("Toggle hide comments from viewers")}
+        />
+      </Tooltip>
+    </Group>
+  );
+}

apps/client/src/ee/security/components/space-viewer-comments-toggle.tsx

@@ -17,7 +17,12 @@ export default function SpaceViewerCommentsToggle({
   const { t } = useTranslation();
   const hasViewerComments = useHasFeature(Feature.VIEWER_COMMENTS);
   const upgradeLabel = useUpgradeLabel();
-  const isDisabled = !hasViewerComments;
+  const hideCommentsEnabled =
+    space.settings?.comments?.hideCommentsFromViewers === true;
+  const isDisabled = !hasViewerComments || hideCommentsEnabled;
+  const tooltipLabel = !hasViewerComments
+    ? upgradeLabel
+    : t("Turn off 'Hide comments from viewers' first");
   const [checked, setChecked] = useState(
     space.settings?.comments?.allowViewerComments === true,
   );
@@ -45,7 +50,7 @@ export default function SpaceViewerCommentsToggle({
         </Text>
       </div>
       <Tooltip
-        label={upgradeLabel}
+        label={tooltipLabel}
         disabled={!isDisabled}
         refProp="rootRef"
       >

apps/client/src/ee/template/components/readonly-template-editor.tsx

@@ -41,7 +41,6 @@ export default function ReadonlyTemplateEditor({
       <EditorProvider
         editable={false}
         immediatelyRender={true}
-        textDirection="auto"
         extensions={extensions}
         content={template.content}
       />

apps/client/src/ee/template/pages/template-editor.tsx

@@ -87,7 +87,6 @@ export default function TemplateEditor() {
   const editor = useEditor({
     extensions: templateExtensions,
     content: "",
-    textDirection: "auto",
     editorProps: {
       scrollThreshold: 80,
       scrollMargin: 80,

apps/client/src/features/attachments/components/attachment-file-icon.tsx

@@ -1,59 +0,0 @@
-import { ThemeIcon } from "@mantine/core";
-import {
-  IconFile,
-  IconFileTypeCsv,
-  IconFileTypeDocx,
-  IconFileTypePdf,
-  IconFileTypePpt,
-  IconFileTypeXls,
-  IconFileZip,
-  IconMovie,
-  IconMusic,
-  IconPhoto,
-  type Icon,
-} from "@tabler/icons-react";
-
-const EXT_ICONS: Record<string, { icon: Icon; color: string }> = {
-  ".pdf": { icon: IconFileTypePdf, color: "red" },
-  ".doc": { icon: IconFileTypeDocx, color: "blue" },
-  ".docx": { icon: IconFileTypeDocx, color: "blue" },
-  ".xls": { icon: IconFileTypeXls, color: "teal" },
-  ".xlsx": { icon: IconFileTypeXls, color: "teal" },
-  ".csv": { icon: IconFileTypeCsv, color: "teal" },
-  ".ppt": { icon: IconFileTypePpt, color: "orange" },
-  ".pptx": { icon: IconFileTypePpt, color: "orange" },
-  ".zip": { icon: IconFileZip, color: "gray" },
-  ".rar": { icon: IconFileZip, color: "gray" },
-  ".7z": { icon: IconFileZip, color: "gray" },
-  ".tar": { icon: IconFileZip, color: "gray" },
-  ".gz": { icon: IconFileZip, color: "gray" },
-};
-
-const MIME_ICONS: Array<{ prefix: string; icon: Icon; color: string }> = [
-  { prefix: "image/", icon: IconPhoto, color: "grape" },
-  { prefix: "video/", icon: IconMovie, color: "violet" },
-  { prefix: "audio/", icon: IconMusic, color: "pink" },
-];
-
-interface AttachmentFileIconProps {
-  fileExt?: string;
-  mimeType?: string;
-}
-
-export function AttachmentFileIcon({
-  fileExt,
-  mimeType,
-}: AttachmentFileIconProps) {
-  const byExt = fileExt ? EXT_ICONS[fileExt.toLowerCase()] : undefined;
-  const byMime = mimeType
-    ? MIME_ICONS.find((entry) => mimeType.startsWith(entry.prefix))
-    : undefined;
-  const { icon: FileIcon, color } = byExt ??
-    byMime ?? { icon: IconFile, color: "gray" };
-
-  return (
-    <ThemeIcon variant="light" color={color} size={40} radius="md">
-      <FileIcon size={22} stroke={1.5} />
-    </ThemeIcon>
-  );
-}

apps/client/src/features/attachments/components/page-attachments-modal.tsx

@@ -1,191 +0,0 @@
-import { useCallback, useEffect, useMemo, useRef, useState } from "react";
-import {
-  ActionIcon,
-  Anchor,
-  Center,
-  Group,
-  Loader,
-  Modal,
-  ScrollArea,
-  Text,
-  Tooltip,
-} from "@mantine/core";
-import { IconDownload } from "@tabler/icons-react";
-import { useTranslation } from "react-i18next";
-import { SearchInput } from "@/components/common/search-input.tsx";
-import { CustomAvatar } from "@/components/ui/custom-avatar.tsx";
-import { usePageAttachmentsQuery } from "@/features/attachments/queries/attachment-query.ts";
-import { IPageAttachment } from "@/features/attachments/types/attachment.types.ts";
-import { AttachmentFileIcon } from "@/features/attachments/components/attachment-file-icon.tsx";
-import { formatBytes } from "@/lib";
-import { getFileUrl } from "@/lib/config.ts";
-import { formattedDate } from "@/lib/time.ts";
-
-interface PageAttachmentsModalProps {
-  pageId: string;
-  open: boolean;
-  onClose: () => void;
-}
-
-export default function PageAttachmentsModal({
-  pageId,
-  open,
-  onClose,
-}: PageAttachmentsModalProps) {
-  const { t } = useTranslation();
-
-  return (
-    <Modal
-      opened={open}
-      onClose={onClose}
-      title={t("Attachments")}
-      size={800}
-      closeButtonProps={{ "aria-label": t("Close") }}
-    >
-      <PageAttachmentsList pageId={pageId} />
-    </Modal>
-  );
-}
-
-function PageAttachmentsList({ pageId }: { pageId: string }) {
-  const { t } = useTranslation();
-  const [search, setSearch] = useState("");
-  const {
-    data,
-    isLoading,
-    isError,
-    isFetching,
-    fetchNextPage,
-    hasNextPage,
-    isFetchingNextPage,
-  } = usePageAttachmentsQuery(pageId, search);
-
-  const attachments = useMemo(
-    () => data?.pages.flatMap((page) => page.items) ?? [],
-    [data],
-  );
-
-  const loadMoreRef = useRef<HTMLDivElement>(null);
-
-  useEffect(() => {
-    const sentinel = loadMoreRef.current;
-    if (!sentinel || !hasNextPage) return;
-
-    const observer = new IntersectionObserver(
-      (entries) => {
-        if (entries[0].isIntersecting && !isFetching) {
-          fetchNextPage();
-        }
-      },
-      { threshold: 0.1 },
-    );
-
-    observer.observe(sentinel);
-    return () => observer.disconnect();
-  }, [fetchNextPage, hasNextPage, isFetching]);
-
-  const handleSearch = useCallback((value: string) => setSearch(value), []);
-
-  return (
-    <>
-      <SearchInput
-        onSearch={handleSearch}
-        placeholder={t("Search attachments...")}
-      />
-
-      {isLoading ? (
-        <Center py="xl">
-          <Loader size="sm" />
-        </Center>
-      ) : isError ? (
-        <Center py="xl">
-          <Text size="sm" c="dimmed">
-            {t("Error loading attachments.")}
-          </Text>
-        </Center>
-      ) : attachments.length === 0 ? (
-        <Center py="xl">
-          <Text size="sm" c="dimmed">
-            {search
-              ? t("No results found")
-              : t("No attachments on this page yet.")}
-          </Text>
-        </Center>
-      ) : (
-        <ScrollArea.Autosize mah={480} type="scroll" scrollbarSize={5}>
-          {attachments.map((attachment) => (
-            <AttachmentRow key={attachment.id} attachment={attachment} />
-          ))}
-          {hasNextPage && <div ref={loadMoreRef} style={{ height: 1 }} />}
-          {isFetchingNextPage && (
-            <Center py="sm">
-              <Loader size="sm" />
-            </Center>
-          )}
-        </ScrollArea.Autosize>
-      )}
-    </>
-  );
-}
-
-function AttachmentRow({ attachment }: { attachment: IPageAttachment }) {
-  const { t } = useTranslation();
-  const fileUrl = getFileUrl(attachment.url);
-
-  return (
-    <Group wrap="nowrap" gap="md" py="sm" pr="xs">
-      <AttachmentFileIcon
-        fileExt={attachment.fileExt}
-        mimeType={attachment.mimeType}
-      />
-
-      <div style={{ flex: 1, minWidth: 0 }}>
-        <Anchor
-          href={fileUrl}
-          target="_blank"
-          rel="noopener noreferrer"
-          size="sm"
-          fw={500}
-          c="inherit"
-          truncate="end"
-          style={{ display: "block" }}
-        >
-          {attachment.fileName}
-        </Anchor>
-        <Text size="xs" c="dimmed" mt={2} truncate="end">
-          {formatBytes(Number(attachment.fileSize))}
-          {" · "}
-          {formattedDate(new Date(attachment.createdAt))}
-        </Text>
-      </div>
-
-      {attachment.creator && (
-        <Tooltip
-          label={t("Uploaded by {{name}}", { name: attachment.creator.name })}
-          withArrow
-        >
-          <CustomAvatar
-            avatarUrl={attachment.creator.avatarUrl}
-            name={attachment.creator.name}
-            size="sm"
-          />
-        </Tooltip>
-      )}
-
-      <Tooltip label={t("Download attachment")} withArrow>
-        <ActionIcon
-          component="a"
-          href={fileUrl}
-          download={attachment.fileName}
-          target="_blank"
-          rel="noopener noreferrer"
-          variant="subtle"
-          color="gray"
-          aria-label={t("Download {{name}}", { name: attachment.fileName })}
-        >
-          <IconDownload size={18} />
-        </ActionIcon>
-      </Tooltip>
-    </Group>
-  );
-}

apps/client/src/features/attachments/queries/attachment-query.ts

@@ -1,25 +0,0 @@
-import {
-  InfiniteData,
-  keepPreviousData,
-  useInfiniteQuery,
-  UseInfiniteQueryResult,
-} from "@tanstack/react-query";
-import { getPageAttachments } from "@/features/attachments/services/attachment-service.ts";
-import { IPageAttachment } from "@/features/attachments/types/attachment.types.ts";
-import { IPagination } from "@/lib/types.ts";
-
-export function usePageAttachmentsQuery(
-  pageId: string,
-  search?: string,
-): UseInfiniteQueryResult<InfiniteData<IPagination<IPageAttachment>, unknown>> {
-  return useInfiniteQuery({
-    queryKey: ["page-attachments", pageId, search],
-    queryFn: ({ pageParam }) =>
-      getPageAttachments(pageId, { cursor: pageParam, query: search }),
-    enabled: !!pageId,
-    gcTime: 0,
-    placeholderData: keepPreviousData,
-    initialPageParam: undefined,
-    getNextPageParam: (lastPage) => lastPage.meta?.nextCursor ?? undefined,
-  });
-}

apps/client/src/features/attachments/services/attachment-service.ts

@@ -3,17 +3,7 @@ import loadImage from "blueimp-load-image";
 import {
   AvatarIconType,
   IAttachment,
-  IPageAttachment,
 } from "@/features/attachments/types/attachment.types.ts";
-import { IPagination, QueryParams } from "@/lib/types.ts";
-
-export async function getPageAttachments(
-  pageId: string,
-  params?: QueryParams,
-): Promise<IPagination<IPageAttachment>> {
-  const req = await api.post("/pages/attachments", { pageId, ...params });
-  return req.data;
-}
 
 async function compressAndResizeIcon(
   file: File,

apps/client/src/features/attachments/services/index.ts

@@ -1,5 +1,4 @@
 export {
-  getPageAttachments,
   uploadIcon,
   uploadUserAvatar,
   uploadSpaceIcon,

apps/client/src/features/attachments/types/attachment.types.ts

@@ -15,15 +15,6 @@ export interface IAttachment {
   deletedAt: string | null;
 }
 
-export interface IPageAttachment extends IAttachment {
-  url: string;
-  creator: {
-    id: string;
-    name: string;
-    avatarUrl: string | null;
-  } | null;
-}
-
 export enum AvatarIconType {
   AVATAR = "avatar",
   SPACE_ICON = "space-icon",

apps/client/src/features/comment/components/comment-editor.tsx

@@ -103,7 +103,6 @@ const CommentEditor = forwardRef(
       },
       content: defaultContent,
       editable,
-      textDirection: "auto",
       immediatelyRender: true,
       shouldRerenderOnTransaction: false,
       autofocus: (autofocus && "end") || false,

apps/client/src/features/comment/hooks/use-can-view-comments.ts

@@ -0,0 +1,15 @@
+import { useParams } from "react-router-dom";
+import { usePageQuery } from "@/features/page/queries/page-query.ts";
+import { useGetSpaceBySlugQuery } from "@/features/space/queries/space-query.ts";
+import { extractPageSlugId } from "@/lib";
+
+export function useCanViewComments(): boolean {
+  const { pageSlug } = useParams();
+  const { data: page } = usePageQuery({ pageId: extractPageSlugId(pageSlug) });
+  const { data: space } = useGetSpaceBySlugQuery(page?.space?.slug);
+
+  const canEdit = !page?.deletedAt && (page?.permissions?.canEdit ?? false);
+  return (
+    canEdit || space?.settings?.comments?.hideCommentsFromViewers !== true
+  );
+}

apps/client/src/features/editor/atoms/editor-atoms.ts

@@ -16,14 +16,6 @@ export const showAiMenuAtom = atom(false);
 
 export const showLinkMenuAtom = atom(false);
 
-export type LightboxRequest = {
-  src: string;
-  type: "image" | "video";
-} | null;
-
-const initialLightboxRequest: LightboxRequest = null;
-export const lightboxRequestAtom = atom(initialLightboxRequest);
-
 // Current page's edit mode — initialized from the user's saved preference on
 // first load, can be toggled locally without persisting to the server.
 export const currentPageEditModeAtom = atom<PageEditMode>(PageEditMode.Edit);

apps/client/src/features/editor/components/bubble-menu/bubble-menu.tsx

@@ -23,21 +23,11 @@ import {
 } from "@/features/comment/atoms/comment-atom";
 import { useAtom, useAtomValue } from "jotai";
 import { v7 as uuid7 } from "uuid";
-import {
+import { isCellSelection, isEditorReady, isTextSelected } from "@docmost/editor-ext";
-  isCellSelection,
-  isEditorReady,
-  isTextSelected,
-} from "@docmost/editor-ext";
 import { LinkSelector } from "@/features/editor/components/bubble-menu/link-selector.tsx";
 import { useTranslation } from "react-i18next";
-import {
+import { showAiMenuAtom, showLinkMenuAtom } from "@/features/editor/atoms/editor-atoms";
-  showAiMenuAtom,
+import { userAtom, workspaceAtom } from "@/features/user/atoms/current-user-atom";
-  showLinkMenuAtom,
-} from "@/features/editor/atoms/editor-atoms";
-import {
-  userAtom,
-  workspaceAtom,
-} from "@/features/user/atoms/current-user-atom";
 
 export interface BubbleMenuItem {
   name: string;
@@ -227,12 +217,7 @@ export const EditorBubbleMenu: FC<EditorBubbleMenuProps> = (props) => {
 
             <ActionIcon.Group>
               {items.map((item, index) => (
-                <Tooltip
+                <Tooltip key={index} label={t(item.name)} withArrow>
-                  key={index}
-                  label={t(item.name)}
-                  withArrow
-                  withinPortal={false}
-                >
                   <ActionIcon
                     key={index}
                     variant="default"
@@ -241,9 +226,7 @@ export const EditorBubbleMenu: FC<EditorBubbleMenuProps> = (props) => {
                     aria-label={t(item.name)}
                     className={clsx({ [classes.active]: item.isActive() })}
                     style={{ border: "none" }}
-                    onClick={() =>
+                    onClick={() => isEditorReady(props.editor) && item.command()}
-                      isEditorReady(props.editor) && item.command()
-                    }
                   >
                     <item.icon style={{ width: rem(16) }} stroke={2} />
                   </ActionIcon>
@@ -273,9 +256,7 @@ export const EditorBubbleMenu: FC<EditorBubbleMenuProps> = (props) => {
               radius="6px"
               aria-label={t(commentItem.name)}
               style={{ border: "none" }}
-              onClick={() =>
+              onClick={() => isEditorReady(props.editor) && commentItem.command()}
-                isEditorReady(props.editor) && commentItem.command()
-              }
             >
               <IconMessage size={16} stroke={2} />
             </ActionIcon>

apps/client/src/features/editor/components/bubble-menu/color-selector.tsx

@@ -129,7 +129,8 @@ function handleColorKeyNav(
   grid: "text" | "highlight",
 ) {
   const cols = COLOR_GRID_COLS;
-  const total = grid === "text" ? TEXT_COLORS.length : HIGHLIGHT_COLORS.length;
+  const total =
+    grid === "text" ? TEXT_COLORS.length : HIGHLIGHT_COLORS.length;
   const col = index % cols;
 
   if (e.key === "ArrowRight") {
@@ -162,7 +163,8 @@ function handleColorKeyNav(
     if (prev >= 0) {
       focusSwatch(grid, prev);
     } else if (grid === "highlight") {
-      const lastRowStart = Math.floor((TEXT_COLORS.length - 1) / cols) * cols;
+      const lastRowStart =
+        Math.floor((TEXT_COLORS.length - 1) / cols) * cols;
       focusSwatch("text", Math.min(lastRowStart + col, TEXT_COLORS.length - 1));
     }
     return;
@@ -220,7 +222,7 @@ export const ColorSelector: FC<ColorSelectorProps> = ({
       withArrow
     >
       <Popover.Target>
-        <Tooltip label={t("Text color")} withArrow withinPortal={false}>
+        <Tooltip label={t("Text color")} withArrow>
           <Button
             variant="default"
             radius="0"
@@ -245,26 +247,26 @@ export const ColorSelector: FC<ColorSelectorProps> = ({
 
       <Popover.Dropdown onMouseDown={(e) => e.preventDefault()}>
         <Stack gap="md" p="2px">
-          <Box>
+            <Box>
-            <Text size="sm" fw={600} mb="xs">
+              <Text size="sm" fw={600} mb="xs">
-              {t("Text color")}
+                {t("Text color")}
-            </Text>
+              </Text>
-            <SimpleGrid cols={5} spacing="xs">
+              <SimpleGrid cols={5} spacing="xs">
-              {TEXT_COLORS.map(({ name, color }, index) => {
+                {TEXT_COLORS.map(({ name, color }, index) => {
-                const applyTextColor = () => {
+                  const applyTextColor = () => {
-                  if (!isEditorReady(editor)) return;
+                    if (!isEditorReady(editor)) return;
-                  if (name === "Default") {
+                    if (name === "Default") {
-                    editor.commands.unsetColor();
+                      editor.commands.unsetColor();
-                  } else {
+                    } else {
-                    editor
+                      editor
-                      .chain()
+                        .chain()
-                      .focus()
+                        .focus()
-                      .setColor(color || "")
+                        .setColor(color || "")
-                      .run();
+                        .run();
-                  }
+                    }
-                  setIsOpen(false);
+                    setIsOpen(false);
-                };
+                  };
-                return (
+                  return (
                   <Tooltip key={index} label={t(name)} withArrow>
                     <Box
                       role="button"
@@ -304,34 +306,34 @@ export const ColorSelector: FC<ColorSelectorProps> = ({
                       A
                     </Box>
                   </Tooltip>
-                );
+                  );
-              })}
+                })}
-            </SimpleGrid>
+              </SimpleGrid>
-          </Box>
+            </Box>
 
-          <Box>
+            <Box>
-            <Text size="sm" fw={600} mb="xs">
+              <Text size="sm" fw={600} mb="xs">
-              {t("Highlight color")}
+                {t("Highlight color")}
-            </Text>
+              </Text>
-            <SimpleGrid cols={5} spacing="xs">
+              <SimpleGrid cols={5} spacing="xs">
-              {HIGHLIGHT_COLORS.map(({ name, color }, index) => {
+                {HIGHLIGHT_COLORS.map(({ name, color }, index) => {
-                const applyHighlight = () => {
+                  const applyHighlight = () => {
-                  if (!isEditorReady(editor)) return;
+                    if (!isEditorReady(editor)) return;
-                  if (name === "Default") {
+                    if (name === "Default") {
-                    editor.commands.unsetHighlight();
+                      editor.commands.unsetHighlight();
-                  } else {
+                    } else {
-                    editor
+                      editor
-                      .chain()
+                        .chain()
-                      .focus()
+                        .focus()
-                      .toggleMark("highlight", {
+                        .toggleMark("highlight", {
-                        color: color || "",
+                          color: color || "",
-                        colorName: name.toLowerCase() || "",
+                          colorName: name.toLowerCase() || "",
-                      })
+                        })
-                      .run();
+                        .run();
-                  }
+                    }
-                  setIsOpen(false);
+                    setIsOpen(false);
-                };
+                  };
-                return (
+                  return (
                   <Tooltip key={index} label={t(name)} withArrow>
                     <Box
                       role="button"
@@ -376,36 +378,37 @@ export const ColorSelector: FC<ColorSelectorProps> = ({
                       )}
                     </Box>
                   </Tooltip>
-                );
+                  );
-              })}
+                })}
-            </SimpleGrid>
+              </SimpleGrid>
-          </Box>
+            </Box>
 
-          <Button
+            <Button
-            variant="default"
+              variant="default"
-            fullWidth
+              fullWidth
-            data-color-grid="remove"
+              data-color-grid="remove"
-            className={classes.removeColor}
+              className={classes.removeColor}
-            onClick={() => {
+              onClick={() => {
-              if (isEditorReady(editor)) {
+                if (isEditorReady(editor)) {
-                editor.commands.unsetColor();
+                  editor.commands.unsetColor();
-                editor.commands.unsetHighlight();
+                  editor.commands.unsetHighlight();
-              }
+                }
-              setIsOpen(false);
+                setIsOpen(false);
-            }}
+              }}
-            onKeyDown={(e) => {
+              onKeyDown={(e) => {
-              if (e.key === "ArrowUp") {
+                if (e.key === "ArrowUp") {
-                e.preventDefault();
+                  e.preventDefault();
-                const lastRowStart =
+                  const lastRowStart =
-                  Math.floor((HIGHLIGHT_COLORS.length - 1) / COLOR_GRID_COLS) *
+                    Math.floor(
-                  COLOR_GRID_COLS;
+                      (HIGHLIGHT_COLORS.length - 1) / COLOR_GRID_COLS,
-                focusSwatch("highlight", lastRowStart);
+                    ) * COLOR_GRID_COLS;
-              }
+                  focusSwatch("highlight", lastRowStart);
-            }}
+                }
-          >
+              }}
-            {t("Remove color")}
+            >
-          </Button>
+              {t("Remove color")}
-        </Stack>
+            </Button>
+          </Stack>
       </Popover.Dropdown>
     </Popover>
   );

apps/client/src/features/editor/components/bubble-menu/link-selector.tsx

@@ -10,7 +10,7 @@ export const LinkSelector: FC = () => {
   const setShowLinkMenu = useSetAtom(showLinkMenuAtom);
 
   return (
-    <Tooltip label={t("Add link")} withArrow withinPortal={false}>
+    <Tooltip label={t("Add link")} withArrow>
       <ActionIcon
         variant="default"
         size="lg"

apps/client/src/features/editor/components/bubble-menu/text-alignment-selector.tsx

@@ -91,12 +91,7 @@ export const TextAlignmentSelector: FC<TextAlignmentProps> = ({
       onChange={setIsOpen}
     >
       <Menu.Target>
-        <Tooltip
+        <Tooltip label={t("Text align")} withArrow disabled={isOpen}>
-          label={t("Text align")}
-          withArrow
-          disabled={isOpen}
-          withinPortal={false}
-        >
           <Button
             variant="default"
             style={{ border: "none", height: "34px" }}

apps/client/src/features/editor/components/common/lightbox-view.tsx

@@ -1,176 +0,0 @@
-import type { Editor } from "@tiptap/react";
-import type { Node as PMNode } from "@tiptap/pm/model";
-import Lightbox, { type Slide } from "yet-another-react-lightbox";
-import type { LightboxRequest } from "@/features/editor/atoms/editor-atoms";
-import { getFileUrl } from "@/lib/config.ts";
-import "yet-another-react-lightbox/styles.css";
-import "yet-another-react-lightbox/plugins/captions.css";
-import Captions from "yet-another-react-lightbox/plugins/captions";
-import Download from "yet-another-react-lightbox/plugins/download";
-import Fullscreen from "yet-another-react-lightbox/plugins/fullscreen";
-import Video from "yet-another-react-lightbox/plugins/video";
-import Zoom from "yet-another-react-lightbox/plugins/zoom";
-import { useEffect, useMemo, useState } from "react";
-import i18n from "@/i18n.ts";
-import { useTranslation } from "react-i18next";
-
-type LightboxViewProps = {
-  editor: Editor;
-  open: boolean;
-  src: string;
-  type: "image" | "video";
-  onClose: () => void;
-};
-
-function getVideoMimeType(src: string) {
-  const extension = src.split(/[?#]/, 1)[0].split(".").pop()?.toLowerCase();
-
-  switch (extension) {
-    case "webm":
-      return "video/webm";
-    case "ogv":
-      return "video/ogg";
-    case "mov":
-      return "video/quicktime";
-    case "m4v":
-      return "video/x-m4v";
-    default:
-      return "video/mp4";
-  }
-}
-
-function getFilename(src: string) {
-  const filename = src.split(/[?#]/, 1)[0].split("/").pop();
-  if (!filename) return i18n.t("Media");
-
-  try {
-    return decodeURIComponent(filename);
-  } catch {
-    return filename;
-  }
-}
-
-function getMedia(rawSrc: string, type?: string, alt?: string): Slide {
-  const src = getFileUrl(rawSrc);
-  const filename = getFilename(rawSrc);
-  const caption = alt || filename;
-
-  if (type === "video") {
-    return {
-      type: "video",
-      sources: [{ src, type: getVideoMimeType(rawSrc) }],
-      title: caption,
-      download: { url: src, filename },
-    };
-  } else {
-    return {
-      type: "image",
-      src,
-      alt: alt || undefined,
-      title: caption,
-      download: { url: src, filename },
-    };
-  }
-}
-
-const LIGHTBOX_NODE_TYPES: Record<string, "image" | "video"> = {
-  image: "image",
-  video: "video",
-  drawio: "image",
-  excalidraw: "image",
-};
-
-// video is excluded: clicks there operate the native controls
-const CLICK_TO_EXPAND_NODE_TYPES = new Set(["image", "drawio", "excalidraw"]);
-
-export function getLightboxClickRequest(node: PMNode): LightboxRequest {
-  if (!CLICK_TO_EXPAND_NODE_TYPES.has(node.type.name)) return null;
-
-  const src = typeof node.attrs.src === "string" ? node.attrs.src : "";
-  if (!src) return null;
-
-  return { src: getFileUrl(src), type: "image" };
-}
-
-function getPageMedia(editor: Editor): Slide[] {
-  const media: Slide[] = [];
-
-  editor.state.doc.descendants((node) => {
-    const type = LIGHTBOX_NODE_TYPES[node.type.name];
-    if (!type) return;
-
-    const rawSrc = typeof node.attrs.src === "string" ? node.attrs.src : "";
-    if (!rawSrc) return;
-
-    media.push(getMedia(rawSrc, type, node.attrs.alt));
-  });
-
-  return media;
-}
-
-export default function LightboxView({
-  editor,
-  open,
-  src,
-  type,
-  onClose,
-}: LightboxViewProps) {
-  const { i18n: i18nInstance } = useTranslation();
-
-  const selectedSlide = useMemo(
-    () => getMedia(src, type),
-    [src, type, i18nInstance.language]
-  );
-
-  const [pageSlides, setPageSlides] = useState<Slide[]>([]);
-  const [loadedMediaKey, setLoadedMediaKey] = useState<string | null>(null);
-
-  useEffect(() => {
-    if (!open) return;
-
-    setLoadedMediaKey(null);
-
-    const frame = requestAnimationFrame(() => {
-      const slides = getPageMedia(editor);
-
-      setPageSlides(slides);
-      setLoadedMediaKey(`${type}:${src}`);
-    });
-
-    return () => cancelAnimationFrame(frame);
-  }, [editor, open, type, src]);
-
-  const slides = loadedMediaKey === `${type}:${src}` ? pageSlides : [selectedSlide];
-
-  const index = useMemo(() => {
-    if (!(pageSlides.length > 0)) {
-      return 0;
-    }
-
-    const idx = slides.findIndex((slide) =>
-      type === "video"
-        ? "sources" in slide && slide.sources.some((s) => s.src === src)
-        : "src" in slide && slide.src === src
-    );
-    return idx >= 0 ? idx : 0;
-  }, [slides, src, type]);
-
-  return (
-    <Lightbox
-      open={open}
-      close={onClose}
-      index={index}
-      slides={slides}
-      plugins={[Captions, Download, Fullscreen, Video, Zoom]}
-      styles={{ container: { backgroundColor: "rgba(0, 0, 0, 0.8)" } }}
-      captions={{ descriptionTextAlign: "center" }}
-      video={{ controls: true, playsInline: true }}
-      zoom={{
-        scrollToZoom: true,
-        maxZoomPixelRatio: 4,
-        maxZoom: 4,
-        supports: ["video"],
-      }}
-    />
-  );
-}

apps/client/src/features/editor/components/drawio/drawio-menu.tsx

@@ -1,7 +1,6 @@
 import { BubbleMenu as BaseBubbleMenu } from "@tiptap/react/menus";
 import { findParentNode, posToDOMRect, useEditorState } from "@tiptap/react";
 import { useCallback, useEffect, useRef, useState } from "react";
-import { useSetAtom } from "jotai";
 import { Node as PMNode } from "@tiptap/pm/model";
 import { isEditorReady } from "@docmost/editor-ext";
 import {
@@ -25,7 +24,6 @@ import {
   IconDownload,
   IconEdit,
   IconTrash,
-  IconZoomIn,
 } from "@tabler/icons-react";
 import { useTranslation } from "react-i18next";
 import { getDrawioUrl, getFileUrl } from "@/lib/config.ts";
@@ -41,12 +39,10 @@ import { decodeBase64ToSvgString, svgStringToFile } from "@/lib/utils";
 import { IAttachment } from "@/features/attachments/types/attachment.types";
 import { modals } from "@mantine/modals";
 import { useAltTextControl } from "@/features/editor/components/common/use-alt-text-control.tsx";
-import { lightboxRequestAtom } from "@/features/editor/atoms/editor-atoms";
 import classes from "../common/toolbar-menu.module.css";
 
 export function DrawioMenu({ editor }: EditorMenuProps) {
   const { t } = useTranslation();
-  const setLightboxRequest = useSetAtom(lightboxRequestAtom);
   const [opened, { open, close }] = useDisclosure(false);
   const [initialXML, setInitialXML] = useState<string>("");
   const drawioRef = useRef<DrawIoEmbedRef>(null);
@@ -332,23 +328,6 @@ export function DrawioMenu({ editor }: EditorMenuProps) {
 
           <div className={classes.divider} />
 
-          <Tooltip position="top" label={t("Expand")} withinPortal={false}>
-            <ActionIcon
-              onClick={() =>
-                editorState?.src &&
-                setLightboxRequest({
-                  src: getFileUrl(editorState.src),
-                  type: "image",
-                })
-              }
-              size="lg"
-              aria-label={t("Expand")}
-              variant="subtle"
-            >
-              <IconZoomIn size={18} />
-            </ActionIcon>
-          </Tooltip>
-
           <Tooltip position="top" label={t("Edit")} withinPortal={false}>
             <ActionIcon
               onClick={handleOpen}

apps/client/src/features/editor/components/excalidraw/excalidraw-menu.tsx

@@ -1,7 +1,6 @@
 import { BubbleMenu as BaseBubbleMenu } from "@tiptap/react/menus";
 import { findParentNode, posToDOMRect, useEditorState } from "@tiptap/react";
 import { lazy, Suspense, useCallback, useEffect, useRef, useState } from "react";
-import { useSetAtom } from "jotai";
 import { Node as PMNode } from "@tiptap/pm/model";
 import { isEditorReady } from "@docmost/editor-ext";
 import {
@@ -26,7 +25,6 @@ import {
   IconDownload,
   IconEdit,
   IconTrash,
-  IconZoomIn,
 } from "@tabler/icons-react";
 import { useTranslation } from "react-i18next";
 import { getFileUrl } from "@/lib/config.ts";
@@ -39,7 +37,6 @@ import ReactClearModal from "react-clear-modal";
 import { useHandleLibrary } from "@excalidraw/excalidraw";
 import { localStorageLibraryAdapter } from "@/features/editor/components/excalidraw/excalidraw-utils.ts";
 import { useAltTextControl } from "@/features/editor/components/common/use-alt-text-control.tsx";
-import { lightboxRequestAtom } from "@/features/editor/atoms/editor-atoms";
 import classes from "../common/toolbar-menu.module.css";
 
 const ExcalidrawComponent = lazy(() =>
@@ -50,7 +47,6 @@ const ExcalidrawComponent = lazy(() =>
 
 export function ExcalidrawMenu({ editor }: EditorMenuProps) {
   const { t } = useTranslation();
-  const setLightboxRequest = useSetAtom(lightboxRequestAtom);
   const [opened, { open, close }] = useDisclosure(false);
   const [excalidrawAPI, setExcalidrawAPI] =
     useState<ExcalidrawImperativeAPI>(null);
@@ -363,23 +359,6 @@ export function ExcalidrawMenu({ editor }: EditorMenuProps) {
 
           <div className={classes.divider} />
 
-          <Tooltip position="top" label={t("Expand")} withinPortal={false}>
-            <ActionIcon
-              onClick={() =>
-                editorState?.src &&
-                setLightboxRequest({
-                  src: getFileUrl(editorState.src),
-                  type: "image",
-                })
-              }
-              size="lg"
-              aria-label={t("Expand")}
-              variant="subtle"
-            >
-              <IconZoomIn size={18} />
-            </ActionIcon>
-          </Tooltip>
-
           <Tooltip position="top" label={t("Edit")} withinPortal={false}>
             <ActionIcon
               onClick={handleOpen}

apps/client/src/features/editor/components/fixed-toolbar/groups/more-inserts-group.tsx

@@ -12,7 +12,6 @@ import {
   IconMathFunction,
   IconRotate2,
   IconSitemap,
-  IconSuperscript,
   IconTable,
   IconTag,
 } from "@tabler/icons-react";
@@ -271,12 +270,6 @@ export const MoreInsertsGroup: FC<Props> = ({ editor, templateMode }) => {
         >
           {t("Math block")}
         </Menu.Item>
-        <Menu.Item
-          leftSection={<IconSuperscript size={16} />}
-          onClick={() => editor.chain().focus().addFootnote().run()}
-        >
-          {t("Footnote")}
-        </Menu.Item>
       </Menu.Dropdown>
     </Menu>
   );

apps/client/src/features/editor/components/image/image-menu.tsx

@@ -1,7 +1,6 @@
 import { BubbleMenu as BaseBubbleMenu } from "@tiptap/react/menus";
 import { findParentNode, posToDOMRect, useEditorState } from "@tiptap/react";
 import React, { useCallback, useRef } from "react";
-import { useSetAtom } from "jotai";
 import { Node as PMNode } from "@tiptap/pm/model";
 import { isEditorReady } from "@docmost/editor-ext";
 import {
@@ -17,19 +16,16 @@ import {
   IconDownload,
   IconRefresh,
   IconTrash,
-  IconZoomIn,
 } from "@tabler/icons-react";
 import { useTranslation } from "react-i18next";
 import { getFileUrl } from "@/lib/config.ts";
 import { uploadImageAction } from "@/features/editor/components/image/upload-image-action.tsx";
 import { useAltTextControl } from "@/features/editor/components/common/use-alt-text-control.tsx";
-import { lightboxRequestAtom } from "@/features/editor/atoms/editor-atoms";
 import classes from "../common/toolbar-menu.module.css";
 
 export function ImageMenu({ editor }: EditorMenuProps) {
   const { t } = useTranslation();
   const fileInputRef = useRef<HTMLInputElement>(null);
-  const setLightboxRequest = useSetAtom(lightboxRequestAtom);
 
   const editorState = useEditorState({
     editor,
@@ -211,23 +207,6 @@ export function ImageMenu({ editor }: EditorMenuProps) {
 
         <div className={classes.divider} />
 
-        <Tooltip position="top" label={t("Expand")} withinPortal={false}>
-          <ActionIcon
-            onClick={() =>
-              editorState?.src &&
-              setLightboxRequest({
-                src: getFileUrl(editorState.src),
-                type: "image",
-              })
-            }
-            size="lg"
-            aria-label={t("Expand")}
-            variant="subtle"
-          >
-            <IconZoomIn size={18} />
-          </ActionIcon>
-        </Tooltip>
-
         <Tooltip position="top" label={t("Download")} withinPortal={false}>
           <ActionIcon
             onClick={handleDownload}

apps/client/src/features/editor/components/slash-menu/menu-items.ts

@@ -30,7 +30,6 @@ import {
   IconTag,
   IconMoodSmile,
   IconRotate2,
-  IconSuperscript,
 } from "@tabler/icons-react";
 import {
   CommandProps,
@@ -178,16 +177,6 @@ const CommandGroups: SlashMenuGroupedItemsType = {
       command: ({ editor, range }: CommandProps) =>
         editor.chain().focus().deleteRange(range).setPageBreak().run(),
     },
-    {
-      title: "Footnote",
-      description: "Insert a footnote reference.",
-      searchTerms: ["footnote", "reference", "citation", "note"],
-      icon: IconSuperscript,
-      command: ({ editor, range }: CommandProps) => {
-        editor.chain().focus().deleteRange(range).run();
-        editor.commands.addFootnote();
-      },
-    },
     {
       title: "Image",
       description: "Upload any image from your device.",

apps/client/src/features/editor/components/subpages/subpages-view.tsx

@@ -13,21 +13,14 @@ import {
 import { useTranslation } from "react-i18next";
 import { sortPositionKeys } from "@/features/page/tree/utils/utils";
 import { useSharedPageSubpages } from "@/features/share/hooks/use-shared-page-subpages";
-import { extractPageSlugId } from "@/lib";
 
 export default function SubpagesView(props: NodeViewProps) {
   const { editor } = props;
-  const { spaceSlug, shareId, pageSlug } = useParams();
+  const { spaceSlug, shareId } = useParams();
   const { t } = useTranslation();
 
-  // @ts-ignore
+  //@ts-ignore
-  const storagePageId = editor.storage.pageId;
+  const currentPageId = editor.storage.pageId;
-  const routePageId = extractPageSlugId(pageSlug);
-  let currentPageId = storagePageId;
-
-  if (shareId){
-    currentPageId = routePageId;
-  }
 
   // Get subpages from shared tree if we're in a shared context
   const sharedSubpages = useSharedPageSubpages(currentPageId);

apps/client/src/features/editor/components/transclusion/transclusion-content.tsx

@@ -40,7 +40,6 @@ export default function TransclusionContent({ content }: Props) {
       <EditorProvider
         editable={false}
         immediatelyRender={true}
-        textDirection="auto"
         extensions={extensions}
         content={content as any}
       />

apps/client/src/features/editor/components/video/video-menu.tsx

@@ -1,7 +1,6 @@
 import { BubbleMenu as BaseBubbleMenu } from "@tiptap/react/menus";
 import { findParentNode, posToDOMRect, useEditorState } from "@tiptap/react";
 import { useCallback } from "react";
-import { useSetAtom } from "jotai";
 import { Node as PMNode } from "@tiptap/pm/model";
 import { isEditorReady } from "@docmost/editor-ext";
 import {
@@ -16,17 +15,14 @@ import {
   IconLayoutAlignRight,
   IconDownload,
   IconTrash,
-  IconZoomIn,
 } from "@tabler/icons-react";
 import { useTranslation } from "react-i18next";
 import { getFileUrl } from "@/lib/config.ts";
 import { useAltTextControl } from "@/features/editor/components/common/use-alt-text-control.tsx";
-import { lightboxRequestAtom } from "@/features/editor/atoms/editor-atoms";
 import classes from "../common/toolbar-menu.module.css";
 
 export function VideoMenu({ editor }: EditorMenuProps) {
   const { t } = useTranslation();
-  const setLightboxRequest = useSetAtom(lightboxRequestAtom);
 
   const editorState = useEditorState({
     editor,
@@ -187,23 +183,6 @@ export function VideoMenu({ editor }: EditorMenuProps) {
 
         <div className={classes.divider} />
 
-        <Tooltip position="top" label={t("Expand")} withinPortal={false}>
-          <ActionIcon
-            onClick={() =>
-              editorState?.src &&
-              setLightboxRequest({
-                src: getFileUrl(editorState.src),
-                type: "video",
-              })
-            }
-            size="lg"
-            aria-label={t("Expand")}
-            variant="subtle"
-          >
-            <IconZoomIn size={18} />
-          </ActionIcon>
-        </Tooltip>
-
         <Tooltip position="top" label={t("Download")} withinPortal={false}>
           <ActionIcon
             onClick={handleDownload}

apps/client/src/features/editor/extensions/extensions.ts

@@ -1,6 +1,5 @@
 import { markInputRule } from "@tiptap/core";
 import { StarterKit } from "@tiptap/starter-kit";
-import { Document } from "@tiptap/extension-document";
 import { Code } from "@tiptap/extension-code";
 import { TextAlign } from "@tiptap/extension-text-align";
 import { TaskList, TaskItem } from "@tiptap/extension-list";
@@ -64,9 +63,6 @@ import {
   TransclusionReference,
   TableView,
   BaseEmbed as BaseEmbedNode,
-  Footnotes,
-  Footnote,
-  FootnoteReference,
 } from "@docmost/editor-ext";
 import {
   randomElement,
@@ -136,7 +132,6 @@ lowlight.register("scala", scala);
 // @ts-ignore
 export const mainExtensions = [
   StarterKit.configure({
-    document: false,
     heading: false,
     undoRedo: false,
     link: false,
@@ -148,9 +143,6 @@ export const mainExtensions = [
     codeBlock: false,
     code: false,
   }),
-  Document.extend({
-    content: "block+ footnotes?",
-  }),
   // Override TipTap's Code extension to fix the inline code input rule.
   // The upstream regex /(^|[^`])`([^`]+)`(?!`)$/ captures the character
   // before the opening backtick as part of the match, causing markInputRule
@@ -211,8 +203,7 @@ export const mainExtensions = [
             parentName === "tableCell" ||
             parentName === "tableHeader" ||
             parentName === "callout" ||
-            parentName === "blockquote" ||
+            parentName === "blockquote"
-            parentName === "footnote"
           ) {
             return i18n.t("Write...");
           }
@@ -426,9 +417,6 @@ export const mainExtensions = [
   }).configure(),
   Columns,
   Column,
-  Footnotes,
-  Footnote,
-  FootnoteReference,
   AutoJoiner.configure({
     elementsToJoin: [],
   }),

apps/client/src/features/editor/page-editor.tsx

@@ -33,7 +33,6 @@ import { useAtom, useAtomValue } from "jotai";
 import { currentUserAtom } from "@/features/user/atoms/current-user-atom";
 import {
   currentPageEditModeAtom,
-  lightboxRequestAtom,
   pageEditorAtom,
   yjsConnectionStatusAtom,
   yjsSyncedAtom,
@@ -54,9 +53,6 @@ import CalloutMenu from "@/features/editor/components/callout/callout-menu.tsx";
 import VideoMenu from "@/features/editor/components/video/video-menu.tsx";
 import PdfMenu from "@/features/editor/components/pdf/pdf-menu.tsx";
 import SubpagesMenu from "@/features/editor/components/subpages/subpages-menu.tsx";
-import LightboxView, {
-  getLightboxClickRequest,
-} from "@/features/editor/components/common/lightbox-view";
 import {
   handleFileDrop,
   handlePaste,
@@ -86,6 +82,8 @@ import {
   getCollabSocket,
   releaseCollabSocket,
 } from "@/features/editor/collab-socket";
+import clsx from "clsx";
+import { useCanViewComments } from "@/features/comment/hooks/use-can-view-comments.ts";
 
 interface PageEditorProps {
   pageId: string;
@@ -188,7 +186,6 @@ function CollabPageEditor({
   const [, setActiveCommentId] = useAtom(activeCommentIdAtom);
   const [showCommentPopup, setShowCommentPopup] = useAtom(showCommentPopupAtom);
   const [showReadOnlyCommentPopup] = useAtom(showReadOnlyCommentPopupAtom);
-  const [lightboxRequest, setLightboxRequest] = useAtom(lightboxRequestAtom);
   const [isLocalSynced, setIsLocalSynced] = useState(false);
   const [isRemoteSynced, setIsRemoteSynced] = useState(false);
   const [yjsConnectionStatus, setYjsConnectionStatus] = useAtom(
@@ -201,6 +198,7 @@ function CollabPageEditor({
   const { pageSlug } = useParams();
   const slugId = extractPageSlugId(pageSlug);
   const currentPageEditMode = useAtomValue(currentPageEditModeAtom);
+  const canViewComments = useCanViewComments();
   const canScroll = useCallback(
     () => Boolean(isComponentMounted.current && editorRef.current),
     [isComponentMounted],
@@ -250,22 +248,10 @@ function CollabPageEditor({
     return [...mainExtensions, ...collabExtensions(provider, currentUser.user)];
   }, [provider, currentUser?.user]);
 
-  const debouncedUpdateContent = useDebouncedCallback((newContent: any) => {
-    const pageData = queryClient.getQueryData<IPage>(["pages", slugId]);
-
-    if (pageData) {
-      queryClient.setQueryData(["pages", slugId], {
-        ...pageData,
-        content: newContent,
-      });
-    }
-  }, 3000);
-
   const editor = useEditor(
     {
       extensions,
       editable,
-      textDirection: "auto",
       immediatelyRender: true,
       shouldRerenderOnTransaction: false,
       editorProps: {
@@ -321,22 +307,6 @@ function CollabPageEditor({
 
           return handleFileDrop(editorRef.current, event, moved, pageId);
         },
-        handleClickOn: (view, _pos, node) => {
-          if (view.editable) return false;
-
-          const request = getLightboxClickRequest(node);
-          if (!request) return false;
-
-          setLightboxRequest(request);
-          return true;
-        },
-        handleDoubleClickOn: (_view, _pos, node) => {
-          const request = getLightboxClickRequest(node);
-          if (!request) return false;
-
-          setLightboxRequest(request);
-          return true;
-        },
       },
       onCreate({ editor }) {
         if (editor) {
@@ -375,6 +345,17 @@ function CollabPageEditor({
     },
   });
 
+  const debouncedUpdateContent = useDebouncedCallback((newContent: any) => {
+    const pageData = queryClient.getQueryData<IPage>(["pages", slugId]);
+
+    if (pageData) {
+      queryClient.setQueryData(["pages", slugId], {
+        ...pageData,
+        content: newContent,
+      });
+    }
+  }, 3000);
+
   const handleActiveCommentEvent = (event) => {
     const { commentId, resolved } = event.detail;
 
@@ -394,6 +375,7 @@ function CollabPageEditor({
   };
 
   useEffect(() => {
+    if (!canViewComments) return;
     document.addEventListener("ACTIVE_COMMENT_EVENT", handleActiveCommentEvent);
     return () => {
       document.removeEventListener(
@@ -401,13 +383,12 @@ function CollabPageEditor({
         handleActiveCommentEvent,
       );
     };
-  }, []);
+  }, [canViewComments]);
 
   useEffect(() => {
     setActiveCommentId(null);
     setShowCommentPopup(false);
     setAsideState({ tab: "", isAsideOpen: false });
-    setLightboxRequest(null);
   }, [pageId]);
 
   const isSynced = isLocalSynced && isRemoteSynced;
@@ -453,7 +434,13 @@ function CollabPageEditor({
   }
 
   return (
-    <div className="editor-container" style={{ position: "relative" }}>
+    <div
+      className={clsx(
+        "editor-container",
+        !canViewComments && "comments-hidden",
+      )}
+      style={{ position: "relative" }}
+    >
       <div ref={menuContainerRef}>
         <EditorContent editor={editor} />
 
@@ -481,15 +468,6 @@ function CollabPageEditor({
         {editor && !editorIsEditable && (editable || canComment) && (
           <ReadonlyBubbleMenu editor={editor} />
         )}
-        {editor && (
-          <LightboxView
-            editor={editor}
-            open={!!lightboxRequest}
-            src={lightboxRequest?.src ?? ""}
-            type={lightboxRequest?.type ?? "image"}
-            onClose={() => setLightboxRequest(null)}
-          />
-        )}
         {showCommentPopup && <CommentDialog editor={editor} pageId={pageId} />}
         {showReadOnlyCommentPopup && (
           <CommentDialog editor={editor} pageId={pageId} readOnly />
@@ -512,18 +490,21 @@ function StaticPageEditor({
   content: any;
   ariaLabel: string;
 }) {
+  const canViewComments = useCanViewComments();
+
   return (
-    <EditorProvider
+    <div className={clsx(!canViewComments && "comments-hidden")}>
-      editable={false}
+      <EditorProvider
-      immediatelyRender={true}
+        editable={false}
-      textDirection="auto"
+        immediatelyRender={true}
-      extensions={mainExtensions}
+        extensions={mainExtensions}
-      content={content}
+        content={content}
-      editorProps={{
+        editorProps={{
-        attributes: {
+          attributes: {
-          "aria-label": ariaLabel,
+            "aria-label": ariaLabel,
-        },
+          },
-      }}
+        }}
-    />
+      />
+    </div>
   );
 }

apps/client/src/features/editor/readonly-page-editor.tsx

@@ -1,27 +1,15 @@
 import "@/features/editor/styles/index.css";
-import React, {
+import React, { useCallback, useEffect, useMemo, useRef } from "react";
-  useCallback,
+import { EditorProvider } from "@tiptap/react";
-  useEffect,
-  useMemo,
-  useRef,
-  useState,
-} from "react";
-import { Editor, EditorProvider } from "@tiptap/react";
 import { mainExtensions } from "@/features/editor/extensions/extensions";
 import { Document } from "@tiptap/extension-document";
 import { Heading, UniqueID } from "@docmost/editor-ext";
 import { Text } from "@tiptap/extension-text";
 import { Placeholder } from "@tiptap/extension-placeholder";
 import { useAtom } from "jotai";
-import {
+import { readOnlyEditorAtom } from "@/features/editor/atoms/editor-atoms.ts";
-  lightboxRequestAtom,
-  readOnlyEditorAtom,
-} from "@/features/editor/atoms/editor-atoms.ts";
 import { useEditorScroll } from "./hooks/use-editor-scroll";
 import { TransclusionLookupProvider } from "@/features/editor/components/transclusion/transclusion-lookup-context";
-import LightboxView, {
-  getLightboxClickRequest,
-} from "@/features/editor/components/common/lightbox-view";
 
 interface PageEditorProps {
   title: string;
@@ -45,8 +33,6 @@ export default function ReadonlyPageEditor({
   shareId,
 }: PageEditorProps) {
   const [, setReadOnlyEditor] = useAtom(readOnlyEditorAtom);
-  const [lightboxRequest, setLightboxRequest] = useAtom(lightboxRequestAtom);
-  const [contentEditor, setContentEditor] = useState<Editor | null>(null);
   const isComponentMounted = useRef(false);
   const editorCreated = useRef(false);
 
@@ -63,11 +49,6 @@ export default function ReadonlyPageEditor({
     isComponentMounted.current = true;
   }, []);
 
-  useEffect(() => {
-    if (!shareId) return;
-    setLightboxRequest(null);
-  }, [pageId, shareId]);
-
   const extensions = useMemo(() => {
     const excludedExtensions = new Set([
       "uniqueID",
@@ -104,7 +85,6 @@ export default function ReadonlyPageEditor({
         <EditorProvider
           editable={false}
           immediatelyRender={true}
-          textDirection="auto"
           extensions={titleExtensions}
           content={title}
         ></EditorProvider>
@@ -113,22 +93,8 @@ export default function ReadonlyPageEditor({
       <EditorProvider
         editable={false}
         immediatelyRender={true}
-        textDirection="auto"
         extensions={extensions}
         content={content}
-        editorProps={
-          shareId
-            ? {
-                handleClickOn: (_view, _pos, node) => {
-                  const request = getLightboxClickRequest(node);
-                  if (!request) return false;
-
-                  setLightboxRequest(request);
-                  return true;
-                },
-              }
-            : undefined
-        }
         onCreate={({ editor }) => {
           if (editor) {
             if (pageId) {
@@ -137,22 +103,12 @@ export default function ReadonlyPageEditor({
             }
             // @ts-ignore
             setReadOnlyEditor(editor);
-            setContentEditor(editor);
 
             handleScrollTo(editor);
             editorCreated.current = true;
           }
         }}
       ></EditorProvider>
-      {shareId && contentEditor && (
-        <LightboxView
-          editor={contentEditor}
-          open={!!lightboxRequest}
-          src={lightboxRequest?.src ?? ""}
-          type={lightboxRequest?.type ?? "image"}
-          onClose={() => setLightboxRequest(null)}
-        />
-      )}
       <div style={{ paddingBottom: "20vh" }}></div>
     </TransclusionLookupProvider>
   );

apps/client/src/features/editor/styles/core.css

@@ -315,3 +315,8 @@
     height: 100%;
   }
 }
+
+.comments-hidden .ProseMirror .comment-mark {
+  background: none;
+  border-bottom: none;
+}

apps/client/src/features/editor/styles/footnotes.css

@@ -1,26 +0,0 @@
-.ProseMirror sup a.footnote-ref {
-  color: var(--mantine-primary-color-filled);
-  text-decoration: none;
-  cursor: pointer;
-  font-weight: 600;
-}
-
-.ProseMirror sup:has(a.footnote-ref) {
-  padding: 0 1px;
-}
-
-.ProseMirror ol.footnotes {
-  margin-top: 2rem;
-  padding-top: 0.75rem;
-  font-size: 0.875rem;
-  color: var(--mantine-color-dimmed);
-  list-style-type: decimal;
-}
-
-.ProseMirror ol.footnotes:has(li) {
-  border-top: 1px solid var(--mantine-color-default-border);
-}
-
-.ProseMirror ol.footnotes li p {
-  margin: 0.15rem 0;
-}

apps/client/src/features/editor/styles/index.css

@@ -18,4 +18,3 @@
 @import "./columns.css";
 @import "./status.css";
 @import "./base-embed.css";
-@import "./footnotes.css";

apps/client/src/features/editor/styles/table.css

@@ -54,7 +54,7 @@
         var(--mantine-color-dark-5)
       );
       font-weight: bold;
-      text-align: start;
+      text-align: left;
     }
 
     .column-resize-handle {

apps/client/src/features/editor/title-editor.tsx

@@ -86,7 +86,6 @@ export function TitleEditor({
     },
     editable: editable,
     content: title,
-    textDirection: "auto",
     immediatelyRender: true,
     shouldRerenderOnTransaction: false,
     editorProps: {

apps/client/src/features/label/queries/label-query.ts

@@ -39,7 +39,6 @@ export function useWorkspaceLabelsQuery(query: string, enabled: boolean) {
     queryFn: () => getWorkspaceLabels({ type: "page", query, limit: 50 }),
     enabled,
     staleTime: 30 * 1000,
-    placeholderData: keepPreviousData
   });
 }
 

apps/client/src/features/page-history/atoms/history-atoms.ts

@@ -6,13 +6,4 @@ export const activeHistoryPrevIdAtom = atom<string>("");
 export const highlightChangesAtom = atom<boolean>(true);
 
 export type DiffCounts = { added: number; deleted: number; total: number };
-export const diffCountsAtom = atom<DiffCounts | null>(
+export const diffCountsAtom = atom<DiffCounts | null>(null);
-  null as DiffCounts | null,
-);
-
-export type ComparePair = { newerId: string; olderId: string };
-export const compareModeAtom = atom<boolean>(false);
-export const compareSelectionAtom = atom<string[]>([]);
-export const comparePairAtom = atom<ComparePair | null>(
-  null as ComparePair | null,
-);

apps/client/src/features/page-history/components/css/history.module.css

@@ -1,7 +1,7 @@
 .history {
-  display: flex;
+  display: block;
-  align-items: center;
   width: 100%;
+  padding: var(--mantine-spacing-md);
   color: light-dark(var(--mantine-color-black), var(--mantine-color-dark-0));
 
   @mixin hover {
@@ -12,28 +12,6 @@
   }
 }
 
-.historyButton {
-  flex: 1;
-  min-width: 0;
-  color: inherit;
-}
-
-.compareCheckbox {
-  padding-left: var(--mantine-spacing-xs);
-}
-
-.itemMenu {
-  opacity: 0;
-  margin-right: var(--mantine-spacing-xs);
-}
-
-.history:hover .itemMenu,
-.history:focus-within .itemMenu,
-.history.active .itemMenu,
-.itemMenu[aria-expanded="true"] {
-  opacity: 1;
-}
-
 .historyEditor {
   :global(.ProseMirror) {
     padding: 0 !important;
@@ -99,8 +77,3 @@
   flex: 1;
   padding: rem(16px) rem(40px);
 }
-
-.compareBanner {
-  border-bottom: rem(1px) solid
-    light-dark(var(--mantine-color-gray-3), var(--mantine-color-dark-4));
-}

apps/client/src/features/page-history/components/history-editor.tsx

@@ -31,7 +31,6 @@ export function HistoryEditor({
   const editor = useEditor({
     extensions: mainExtensions,
     editable: false,
-    textDirection: "auto",
   });
 
   useEffect(() => {
@@ -171,6 +170,7 @@ export function HistoryEditor({
     }
 
     const total = addedCount + deletedCount;
+    // @ts-ignore
     setDiffCounts({ added: addedCount, deleted: deletedCount, total });
 
     editor.setOptions({

apps/client/src/features/page-history/components/history-item.tsx

@@ -1,21 +1,10 @@
-import {
+import { Text, Group, UnstyledButton, Avatar, Tooltip } from "@mantine/core";
-  Text,
-  Group,
-  UnstyledButton,
-  Avatar,
-  Tooltip,
-  ActionIcon,
-  Checkbox,
-  Menu,
-} from "@mantine/core";
-import { IconDots } from "@tabler/icons-react";
 import { CustomAvatar } from "@/components/ui/custom-avatar.tsx";
 import { formattedDate } from "@/lib/time";
 import classes from "./css/history.module.css";
 import clsx from "clsx";
 import { IPageHistory } from "@/features/page-history/types/page.types";
 import { memo, useCallback } from "react";
-import { useTranslation } from "react-i18next";
 
 const MAX_VISIBLE_AVATARS = 5;
 
@@ -26,13 +15,6 @@ interface HistoryItemProps {
   onHover?: (id: string, index: number) => void;
   onHoverEnd?: () => void;
   isActive: boolean;
-  compareMode: boolean;
-  isChecked: boolean;
-  isCheckboxDisabled: boolean;
-  canCompare: boolean;
-  onToggleCompare: (id: string) => void;
-  onStartCompare: (id: string) => void;
-  onRestore?: (id: string, index: number) => void;
 }
 
 const HistoryItem = memo(function HistoryItem({
@@ -42,24 +24,10 @@ const HistoryItem = memo(function HistoryItem({
   onHover,
   onHoverEnd,
   isActive,
-  compareMode,
-  isChecked,
-  isCheckboxDisabled,
-  canCompare,
-  onToggleCompare,
-  onStartCompare,
-  onRestore,
 }: HistoryItemProps) {
-  const { t } = useTranslation();
-  const date = formattedDate(new Date(historyItem.createdAt));
-
   const handleClick = useCallback(() => {
-    if (compareMode) {
+    onSelect(historyItem.id, index);
-      onToggleCompare(historyItem.id);
+  }, [onSelect, historyItem.id, index]);
-    } else {
-      onSelect(historyItem.id, index);
-    }
-  }, [compareMode, onToggleCompare, onSelect, historyItem.id, index]);
 
   const handleMouseEnter = useCallback(() => {
     onHover?.(historyItem.id, index);
@@ -69,115 +37,63 @@ const HistoryItem = memo(function HistoryItem({
   const hasContributors = contributors && contributors.length > 0;
 
   return (
-    <div
+    <UnstyledButton
-      className={clsx(classes.history, { [classes.active]: isActive })}
+      p="xs"
+      onClick={handleClick}
       onMouseEnter={handleMouseEnter}
       onMouseLeave={onHoverEnd}
+      className={clsx(classes.history, { [classes.active]: isActive })}
     >
-      {compareMode && (
+      <Text size="sm">{formattedDate(new Date(historyItem.createdAt))}</Text>
-        <Checkbox
-          size="xs"
-          className={classes.compareCheckbox}
-          checked={isChecked}
-          disabled={isCheckboxDisabled}
-          onChange={() => onToggleCompare(historyItem.id)}
-          aria-label={t("Select version from {{date}}", { date })}
-        />
-      )}
 
-      <UnstyledButton
+      <Group gap={6} wrap="nowrap" mt={4}>
-        p="xs"
+        {hasContributors ? (
-        onClick={handleClick}
+          <>
-        className={classes.historyButton}
+            <Tooltip.Group openDelay={300} closeDelay={100}>
-      >
+              <Avatar.Group spacing={8}>
-        <Text size="sm">{date}</Text>
+                {contributors.slice(0, MAX_VISIBLE_AVATARS).map((contributor) => (
-
+                  <Tooltip key={contributor.id} label={contributor.name} withArrow>
-        <Group gap={6} wrap="nowrap" mt={4}>
+                    <CustomAvatar
-          {hasContributors ? (
+                      size="sm"
-            <>
+                      avatarUrl={contributor.avatarUrl}
-              <Tooltip.Group openDelay={300} closeDelay={100}>
+                      name={contributor.name}
-                <Avatar.Group spacing={8}>
+                    />
-                  {contributors
+                  </Tooltip>
-                    .slice(0, MAX_VISIBLE_AVATARS)
+                ))}
-                    .map((contributor) => (
+                {contributors.length > MAX_VISIBLE_AVATARS && (
-                      <Tooltip
+                  <Tooltip
-                        key={contributor.id}
+                    withArrow
-                        label={contributor.name}
+                    label={contributors.slice(MAX_VISIBLE_AVATARS).map((c) => (
-                        withArrow
+                      <div key={c.id}>{c.name}</div>
-                      >
-                        <CustomAvatar
-                          size="sm"
-                          avatarUrl={contributor.avatarUrl}
-                          name={contributor.name}
-                        />
-                      </Tooltip>
                     ))}
-                  {contributors.length > MAX_VISIBLE_AVATARS && (
+                  >
-                    <Tooltip
+                    <Avatar size="sm" color="gray">
-                      withArrow
+                      +{contributors.length - MAX_VISIBLE_AVATARS}
-                      label={contributors
+                    </Avatar>
-                        .slice(MAX_VISIBLE_AVATARS)
+                  </Tooltip>
-                        .map((c) => (
+                )}
-                          <div key={c.id}>{c.name}</div>
+              </Avatar.Group>
-                        ))}
+            </Tooltip.Group>
-                    >
+            {contributors.length === 1 && (
-                      <Avatar size="sm" color="gray">
-                        +{contributors.length - MAX_VISIBLE_AVATARS}
-                      </Avatar>
-                    </Tooltip>
-                  )}
-                </Avatar.Group>
-              </Tooltip.Group>
-              {contributors.length === 1 && (
-                <Text size="sm" c="dimmed" lineClamp={1}>
-                  {contributors[0].name}
-                </Text>
-              )}
-            </>
-          ) : (
-            <>
-              <CustomAvatar
-                size="sm"
-                avatarUrl={historyItem.lastUpdatedBy?.avatarUrl}
-                name={historyItem.lastUpdatedBy?.name}
-              />
               <Text size="sm" c="dimmed" lineClamp={1}>
-                {historyItem.lastUpdatedBy?.name}
+                {contributors[0].name}
               </Text>
-            </>
-          )}
-        </Group>
-      </UnstyledButton>
-
-      {!compareMode && (
-        <Menu shadow="md" width={180} position="bottom-end">
-          <Menu.Target>
-            <ActionIcon
-              variant="subtle"
-              color="gray"
-              className={classes.itemMenu}
-              aria-label={t("Version actions for {{date}}", { date })}
-              onClick={(e) => e.stopPropagation()}
-            >
-              <IconDots size={18} />
-            </ActionIcon>
-          </Menu.Target>
-          <Menu.Dropdown>
-            <Menu.Item
-              disabled={!canCompare}
-              onClick={() => onStartCompare(historyItem.id)}
-            >
-              {t("Compare")}
-            </Menu.Item>
-            {onRestore && (
-              <Menu.Item onClick={() => onRestore(historyItem.id, index)}>
-                {t("Restore")}
-              </Menu.Item>
             )}
-          </Menu.Dropdown>
+          </>
-        </Menu>
+        ) : (
-      )}
+          <>
-    </div>
+            <CustomAvatar
+              size="sm"
+              avatarUrl={historyItem.lastUpdatedBy?.avatarUrl}
+              name={historyItem.lastUpdatedBy?.name}
+            />
+            <Text size="sm" c="dimmed" lineClamp={1}>
+              {historyItem.lastUpdatedBy?.name}
+            </Text>
+          </>
+        )}
+      </Group>
+    </UnstyledButton>
   );
 });
 

apps/client/src/features/page-history/components/history-list.tsx

@@ -6,12 +6,8 @@ import HistoryItem from "@/features/page-history/components/history-item";
 import {
   activeHistoryIdAtom,
   activeHistoryPrevIdAtom,
-  compareModeAtom,
-  comparePairAtom,
-  compareSelectionAtom,
   historyAtoms,
 } from "@/features/page-history/atoms/history-atoms";
-import { resolveComparePair } from "@/features/page-history/utils/resolve-compare-pair";
 import { useAtom, useSetAtom } from "jotai";
 import { useCallback, useEffect, useMemo, useRef } from "react";
 import {
@@ -36,9 +32,6 @@ function HistoryList({ pageId }: Props) {
   const [activeHistoryId, setActiveHistoryId] = useAtom(activeHistoryIdAtom);
   const setActiveHistoryPrevId = useSetAtom(activeHistoryPrevIdAtom);
   const setHistoryModalOpen = useSetAtom(historyAtoms);
-  const [compareMode, setCompareMode] = useAtom(compareModeAtom);
-  const [compareSelection, setCompareSelection] = useAtom(compareSelectionAtom);
-  const setComparePair = useSetAtom(comparePairAtom);
 
   const {
     data: pageHistoryData,
@@ -86,58 +79,10 @@ function HistoryList({ pageId }: Props) {
 
   const handleSelect = useCallback(
     (id: string, index: number) => {
-      setComparePair(null);
       setActiveHistoryId(id);
       setActiveHistoryPrevId(historyItems[index + 1]?.id ?? "");
     },
-    [historyItems, setActiveHistoryId, setActiveHistoryPrevId, setComparePair],
+    [historyItems, setActiveHistoryId, setActiveHistoryPrevId],
-  );
-
-  const handleToggleCompare = useCallback(
-    (id: string) => {
-      setCompareSelection((prev) => {
-        if (prev.includes(id)) return prev.filter((item) => item !== id);
-        if (prev.length >= 2) return prev;
-        return [...prev, id];
-      });
-    },
-    [setCompareSelection],
-  );
-
-  const handleStartCompare = useCallback(
-    (id: string) => {
-      setComparePair(null);
-      setCompareMode(true);
-      setCompareSelection([id]);
-    },
-    [setComparePair, setCompareMode, setCompareSelection],
-  );
-
-  const handleCancelCompare = useCallback(() => {
-    setCompareMode(false);
-    setCompareSelection([]);
-  }, [setCompareMode, setCompareSelection]);
-
-  const handleConfirmCompare = useCallback(() => {
-    const pair = resolveComparePair(historyItems, compareSelection);
-    if (!pair) return;
-    setComparePair(pair);
-    setCompareMode(false);
-    setCompareSelection([]);
-  }, [
-    historyItems,
-    compareSelection,
-    setComparePair,
-    setCompareMode,
-    setCompareSelection,
-  ]);
-
-  const handleRestoreItem = useCallback(
-    (id: string, index: number) => {
-      handleSelect(id, index);
-      confirmRestore(id);
-    },
-    [handleSelect, confirmRestore],
   );
 
   useEffect(() => {
@@ -193,16 +138,6 @@ function HistoryList({ pageId }: Props) {
             onHover={handleHover}
             onHoverEnd={clearPrefetchTimeout}
             isActive={historyItem.id === activeHistoryId}
-            compareMode={compareMode}
-            isChecked={compareSelection.includes(historyItem.id)}
-            isCheckboxDisabled={
-              !compareSelection.includes(historyItem.id) &&
-              compareSelection.length >= 2
-            }
-            canCompare={historyItems.length >= 2}
-            onToggleCompare={handleToggleCompare}
-            onStartCompare={handleStartCompare}
-            onRestore={canRestore ? handleRestoreItem : undefined}
           />
         ))}
         {hasNextPage && <div ref={loadMoreRef} style={{ height: 1 }} />}
@@ -213,44 +148,22 @@ function HistoryList({ pageId }: Props) {
         )}
       </ScrollArea>
 
-      {compareMode ? (
+      {canRestore && (
         <>
           <Divider />
           <Group p="xs" wrap="nowrap">
             <Button
               variant="default"
               size="compact-md"
-              onClick={handleCancelCompare}
+              onClick={() => setHistoryModalOpen(false)}
             >
               {t("Cancel")}
             </Button>
-            <Button
+            <Button size="compact-md" onClick={confirmRestore}>
-              size="compact-md"
+              {t("Restore")}
-              disabled={compareSelection.length !== 2}
-              onClick={handleConfirmCompare}
-            >
-              {t("Compare")}
             </Button>
           </Group>
         </>
-      ) : (
-        canRestore && (
-          <>
-            <Divider />
-            <Group p="xs" wrap="nowrap">
-              <Button
-                variant="default"
-                size="compact-md"
-                onClick={() => setHistoryModalOpen(false)}
-              >
-                {t("Cancel")}
-              </Button>
-              <Button size="compact-md" onClick={() => confirmRestore()}>
-                {t("Restore")}
-              </Button>
-            </Group>
-          </>
-        )
       )}
     </div>
   );

apps/client/src/features/page-history/components/history-modal-body.tsx

@@ -1,6 +1,5 @@
 import {
   ActionIcon,
-  CloseButton,
   Group,
   Paper,
   ScrollArea,
@@ -13,20 +12,17 @@ import { useAtom, useAtomValue } from "jotai";
 import {
   activeHistoryIdAtom,
   activeHistoryPrevIdAtom,
-  comparePairAtom,
   diffCountsAtom,
   highlightChangesAtom,
 } from "@/features/page-history/atoms/history-atoms";
 import HistoryView from "@/features/page-history/components/history-view";
-import { useMemo, useRef } from "react";
+import { useRef } from "react";
 import { IconChevronUp, IconChevronDown } from "@tabler/icons-react";
 import { useTranslation } from "react-i18next";
 import {
   useDiffNavigation,
   useHistoryReset,
 } from "@/features/page-history/hooks";
-import { usePageHistoryListQuery } from "@/features/page-history/queries/page-history-query";
-import { formattedDate } from "@/lib/time";
 
 interface Props {
   pageId: string;
@@ -40,28 +36,6 @@ export default function HistoryModalBody({ pageId }: Props) {
   const activeHistoryPrevId = useAtomValue(activeHistoryPrevIdAtom);
   const [highlightChanges, setHighlightChanges] = useAtom(highlightChangesAtom);
   const diffCounts = useAtomValue(diffCountsAtom);
-  const [comparePair, setComparePair] = useAtom(comparePairAtom);
-
-  const { data: pageHistoryData } = usePageHistoryListQuery(pageId);
-  const historyItems = useMemo(
-    () => pageHistoryData?.pages.flatMap((page) => page.items) ?? [],
-    [pageHistoryData],
-  );
-
-  const compareLabel = useMemo(() => {
-    if (!comparePair) return null;
-    const newerItem = historyItems.find(
-      (item) => item.id === comparePair.newerId,
-    );
-    const olderItem = historyItems.find(
-      (item) => item.id === comparePair.olderId,
-    );
-    if (!newerItem || !olderItem) return null;
-    return t("Comparing {{newer}} and {{older}}", {
-      newer: formattedDate(new Date(newerItem.createdAt)),
-      older: formattedDate(new Date(olderItem.createdAt)),
-    });
-  }, [comparePair, historyItems, t]);
 
   useHistoryReset(pageId);
   const { currentChangeIndex, handlePrevChange, handleNextChange } =
@@ -76,25 +50,6 @@ export default function HistoryModalBody({ pageId }: Props) {
       </nav>
 
       <div style={{ position: "relative", flex: 1 }}>
-        {comparePair && (
-          <Group
-            justify="space-between"
-            wrap="nowrap"
-            px="md"
-            py={4}
-            className={classes.compareBanner}
-          >
-            <Text size="sm" fw={500} lineClamp={1}>
-              {compareLabel ?? t("Compare versions")}
-            </Text>
-            <CloseButton
-              size="sm"
-              aria-label={t("Exit compare")}
-              onClick={() => setComparePair(null)}
-            />
-          </Group>
-        )}
-
         <ScrollArea
           h={650}
           w="100%"
@@ -102,18 +57,11 @@ export default function HistoryModalBody({ pageId }: Props) {
           viewportRef={scrollViewportRef}
         >
           <div className={classes.sidebarRightSection}>
-            {comparePair ? (
+            {activeHistoryId && <HistoryView />}
-              <HistoryView
-                historyId={comparePair.newerId}
-                prevHistoryId={comparePair.olderId}
-              />
-            ) : (
-              activeHistoryId && <HistoryView />
-            )}
           </div>
         </ScrollArea>
 
-        {(comparePair || (activeHistoryId && activeHistoryPrevId)) && (
+        {activeHistoryId && activeHistoryPrevId && (
           <Paper
             shadow="md"
             radius="xl"

apps/client/src/features/page-history/components/history-modal-mobile.tsx

@@ -166,7 +166,7 @@ export default function HistoryModalMobile({ pageId, pageTitle }: Props) {
           <Button variant="default" onClick={() => setHistoryModalOpen(false)}>
             {t("Cancel")}
           </Button>
-          <Button onClick={() => confirmRestore()}>{t("Restore")}</Button>
+          <Button onClick={confirmRestore}>{t("Restore")}</Button>
         </Group>
       )}
 

apps/client/src/features/page-history/components/history-view.tsx

@@ -7,29 +7,21 @@ import {
   activeHistoryPrevIdAtom,
 } from "@/features/page-history/atoms/history-atoms";
 
-interface Props {
+function HistoryView() {
-  historyId?: string;
-  prevHistoryId?: string;
-}
-
-function HistoryView({ historyId, prevHistoryId }: Props) {
   const { t } = useTranslation();
-  const activeId = useAtomValue(activeHistoryIdAtom);
+  const historyId = useAtomValue(activeHistoryIdAtom);
-  const activePrevId = useAtomValue(activeHistoryPrevIdAtom);
+  const prevHistoryId = useAtomValue(activeHistoryPrevIdAtom);
-
-  const resolvedId = historyId ?? activeId;
-  const resolvedPrevId = prevHistoryId ?? activePrevId;
 
   const {
     data,
     isLoading: isLoadingCurrent,
     isError: isErrorCurrent,
-  } = usePageHistoryQuery(resolvedId);
+  } = usePageHistoryQuery(historyId);
   const {
     data: prevData,
     isLoading: isLoadingPrev,
     isError: isErrorPrev,
-  } = usePageHistoryQuery(resolvedPrevId);
+  } = usePageHistoryQuery(prevHistoryId);
 
   if (isLoadingCurrent || isLoadingPrev) {
     return <></>;

apps/client/src/features/page-history/hooks/use-history-reset.ts

@@ -3,45 +3,22 @@ import { useEffect } from "react";
 import {
   activeHistoryIdAtom,
   activeHistoryPrevIdAtom,
-  compareModeAtom,
-  comparePairAtom,
-  compareSelectionAtom,
   diffCountsAtom,
 } from "@/features/page-history/atoms/history-atoms";
 
 /**
  * Resets history state when pageId changes.
- * Clears active selection, diff counts, and compare state.
+ * Clears active selection and diff counts.
- * Compare state also resets on unmount so reopening the modal starts clean.
  */
 export function useHistoryReset(pageId: string) {
   const [, setActiveHistoryId] = useAtom(activeHistoryIdAtom);
   const [, setActiveHistoryPrevId] = useAtom(activeHistoryPrevIdAtom);
   const [, setDiffCounts] = useAtom(diffCountsAtom);
-  const [, setCompareMode] = useAtom(compareModeAtom);
-  const [, setCompareSelection] = useAtom(compareSelectionAtom);
-  const [, setComparePair] = useAtom(comparePairAtom);
 
   useEffect(() => {
-    const resetCompare = () => {
-      setCompareMode(false);
-      setCompareSelection([]);
-      setComparePair(null);
-    };
-
     setActiveHistoryId("");
     setActiveHistoryPrevId("");
+    // @ts-ignore
     setDiffCounts(null);
-    resetCompare();
+  }, [pageId, setActiveHistoryId, setActiveHistoryPrevId, setDiffCounts]);
-
-    return resetCompare;
-  }, [
-    pageId,
-    setActiveHistoryId,
-    setActiveHistoryPrevId,
-    setDiffCounts,
-    setCompareMode,
-    setCompareSelection,
-    setComparePair,
-  ]);
 }

apps/client/src/features/page-history/hooks/use-history-restore.tsx

@@ -1,4 +1,4 @@
-import { useAtomValue, useSetAtom } from "jotai";
+import { useAtom, useAtomValue, useSetAtom } from "jotai";
 import { useCallback } from "react";
 import { useTranslation } from "react-i18next";
 import { Text } from "@mantine/core";
@@ -9,8 +9,7 @@ import {
   activeHistoryIdAtom,
   historyAtoms,
 } from "@/features/page-history/atoms/history-atoms";
-import { fetchPageHistory } from "@/features/page-history/queries/page-history-query";
+import { usePageHistoryQuery } from "@/features/page-history/queries/page-history-query";
-import { IPageHistory } from "@/features/page-history/types/page.types";
 import {
   pageEditorAtom,
   titleEditorAtom,
@@ -26,6 +25,8 @@ export function useHistoryRestore() {
   const { t } = useTranslation();
 
   const activeHistoryId = useAtomValue(activeHistoryIdAtom);
+  const { data: activeHistoryData } = usePageHistoryQuery(activeHistoryId);
+
   const mainEditor = useAtomValue(pageEditorAtom);
   const mainEditorTitle = useAtomValue(titleEditorAtom);
   const setHistoryModalOpen = useSetAtom(historyAtoms);
@@ -39,66 +40,47 @@ export function useHistoryRestore() {
     SpaceCaslSubject.Page,
   );
 
-  const handleRestore = useCallback(
+  const handleRestore = useCallback(() => {
-    async (historyId: string) => {
+    if (!activeHistoryData) return;
-      let historyData: IPageHistory;
+    if (
-      try {
+      !mainEditor ||
-        historyData = await fetchPageHistory(historyId);
+      mainEditor.isDestroyed ||
-      } catch {
+      !mainEditorTitle ||
-        notifications.show({
+      mainEditorTitle.isDestroyed
-          message: t("Error fetching page data."),
+    ) {
-          color: "red",
+      return;
-        });
+    }
-        return;
-      }
 
-      if (
+    mainEditorTitle
-        !mainEditor ||
+      .chain()
-        mainEditor.isDestroyed ||
+      .clearContent()
-        !mainEditorTitle ||
+      .setContent(activeHistoryData.title, { emitUpdate: true })
-        mainEditorTitle.isDestroyed
+      .run();
-      ) {
-        return;
-      }
 
-      mainEditorTitle
+    mainEditor
-        .chain()
+      .chain()
-        .clearContent()
+      .clearContent()
-        .setContent(historyData.title, { emitUpdate: true })
+      .setContent(activeHistoryData.content)
-        .run();
+      .run();
 
-      mainEditor
+    setHistoryModalOpen(false);
-        .chain()
+    notifications.show({ message: t("Successfully restored") });
-        .clearContent()
+  }, [activeHistoryData, mainEditor, mainEditorTitle, setHistoryModalOpen, t]);
-        .setContent(historyData.content)
-        .run();
 
-      setHistoryModalOpen(false);
+  const confirmRestore = useCallback(() => {
-      notifications.show({ message: t("Successfully restored") });
+    modals.openConfirmModal({
-    },
+      title: t("Please confirm your action"),
-    [mainEditor, mainEditorTitle, setHistoryModalOpen, t],
+      children: (
-  );
+        <Text size="sm">
-
+          {t(
-  const confirmRestore = useCallback(
+            "Are you sure you want to restore this version? Any changes not versioned will be lost.",
-    (historyId?: string) => {
+          )}
-      const targetId = historyId ?? activeHistoryId;
+        </Text>
-      if (!targetId) return;
+      ),
-
+      labels: { confirm: t("Confirm"), cancel: t("Cancel") },
-      modals.openConfirmModal({
+      onConfirm: handleRestore,
-        title: t("Please confirm your action"),
+    });
-        children: (
+  }, [t, handleRestore]);
-          <Text size="sm">
-            {t(
-              "Are you sure you want to restore this version? Any changes not versioned will be lost.",
-            )}
-          </Text>
-        ),
-        labels: { confirm: t("Confirm"), cancel: t("Cancel") },
-        onConfirm: () => handleRestore(targetId),
-      });
-    },
-    [t, handleRestore, activeHistoryId],
-  );
 
   return { canRestore, confirmRestore };
 }

apps/client/src/features/page-history/queries/page-history-query.ts

@@ -23,14 +23,6 @@ export function prefetchPageHistory(historyId: string) {
   });
 }
 
-export function fetchPageHistory(historyId: string): Promise<IPageHistory> {
-  return queryClient.fetchQuery({
-    queryKey: ["page-history", historyId],
-    queryFn: () => getPageHistoryById(historyId),
-    staleTime: HISTORY_STALE_TIME,
-  });
-}
-
 export function usePageHistoryListQuery(
   pageId: string,
 ): UseInfiniteQueryResult<InfiniteData<IPagination<IPageHistory>, unknown>> {

apps/client/src/features/page-history/utils/resolve-compare-pair.test.ts

@@ -1,32 +0,0 @@
-import { describe, expect, it } from "vitest";
-import { resolveComparePair } from "./resolve-compare-pair";
-
-// list is newest-first, matching usePageHistoryListQuery order
-const items = [{ id: "v3" }, { id: "v2" }, { id: "v1" }];
-
-describe("resolveComparePair", () => {
-  it("orders newer before older regardless of selection order", () => {
-    expect(resolveComparePair(items, ["v1", "v3"])).toEqual({
-      newerId: "v3",
-      olderId: "v1",
-    });
-    expect(resolveComparePair(items, ["v3", "v1"])).toEqual({
-      newerId: "v3",
-      olderId: "v1",
-    });
-  });
-
-  it("returns null unless exactly two versions are selected", () => {
-    expect(resolveComparePair(items, [])).toBeNull();
-    expect(resolveComparePair(items, ["v1"])).toBeNull();
-    expect(resolveComparePair(items, ["v1", "v2", "v3"])).toBeNull();
-  });
-
-  it("returns null when a selected id is not in the list", () => {
-    expect(resolveComparePair(items, ["v1", "missing"])).toBeNull();
-  });
-
-  it("returns null when the same id is selected twice", () => {
-    expect(resolveComparePair(items, ["v2", "v2"])).toBeNull();
-  });
-});

apps/client/src/features/page-history/utils/resolve-compare-pair.ts

@@ -1,18 +0,0 @@
-import { ComparePair } from "@/features/page-history/atoms/history-atoms";
-
-/**
- * Resolves which of the two selected versions is newer using their position
- * in the history list (list is newest-first: lower index = newer).
- */
-export function resolveComparePair(
-  historyItems: { id: string }[],
-  selection: string[],
-): ComparePair | null {
-  if (selection.length !== 2) return null;
-  const indexA = historyItems.findIndex((item) => item.id === selection[0]);
-  const indexB = historyItems.findIndex((item) => item.id === selection[1]);
-  if (indexA === -1 || indexB === -1 || indexA === indexB) return null;
-  return indexA < indexB
-    ? { newerId: selection[0], olderId: selection[1] }
-    : { newerId: selection[1], olderId: selection[0] };
-}

apps/client/src/features/page/components/header/page-header-menu.tsx

@@ -11,7 +11,6 @@ import {
   IconList,
   IconMarkdown,
   IconMessage,
-  IconPaperclip,
   IconPrinter,
   IconStar,
   IconStarFilled,
@@ -43,7 +42,6 @@ import {
 import { formattedDate } from "@/lib/time.ts";
 import { PageEditModeToggle } from "@/features/user/components/page-state-pref.tsx";
 import MovePageModal from "@/features/page/components/move-page-modal.tsx";
-import PageAttachmentsModal from "@/features/attachments/components/page-attachments-modal.tsx";
 import { useTimeAgo } from "@/hooks/use-time-ago.tsx";
 import { PageShareModal } from "@/ee/page-permission";
 import {
@@ -60,6 +58,7 @@ import {
   useWatchPageMutation,
   useUnwatchPageMutation,
 } from "@/features/page/queries/watcher-query";
+import { useCanViewComments } from "@/features/comment/hooks/use-can-view-comments.ts";
 
 interface PageHeaderMenuProps {
   readOnly?: boolean;
@@ -67,6 +66,7 @@ interface PageHeaderMenuProps {
 export default function PageHeaderMenu({ readOnly }: PageHeaderMenuProps) {
   const { t } = useTranslation();
   const commentsTriggerProps = useAsideTriggerProps("comments");
+  const canViewComments = useCanViewComments();
   const tocTriggerProps = useAsideTriggerProps("toc");
   const { pageSlug } = useParams();
   const { data: page } = usePageQuery({
@@ -107,16 +107,18 @@ export default function PageHeaderMenu({ readOnly }: PageHeaderMenuProps) {
 
       <PageShareModal readOnly={readOnly} />
 
-      <Tooltip label={t("Comments")} openDelay={250} withArrow>
+      {canViewComments && (
-        <ActionIcon
+        <Tooltip label={t("Comments")} openDelay={250} withArrow>
-          variant="subtle"
+          <ActionIcon
-          color="dark"
+            variant="subtle"
-          aria-label={t("Comments")}
+            color="dark"
-          {...commentsTriggerProps}
+            aria-label={t("Comments")}
-        >
+            {...commentsTriggerProps}
-          <IconMessage size={20} stroke={2} />
+          >
-        </ActionIcon>
+            <IconMessage size={20} stroke={2} />
-      </Tooltip>
+          </ActionIcon>
+        </Tooltip>
+      )}
 
       {!page?.isBase && (
         <Tooltip label={t("Table of contents")} openDelay={250} withArrow>
@@ -159,10 +161,6 @@ function PageActionMenu({ readOnly }: PageActionMenuProps) {
     verificationOpened,
     { open: openVerificationModal, close: closeVerificationModal },
   ] = useDisclosure(false);
-  const [
-    attachmentsOpened,
-    { open: openAttachmentsModal, close: closeAttachmentsModal },
-  ] = useDisclosure(false);
   const [pageEditor] = useAtom(pageEditorAtom);
   const pageUpdatedAt = useTimeAgo(page?.updatedAt);
   const favoriteIds = useFavoriteIds("page", page?.spaceId);
@@ -299,15 +297,6 @@ function PageActionMenu({ readOnly }: PageActionMenuProps) {
             </Menu.Item>
           )}
 
-          {!page?.isBase && (
-            <Menu.Item
-              leftSection={<IconPaperclip size={16} />}
-              onClick={openAttachmentsModal}
-            >
-              {t("Attachments")}
-            </Menu.Item>
-          )}
-
           {!readOnly && !page?.isBase && (
             <PageVerificationMenuItem
               pageId={page?.id}
@@ -410,12 +399,6 @@ function PageActionMenu({ readOnly }: PageActionMenuProps) {
         opened={verificationOpened}
         onClose={closeVerificationModal}
       />
-
-      <PageAttachmentsModal
-        pageId={page.id}
-        open={attachmentsOpened}
-        onClose={closeAttachmentsModal}
-      />
     </>
   );
 }

apps/client/src/features/search/components/creator-filter-menu.tsx

@@ -1,152 +0,0 @@
-import { ReactNode, useMemo, useState } from "react";
-import { Divider, Group, Menu, ScrollArea, Text, TextInput } from "@mantine/core";
-import { useDebouncedValue } from "@mantine/hooks";
-import { IconCheck, IconSearch } from "@tabler/icons-react";
-import { useTranslation } from "react-i18next";
-import { useSearchSuggestionsQuery } from "@/features/search/queries/search-query";
-import { RadioMenuItem } from "@/components/ui/radio-menu-item";
-import { CustomAvatar } from "@/components/ui/custom-avatar.tsx";
-import { IUser } from "@/features/user/types/user.types.ts";
-import { useAtomValue } from "jotai";
-import { userAtom } from "@/features/user/atoms/current-user-atom.ts";
-
-type CreatorFilterMenuProps = {
-  value: string | null;
-  onChange: (user: IUser | null) => void;
-  children: ReactNode;
-  width?: number;
-  position?:
-    | "bottom-start"
-    | "bottom-end"
-    | "bottom"
-    | "top-start"
-    | "top-end"
-    | "top";
-  zIndex?: number;
-  opened?: boolean;
-  onOpenChange?: (opened: boolean) => void;
-};
-
-export function CreatorFilterMenu({
-  value,
-  onChange,
-  children,
-  width = 280,
-  position = "bottom-end",
-  zIndex,
-  opened,
-  onOpenChange,
-}: CreatorFilterMenuProps) {
-  const { t } = useTranslation();
-  const [searchQuery, setSearchQuery] = useState("");
-  const [debouncedQuery] = useDebouncedValue(searchQuery, 300);
-
-  const { data: suggestion, isLoading } = useSearchSuggestionsQuery({
-    query: debouncedQuery,
-    includeUsers: true,
-    includeGroups: false,
-    includePages: false,
-    preload: true,
-  });
-
-  const users: IUser[] = (suggestion?.users as IUser[]) ?? [];
-  const currentUser = useAtomValue(userAtom);
-
-  // pin the signed-in user on top so they never have to search themselves
-  const displayUsers = useMemo(() => {
-    if (!currentUser) return users;
-    const others = users.filter((user) => user.id !== currentUser.id);
-    const q = debouncedQuery.trim().toLowerCase();
-    const matchesQuery =
-      !q ||
-      currentUser.name?.toLowerCase().includes(q) ||
-      currentUser.email?.toLowerCase().includes(q);
-    return matchesQuery ? [currentUser as IUser, ...others] : users;
-  }, [users, currentUser, debouncedQuery]);
-
-  return (
-    <Menu
-      shadow="md"
-      width={width}
-      position={position}
-      zIndex={zIndex}
-      opened={opened}
-      onChange={onOpenChange}
-    >
-      <Menu.Target>{children}</Menu.Target>
-      <Menu.Dropdown>
-        <TextInput
-          placeholder={t("Find a user")}
-          data-autofocus
-          autoFocus
-          leftSection={<IconSearch size={16} />}
-          value={searchQuery}
-          onChange={(e) => setSearchQuery(e.target.value)}
-          size="sm"
-          variant="filled"
-          radius="sm"
-          styles={{ input: { marginBottom: 8 } }}
-        />
-
-        <ScrollArea.Autosize mah={280}>
-          <Menu.Item
-            component={RadioMenuItem}
-            aria-checked={!value}
-            onClick={() => onChange(null)}
-          >
-            <Group flex="1" gap="xs">
-              <div style={{ flex: 1 }}>
-                <Text size="sm" fw={500}>
-                  {t("Anyone")}
-                </Text>
-              </div>
-              {!value && <IconCheck size={20} aria-hidden />}
-            </Group>
-          </Menu.Item>
-
-          <Divider my="xs" />
-
-          {displayUsers.length === 0 && (
-            <Text size="xs" c="dimmed" px="xs" py="sm">
-              {isLoading ? t("Loading...") : t("No users found")}
-            </Text>
-          )}
-
-          {displayUsers.map((user) => (
-            <Menu.Item
-              key={user.id}
-              component={RadioMenuItem}
-              aria-checked={value === user.id}
-              onClick={() => onChange(user)}
-            >
-              <Group flex="1" gap="xs">
-                <CustomAvatar
-                  avatarUrl={user.avatarUrl}
-                  size={20}
-                  name={user.name}
-                />
-                <div style={{ flex: 1, minWidth: 0 }}>
-                  <Text size="sm" fw={500} truncate>
-                    {user.name}
-                    {user.id === currentUser?.id && (
-                      <Text span size="sm" c="dimmed" fw={400}>
-                        {" "}
-                        ({t("you")})
-                      </Text>
-                    )}
-                  </Text>
-                  {user.email && (
-                    <Text size="xs" c="dimmed" truncate>
-                      {user.email}
-                    </Text>
-                  )}
-                </div>
-                {value === user.id && <IconCheck size={20} aria-hidden />}
-              </Group>
-            </Menu.Item>
-          ))}
-        </ScrollArea.Autosize>
-      </Menu.Dropdown>
-    </Menu>
-  );
-}

apps/client/src/features/search/components/label-filter-menu.tsx

@@ -1,127 +0,0 @@
-import { ReactNode, useMemo, useState } from "react";
-import {
-  Group,
-  Menu,
-  ScrollArea,
-  Text,
-  TextInput,
-  useComputedColorScheme,
-} from "@mantine/core";
-import { useDebouncedValue } from "@mantine/hooks";
-import { IconCheck, IconSearch } from "@tabler/icons-react";
-import { useTranslation } from "react-i18next";
-import { useWorkspaceLabelsQuery } from "@/features/label/queries/label-query.ts";
-import { getLabelColor } from "@/features/label/utils/label-colors.ts";
-import { CheckboxMenuItem } from "@/components/ui/checkbox-menu-item";
-
-type LabelFilterMenuProps = {
-  value: string[];
-  onChange: (labelIds: string[]) => void;
-  children: ReactNode;
-  width?: number;
-  position?:
-    | "bottom-start"
-    | "bottom-end"
-    | "bottom"
-    | "top-start"
-    | "top-end"
-    | "top";
-  zIndex?: number;
-  opened?: boolean;
-  onOpenChange?: (opened: boolean) => void;
-};
-
-export function LabelFilterMenu({
-  value,
-  onChange,
-  children,
-  width = 280,
-  position = "bottom-end",
-  zIndex,
-  opened,
-  onOpenChange,
-}: LabelFilterMenuProps) {
-  const { t } = useTranslation();
-  const scheme = useComputedColorScheme("light");
-  const [searchQuery, setSearchQuery] = useState("");
-  const [debouncedQuery] = useDebouncedValue(searchQuery, 300);
-
-  const { data, isLoading } = useWorkspaceLabelsQuery(debouncedQuery, true);
-  const labels = data?.items ?? [];
-
-  const selectedSet = useMemo(() => new Set(value), [value]);
-
-  const toggleLabel = (labelId: string) => {
-    if (selectedSet.has(labelId)) {
-      onChange(value.filter((id) => id !== labelId));
-    } else {
-      onChange([...value, labelId]);
-    }
-  };
-
-  return (
-    <Menu
-      shadow="md"
-      width={width}
-      position={position}
-      zIndex={zIndex}
-      opened={opened}
-      onChange={onOpenChange}
-      closeOnItemClick={false}
-    >
-      <Menu.Target>{children}</Menu.Target>
-      <Menu.Dropdown>
-        <TextInput
-          placeholder={t("Find a label")}
-          data-autofocus
-          autoFocus
-          leftSection={<IconSearch size={16} />}
-          value={searchQuery}
-          onChange={(e) => setSearchQuery(e.target.value)}
-          size="sm"
-          variant="filled"
-          radius="sm"
-          styles={{ input: { marginBottom: 8 } }}
-        />
-
-        <ScrollArea.Autosize mah={280}>
-          {labels.length === 0 && (
-            <Text size="xs" c="dimmed" px="xs" py="sm">
-              {isLoading ? t("Loading...") : t("No labels found")}
-            </Text>
-          )}
-
-          {labels.map((label) => {
-            const isChecked = selectedSet.has(label.id);
-            const color = getLabelColor(label.name, scheme);
-            return (
-              <Menu.Item
-                key={label.id}
-                type="button"
-                component={CheckboxMenuItem}
-                aria-checked={isChecked}
-                onClick={() => toggleLabel(label.id)}
-              >
-                <Group flex="1" gap="xs">
-                  <span
-                    style={{
-                      width: 8,
-                      height: 8,
-                      borderRadius: "50%",
-                      background: color.dot,
-                      flexShrink: 0,
-                    }}
-                  />
-                  <Text size="sm" fw={500} style={{ flex: 1 }} truncate>
-                    {label.name}
-                  </Text>
-                  {isChecked && <IconCheck size={20} aria-hidden />}
-                </Group>
-              </Menu.Item>
-            );
-          })}
-        </ScrollArea.Autosize>
-      </Menu.Dropdown>
-    </Menu>
-  );
-}

apps/client/src/features/search/components/search-result-item.tsx

@@ -19,7 +19,6 @@ import {
 } from "@/features/search/types/search.types";
 import DOMPurify from "dompurify";
 import { useTranslation } from "react-i18next";
-import { timeAgo } from "@/lib/time.ts";
 
 interface SearchResultItemProps {
   result: IPageSearch | IAttachmentSearch;
@@ -27,14 +26,6 @@ interface SearchResultItemProps {
   showSpace?: boolean;
 }
 
-// Spotlight hardcodes tabIndex={-1} after spreading props; a ref wins and
-// React never writes -1 back because the prop value never changes
-const makeActionTabbable = (el: HTMLElement | null) => {
-  if (el) {
-    el.tabIndex = 0;
-  }
-};
-
 export function SearchResultItem({
   result,
   isAttachmentResult,
@@ -55,7 +46,6 @@ export function SearchResultItem({
     return (
       <Spotlight.Action
         component={Link}
-        ref={makeActionTabbable}
         //@ts-ignore
         to={buildPageUrl(
           attachmentResult.space.slug,
@@ -69,13 +59,8 @@ export function SearchResultItem({
             <IconFile size={16} />
           </Center>
 
-          <div style={{ flex: 1, minWidth: 0 }}>
+          <div style={{ flex: 1 }}>
-            <Group justify="space-between" wrap="nowrap" gap="xs">
+            <Text>{attachmentResult.fileName}</Text>
-              <Text truncate>{attachmentResult.fileName}</Text>
-              <Text size="xs" c="dimmed" style={{ flexShrink: 0 }}>
-                {timeAgo(attachmentResult.updatedAt)}
-              </Text>
-            </Group>
             <Text size="xs" opacity={0.6}>
               {attachmentResult.space.name} • {attachmentResult.page.title}
             </Text>
@@ -111,7 +96,6 @@ export function SearchResultItem({
     return (
       <Spotlight.Action
         component={Link}
-        ref={makeActionTabbable}
         //@ts-ignore
         to={buildPageUrl(
           pageResult.space.slug,
@@ -123,13 +107,8 @@ export function SearchResultItem({
         <Group wrap="nowrap" w="100%">
           <Center>{getPageIcon(pageResult?.icon)}</Center>
 
-          <div style={{ flex: 1, minWidth: 0 }}>
+          <div style={{ flex: 1 }}>
-            <Group justify="space-between" wrap="nowrap" gap="xs">
+            <Text>{pageResult.title}</Text>
-              <Text truncate>{pageResult.title || t("Untitled")}</Text>
-              <Text size="xs" c="dimmed" style={{ flexShrink: 0 }}>
-                {timeAgo(pageResult.updatedAt)}
-              </Text>
-            </Group>
 
             {showSpace && pageResult.space && (
               <Badge variant="light" size="xs" color="gray">

apps/client/src/features/search/components/search-spotlight-filters.module.css

@@ -17,10 +17,3 @@
     color: light-dark(var(--mantine-color-gray-7), var(--mantine-color-gray-6));
   }
 }
-
-.filterButtonActive {
-  color: var(--mantine-color-blue-light-color);
-  &:hover {
-    color: var(--mantine-color-blue-light-color);
-  }
-}

apps/client/src/features/search/components/search-spotlight-filters.tsx

@@ -1,5 +1,4 @@
 import React, { useState, useEffect } from "react";
-import cx from "clsx";
 import {
   Button,
   Menu,
@@ -12,24 +11,18 @@ import {
 import {
   IconChevronDown,
   IconBuilding,
-  IconPlus,
   IconFileDescription,
   IconCheck,
-  IconUser,
-  IconTag,
-  IconLetterCase,
 } from "@tabler/icons-react";
 import { useTranslation } from "react-i18next";
 import { useGetSpacesQuery } from "@/features/space/queries/space-query";
 import { SpaceFilterMenu } from "@/features/space/components/space-filter-menu";
-import { CreatorFilterMenu } from "@/features/search/components/creator-filter-menu";
 import { RadioMenuItem } from "@/components/ui/radio-menu-item";
 import { useHasFeature } from "@/ee/hooks/use-feature";
 import { Feature } from "@/ee/features";
 import classes from "./search-spotlight-filters.module.css";
 import { useAtom } from "jotai";
 import { workspaceAtom } from "@/features/user/atoms/current-user-atom.ts";
-import { LabelFilterMenu } from "./label-filter-menu";
 
 interface SearchSpotlightFiltersProps {
   onFiltersChange?: (filters: any) => void;
@@ -47,17 +40,9 @@ export function SearchSpotlightFilters({
   const { t } = useTranslation();
   const hasAttachmentIndexing = useHasFeature(Feature.ATTACHMENT_INDEXING);
   const [selectedSpaceId, setSelectedSpaceId] = useState<string | null>(
-    spaceId || null
+    spaceId || null,
   );
   const [contentType, setContentType] = useState<string | null>("page");
-  const [selectedCreatorId, setSelectedCreatorId] = useState<string | null>(null);
-  const [selectedCreatorName, setSelectedCreatorName] = useState<string | null>(
-    null
-  );
-  const [selectedLabelIds, setSelectedLabelIds] = useState<string[]>([]);
-  const [titleOnly, setTitleOnly] = useState(false);
-  const [openedFilter, setOpenedFilter] = useState<string | null>(null);
-  const [visibleFilters, setVisibleFilters] = useState<string[]>([]);
   const [workspace] = useAtom(workspaceAtom);
 
   const { data: spacesData } = useGetSpacesQuery({ limit: 100 });
@@ -65,6 +50,15 @@ export function SearchSpotlightFilters({
     ? spacesData?.items.find((space) => space.id === selectedSpaceId)
     : null;
 
+  useEffect(() => {
+    if (onFiltersChange) {
+      onFiltersChange({
+        spaceId: selectedSpaceId,
+        contentType,
+      });
+    }
+  }, []);
+
   const contentTypeOptions = [
     { value: "page", label: t("Pages") },
     {
@@ -74,70 +68,38 @@ export function SearchSpotlightFilters({
     },
   ];
 
-  useEffect(() => {
-    onFiltersChange?.({
-      spaceId: selectedSpaceId,
-      contentType,
-      creatorId: selectedCreatorId,
-      labelIds: selectedLabelIds,
-      titleOnly,
-    });
-  }, [
-    selectedSpaceId,
-    contentType,
-    selectedCreatorId,
-    selectedLabelIds,
-    titleOnly,
-    onFiltersChange,
-  ]);
-
   const handleSpaceSelect = (spaceId: string | null) => {
     setSelectedSpaceId(spaceId);
-  };
 
-  const handleCreatorSelect = (user: { id: string; name: string } | null) => {
+    if (onFiltersChange) {
-    setSelectedCreatorId(user?.id ?? null);
+      onFiltersChange({
-    setSelectedCreatorName(user?.name ?? null);
+        spaceId: spaceId,
-  };
+        contentType,
-
+      });
-  const handleLabelsSelect = (labelIds: string[]) => {
-    setSelectedLabelIds(labelIds);
-  };
-
-  const handleChangeContentType = (value: string) => {
-    setContentType(value);
-
-    if (value === "attachment") {
-      setSelectedLabelIds([]);
     }
   };
 
-  const onDemandFilters = [
+  const handleFilterChange = (filterType: string, value: any) => {
-    { key: "creator", label: t("Created by"), icon: IconUser, available: true },
+    let newSelectedSpaceId = selectedSpaceId;
-    {
+    let newContentType = contentType;
-      key: "labels",
-      label: t("Labels"),
-      icon: IconTag,
-      available: contentType !== "attachment",
-    },
-  ];
 
-  const isFilterVisible = (key: string) => {
+    switch (filterType) {
-    if (openedFilter === key) return true;
+      case "spaceId":
-    if (key === "creator") return !!selectedCreatorId;
+        newSelectedSpaceId = value;
-    if (key === "labels")
+        setSelectedSpaceId(value);
-      return contentType !== "attachment" && selectedLabelIds.length > 0;
+        break;
-    return false;
+      case "contentType":
-  };
+        newContentType = value;
+        setContentType(value);
+        break;
+    }
 
-  const orderedVisibleFilters = visibleFilters.filter(isFilterVisible);
+    if (onFiltersChange) {
-  const addableFilters = onDemandFilters.filter(
+      onFiltersChange({
-    (filter) => filter.available && !isFilterVisible(filter.key),
+        spaceId: newSelectedSpaceId,
-  );
+        contentType: newContentType,
-
+      });
-  const revealFilter = (key: string) => {
+    }
-    setVisibleFilters((prev) => [...prev.filter((k) => k !== key), key]);
-    setOpenedFilter(key);
   };
 
   return (
@@ -160,17 +122,8 @@ export function SearchSpotlightFilters({
             color="blue"
             labelPosition="left"
             styles={{
-              root: {
+              root: { display: "flex", alignItems: "center" },
-                display: "flex",
+              label: { paddingRight: "8px", fontSize: "13px", fontWeight: 500 },
-                alignItems: "center",
-                flexShrink: 0,
-              },
-              label: {
-                whiteSpace: "nowrap",
-                paddingRight: "8px",
-                fontSize: "13px",
-                fontWeight: 500,
-              },
             }}
           />
         </div>
@@ -228,7 +181,7 @@ export function SearchSpotlightFilters({
               onClick={() =>
                 !option.disabled &&
                 contentType !== option.value &&
-                handleChangeContentType(option.value)
+                handleFilterChange("contentType", option.value)
               }
               disabled={
                 option.disabled || (isAiMode && option.value === "attachment")
@@ -242,11 +195,13 @@ export function SearchSpotlightFilters({
                       {t("Enterprise")}
                     </Badge>
                   )}
-                  {!option.disabled && isAiMode && option.value === "attachment" && (
+                  {!option.disabled &&
-                    <Text size="xs" mt={4}>
+                    isAiMode &&
-                      {t("AI Answers not available for attachments")}
+                    option.value === "attachment" && (
-                    </Text>
+                      <Text size="xs" mt={4}>
-                  )}
+                        {t("AI Answers not available for attachments")}
+                      </Text>
+                    )}
                 </div>
                 {contentType === option.value && <IconCheck size={20} aria-hidden />}
               </Group>
@@ -254,126 +209,6 @@ export function SearchSpotlightFilters({
           ))}
         </Menu.Dropdown>
       </Menu>
-
-      {!isAiMode && (
-        <Button
-          variant={titleOnly ? "light" : "subtle"}
-          color={titleOnly ? "blue" : "gray"}
-          size="sm"
-          radius="xl"
-          leftSection={<IconLetterCase size={16} />}
-          className={cx(
-            classes.filterButton,
-            titleOnly && classes.filterButtonActive,
-          )}
-          fw={500}
-          aria-pressed={titleOnly}
-          onClick={() => setTitleOnly(!titleOnly)}
-        >
-          {t("Title only")}
-        </Button>
-      )}
-
-      {!isAiMode &&
-        orderedVisibleFilters.map((filterKey) => {
-        if (filterKey === "creator") {
-          return (
-            <CreatorFilterMenu
-              key="creator"
-              value={selectedCreatorId}
-              onChange={handleCreatorSelect}
-              position="bottom-start"
-              width={250}
-              zIndex={getDefaultZIndex("max")}
-              opened={openedFilter === "creator"}
-              onOpenChange={(opened) =>
-                setOpenedFilter(opened ? "creator" : null)
-              }
-            >
-              <Button
-                variant="subtle"
-                color="gray"
-                size="sm"
-                rightSection={<IconChevronDown size={14} />}
-                leftSection={<IconUser size={16} />}
-                className={classes.filterButton}
-                fw={500}
-              >
-                {selectedCreatorId
-                  ? `${t("Created by")}: ${selectedCreatorName || t("Unknown")}`
-                  : `${t("Created by")}: ${t("Anyone")}`}
-              </Button>
-            </CreatorFilterMenu>
-          );
-        }
-
-        if (filterKey === "labels") {
-          return (
-            <LabelFilterMenu
-              key="labels"
-              value={selectedLabelIds}
-              onChange={handleLabelsSelect}
-              position="bottom-start"
-              width={250}
-              zIndex={getDefaultZIndex("max")}
-              opened={openedFilter === "labels"}
-              onOpenChange={(opened) =>
-                setOpenedFilter(opened ? "labels" : null)
-              }
-            >
-              <Button
-                variant="subtle"
-                color="gray"
-                size="sm"
-                rightSection={<IconChevronDown size={14} />}
-                leftSection={<IconTag size={16} />}
-                className={classes.filterButton}
-                fw={500}
-              >
-                {selectedLabelIds.length > 0
-                  ? `${t("Labels")} (${selectedLabelIds.length})`
-                  : t("Labels")}
-              </Button>
-            </LabelFilterMenu>
-          );
-        }
-
-        return null;
-      })}
-
-      {!isAiMode && addableFilters.length > 0 && (
-        <Menu
-          shadow="md"
-          width={200}
-          position="bottom-end"
-          zIndex={getDefaultZIndex("max")}
-        >
-          <Menu.Target>
-            <Button
-              variant="subtle"
-              color="gray"
-              size="sm"
-              leftSection={<IconPlus size={16} />}
-              className={classes.filterButton}
-              style={{ marginLeft: "auto" }}
-              fw={500}
-            >
-              {t("Filter")}
-            </Button>
-          </Menu.Target>
-          <Menu.Dropdown>
-            {addableFilters.map((filter) => (
-              <Menu.Item
-                key={filter.key}
-                leftSection={<filter.icon size={16} />}
-                onClick={() => revealFilter(filter.key)}
-              >
-                {filter.label}
-              </Menu.Item>
-            ))}
-          </Menu.Dropdown>
-        </Menu>
-      )}
     </div>
   );
 }

apps/client/src/features/search/components/search-spotlight.tsx

@@ -1,7 +1,7 @@
 import { Spotlight } from "@mantine/spotlight";
 import { IconSearch, IconSparkles } from "@tabler/icons-react";
-import { Group, Button, VisuallyHidden, Text } from "@mantine/core";
+import { Group, Button, VisuallyHidden } from "@mantine/core";
-import React, { useState, useMemo, useEffect, useCallback } from "react";
+import React, { useState, useMemo, useEffect } from "react";
 import { useDebouncedValue } from "@mantine/hooks";
 import { useTranslation } from "react-i18next";
 import { notifications } from "@mantine/notifications";
@@ -13,16 +13,11 @@ import { SearchResultItem } from "./search-result-item.tsx";
 import { AiSearchResult } from "../../../ee/ai/components/ai-search-result.tsx";
 import { useHasFeature } from "@/ee/hooks/use-feature";
 import { Feature } from "@/ee/features";
-import { useAtomValue } from "jotai";
-import { workspaceAtom } from "@/features/user/atoms/current-user-atom.ts";
-import { hintVectorCache } from "@/ee/ai/services/ai-search-service.ts";
-import { getAiVectorDriver } from "@/lib/config.ts";
 
 interface SearchSpotlightProps {
   spaceId?: string;
 }
 export function SearchSpotlight({ spaceId }: SearchSpotlightProps) {
-  const workspace = useAtomValue(workspaceAtom);
   const { t } = useTranslation();
   const hasAiFeature = useHasFeature(Feature.AI);
   const hasAttachmentIndexing = useHasFeature(Feature.ATTACHMENT_INDEXING);
@@ -31,9 +26,6 @@ export function SearchSpotlight({ spaceId }: SearchSpotlightProps) {
   const [filters, setFilters] = useState<{
     spaceId?: string | null;
     contentType?: string;
-    creatorId?: string | null;
-    labelIds?: string[];
-    titleOnly?: boolean;
   }>({
     contentType: "page",
   });
@@ -51,25 +43,10 @@ export function SearchSpotlight({ spaceId }: SearchSpotlightProps) {
       params.spaceId = filters.spaceId;
     }
 
-    if (filters.creatorId) {
-      params.creatorId = filters.creatorId;
-    }
-
-    if (filters.labelIds?.length) {
-      params.labelIds = filters.labelIds;
-    }
-
-    if (filters.titleOnly) {
-      params.titleOnly = true;
-    }
-
     return params;
   }, [debouncedSearchQuery, filters]);
 
-  const {
+  const { data: searchResults, isLoading } = useUnifiedSearch(
-    data: searchResults,
-    isFetching,
-  } = useUnifiedSearch(
     searchParams,
     !isAiMode // Disable regular search when in AI mode
   );
@@ -106,11 +83,6 @@ export function SearchSpotlight({ spaceId }: SearchSpotlightProps) {
     }
   }, [aiSearchError, t]);
 
-  const isFilterBrowse =
-    (filters.labelIds?.length ?? 0) > 0 || !!filters.creatorId;
-  // while the debounce is pending the empty list is not a settled "no results"
-  const isQuerySettled = query === debouncedSearchQuery;
-
   // Determine result type for rendering
   const isAttachmentSearch =
     filters.contentType === "attachment" && hasAttachmentIndexing;
@@ -124,18 +96,9 @@ export function SearchSpotlight({ spaceId }: SearchSpotlightProps) {
     />
   ));
 
-  const handleSpotlightOpen = () => {
+  const handleFiltersChange = (newFilters: any) => {
-    if (
-      workspace?.settings?.ai?.search === true &&
-      getAiVectorDriver() === "turbopuffer"
-    ) {
-      hintVectorCache();
-    }
-  };
-
-  const handleFiltersChange = useCallback((newFilters: any) => {
     setFilters(newFilters);
-  }, [setFilters]);
+  };
 
   const handleAskClick = () => {
     setIsAiMode(!isAiMode);
@@ -152,7 +115,6 @@ export function SearchSpotlight({ spaceId }: SearchSpotlightProps) {
       <Spotlight.Root
         size="xl"
         maxHeight={600}
-        onSpotlightOpen={handleSpotlightOpen}
         store={searchSpotlightStore}
         query={query}
         onQueryChange={setQuery}
@@ -205,7 +167,7 @@ export function SearchSpotlight({ spaceId }: SearchSpotlightProps) {
             ? query.length > 0 && !isAiLoading && !aiSearchResult
               ? t("No answer available")
               : ""
-            : (query.length > 0 || isFilterBrowse) && !isFetching
+            : query.length > 0 && !isLoading
               ? resultItems.length === 0
                 ? t("No results found")
                 : t("{{count}} results found", { count: resultItems.length })
@@ -232,28 +194,15 @@ export function SearchSpotlight({ spaceId }: SearchSpotlightProps) {
             </>
           ) : (
             <>
-              {query.length === 0 && !isFilterBrowse && resultItems.length === 0 && (
+              {query.length === 0 && resultItems.length === 0 && (
                 <Spotlight.Empty>{t("Start typing to search...")}</Spotlight.Empty>
               )}
 
-              {(query.length > 0 || isFilterBrowse) &&
+              {query.length > 0 && !isLoading && resultItems.length === 0 && (
-                !isFetching &&
+                <Spotlight.Empty>{t("No results found...")}</Spotlight.Empty>
-                isQuerySettled &&
+              )}
-                resultItems.length === 0 && (
-                  <Spotlight.Empty>{t("No results found...")}</Spotlight.Empty>
-                )}
 
               {resultItems.length > 0 && <>{resultItems}</>}
-
-              {(query.length > 0 || isFilterBrowse) &&
-                isFetching &&
-                resultItems.length === 0 && (
-                <Spotlight.Empty>
-                  <Text size="sm" style={{ marginTop: 10 }}>
-                    {t("Searching...")}
-                  </Text>
-                </Spotlight.Empty>
-              )}
             </>
           )}
         </Spotlight.ActionsList>

apps/client/src/features/search/hooks/use-unified-search.ts

@@ -39,20 +39,6 @@ export function useUnifiedSearch(
         return await searchPage(backendParams);
       }
     },
-    enabled:
+    enabled: !!params.query && enabled,
-      (!!params.query ||
-        (params.labelIds?.length ?? 0) > 0 ||
-        !!params.creatorId) &&
-      enabled,
-    // keep previous results only within the same search type; page results
-    // rendered as attachments (or vice versa) crash on missing fields
-    placeholderData: (previousData, previousQuery) => {
-      if (!params.query && !params.labelIds?.length && !params.creatorId)
-        return undefined;
-      if (previousQuery && previousQuery.queryKey[1] !== searchType) {
-        return undefined;
-      }
-      return previousData;
-    },
   });
 }

apps/client/src/features/search/types/search.types.ts

@@ -36,9 +36,6 @@ export interface IPageSearchParams {
   query: string;
   spaceId?: string;
   shareId?: string;
-  creatorId?: string;
-  labelIds?: string[];
-  titleOnly?: boolean;
 }
 
 export interface IAttachmentSearch {

apps/client/src/features/space/components/sidebar/space-select.tsx

@@ -1,4 +1,4 @@
-import React, { useEffect, useRef, useState } from "react";
+import React, { useEffect, useState } from "react";
 import { useDebouncedValue } from "@mantine/hooks";
 import { Group, Select, SelectProps, Text } from "@mantine/core";
 import { useGetSpacesQuery } from "@/features/space/queries/space-query.ts";
@@ -14,7 +14,6 @@ interface SpaceSelectProps {
   width?: number;
   opened?: boolean;
   clearable?: boolean;
-  withinPortal?: boolean;
 }
 
 const renderSelectOption: SelectProps["renderOption"] = ({ option }) => (
@@ -42,7 +41,6 @@ export function SpaceSelect({
   width,
   opened,
   clearable,
-  withinPortal = true,
 }: SpaceSelectProps) {
   const { t } = useTranslation();
   const [searchValue, setSearchValue] = useState("");
@@ -52,13 +50,9 @@ export function SpaceSelect({
     limit: 50,
   });
   const [data, setData] = useState([]);
-  const fetchedSpaces = useRef(new Map<string, ISpace>());
 
   useEffect(() => {
     if (spaces) {
-      spaces.items.forEach((space: ISpace) =>
-        fetchedSpaces.current.set(space.slug, space),
-      );
       const spaceData = spaces?.items
         .filter((space: ISpace) => space.slug !== value)
         .map((space: ISpace) => {
@@ -89,19 +83,14 @@ export function SpaceSelect({
       onSearchChange={setSearchValue}
       clearable={clearable}
       variant="filled"
-      onChange={(slug) => {
+      onChange={(slug) =>
-        // options accumulate across fetches; resolve against everything
+        onChange(spaces.items?.find((item) => item.slug === slug))
-        // fetched, not just the latest query result
+      }
-        const space = slug && fetchedSpaces.current.get(slug);
-        if (space) {
-          onChange(space);
-        }
-      }}
       onClick={(e) => e.stopPropagation()}
       nothingFoundMessage={t("No space found")}
       limit={50}
       checkIconPosition="right"
-      comboboxProps={{ width, withinPortal, position: "bottom", keepMounted: false, dropdownPadding: 0 }}
+      comboboxProps={{ width, withinPortal: true, position: "bottom", keepMounted: false, dropdownPadding: 0 }}
       dropdownOpened={opened}
     />
   );

apps/client/src/features/space/components/sidebar/space-sidebar.tsx

@@ -54,9 +54,7 @@ import {
 import { mobileSidebarAtom } from "@/components/layouts/global/hooks/atoms/sidebar-atom.ts";
 import { useToggleSidebar } from "@/components/layouts/global/hooks/hooks/use-toggle-sidebar.ts";
 import { searchSpotlight } from "@/features/search/constants";
-const TemplatePickerModal = React.lazy(
+import TemplatePickerModal from "@/ee/template/components/template-picker-modal";
-  () => import("@/ee/template/components/template-picker-modal"),
-);
 import { useHasFeature } from "@/ee/hooks/use-feature";
 import { useUpgradeLabel } from "@/ee/hooks/use-upgrade-label";
 import { Feature } from "@/ee/features";
@@ -408,13 +406,11 @@ function SpaceMenu({
 
       {hasTemplates && templatePickerOpened && (
         <ErrorBoundary fallbackRender={() => null}>
-          <React.Suspense fallback={null}>
+          <TemplatePickerModal
-            <TemplatePickerModal
+            opened={templatePickerOpened}
-              opened={templatePickerOpened}
+            onClose={closeTemplatePicker}
-              onClose={closeTemplatePicker}
+            initialSpaceId={spaceId}
-              initialSpaceId={spaceId}
+          />
-            />
-          </React.Suspense>
         </ErrorBoundary>
       )}
     </>

apps/client/src/features/space/components/sidebar/switch-space.tsx

@@ -70,7 +70,6 @@ export function SwitchSpace({
           onChange={(space) => handleSelect(space.slug)}
           width={300}
           opened={true}
-          withinPortal={false}
         />
       </Popover.Dropdown>
     </Popover>

apps/client/src/features/space/components/space-security-settings.tsx

@@ -4,6 +4,7 @@ import { useTranslation } from "react-i18next";
 import { ISpace } from "@/features/space/types/space.types.ts";
 import SpacePublicSharingToggle from "@/ee/security/components/space-public-sharing-toggle.tsx";
 import SpaceViewerCommentsToggle from "@/ee/security/components/space-viewer-comments-toggle.tsx";
+import SpaceHideCommentsToggle from "@/ee/security/components/space-hide-comments-toggle.tsx";
 
 type SpaceSecuritySettingsProps = {
   space: ISpace;
@@ -29,6 +30,10 @@ export default function SpaceSecuritySettings({
       <Divider my="lg" />
 
       <SpaceViewerCommentsToggle space={space} />
+
+      <Divider my="lg" />
+
+      <SpaceHideCommentsToggle space={space} />
     </div>
   );
 }

apps/client/src/features/space/types/space.types.ts

@@ -11,6 +11,7 @@ export interface ISpaceSharingSettings {
 
 export interface ISpaceCommentsSettings {
   allowViewerComments?: boolean;
+  hideCommentsFromViewers?: boolean;
 }
 
 export interface ISpaceSettings {
@@ -36,6 +37,7 @@ export interface ISpace {
   // for updates
   disablePublicSharing?: boolean;
   allowViewerComments?: boolean;
+  hideCommentsFromViewers?: boolean;
 }
 
 interface IMembership {

apps/client/src/features/workspace/types/workspace.types.ts

@@ -25,8 +25,6 @@ export interface IWorkspace {
   generativeAi?: boolean;
   disablePublicSharing?: boolean;
   mcpEnabled?: boolean;
-  aiChatReadOnly?: boolean;
-  aiChatWorkspaceKnowledgeOnly?: boolean;
   trashRetentionDays?: number;
   restrictApiToAdmins?: boolean;
   allowMemberTemplates?: boolean;
@@ -53,8 +51,6 @@ export interface IWorkspaceAiSettings {
   generative?: boolean;
   mcp?: boolean;
   chat?: boolean;
-  chatReadOnly?: boolean;
-  chatWorkspaceKnowledgeOnly?: boolean;
 }
 
 export interface IWorkspaceSharingSettings {

apps/client/src/lib/config.ts

@@ -43,10 +43,6 @@ export function isCloud(): boolean {
   return castToBoolean(getConfigValue("CLOUD"));
 }
 
-export function getAiVectorDriver(): string {
-  return getConfigValue("AI_VECTOR_DRIVER");
-}
-
 export function getAvatarUrl(
   avatarUrl: string,
   type: AvatarIconType = AvatarIconType.AVATAR,

apps/client/src/styles/a11y-overrides.css

@@ -33,31 +33,3 @@
   color: var(--mantine-color-dimmed);
   -webkit-text-fill-color: var(--mantine-color-dimmed);
 }
-
-/* Spotlight's selected action ships as primary-filled blue with white text,
- * but our custom action children (gray badge, dimmed snippet, gray icons)
- * keep their light-surface colors on it and drop below WCAG AA 4.5:1
- * (WCAG 1.4.3). Use a gray selection one step above the gray-0/dark-6
- * hover instead - it matches the app's selection styling (we use no blue
- * fills) and keeps every child at its already-passing resting contrast.
- */
-.mantine-Spotlight-action[data-selected] {
-  background-color: light-dark(
-    var(--mantine-color-gray-1),
-    var(--mantine-color-dark-5)
-  );
-  color: var(--mantine-color-text);
-  --action-description-color: var(--mantine-color-dimmed);
-  --action-description-opacity: 1;
-}
-
-/* Result actions are tab stops (tabIndex restored via ref); give keyboard
- * focus the same gray treatment as arrow-key selection so both navigation
- * modes read identically (WCAG 2.4.7 focus visible).
- */
-.mantine-Spotlight-action:focus-visible {
-  background-color: light-dark(
-    var(--mantine-color-gray-1),
-    var(--mantine-color-dark-5)
-  );
-}

apps/client/vite.config.ts

@@ -16,7 +16,6 @@ export default defineConfig(({ mode }) => {
     BILLING_TRIAL_DAYS,
     POSTHOG_HOST,
     POSTHOG_KEY,
-    AI_VECTOR_DRIVER,
   } = loadEnv(mode, envPath, "");
 
   return {
@@ -32,7 +31,6 @@ export default defineConfig(({ mode }) => {
         BILLING_TRIAL_DAYS,
         POSTHOG_HOST,
         POSTHOG_KEY,
-        AI_VECTOR_DRIVER,
       },
       APP_VERSION: JSON.stringify(process.env.npm_package_version),
     },

apps/server/package.json

@@ -40,33 +40,32 @@
     "@clickhouse/client": "1.18.2",
     "@docmost/base-formula": "workspace:*",
     "@docmost/pdf-inspector": "1.9.6",
-    "@fastify/cookie": "11.1.2",
+    "@fastify/cookie": "11.0.2",
-    "@fastify/multipart": "10.1.1",
+    "@fastify/multipart": "10.0.0",
-    "@fastify/static": "10.1.3",
+    "@fastify/static": "10.1.2",
     "@keyv/redis": "5.1.6",
     "@langchain/core": "1.1.46",
     "@langchain/textsplitters": "1.0.1",
     "@modelcontextprotocol/sdk": "1.30.0",
     "@nest-lab/throttler-storage-redis": "1.2.0",
     "@nestjs-labs/nestjs-ioredis": "11.0.4",
-    "@nestjs/bullmq": "11.0.5",
+    "@nestjs/bullmq": "11.0.4",
     "@nestjs/cache-manager": "3.1.3",
-    "@nestjs/common": "11.2.1",
+    "@nestjs/common": "11.1.28",
     "@nestjs/config": "4.0.4",
-    "@nestjs/core": "11.2.1",
+    "@nestjs/core": "11.1.27",
     "@nestjs/event-emitter": "3.1.0",
     "@nestjs/jwt": "11.0.2",
     "@nestjs/mapped-types": "2.1.1",
     "@nestjs/passport": "11.0.5",
-    "@nestjs/platform-fastify": "11.2.1",
+    "@nestjs/platform-fastify": "11.1.28",
-    "@nestjs/platform-socket.io": "11.2.1",
+    "@nestjs/platform-socket.io": "11.1.28",
     "@nestjs/schedule": "6.1.3",
     "@nestjs/terminus": "11.1.1",
     "@nestjs/throttler": "6.5.0",
-    "@nestjs/websockets": "11.2.1",
+    "@nestjs/websockets": "11.1.28",
     "@node-saml/passport-saml": "5.1.0",
     "@socket.io/redis-adapter": "8.3.0",
-    "@turbopuffer/turbopuffer": "^2.8.0",
     "ai": "6.0.134",
     "ai-sdk-ollama": "3.8.1",
     "bcrypt": "6.0.0",
@@ -120,7 +119,7 @@
     "tmp-promise": "3.0.3",
     "typesense": "3.0.5",
     "undici": "7.29.0",
-    "ws": "8.21.3",
+    "ws": "8.21.0",
     "yauzl": "3.4.0",
     "zod": "4.3.6"
   },

apps/server/src/app.module.ts

@@ -22,13 +22,11 @@ import { TelemetryModule } from './integrations/telemetry/telemetry.module';
 import { RedisModule } from '@nestjs-labs/nestjs-ioredis';
 import { RedisConfigService } from './integrations/redis/redis-config.service';
 import { CacheModule } from '@nestjs/cache-manager';
-import KeyvRedis, { defaultReconnectStrategy } from '@keyv/redis';
+import KeyvRedis from '@keyv/redis';
-import { parseRedisUrl } from './common/helpers';
 import { LoggerModule } from './common/logger/logger.module';
 import { ClsModule } from 'nestjs-cls';
 import { NoopAuditModule } from './integrations/audit/audit.module';
 import { ThrottleModule } from './integrations/throttle/throttle.module';
-import { EncryptionModule } from './integrations/encryption/encryption.module';
 
 const enterpriseModules = [];
 try {
@@ -55,7 +53,6 @@ try {
     CoreModule,
     DatabaseModule,
     EnvironmentModule,
-    EncryptionModule,
     RedisModule.forRootAsync({
       useClass: RedisConfigService,
     }),
@@ -63,20 +60,10 @@ try {
       isGlobal: true,
       useFactory: async (environmentService: EnvironmentService) => {
         const redisUrl = environmentService.getRedisUrl();
-        const { family, tls } = parseRedisUrl(redisUrl);
 
         return {
           ttl: 5 * 1000,
-          stores: [
+          stores: [new KeyvRedis(redisUrl)],
-            new KeyvRedis({
-              url: redisUrl,
-              socket: {
-                family,
-                reconnectStrategy: defaultReconnectStrategy,
-                ...tls,
-              },
-            }),
-          ],
         };
       },
       inject: [EnvironmentService],

apps/server/src/collaboration/collaboration.gateway.ts

@@ -66,7 +66,6 @@ export class CollaborationGateway {
           password: this.redisConfig.password,
           db: this.redisConfig.db,
           family: this.redisConfig.family,
-          tls: this.redisConfig.tls,
           retryStrategy: createRetryStrategy(),
         }),
         serverId: `collab-${os?.hostname()}-${nanoid(10)}`,

apps/server/src/collaboration/collaboration.util.ts

@@ -1,5 +1,4 @@
 import { StarterKit } from '@tiptap/starter-kit';
-import { Document } from '@tiptap/extension-document';
 import { TextAlign } from '@tiptap/extension-text-align';
 import { Superscript } from '@tiptap/extension-superscript';
 import SubScript from '@tiptap/extension-subscript';
@@ -46,18 +45,9 @@ import {
   TransclusionSource,
   TransclusionReference,
   BaseEmbed,
-  Footnotes,
-  Footnote,
-  FootnoteReference,
 } from '@docmost/editor-ext';
-import {
+import { generateText, getSchema, JSONContent } from '@tiptap/core';
-  extensions as coreExtensions,
-  generateText,
-  getSchema,
-  JSONContent,
-} from '@tiptap/core';
 import { generateHTML, generateJSON } from '../common/helpers/prosemirror/html';
-import { collapseBlankLines } from '../common/helpers';
 // @tiptap/html library works best for generating prosemirror json state but not HTML
 // see: https://github.com/ueberdosis/tiptap/issues/5352
 // see:https://github.com/ueberdosis/tiptap/issues/4089
@@ -67,17 +57,12 @@ import * as Y from 'yjs';
 import { Logger } from '@nestjs/common';
 
 export const tiptapExtensions = [
-  coreExtensions.TextDirection.configure({ direction: 'auto' }),
   StarterKit.configure({
-    document: false,
     codeBlock: false,
     link: false,
     trailingNode: false,
     heading: false,
   }),
-  Document.extend({
-    content: 'block+ footnotes?',
-  }),
   Heading,
   UniqueID.configure({
     types: ['heading', 'paragraph', 'transclusionSource'],
@@ -125,10 +110,7 @@ export const tiptapExtensions = [
   Status,
   TransclusionSource,
   TransclusionReference,
-  BaseEmbed,
+  BaseEmbed
-  Footnotes,
-  Footnote,
-  FootnoteReference,
 ] as any;
 
 export function jsonToHtml(tiptapJson: any) {
@@ -147,7 +129,7 @@ export function htmlToJson(html: string) {
 }
 
 export function jsonToText(tiptapJson: JSONContent) {
-  return collapseBlankLines(generateText(tiptapJson, tiptapExtensions));
+  return generateText(tiptapJson, tiptapExtensions);
 }
 
 export function jsonToNode(tiptapJson: JSONContent) {

apps/server/src/common/features.ts

@@ -18,12 +18,12 @@ export const Feature = {
   RETENTION: 'retention',
   SHARING_CONTROLS: 'sharing:controls',
   VIEWER_COMMENTS: 'comment:viewer',
+  HIDE_COMMENTS: 'comment:hide',
   TEMPLATES: 'templates',
   PDF_EXPORT: 'export:pdf',
   PERSONAL_SPACES: 'spaces:personal',
   DOCX_EXPORT: 'export:docx',
   BASES: 'bases',
-  AI_CONTROLS: 'ai:controls',
 } as const;
 
 export type FeatureKey = (typeof Feature)[keyof typeof Feature];

apps/server/src/common/helpers/index.ts

@@ -1,5 +1,4 @@
 export * from './utils';
-export * from './text.utils';
 export * from './nanoid.utils';
 export * from './file.helper';
 export * from './constants';

apps/server/src/common/helpers/text.utils.spec.ts

@@ -1,14 +0,0 @@
-import { collapseBlankLines } from './text.utils';
-
-describe('collapseBlankLines', () => {
-  it.each([
-    ['a\n\n\n\nb', 'a\n\nb'],
-    ['a\n\nb', 'a\n\nb'],
-    ['a\nb', 'a\nb'],
-    ['\n\n\n\na\n\n\n', '\n\na\n\n'],
-    ['no newlines', 'no newlines'],
-    ['', ''],
-  ])('collapses %j to %j', (input, expected) => {
-    expect(collapseBlankLines(input)).toBe(expected);
-  });
-});

apps/server/src/common/helpers/text.utils.ts

@@ -1,3 +0,0 @@
-export function collapseBlankLines(text: string): string {
-  return text.replace(/\n{2,}/g, '\n\n');
-}