convert only bare links to embeds

Dockerfile

@@ -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

apps/client/package.json

@@ -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",
@@ -699,7 +698,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",
@@ -1303,13 +1302,5 @@
   "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}}",
+  "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/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();
@@ -282,19 +270,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 +429,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/features.ts

@@ -22,5 +22,4 @@ export const Feature = {
   PERSONAL_SPACES: 'spaces:personal',
   DOCX_EXPORT: 'export:docx',
   BASES: 'bases',
-  AI_CONTROLS: 'ai:controls',
 } as const;

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"
@@ -397,8 +399,9 @@ export const ColorSelector: FC<ColorSelectorProps> = ({
                 if (e.key === "ArrowUp") {
                   e.preventDefault();
                   const lastRowStart =
-                  Math.floor((HIGHLIGHT_COLORS.length - 1) / COLOR_GRID_COLS) *
+                    Math.floor(
-                  COLOR_GRID_COLS;
+                      (HIGHLIGHT_COLORS.length - 1) / COLOR_GRID_COLS,
+                    ) * COLOR_GRID_COLS;
                   focusSwatch("highlight", lastRowStart);
                 }
               }}

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/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/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/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/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,
@@ -188,7 +184,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(
@@ -310,22 +305,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) {
@@ -407,7 +386,6 @@ function CollabPageEditor({
     setActiveCommentId(null);
     setShowCommentPopup(false);
     setAsideState({ tab: "", isAsideOpen: false });
-    setLightboxRequest(null);
   }, [pageId]);
 
   const isSynced = isLocalSynced && isRemoteSynced;
@@ -481,15 +459,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 />

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",
@@ -116,19 +97,6 @@ export default function ReadonlyPageEditor({
         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 +105,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/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/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,7 +195,9 @@ export function SearchSpotlightFilters({
                       {t("Enterprise")}
                     </Badge>
                   )}
-                  {!option.disabled && isAiMode && option.value === "attachment" && (
+                  {!option.disabled &&
+                    isAiMode &&
+                    option.value === "attachment" && (
                       <Text size="xs" mt={4}>
                         {t("AI Answers not available for attachments")}
                       </Text>
@@ -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";
@@ -31,9 +31,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 +48,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 +88,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;
@@ -133,9 +110,9 @@ export function SearchSpotlight({ spaceId }: SearchSpotlightProps) {
     }
   };
 
-  const handleFiltersChange = useCallback((newFilters: any) => {
+  const handleFiltersChange = (newFilters: any) => {
     setFilters(newFilters);
-  }, [setFilters]);
+  };
 
   const handleAskClick = () => {
     setIsAiMode(!isAiMode);
@@ -205,7 +182,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 +209,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 &&
-                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/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/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/server/src/common/features.ts

@@ -23,7 +23,6 @@ export const Feature = {
   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/core/attachment/services/attachment.service.ts

@@ -116,8 +116,8 @@ export class AttachmentService {
         });
       }
 
-      // Only index PDF, DOCX and TXT files
+      // Only index PDFs and DOCX files
-      if (['.pdf', '.docx', '.txt'].includes(attachment.fileExt.toLowerCase())) {
+      if (['.pdf', '.docx'].includes(attachment.fileExt.toLowerCase())) {
         await this.attachmentQueue.add(
           QueueJob.ATTACHMENT_INDEX_CONTENT,
           {

apps/server/src/core/comment/comment.controller.ts

@@ -54,7 +54,7 @@ export class CommentController {
     @AuthWorkspace() workspace: Workspace,
   ) {
     const page = await this.pageRepo.findById(createCommentDto.pageId);
-    if (!page || page.workspaceId !== workspace.id || page.deletedAt) {
+    if (!page || page.deletedAt) {
       throw new NotFoundException('Page not found');
     }
 
@@ -89,10 +89,9 @@ export class CommentController {
     @Body()
     pagination: PaginationOptions,
     @AuthUser() user: User,
-    @AuthWorkspace() workspace: Workspace,
   ) {
     const page = await this.pageRepo.findById(input.pageId);
-    if (!page || page.workspaceId !== workspace.id || page.deletedAt) {
+    if (!page) {
       throw new NotFoundException('Page not found');
     }
 
@@ -103,18 +102,14 @@ export class CommentController {
 
   @HttpCode(HttpStatus.OK)
   @Post('info')
-  async findOne(
+  async findOne(@Body() input: CommentIdDto, @AuthUser() user: User) {
-    @Body() input: CommentIdDto,
-    @AuthUser() user: User,
-    @AuthWorkspace() workspace: Workspace,
-  ) {
     const comment = await this.commentRepo.findById(input.commentId);
     if (!comment) {
       throw new NotFoundException('Comment not found');
     }
 
     const page = await this.pageRepo.findById(comment.pageId);
-    if (!page || page.workspaceId !== workspace.id || page.deletedAt) {
+    if (!page) {
       throw new NotFoundException('Page not found');
     }
 
@@ -135,7 +130,7 @@ export class CommentController {
     }
 
     const page = await this.pageRepo.findById(comment.pageId);
-    if (!page || page.workspaceId !== workspace.id || page.deletedAt) {
+    if (!page) {
       throw new NotFoundException('Page not found');
     }
 
@@ -153,7 +148,7 @@ export class CommentController {
     }
 
     const page = await this.pageRepo.findById(comment.pageId);
-    if (!page || page.workspaceId !== workspace.id || page.deletedAt) {
+    if (!page) {
       throw new NotFoundException('Page not found');
     }
 

apps/server/src/core/label/label.service.ts

@@ -7,15 +7,12 @@ import { executeTx } from '@docmost/db/utils';
 import { PaginationOptions } from '@docmost/db/pagination/pagination-options';
 import { PagePermissionRepo } from '@docmost/db/repos/page/page-permission.repo';
 import { normalizeLabelName } from './utils';
-import { EventEmitter2 } from "@nestjs/event-emitter";
-import { EventName } from "src/common/events/event.contants";
 
 @Injectable()
 export class LabelService {
   constructor(
     private readonly labelRepo: LabelRepo,
     private readonly pagePermissionRepo: PagePermissionRepo,
-    private readonly eventEmitter: EventEmitter2,
     @InjectKysely() private readonly db: KyselyDB,
   ) {}
 
@@ -37,12 +34,6 @@ export class LabelService {
         attached.push(label);
       }
     });
-
-    this.eventEmitter.emit(EventName.PAGE_UPDATED, {
-      pageIds: [pageId],
-      workspaceId: workspaceId,
-    });
-    
     return attached;
   }
 
@@ -73,11 +64,6 @@ export class LabelService {
         await this.labelRepo.deleteLabel(labelId, workspaceId, trx);
       }
     });
-
-    this.eventEmitter.emit(EventName.PAGE_UPDATED, {
-      pageIds: [pageId],
-      workspaceId: workspaceId,
-    });
   }
 
   async getPageLabels(pageId: string, pagination: PaginationOptions) {

apps/server/src/core/search/dto/search.dto.ts

@@ -1,5 +1,4 @@
 import {
-  IsArray,
   IsBoolean,
   IsNotEmpty,
   IsNumber,
@@ -9,9 +8,9 @@ import {
 } from 'class-validator';
 
 export class SearchDTO {
-  @IsOptional()
+  @IsNotEmpty()
   @IsString()
-  query?: string;
+  query: string;
 
   @IsOptional()
   @IsUUID()
@@ -25,15 +24,6 @@ export class SearchDTO {
   @IsUUID()
   creatorId?: string;
 
-  @IsOptional()
-  @IsArray()
-  @IsUUID('all', { each: true })
-  labelIds?: string[];
-
-  @IsOptional()
-  @IsBoolean()
-  titleOnly?: boolean;
-
   @IsOptional()
   @IsNumber()
   limit?: number;

apps/server/src/core/search/search.service.ts

@@ -29,36 +29,12 @@ export class SearchService {
       workspaceId: string;
     },
   ): Promise<{ items: SearchResponseDto[] }> {
-    const query = searchParams.query?.trim() ?? '';
+    const { query } = searchParams;
-    const labelIds = [...new Set(searchParams.labelIds ?? [])];
-    // selected filters (labels, creator) are browsable without a query
-    const browseByFilters =
-      query.length < 1 &&
-      (labelIds.length > 0 || Boolean(searchParams.creatorId));
 
-    if (query.length < 1 && !browseByFilters) {
+    if (query.length < 1) {
       return { items: [] };
     }
-    const searchQuery = tsquery(query + '*');
+    const searchQuery = tsquery(query.trim() + '*');
-    const titleOnly = searchParams.titleOnly === true;
-    const titleQuery = query;
-    // escape LIKE wildcards; ranking keeps the raw query
-    const titleLikeQuery = query.replace(/[\\%_]/g, '\\$&');
-
-    const rankColumn = browseByFilters
-      ? sql<number>`0`.as('rank')
-      : titleOnly
-        ? sql<number>`word_similarity(lower(f_unaccent(${titleQuery})), lower(f_unaccent(pages.title)))`.as(
-            'rank',
-          )
-        : sql<number>`ts_rank(tsv, to_tsquery('english', f_unaccent(${searchQuery})))`.as(
-            'rank',
-          );
-    const highlightColumn = browseByFilters || titleOnly
-      ? sql<string>`''`.as('highlight')
-      : sql<string>`ts_headline('english', text_content, to_tsquery('english', f_unaccent(${searchQuery})),'MinWords=9, MaxWords=10, MaxFragments=3')`.as(
-          'highlight',
-        );
 
     let queryResults = this.db
       .selectFrom('pages')
@@ -71,41 +47,23 @@ export class SearchService {
         'creatorId',
         'createdAt',
         'updatedAt',
-        rankColumn,
+        sql<number>`ts_rank(tsv, to_tsquery('english', f_unaccent(${searchQuery})))`.as(
-        highlightColumn,
+          'rank',
+        ),
+        sql<string>`ts_headline('english', text_content, to_tsquery('english', f_unaccent(${searchQuery})),'MinWords=9, MaxWords=10, MaxFragments=3')`.as(
+          'highlight',
+        ),
       ])
-      .$if(!browseByFilters && !titleOnly, (qb) =>
+      .where(
-        qb.where(
         'tsv',
         '@@',
         sql<string>`to_tsquery('english', f_unaccent(${searchQuery}))`,
-        ),
-      )
-      .$if(!browseByFilters && titleOnly, (qb) =>
-        qb.where((eb) =>
-          eb(
-            sql`lower(f_unaccent(pages.title))`,
-            'like',
-            sql`lower(f_unaccent(${`%${titleLikeQuery}%`}))`,
-          ),
-        ),
       )
       .$if(Boolean(searchParams.creatorId), (qb) =>
         qb.where('creatorId', '=', searchParams.creatorId),
       )
-      .$if(labelIds?.length > 0, (qb) =>
-        qb.where(
-          'id',
-          'in',
-          this.db
-            .selectFrom('pageLabels')
-            .select('pageId')
-            .where('labelId', 'in', labelIds),
-        ),
-      )
       .where('deletedAt', 'is', null)
-      .$if(browseByFilters, (qb) => qb.orderBy('updatedAt', 'desc'))
+      .orderBy('rank', 'desc')
-      .$if(!browseByFilters, (qb) => qb.orderBy('rank', 'desc'))
       .limit(searchParams.limit || 25)
       .offset(searchParams.offset || 0);
 
@@ -113,7 +71,8 @@ export class SearchService {
       queryResults = queryResults.select((eb) => this.pageRepo.withSpace(eb));
     }
 
-    if (searchParams.spaceId && opts.userId) {
+    if (searchParams.spaceId) {
+      // search by spaceId
       queryResults = queryResults.where('spaceId', '=', searchParams.spaceId);
     } else if (opts.userId && !searchParams.spaceId) {
       // only search spaces the user is a member of

apps/server/src/core/share/share.service.ts

@@ -46,9 +46,8 @@ export class ShareService {
       throw new NotFoundException('Share not found');
     }
 
-    const isRestricted = await this.pagePermissionRepo.hasRestrictedAncestor(
+    const isRestricted =
-      share.pageId,
+      await this.pagePermissionRepo.hasRestrictedAncestor(share.pageId);
-    );
     if (isRestricted) {
       throw new NotFoundException('Share not found');
     }
@@ -111,9 +110,6 @@ export class ShareService {
   }
 
   async getSharedPage(dto: ShareInfoDto, workspaceId: string) {
-    //TODO: we should resolve the page from the share id
-    if (!dto.pageId) throw new NotFoundException('Shared page not found');
-
     const share = await this.getShareForPage(dto.pageId, workspaceId);
 
     if (!share) {
@@ -130,9 +126,8 @@ export class ShareService {
     }
 
     // Block access to restricted pages
-    const isRestricted = await this.pagePermissionRepo.hasRestrictedAncestor(
+    const isRestricted =
-      page.id,
+      await this.pagePermissionRepo.hasRestrictedAncestor(page.id);
-    );
     if (isRestricted) {
       throw new NotFoundException('Shared page not found');
     }

apps/server/src/core/workspace/dto/update-workspace.dto.ts

@@ -68,12 +68,4 @@ export class UpdateWorkspaceDto extends PartialType(CreateWorkspaceDto) {
   @IsString()
   @IsIn(['read', 'edit'])
   defaultPageEditMode: string;
-
-  @IsOptional()
-  @IsBoolean()
-  aiChatReadOnly: boolean;
-
-  @IsOptional()
-  @IsBoolean()
-  aiChatWorkspaceKnowledgeOnly: boolean;
 }

apps/server/src/core/workspace/services/workspace.service.ts

@@ -334,9 +334,7 @@ export class WorkspaceService {
       typeof updateWorkspaceDto.restrictApiToAdmins !== 'undefined' ||
       typeof updateWorkspaceDto.allowMemberTemplates !== 'undefined' ||
       typeof updateWorkspaceDto.isScimEnabled !== 'undefined' ||
-      typeof updateWorkspaceDto.allowPersonalSpaces !== 'undefined' ||
+      typeof updateWorkspaceDto.allowPersonalSpaces !== 'undefined'
-      typeof updateWorkspaceDto.aiChatReadOnly !== 'undefined' ||
-      typeof updateWorkspaceDto.aiChatWorkspaceKnowledgeOnly !== 'undefined'
     ) {
       const ws = await this.db
         .selectFrom('workspaces')
@@ -376,21 +374,6 @@ export class WorkspaceService {
         }
       }
 
-      if (
-        typeof updateWorkspaceDto.aiChatReadOnly !== 'undefined' ||
-        typeof updateWorkspaceDto.aiChatWorkspaceKnowledgeOnly !== 'undefined'
-      ) {
-        if (
-          !this.licenseCheckService.hasFeature(
-            ws.licenseKey,
-            Feature.AI_CONTROLS,
-            ws.plan,
-          )
-        ) {
-          throw new ForbiddenException('This feature requires a valid license');
-        }
-      }
-
       if (
         typeof updateWorkspaceDto.disablePublicSharing !== 'undefined' ||
         typeof updateWorkspaceDto.trashRetentionDays !== 'undefined' ||
@@ -533,34 +516,6 @@ export class WorkspaceService {
         );
       }
 
-      if (typeof updateWorkspaceDto.aiChatReadOnly !== 'undefined') {
-        const prev = settingsBefore?.ai?.chatReadOnly ?? false;
-        if (prev !== updateWorkspaceDto.aiChatReadOnly) {
-          before.aiChatReadOnly = prev;
-          after.aiChatReadOnly = updateWorkspaceDto.aiChatReadOnly;
-        }
-        await this.workspaceRepo.updateAiSettings(
-          workspaceId,
-          'chatReadOnly',
-          updateWorkspaceDto.aiChatReadOnly,
-          trx,
-        );
-      }
-
-      if (typeof updateWorkspaceDto.aiChatWorkspaceKnowledgeOnly !== 'undefined') {
-        const prev = settingsBefore?.ai?.chatWorkspaceKnowledgeOnly ?? false;
-        if (prev !== updateWorkspaceDto.aiChatWorkspaceKnowledgeOnly) {
-          before.aiChatWorkspaceKnowledgeOnly = prev;
-          after.aiChatWorkspaceKnowledgeOnly = updateWorkspaceDto.aiChatWorkspaceKnowledgeOnly;
-        }
-        await this.workspaceRepo.updateAiSettings(
-          workspaceId,
-          'chatWorkspaceKnowledgeOnly',
-          updateWorkspaceDto.aiChatWorkspaceKnowledgeOnly,
-          trx,
-        );
-      }
-
       if (typeof updateWorkspaceDto.allowPersonalSpaces !== 'undefined') {
         const prev = settingsBefore?.spaces?.allowPersonal ?? false;
         if (prev !== updateWorkspaceDto.allowPersonalSpaces) {
@@ -598,8 +553,6 @@ export class WorkspaceService {
       delete updateWorkspaceDto.aiChat;
       delete updateWorkspaceDto.allowPersonalSpaces;
       delete updateWorkspaceDto.defaultPageEditMode;
-      delete updateWorkspaceDto.aiChatReadOnly;
-      delete updateWorkspaceDto.aiChatWorkspaceKnowledgeOnly;
 
       await this.workspaceRepo.updateWorkspace(
         updateWorkspaceDto,

apps/server/src/database/migrations/20260824T211732-page-title-trgm-index.ts

@@ -1,17 +0,0 @@
-import { type Kysely, sql } from 'kysely';
-
-export async function up(db: Kysely<any>): Promise<void> {
-  await sql`CREATE INDEX IF NOT EXISTS pages_title_trgm_idx ON pages USING gin (lower(f_unaccent(title)) gin_trgm_ops)`.execute(
-    db,
-  );
-
-  // separators normalized to spaces so space-typed queries match How_to_export.pdf
-  await sql`CREATE INDEX IF NOT EXISTS attachments_file_name_trgm_idx ON attachments USING gin (lower(f_unaccent(translate(file_name, '_.-', '   '))) gin_trgm_ops)`.execute(
-    db,
-  );
-}
-
-export async function down(db: Kysely<any>): Promise<void> {
-  await sql`DROP INDEX IF EXISTS attachments_file_name_trgm_idx`.execute(db);
-  await sql`DROP INDEX IF EXISTS pages_title_trgm_idx`.execute(db);
-}

apps/server/src/integrations/import/utils/import-formatter.ts

@@ -97,6 +97,15 @@ export function xwikiFormatter($: CheerioAPI, $root: Cheerio<any>) {
   }
 }
 
+function isBareLink($el: Cheerio<any>): boolean {
+  const href = $el.attr("href")?.trim();
+  const text = $el.text().trim();
+
+  if(!text || !href) return false
+
+  return text === href;
+}
+
 export function defaultHtmlFormatter($: CheerioAPI, $root: Cheerio<any>) {
   normalizeTableColumnWidths($, $root);
 
@@ -104,7 +113,9 @@ export function defaultHtmlFormatter($: CheerioAPI, $root: Cheerio<any>) {
     const $el = $(el);
     const url = $el.attr('href')!;
     const { provider } = getEmbedUrlAndProvider(url);
-    if (provider === 'iframe') return;
+    if (provider === 'iframe' || !isBareLink($el)) {
+      return;
+    }
 
     const embed = `<div data-type=\"embed\" data-src=\"${url}\" data-provider=\"${provider}\" data-align=\"center\" data-width=\"640\" data-height=\"480\"></div>`;
     $el.replaceWith(embed);

pnpm-lock.yaml

@@ -397,9 +397,6 @@ importers:
       socket.io-client:
         specifier: 4.8.3
         version: 4.8.3(supports-color@10.2.2)
-      yet-another-react-lightbox:
-        specifier: ^3.32.2
-        version: 3.32.2(@types/react-dom@19.2.3(@types/react@19.2.17))(@types/react@19.2.17)(react-dom@19.2.7(react@19.2.7))(react@19.2.7)
       zod:
         specifier: 4.3.6
         version: 4.3.6
@@ -10036,20 +10033,6 @@ packages:
     resolution: {integrity: sha512-jIH9yLR9wqr0wOS0TpBvo/g/2UgZH5qePVbjgRliiF0BYvOZyaBknKsF+x9Iht0O6sqgnB93rCICdOZFecJuDw==}
     engines: {node: '>=12'}
 
-  yet-another-react-lightbox@3.32.2:
-    resolution: {integrity: sha512-F4HtHQfUNpvkj+AmECgWM4XRdCqMY5gXpKgOUx39+T+FyxLe8II4SK/pwMyYj2X54KH9lFSQeHYY1/GfYf3SdA==}
-    engines: {node: '>=14'}
-    peerDependencies:
-      '@types/react': ^16 || ^17 || ^18 || ^19
-      '@types/react-dom': ^16 || ^17 || ^18 || ^19
-      react: ^16.8.0 || ^17 || ^18 || ^19
-      react-dom: ^16.8.0 || ^17 || ^18 || ^19
-    peerDependenciesMeta:
-      '@types/react':
-        optional: true
-      '@types/react-dom':
-        optional: true
-
   yjs@13.6.30:
     resolution: {integrity: sha512-vv/9h42eCMC81ZHDFswuu/MKzkl/vyq1BhaNGfHyOonwlG4CJbQF4oiBBJPvfdeCt/PlVDWh7Nov9D34YY09uQ==}
     engines: {node: '>=16.0.0', npm: '>=8.0.0'}
@@ -20761,14 +20744,6 @@ snapshots:
     dependencies:
       pend: 1.2.0
 
-  yet-another-react-lightbox@3.32.2(@types/react-dom@19.2.3(@types/react@19.2.17))(@types/react@19.2.17)(react-dom@19.2.7(react@19.2.7))(react@19.2.7):
-    dependencies:
-      react: 19.2.7
-      react-dom: 19.2.7(react@19.2.7)
-    optionalDependencies:
-      '@types/react': 19.2.17
-      '@types/react-dom': 19.2.3(@types/react@19.2.17)
-
   yjs@13.6.30:
     dependencies:
       lib0: 0.2.117