From 97a7701f5d152e9458ab265392715339fa4bfb58 Mon Sep 17 00:00:00 2001
From: Philip Okugbe <16838612+Philipinho@users.noreply.github.com>
Date: Mon, 4 Aug 2025 03:20:18 +0100
Subject: [PATCH 01/46] fix local storage copy function (#1442)

---
 apps/server/src/integrations/storage/drivers/local.driver.ts | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/apps/server/src/integrations/storage/drivers/local.driver.ts b/apps/server/src/integrations/storage/drivers/local.driver.ts
index 36d9ca9e..caa6ab36 100644
--- a/apps/server/src/integrations/storage/drivers/local.driver.ts
+++ b/apps/server/src/integrations/storage/drivers/local.driver.ts
@@ -40,8 +40,11 @@ export class LocalDriver implements StorageDriver {
 
   async copy(fromFilePath: string, toFilePath: string): Promise<void> {
     try {
+      const fromFullPath = this._fullPath(fromFilePath);
+      const toFullPath = this._fullPath(toFilePath);
+      
       if (await this.exists(fromFilePath)) {
-        await fs.copy(fromFilePath, toFilePath);
+        await fs.copy(fromFullPath, toFullPath);
       }
     } catch (err) {
       throw new Error(`Failed to copy file: ${(err as Error).message}`);

From aa6eec754ebce1ca9e962a7311f56c2b309872bf Mon Sep 17 00:00:00 2001
From: Philipinho <16838612+Philipinho@users.noreply.github.com>
Date: Mon, 4 Aug 2025 00:00:06 -0700
Subject: [PATCH 02/46] fix: exclude trashed pages from position generation

---
 apps/server/src/core/page/services/page.service.ts | 1 +
 1 file changed, 1 insertion(+)

diff --git a/apps/server/src/core/page/services/page.service.ts b/apps/server/src/core/page/services/page.service.ts
index 3a97f960..d07b6133 100644
--- a/apps/server/src/core/page/services/page.service.ts
+++ b/apps/server/src/core/page/services/page.service.ts
@@ -109,6 +109,7 @@ export class PageService {
       .selectFrom('pages')
       .select(['position'])
       .where('spaceId', '=', spaceId)
+      .where('deletedAt', 'is', null)
       .orderBy('position', 'desc')
       .limit(1);
 

From dddfd48934ef00fd0b2909053c30587f62dc22cc Mon Sep 17 00:00:00 2001
From: Philip Okugbe <16838612+Philipinho@users.noreply.github.com>
Date: Mon, 4 Aug 2025 08:01:11 +0100
Subject: [PATCH 03/46] feat: add attachments support for single page exports
 (#1440)

* feat: add attachments support for single page exports
- Add includeAttachments option to page export modal and API
- Fix internal page url in single page exports in cloud

* remove redundant line

* preserve export state
---
 .../src/components/common/export-modal.tsx    |  23 +++-
 .../page/components/page-export-modal.tsx     | 105 ------------------
 .../src/features/page/types/page.types.ts     |   1 +
 .../src/integrations/export/dto/export-dto.ts |   4 +
 .../integrations/export/export.controller.ts  |  34 ++----
 .../src/integrations/export/export.service.ts |  33 ++++--
 6 files changed, 58 insertions(+), 142 deletions(-)
 delete mode 100644 apps/client/src/features/page/components/page-export-modal.tsx

diff --git a/apps/client/src/components/common/export-modal.tsx b/apps/client/src/components/common/export-modal.tsx
index a53094d4..25f4d328 100644
--- a/apps/client/src/components/common/export-modal.tsx
+++ b/apps/client/src/components/common/export-modal.tsx
@@ -29,19 +29,22 @@ export default function ExportModal({
 }: ExportModalProps) {
   const [format, setFormat] = useState<ExportFormat>(ExportFormat.Markdown);
   const [includeChildren, setIncludeChildren] = useState<boolean>(false);
-  const [includeAttachments, setIncludeAttachments] = useState<boolean>(true);
+  const [includeAttachments, setIncludeAttachments] = useState<boolean>(false);
   const { t } = useTranslation();
 
   const handleExport = async () => {
     try {
       if (type === "page") {
-        await exportPage({ pageId: id, format, includeChildren });
+        await exportPage({
+          pageId: id,
+          format,
+          includeChildren,
+          includeAttachments,
+        });
       }
       if (type === "space") {
         await exportSpace({ spaceId: id, format, includeAttachments });
       }
-      setIncludeChildren(false);
-      setIncludeAttachments(true);
       onClose();
     } catch (err) {
       notifications.show({
@@ -96,6 +99,18 @@ export default function ExportModal({
                   checked={includeChildren}
                 />
               </Group>
+
+              <Group justify="space-between" wrap="nowrap" mt="md">
+                <div>
+                  <Text size="md">{t("Include attachments")}</Text>
+                </div>
+                <Switch
+                  onChange={(event) =>
+                    setIncludeAttachments(event.currentTarget.checked)
+                  }
+                  checked={includeAttachments}
+                />
+              </Group>
             </>
           )}
 
diff --git a/apps/client/src/features/page/components/page-export-modal.tsx b/apps/client/src/features/page/components/page-export-modal.tsx
deleted file mode 100644
index 9b51910f..00000000
--- a/apps/client/src/features/page/components/page-export-modal.tsx
+++ /dev/null
@@ -1,105 +0,0 @@
-import { Modal, Button, Group, Text, Select, Switch } from "@mantine/core";
-import { exportPage } from "@/features/page/services/page-service.ts";
-import { useState } from "react";
-import * as React from "react";
-import { ExportFormat } from "@/features/page/types/page.types.ts";
-import { notifications } from "@mantine/notifications";
-import { useTranslation } from "react-i18next";
-
-interface PageExportModalProps {
-  pageId: string;
-  open: boolean;
-  onClose: () => void;
-}
-
-export default function PageExportModal({
-  pageId,
-  open,
-  onClose,
-}: PageExportModalProps) {
-  const { t } = useTranslation();
-  const [format, setFormat] = useState<ExportFormat>(ExportFormat.Markdown);
-
-  const handleExport = async () => {
-    try {
-      await exportPage({ pageId: pageId, format });
-      onClose();
-    } catch (err) {
-      notifications.show({
-        message: t("Export failed:") + err.response?.data.message,
-        color: "red",
-      });
-      console.error("export error", err);
-    }
-  };
-
-  const handleChange = (format: ExportFormat) => {
-    setFormat(format);
-  };
-
-  return (
-    <Modal.Root
-      opened={open}
-      onClose={onClose}
-      size={500}
-      padding="xl"
-      yOffset="10vh"
-      xOffset={0}
-      mah={400}
-    >
-      <Modal.Overlay />
-      <Modal.Content style={{ overflow: "hidden" }}>
-        <Modal.Header py={0}>
-          <Modal.Title fw={500}>{t("Export page")}</Modal.Title>
-          <Modal.CloseButton />
-        </Modal.Header>
-        <Modal.Body>
-          <Group justify="space-between" wrap="nowrap">
-            <div>
-              <Text size="md">{t("Format")}</Text>
-            </div>
-            <ExportFormatSelection format={format} onChange={handleChange} />
-          </Group>
-
-          <Group justify="space-between" wrap="nowrap" pt="md">
-            <div>
-              <Text size="md">{t("Include subpages")}</Text>
-            </div>
-            <Switch defaultChecked />
-          </Group>
-
-          <Group justify="center" mt="md">
-            <Button onClick={onClose} variant="default">
-              {t("Cancel")}
-            </Button>
-            <Button onClick={handleExport}>{t("Export")}</Button>
-          </Group>
-        </Modal.Body>
-      </Modal.Content>
-    </Modal.Root>
-  );
-}
-
-interface ExportFormatSelection {
-  format: ExportFormat;
-  onChange: (value: string) => void;
-}
-function ExportFormatSelection({ format, onChange }: ExportFormatSelection) {
-  const { t } = useTranslation();
-
-  return (
-    <Select
-      data={[
-        { value: "markdown", label: "Markdown" },
-        { value: "html", label: "HTML" },
-      ]}
-      defaultValue={format}
-      onChange={onChange}
-      styles={{ wrapper: { maxWidth: 120 } }}
-      comboboxProps={{ width: "120" }}
-      allowDeselect={false}
-      withCheckIcon={false}
-      aria-label={t("Select export format")}
-    />
-  );
-}
diff --git a/apps/client/src/features/page/types/page.types.ts b/apps/client/src/features/page/types/page.types.ts
index 5526ef5a..052dda35 100644
--- a/apps/client/src/features/page/types/page.types.ts
+++ b/apps/client/src/features/page/types/page.types.ts
@@ -79,6 +79,7 @@ export interface IExportPageParams {
   pageId: string;
   format: ExportFormat;
   includeChildren?: boolean;
+  includeAttachments?: boolean;
 }
 
 export enum ExportFormat {
diff --git a/apps/server/src/integrations/export/dto/export-dto.ts b/apps/server/src/integrations/export/dto/export-dto.ts
index acadfd82..a2216b25 100644
--- a/apps/server/src/integrations/export/dto/export-dto.ts
+++ b/apps/server/src/integrations/export/dto/export-dto.ts
@@ -23,6 +23,10 @@ export class ExportPageDto {
   @IsOptional()
   @IsBoolean()
   includeChildren?: boolean;
+
+  @IsOptional()
+  @IsBoolean()
+  includeAttachments?: boolean;
 }
 
 export class ExportSpaceDto {
diff --git a/apps/server/src/integrations/export/export.controller.ts b/apps/server/src/integrations/export/export.controller.ts
index f67905da..7ecea668 100644
--- a/apps/server/src/integrations/export/export.controller.ts
+++ b/apps/server/src/integrations/export/export.controller.ts
@@ -55,40 +55,22 @@ export class ExportController {
       throw new ForbiddenException();
     }
 
-    const fileExt = getExportExtension(dto.format);
-    const fileName = sanitize(page.title || 'untitled') + fileExt;
-
-    if (dto.includeChildren) {
-      const zipFileBuffer = await this.exportService.exportPageWithChildren(
-        dto.pageId,
-        dto.format,
-      );
-
-      const newName = path.parse(fileName).name + '.zip';
-
-      res.headers({
-        'Content-Type': 'application/zip',
-        'Content-Disposition':
-          'attachment; filename="' + encodeURIComponent(newName) + '"',
-      });
-
-      res.send(zipFileBuffer);
-      return;
-    }
-
-    const rawContent = await this.exportService.exportPage(
+    const zipFileBuffer = await this.exportService.exportPages(
+      dto.pageId,
       dto.format,
-      page,
-      true,
+      dto.includeAttachments,
+      dto.includeChildren,
     );
 
+    const fileName = sanitize(page.title || 'untitled') + '.zip';
+
     res.headers({
-      'Content-Type': getMimeType(fileExt),
+      'Content-Type': 'application/zip',
       'Content-Disposition':
         'attachment; filename="' + encodeURIComponent(fileName) + '"',
     });
 
-    res.send(rawContent);
+    res.send(zipFileBuffer);
   }
 
   @UseGuards(JwtAuthGuard)
diff --git a/apps/server/src/integrations/export/export.service.ts b/apps/server/src/integrations/export/export.service.ts
index 4bb5146f..b8f3a201 100644
--- a/apps/server/src/integrations/export/export.service.ts
+++ b/apps/server/src/integrations/export/export.service.ts
@@ -89,10 +89,28 @@ export class ExportService {
     return;
   }
 
-  async exportPageWithChildren(pageId: string, format: string) {
-    const pages = await this.pageRepo.getPageAndDescendants(pageId, {
-      includeContent: true,
-    });
+  async exportPages(
+    pageId: string,
+    format: string,
+    includeAttachments: boolean,
+    includeChildren: boolean,
+  ) {
+    let pages: Page[];
+
+    if (includeChildren) {
+      //@ts-ignore
+      pages = await this.pageRepo.getPageAndDescendants(pageId, {
+        includeContent: true,
+      });
+    } else {
+      // Only fetch the single page when includeChildren is false
+      const page = await this.pageRepo.findById(pageId, {
+        includeContent: true,
+      });
+      if (page){
+        pages = [page];
+      }
+    }
 
     if (!pages || pages.length === 0) {
       throw new BadRequestException('No pages to export');
@@ -105,7 +123,7 @@ export class ExportService {
     const tree = buildTree(pages as Page[]);
 
     const zip = new JSZip();
-    await this.zipPages(tree, format, zip);
+    await this.zipPages(tree, format, zip, includeAttachments);
 
     const zipFile = zip.generateNodeStream({
       type: 'nodebuffer',
@@ -168,7 +186,7 @@ export class ExportService {
     tree: PageExportTree,
     format: string,
     zip: JSZip,
-    includeAttachments = true,
+    includeAttachments: boolean,
   ): Promise<void> {
     const slugIdToPath: Record<string, string> = {};
 
@@ -200,7 +218,8 @@ export class ExportService {
 
         if (includeAttachments) {
           await this.zipAttachments(updatedJsonContent, page.spaceId, folder);
-          updatedJsonContent = updateAttachmentUrlsToLocalPaths(updatedJsonContent);
+          updatedJsonContent =
+            updateAttachmentUrlsToLocalPaths(updatedJsonContent);
         }
 
         const pageTitle = getPageTitle(page.title);

From b0c557272da226de8ee9e05f930f35c5c0b717ae Mon Sep 17 00:00:00 2001
From: Philip Okugbe <16838612+Philipinho@users.noreply.github.com>
Date: Mon, 4 Aug 2025 08:01:18 +0100
Subject: [PATCH 04/46] fix nested taskList in markdown export (#1443)

---
 .../src/integrations/export/turndown-utils.ts       | 13 +++++++++++--
 1 file changed, 11 insertions(+), 2 deletions(-)

diff --git a/apps/server/src/integrations/export/turndown-utils.ts b/apps/server/src/integrations/export/turndown-utils.ts
index 54fdef12..b20e6733 100644
--- a/apps/server/src/integrations/export/turndown-utils.ts
+++ b/apps/server/src/integrations/export/turndown-utils.ts
@@ -69,8 +69,17 @@ function taskList(turndownService: TurndownService) {
         'input[type="checkbox"]',
       ) as HTMLInputElement;
       const isChecked = checkbox.checked;
-
-      return `- ${isChecked ? '[x]' : '[ ]'} ${content.trim()} \n`;
+      
+      // Process content like regular list items
+      content = content
+        .replace(/^\n+/, '') // remove leading newlines
+        .replace(/\n+$/, '\n') // replace trailing newlines with just a single one
+        .replace(/\n/gm, '\n  '); // indent nested content with 2 spaces
+      
+      // Create the checkbox prefix
+      const prefix = `- ${isChecked ? '[x]' : '[ ]'} `;
+      
+      return prefix + content + (node.nextSibling && !/\n$/.test(content) ? '\n' : '');
     },
   });
 }

From 95b7be61df95ce4a2199d055cbec74dca3f080be Mon Sep 17 00:00:00 2001
From: Philip Okugbe <16838612+Philipinho@users.noreply.github.com>
Date: Mon, 4 Aug 2025 08:35:28 +0100
Subject: [PATCH 05/46] fix: hide trash from can view permission (#1445)

---
 apps/client/src/App.tsx                       |  7 ++---
 .../page/trash/components}/trash.tsx          |  2 +-
 apps/client/src/pages/space/space-trash.tsx   | 27 +++++++++++++++++++
 .../src/core/page/dto/deleted-page.dto.ts     |  4 +--
 apps/server/src/core/page/page.controller.ts  |  2 +-
 5 files changed, 33 insertions(+), 9 deletions(-)
 rename apps/client/src/{pages/space => features/page/trash/components}/trash.tsx (99%)
 create mode 100644 apps/client/src/pages/space/space-trash.tsx

diff --git a/apps/client/src/App.tsx b/apps/client/src/App.tsx
index cb117734..3995191d 100644
--- a/apps/client/src/App.tsx
+++ b/apps/client/src/App.tsx
@@ -34,7 +34,7 @@ import { useTrackOrigin } from "@/hooks/use-track-origin";
 import SpacesPage from "@/pages/spaces/spaces.tsx";
 import { MfaChallengePage } from "@/ee/mfa/pages/mfa-challenge-page";
 import { MfaSetupRequiredPage } from "@/ee/mfa/pages/mfa-setup-required-page";
-import SpaceTrash from "@/pages/space/trash.tsx";
+import SpaceTrash from "@/pages/space/space-trash.tsx";
 
 export default function App() {
   const { t } = useTranslation();
@@ -50,10 +50,7 @@ export default function App() {
         <Route path={"/forgot-password"} element={<ForgotPassword />} />
         <Route path={"/password-reset"} element={<PasswordReset />} />
         <Route path={"/login/mfa"} element={<MfaChallengePage />} />
-        <Route
-          path={"/login/mfa/setup"}
-          element={<MfaSetupRequiredPage />}
-        />
+        <Route path={"/login/mfa/setup"} element={<MfaSetupRequiredPage />} />
 
         {!isCloud() && (
           <Route path={"/setup/register"} element={<SetupWorkspace />} />
diff --git a/apps/client/src/pages/space/trash.tsx b/apps/client/src/features/page/trash/components/trash.tsx
similarity index 99%
rename from apps/client/src/pages/space/trash.tsx
rename to apps/client/src/features/page/trash/components/trash.tsx
index 53ca04cd..9e4e4113 100644
--- a/apps/client/src/pages/space/trash.tsx
+++ b/apps/client/src/features/page/trash/components/trash.tsx
@@ -32,7 +32,7 @@ import { UserInfo } from "@/components/common/user-info.tsx";
 import Paginate from "@/components/common/paginate.tsx";
 import { usePaginateAndSearch } from "@/hooks/use-paginate-and-search";
 
-export default function SpaceTrash() {
+export default function Trash() {
   const { t } = useTranslation();
   const { spaceSlug } = useParams();
   const { page, setPage } = usePaginateAndSearch();
diff --git a/apps/client/src/pages/space/space-trash.tsx b/apps/client/src/pages/space/space-trash.tsx
new file mode 100644
index 00000000..64b4b259
--- /dev/null
+++ b/apps/client/src/pages/space/space-trash.tsx
@@ -0,0 +1,27 @@
+import Trash from "@/features/page/trash/components/trash.tsx";
+import { useParams } from "react-router-dom";
+import { useGetSpaceBySlugQuery } from "@/features/space/queries/space-query.ts";
+import { useSpaceAbility } from "@/features/space/permissions/use-space-ability.ts";
+import React from "react";
+import {
+  SpaceCaslAction,
+  SpaceCaslSubject,
+} from "@/features/space/permissions/permissions.type.ts";
+
+export default function SpaceTrash() {
+  const { spaceSlug } = useParams();
+  const { data: space } = useGetSpaceBySlugQuery(spaceSlug);
+
+  const spaceRules = space?.membership?.permissions;
+  const spaceAbility = useSpaceAbility(spaceRules);
+
+  if (!space) {
+    return <></>;
+  }
+
+  if (spaceAbility.cannot(SpaceCaslAction.Manage, SpaceCaslSubject.Page)) {
+    return <></>;
+  }
+
+  return <Trash />;
+}
diff --git a/apps/server/src/core/page/dto/deleted-page.dto.ts b/apps/server/src/core/page/dto/deleted-page.dto.ts
index d0264bb7..8c458cc4 100644
--- a/apps/server/src/core/page/dto/deleted-page.dto.ts
+++ b/apps/server/src/core/page/dto/deleted-page.dto.ts
@@ -1,7 +1,7 @@
-import { IsOptional, IsString } from 'class-validator';
+import { IsNotEmpty, IsString } from 'class-validator';
 
 export class DeletedPageDto {
-  @IsOptional()
+  @IsNotEmpty()
   @IsString()
   spaceId: string;
 }
\ No newline at end of file
diff --git a/apps/server/src/core/page/page.controller.ts b/apps/server/src/core/page/page.controller.ts
index c3d2e5c5..2f6dcf60 100644
--- a/apps/server/src/core/page/page.controller.ts
+++ b/apps/server/src/core/page/page.controller.ts
@@ -194,7 +194,7 @@ export class PageController {
         deletedPageDto.spaceId,
       );
 
-      if (ability.cannot(SpaceCaslAction.Read, SpaceCaslSubject.Page)) {
+      if (ability.cannot(SpaceCaslAction.Manage, SpaceCaslSubject.Page)) {
         throw new ForbiddenException();
       }
 

From cb2a0398c7786c96ff708957c183023ce60761ed Mon Sep 17 00:00:00 2001
From: Philipinho <16838612+Philipinho@users.noreply.github.com>
Date: Mon, 4 Aug 2025 00:42:13 -0700
Subject: [PATCH 06/46] fix: invalidate trashed page from tree state

---
 apps/client/src/features/page/queries/page-query.ts | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/apps/client/src/features/page/queries/page-query.ts b/apps/client/src/features/page/queries/page-query.ts
index 5668de44..cfd8b10a 100644
--- a/apps/client/src/features/page/queries/page-query.ts
+++ b/apps/client/src/features/page/queries/page-query.ts
@@ -126,8 +126,9 @@ export function useUpdatePageMutation() {
 export function useRemovePageMutation() {
   return useMutation({
     mutationFn: (pageId: string) => deletePage(pageId, false),
-    onSuccess: () => {
+    onSuccess: (_, pageId) => {
       notifications.show({ message: "Page moved to trash" });
+      invalidateOnDeletePage(pageId);
       queryClient.invalidateQueries({
         predicate: (item) =>
           ["trash-list"].includes(item.queryKey[0] as string),

From 3b85f4b61623b287ebedf6f6b4cc35c296b42cd8 Mon Sep 17 00:00:00 2001
From: Philip Okugbe <16838612+Philipinho@users.noreply.github.com>
Date: Mon, 4 Aug 2025 09:49:29 +0100
Subject: [PATCH 07/46] fix: enforce C collation for page position ordering to
 ensure consistent behavior in Postgres 17+ (#1446)

- Add explicit C collation to position ordering queries to fix incorrect page placement in PostgreSQL 17+
- Ensures consistent ASCII-based ordering regardless of database locale settings
- Fixes issue where new pages were incorrectly placed at random positions instead of bottom
---
 apps/server/src/core/page/services/page.service.ts            | 4 ++--
 .../server/src/integrations/import/services/import.service.ts | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/apps/server/src/core/page/services/page.service.ts b/apps/server/src/core/page/services/page.service.ts
index d07b6133..a538eedf 100644
--- a/apps/server/src/core/page/services/page.service.ts
+++ b/apps/server/src/core/page/services/page.service.ts
@@ -110,7 +110,7 @@ export class PageService {
       .select(['position'])
       .where('spaceId', '=', spaceId)
       .where('deletedAt', 'is', null)
-      .orderBy('position', 'desc')
+      .orderBy('position', (ob) => ob.collate('C').desc())
       .limit(1);
 
     if (parentPageId) {
@@ -191,7 +191,7 @@ export class PageService {
         'deletedAt',
       ])
       .select((eb) => this.pageRepo.withHasChildren(eb))
-      .orderBy('position', 'asc')
+      .orderBy('position', (ob) => ob.collate('C').asc())
       .where('deletedAt', 'is', null)
       .where('spaceId', '=', spaceId);
 
diff --git a/apps/server/src/integrations/import/services/import.service.ts b/apps/server/src/integrations/import/services/import.service.ts
index a3da4918..7901122a 100644
--- a/apps/server/src/integrations/import/services/import.service.ts
+++ b/apps/server/src/integrations/import/services/import.service.ts
@@ -178,7 +178,7 @@ export class ImportService {
       .selectFrom('pages')
       .select(['id', 'position'])
       .where('spaceId', '=', spaceId)
-      .orderBy('position', 'desc')
+      .orderBy('position', (ob) => ob.collate('C').desc())
       .limit(1)
       .where('parentPageId', 'is', null)
       .executeTakeFirst();

From 5a3377790e727b3943646adbdec210a41ac8b8ad Mon Sep 17 00:00:00 2001
From: Philip Okugbe <16838612+Philipinho@users.noreply.github.com>
Date: Wed, 6 Aug 2025 18:16:30 +0100
Subject: [PATCH 08/46] feat: debug mode env variable (#1450)

---
 .env.example                                         |  5 ++++-
 apps/server/src/common/logger/internal-log-filter.ts | 12 ++++++++----
 2 files changed, 12 insertions(+), 5 deletions(-)

diff --git a/.env.example b/.env.example
index 084b871b..4a74a6b4 100644
--- a/.env.example
+++ b/.env.example
@@ -43,4 +43,7 @@ POSTMARK_TOKEN=
 # for custom drawio server
 DRAWIO_URL=
 
-DISABLE_TELEMETRY=false
\ No newline at end of file
+DISABLE_TELEMETRY=false
+
+# Enable debug logging in production (default: false)
+DEBUG_MODE=false
\ No newline at end of file
diff --git a/apps/server/src/common/logger/internal-log-filter.ts b/apps/server/src/common/logger/internal-log-filter.ts
index f56d3fce..5273716c 100644
--- a/apps/server/src/common/logger/internal-log-filter.ts
+++ b/apps/server/src/common/logger/internal-log-filter.ts
@@ -12,10 +12,14 @@ export class InternalLogFilter extends ConsoleLogger {
 
   constructor() {
     super();
-    this.allowedLogLevels =
-      process.env.NODE_ENV === 'production'
-        ? ['log', 'error', 'fatal']
-        : ['log', 'debug', 'verbose', 'warn', 'error', 'fatal'];
+    const isProduction = process.env.NODE_ENV === 'production';
+    const isDebugMode = process.env.DEBUG_MODE === 'true';
+    
+    if (isProduction && !isDebugMode) {
+      this.allowedLogLevels = ['log', 'error', 'fatal'];
+    } else {
+      this.allowedLogLevels = ['log', 'debug', 'verbose', 'warn', 'error', 'fatal'];
+    }
   }
 
   private isLogLevelAllowed(level: string): boolean {

From 5012a68d85c30a0986a612e2a2e9da5a6b4c46f2 Mon Sep 17 00:00:00 2001
From: Philipinho <16838612+Philipinho@users.noreply.github.com>
Date: Wed, 6 Aug 2025 10:19:35 -0700
Subject: [PATCH 09/46] sync

---
 apps/server/src/ee | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/apps/server/src/ee b/apps/server/src/ee
index 7e9c376a..72bdb639 160000
--- a/apps/server/src/ee
+++ b/apps/server/src/ee
@@ -1 +1 @@
-Subproject commit 7e9c376ab84a2e05b9a565a9d819b0e0d60d472e
+Subproject commit 72bdb639cf5e7ddb065f339111d53807cff7e006

From d92a94244fec2fb0737e7501d3929ce150e224b5 Mon Sep 17 00:00:00 2001
From: Philipinho <16838612+Philipinho@users.noreply.github.com>
Date: Tue, 12 Aug 2025 10:21:17 -0700
Subject: [PATCH 10/46] sync

---
 apps/server/src/ee | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/apps/server/src/ee b/apps/server/src/ee
index 72bdb639..abbd253e 160000
--- a/apps/server/src/ee
+++ b/apps/server/src/ee
@@ -1 +1 @@
-Subproject commit 72bdb639cf5e7ddb065f339111d53807cff7e006
+Subproject commit abbd253ee2666febe753b6a299b8cc614705c80b

From 08135a2fba70a26b411dde69e0ac88ff3351c70c Mon Sep 17 00:00:00 2001
From: Philipinho <16838612+Philipinho@users.noreply.github.com>
Date: Tue, 12 Aug 2025 11:09:26 -0700
Subject: [PATCH 11/46] sync

---
 apps/server/src/ee | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/apps/server/src/ee b/apps/server/src/ee
index abbd253e..fbc01d80 160000
--- a/apps/server/src/ee
+++ b/apps/server/src/ee
@@ -1 +1 @@
-Subproject commit abbd253ee2666febe753b6a299b8cc614705c80b
+Subproject commit fbc01d808f3edd7d16a64c21251a0bcb720f1ba4

From aa58e272d68c53177725e2f052ba4c98cee19414 Mon Sep 17 00:00:00 2001
From: Philip Okugbe <16838612+Philipinho@users.noreply.github.com>
Date: Sun, 31 Aug 2025 09:11:33 +0100
Subject: [PATCH 12/46] fix: exclude deleted pages (#1494)

---
 apps/server/src/database/repos/page/page.repo.ts         | 4 +++-
 apps/server/src/integrations/export/export.controller.ts | 2 +-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/apps/server/src/database/repos/page/page.repo.ts b/apps/server/src/database/repos/page/page.repo.ts
index c814240a..e577cc43 100644
--- a/apps/server/src/database/repos/page/page.repo.ts
+++ b/apps/server/src/database/repos/page/page.repo.ts
@@ -399,6 +399,7 @@ export class PageRepo {
           ])
           .$if(opts?.includeContent, (qb) => qb.select('content'))
           .where('id', '=', parentPageId)
+          .where('deletedAt', 'is', null)
           .unionAll((exp) =>
             exp
               .selectFrom('pages as p')
@@ -413,7 +414,8 @@ export class PageRepo {
                 'p.workspaceId',
               ])
               .$if(opts?.includeContent, (qb) => qb.select('p.content'))
-              .innerJoin('page_hierarchy as ph', 'p.parentPageId', 'ph.id'),
+              .innerJoin('page_hierarchy as ph', 'p.parentPageId', 'ph.id')
+              .where('p.deletedAt', 'is', null),
           ),
       )
       .selectFrom('page_hierarchy')
diff --git a/apps/server/src/integrations/export/export.controller.ts b/apps/server/src/integrations/export/export.controller.ts
index 7ecea668..9d49d108 100644
--- a/apps/server/src/integrations/export/export.controller.ts
+++ b/apps/server/src/integrations/export/export.controller.ts
@@ -46,7 +46,7 @@ export class ExportController {
       includeContent: true,
     });
 
-    if (!page) {
+    if (!page || page.deletedAt) {
       throw new NotFoundException('Page not found');
     }
 

From 7d1e5bce0dbbf6a863fb219d171549a71039db0c Mon Sep 17 00:00:00 2001
From: Mirone <Saul-Mirone@outlook.com>
Date: Mon, 1 Sep 2025 02:53:27 +0900
Subject: [PATCH 13/46] feat: table row/column drag and drop (#1467)

* chore: add dev container

* feat: add drag handle when hovering cell

* feat: add column drag and drop

* feat: add support for row drag and drop

* refactor: extract preview controllers

* fix: hover issue

* refactor: add handle controller

* chore: f

* chore: remove log

* chore: remove dev files

* feat: hide other drop indicators when table dnd working

* feat: add auto scroll and bug fix

* chore: f

* fix: firefox
---
 .../features/editor/extensions/extensions.ts  |   2 +
 .../src/features/editor/page-editor.tsx       |   2 +-
 .../features/editor/styles/drag-handle.css    |   4 +
 .../src/features/editor/styles/table.css      |  20 ++
 package.json                                  |   1 +
 .../lib/table/dnd/auto-scroll-controller.ts   |  76 +++++
 .../src/lib/table/dnd/calc-drag-over.ts       |  44 +++
 .../src/lib/table/dnd/dnd-extension.ts        | 271 ++++++++++++++++++
 .../dnd/handle/drag-handle-controller.ts      | 105 +++++++
 .../dnd/handle/empty-image-controller.ts      |  21 ++
 .../editor-ext/src/lib/table/dnd/index.ts     |   1 +
 .../dnd/preview/drop-indicator-controller.ts  | 102 +++++++
 .../table/dnd/preview/preview-controller.ts   | 122 ++++++++
 .../lib/table/dnd/preview/render-preview.ts   |  37 +++
 .../editor-ext/src/lib/table/dnd/utils.ts     | 107 +++++++
 packages/editor-ext/src/lib/table/index.ts    |   1 +
 .../convert-array-of-rows-to-table-node.ts    |  44 +++
 .../convert-table-node-to-array-of-rows.ts    |  61 ++++
 .../lib/table/utils/get-cells-in-column.ts    |  36 +++
 .../src/lib/table/utils/get-cells-in-row.ts   |  36 +++
 .../utils/get-selection-range-in-column.ts    |  91 ++++++
 .../table/utils/get-selection-range-in-row.ts |  89 ++++++
 .../editor-ext/src/lib/table/utils/index.ts   |   3 +
 .../src/lib/table/utils/move-column.ts        |  81 ++++++
 .../table/utils/move-row-in-array-of-rows.ts  |  30 ++
 .../src/lib/table/utils/move-row.ts           |  74 +++++
 .../editor-ext/src/lib/table/utils/query.ts   | 122 ++++++++
 .../src/lib/table/utils/transpose.ts          |  29 ++
 .../editor-ext/src/lib/table/utils/types.ts   |  18 ++
 pnpm-lock.yaml                                |  23 ++
 30 files changed, 1652 insertions(+), 1 deletion(-)
 create mode 100644 packages/editor-ext/src/lib/table/dnd/auto-scroll-controller.ts
 create mode 100644 packages/editor-ext/src/lib/table/dnd/calc-drag-over.ts
 create mode 100644 packages/editor-ext/src/lib/table/dnd/dnd-extension.ts
 create mode 100644 packages/editor-ext/src/lib/table/dnd/handle/drag-handle-controller.ts
 create mode 100644 packages/editor-ext/src/lib/table/dnd/handle/empty-image-controller.ts
 create mode 100644 packages/editor-ext/src/lib/table/dnd/index.ts
 create mode 100644 packages/editor-ext/src/lib/table/dnd/preview/drop-indicator-controller.ts
 create mode 100644 packages/editor-ext/src/lib/table/dnd/preview/preview-controller.ts
 create mode 100644 packages/editor-ext/src/lib/table/dnd/preview/render-preview.ts
 create mode 100644 packages/editor-ext/src/lib/table/dnd/utils.ts
 create mode 100644 packages/editor-ext/src/lib/table/utils/convert-array-of-rows-to-table-node.ts
 create mode 100644 packages/editor-ext/src/lib/table/utils/convert-table-node-to-array-of-rows.ts
 create mode 100644 packages/editor-ext/src/lib/table/utils/get-cells-in-column.ts
 create mode 100644 packages/editor-ext/src/lib/table/utils/get-cells-in-row.ts
 create mode 100644 packages/editor-ext/src/lib/table/utils/get-selection-range-in-column.ts
 create mode 100644 packages/editor-ext/src/lib/table/utils/get-selection-range-in-row.ts
 create mode 100644 packages/editor-ext/src/lib/table/utils/index.ts
 create mode 100644 packages/editor-ext/src/lib/table/utils/move-column.ts
 create mode 100644 packages/editor-ext/src/lib/table/utils/move-row-in-array-of-rows.ts
 create mode 100644 packages/editor-ext/src/lib/table/utils/move-row.ts
 create mode 100644 packages/editor-ext/src/lib/table/utils/query.ts
 create mode 100644 packages/editor-ext/src/lib/table/utils/transpose.ts
 create mode 100644 packages/editor-ext/src/lib/table/utils/types.ts

diff --git a/apps/client/src/features/editor/extensions/extensions.ts b/apps/client/src/features/editor/extensions/extensions.ts
index 922bcd59..adfed7ed 100644
--- a/apps/client/src/features/editor/extensions/extensions.ts
+++ b/apps/client/src/features/editor/extensions/extensions.ts
@@ -38,6 +38,7 @@ import {
   Embed,
   SearchAndReplace,
   Mention,
+  TableDndExtension,
 } from "@docmost/editor-ext";
 import {
   randomElement,
@@ -168,6 +169,7 @@ export const mainExtensions = [
   TableRow,
   TableCell,
   TableHeader,
+  TableDndExtension,
   MathInline.configure({
     view: MathInlineView,
   }),
diff --git a/apps/client/src/features/editor/page-editor.tsx b/apps/client/src/features/editor/page-editor.tsx
index 5d88b208..44aa403b 100644
--- a/apps/client/src/features/editor/page-editor.tsx
+++ b/apps/client/src/features/editor/page-editor.tsx
@@ -375,7 +375,7 @@ export default function PageEditor({
   }
 
   return (
-    <div style={{ position: "relative" }}>
+    <div className="editor-container" style={{ position: "relative" }}>
       <div ref={menuContainerRef}>
         <EditorContent editor={editor} />
 
diff --git a/apps/client/src/features/editor/styles/drag-handle.css b/apps/client/src/features/editor/styles/drag-handle.css
index e1d3ae4b..f77c9630 100644
--- a/apps/client/src/features/editor/styles/drag-handle.css
+++ b/apps/client/src/features/editor/styles/drag-handle.css
@@ -45,6 +45,10 @@
     display: none;
     pointer-events: none;
   }
+
+  &[data-direction='horizontal'] {
+    rotate: 90deg;
+  }
 }
 
 .dark .drag-handle {
diff --git a/apps/client/src/features/editor/styles/table.css b/apps/client/src/features/editor/styles/table.css
index d60a299c..9926d0bc 100644
--- a/apps/client/src/features/editor/styles/table.css
+++ b/apps/client/src/features/editor/styles/table.css
@@ -8,6 +8,16 @@
   }
 }
 
+.table-dnd-preview {
+  padding: 0;
+  background-color: rgba(255, 255, 255, 0.3);
+  backdrop-filter: blur(2px);
+}
+
+.table-dnd-drop-indicator {
+  background-color: #adf;
+}
+
 .ProseMirror {
   table {
     border-collapse: collapse;
@@ -118,3 +128,13 @@
     }
   }
 }
+
+.editor-container:has(.table-dnd-drop-indicator[data-dragging="true"]) {
+  .prosemirror-dropcursor-block {
+    display: none;
+  }
+
+  .prosemirror-dropcursor-inline {
+    display: none;
+  }
+}
\ No newline at end of file
diff --git a/package.json b/package.json
index 4b14083e..707c262f 100644
--- a/package.json
+++ b/package.json
@@ -20,6 +20,7 @@
   "dependencies": {
     "@braintree/sanitize-url": "^7.1.0",
     "@docmost/editor-ext": "workspace:*",
+    "@floating-ui/dom": "^1.7.3",
     "@hocuspocus/extension-redis": "^2.15.2",
     "@hocuspocus/provider": "^2.15.2",
     "@hocuspocus/server": "^2.15.2",
diff --git a/packages/editor-ext/src/lib/table/dnd/auto-scroll-controller.ts b/packages/editor-ext/src/lib/table/dnd/auto-scroll-controller.ts
new file mode 100644
index 00000000..9b8304d5
--- /dev/null
+++ b/packages/editor-ext/src/lib/table/dnd/auto-scroll-controller.ts
@@ -0,0 +1,76 @@
+import { DraggingDOMs } from "./utils";
+
+const EDGE_THRESHOLD = 100;
+const SCROLL_SPEED = 10;
+
+export class AutoScrollController {
+    private _autoScrollInterval?: number;
+
+    checkYAutoScroll = (clientY: number) => {
+        const scrollContainer = document.documentElement;
+
+        if (clientY < 0 + EDGE_THRESHOLD) {
+            this._startYAutoScroll(scrollContainer!, -1 * SCROLL_SPEED);
+        } else if (clientY > window.innerHeight - EDGE_THRESHOLD) {
+            this._startYAutoScroll(scrollContainer!, SCROLL_SPEED);
+        } else {
+            this._stopYAutoScroll();
+        }
+    }
+
+    checkXAutoScroll = (clientX: number, draggingDOMs: DraggingDOMs) => {
+        const table = draggingDOMs?.table;
+        if (!table) return;
+
+        const scrollContainer = table.closest<HTMLElement>('.tableWrapper');
+        const editorRect = scrollContainer.getBoundingClientRect();
+        if (!scrollContainer) return;
+
+        if (clientX < editorRect.left + EDGE_THRESHOLD) {
+            this._startXAutoScroll(scrollContainer!, -1 * SCROLL_SPEED);
+        } else if (clientX > editorRect.right - EDGE_THRESHOLD) {
+            this._startXAutoScroll(scrollContainer!, SCROLL_SPEED);
+        } else {
+            this._stopXAutoScroll();
+        }
+    }
+
+    stop = () => {
+        this._stopXAutoScroll();
+        this._stopYAutoScroll();
+    }
+
+    private _startXAutoScroll = (scrollContainer: HTMLElement, speed: number) => {
+        if (this._autoScrollInterval) {
+            clearInterval(this._autoScrollInterval);
+        }
+
+        this._autoScrollInterval = window.setInterval(() => {
+            scrollContainer.scrollLeft += speed;
+        }, 16);
+    }
+
+    private _stopXAutoScroll = () => {
+        if (this._autoScrollInterval) {
+            clearInterval(this._autoScrollInterval);
+            this._autoScrollInterval = undefined;
+        }
+    }
+
+    private _startYAutoScroll = (scrollContainer: HTMLElement, speed: number) => {
+        if (this._autoScrollInterval) {
+            clearInterval(this._autoScrollInterval);
+        }
+
+        this._autoScrollInterval = window.setInterval(() => {
+            scrollContainer.scrollTop += speed;
+        }, 16);
+    }
+
+    private _stopYAutoScroll = () => {
+        if (this._autoScrollInterval) {
+            clearInterval(this._autoScrollInterval);
+            this._autoScrollInterval = undefined;
+        }
+    }
+}
\ No newline at end of file
diff --git a/packages/editor-ext/src/lib/table/dnd/calc-drag-over.ts b/packages/editor-ext/src/lib/table/dnd/calc-drag-over.ts
new file mode 100644
index 00000000..8bdb68ad
--- /dev/null
+++ b/packages/editor-ext/src/lib/table/dnd/calc-drag-over.ts
@@ -0,0 +1,44 @@
+function findDragOverElement(
+  elements: Element[],
+  pointer: number,
+  axis: 'x' | 'y',
+): [Element, number] | undefined {
+  const startProp = axis === 'x' ? 'left' : 'top'
+  const endProp = axis === 'x' ? 'right' : 'bottom'
+  const lastIndex = elements.length - 1
+
+  const index = elements.findIndex((el, index) => {
+    const rect = el.getBoundingClientRect()
+    const boundaryStart = rect[startProp]
+    const boundaryEnd = rect[endProp]
+
+    // The pointer is within the boundary of the current element.
+    if (boundaryStart <= pointer && pointer <= boundaryEnd) return true
+    // The pointer is beyond the last element.
+    if (index === lastIndex && pointer > boundaryEnd) return true
+    // The pointer is before the first element.
+    if (index === 0 && pointer < boundaryStart) return true
+
+    return false
+  })
+
+  return index >= 0 ? [elements[index], index] : undefined
+}
+
+export function getDragOverColumn(
+  table: HTMLTableElement,
+  pointerX: number,
+): [element: Element, index: number] | undefined {
+  const firstRow = table.querySelector('tr')
+  if (!firstRow) return
+  const cells = Array.from(firstRow.children)
+  return findDragOverElement(cells, pointerX, 'x')
+}
+
+export function getDragOverRow(
+  table: HTMLTableElement,
+  pointerY: number,
+): [element: Element, index: number] | undefined {
+  const rows = Array.from(table.querySelectorAll('tr'))
+  return findDragOverElement(rows, pointerY, 'y')
+}
\ No newline at end of file
diff --git a/packages/editor-ext/src/lib/table/dnd/dnd-extension.ts b/packages/editor-ext/src/lib/table/dnd/dnd-extension.ts
new file mode 100644
index 00000000..a29476ca
--- /dev/null
+++ b/packages/editor-ext/src/lib/table/dnd/dnd-extension.ts
@@ -0,0 +1,271 @@
+import { Editor, Extension } from "@tiptap/core";
+import { PluginKey, Plugin, PluginSpec } from "@tiptap/pm/state";
+import { EditorProps, EditorView } from "@tiptap/pm/view";
+import { DraggingDOMs, getDndRelatedDOMs, getHoveringCell, HoveringCellInfo } from "./utils";
+import { getDragOverColumn, getDragOverRow } from "./calc-drag-over";
+import { moveColumn, moveRow } from "../utils";
+import { PreviewController } from "./preview/preview-controller";
+import { DropIndicatorController } from "./preview/drop-indicator-controller";
+import { DragHandleController } from "./handle/drag-handle-controller";
+import { EmptyImageController } from "./handle/empty-image-controller";
+import { AutoScrollController } from "./auto-scroll-controller";
+
+export const TableDndKey = new PluginKey('table-drag-and-drop')
+
+class TableDragHandlePluginSpec implements PluginSpec<void> {
+    key = TableDndKey
+    props: EditorProps<Plugin<void>>
+
+    private _colDragHandle: HTMLElement;
+    private _rowDragHandle: HTMLElement;
+    private _hoveringCell?: HoveringCellInfo;
+    private _disposables: (() => void)[] = [];
+    private _draggingCoords: { x: number; y: number } = { x: 0, y: 0 };
+    private _dragging = false;
+    private _draggingDirection: 'col' | 'row' = 'col';
+    private _draggingIndex = -1;
+    private _droppingIndex = -1;
+    private _draggingDOMs?: DraggingDOMs | undefined
+    private _startCoords: { x: number; y: number } = { x: 0, y: 0 };
+    private _previewController: PreviewController;
+    private _dropIndicatorController: DropIndicatorController;
+    private _dragHandleController: DragHandleController;
+    private _emptyImageController: EmptyImageController;
+    private _autoScrollController: AutoScrollController;
+
+    constructor(public editor: Editor) {
+        this.props = {
+            handleDOMEvents: {
+                pointerover: this._pointerOver,
+            }
+        }
+
+        this._dragHandleController = new DragHandleController();
+        this._colDragHandle = this._dragHandleController.colDragHandle;
+        this._rowDragHandle = this._dragHandleController.rowDragHandle;
+
+        this._previewController = new PreviewController();
+        this._dropIndicatorController = new DropIndicatorController();
+        this._emptyImageController = new EmptyImageController();
+
+        this._autoScrollController = new AutoScrollController();
+
+        this._bindDragEvents();
+    }
+
+    view = () => {
+        const wrapper = this.editor.options.element;
+        wrapper.appendChild(this._colDragHandle)
+        wrapper.appendChild(this._rowDragHandle)
+        wrapper.appendChild(this._previewController.previewRoot)
+        wrapper.appendChild(this._dropIndicatorController.dropIndicatorRoot)
+
+        return {
+            update: this.update,
+            destroy: this.destroy,
+        }
+    }
+
+    update = () => {}
+
+    destroy = () => {
+        if (!this.editor.isDestroyed) return;
+        this._dragHandleController.destroy();
+        this._emptyImageController.destroy();
+        this._previewController.destroy();
+        this._dropIndicatorController.destroy();
+        this._autoScrollController.stop();
+
+        this._disposables.forEach(disposable => disposable());
+    }
+
+    private _pointerOver = (view: EditorView, event: PointerEvent) => {
+        if (this._dragging) return;
+
+        const hoveringCell = getHoveringCell(view, event)
+        this._hoveringCell = hoveringCell;
+        if (!hoveringCell) {
+            this._dragHandleController.hide();
+        } else {
+            this._dragHandleController.show(this.editor, hoveringCell);
+        }
+    }
+
+    private _onDragColStart = (event: DragEvent) => {
+        this._onDragStart(event, 'col');
+    }
+
+    private _onDraggingCol = (event: DragEvent) => {
+        const draggingDOMs = this._draggingDOMs;
+        if (!draggingDOMs) return;
+
+        this._draggingCoords = { x: event.clientX, y: event.clientY };
+        this._previewController.onDragging(draggingDOMs, this._draggingCoords.x, this._draggingCoords.y, 'col');
+
+        this._autoScrollController.checkXAutoScroll(event.clientX, draggingDOMs);
+
+        const direction = this._startCoords.x > this._draggingCoords.x ? 'left' : 'right';
+        const dragOverColumn = getDragOverColumn(draggingDOMs.table, this._draggingCoords.x);
+        if (!dragOverColumn) return;
+
+        const [col, index] = dragOverColumn;
+        this._droppingIndex = index;
+        this._dropIndicatorController.onDragging(col, direction, 'col');
+    }
+
+    private _onDragRowStart = (event: DragEvent) => {
+        this._onDragStart(event, 'row');
+    }
+
+    private _onDraggingRow = (event: DragEvent) => {
+        const draggingDOMs = this._draggingDOMs;
+        if (!draggingDOMs) return;
+
+        this._draggingCoords = { x: event.clientX, y: event.clientY };
+        this._previewController.onDragging(draggingDOMs, this._draggingCoords.x, this._draggingCoords.y, 'row');
+
+        this._autoScrollController.checkYAutoScroll(event.clientY);
+
+        const direction = this._startCoords.y > this._draggingCoords.y ? 'up' : 'down';
+        const dragOverRow = getDragOverRow(draggingDOMs.table, this._draggingCoords.y);
+        if (!dragOverRow) return;
+
+        const [row, index] = dragOverRow;
+        this._droppingIndex = index;
+        this._dropIndicatorController.onDragging(row, direction, 'row');
+    }
+
+    private _onDragEnd = () => {
+        this._dragging = false;
+        this._draggingIndex = -1;
+        this._droppingIndex = -1;
+        this._startCoords = { x: 0, y: 0 };
+        this._autoScrollController.stop();
+        this._dropIndicatorController.onDragEnd();
+        this._previewController.onDragEnd();
+    }
+
+    private _bindDragEvents = () => {
+        this._colDragHandle.addEventListener('dragstart', this._onDragColStart);
+        this._disposables.push(() => {
+            this._colDragHandle.removeEventListener('dragstart', this._onDragColStart);
+        })
+
+        this._colDragHandle.addEventListener('dragend', this._onDragEnd);
+        this._disposables.push(() => {
+            this._colDragHandle.removeEventListener('dragend', this._onDragEnd);
+        })
+
+        this._rowDragHandle.addEventListener('dragstart', this._onDragRowStart);
+        this._disposables.push(() => {
+            this._rowDragHandle.removeEventListener('dragstart', this._onDragRowStart);
+        })
+
+        this._rowDragHandle.addEventListener('dragend', this._onDragEnd);
+        this._disposables.push(() => {
+            this._rowDragHandle.removeEventListener('dragend', this._onDragEnd);
+        })
+
+        const ownerDocument = this.editor.view.dom?.ownerDocument
+        if (ownerDocument) {
+            // To make `drop` event work, we need to prevent the default behavior of the
+            // `dragover` event for drop zone. Here we set the whole document as the
+            // drop zone so that even the mouse moves outside the editor, the `drop`
+            // event will still be triggered.
+            ownerDocument.addEventListener('drop', this._onDrop);
+            ownerDocument.addEventListener('dragover', this._onDrag);
+            this._disposables.push(() => {
+                ownerDocument.removeEventListener('drop', this._onDrop);
+                ownerDocument.removeEventListener('dragover', this._onDrag);
+            });
+        }
+    }
+
+    private _onDragStart = (event: DragEvent, type: 'col' | 'row') => {
+        const dataTransfer = event.dataTransfer;
+        if (dataTransfer) {
+            dataTransfer.effectAllowed = 'move';
+            this._emptyImageController.hideDragImage(dataTransfer);
+        }
+        this._dragging = true;
+        this._draggingDirection = type;
+        this._startCoords = { x: event.clientX, y: event.clientY };
+        const draggingIndex = (type === 'col' ? this._hoveringCell?.colIndex : this._hoveringCell?.rowIndex) ?? 0;
+
+        this._draggingIndex = draggingIndex;
+
+        const relatedDoms = getDndRelatedDOMs(
+            this.editor.view,
+            this._hoveringCell?.cellPos,
+            draggingIndex,
+            type
+        )
+        this._draggingDOMs = relatedDoms;
+
+        const index = type === 'col' ? this._hoveringCell?.colIndex : this._hoveringCell?.rowIndex;
+
+        this._previewController.onDragStart(relatedDoms, index, type);
+        this._dropIndicatorController.onDragStart(relatedDoms, type);
+    }
+
+    private _onDrag = (event: DragEvent) => {
+        event.preventDefault()
+        if (!this._dragging) return;
+        if (this._draggingDirection === 'col') {
+            this._onDraggingCol(event);
+        } else {
+            this._onDraggingRow(event);
+        }
+    }
+
+    private _onDrop = () => {
+        if (!this._dragging) return;
+        const direction = this._draggingDirection;
+        const from = this._draggingIndex;
+        const to = this._droppingIndex;
+        const tr = this.editor.state.tr;
+        const pos = this.editor.state.selection.from;
+
+        if (direction === 'col') {
+            const canMove = moveColumn({
+                tr,
+                originIndex: from,
+                targetIndex: to,
+                select: true,
+                pos,
+            })
+            if (canMove) {
+                this.editor.view.dispatch(tr);
+            }
+
+            return;
+        }
+
+        if (direction === 'row') {
+            const canMove = moveRow({
+                tr,
+                originIndex: from,
+                targetIndex: to,
+                select: true,
+                pos,
+            })
+            if (canMove) {
+                this.editor.view.dispatch(tr);
+            }
+
+            return;
+        }
+    }
+}
+
+export const TableDndExtension = Extension.create({
+    name: 'table-drag-and-drop',
+    addProseMirrorPlugins() {
+        const editor = this.editor
+
+        const dragHandlePluginSpec = new TableDragHandlePluginSpec(editor)
+        const dragHandlePlugin = new Plugin(dragHandlePluginSpec)
+
+        return [dragHandlePlugin]
+    }
+})
diff --git a/packages/editor-ext/src/lib/table/dnd/handle/drag-handle-controller.ts b/packages/editor-ext/src/lib/table/dnd/handle/drag-handle-controller.ts
new file mode 100644
index 00000000..33137e91
--- /dev/null
+++ b/packages/editor-ext/src/lib/table/dnd/handle/drag-handle-controller.ts
@@ -0,0 +1,105 @@
+import { Editor } from "@tiptap/core";
+import { HoveringCellInfo } from "../utils";
+import { computePosition, offset } from "@floating-ui/dom";
+
+export class DragHandleController {
+    private _colDragHandle: HTMLElement;
+    private _rowDragHandle: HTMLElement;
+
+    constructor() {
+        this._colDragHandle = this._createDragHandleDom('col');
+        this._rowDragHandle = this._createDragHandleDom('row');
+    }
+
+    get colDragHandle() {
+        return this._colDragHandle;
+    }
+
+    get rowDragHandle() {
+        return this._rowDragHandle;
+    }
+
+    show = (editor: Editor, hoveringCell: HoveringCellInfo) => {
+        this._showColDragHandle(editor, hoveringCell);
+        this._showRowDragHandle(editor, hoveringCell);
+    }
+
+    hide = () => {
+        Object.assign(this._colDragHandle.style, {
+            display: 'none',
+            left: '-999px',
+            top: '-999px',
+        });
+        Object.assign(this._rowDragHandle.style, {
+            display: 'none',
+            left: '-999px',
+            top: '-999px',
+        });
+    }
+
+    destroy = () => {
+        this._colDragHandle.remove()
+        this._rowDragHandle.remove()
+    }
+
+    private _createDragHandleDom = (type: 'col' | 'row') => {
+        const dragHandle = document.createElement('div')
+        dragHandle.classList.add('drag-handle')
+        dragHandle.setAttribute('draggable', 'true')
+        dragHandle.setAttribute('data-direction', type === 'col' ? 'horizontal' : 'vertical')
+        dragHandle.setAttribute('data-drag-handle', '')
+        Object.assign(dragHandle.style, {
+            position: 'absolute',
+            top: '-999px',
+            left: '-999px',
+            display: 'none',
+        })
+        return dragHandle;
+    }
+
+    private _showColDragHandle(editor: Editor, hoveringCell: HoveringCellInfo) {
+        const referenceCell = editor.view.nodeDOM(hoveringCell.colFirstCellPos);
+        if (!referenceCell) return;
+
+        const yOffset = -1 * parseInt(getComputedStyle(this._colDragHandle).height) / 2;
+
+        computePosition(
+            referenceCell as HTMLElement,
+            this._colDragHandle,
+            {
+                placement: 'top',
+                middleware: [offset(yOffset)]
+            }
+        )
+            .then(({ x, y }) => {
+                Object.assign(this._colDragHandle.style, {
+                    display: 'block',
+                    top: `${y}px`,
+                    left: `${x}px`,
+                });
+            })
+    }
+
+    private _showRowDragHandle(editor: Editor, hoveringCell: HoveringCellInfo) {
+        const referenceCell = editor.view.nodeDOM(hoveringCell.rowFirstCellPos);
+        if (!referenceCell) return;
+
+        const xOffset = -1 * parseInt(getComputedStyle(this._rowDragHandle).width) / 2;
+
+        computePosition(
+            referenceCell as HTMLElement,
+            this._rowDragHandle,
+            {
+                middleware: [offset(xOffset)],
+                placement: 'left'
+            }
+        )
+            .then(({ x, y}) => {
+                Object.assign(this._rowDragHandle.style, {
+                    display: 'block',
+                    top: `${y}px`,
+                    left: `${x}px`,
+                });
+            })
+    }
+}
\ No newline at end of file
diff --git a/packages/editor-ext/src/lib/table/dnd/handle/empty-image-controller.ts b/packages/editor-ext/src/lib/table/dnd/handle/empty-image-controller.ts
new file mode 100644
index 00000000..8848a6b0
--- /dev/null
+++ b/packages/editor-ext/src/lib/table/dnd/handle/empty-image-controller.ts
@@ -0,0 +1,21 @@
+export class EmptyImageController {
+    private _emptyImage: HTMLImageElement;
+
+    constructor() {
+        this._emptyImage = new Image(1, 1);
+        this._emptyImage.src = 'data:image/gif;base64,R0lGODlhAQABAIAAAAAAAP///yH5BAEAAAAALAAAAAABAAEAAAIBRAA7';
+    }
+
+    get emptyImage() {
+        return this._emptyImage;
+    }
+
+    hideDragImage = (dataTransfer: DataTransfer) => {
+        dataTransfer.effectAllowed = 'move';
+        dataTransfer.setDragImage(this._emptyImage, 0, 0);
+    }
+
+    destroy = () => {
+        this._emptyImage.remove();
+    }
+}
\ No newline at end of file
diff --git a/packages/editor-ext/src/lib/table/dnd/index.ts b/packages/editor-ext/src/lib/table/dnd/index.ts
new file mode 100644
index 00000000..cb21bec1
--- /dev/null
+++ b/packages/editor-ext/src/lib/table/dnd/index.ts
@@ -0,0 +1 @@
+export * from './dnd-extension'
\ No newline at end of file
diff --git a/packages/editor-ext/src/lib/table/dnd/preview/drop-indicator-controller.ts b/packages/editor-ext/src/lib/table/dnd/preview/drop-indicator-controller.ts
new file mode 100644
index 00000000..0f079828
--- /dev/null
+++ b/packages/editor-ext/src/lib/table/dnd/preview/drop-indicator-controller.ts
@@ -0,0 +1,102 @@
+import { computePosition, offset } from "@floating-ui/dom";
+import { DraggingDOMs } from "../utils";
+
+const DROP_INDICATOR_WIDTH = 2;
+
+export class DropIndicatorController {
+    private _dropIndicator: HTMLElement;
+
+    constructor() {
+        this._dropIndicator = document.createElement('div');
+        this._dropIndicator.classList.add('table-dnd-drop-indicator');
+        Object.assign(this._dropIndicator.style, {
+            position: 'absolute',
+            pointerEvents: 'none'
+        });
+    }
+
+    get dropIndicatorRoot() {
+        return this._dropIndicator;
+    }
+
+    onDragStart = (relatedDoms: DraggingDOMs, type: 'col' | 'row') => {
+        this._initDropIndicatorStyle(relatedDoms.table, type);
+        this._initDropIndicatorPosition(relatedDoms.cell, type);
+        this._dropIndicator.dataset.dragging = 'true';
+    }
+
+    onDragEnd = () => {
+        Object.assign(this._dropIndicator.style, { display: 'none' });
+        this._dropIndicator.dataset.dragging = 'false';
+    }
+
+    onDragging = (target: Element, direction: 'left' | 'right' | 'up' | 'down', type: 'col' | 'row') => {
+        if (type === 'col') {
+            void computePosition(target, this._dropIndicator, {
+                placement: direction === 'left' ? 'left' : 'right',
+                middleware: [offset((direction === 'left' ? -1 * DROP_INDICATOR_WIDTH : 0))],
+            }).then(({ x }) => {
+                Object.assign(this._dropIndicator.style, { left: `${x}px` });
+            })
+
+            return;
+        }
+
+        if (type === 'row') {
+            void computePosition(target, this._dropIndicator, {
+                placement: direction === 'up' ? 'top' : 'bottom',
+                middleware: [offset((direction === 'up' ? -1 * DROP_INDICATOR_WIDTH : 0))],
+            }).then(({ y }) => {
+                Object.assign(this._dropIndicator.style, { top: `${y}px` });
+            })
+
+            return;
+        }
+    }
+
+    destroy = () => {
+        this._dropIndicator.remove();
+    }
+
+    private _initDropIndicatorStyle = (table: HTMLElement, type: 'col' | 'row') => {
+        const tableRect = table.getBoundingClientRect();
+
+        if (type === 'col') {
+            Object.assign(this._dropIndicator.style, {
+                display: 'block',
+                width: `${DROP_INDICATOR_WIDTH}px`,
+                height: `${tableRect.height}px`,
+            });
+            return;
+        }
+
+        if (type === 'row') {
+            Object.assign(this._dropIndicator.style, {
+                display: 'block',
+                width: `${tableRect.width}px`,
+                height: `${DROP_INDICATOR_WIDTH}px`,
+            });
+        }
+    }
+
+
+    private _initDropIndicatorPosition = (cell: HTMLElement, type: 'col' | 'row') => {
+        void computePosition(cell, this._dropIndicator, {
+            placement: type === 'row' ? 'right' : 'bottom',
+            middleware: [
+                offset(({ rects }) => {
+                    if (type === 'col') {
+                        return -rects.reference.height
+                    }
+                    return -rects.reference.width
+                }),
+            ],
+        }).then(({ x, y }) => {
+            Object.assign(this._dropIndicator.style, {
+                left: `${x}px`,
+                top: `${y}px`,
+            })
+        });
+    }
+
+}
\ No newline at end of file
diff --git a/packages/editor-ext/src/lib/table/dnd/preview/preview-controller.ts b/packages/editor-ext/src/lib/table/dnd/preview/preview-controller.ts
new file mode 100644
index 00000000..b7a0ea40
--- /dev/null
+++ b/packages/editor-ext/src/lib/table/dnd/preview/preview-controller.ts
@@ -0,0 +1,122 @@
+import { computePosition, offset, ReferenceElement } from "@floating-ui/dom";
+import { DraggingDOMs } from "../utils";
+import { clearPreviewDOM, createPreviewDOM } from "./render-preview";
+
+export class PreviewController {
+    private _preview: HTMLElement;
+
+    constructor() {
+        this._preview = document.createElement('div');
+        this._preview.classList.add('table-dnd-preview');
+        this._preview.classList.add('ProseMirror');
+        Object.assign(this._preview.style, {
+            position: 'absolute',
+            pointerEvents: 'none',
+            display: 'none',
+        });
+    }
+
+    get previewRoot(): HTMLElement {
+        return this._preview;
+    }
+
+    onDragStart = (relatedDoms: DraggingDOMs, index: number | undefined, type: 'col' | 'row') => {
+        this._initPreviewStyle(relatedDoms.table, relatedDoms.cell, type);
+        createPreviewDOM(relatedDoms.table, this._preview, index, type)
+        this._initPreviewPosition(relatedDoms.cell, type);
+    }
+
+    onDragEnd = () => {
+        clearPreviewDOM(this._preview);
+        Object.assign(this._preview.style, { display: 'none' });
+    }
+
+    onDragging = (relatedDoms: DraggingDOMs, x: number, y: number, type: 'col' | 'row') => {
+        this._updatePreviewPosition(x, y, relatedDoms.cell, type);
+    }
+
+    destroy = () => {
+        this._preview.remove();
+    }
+
+    private _initPreviewStyle(table: HTMLTableElement, cell: HTMLTableCellElement, type: 'col' | 'row') {
+        const tableRect = table.getBoundingClientRect();
+        const cellRect = cell.getBoundingClientRect();
+
+        if (type === 'col') {
+            Object.assign(this._preview.style, {
+                display: 'block',
+                width: `${cellRect.width}px`,
+                height: `${tableRect.height}px`,
+            })
+        }
+
+        if (type === 'row') {
+            Object.assign(this._preview.style, {
+                display: 'block',
+                width: `${tableRect.width}px`,
+                height: `${cellRect.height}px`,
+            })
+        }
+    }
+
+    private _initPreviewPosition(cell: HTMLElement, type: 'col' | 'row') {
+        void computePosition(cell, this._preview, {
+            placement: type === 'row' ? 'right' : 'bottom',
+            middleware: [
+                offset(({ rects }) => {
+                    if (type === 'col') {
+                        return -rects.reference.height
+                    }
+                    return -rects.reference.width
+                }),
+            ],
+        }).then(({ x, y }) => {
+            Object.assign(this._preview.style, {
+                left: `${x}px`,
+                top: `${y}px`,
+            })
+        });
+    }
+
+    private _updatePreviewPosition(x: number, y: number, cell: HTMLElement, type: 'col' | 'row') {
+        computePosition(
+            getVirtualElement(cell, x, y),
+            this._preview,
+            { placement: type === 'row' ? 'right' : 'bottom' },
+        ).then(({ x, y }) => {
+            if (type === 'row') {
+                Object.assign(this._preview.style, {
+                    top: `${y}px`,
+                })
+                return
+            }
+
+            if (type === 'col') {
+                Object.assign(this._preview.style, {
+                    left: `${x}px`,
+                })
+                return
+            }
+        })
+    }
+}
+
+function getVirtualElement(cell: HTMLElement, x: number, y: number): ReferenceElement {
+  return {
+    contextElement: cell,
+    getBoundingClientRect: () => {
+      const rect = cell.getBoundingClientRect()
+      return {
+        width: rect.width,
+        height: rect.height,
+        right: x + rect.width / 2,
+        bottom: y + rect.height / 2,
+        top: y - rect.height / 2,
+        left: x - rect.width / 2,
+        x: x - rect.width / 2,
+        y: y - rect.height / 2,
+      }
+    },
+  }
+}
\ No newline at end of file
diff --git a/packages/editor-ext/src/lib/table/dnd/preview/render-preview.ts b/packages/editor-ext/src/lib/table/dnd/preview/render-preview.ts
new file mode 100644
index 00000000..fa251f8f
--- /dev/null
+++ b/packages/editor-ext/src/lib/table/dnd/preview/render-preview.ts
@@ -0,0 +1,37 @@
+export function clearPreviewDOM(previewRoot: HTMLElement): void {
+  while (previewRoot.firstChild) {
+    previewRoot.removeChild(previewRoot.firstChild)
+  }
+}
+
+export function createPreviewDOM(
+  table: HTMLTableElement,
+  previewRoot: HTMLElement,
+  index: number,
+  direction: 'row' | 'col',
+): void {
+  clearPreviewDOM(previewRoot)
+
+  const previewTable = document.createElement('table')
+  const previewTableBody = document.createElement('tbody')
+  previewTable.appendChild(previewTableBody)
+  previewRoot.appendChild(previewTable)
+
+  const rows = table.querySelectorAll('tr')
+
+  if (direction === 'row') {
+    const row = rows[index]
+    const rowDOM = row.cloneNode(true)
+    previewTableBody.appendChild(rowDOM)
+  } else {
+    rows.forEach((row) => {
+      const rowDOM = row.cloneNode(false)
+      const cells = row.querySelectorAll('th,td')
+      if (cells[index]) {
+        const cellDOM = cells[index].cloneNode(true)
+        rowDOM.appendChild(cellDOM)
+        previewTableBody.appendChild(rowDOM)
+      }
+    })
+  }
+}
\ No newline at end of file
diff --git a/packages/editor-ext/src/lib/table/dnd/utils.ts b/packages/editor-ext/src/lib/table/dnd/utils.ts
new file mode 100644
index 00000000..d184368f
--- /dev/null
+++ b/packages/editor-ext/src/lib/table/dnd/utils.ts
@@ -0,0 +1,107 @@
+import { cellAround, TableMap } from "@tiptap/pm/tables"
+import { EditorView } from "@tiptap/pm/view"
+
+export function getHoveringCell(
+  view: EditorView,
+  event: MouseEvent,
+): HoveringCellInfo | undefined {
+  const domCell = domCellAround(event.target as HTMLElement | null)
+  if (!domCell) return
+
+  const { left, top, width, height } = domCell.getBoundingClientRect()
+  const eventPos = view.posAtCoords({
+    // Use the center coordinates of the cell to ensure we're within the
+    // selected cell. This prevents potential issues when the mouse is on the
+    // border of two cells.
+    left: left + width / 2,
+    top: top + height / 2,
+  })
+  if (!eventPos) return
+
+  const $cellPos = cellAround(view.state.doc.resolve(eventPos.pos))
+  if (!$cellPos) return
+
+  const map = TableMap.get($cellPos.node(-1))
+  const tableStart = $cellPos.start(-1)
+  const cellRect = map.findCell($cellPos.pos - tableStart)
+  const rowIndex = cellRect.top
+  const colIndex = cellRect.left
+
+  return {
+    rowIndex,
+    colIndex,
+    cellPos: $cellPos.pos,
+    rowFirstCellPos: getCellPos(map, tableStart, rowIndex, 0),
+    colFirstCellPos: getCellPos(map, tableStart, 0, colIndex),
+  }
+}
+
+function domCellAround(target: HTMLElement | null): HTMLElement | null {
+  while (target && target.nodeName != 'TD' && target.nodeName != 'TH') {
+    target = target.classList?.contains('ProseMirror')
+      ? null
+      : (target.parentNode as HTMLElement | null)
+  }
+  return target
+}
+
+export interface HoveringCellInfo {
+  rowIndex: number
+  colIndex: number
+  cellPos: number
+  rowFirstCellPos: number
+  colFirstCellPos: number
+}
+
+function getCellPos(
+  map: TableMap,
+  tableStart: number,
+  rowIndex: number,
+  colIndex: number,
+) {
+  const cellIndex = getCellIndex(map, rowIndex, colIndex)
+  const posInTable = map.map[cellIndex]
+  return tableStart + posInTable
+}
+
+function getCellIndex(
+  map: TableMap,
+  rowIndex: number,
+  colIndex: number,
+): number {
+  return map.width * rowIndex + colIndex
+}
+
+function getTableDOMByPos(view: EditorView, pos: number): HTMLTableElement | undefined {
+  const dom = view.domAtPos(pos).node
+  if (!dom) return
+  const element = dom instanceof HTMLElement ? dom : dom.parentElement
+  const table = element?.closest('table')
+  return table ?? undefined
+}
+
+function getTargetFirstCellDOM(table: HTMLTableElement, index: number, direction: 'row' | 'col'): HTMLTableCellElement | undefined {
+  if (direction === 'row') {
+    const row = table.querySelectorAll('tr')[index]
+    const cell = row?.querySelector<HTMLTableCellElement>('th,td')
+    return cell ?? undefined
+  } else {
+    const row = table.querySelector('tr')
+    const cell = row?.querySelectorAll<HTMLTableCellElement>('th,td')[index]
+    return cell ?? undefined
+  }
+}
+
+export type DraggingDOMs = {
+    table: HTMLTableElement
+    cell: HTMLTableCellElement
+}
+
+export function getDndRelatedDOMs(view: EditorView, cellPos: number | undefined, draggingIndex: number, direction: 'row' | 'col'): DraggingDOMs | undefined {
+  if (cellPos == null) return
+  const table = getTableDOMByPos(view, cellPos)
+  if (!table) return
+  const cell = getTargetFirstCellDOM(table, draggingIndex, direction)
+  if (!cell) return
+  return { table, cell }
+}
\ No newline at end of file
diff --git a/packages/editor-ext/src/lib/table/index.ts b/packages/editor-ext/src/lib/table/index.ts
index fd1d8019..9e5a9265 100644
--- a/packages/editor-ext/src/lib/table/index.ts
+++ b/packages/editor-ext/src/lib/table/index.ts
@@ -2,3 +2,4 @@ export * from "./row";
 export * from "./cell";
 export * from "./header";
 export * from "./table";
+export * from "./dnd";
\ No newline at end of file
diff --git a/packages/editor-ext/src/lib/table/utils/convert-array-of-rows-to-table-node.ts b/packages/editor-ext/src/lib/table/utils/convert-array-of-rows-to-table-node.ts
new file mode 100644
index 00000000..c959ce50
--- /dev/null
+++ b/packages/editor-ext/src/lib/table/utils/convert-array-of-rows-to-table-node.ts
@@ -0,0 +1,44 @@
+import type { Node } from '@tiptap/pm/model'
+import { TableMap } from '@tiptap/pm/tables'
+
+/**
+ * Convert an array of rows to a table node.
+ *
+ * @internal
+ */
+export function convertArrayOfRowsToTableNode(
+  tableNode: Node,
+  arrayOfNodes: (Node | null)[][],
+): Node {
+  const rowsPM = []
+  const map = TableMap.get(tableNode)
+  for (let rowIndex = 0; rowIndex < map.height; rowIndex++) {
+    const row = tableNode.child(rowIndex)
+    const rowCells = []
+
+    for (let colIndex = 0; colIndex < map.width; colIndex++) {
+      if (!arrayOfNodes[rowIndex][colIndex]) continue
+
+      const cellPos = map.map[rowIndex * map.width + colIndex]
+
+      const cell = arrayOfNodes[rowIndex][colIndex]!
+      const oldCell = tableNode.nodeAt(cellPos)!
+      const newCell = oldCell.type.createChecked(
+        Object.assign({}, cell.attrs),
+        cell.content,
+        cell.marks,
+      )
+      rowCells.push(newCell)
+    }
+
+    rowsPM.push(row.type.createChecked(row.attrs, rowCells, row.marks))
+  }
+
+  const newTable = tableNode.type.createChecked(
+    tableNode.attrs,
+    rowsPM,
+    tableNode.marks,
+  )
+
+  return newTable
+}
diff --git a/packages/editor-ext/src/lib/table/utils/convert-table-node-to-array-of-rows.ts b/packages/editor-ext/src/lib/table/utils/convert-table-node-to-array-of-rows.ts
new file mode 100644
index 00000000..5d85b68b
--- /dev/null
+++ b/packages/editor-ext/src/lib/table/utils/convert-table-node-to-array-of-rows.ts
@@ -0,0 +1,61 @@
+import type { Node } from '@tiptap/pm/model'
+import { TableMap } from '@tiptap/pm/tables'
+
+/**
+ * This function will transform the table node into a matrix of rows and columns
+ * respecting merged cells, for example this table:
+ *
+ * ```
+ * ┌──────┬──────┬─────────────┐
+ * │  A1  │  B1  │     C1      │
+ * ├──────┼──────┴──────┬──────┤
+ * │  A2  │     B2      │      │
+ * ├──────┼─────────────┤  D1  │
+ * │  A3  │  B3  │  C3  │      │
+ * └──────┴──────┴──────┴──────┘
+ * ```
+ *
+ * will be converted to the below:
+ *
+ * ```javascript
+ * [
+ *   [A1, B1, C1, null],
+ *   [A2, B2, null, D1],
+ *   [A3, B3, C3, null],
+ * ]
+ * ```
+ * @internal
+ */
+export function convertTableNodeToArrayOfRows(tableNode: Node): (Node | null)[][] {
+  const map = TableMap.get(tableNode)
+  const rows: (Node | null)[][] = []
+  const rowCount = map.height
+  const colCount = map.width
+  for (let rowIndex = 0; rowIndex < rowCount; rowIndex++) {
+    const row: (Node | null)[] = []
+    for (let colIndex = 0; colIndex < colCount; colIndex++) {
+      let cellIndex = rowIndex * colCount + colIndex
+      let cellPos = map.map[cellIndex]
+      if (rowIndex > 0) {
+        const topCellIndex = cellIndex - colCount
+        const topCellPos = map.map[topCellIndex]
+        if (cellPos === topCellPos) {
+          row.push(null)
+          continue
+        }
+      }
+      if (colIndex > 0) {
+        const leftCellIndex = cellIndex - 1
+        const leftCellPos = map.map[leftCellIndex]
+        if (cellPos === leftCellPos) {
+          row.push(null)
+          continue
+        }
+      }
+      row.push(tableNode.nodeAt(cellPos))
+    }
+    rows.push(row)
+  }
+
+  return rows
+}
diff --git a/packages/editor-ext/src/lib/table/utils/get-cells-in-column.ts b/packages/editor-ext/src/lib/table/utils/get-cells-in-column.ts
new file mode 100644
index 00000000..0f9d6534
--- /dev/null
+++ b/packages/editor-ext/src/lib/table/utils/get-cells-in-column.ts
@@ -0,0 +1,36 @@
+import type { Selection } from '@tiptap/pm/state'
+import { TableMap } from '@tiptap/pm/tables'
+
+import { findTable } from './query'
+import type { CellPos } from './types'
+
+/**
+ * Returns an array of cells in a column(s), where `columnIndex` could be a column index or an array of column indexes.
+ *
+ * @internal
+ */
+export function getCellsInColumn(columnIndexes: number | number[], selection: Selection): CellPos[] | undefined {
+  const table = findTable(selection.$from)
+  if (!table) {
+    return
+  }
+
+  const map = TableMap.get(table.node)
+  const indexes = Array.isArray(columnIndexes) ? columnIndexes : [columnIndexes]
+
+  return indexes
+    .filter((index) => index >= 0 && index <= map.width - 1)
+    .flatMap((index) => {
+      const cells = map.cellsInRect({
+        left: index,
+        right: index + 1,
+        top: 0,
+        bottom: map.height,
+      })
+      return cells.map((nodePos) => {
+        const node = table.node.nodeAt(nodePos)!
+        const pos = nodePos + table.start
+        return { pos, start: pos + 1, node, depth: table.depth + 2 }
+      })
+    })
+}
diff --git a/packages/editor-ext/src/lib/table/utils/get-cells-in-row.ts b/packages/editor-ext/src/lib/table/utils/get-cells-in-row.ts
new file mode 100644
index 00000000..75e73546
--- /dev/null
+++ b/packages/editor-ext/src/lib/table/utils/get-cells-in-row.ts
@@ -0,0 +1,36 @@
+import type { Selection } from '@tiptap/pm/state'
+import { TableMap } from '@tiptap/pm/tables'
+
+import { findTable } from './query'
+import type { CellPos } from './types'
+
+/**
+ * Returns an array of cells in a row(s), where `rowIndex` could be a row index or an array of row indexes.
+ *
+ * @internal
+ */
+export function getCellsInRow(rowIndex: number | number[], selection: Selection): CellPos[] | undefined {
+  const table = findTable(selection.$from)
+  if (!table) {
+    return
+  }
+
+  const map = TableMap.get(table.node)
+  const indexes = Array.isArray(rowIndex) ? rowIndex : [rowIndex]
+
+  return indexes
+    .filter((index) => index >= 0 && index <= map.height - 1)
+    .flatMap((index) => {
+      const cells = map.cellsInRect({
+        left: 0,
+        right: map.width,
+        top: index,
+        bottom: index + 1,
+      })
+      return cells.map((nodePos) => {
+        const node = table.node.nodeAt(nodePos)!
+        const pos = nodePos + table.start
+        return { pos, start: pos + 1, node, depth: table.depth + 2 }
+      })
+    })
+}
diff --git a/packages/editor-ext/src/lib/table/utils/get-selection-range-in-column.ts b/packages/editor-ext/src/lib/table/utils/get-selection-range-in-column.ts
new file mode 100644
index 00000000..6fda934d
--- /dev/null
+++ b/packages/editor-ext/src/lib/table/utils/get-selection-range-in-column.ts
@@ -0,0 +1,91 @@
+import type { Transaction } from '@tiptap/pm/state'
+
+import { getCellsInColumn } from './get-cells-in-column'
+import { getCellsInRow } from './get-cells-in-row'
+import type { CellSelectionRange } from './types'
+
+/**
+ * Returns a range of rectangular selection spanning all merged cells around a
+ * column at index `columnIndex`.
+ *
+ * Original implementation from Atlassian (Apache License 2.0)
+ *
+ * https://bitbucket.org/atlassian/atlassian-frontend-mirror/src/5f91cb871e8248bc3bae5ddc30bb9fd9200fadbb/editor/editor-tables/src/utils/get-selection-range-in-column.ts#editor/editor-tables/src/utils/get-selection-range-in-column.ts
+ *
+ * @internal
+ */
+export function getSelectionRangeInColumn(tr: Transaction, startColIndex: number, endColIndex: number = startColIndex): CellSelectionRange | undefined {
+  let startIndex = startColIndex
+  let endIndex = endColIndex
+
+  // looking for selection start column (startIndex)
+  for (let i = startColIndex; i >= 0; i--) {
+    const cells = getCellsInColumn(i, tr.selection)
+    if (cells) {
+      cells.forEach((cell) => {
+        const maybeEndIndex = cell.node.attrs.colspan + i - 1
+        if (maybeEndIndex >= startIndex) {
+          startIndex = i
+        }
+        if (maybeEndIndex > endIndex) {
+          endIndex = maybeEndIndex
+        }
+      })
+    }
+  }
+  // looking for selection end column (endIndex)
+  for (let i = startColIndex; i <= endIndex; i++) {
+    const cells = getCellsInColumn(i, tr.selection)
+    if (cells) {
+      cells.forEach((cell) => {
+        const maybeEndIndex = cell.node.attrs.colspan + i - 1
+        if (cell.node.attrs.colspan > 1 && maybeEndIndex > endIndex) {
+          endIndex = maybeEndIndex
+        }
+      })
+    }
+  }
+
+  // filter out columns without cells (where all rows have colspan > 1 in the same column)
+  const indexes = []
+  for (let i = startIndex; i <= endIndex; i++) {
+    const maybeCells = getCellsInColumn(i, tr.selection)
+    if (maybeCells && maybeCells.length > 0) {
+      indexes.push(i)
+    }
+  }
+  startIndex = indexes[0]
+  endIndex = indexes[indexes.length - 1]
+
+  const firstSelectedColumnCells = getCellsInColumn(startIndex, tr.selection)
+  const firstRowCells = getCellsInRow(0, tr.selection)
+  if (!firstSelectedColumnCells || !firstRowCells) {
+    return
+  }
+
+  const $anchor = tr.doc.resolve(
+    firstSelectedColumnCells[firstSelectedColumnCells.length - 1].pos,
+  )
+
+  let headCell
+  for (let i = endIndex; i >= startIndex; i--) {
+    const columnCells = getCellsInColumn(i, tr.selection)
+    if (columnCells && columnCells.length > 0) {
+      for (let j = firstRowCells.length - 1; j >= 0; j--) {
+        if (firstRowCells[j].pos === columnCells[0].pos) {
+          headCell = columnCells[0]
+          break
+        }
+      }
+      if (headCell) {
+        break
+      }
+    }
+  }
+  if (!headCell) {
+    return
+  }
+
+  const $head = tr.doc.resolve(headCell.pos)
+  return { $anchor, $head, indexes }
+}
diff --git a/packages/editor-ext/src/lib/table/utils/get-selection-range-in-row.ts b/packages/editor-ext/src/lib/table/utils/get-selection-range-in-row.ts
new file mode 100644
index 00000000..ece61d7f
--- /dev/null
+++ b/packages/editor-ext/src/lib/table/utils/get-selection-range-in-row.ts
@@ -0,0 +1,89 @@
+import type { Transaction } from '@tiptap/pm/state'
+
+import { getCellsInColumn } from './get-cells-in-column'
+import { getCellsInRow } from './get-cells-in-row'
+import type { CellSelectionRange } from './types'
+
+/**
+ * Returns a range of rectangular selection spanning all merged cells around a
+ * row at index `rowIndex`.
+ *
+ * Original implementation from Atlassian (Apache License 2.0)
+ *
+ * https://bitbucket.org/atlassian/atlassian-frontend-mirror/src/5f91cb871e8248bc3bae5ddc30bb9fd9200fadbb/editor/editor-tables/src/utils/get-selection-range-in-row.ts#editor/editor-tables/src/utils/get-selection-range-in-row.ts
+ *
+ * @internal
+ */
+export function getSelectionRangeInRow(tr: Transaction, startRowIndex: number, endRowIndex: number = startRowIndex): CellSelectionRange | undefined {
+  let startIndex = startRowIndex
+  let endIndex = endRowIndex
+
+  // looking for selection start row (startIndex)
+  for (let i = startRowIndex; i >= 0; i--) {
+    const cells = getCellsInRow(i, tr.selection)
+    if (cells) {
+      cells.forEach((cell) => {
+        const maybeEndIndex = cell.node.attrs.rowspan + i - 1
+        if (maybeEndIndex >= startIndex) {
+          startIndex = i
+        }
+        if (maybeEndIndex > endIndex) {
+          endIndex = maybeEndIndex
+        }
+      })
+    }
+  }
+  // looking for selection end row (endIndex)
+  for (let i = startRowIndex; i <= endIndex; i++) {
+    const cells = getCellsInRow(i, tr.selection)
+    if (cells) {
+      cells.forEach((cell) => {
+        const maybeEndIndex = cell.node.attrs.rowspan + i - 1
+        if (cell.node.attrs.rowspan > 1 && maybeEndIndex > endIndex) {
+          endIndex = maybeEndIndex
+        }
+      })
+    }
+  }
+
+  // filter out rows without cells (where all columns have rowspan > 1 in the same row)
+  const indexes = []
+  for (let i = startIndex; i <= endIndex; i++) {
+    const maybeCells = getCellsInRow(i, tr.selection)
+    if (maybeCells && maybeCells.length > 0) {
+      indexes.push(i)
+    }
+  }
+  startIndex = indexes[0]
+  endIndex = indexes[indexes.length - 1]
+
+  const firstSelectedRowCells = getCellsInRow(startIndex, tr.selection)
+  const firstColumnCells = getCellsInColumn(0, tr.selection)
+  if (!firstSelectedRowCells || !firstColumnCells) {
+    return
+  }
+
+  const $anchor = tr.doc.resolve(firstSelectedRowCells[firstSelectedRowCells.length - 1].pos)
+
+  let headCell
+  for (let i = endIndex; i >= startIndex; i--) {
+    const rowCells = getCellsInRow(i, tr.selection)
+    if (rowCells && rowCells.length > 0) {
+      for (let j = firstColumnCells.length - 1; j >= 0; j--) {
+        if (firstColumnCells[j].pos === rowCells[0].pos) {
+          headCell = rowCells[0]
+          break
+        }
+      }
+      if (headCell) {
+        break
+      }
+    }
+  }
+  if (!headCell) {
+    return
+  }
+
+  const $head = tr.doc.resolve(headCell.pos)
+  return { $anchor, $head, indexes }
+}
diff --git a/packages/editor-ext/src/lib/table/utils/index.ts b/packages/editor-ext/src/lib/table/utils/index.ts
new file mode 100644
index 00000000..23169970
--- /dev/null
+++ b/packages/editor-ext/src/lib/table/utils/index.ts
@@ -0,0 +1,3 @@
+export * from './move-column'
+export * from './move-row'
+export * from './query'
diff --git a/packages/editor-ext/src/lib/table/utils/move-column.ts b/packages/editor-ext/src/lib/table/utils/move-column.ts
new file mode 100644
index 00000000..d73e06bf
--- /dev/null
+++ b/packages/editor-ext/src/lib/table/utils/move-column.ts
@@ -0,0 +1,81 @@
+import type { Node } from '@tiptap/pm/model'
+import type { Transaction } from '@tiptap/pm/state'
+import {
+  CellSelection,
+  TableMap,
+} from '@tiptap/pm/tables'
+
+import { convertArrayOfRowsToTableNode } from './convert-array-of-rows-to-table-node'
+import { convertTableNodeToArrayOfRows } from './convert-table-node-to-array-of-rows'
+import { getSelectionRangeInColumn } from './get-selection-range-in-column'
+import { moveRowInArrayOfRows } from './move-row-in-array-of-rows'
+import { findTable } from './query'
+import { transpose } from './transpose'
+
+export interface MoveColumnParams {
+  tr: Transaction
+  originIndex: number
+  targetIndex: number
+  select: boolean
+  pos: number
+}
+
+/**
+ * Move a column from index `origin` to index `target`.
+ *
+ * @internal
+ */
+export function moveColumn(moveColParams: MoveColumnParams): boolean {
+  const { tr, originIndex, targetIndex, select, pos } = moveColParams
+  const $pos = tr.doc.resolve(pos)
+  const table = findTable($pos)
+  if (!table) return false
+
+  const indexesOriginColumn = getSelectionRangeInColumn(tr, originIndex)?.indexes
+  const indexesTargetColumn = getSelectionRangeInColumn(tr, targetIndex)?.indexes
+
+  if (!indexesOriginColumn || !indexesTargetColumn) return false
+
+  if (indexesOriginColumn.includes(targetIndex)) return false
+
+  const newTable = moveTableColumn(
+    table.node,
+    indexesOriginColumn,
+    indexesTargetColumn,
+    0,
+  )
+
+  tr.replaceWith(
+    table.pos,
+    table.pos + table.node.nodeSize,
+    newTable,
+  )
+
+  if (!select) return true
+
+  const map = TableMap.get(newTable)
+  const start = table.start
+  const index = targetIndex
+  const lastCell = map.positionAt(map.height - 1, index, newTable)
+  const $lastCell = tr.doc.resolve(start + lastCell)
+
+  const firstCell = map.positionAt(0, index, newTable)
+  const $firstCell = tr.doc.resolve(start + firstCell)
+
+  tr.setSelection(CellSelection.colSelection($lastCell, $firstCell))
+  return true
+}
+
+function moveTableColumn(
+  table: Node,
+  indexesOrigin: number[],
+  indexesTarget: number[],
+  direction: -1 | 1 | 0,
+) {
+  let rows = transpose(convertTableNodeToArrayOfRows(table))
+
+  rows = moveRowInArrayOfRows(rows, indexesOrigin, indexesTarget, direction)
+  rows = transpose(rows)
+
+  return convertArrayOfRowsToTableNode(table, rows)
+}
diff --git a/packages/editor-ext/src/lib/table/utils/move-row-in-array-of-rows.ts b/packages/editor-ext/src/lib/table/utils/move-row-in-array-of-rows.ts
new file mode 100644
index 00000000..529df254
--- /dev/null
+++ b/packages/editor-ext/src/lib/table/utils/move-row-in-array-of-rows.ts
@@ -0,0 +1,30 @@
+/**
+ * Move a row in an array of rows.
+ *
+ * @internal
+ */
+export function moveRowInArrayOfRows<T>(
+  rows: T[],
+  indexesOrigin: number[],
+  indexesTarget: number[],
+  directionOverride: -1 | 1 | 0,
+): T[] {
+  const direction = indexesOrigin[0] > indexesTarget[0] ? -1 : 1
+
+  const rowsExtracted = rows.splice(indexesOrigin[0], indexesOrigin.length)
+  const positionOffset = rowsExtracted.length % 2 === 0 ? 1 : 0
+  let target: number
+
+  if (directionOverride === -1 && direction === 1) {
+    target = indexesTarget[0] - 1
+  } else if (directionOverride === 1 && direction === -1) {
+    target = indexesTarget[indexesTarget.length - 1] - positionOffset + 1
+  } else {
+    target = direction === -1
+      ? indexesTarget[0]
+      : indexesTarget[indexesTarget.length - 1] - positionOffset
+  }
+
+  rows.splice(target, 0, ...rowsExtracted)
+  return rows
+}
diff --git a/packages/editor-ext/src/lib/table/utils/move-row.ts b/packages/editor-ext/src/lib/table/utils/move-row.ts
new file mode 100644
index 00000000..e69e870a
--- /dev/null
+++ b/packages/editor-ext/src/lib/table/utils/move-row.ts
@@ -0,0 +1,74 @@
+import type { Node } from '@tiptap/pm/model'
+import type { Transaction } from '@tiptap/pm/state'
+import {
+  CellSelection,
+  TableMap,
+} from '@tiptap/pm/tables'
+
+import { convertArrayOfRowsToTableNode } from './convert-array-of-rows-to-table-node'
+import { convertTableNodeToArrayOfRows } from './convert-table-node-to-array-of-rows'
+import { getSelectionRangeInRow } from './get-selection-range-in-row'
+import { moveRowInArrayOfRows } from './move-row-in-array-of-rows'
+import { findTable } from './query'
+
+export interface MoveRowParams {
+  tr: Transaction
+  originIndex: number
+  targetIndex: number
+  select: boolean
+  pos: number
+}
+
+/**
+ * Move a row from index `origin` to index `target`.
+ *
+ * @internal
+ */
+export function moveRow(moveRowParams: MoveRowParams): boolean {
+  const { tr, originIndex, targetIndex, select, pos } = moveRowParams
+  const $pos = tr.doc.resolve(pos)
+  const table = findTable($pos)
+  if (!table) return false
+
+  const indexesOriginRow = getSelectionRangeInRow(tr, originIndex)?.indexes
+  const indexesTargetRow = getSelectionRangeInRow(tr, targetIndex)?.indexes
+
+  if (!indexesOriginRow || !indexesTargetRow) return false
+
+  if (indexesOriginRow.includes(targetIndex)) return false
+
+  const newTable = moveTableRow(table.node, indexesOriginRow, indexesTargetRow, 0)
+
+  tr.replaceWith(
+    table.pos,
+    table.pos + table.node.nodeSize,
+    newTable,
+  )
+
+  if (!select) return true
+
+  const map = TableMap.get(newTable)
+  const start = table.start
+  const index = targetIndex
+  const lastCell = map.positionAt(index, map.width - 1, newTable)
+  const $lastCell = tr.doc.resolve(start + lastCell)
+
+  const firstCell = map.positionAt(index, 0, newTable)
+  const $firstCell = tr.doc.resolve(start + firstCell)
+
+  tr.setSelection(CellSelection.rowSelection($lastCell, $firstCell))
+  return true
+}
+
+function moveTableRow(
+  table: Node,
+  indexesOrigin: number[],
+  indexesTarget: number[],
+  direction: -1 | 1 | 0,
+) {
+  let rows = convertTableNodeToArrayOfRows(table)
+
+  rows = moveRowInArrayOfRows(rows, indexesOrigin, indexesTarget, direction)
+
+  return convertArrayOfRowsToTableNode(table, rows)
+}
diff --git a/packages/editor-ext/src/lib/table/utils/query.ts b/packages/editor-ext/src/lib/table/utils/query.ts
new file mode 100644
index 00000000..3d0a542b
--- /dev/null
+++ b/packages/editor-ext/src/lib/table/utils/query.ts
@@ -0,0 +1,122 @@
+import type {
+  Node,
+  ResolvedPos,
+} from '@tiptap/pm/model'
+import type { Selection } from '@tiptap/pm/state'
+import {
+  cellAround,
+  cellNear,
+  CellSelection,
+  inSameTable,
+} from '@tiptap/pm/tables'
+
+/**
+ * Checks if the given object is a `CellSelection` instance.
+ *
+ * @public
+ */
+export function isCellSelection(value: unknown): value is CellSelection {
+  return value instanceof CellSelection
+}
+
+/**
+ * Find the closest table node.
+ *
+ * @internal
+ */
+export function findTable($pos: ResolvedPos): FindParentNodeResult | undefined {
+  return findParentNode((node) => node.type.spec.tableRole === 'table', $pos)
+}
+
+/**
+ * Try to find the anchor and head cell in the same table by using the given
+ * anchor and head as hit points, or fallback to the selection's anchor and
+ * head.
+ *
+ * @internal
+ */
+export function findCellRange(
+  selection: Selection,
+  anchorHit?: number,
+  headHit?: number,
+): [ResolvedPos, ResolvedPos] | undefined {
+  if (anchorHit == null && headHit == null && isCellSelection(selection)) {
+    return [selection.$anchorCell, selection.$headCell]
+  }
+
+  const anchor: number = anchorHit ?? headHit ?? selection.anchor
+  const head: number = headHit ?? anchorHit ?? selection.head
+
+  const doc = selection.$head.doc
+
+  const $anchorCell = findCellPos(doc, anchor)
+  const $headCell = findCellPos(doc, head)
+
+  if ($anchorCell && $headCell && inSameTable($anchorCell, $headCell)) {
+    return [$anchorCell, $headCell]
+  }
+}
+
+/**
+ * Try to find a resolved pos of a cell by using the given pos as a hit point.
+ *
+ * @internal
+ */
+export function findCellPos(
+  doc: Node,
+  pos: number,
+): ResolvedPos | undefined {
+  const $pos = doc.resolve(pos)
+  return cellAround($pos) || cellNear($pos)
+}
+
+/**
+ * @internal
+ */
+export interface FindParentNodeResult {
+  /**
+   * The closest parent node that satisfies the predicate.
+   */
+  node: Node
+
+  /**
+   * The position directly before the node.
+   */
+  pos: number
+
+  /**
+   * The position at the start of the node.
+   */
+  start: number
+
+  /**
+   * The depth of the node.
+   */
+  depth: number
+}
+
+/**
+ * Find the closest parent node that satisfies the predicate.
+ *
+ * @internal
+ */
+export function findParentNode(
+  /**
+   * The predicate to test the parent node.
+   */
+  predicate: (node: Node) => boolean,
+  /**
+   * The position to start searching from.
+   */
+  $pos: ResolvedPos,
+): FindParentNodeResult | undefined {
+  for (let depth = $pos.depth; depth >= 0; depth -= 1) {
+    const node = $pos.node(depth)
+
+    if (predicate(node)) {
+      const pos = depth === 0 ? 0 : $pos.before(depth)
+      const start = $pos.start(depth)
+      return { node, pos, start, depth }
+    }
+  }
+}
diff --git a/packages/editor-ext/src/lib/table/utils/transpose.ts b/packages/editor-ext/src/lib/table/utils/transpose.ts
new file mode 100644
index 00000000..dffc6e26
--- /dev/null
+++ b/packages/editor-ext/src/lib/table/utils/transpose.ts
@@ -0,0 +1,29 @@
+/**
+ * Transposes a 2D array by flipping columns to rows.
+ *
+ * Transposition is a familiar algebra concept where the matrix is flipped
+ * along its diagonal. For more details, see:
+ * https://en.wikipedia.org/wiki/Transpose
+ *
+ * @example
+ * ```javascript
+ * const arr = [
+ *   ['a1', 'a2', 'a3'],
+ *   ['b1', 'b2', 'b3'],
+ *   ['c1', 'c2', 'c3'],
+ *   ['d1', 'd2', 'd3'],
+ * ];
+ *
+ * const result = transpose(arr);
+ * result === [
+ *   ['a1', 'b1', 'c1', 'd1'],
+ *   ['a2', 'b2', 'c2', 'd2'],
+ *   ['a3', 'b3', 'c3', 'd3'],
+ * ]
+ * ```
+ */
+export function transpose<T>(array: T[][]): T[][] {
+  return array[0].map((_, i) => {
+    return array.map((column) => column[i])
+  })
+}
diff --git a/packages/editor-ext/src/lib/table/utils/types.ts b/packages/editor-ext/src/lib/table/utils/types.ts
new file mode 100644
index 00000000..a45f5be1
--- /dev/null
+++ b/packages/editor-ext/src/lib/table/utils/types.ts
@@ -0,0 +1,18 @@
+import type {
+  Node,
+  ResolvedPos,
+} from '@tiptap/pm/model'
+
+export type CellPos = {
+  pos: number
+  start: number
+  depth: number
+  node: Node
+}
+
+export type CellSelectionRange = {
+  $anchor: ResolvedPos
+  $head: ResolvedPos
+  // an array of column/row indexes
+  indexes: number[]
+}
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index b9fdc892..1bb9b885 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -22,6 +22,9 @@ importers:
       '@docmost/editor-ext':
         specifier: workspace:*
         version: link:packages/editor-ext
+      '@floating-ui/dom':
+        specifier: ^1.7.3
+        version: 1.7.3
       '@hocuspocus/extension-redis':
         specifier: ^2.15.2
         version: 2.15.2(y-protocols@1.0.6(yjs@13.6.27))(yjs@13.6.27)
@@ -2189,9 +2192,15 @@ packages:
   '@floating-ui/core@1.5.3':
     resolution: {integrity: sha512-O0WKDOo0yhJuugCx6trZQj5jVJ9yR0ystG2JaNAemYUWce+pmM6WUEFIibnWyEJKdrDxhm75NoSRME35FNaM/Q==}
 
+  '@floating-ui/core@1.7.3':
+    resolution: {integrity: sha512-sGnvb5dmrJaKEZ+LDIpguvdX3bDlEllmv4/ClQ9awcmCZrlx5jQyyMWFM5kBI+EyNOCDDiKk8il0zeuX3Zlg/w==}
+
   '@floating-ui/dom@1.6.3':
     resolution: {integrity: sha512-RnDthu3mzPlQ31Ss/BTwQ1zjzIhr3lk1gZB1OC56h/1vEtaXkESrOqL5fQVMfXpwGtRwX+YsZBdyHtJMQnkArw==}
 
+  '@floating-ui/dom@1.7.3':
+    resolution: {integrity: sha512-uZA413QEpNuhtb3/iIKoYMSK07keHPYeXF02Zhd6e213j+d1NamLix/mCLxBUDW/Gx52sPH2m+chlUsyaBs/Ag==}
+
   '@floating-ui/react-dom@2.1.2':
     resolution: {integrity: sha512-06okr5cgPzMNBy+Ycse2A6udMi4bqwW/zgBF/rwjcNqWkyr82Mcg8b0vjX8OJpZFy/FKjJmw6wV7t44kK6kW7A==}
     peerDependencies:
@@ -2204,6 +2213,9 @@ packages:
       react: '>=16.8.0'
       react-dom: '>=16.8.0'
 
+  '@floating-ui/utils@0.2.10':
+    resolution: {integrity: sha512-aGTxbpbg8/b5JfU1HXSrbH3wXZuLPJcNEcZQFMxLs3oSzgtVu6nFPkbbGGUvBcUjKV2YyB9Wxxabo+HEH9tcRQ==}
+
   '@floating-ui/utils@0.2.8':
     resolution: {integrity: sha512-kym7SodPp8/wloecOpcmSnWJsK7M0E5Wg8UcFA+uO4B9s5d0ywXOEro/8HM9x0rW+TljRzul/14UYz3TleT3ig==}
 
@@ -11848,11 +11860,20 @@ snapshots:
     dependencies:
       '@floating-ui/utils': 0.2.8
 
+  '@floating-ui/core@1.7.3':
+    dependencies:
+      '@floating-ui/utils': 0.2.10
+
   '@floating-ui/dom@1.6.3':
     dependencies:
       '@floating-ui/core': 1.5.3
       '@floating-ui/utils': 0.2.8
 
+  '@floating-ui/dom@1.7.3':
+    dependencies:
+      '@floating-ui/core': 1.7.3
+      '@floating-ui/utils': 0.2.10
+
   '@floating-ui/react-dom@2.1.2(react-dom@18.3.1(react@18.3.1))(react@18.3.1)':
     dependencies:
       '@floating-ui/dom': 1.6.3
@@ -11867,6 +11888,8 @@ snapshots:
       react-dom: 18.3.1(react@18.3.1)
       tabbable: 6.2.0
 
+  '@floating-ui/utils@0.2.10': {}
+
   '@floating-ui/utils@0.2.8': {}
 
   '@hocuspocus/common@2.15.2':

From 73ee6ee8c342b78b9c9119d9a5c4f868dea9ae14 Mon Sep 17 00:00:00 2001
From: Philip Okugbe <16838612+Philipinho@users.noreply.github.com>
Date: Sun, 31 Aug 2025 18:54:52 +0100
Subject: [PATCH 14/46] feat: subpages (child pages) list node (#1462)

* feat: subpages list node

* disable user-select

* support subpages node list in public pages
---
 .../public/locales/en-US/translation.json     |   7 +-
 .../components/slash-menu/menu-items.ts       |  15 ++-
 .../components/subpages/subpages-menu.tsx     |  95 ++++++++++++++
 .../components/subpages/subpages-view.tsx     | 120 ++++++++++++++++++
 .../components/subpages/subpages.module.css   |   9 ++
 .../features/editor/extensions/extensions.ts  |   5 +
 .../src/features/editor/page-editor.tsx       |   2 +
 .../features/editor/readonly-page-editor.tsx  |  13 +-
 .../src/features/page/queries/page-query.ts   |   1 +
 .../src/features/page/types/page.types.ts     |   2 +-
 .../features/share/atoms/shared-page-atom.ts  |   6 +
 .../features/share/components/share-shell.tsx |  20 ++-
 .../share/hooks/use-shared-page-subpages.ts   |  29 +++++
 apps/client/src/pages/share/shared-page.tsx   |   1 +
 .../src/collaboration/collaboration.util.ts   |   2 +
 .../src/core/page/dto/sidebar-page.dto.ts     |   8 +-
 apps/server/src/core/page/page.controller.ts  |  29 +++--
 packages/editor-ext/src/index.ts              |   1 +
 packages/editor-ext/src/lib/subpages/index.ts |   2 +
 .../editor-ext/src/lib/subpages/subpages.ts   |  68 ++++++++++
 20 files changed, 410 insertions(+), 25 deletions(-)
 create mode 100644 apps/client/src/features/editor/components/subpages/subpages-menu.tsx
 create mode 100644 apps/client/src/features/editor/components/subpages/subpages-view.tsx
 create mode 100644 apps/client/src/features/editor/components/subpages/subpages.module.css
 create mode 100644 apps/client/src/features/share/atoms/shared-page-atom.ts
 create mode 100644 apps/client/src/features/share/hooks/use-shared-page-subpages.ts
 create mode 100644 packages/editor-ext/src/lib/subpages/index.ts
 create mode 100644 packages/editor-ext/src/lib/subpages/subpages.ts

diff --git a/apps/client/public/locales/en-US/translation.json b/apps/client/public/locales/en-US/translation.json
index efad41cc..3efcdfec 100644
--- a/apps/client/public/locales/en-US/translation.json
+++ b/apps/client/public/locales/en-US/translation.json
@@ -495,5 +495,10 @@
   "Page restored successfully": "Page restored successfully",
   "Deleted by": "Deleted by",
   "Deleted at": "Deleted at",
-  "Preview": "Preview"
+  "Preview": "Preview",
+  "Subpages": "Subpages",
+  "Failed to load subpages": "Failed to load subpages",
+  "No subpages": "No subpages",
+  "Subpages (Child pages)": "Subpages (Child pages)",
+  "List all subpages of the current page": "List all subpages of the current page"
 }
diff --git a/apps/client/src/features/editor/components/slash-menu/menu-items.ts b/apps/client/src/features/editor/components/slash-menu/menu-items.ts
index 42bed5c1..f56d7f04 100644
--- a/apps/client/src/features/editor/components/slash-menu/menu-items.ts
+++ b/apps/client/src/features/editor/components/slash-menu/menu-items.ts
@@ -17,8 +17,10 @@ import {
   IconTable,
   IconTypography,
   IconMenu4,
-  IconCalendar, IconAppWindow,
-} from '@tabler/icons-react';
+  IconCalendar,
+  IconAppWindow,
+  IconSitemap,
+} from "@tabler/icons-react";
 import {
   CommandProps,
   SlashMenuGroupedItemsType,
@@ -357,6 +359,15 @@ const CommandGroups: SlashMenuGroupedItemsType = {
           .run();
       },
     },
+    {
+      title: "Subpages (Child pages)",
+      description: "List all subpages of the current page",
+      searchTerms: ["subpages", "child", "children", "nested", "hierarchy"],
+      icon: IconSitemap,
+      command: ({ editor, range }: CommandProps) => {
+        editor.chain().focus().deleteRange(range).insertSubpages().run();
+      },
+    },
     {
       title: "Iframe embed",
       description: "Embed any Iframe",
diff --git a/apps/client/src/features/editor/components/subpages/subpages-menu.tsx b/apps/client/src/features/editor/components/subpages/subpages-menu.tsx
new file mode 100644
index 00000000..6cc017e2
--- /dev/null
+++ b/apps/client/src/features/editor/components/subpages/subpages-menu.tsx
@@ -0,0 +1,95 @@
+import {
+  BubbleMenu as BaseBubbleMenu,
+  posToDOMRect,
+  findParentNode,
+} from "@tiptap/react";
+import { Node as PMNode } from "@tiptap/pm/model";
+import React, { useCallback } from "react";
+import { ActionIcon, Tooltip } from "@mantine/core";
+import { IconTrash } from "@tabler/icons-react";
+import { useTranslation } from "react-i18next";
+import { Editor } from "@tiptap/core";
+import { sticky } from "tippy.js";
+
+interface SubpagesMenuProps {
+  editor: Editor;
+}
+
+interface ShouldShowProps {
+  state: any;
+  from?: number;
+  to?: number;
+}
+
+export const SubpagesMenu = React.memo(
+  ({ editor }: SubpagesMenuProps): JSX.Element => {
+    const { t } = useTranslation();
+
+    const shouldShow = useCallback(
+      ({ state }: ShouldShowProps) => {
+        if (!state) {
+          return false;
+        }
+
+        return editor.isActive("subpages");
+      },
+      [editor],
+    );
+
+    const getReferenceClientRect = useCallback(() => {
+      const { selection } = editor.state;
+      const predicate = (node: PMNode) => node.type.name === "subpages";
+      const parent = findParentNode(predicate)(selection);
+
+      if (parent) {
+        const dom = editor.view.nodeDOM(parent?.pos) as HTMLElement;
+        return dom.getBoundingClientRect();
+      }
+
+      return posToDOMRect(editor.view, selection.from, selection.to);
+    }, [editor]);
+
+    const deleteNode = useCallback(() => {
+      const { selection } = editor.state;
+      editor
+        .chain()
+        .focus()
+        .setNodeSelection(selection.from)
+        .deleteSelection()
+        .run();
+    }, [editor]);
+
+    return (
+      <BaseBubbleMenu
+        editor={editor}
+        pluginKey={`subpages-menu}`}
+        updateDelay={0}
+        tippyOptions={{
+          getReferenceClientRect,
+          offset: [0, 8],
+          zIndex: 99,
+          popperOptions: {
+            modifiers: [{ name: "flip", enabled: false }],
+          },
+          plugins: [sticky],
+          sticky: "popper",
+        }}
+        shouldShow={shouldShow}
+      >
+        <Tooltip position="top" label={t("Delete")}>
+          <ActionIcon
+            onClick={deleteNode}
+            variant="default"
+            size="lg"
+            color="red"
+            aria-label={t("Delete")}
+          >
+            <IconTrash size={18} />
+          </ActionIcon>
+        </Tooltip>
+      </BaseBubbleMenu>
+    );
+  },
+);
+
+export default SubpagesMenu;
diff --git a/apps/client/src/features/editor/components/subpages/subpages-view.tsx b/apps/client/src/features/editor/components/subpages/subpages-view.tsx
new file mode 100644
index 00000000..525e2ec9
--- /dev/null
+++ b/apps/client/src/features/editor/components/subpages/subpages-view.tsx
@@ -0,0 +1,120 @@
+import { NodeViewProps, NodeViewWrapper } from "@tiptap/react";
+import { Stack, Text, Anchor, ActionIcon } from "@mantine/core";
+import { IconFileDescription } from "@tabler/icons-react";
+import { useGetSidebarPagesQuery } from "@/features/page/queries/page-query";
+import { useMemo } from "react";
+import { Link, useParams } from "react-router-dom";
+import classes from "./subpages.module.css";
+import styles from "../mention/mention.module.css";
+import {
+  buildPageUrl,
+  buildSharedPageUrl,
+} from "@/features/page/page.utils.ts";
+import { useTranslation } from "react-i18next";
+import { sortPositionKeys } from "@/features/page/tree/utils/utils";
+import { useSharedPageSubpages } from "@/features/share/hooks/use-shared-page-subpages";
+
+export default function SubpagesView(props: NodeViewProps) {
+  const { editor } = props;
+  const { spaceSlug, shareId } = useParams();
+  const { t } = useTranslation();
+
+  const currentPageId = editor.storage.pageId;
+
+  // Get subpages from shared tree if we're in a shared context
+  const sharedSubpages = useSharedPageSubpages(currentPageId);
+
+  const { data, isLoading, error } = useGetSidebarPagesQuery({
+    pageId: currentPageId,
+  });
+
+  const subpages = useMemo(() => {
+    // If we're in a shared context, use the shared subpages
+    if (shareId && sharedSubpages) {
+      return sharedSubpages.map((node) => ({
+        id: node.value,
+        slugId: node.slugId,
+        title: node.name,
+        icon: node.icon,
+        position: node.position,
+      }));
+    }
+
+    // Otherwise use the API data
+    if (!data?.pages) return [];
+    const allPages = data.pages.flatMap((page) => page.items);
+    return sortPositionKeys(allPages);
+  }, [data, shareId, sharedSubpages]);
+
+  if (isLoading && !shareId) {
+    return null;
+  }
+
+  if (error && !shareId) {
+    return (
+      <NodeViewWrapper>
+        <Text c="dimmed" size="md" py="md">
+          {t("Failed to load subpages")}
+        </Text>
+      </NodeViewWrapper>
+    );
+  }
+
+  if (subpages.length === 0) {
+    return (
+      <NodeViewWrapper>
+        <div className={classes.container}>
+          <Text c="dimmed" size="md" py="md">
+            {t("No subpages")}
+          </Text>
+        </div>
+      </NodeViewWrapper>
+    );
+  }
+
+  return (
+    <NodeViewWrapper>
+      <div className={classes.container}>
+        <Stack gap={5}>
+          {subpages.map((page) => (
+            <Anchor
+              key={page.id}
+              component={Link}
+              fw={500}
+              to={
+                shareId
+                  ? buildSharedPageUrl({
+                      shareId,
+                      pageSlugId: page.slugId,
+                      pageTitle: page.title,
+                    })
+                  : buildPageUrl(spaceSlug, page.slugId, page.title)
+              }
+              underline="never"
+              className={styles.pageMentionLink}
+              draggable={false}
+            >
+              {page?.icon ? (
+                <span style={{ marginRight: "4px" }}>{page.icon}</span>
+              ) : (
+                <ActionIcon
+                  variant="transparent"
+                  color="gray"
+                  component="span"
+                  size={18}
+                  style={{ verticalAlign: "text-bottom" }}
+                >
+                  <IconFileDescription size={18} />
+                </ActionIcon>
+              )}
+
+              <span className={styles.pageMentionText}>
+                {page?.title || t("untitled")}
+              </span>
+            </Anchor>
+          ))}
+        </Stack>
+      </div>
+    </NodeViewWrapper>
+  );
+}
diff --git a/apps/client/src/features/editor/components/subpages/subpages.module.css b/apps/client/src/features/editor/components/subpages/subpages.module.css
new file mode 100644
index 00000000..fb43eaf6
--- /dev/null
+++ b/apps/client/src/features/editor/components/subpages/subpages.module.css
@@ -0,0 +1,9 @@
+.container {
+  margin: 0;
+  padding-left: 4px;
+  user-select: none;
+
+  a {
+    border: none !important;
+  }
+}
diff --git a/apps/client/src/features/editor/extensions/extensions.ts b/apps/client/src/features/editor/extensions/extensions.ts
index adfed7ed..51009b43 100644
--- a/apps/client/src/features/editor/extensions/extensions.ts
+++ b/apps/client/src/features/editor/extensions/extensions.ts
@@ -38,6 +38,7 @@ import {
   Embed,
   SearchAndReplace,
   Mention,
+  Subpages,
   TableDndExtension,
 } from "@docmost/editor-ext";
 import {
@@ -58,6 +59,7 @@ import CodeBlockView from "@/features/editor/components/code-block/code-block-vi
 import DrawioView from "../components/drawio/drawio-view";
 import ExcalidrawView from "@/features/editor/components/excalidraw/excalidraw-view.tsx";
 import EmbedView from "@/features/editor/components/embed/embed-view.tsx";
+import SubpagesView from "@/features/editor/components/subpages/subpages-view.tsx";
 import plaintext from "highlight.js/lib/languages/plaintext";
 import powershell from "highlight.js/lib/languages/powershell";
 import abap from "highlightjs-sap-abap";
@@ -214,6 +216,9 @@ export const mainExtensions = [
   Embed.configure({
     view: EmbedView,
   }),
+  Subpages.configure({
+    view: SubpagesView,
+  }),
   MarkdownClipboard.configure({
     transformPastedText: true,
   }),
diff --git a/apps/client/src/features/editor/page-editor.tsx b/apps/client/src/features/editor/page-editor.tsx
index 44aa403b..f68f50de 100644
--- a/apps/client/src/features/editor/page-editor.tsx
+++ b/apps/client/src/features/editor/page-editor.tsx
@@ -31,6 +31,7 @@ import TableMenu from "@/features/editor/components/table/table-menu.tsx";
 import ImageMenu from "@/features/editor/components/image/image-menu.tsx";
 import CalloutMenu from "@/features/editor/components/callout/callout-menu.tsx";
 import VideoMenu from "@/features/editor/components/video/video-menu.tsx";
+import SubpagesMenu from "@/features/editor/components/subpages/subpages-menu.tsx";
 import {
   handleFileDrop,
   handlePaste,
@@ -391,6 +392,7 @@ export default function PageEditor({
             <ImageMenu editor={editor} />
             <VideoMenu editor={editor} />
             <CalloutMenu editor={editor} />
+            <SubpagesMenu editor={editor} />
             <ExcalidrawMenu editor={editor} />
             <DrawioMenu editor={editor} />
             <LinkMenu editor={editor} appendTo={menuContainerRef} />
diff --git a/apps/client/src/features/editor/readonly-page-editor.tsx b/apps/client/src/features/editor/readonly-page-editor.tsx
index bd6b9f6b..c1352354 100644
--- a/apps/client/src/features/editor/readonly-page-editor.tsx
+++ b/apps/client/src/features/editor/readonly-page-editor.tsx
@@ -6,21 +6,19 @@ import { Document } from "@tiptap/extension-document";
 import { Heading } from "@tiptap/extension-heading";
 import { Text } from "@tiptap/extension-text";
 import { Placeholder } from "@tiptap/extension-placeholder";
-import { useAtom } from "jotai/index";
-import {
-  pageEditorAtom,
-  readOnlyEditorAtom,
-} from "@/features/editor/atoms/editor-atoms.ts";
-import { Editor } from "@tiptap/core";
+import { useAtom } from "jotai";
+import { readOnlyEditorAtom } from "@/features/editor/atoms/editor-atoms.ts";
 
 interface PageEditorProps {
   title: string;
   content: any;
+  pageId?: string;
 }
 
 export default function ReadonlyPageEditor({
   title,
   content,
+  pageId,
 }: PageEditorProps) {
   const [, setReadOnlyEditor] = useAtom(readOnlyEditorAtom);
 
@@ -56,6 +54,9 @@ export default function ReadonlyPageEditor({
         content={content}
         onCreate={({ editor }) => {
           if (editor) {
+            if (pageId) {
+              editor.storage.pageId = pageId;
+            }
             // @ts-ignore
             setReadOnlyEditor(editor);
           }
diff --git a/apps/client/src/features/page/queries/page-query.ts b/apps/client/src/features/page/queries/page-query.ts
index cfd8b10a..64d03ddd 100644
--- a/apps/client/src/features/page/queries/page-query.ts
+++ b/apps/client/src/features/page/queries/page-query.ts
@@ -252,6 +252,7 @@ export function useGetSidebarPagesQuery(
 ): UseInfiniteQueryResult<InfiniteData<IPagination<IPage>, unknown>> {
   return useInfiniteQuery({
     queryKey: ["sidebar-pages", data],
+    enabled: !!data?.pageId || !!data?.spaceId,
     queryFn: ({ pageParam }) => getSidebarPages({ ...data, page: pageParam }),
     initialPageParam: 1,
     getPreviousPageParam: (firstPage) =>
diff --git a/apps/client/src/features/page/types/page.types.ts b/apps/client/src/features/page/types/page.types.ts
index 052dda35..a5078564 100644
--- a/apps/client/src/features/page/types/page.types.ts
+++ b/apps/client/src/features/page/types/page.types.ts
@@ -60,7 +60,7 @@ export interface ICopyPageToSpace {
 }
 
 export interface SidebarPagesParams {
-  spaceId: string;
+  spaceId?: string;
   pageId?: string;
   page?: number; // pagination
 }
diff --git a/apps/client/src/features/share/atoms/shared-page-atom.ts b/apps/client/src/features/share/atoms/shared-page-atom.ts
new file mode 100644
index 00000000..813f5e61
--- /dev/null
+++ b/apps/client/src/features/share/atoms/shared-page-atom.ts
@@ -0,0 +1,6 @@
+import { atom } from "jotai";
+import { ISharedPageTree } from "@/features/share/types/share.types";
+import { SharedPageTreeNode } from "@/features/share/utils";
+
+export const sharedPageTreeAtom = atom<ISharedPageTree | null>(null);
+export const sharedTreeDataAtom = atom<SharedPageTreeNode[] | null>(null);
\ No newline at end of file
diff --git a/apps/client/src/features/share/components/share-shell.tsx b/apps/client/src/features/share/components/share-shell.tsx
index 8550f59f..af207f4c 100644
--- a/apps/client/src/features/share/components/share-shell.tsx
+++ b/apps/client/src/features/share/components/share-shell.tsx
@@ -1,4 +1,4 @@
-import React from "react";
+import React, { useEffect, useMemo } from "react";
 import {
   ActionIcon,
   Affix,
@@ -14,8 +14,10 @@ import SharedTree from "@/features/share/components/shared-tree.tsx";
 import { TableOfContents } from "@/features/editor/components/table-of-contents/table-of-contents.tsx";
 import { readOnlyEditorAtom } from "@/features/editor/atoms/editor-atoms.ts";
 import { ThemeToggle } from "@/components/theme-toggle.tsx";
-import { useAtomValue } from "jotai";
+import { useAtomValue, useSetAtom } from "jotai";
 import { useAtom } from "jotai";
+import { sharedPageTreeAtom, sharedTreeDataAtom } from "@/features/share/atoms/shared-page-atom";
+import { buildSharedPageTree } from "@/features/share/utils";
 import {
   desktopSidebarAtom,
   mobileSidebarAtom,
@@ -59,6 +61,20 @@ export default function ShareShell({
   const { shareId } = useParams();
   const { data } = useGetSharedPageTreeQuery(shareId);
   const readOnlyEditor = useAtomValue(readOnlyEditorAtom);
+  
+  const setSharedPageTree = useSetAtom(sharedPageTreeAtom);
+  const setSharedTreeData = useSetAtom(sharedTreeDataAtom);
+  
+  // Build and set the tree data when it changes
+  const treeData = useMemo(() => {
+    if (!data?.pageTree) return null;
+    return buildSharedPageTree(data.pageTree);
+  }, [data?.pageTree]);
+  
+  useEffect(() => {
+    setSharedPageTree(data || null);
+    setSharedTreeData(treeData);
+  }, [data, treeData, setSharedPageTree, setSharedTreeData]);
 
   return (
     <AppShell
diff --git a/apps/client/src/features/share/hooks/use-shared-page-subpages.ts b/apps/client/src/features/share/hooks/use-shared-page-subpages.ts
new file mode 100644
index 00000000..6112d3fd
--- /dev/null
+++ b/apps/client/src/features/share/hooks/use-shared-page-subpages.ts
@@ -0,0 +1,29 @@
+import { useMemo } from "react";
+import { useAtomValue } from "jotai";
+import { sharedTreeDataAtom } from "@/features/share/atoms/shared-page-atom";
+import { SharedPageTreeNode } from "@/features/share/utils";
+
+export function useSharedPageSubpages(pageId: string | undefined) {
+  const treeData = useAtomValue(sharedTreeDataAtom);
+
+  return useMemo(() => {
+    if (!treeData || !pageId) return [];
+
+    function findSubpages(nodes: SharedPageTreeNode[]): SharedPageTreeNode[] {
+      for (const node of nodes) {
+        if (node.value === pageId || node.slugId === pageId) {
+          return node.children || [];
+        }
+        if (node.children && node.children.length > 0) {
+          const subpages = findSubpages(node.children);
+          if (subpages.length > 0) {
+            return subpages;
+          }
+        }
+      }
+      return [];
+    }
+
+    return findSubpages(treeData);
+  }, [treeData, pageId]);
+}
diff --git a/apps/client/src/pages/share/shared-page.tsx b/apps/client/src/pages/share/shared-page.tsx
index 50e5837d..274b76cb 100644
--- a/apps/client/src/pages/share/shared-page.tsx
+++ b/apps/client/src/pages/share/shared-page.tsx
@@ -52,6 +52,7 @@ export default function SharedPage() {
           key={data.page.id}
           title={data.page.title}
           content={data.page.content}
+          pageId={data.page.id}
         />
       </Container>
 
diff --git a/apps/server/src/collaboration/collaboration.util.ts b/apps/server/src/collaboration/collaboration.util.ts
index 099d615e..37645f44 100644
--- a/apps/server/src/collaboration/collaboration.util.ts
+++ b/apps/server/src/collaboration/collaboration.util.ts
@@ -32,6 +32,7 @@ import {
   Excalidraw,
   Embed,
   Mention,
+  Subpages,
 } from '@docmost/editor-ext';
 import { generateText, getSchema, JSONContent } from '@tiptap/core';
 import { generateHTML } from '../common/helpers/prosemirror/html';
@@ -79,6 +80,7 @@ export const tiptapExtensions = [
   Excalidraw,
   Embed,
   Mention,
+  Subpages,
 ] as any;
 
 export function jsonToHtml(tiptapJson: any) {
diff --git a/apps/server/src/core/page/dto/sidebar-page.dto.ts b/apps/server/src/core/page/dto/sidebar-page.dto.ts
index 4ea2bb20..012f64b0 100644
--- a/apps/server/src/core/page/dto/sidebar-page.dto.ts
+++ b/apps/server/src/core/page/dto/sidebar-page.dto.ts
@@ -1,7 +1,11 @@
-import { IsOptional, IsString } from 'class-validator';
+import { IsOptional, IsString, IsUUID } from 'class-validator';
 import { SpaceIdDto } from './page.dto';
 
-export class SidebarPageDto extends SpaceIdDto {
+export class SidebarPageDto {
+  @IsOptional()
+  @IsUUID()
+  spaceId: string;
+
   @IsOptional()
   @IsString()
   pageId: string;
diff --git a/apps/server/src/core/page/page.controller.ts b/apps/server/src/core/page/page.controller.ts
index 2f6dcf60..450874f7 100644
--- a/apps/server/src/core/page/page.controller.ts
+++ b/apps/server/src/core/page/page.controller.ts
@@ -254,21 +254,28 @@ export class PageController {
     @Body() pagination: PaginationOptions,
     @AuthUser() user: User,
   ) {
-    const ability = await this.spaceAbility.createForUser(user, dto.spaceId);
+    if (!dto.spaceId && !dto.pageId) {
+      throw new BadRequestException(
+        'Either spaceId or pageId must be provided',
+      );
+    }
+    let spaceId = dto.spaceId;
+
+    if (dto.pageId) {
+      const page = await this.pageRepo.findById(dto.pageId);
+      if (!page) {
+        throw new ForbiddenException();
+      }
+
+      spaceId = page.spaceId;
+    }
+
+    const ability = await this.spaceAbility.createForUser(user, spaceId);
     if (ability.cannot(SpaceCaslAction.Read, SpaceCaslSubject.Page)) {
       throw new ForbiddenException();
     }
 
-    let pageId = null;
-    if (dto.pageId) {
-      const page = await this.pageRepo.findById(dto.pageId);
-      if (page.spaceId !== dto.spaceId) {
-        throw new ForbiddenException();
-      }
-      pageId = page.id;
-    }
-
-    return this.pageService.getSidebarPages(dto.spaceId, pagination, pageId);
+    return this.pageService.getSidebarPages(spaceId, pagination, dto.pageId);
   }
 
   @HttpCode(HttpStatus.OK)
diff --git a/packages/editor-ext/src/index.ts b/packages/editor-ext/src/index.ts
index d3e1d53d..a0efaa1b 100644
--- a/packages/editor-ext/src/index.ts
+++ b/packages/editor-ext/src/index.ts
@@ -19,3 +19,4 @@ export * from "./lib/mention";
 export * from "./lib/markdown";
 export * from "./lib/search-and-replace";
 export * from "./lib/embed-provider";
+export * from "./lib/subpages";
diff --git a/packages/editor-ext/src/lib/subpages/index.ts b/packages/editor-ext/src/lib/subpages/index.ts
new file mode 100644
index 00000000..27a974a6
--- /dev/null
+++ b/packages/editor-ext/src/lib/subpages/index.ts
@@ -0,0 +1,2 @@
+export { Subpages } from "./subpages";
+export type { SubpagesAttributes, SubpagesOptions } from "./subpages";
diff --git a/packages/editor-ext/src/lib/subpages/subpages.ts b/packages/editor-ext/src/lib/subpages/subpages.ts
new file mode 100644
index 00000000..620f0342
--- /dev/null
+++ b/packages/editor-ext/src/lib/subpages/subpages.ts
@@ -0,0 +1,68 @@
+import { mergeAttributes, Node } from "@tiptap/core";
+import { ReactNodeViewRenderer } from "@tiptap/react";
+
+export interface SubpagesOptions {
+  HTMLAttributes: Record<string, any>;
+  view: any;
+}
+
+export interface SubpagesAttributes {}
+
+declare module "@tiptap/core" {
+  interface Commands<ReturnType> {
+    subpages: {
+      insertSubpages: (attributes?: SubpagesAttributes) => ReturnType;
+    };
+  }
+}
+
+export const Subpages = Node.create<SubpagesOptions>({
+  name: "subpages",
+
+  addOptions() {
+    return {
+      HTMLAttributes: {},
+      view: null,
+    };
+  },
+
+  group: "block",
+  atom: true,
+  draggable: false,
+
+  parseHTML() {
+    return [
+      {
+        tag: `div[data-type="${this.name}"]`,
+      },
+    ];
+  },
+
+  renderHTML({ HTMLAttributes }) {
+    return [
+      "div",
+      mergeAttributes(
+        { "data-type": this.name },
+        this.options.HTMLAttributes,
+        HTMLAttributes,
+      ),
+    ];
+  },
+
+  addCommands() {
+    return {
+      insertSubpages:
+        (attributes) =>
+        ({ commands }) => {
+          return commands.insertContent({
+            type: this.name,
+            attrs: attributes,
+          });
+        },
+    };
+  },
+
+  addNodeView() {
+    return ReactNodeViewRenderer(this.options.view);
+  },
+});

From 60a373f4889cb561196d144356c1442da0fe6686 Mon Sep 17 00:00:00 2001
From: Philipinho <16838612+Philipinho@users.noreply.github.com>
Date: Sun, 31 Aug 2025 12:04:27 -0700
Subject: [PATCH 15/46] fix: readonly editor table responsiveness

---
 packages/editor-ext/src/lib/table/table.ts | 30 +++++++++++++++++-----
 1 file changed, 23 insertions(+), 7 deletions(-)

diff --git a/packages/editor-ext/src/lib/table/table.ts b/packages/editor-ext/src/lib/table/table.ts
index 549847b8..87053832 100644
--- a/packages/editor-ext/src/lib/table/table.ts
+++ b/packages/editor-ext/src/lib/table/table.ts
@@ -1,29 +1,34 @@
 import Table from "@tiptap/extension-table";
 import { Editor } from "@tiptap/core";
+import { DOMOutputSpec } from "@tiptap/pm/model";
 
 const LIST_TYPES = ["bulletList", "orderedList", "taskList"];
 
 function isInList(editor: Editor): boolean {
   const { $from } = editor.state.selection;
-  
+
   for (let depth = $from.depth; depth > 0; depth--) {
     const node = $from.node(depth);
     if (LIST_TYPES.includes(node.type.name)) {
       return true;
     }
   }
-  
+
   return false;
 }
 
 function handleListIndent(editor: Editor): boolean {
-  return editor.commands.sinkListItem("listItem") || 
-         editor.commands.sinkListItem("taskItem");
+  return (
+    editor.commands.sinkListItem("listItem") ||
+    editor.commands.sinkListItem("taskItem")
+  );
 }
 
 function handleListOutdent(editor: Editor): boolean {
-  return editor.commands.liftListItem("listItem") || 
-         editor.commands.liftListItem("taskItem");
+  return (
+    editor.commands.liftListItem("listItem") ||
+    editor.commands.liftListItem("taskItem")
+  );
 }
 
 export const CustomTable = Table.extend({
@@ -62,4 +67,15 @@ export const CustomTable = Table.extend({
       },
     };
   },
-});
\ No newline at end of file
+
+  renderHTML({ node, HTMLAttributes }) {
+    // https://github.com/ueberdosis/tiptap/issues/4872#issuecomment-2717554498
+    const originalRender = this.parent?.({ node, HTMLAttributes });
+    const wrapper: DOMOutputSpec = [
+      "div",
+      { class: "tableWrapper" },
+      originalRender,
+    ];
+    return wrapper;
+  },
+});

From 937386e42bf879bc125c39fd34c83f147c604500 Mon Sep 17 00:00:00 2001
From: Philipinho <16838612+Philipinho@users.noreply.github.com>
Date: Sun, 31 Aug 2025 12:08:02 -0700
Subject: [PATCH 16/46] fix: hide table handles in readonly mode

---
 packages/editor-ext/src/lib/table/dnd/dnd-extension.ts | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/packages/editor-ext/src/lib/table/dnd/dnd-extension.ts b/packages/editor-ext/src/lib/table/dnd/dnd-extension.ts
index a29476ca..b4ac2950 100644
--- a/packages/editor-ext/src/lib/table/dnd/dnd-extension.ts
+++ b/packages/editor-ext/src/lib/table/dnd/dnd-extension.ts
@@ -81,6 +81,12 @@ class TableDragHandlePluginSpec implements PluginSpec<void> {
 
     private _pointerOver = (view: EditorView, event: PointerEvent) => {
         if (this._dragging) return;
+        
+        // Don't show drag handles in readonly mode
+        if (!this.editor.isEditable) {
+            this._dragHandleController.hide();
+            return;
+        }
 
         const hoveringCell = getHoveringCell(view, event)
         this._hoveringCell = hoveringCell;

From 509622af54acd0b791d7935d4c5ce90300f5f9e7 Mon Sep 17 00:00:00 2001
From: Philipinho <16838612+Philipinho@users.noreply.github.com>
Date: Sun, 31 Aug 2025 12:20:40 -0700
Subject: [PATCH 17/46] ignore type error

---
 .../features/share/components/share-shell.tsx   | 10 +++++-----
 ...1T191600-add-group-sync-to-auth-providers.ts | 17 +++++++++++++++++
 2 files changed, 22 insertions(+), 5 deletions(-)
 create mode 100644 apps/server/src/database/migrations/20250831T191600-add-group-sync-to-auth-providers.ts

diff --git a/apps/client/src/features/share/components/share-shell.tsx b/apps/client/src/features/share/components/share-shell.tsx
index af207f4c..10b2a74d 100644
--- a/apps/client/src/features/share/components/share-shell.tsx
+++ b/apps/client/src/features/share/components/share-shell.tsx
@@ -1,9 +1,7 @@
 import React, { useEffect, useMemo } from "react";
 import {
   ActionIcon,
-  Affix,
   AppShell,
-  Button,
   Group,
   ScrollArea,
   Tooltip,
@@ -61,16 +59,18 @@ export default function ShareShell({
   const { shareId } = useParams();
   const { data } = useGetSharedPageTreeQuery(shareId);
   const readOnlyEditor = useAtomValue(readOnlyEditorAtom);
-  
+
+  // @ts-ignore
   const setSharedPageTree = useSetAtom(sharedPageTreeAtom);
+  // @ts-ignore
   const setSharedTreeData = useSetAtom(sharedTreeDataAtom);
-  
+
   // Build and set the tree data when it changes
   const treeData = useMemo(() => {
     if (!data?.pageTree) return null;
     return buildSharedPageTree(data.pageTree);
   }, [data?.pageTree]);
-  
+
   useEffect(() => {
     setSharedPageTree(data || null);
     setSharedTreeData(treeData);
diff --git a/apps/server/src/database/migrations/20250831T191600-add-group-sync-to-auth-providers.ts b/apps/server/src/database/migrations/20250831T191600-add-group-sync-to-auth-providers.ts
new file mode 100644
index 00000000..2f06989f
--- /dev/null
+++ b/apps/server/src/database/migrations/20250831T191600-add-group-sync-to-auth-providers.ts
@@ -0,0 +1,17 @@
+import { type Kysely } from 'kysely';
+
+export async function up(db: Kysely<any>): Promise<void> {
+  await db.schema
+    .alterTable('auth_providers')
+    .addColumn('is_group_sync_enabled', 'boolean', (col) =>
+      col.defaultTo(false).notNull(),
+    )
+    .execute();
+}
+
+export async function down(db: Kysely<any>): Promise<void> {
+  await db.schema
+    .alterTable('auth_providers')
+    .dropColumn('is_group_sync_enabled')
+    .execute();
+}
\ No newline at end of file

From 74cd890bddd7ef296572b5f7598727eedbc09984 Mon Sep 17 00:00:00 2001
From: Philip Okugbe <16838612+Philipinho@users.noreply.github.com>
Date: Sun, 31 Aug 2025 20:33:37 +0100
Subject: [PATCH 18/46] feat(EE): implement SSO group sync for SAML and OIDC
 (#1452)

* feat: implement SSO group synchronization for SAML and OIDC

- Add group_sync column to auth_providers table
- Extract groups from SAML attributes (memberOf, groups, roles)
- Extract groups from OIDC claims (groups, roles)
- Implement case-insensitive group matching with auto-creation
- Sync user groups on each SSO login
- Ensure only one provider can have group sync enabled at a time
- Add group sync toggle to SAML and OIDC configuration forms

* rename column
---
 .../src/ee/security/components/sso-oidc-form.tsx   | 14 ++++++++++++++
 .../src/ee/security/components/sso-saml-form.tsx   | 14 ++++++++++++++
 .../client/src/ee/security/types/security.types.ts |  1 +
 ...0831T191600-add-group-sync-to-auth-providers.ts |  8 +++-----
 apps/server/src/database/types/db.d.ts             |  1 +
 apps/server/src/ee                                 |  2 +-
 6 files changed, 34 insertions(+), 6 deletions(-)

diff --git a/apps/client/src/ee/security/components/sso-oidc-form.tsx b/apps/client/src/ee/security/components/sso-oidc-form.tsx
index 28b1ac47..aa9e653c 100644
--- a/apps/client/src/ee/security/components/sso-oidc-form.tsx
+++ b/apps/client/src/ee/security/components/sso-oidc-form.tsx
@@ -16,6 +16,7 @@ const ssoSchema = z.object({
   oidcClientSecret: z.string().min(1, "Client secret is required"),
   isEnabled: z.boolean(),
   allowSignup: z.boolean(),
+  groupSync: z.boolean(),
 });
 
 type SSOFormValues = z.infer<typeof ssoSchema>;
@@ -36,6 +37,7 @@ export function SsoOIDCForm({ provider, onClose }: SsoFormProps) {
       oidcClientSecret: provider.oidcClientSecret || "",
       isEnabled: provider.isEnabled,
       allowSignup: provider.allowSignup,
+      groupSync: provider.groupSync || false,
     },
     validate: zodResolver(ssoSchema),
   });
@@ -67,6 +69,9 @@ export function SsoOIDCForm({ provider, onClose }: SsoFormProps) {
     if (form.isDirty("allowSignup")) {
       ssoData.allowSignup = values.allowSignup;
     }
+    if (form.isDirty("groupSync")) {
+      ssoData.groupSync = values.groupSync;
+    }
 
     await updateSsoProviderMutation.mutateAsync(ssoData);
     form.resetDirty();
@@ -119,6 +124,15 @@ export function SsoOIDCForm({ provider, onClose }: SsoFormProps) {
             />
           </Group>
 
+          <Group justify="space-between">
+            <div>{t("Group sync")}</div>
+            <Switch
+              className={classes.switch}
+              checked={form.values.groupSync}
+              {...form.getInputProps("groupSync")}
+            />
+          </Group>
+
           <Group justify="space-between">
             <div>{t("Enabled")}</div>
             <Switch
diff --git a/apps/client/src/ee/security/components/sso-saml-form.tsx b/apps/client/src/ee/security/components/sso-saml-form.tsx
index 76ea3d51..1046a2f4 100644
--- a/apps/client/src/ee/security/components/sso-saml-form.tsx
+++ b/apps/client/src/ee/security/components/sso-saml-form.tsx
@@ -26,6 +26,7 @@ const ssoSchema = z.object({
   samlCertificate: z.string().min(1, "SAML Idp Certificate is required"),
   isEnabled: z.boolean(),
   allowSignup: z.boolean(),
+  groupSync: z.boolean(),
 });
 
 type SSOFormValues = z.infer<typeof ssoSchema>;
@@ -45,6 +46,7 @@ export function SsoSamlForm({ provider, onClose }: SsoFormProps) {
       samlCertificate: provider.samlCertificate || "",
       isEnabled: provider.isEnabled,
       allowSignup: provider.allowSignup,
+      groupSync: provider.groupSync || false,
     },
     validate: zodResolver(ssoSchema),
   });
@@ -75,6 +77,9 @@ export function SsoSamlForm({ provider, onClose }: SsoFormProps) {
     if (form.isDirty("allowSignup")) {
       ssoData.allowSignup = values.allowSignup;
     }
+    if (form.isDirty("groupSync")) {
+      ssoData.groupSync = values.groupSync;
+    }
 
     await updateSsoProviderMutation.mutateAsync(ssoData);
     form.resetDirty();
@@ -132,6 +137,15 @@ export function SsoSamlForm({ provider, onClose }: SsoFormProps) {
             />
           </Group>
 
+          <Group justify="space-between">
+            <div>{t("Group sync")}</div>
+            <Switch
+              className={classes.switch}
+              checked={form.values.groupSync}
+              {...form.getInputProps("groupSync")}
+            />
+          </Group>
+
           <Group justify="space-between">
             <div>{t("Enabled")}</div>
             <Switch
diff --git a/apps/client/src/ee/security/types/security.types.ts b/apps/client/src/ee/security/types/security.types.ts
index c0f6d05d..7f8156c5 100644
--- a/apps/client/src/ee/security/types/security.types.ts
+++ b/apps/client/src/ee/security/types/security.types.ts
@@ -11,6 +11,7 @@ export interface IAuthProvider {
   oidcClientSecret: string;
   allowSignup: boolean;
   isEnabled: boolean;
+  groupSync: boolean;
   creatorId: string;
   workspaceId: string;
   createdAt: Date;
diff --git a/apps/server/src/database/migrations/20250831T191600-add-group-sync-to-auth-providers.ts b/apps/server/src/database/migrations/20250831T191600-add-group-sync-to-auth-providers.ts
index 2f06989f..26167805 100644
--- a/apps/server/src/database/migrations/20250831T191600-add-group-sync-to-auth-providers.ts
+++ b/apps/server/src/database/migrations/20250831T191600-add-group-sync-to-auth-providers.ts
@@ -3,15 +3,13 @@ import { type Kysely } from 'kysely';
 export async function up(db: Kysely<any>): Promise<void> {
   await db.schema
     .alterTable('auth_providers')
-    .addColumn('is_group_sync_enabled', 'boolean', (col) =>
-      col.defaultTo(false).notNull(),
-    )
+    .addColumn('group_sync', 'boolean', (col) => col.defaultTo(false).notNull())
     .execute();
 }
 
 export async function down(db: Kysely<any>): Promise<void> {
   await db.schema
     .alterTable('auth_providers')
-    .dropColumn('is_group_sync_enabled')
+    .dropColumn('group_sync')
     .execute();
-}
\ No newline at end of file
+}
diff --git a/apps/server/src/database/types/db.d.ts b/apps/server/src/database/types/db.d.ts
index e8662649..ab0fa898 100644
--- a/apps/server/src/database/types/db.d.ts
+++ b/apps/server/src/database/types/db.d.ts
@@ -62,6 +62,7 @@ export interface AuthProviders {
   deletedAt: Timestamp | null;
   id: Generated<string>;
   isEnabled: Generated<boolean>;
+  groupSync: Generated<boolean>;
   name: string;
   oidcClientId: string | null;
   oidcClientSecret: string | null;
diff --git a/apps/server/src/ee b/apps/server/src/ee
index fbc01d80..10519eea 160000
--- a/apps/server/src/ee
+++ b/apps/server/src/ee
@@ -1 +1 @@
-Subproject commit fbc01d808f3edd7d16a64c21251a0bcb720f1ba4
+Subproject commit 10519eeaa24881201f21f79fc5edc632fe2c185c

From 242fb6bb572fa0d400f254687caa145f44b44b70 Mon Sep 17 00:00:00 2001
From: Alexander Schaber <a.schaber@cuegee.com>
Date: Sun, 31 Aug 2025 21:48:59 +0200
Subject: [PATCH 19/46] fix: set mermaid theme based on computed color scheme
 (#1438)

---
 .../components/code-block/mermaid-view.tsx    | 20 ++++++++++++-------
 1 file changed, 13 insertions(+), 7 deletions(-)

diff --git a/apps/client/src/features/editor/components/code-block/mermaid-view.tsx b/apps/client/src/features/editor/components/code-block/mermaid-view.tsx
index 5f2cf845..e871e2f4 100644
--- a/apps/client/src/features/editor/components/code-block/mermaid-view.tsx
+++ b/apps/client/src/features/editor/components/code-block/mermaid-view.tsx
@@ -4,11 +4,7 @@ import mermaid from "mermaid";
 import { v4 as uuidv4 } from "uuid";
 import classes from "./code-block.module.css";
 import { useTranslation } from "react-i18next";
-
-mermaid.initialize({
-  startOnLoad: false,
-  suppressErrorRendering: true,
-});
+import { useComputedColorScheme } from "@mantine/core";
 
 interface MermaidViewProps {
   props: NodeViewProps;
@@ -16,12 +12,22 @@ interface MermaidViewProps {
 
 export default function MermaidView({ props }: MermaidViewProps) {
   const { t } = useTranslation();
+  const computedColorScheme = useComputedColorScheme();
   const { node } = props;
   const [preview, setPreview] = useState<string>("");
 
+  // Update Mermaid config when theme changes.
+  useEffect(() => {
+    mermaid.initialize({
+      startOnLoad: false,
+      suppressErrorRendering: true,
+      theme: computedColorScheme === "light" ? "default" : "dark",
+    });
+  }, [computedColorScheme]);
+
+  // Re-render the diagram whenever the node content or theme changes.
   useEffect(() => {
     const id = `mermaid-${uuidv4()}`;
-
     if (node.textContent.length > 0) {
       mermaid
         .render(id, node.textContent)
@@ -40,7 +46,7 @@ export default function MermaidView({ props }: MermaidViewProps) {
           }
         });
     }
-  }, [node.textContent]);
+  }, [node.textContent, computedColorScheme]);
 
   return (
     <div

From 5968764508edeb7807832671e29b6e0c7820a8fd Mon Sep 17 00:00:00 2001
From: Finn Dittmar <86927734+Vito0912@users.noreply.github.com>
Date: Sun, 31 Aug 2025 22:16:52 +0200
Subject: [PATCH 20/46] feat: emoji callout icon (#1323)

---
 .../client/src/components/ui/emoji-picker.tsx | 13 ++++-
 .../components/callout/callout-menu.tsx       | 49 ++++++++++++++++++-
 .../components/callout/callout-view.tsx       | 10 ++--
 .../editor-ext/src/lib/callout/callout.ts     | 19 +++++++
 4 files changed, 86 insertions(+), 5 deletions(-)

diff --git a/apps/client/src/components/ui/emoji-picker.tsx b/apps/client/src/components/ui/emoji-picker.tsx
index 952c1171..112c2d9c 100644
--- a/apps/client/src/components/ui/emoji-picker.tsx
+++ b/apps/client/src/components/ui/emoji-picker.tsx
@@ -15,6 +15,11 @@ export interface EmojiPickerInterface {
   icon: ReactNode;
   removeEmojiAction: () => void;
   readOnly: boolean;
+  actionIconProps?: {
+    size?: string;
+    variant?: string;
+    c?: string;
+  };
 }
 
 function EmojiPicker({
@@ -22,6 +27,7 @@ function EmojiPicker({
   icon,
   removeEmojiAction,
   readOnly,
+  actionIconProps,
 }: EmojiPickerInterface) {
   const { t } = useTranslation();
   const [opened, handlers] = useDisclosure(false);
@@ -64,7 +70,12 @@ function EmojiPicker({
       closeOnEscape={true}
     >
       <Popover.Target ref={setTarget}>
-        <ActionIcon c="gray" variant="transparent" onClick={handlers.toggle}>
+        <ActionIcon 
+          c={actionIconProps?.c || "gray"} 
+          variant={actionIconProps?.variant || "transparent"} 
+          size={actionIconProps?.size}
+          onClick={handlers.toggle}
+        >
           {icon}
         </ActionIcon>
       </Popover.Target>
diff --git a/apps/client/src/features/editor/components/callout/callout-menu.tsx b/apps/client/src/features/editor/components/callout/callout-menu.tsx
index 56dea233..400460e7 100644
--- a/apps/client/src/features/editor/components/callout/callout-menu.tsx
+++ b/apps/client/src/features/editor/components/callout/callout-menu.tsx
@@ -9,18 +9,21 @@ import {
   EditorMenuProps,
   ShouldShowProps,
 } from "@/features/editor/components/table/types/types.ts";
-import { ActionIcon, Tooltip } from "@mantine/core";
+import { ActionIcon, Tooltip, Divider } from "@mantine/core";
 import {
   IconAlertTriangleFilled,
   IconCircleCheckFilled,
   IconCircleXFilled,
   IconInfoCircleFilled,
+  IconMoodSmile,
 } from "@tabler/icons-react";
 import { CalloutType } from "@docmost/editor-ext";
 import { useTranslation } from "react-i18next";
+import EmojiPicker from "@/components/ui/emoji-picker.tsx";
 
 export function CalloutMenu({ editor }: EditorMenuProps) {
   const { t } = useTranslation();
+  
   const shouldShow = useCallback(
     ({ state }: ShouldShowProps) => {
       if (!state) {
@@ -56,6 +59,36 @@ export function CalloutMenu({ editor }: EditorMenuProps) {
     [editor],
   );
 
+  const setCalloutIcon = useCallback(
+    (emoji: any) => {
+      const emojiChar = emoji?.native || emoji?.emoji || emoji;
+      editor
+        .chain()
+        .focus(undefined, { scrollIntoView: false })
+        .updateCalloutIcon(emojiChar)
+        .run();
+    },
+    [editor],
+  );
+
+  const removeCalloutIcon = useCallback(() => {
+    editor
+      .chain()
+      .focus(undefined, { scrollIntoView: false })
+      .updateCalloutIcon("")
+      .run();
+  }, [editor]);
+
+  const getCurrentIcon = () => {
+    const { selection } = editor.state;
+    const predicate = (node: PMNode) => node.type.name === "callout";
+    const parent = findParentNode(predicate)(selection);
+    const icon = parent?.node.attrs.icon;
+    return icon || null;
+  };
+
+  const currentIcon = getCurrentIcon();
+
   return (
     <BaseBubbleMenu
       editor={editor}
@@ -130,6 +163,20 @@ export function CalloutMenu({ editor }: EditorMenuProps) {
             <IconCircleXFilled size={18} />
           </ActionIcon>
         </Tooltip>
+
+        <Tooltip position="top" label={t("Custom emoji")}>
+          <EmojiPicker
+            onEmojiSelect={setCalloutIcon}
+            removeEmojiAction={removeCalloutIcon}
+            readOnly={false}
+            icon={currentIcon || <IconMoodSmile size={18} />}
+            actionIconProps={{
+              size: "lg",
+              variant: "default",
+              c: undefined
+            }}
+          />
+        </Tooltip>
       </ActionIcon.Group>
     </BaseBubbleMenu>
   );
diff --git a/apps/client/src/features/editor/components/callout/callout-view.tsx b/apps/client/src/features/editor/components/callout/callout-view.tsx
index 0df410a3..5583bd87 100644
--- a/apps/client/src/features/editor/components/callout/callout-view.tsx
+++ b/apps/client/src/features/editor/components/callout/callout-view.tsx
@@ -11,7 +11,7 @@ import { CalloutType } from "@docmost/editor-ext";
 
 export default function CalloutView(props: NodeViewProps) {
   const { node } = props;
-  const { type } = node.attrs;
+  const { type, icon } = node.attrs;
 
   return (
     <NodeViewWrapper>
@@ -19,7 +19,7 @@ export default function CalloutView(props: NodeViewProps) {
         variant="light"
         title=""
         color={getCalloutColor(type)}
-        icon={getCalloutIcon(type)}
+        icon={getCalloutIcon(type, icon)}
         p="xs"
         classNames={{
           message: classes.message,
@@ -32,7 +32,11 @@ export default function CalloutView(props: NodeViewProps) {
   );
 }
 
-function getCalloutIcon(type: CalloutType) {
+function getCalloutIcon(type: CalloutType, customIcon?: string) {
+  if (customIcon && customIcon.trim() !== "") {
+    return <span style={{ fontSize: '18px' }}>{customIcon}</span>;
+  }
+
   switch (type) {
     case "info":
       return <IconInfoCircleFilled />;
diff --git a/packages/editor-ext/src/lib/callout/callout.ts b/packages/editor-ext/src/lib/callout/callout.ts
index c756917b..97c5dfcc 100644
--- a/packages/editor-ext/src/lib/callout/callout.ts
+++ b/packages/editor-ext/src/lib/callout/callout.ts
@@ -18,6 +18,10 @@ export interface CalloutAttributes {
    * The type of callout.
    */
   type: CalloutType;
+  /**
+   * The custom icon name for the callout.
+   */
+  icon?: string;
 }
 
 declare module "@tiptap/core" {
@@ -27,6 +31,7 @@ declare module "@tiptap/core" {
       unsetCallout: () => ReturnType;
       toggleCallout: (attributes?: CalloutAttributes) => ReturnType;
       updateCalloutType: (type: CalloutType) => ReturnType;
+      updateCalloutIcon: (icon: string) => ReturnType;
     };
   }
 }
@@ -58,6 +63,13 @@ export const Callout = Node.create<CalloutOptions>({
           "data-callout-type": attributes.type,
         }),
       },
+      icon: {
+        default: null,
+        parseHTML: (element) => element.getAttribute("data-callout-icon"),
+        renderHTML: (attributes) => ({
+          "data-callout-icon": attributes.icon,
+        }),
+      },
     };
   },
 
@@ -107,6 +119,13 @@ export const Callout = Node.create<CalloutOptions>({
           commands.updateAttributes("callout", {
             type: getValidCalloutType(type),
           }),
+
+      updateCalloutIcon:
+        (icon: string) =>
+        ({ commands }) =>
+          commands.updateAttributes("callout", {
+            icon: icon || null,
+          }),
     };
   },
 

From dcbb65d799afa956ac628d7ceb0a287bdd427f8b Mon Sep 17 00:00:00 2001
From: Philip Okugbe <16838612+Philipinho@users.noreply.github.com>
Date: Tue, 2 Sep 2025 04:59:01 +0100
Subject: [PATCH 21/46] feat(EE): LDAP integration (#1515)

* LDAP - WIP

* WIP

* add hasGeneratedPassword

* fix jotai atom

* - don't require password confirmation for MFA is user has auto generated password (LDAP)
- cleanups

* fix

* reorder

* update migration

* update default

* fix type error
---
 .../src/ee/components/ldap-login-modal.tsx    | 124 ++++++++++
 apps/client/src/ee/components/sso-login.tsx   |  53 +++-
 .../mfa/components/mfa-backup-code-input.tsx  |   1 +
 .../mfa/components/mfa-backup-codes-modal.tsx |  41 +++-
 .../src/ee/mfa/components/mfa-challenge.tsx   |   1 +
 .../ee/mfa/components/mfa-disable-modal.tsx   |  50 ++--
 .../src/ee/mfa/components/mfa-setup-modal.tsx |   1 +
 .../client/src/ee/mfa/services/mfa-service.ts |   2 +-
 apps/client/src/ee/mfa/types/mfa.types.ts     |   2 +-
 .../security/components/allowed-domains.tsx   |   3 +-
 .../components/create-sso-provider.tsx        |  22 +-
 .../ee/security/components/sso-ldap-form.tsx  | 228 ++++++++++++++++++
 .../ee/security/components/sso-oidc-form.tsx  |  18 +-
 .../components/sso-provider-modal.tsx         |   5 +
 .../ee/security/components/sso-saml-form.tsx  |  18 +-
 apps/client/src/ee/security/contants.ts       |   1 +
 .../ee/security/services/ldap-auth-service.ts |  23 ++
 .../src/ee/security/types/security.types.ts   |   8 +
 .../features/user/atoms/current-user-atom.ts  |  39 ++-
 .../user/components/account-language.tsx      |   2 +-
 .../src/features/user/types/user.types.ts     |   1 +
 .../components/workspace-name-form.tsx        |   3 +-
 apps/server/package.json                      |   1 +
 .../src/core/auth/services/auth.service.ts    |   2 +
 .../migrations/20250831T202306-ldap-auth.ts   |  68 ++++++
 .../src/database/repos/user/user.repo.ts      |   1 +
 apps/server/src/database/types/db.d.ts        |  15 +-
 apps/server/src/ee                            |   2 +-
 pnpm-lock.yaml                                |  78 +++++-
 29 files changed, 723 insertions(+), 90 deletions(-)
 create mode 100644 apps/client/src/ee/components/ldap-login-modal.tsx
 create mode 100644 apps/client/src/ee/security/components/sso-ldap-form.tsx
 create mode 100644 apps/client/src/ee/security/services/ldap-auth-service.ts
 create mode 100644 apps/server/src/database/migrations/20250831T202306-ldap-auth.ts

diff --git a/apps/client/src/ee/components/ldap-login-modal.tsx b/apps/client/src/ee/components/ldap-login-modal.tsx
new file mode 100644
index 00000000..9360651d
--- /dev/null
+++ b/apps/client/src/ee/components/ldap-login-modal.tsx
@@ -0,0 +1,124 @@
+import React, { useState } from "react";
+import { Modal, TextInput, PasswordInput, Button, Stack } from "@mantine/core";
+import { useForm } from "@mantine/form";
+import { zodResolver } from "mantine-form-zod-resolver";
+import { z } from "zod";
+import { notifications } from "@mantine/notifications";
+import { useNavigate } from "react-router-dom";
+import { useTranslation } from "react-i18next";
+import { IAuthProvider } from "@/ee/security/types/security.types";
+import APP_ROUTE from "@/lib/app-route";
+import { ldapLogin } from "@/ee/security/services/ldap-auth-service";
+
+const formSchema = z.object({
+  username: z.string().min(1, { message: "Username is required" }),
+  password: z.string().min(1, { message: "Password is required" }),
+});
+
+interface LdapLoginModalProps {
+  opened: boolean;
+  onClose: () => void;
+  provider: IAuthProvider;
+  workspaceId: string;
+}
+
+export function LdapLoginModal({
+  opened,
+  onClose,
+  provider,
+  workspaceId,
+}: LdapLoginModalProps) {
+  const { t } = useTranslation();
+  const navigate = useNavigate();
+  const [isLoading, setIsLoading] = useState(false);
+  const [error, setError] = useState<string | null>(null);
+
+  const form = useForm({
+    validate: zodResolver(formSchema),
+    initialValues: {
+      username: "",
+      password: "",
+    },
+  });
+
+  const handleSubmit = async (values: {
+    username: string;
+    password: string;
+  }) => {
+    setIsLoading(true);
+    setError(null);
+
+    try {
+      const response = await ldapLogin({
+        username: values.username,
+        password: values.password,
+        providerId: provider.id,
+        workspaceId,
+      });
+
+      // Handle MFA like the regular login
+      if (response?.userHasMfa) {
+        onClose();
+        navigate(APP_ROUTE.AUTH.MFA_CHALLENGE);
+      } else if (response?.requiresMfaSetup) {
+        onClose();
+        navigate(APP_ROUTE.AUTH.MFA_SETUP_REQUIRED);
+      } else {
+        onClose();
+        navigate(APP_ROUTE.HOME);
+      }
+    } catch (err: any) {
+      setIsLoading(false);
+      const errorMessage =
+        err.response?.data?.message || "Authentication failed";
+      setError(errorMessage);
+
+      notifications.show({
+        message: errorMessage,
+        color: "red",
+      });
+    }
+  };
+
+  const handleClose = () => {
+    form.reset();
+    setError(null);
+    onClose();
+  };
+
+  return (
+    <Modal
+      opened={opened}
+      onClose={handleClose}
+      title={`LDAP Login - ${provider.name}`}
+      size="md"
+    >
+      <form onSubmit={form.onSubmit(handleSubmit)}>
+        <Stack>
+          <TextInput
+            id="ldap-username"
+            type="text"
+            label={t("LDAP username")}
+            placeholder="Enter your LDAP username"
+            variant="filled"
+            disabled={isLoading}
+            data-autofocus
+            {...form.getInputProps("username")}
+          />
+
+          <PasswordInput
+            label={t("LDAP password")}
+            placeholder={t("Enter your LDAP password")}
+            variant="filled"
+            disabled={isLoading}
+            {...form.getInputProps("password")}
+          />
+
+          <Button type="submit" fullWidth mt="md" loading={isLoading}>
+            {t("Sign in with LDAP")}
+          </Button>
+        </Stack>
+      </form>
+    </Modal>
+  );
+}
diff --git a/apps/client/src/ee/components/sso-login.tsx b/apps/client/src/ee/components/sso-login.tsx
index 8de93c29..8c96d9c5 100644
--- a/apps/client/src/ee/components/sso-login.tsx
+++ b/apps/client/src/ee/components/sso-login.tsx
@@ -1,29 +1,62 @@
+import { useState } from "react";
 import { useWorkspacePublicDataQuery } from "@/features/workspace/queries/workspace-query.ts";
 import { Button, Divider, Stack } from "@mantine/core";
-import { IconLock } from "@tabler/icons-react";
+import { IconLock, IconServer } from "@tabler/icons-react";
 import { IAuthProvider } from "@/ee/security/types/security.types.ts";
 import { buildSsoLoginUrl } from "@/ee/security/sso.utils.ts";
 import { SSO_PROVIDER } from "@/ee/security/contants.ts";
 import { GoogleIcon } from "@/components/icons/google-icon.tsx";
 import { isCloud } from "@/lib/config.ts";
+import { LdapLoginModal } from "@/ee/components/ldap-login-modal.tsx";
 
 export default function SsoLogin() {
   const { data, isLoading } = useWorkspacePublicDataQuery();
+  const [ldapModalOpened, setLdapModalOpened] = useState(false);
+  const [selectedLdapProvider, setSelectedLdapProvider] = useState<IAuthProvider | null>(null);
 
   if (!data?.authProviders || data?.authProviders?.length === 0) {
     return null;
   }
 
   const handleSsoLogin = (provider: IAuthProvider) => {
-    window.location.href = buildSsoLoginUrl({
-      providerId: provider.id,
-      type: provider.type,
-      workspaceId: data.id,
-    });
+    if (provider.type === SSO_PROVIDER.LDAP) {
+      // Open modal for LDAP instead of redirecting
+      setSelectedLdapProvider(provider);
+      setLdapModalOpened(true);
+    } else {
+      // Redirect for other SSO providers
+      window.location.href = buildSsoLoginUrl({
+        providerId: provider.id,
+        type: provider.type,
+        workspaceId: data.id,
+      });
+    }
+  };
+
+  const getProviderIcon = (provider: IAuthProvider) => {
+    if (provider.type === SSO_PROVIDER.GOOGLE) {
+      return <GoogleIcon size={16} />;
+    } else if (provider.type === SSO_PROVIDER.LDAP) {
+      return <IconServer size={16} />;
+    } else {
+      return <IconLock size={16} />;
+    }
   };
 
   return (
     <>
+      {selectedLdapProvider && (
+        <LdapLoginModal
+          opened={ldapModalOpened}
+          onClose={() => {
+            setLdapModalOpened(false);
+            setSelectedLdapProvider(null);
+          }}
+          provider={selectedLdapProvider}
+          workspaceId={data.id}
+        />
+      )}
+
       {(isCloud() || data.hasLicenseKey) && (
         <>
           <Stack align="stretch" justify="center" gap="sm">
@@ -31,13 +64,7 @@ export default function SsoLogin() {
               <div key={provider.id}>
                 <Button
                   onClick={() => handleSsoLogin(provider)}
-                  leftSection={
-                    provider.type === SSO_PROVIDER.GOOGLE ? (
-                      <GoogleIcon size={16} />
-                    ) : (
-                      <IconLock size={16} />
-                    )
-                  }
+                  leftSection={getProviderIcon(provider)}
                   variant="default"
                   fullWidth
                 >
diff --git a/apps/client/src/ee/mfa/components/mfa-backup-code-input.tsx b/apps/client/src/ee/mfa/components/mfa-backup-code-input.tsx
index fef4b8cb..2b774060 100644
--- a/apps/client/src/ee/mfa/components/mfa-backup-code-input.tsx
+++ b/apps/client/src/ee/mfa/components/mfa-backup-code-input.tsx
@@ -45,6 +45,7 @@ export function MfaBackupCodeInput({
         onChange={(e) => onChange(e.currentTarget.value.toUpperCase())}
         error={error}
         autoFocus
+        data-autofocus
         maxLength={8}
         styles={{
           input: {
diff --git a/apps/client/src/ee/mfa/components/mfa-backup-codes-modal.tsx b/apps/client/src/ee/mfa/components/mfa-backup-codes-modal.tsx
index fdad6811..c24638fe 100644
--- a/apps/client/src/ee/mfa/components/mfa-backup-codes-modal.tsx
+++ b/apps/client/src/ee/mfa/components/mfa-backup-codes-modal.tsx
@@ -25,23 +25,30 @@ import { regenerateBackupCodes } from "@/ee/mfa";
 import { useForm } from "@mantine/form";
 import { zodResolver } from "mantine-form-zod-resolver";
 import { z } from "zod";
+import useCurrentUser from "@/features/user/hooks/use-current-user";
 
 interface MfaBackupCodesModalProps {
   opened: boolean;
   onClose: () => void;
 }
 
-const formSchema = z.object({
-  confirmPassword: z.string().min(1, { message: "Password is required" }),
-});
-
 export function MfaBackupCodesModal({
   opened,
   onClose,
 }: MfaBackupCodesModalProps) {
   const { t } = useTranslation();
+  const { data: currentUser } = useCurrentUser();
   const [backupCodes, setBackupCodes] = useState<string[]>([]);
   const [showNewCodes, setShowNewCodes] = useState(false);
+  const requiresPassword = !currentUser?.user?.hasGeneratedPassword;
+
+  const formSchema = requiresPassword
+    ? z.object({
+        confirmPassword: z.string().min(1, { message: "Password is required" }),
+      })
+    : z.object({
+        confirmPassword: z.string().optional(),
+      });
 
   const form = useForm({
     validate: zodResolver(formSchema),
@@ -51,7 +58,7 @@ export function MfaBackupCodesModal({
   });
 
   const regenerateMutation = useMutation({
-    mutationFn: (data: { confirmPassword: string }) =>
+    mutationFn: (data: { confirmPassword?: string }) =>
       regenerateBackupCodes(data),
     onSuccess: (data) => {
       setBackupCodes(data.backupCodes);
@@ -73,8 +80,12 @@ export function MfaBackupCodesModal({
     },
   });
 
-  const handleRegenerate = (values: { confirmPassword: string }) => {
-    regenerateMutation.mutate(values);
+  const handleRegenerate = (values: { confirmPassword?: string }) => {
+    // Only send confirmPassword if it's required (non-SSO users)
+    const payload = requiresPassword
+      ? { confirmPassword: values.confirmPassword }
+      : {};
+    regenerateMutation.mutate(payload);
   };
 
   const handleClose = () => {
@@ -114,12 +125,16 @@ export function MfaBackupCodesModal({
                 )}
               </Text>
 
-              <PasswordInput
-                label={t("Confirm password")}
-                placeholder={t("Enter your password")}
-                variant="filled"
-                {...form.getInputProps("confirmPassword")}
-              />
+              {requiresPassword && (
+                <PasswordInput
+                  label={t("Confirm password")}
+                  placeholder={t("Enter your password")}
+                  variant="filled"
+                  {...form.getInputProps("confirmPassword")}
+                  autoFocus
+                  data-autofocus
+                />
+              )}
 
               <Button
                 type="submit"
diff --git a/apps/client/src/ee/mfa/components/mfa-challenge.tsx b/apps/client/src/ee/mfa/components/mfa-challenge.tsx
index e067d730..8a9bef53 100644
--- a/apps/client/src/ee/mfa/components/mfa-challenge.tsx
+++ b/apps/client/src/ee/mfa/components/mfa-challenge.tsx
@@ -97,6 +97,7 @@ export function MfaChallenge() {
                     length={6}
                     type="number"
                     autoFocus
+                    data-autofocus
                     oneTimeCode
                     {...form.getInputProps("code")}
                     error={!!form.errors.code}
diff --git a/apps/client/src/ee/mfa/components/mfa-disable-modal.tsx b/apps/client/src/ee/mfa/components/mfa-disable-modal.tsx
index 4b58f074..72bcbeca 100644
--- a/apps/client/src/ee/mfa/components/mfa-disable-modal.tsx
+++ b/apps/client/src/ee/mfa/components/mfa-disable-modal.tsx
@@ -15,6 +15,7 @@ import { notifications } from "@mantine/notifications";
 import { useTranslation } from "react-i18next";
 import { z } from "zod";
 import { disableMfa } from "@/ee/mfa";
+import useCurrentUser from "@/features/user/hooks/use-current-user";
 
 interface MfaDisableModalProps {
   opened: boolean;
@@ -22,16 +23,22 @@ interface MfaDisableModalProps {
   onComplete: () => void;
 }
 
-const formSchema = z.object({
-  confirmPassword: z.string().min(1, { message: "Password is required" }),
-});
-
 export function MfaDisableModal({
   opened,
   onClose,
   onComplete,
 }: MfaDisableModalProps) {
   const { t } = useTranslation();
+  const { data: currentUser } = useCurrentUser();
+  const requiresPassword = !currentUser?.user?.hasGeneratedPassword;
+
+  const formSchema = requiresPassword
+    ? z.object({
+        confirmPassword: z.string().min(1, { message: "Password is required" }),
+      })
+    : z.object({
+        confirmPassword: z.string().optional(),
+      });
 
   const form = useForm({
     validate: zodResolver(formSchema),
@@ -54,8 +61,12 @@ export function MfaDisableModal({
     },
   });
 
-  const handleSubmit = async (values: { confirmPassword: string }) => {
-    await disableMutation.mutateAsync(values);
+  const handleSubmit = async (values: { confirmPassword?: string }) => {
+    // Only send confirmPassword if it's required (non-SSO users)
+    const payload = requiresPassword 
+      ? { confirmPassword: values.confirmPassword }
+      : {};
+    await disableMutation.mutateAsync(payload);
   };
 
   const handleClose = () => {
@@ -85,18 +96,23 @@ export function MfaDisableModal({
             </Text>
           </Alert>
 
-          <Text size="sm">
-            {t(
-              "Please enter your password to disable two-factor authentication:",
-            )}
-          </Text>
+          {requiresPassword && (
+            <>
+              <Text size="sm">
+                {t(
+                  "Please enter your password to disable two-factor authentication:",
+                )}
+              </Text>
 
-          <PasswordInput
-            label={t("Password")}
-            placeholder={t("Enter your password")}
-            {...form.getInputProps("confirmPassword")}
-            autoFocus
-          />
+              <PasswordInput
+                label={t("Password")}
+                placeholder={t("Enter your password")}
+                {...form.getInputProps("confirmPassword")}
+                autoFocus
+                data-autofocus
+              />
+            </>
+          )}
 
           <Stack gap="sm">
             <Button
diff --git a/apps/client/src/ee/mfa/components/mfa-setup-modal.tsx b/apps/client/src/ee/mfa/components/mfa-setup-modal.tsx
index 124b622c..d01f2c9f 100644
--- a/apps/client/src/ee/mfa/components/mfa-setup-modal.tsx
+++ b/apps/client/src/ee/mfa/components/mfa-setup-modal.tsx
@@ -235,6 +235,7 @@ export function MfaSetupModal({
                       length={6}
                       type="number"
                       autoFocus
+                      data-autofocus
                       oneTimeCode
                       {...form.getInputProps("verificationCode")}
                       styles={{
diff --git a/apps/client/src/ee/mfa/services/mfa-service.ts b/apps/client/src/ee/mfa/services/mfa-service.ts
index bf49d2eb..2c4956e1 100644
--- a/apps/client/src/ee/mfa/services/mfa-service.ts
+++ b/apps/client/src/ee/mfa/services/mfa-service.ts
@@ -37,7 +37,7 @@ export async function disableMfa(
 }
 
 export async function regenerateBackupCodes(data: {
-  confirmPassword: string;
+  confirmPassword?: string;
 }): Promise<MfaBackupCodesResponse> {
   const req = await api.post<MfaBackupCodesResponse>(
     "/mfa/generate-backup-codes",
diff --git a/apps/client/src/ee/mfa/types/mfa.types.ts b/apps/client/src/ee/mfa/types/mfa.types.ts
index ac032195..9f3bbe7c 100644
--- a/apps/client/src/ee/mfa/types/mfa.types.ts
+++ b/apps/client/src/ee/mfa/types/mfa.types.ts
@@ -46,7 +46,7 @@ export interface MfaEnableResponse {
 }
 
 export interface MfaDisableRequest {
-  confirmPassword: string;
+  confirmPassword?: string;
 }
 
 export interface MfaBackupCodesResponse {
diff --git a/apps/client/src/ee/security/components/allowed-domains.tsx b/apps/client/src/ee/security/components/allowed-domains.tsx
index c50825fe..6576c460 100644
--- a/apps/client/src/ee/security/components/allowed-domains.tsx
+++ b/apps/client/src/ee/security/components/allowed-domains.tsx
@@ -1,6 +1,7 @@
 import { useAtom } from "jotai";
 import * as z from "zod";
-import { useForm, zodResolver } from "@mantine/form";
+import { useForm } from "@mantine/form";
+import { zodResolver } from "mantine-form-zod-resolver";
 import { workspaceAtom } from "@/features/user/atoms/current-user-atom.ts";
 import React, { useState } from "react";
 import { Button, Text, TagsInput } from "@mantine/core";
diff --git a/apps/client/src/ee/security/components/create-sso-provider.tsx b/apps/client/src/ee/security/components/create-sso-provider.tsx
index 8a6162e9..3f213bb9 100644
--- a/apps/client/src/ee/security/components/create-sso-provider.tsx
+++ b/apps/client/src/ee/security/components/create-sso-provider.tsx
@@ -1,7 +1,7 @@
 import React, { useState } from "react";
 import { useDisclosure } from "@mantine/hooks";
 import { Button, Menu, Group } from "@mantine/core";
-import { IconChevronDown, IconLock } from "@tabler/icons-react";
+import { IconChevronDown, IconLock, IconServer } from "@tabler/icons-react";
 import { useCreateSsoProviderMutation } from "@/ee/security/queries/security-query.ts";
 import { SSO_PROVIDER } from "@/ee/security/contants.ts";
 import { IAuthProvider } from "@/ee/security/types/security.types.ts";
@@ -40,6 +40,19 @@ export default function CreateSsoProvider() {
     }
   };
 
+  const handleCreateLDAP = async () => {
+    try {
+      const newProvider = await createSsoProviderMutation.mutateAsync({
+        type: SSO_PROVIDER.LDAP,
+        name: "LDAP",
+      });
+      setProvider(newProvider);
+      open();
+    } catch (error) {
+      console.error("Failed to create LDAP provider", error);
+    }
+  };
+
   return (
     <>
       <SsoProviderModal opened={opened} onClose={close} provider={provider} />
@@ -71,6 +84,13 @@ export default function CreateSsoProvider() {
             >
               OpenID (OIDC)
             </Menu.Item>
+
+            <Menu.Item
+              onClick={handleCreateLDAP}
+              leftSection={<IconServer size={16} />}
+            >
+              LDAP / Active Directory
+            </Menu.Item>
           </Menu.Dropdown>
         </Menu>
       </Group>
diff --git a/apps/client/src/ee/security/components/sso-ldap-form.tsx b/apps/client/src/ee/security/components/sso-ldap-form.tsx
new file mode 100644
index 00000000..c570a51c
--- /dev/null
+++ b/apps/client/src/ee/security/components/sso-ldap-form.tsx
@@ -0,0 +1,228 @@
+import React from "react";
+import { z } from "zod";
+import { useForm } from "@mantine/form";
+import { zodResolver } from "mantine-form-zod-resolver";
+import {
+  Box,
+  Button,
+  Group,
+  Stack,
+  Switch,
+  TextInput,
+  Textarea,
+  Text,
+  Accordion,
+} from "@mantine/core";
+import classes from "@/ee/security/components/sso.module.css";
+import { IAuthProvider } from "@/ee/security/types/security.types.ts";
+import { useTranslation } from "react-i18next";
+import { useUpdateSsoProviderMutation } from "@/ee/security/queries/security-query.ts";
+import { IconInfoCircle } from "@tabler/icons-react";
+
+const ssoSchema = z.object({
+  name: z.string().min(1, "Display name is required"),
+  ldapUrl: z.string().url().startsWith("ldap", "Must be an LDAP URL"),
+  ldapBindDn: z.string().min(1, "Bind DN is required"),
+  ldapBindPassword: z.string().min(1, "Bind password is required"),
+  ldapBaseDn: z.string().min(1, "Base DN is required"),
+  ldapUserSearchFilter: z.string().optional(),
+  ldapTlsEnabled: z.boolean(),
+  ldapTlsCaCert: z.string().optional(),
+  isEnabled: z.boolean(),
+  allowSignup: z.boolean(),
+  groupSync: z.boolean(),
+});
+
+type SSOFormValues = z.infer<typeof ssoSchema>;
+
+interface SsoFormProps {
+  provider: IAuthProvider;
+  onClose?: () => void;
+}
+
+export function SsoLDAPForm({ provider, onClose }: SsoFormProps) {
+  const { t } = useTranslation();
+  const updateSsoProviderMutation = useUpdateSsoProviderMutation();
+
+  const form = useForm<SSOFormValues>({
+    initialValues: {
+      name: provider.name || "",
+      ldapUrl: provider.ldapUrl || "",
+      ldapBindDn: provider.ldapBindDn || "",
+      ldapBindPassword: provider.ldapBindPassword || "",
+      ldapBaseDn: provider.ldapBaseDn || "",
+      ldapUserSearchFilter:
+        provider.ldapUserSearchFilter || "(mail={{username}})",
+      ldapTlsEnabled: provider.ldapTlsEnabled || false,
+      ldapTlsCaCert: provider.ldapTlsCaCert || "",
+      isEnabled: provider.isEnabled,
+      allowSignup: provider.allowSignup,
+      groupSync: provider.groupSync || false,
+    },
+    validate: zodResolver(ssoSchema),
+  });
+
+  const handleSubmit = async (values: SSOFormValues) => {
+    const ssoData: Partial<IAuthProvider> = {
+      providerId: provider.id,
+    };
+    if (form.isDirty("name")) {
+      ssoData.name = values.name;
+    }
+    if (form.isDirty("ldapUrl")) {
+      ssoData.ldapUrl = values.ldapUrl;
+    }
+    if (form.isDirty("ldapBindDn")) {
+      ssoData.ldapBindDn = values.ldapBindDn;
+    }
+    if (form.isDirty("ldapBindPassword")) {
+      ssoData.ldapBindPassword = values.ldapBindPassword;
+    }
+    if (form.isDirty("ldapBaseDn")) {
+      ssoData.ldapBaseDn = values.ldapBaseDn;
+    }
+    if (form.isDirty("ldapUserSearchFilter")) {
+      ssoData.ldapUserSearchFilter = values.ldapUserSearchFilter;
+    }
+    if (form.isDirty("ldapTlsEnabled")) {
+      ssoData.ldapTlsEnabled = values.ldapTlsEnabled;
+    }
+    if (form.isDirty("ldapTlsCaCert")) {
+      ssoData.ldapTlsCaCert = values.ldapTlsCaCert;
+    }
+    if (form.isDirty("isEnabled")) {
+      ssoData.isEnabled = values.isEnabled;
+    }
+    if (form.isDirty("allowSignup")) {
+      ssoData.allowSignup = values.allowSignup;
+    }
+    if (form.isDirty("groupSync")) {
+      ssoData.groupSync = values.groupSync;
+    }
+
+    await updateSsoProviderMutation.mutateAsync(ssoData);
+    form.resetDirty();
+    onClose();
+  };
+
+  return (
+    <Box maw={600} mx="auto">
+      <form onSubmit={form.onSubmit(handleSubmit)}>
+        <Stack>
+          <TextInput
+            label="Display name"
+            placeholder="e.g Company LDAP"
+            data-autofocus
+            {...form.getInputProps("name")}
+          />
+
+          <TextInput
+            label="LDAP Server URL"
+            description="URL of your LDAP server"
+            placeholder="ldap://ldap.example.com:389 or ldaps://ldap.example.com:636"
+            {...form.getInputProps("ldapUrl")}
+          />
+
+          <TextInput
+            label="Bind DN"
+            description="Distinguished Name of the service account for searching"
+            placeholder="cn=admin,dc=example,dc=com"
+            {...form.getInputProps("ldapBindDn")}
+          />
+
+          <TextInput
+            label="Bind Password"
+            description="Password for the service account"
+            type="password"
+            placeholder="••••••••"
+            {...form.getInputProps("ldapBindPassword")}
+          />
+
+          <TextInput
+            label="Base DN"
+            description="Base DN where user searches will start"
+            placeholder="ou=users,dc=example,dc=com"
+            {...form.getInputProps("ldapBaseDn")}
+          />
+
+          <TextInput
+            label="User Search Filter"
+            description="LDAP filter to find users. Use {{username}} as placeholder"
+            placeholder="(mail={{username}})"
+            {...form.getInputProps("ldapUserSearchFilter")}
+          />
+
+          <Accordion variant="separated">
+            <Accordion.Item value="advanced">
+              <Accordion.Control icon={<IconInfoCircle size={20} />}>
+                Advanced Settings
+              </Accordion.Control>
+              <Accordion.Panel>
+                <Stack>
+                  <Group justify="space-between">
+                    <div>
+                      <Text size="sm">{t("Enable TLS/SSL")}</Text>
+                      <Text size="xs" c="dimmed">
+                        Use secure connection to LDAP server
+                      </Text>
+                    </div>
+                    <Switch
+                      className={classes.switch}
+                      checked={form.values.ldapTlsEnabled}
+                      {...form.getInputProps("ldapTlsEnabled")}
+                    />
+                  </Group>
+
+                  {form.values.ldapTlsEnabled && (
+                    <Textarea
+                      label="CA Certificate"
+                      description="PEM-encoded CA certificate for TLS verification (optional)"
+                      placeholder="-----BEGIN CERTIFICATE-----
+...
+-----END CERTIFICATE-----"
+                      minRows={4}
+                      {...form.getInputProps("ldapTlsCaCert")}
+                    />
+                  )}
+                </Stack>
+              </Accordion.Panel>
+            </Accordion.Item>
+          </Accordion>
+
+          <Group justify="space-between">
+            <div>{t("Group sync")}</div>
+            <Switch
+              className={classes.switch}
+              checked={form.values.groupSync}
+              {...form.getInputProps("groupSync")}
+            />
+          </Group>
+
+          <Group justify="space-between">
+            <div>{t("Allow signup")}</div>
+            <Switch
+              className={classes.switch}
+              checked={form.values.allowSignup}
+              {...form.getInputProps("allowSignup")}
+            />
+          </Group>
+
+          <Group justify="space-between">
+            <div>{t("Enabled")}</div>
+            <Switch
+              className={classes.switch}
+              checked={form.values.isEnabled}
+              {...form.getInputProps("isEnabled")}
+            />
+          </Group>
+
+          <Group mt="md" justify="flex-end">
+            <Button type="submit" disabled={!form.isDirty()}>
+              {t("Save")}
+            </Button>
+          </Group>
+        </Stack>
+      </form>
+    </Box>
+  );
+}
diff --git a/apps/client/src/ee/security/components/sso-oidc-form.tsx b/apps/client/src/ee/security/components/sso-oidc-form.tsx
index aa9e653c..b1c19aa4 100644
--- a/apps/client/src/ee/security/components/sso-oidc-form.tsx
+++ b/apps/client/src/ee/security/components/sso-oidc-form.tsx
@@ -115,15 +115,6 @@ export function SsoOIDCForm({ provider, onClose }: SsoFormProps) {
             {...form.getInputProps("oidcClientSecret")}
           />
 
-          <Group justify="space-between">
-            <div>{t("Allow signup")}</div>
-            <Switch
-              className={classes.switch}
-              checked={form.values.allowSignup}
-              {...form.getInputProps("allowSignup")}
-            />
-          </Group>
-
           <Group justify="space-between">
             <div>{t("Group sync")}</div>
             <Switch
@@ -133,6 +124,15 @@ export function SsoOIDCForm({ provider, onClose }: SsoFormProps) {
             />
           </Group>
 
+          <Group justify="space-between">
+            <div>{t("Allow signup")}</div>
+            <Switch
+              className={classes.switch}
+              checked={form.values.allowSignup}
+              {...form.getInputProps("allowSignup")}
+            />
+          </Group>
+
           <Group justify="space-between">
             <div>{t("Enabled")}</div>
             <Switch
diff --git a/apps/client/src/ee/security/components/sso-provider-modal.tsx b/apps/client/src/ee/security/components/sso-provider-modal.tsx
index 2a04cb5c..bf05dd54 100644
--- a/apps/client/src/ee/security/components/sso-provider-modal.tsx
+++ b/apps/client/src/ee/security/components/sso-provider-modal.tsx
@@ -5,6 +5,7 @@ import { SsoSamlForm } from "@/ee/security/components/sso-saml-form.tsx";
 import { SSO_PROVIDER } from "@/ee/security/contants.ts";
 import { SsoOIDCForm } from "@/ee/security/components/sso-oidc-form.tsx";
 import { SsoGoogleForm } from "@/ee/security/components/sso-google-form.tsx";
+import { SsoLDAPForm } from "@/ee/security/components/sso-ldap-form.tsx";
 
 interface SsoModalProps {
   opened: boolean;
@@ -38,6 +39,10 @@ export default function SsoProviderModal({
       {provider.type === SSO_PROVIDER.GOOGLE && (
         <SsoGoogleForm provider={provider} onClose={onClose} />
       )}
+
+      {provider.type === SSO_PROVIDER.LDAP && (
+        <SsoLDAPForm provider={provider} onClose={onClose} />
+      )}
     </Modal>
   );
 }
diff --git a/apps/client/src/ee/security/components/sso-saml-form.tsx b/apps/client/src/ee/security/components/sso-saml-form.tsx
index 1046a2f4..696277bd 100644
--- a/apps/client/src/ee/security/components/sso-saml-form.tsx
+++ b/apps/client/src/ee/security/components/sso-saml-form.tsx
@@ -128,15 +128,6 @@ export function SsoSamlForm({ provider, onClose }: SsoFormProps) {
             {...form.getInputProps("samlCertificate")}
           />
 
-          <Group justify="space-between">
-            <div>{t("Allow signup")}</div>
-            <Switch
-              className={classes.switch}
-              checked={form.values.allowSignup}
-              {...form.getInputProps("allowSignup")}
-            />
-          </Group>
-
           <Group justify="space-between">
             <div>{t("Group sync")}</div>
             <Switch
@@ -146,6 +137,15 @@ export function SsoSamlForm({ provider, onClose }: SsoFormProps) {
             />
           </Group>
 
+          <Group justify="space-between">
+            <div>{t("Allow signup")}</div>
+            <Switch
+              className={classes.switch}
+              checked={form.values.allowSignup}
+              {...form.getInputProps("allowSignup")}
+            />
+          </Group>
+
           <Group justify="space-between">
             <div>{t("Enabled")}</div>
             <Switch
diff --git a/apps/client/src/ee/security/contants.ts b/apps/client/src/ee/security/contants.ts
index f423d4d3..84ce3aec 100644
--- a/apps/client/src/ee/security/contants.ts
+++ b/apps/client/src/ee/security/contants.ts
@@ -2,4 +2,5 @@ export enum SSO_PROVIDER {
   OIDC = 'oidc',
   SAML = 'saml',
   GOOGLE = 'google',
+  LDAP = 'ldap',
 }
\ No newline at end of file
diff --git a/apps/client/src/ee/security/services/ldap-auth-service.ts b/apps/client/src/ee/security/services/ldap-auth-service.ts
new file mode 100644
index 00000000..0e6f5381
--- /dev/null
+++ b/apps/client/src/ee/security/services/ldap-auth-service.ts
@@ -0,0 +1,23 @@
+import api from "@/lib/api-client.ts";
+import { ILoginResponse } from "@/features/auth/types/auth.types.ts";
+
+interface ILdapLogin {
+  username: string;
+  password: string;
+  providerId: string;
+  workspaceId: string;
+}
+
+export async function ldapLogin(data: ILdapLogin): Promise<ILoginResponse> {
+  const requestData = {
+    username: data.username,
+    password: data.password,
+  };
+
+  const response = await api.post<ILoginResponse>(
+    `/sso/ldap/${data.providerId}/login`,
+    requestData
+  );
+
+  return response.data;
+}
diff --git a/apps/client/src/ee/security/types/security.types.ts b/apps/client/src/ee/security/types/security.types.ts
index 7f8156c5..518302b7 100644
--- a/apps/client/src/ee/security/types/security.types.ts
+++ b/apps/client/src/ee/security/types/security.types.ts
@@ -9,6 +9,14 @@ export interface IAuthProvider {
   oidcIssuer: string;
   oidcClientId: string;
   oidcClientSecret: string;
+  ldapUrl: string;
+  ldapBindDn: string;
+  ldapBindPassword: string;
+  ldapBaseDn: string;
+  ldapUserSearchFilter: string;
+  ldapUserAttributes: any;
+  ldapTlsEnabled: boolean;
+  ldapTlsCaCert: string;
   allowSignup: boolean;
   isEnabled: boolean;
   groupSync: boolean;
diff --git a/apps/client/src/features/user/atoms/current-user-atom.ts b/apps/client/src/features/user/atoms/current-user-atom.ts
index 49eab9d7..98c6f332 100644
--- a/apps/client/src/features/user/atoms/current-user-atom.ts
+++ b/apps/client/src/features/user/atoms/current-user-atom.ts
@@ -1,16 +1,41 @@
+import { atom } from "jotai";
 import { atomWithStorage } from "jotai/utils";
-
-import { ICurrentUser } from "@/features/user/types/user.types";
-import { focusAtom } from "jotai-optics";
+import { ICurrentUser, IUser } from "@/features/user/types/user.types";
+import { IWorkspace } from "@/features/workspace/types/workspace.types";
 
 export const currentUserAtom = atomWithStorage<ICurrentUser | null>(
   "currentUser",
   null,
 );
 
-export const userAtom = focusAtom(currentUserAtom, (optic) =>
-  optic.prop("user"),
+export const userAtom = atom(
+  (get) => {
+    const currentUser = get(currentUserAtom);
+    return currentUser?.user ?? null;
+  },
+  (get, set, newUser: IUser) => {
+    const currentUser = get(currentUserAtom);
+    if (currentUser) {
+      set(currentUserAtom, {
+        ...currentUser,
+        user: newUser,
+      });
+    }
+  }
 );
-export const workspaceAtom = focusAtom(currentUserAtom, (optic) =>
-  optic.prop("workspace"),
+
+export const workspaceAtom = atom(
+  (get) => {
+    const currentUser = get(currentUserAtom);
+    return currentUser?.workspace ?? null;
+  },
+  (get, set, newWorkspace: IWorkspace) => {
+    const currentUser = get(currentUserAtom);
+    if (currentUser) {
+      set(currentUserAtom, {
+        ...currentUser,
+        workspace: newWorkspace,
+      });
+    }
+  }
 );
diff --git a/apps/client/src/features/user/components/account-language.tsx b/apps/client/src/features/user/components/account-language.tsx
index b0093ed9..42a2331e 100644
--- a/apps/client/src/features/user/components/account-language.tsx
+++ b/apps/client/src/features/user/components/account-language.tsx
@@ -25,7 +25,7 @@ function LanguageSwitcher() {
   const { t, i18n } = useTranslation();
   const [user, setUser] = useAtom(userAtom);
   const [language, setLanguage] = useState(
-    user?.locale === "en" ? "en-US" : user.locale,
+    user?.locale === "en" ? "en-US" : user?.locale,
   );
 
   const handleChange = async (value: string) => {
diff --git a/apps/client/src/features/user/types/user.types.ts b/apps/client/src/features/user/types/user.types.ts
index 95060358..80d86706 100644
--- a/apps/client/src/features/user/types/user.types.ts
+++ b/apps/client/src/features/user/types/user.types.ts
@@ -20,6 +20,7 @@ export interface IUser {
   deletedAt: Date;
   fullPageWidth: boolean; // used for update
   pageEditMode: string; // used for update
+  hasGeneratedPassword?: boolean;
 }
 
 export interface ICurrentUser {
diff --git a/apps/client/src/features/workspace/components/settings/components/workspace-name-form.tsx b/apps/client/src/features/workspace/components/settings/components/workspace-name-form.tsx
index f8cd5d2d..60b46ed3 100644
--- a/apps/client/src/features/workspace/components/settings/components/workspace-name-form.tsx
+++ b/apps/client/src/features/workspace/components/settings/components/workspace-name-form.tsx
@@ -5,7 +5,8 @@ import { useState } from "react";
 import { updateWorkspace } from "@/features/workspace/services/workspace-service.ts";
 import { IWorkspace } from "@/features/workspace/types/workspace.types.ts";
 import { TextInput, Button } from "@mantine/core";
-import { useForm, zodResolver } from "@mantine/form";
+import { useForm } from "@mantine/form";
+import { zodResolver } from "mantine-form-zod-resolver";
 import { notifications } from "@mantine/notifications";
 import useUserRole from "@/hooks/use-user-role.tsx";
 import { useTranslation } from "react-i18next";
diff --git a/apps/server/package.json b/apps/server/package.json
index cc1db023..267abe00 100644
--- a/apps/server/package.json
+++ b/apps/server/package.json
@@ -66,6 +66,7 @@
     "jsonwebtoken": "^9.0.2",
     "kysely": "^0.28.2",
     "kysely-migration-cli": "^0.4.2",
+    "ldapts": "^7.4.0",
     "mime-types": "^2.1.35",
     "nanoid": "3.3.11",
     "nestjs-kysely": "^1.2.0",
diff --git a/apps/server/src/core/auth/services/auth.service.ts b/apps/server/src/core/auth/services/auth.service.ts
index 72ffc521..d2dac116 100644
--- a/apps/server/src/core/auth/services/auth.service.ts
+++ b/apps/server/src/core/auth/services/auth.service.ts
@@ -106,6 +106,7 @@ export class AuthService {
     await this.userRepo.updateUser(
       {
         password: newPasswordHash,
+        hasGeneratedPassword: false,
       },
       userId,
       workspaceId,
@@ -186,6 +187,7 @@ export class AuthService {
       await this.userRepo.updateUser(
         {
           password: newPasswordHash,
+          hasGeneratedPassword: false,
         },
         user.id,
         workspace.id,
diff --git a/apps/server/src/database/migrations/20250831T202306-ldap-auth.ts b/apps/server/src/database/migrations/20250831T202306-ldap-auth.ts
new file mode 100644
index 00000000..82ab8493
--- /dev/null
+++ b/apps/server/src/database/migrations/20250831T202306-ldap-auth.ts
@@ -0,0 +1,68 @@
+import { type Kysely, sql } from 'kysely';
+
+export async function up(db: Kysely<any>): Promise<void> {
+  // switch type to text column since you can't add value to PG types in a transaction
+  await db.schema
+    .alterTable('auth_providers')
+    .alterColumn('type', (col) => col.setDataType('text'))
+    .execute();
+
+  await db.schema.dropType('auth_provider_type').ifExists().execute();
+
+  await db.schema
+    .alterTable('users')
+    .addColumn('has_generated_password', 'boolean', (col) =>
+      col.notNull().defaultTo(false).ifNotExists(),
+    )
+    .execute();
+
+  await db.schema
+    .alterTable('auth_providers')
+    .addColumn('ldap_url', 'varchar', (col) => col)
+    .addColumn('ldap_bind_dn', 'varchar', (col) => col)
+    .addColumn('ldap_bind_password', 'varchar', (col) => col)
+    .addColumn('ldap_base_dn', 'varchar', (col) => col)
+    .addColumn('ldap_user_search_filter', 'varchar', (col) => col)
+    .addColumn('ldap_user_attributes', 'jsonb', (col) =>
+      col.defaultTo(sql`'{}'::jsonb`),
+    )
+    .addColumn('ldap_tls_enabled', 'boolean', (col) => col.defaultTo(false))
+    .addColumn('ldap_tls_ca_cert', 'text', (col) => col)
+    .addColumn('ldap_config', 'jsonb', (col) => col.defaultTo(sql`'{}'::jsonb`))
+    .addColumn('settings', 'jsonb', (col) => col.defaultTo(sql`'{}'::jsonb`))
+    .execute();
+}
+
+export async function down(db: Kysely<any>): Promise<void> {
+  await db.schema
+    .alterTable('users')
+    .dropColumn('has_generated_password')
+    .execute();
+
+  await db.schema
+    .alterTable('auth_providers')
+    .dropColumn('ldap_url')
+    .dropColumn('ldap_bind_dn')
+    .dropColumn('ldap_bind_password')
+    .dropColumn('ldap_base_dn')
+    .dropColumn('ldap_user_search_filter')
+    .dropColumn('ldap_user_attributes')
+    .dropColumn('ldap_tls_enabled')
+    .dropColumn('ldap_tls_ca_cert')
+    .dropColumn('ldap_config')
+    .dropColumn('settings')
+    .execute();
+
+  await db.schema
+    .createType('auth_provider_type')
+    .asEnum(['saml', 'oidc', 'google'])
+    .execute();
+
+  await db.deleteFrom('auth_providers').where('type', '=', 'ldap').execute();
+
+  await sql`
+    ALTER TABLE auth_providers 
+    ALTER COLUMN type TYPE auth_provider_type 
+    USING type::auth_provider_type
+  `.execute(db);
+}
diff --git a/apps/server/src/database/repos/user/user.repo.ts b/apps/server/src/database/repos/user/user.repo.ts
index 86cc8510..c7c7b2b2 100644
--- a/apps/server/src/database/repos/user/user.repo.ts
+++ b/apps/server/src/database/repos/user/user.repo.ts
@@ -34,6 +34,7 @@ export class UserRepo {
     'createdAt',
     'updatedAt',
     'deletedAt',
+    'hasGeneratedPassword',
   ];
 
   async findById(
diff --git a/apps/server/src/database/types/db.d.ts b/apps/server/src/database/types/db.d.ts
index ab0fa898..0d0922c8 100644
--- a/apps/server/src/database/types/db.d.ts
+++ b/apps/server/src/database/types/db.d.ts
@@ -5,8 +5,6 @@
 
 import type { ColumnType } from "kysely";
 
-export type AuthProviderType = "google" | "oidc" | "saml";
-
 export type Generated<T> = T extends ColumnType<infer S, infer I, infer U>
   ? ColumnType<S, I | undefined, U>
   : ColumnType<T, T | undefined, T>;
@@ -63,13 +61,23 @@ export interface AuthProviders {
   id: Generated<string>;
   isEnabled: Generated<boolean>;
   groupSync: Generated<boolean>;
+  ldapBaseDn: string | null;
+  ldapBindDn: string | null;
+  ldapBindPassword: string | null;
+  ldapTlsCaCert: string | null;
+  ldapTlsEnabled: Generated<boolean | null>;
+  ldapUrl: string | null;
+  ldapUserAttributes: Json | null;
+  ldapUserSearchFilter: string | null;
+  ldapConfig: Json | null;
+  settings: Json | null;
   name: string;
   oidcClientId: string | null;
   oidcClientSecret: string | null;
   oidcIssuer: string | null;
   samlCertificate: string | null;
   samlUrl: string | null;
-  type: AuthProviderType;
+  type: string;
   updatedAt: Generated<Timestamp>;
   workspaceId: string;
 }
@@ -276,6 +284,7 @@ export interface Users {
   lastActiveAt: Timestamp | null;
   lastLoginAt: Timestamp | null;
   locale: string | null;
+  hasGeneratedPassword: Generated<boolean | null>;
   name: string | null;
   password: string | null;
   role: string | null;
diff --git a/apps/server/src/ee b/apps/server/src/ee
index 10519eea..505081bb 160000
--- a/apps/server/src/ee
+++ b/apps/server/src/ee
@@ -1 +1 @@
-Subproject commit 10519eeaa24881201f21f79fc5edc632fe2c185c
+Subproject commit 505081bb85d283a0d620165fa9f210f7c8e14232
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index 1bb9b885..3e22bafa 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -534,6 +534,9 @@ importers:
       kysely-migration-cli:
         specifier: ^0.4.2
         version: 0.4.2
+      ldapts:
+        specifier: ^7.4.0
+        version: 7.4.0
       mime-types:
         specifier: ^2.1.35
         version: 2.1.35
@@ -4109,6 +4112,9 @@ packages:
   '@tybys/wasm-util@0.9.0':
     resolution: {integrity: sha512-6+7nlbMVX/PVDCwaIQ8nTOPveOcFLSt8GcXdx8hD0bt39uWxYT88uXzqTd4fTvqta7oeUJqudepapKNt2DYJFw==}
 
+  '@types/asn1@0.2.4':
+    resolution: {integrity: sha512-V91DSJ2l0h0gRhVP4oBfBzRBN9lAbPUkGDMCnwedqPKX2d84aAMc9CulOvxdw1f7DfEYx99afab+Rsm3e52jhA==}
+
   '@types/babel__core@7.20.5':
     resolution: {integrity: sha512-qoQprZvz5wQFJwMDqeseRXWv3rqMvhgpbXFfVyWhbx9X47POIA6i/+dXefEmZKoAgOaTdaIgNSMqMIU61yRyzA==}
 
@@ -4833,6 +4839,9 @@ packages:
   asap@2.0.6:
     resolution: {integrity: sha512-BSHWgDSAiKs50o2Re8ppvp3seVHXSRM44cdSsT9FfNEUUZLOGWVCsiWaRPWM1Znn+mqZ1OfVZ3z3DWEzSp7hRA==}
 
+  asn1@0.2.6:
+    resolution: {integrity: sha512-ix/FxPn0MDjeyJ7i/yoHGFt/EX6LyNbxSEhPPXODPL+KB0VPk86UYfL0lMdy+KCnv+fmvIzySwaK5COwqVbWTQ==}
+
   async-lock@1.4.1:
     resolution: {integrity: sha512-Az2ZTpuytrtqENulXwO3GGv1Bztugx6TT37NIo7imr/Qo0gsYiGtSdBa2B6fsXhTpVZDNfu1Qn3pk531e3q+nQ==}
 
@@ -7032,6 +7041,10 @@ packages:
   layout-base@2.0.1:
     resolution: {integrity: sha512-dp3s92+uNI1hWIpPGH3jK2kxE2lMjdXdr+DH8ynZHpd6PUlH6x6cbuXnoMmiNumznqaNO31xu9e79F0uuZ0JFg==}
 
+  ldapts@7.4.0:
+    resolution: {integrity: sha512-QLgx2pLvxMXY1nCc85Fx+cwVJDvC0sQ3l4CJZSl1FJ/iV8Ypfl6m+5xz4lm1lhoXcUlvhPqxEoyIj/8LR6ut+A==}
+    engines: {node: '>=18'}
+
   leac@0.6.0:
     resolution: {integrity: sha512-y+SqErxb8h7nE/fiEX07jsbuhrpO9lL8eca7/Y1nuWV2moNlXhyd59iDGcRf6moVyDMbmTNzL40SUyrFU/yDpg==}
 
@@ -8759,6 +8772,9 @@ packages:
     resolution: {integrity: sha512-Mcc5wHehp9aXz1ax6bZUyY5afg9u2rv5cqQI3mRrYkGC8rW2hM02jWuwjtL++LS5qinSyhj2QfLyNsuc+VsExg==}
     engines: {node: '>=10.0.0'}
 
+  strict-event-emitter-types@2.0.0:
+    resolution: {integrity: sha512-Nk/brWYpD85WlOgzw5h173aci0Teyv8YdIAEtV+N88nDB0dLlazZyJMIsN6eo1/AR61l+p6CJTG1JIyFaoNEEA==}
+
   string-length@4.0.2:
     resolution: {integrity: sha512-+l6rNN5fYHNhZZy41RXsYptCjA2Igmq4EG7kZAYFQI1E1VTXarr6ZPXBg6eq7Y6eK4FEhY6AJlyuFIb/v/S0VQ==}
     engines: {node: '>=10'}
@@ -8998,6 +9014,10 @@ packages:
     resolution: {integrity: sha512-tk2G5R2KRwBd+ZN0zaEXpmzdKyOYksXwywulIX95MBODjSzMIuQnQ3m8JxgbhnL1LeVo7lqQKsYa1O3Htl7K5g==}
     engines: {node: '>=18'}
 
+  tr46@5.1.1:
+    resolution: {integrity: sha512-hdF5ZgjTqgAntKkklYw0R03MG2x/bSzTtkxmIRw/sTNV8YXsCJ1tfLAX23lhxhHJlEf3CRCOCGGWw3vI3GaSPw==}
+    engines: {node: '>=18'}
+
   tree-kill@1.2.2:
     resolution: {integrity: sha512-L0Orpi8qGpRG//Nd+H90vFB+3iHnue1zSSGmNOOCh1GLJ7rUKVwV2HvijphGQS2UmhUZewS9VgvxYIdgr+fG1A==}
     hasBin: true
@@ -9452,6 +9472,10 @@ packages:
     resolution: {integrity: sha512-1lfMEm2IEr7RIV+f4lUNPOqfFL+pO+Xw3fJSqmjX9AbXcXcYOkCe1P6+9VBZB6n94af16NfZf+sSk0JCBZC9aw==}
     engines: {node: '>=18'}
 
+  whatwg-url@14.2.0:
+    resolution: {integrity: sha512-De72GdQZzNTUBBChsXueQUnPKDkg/5A5zp7pFDuQAj5UFoENpiACU0wlCvzpAGnTkj++ihpKwKyYewn/XNUbKw==}
+    engines: {node: '>=18'}
+
   whatwg-url@5.0.0:
     resolution: {integrity: sha512-saE57nupxk6v3HY35+jzBwYa0rKSy0XR8JSxZPwgLr7ys0IBzhGviA1/TUGJLmSVqs8pb9AnvICXEuOHLprYTw==}
 
@@ -10321,7 +10345,7 @@ snapshots:
       '@babel/traverse': 7.25.9
       '@babel/types': 7.26.0
       convert-source-map: 2.0.0
-      debug: 4.3.7
+      debug: 4.4.0
       gensync: 1.0.0-beta.2
       json5: 2.2.3
       semver: 6.3.1
@@ -10361,7 +10385,7 @@ snapshots:
       '@babel/traverse': 7.25.9
       '@babel/types': 7.26.0
       convert-source-map: 2.0.0
-      debug: 4.3.4
+      debug: 4.4.0
       gensync: 1.0.0-beta.2
       json5: 2.2.3
       semver: 6.3.1
@@ -10381,7 +10405,7 @@ snapshots:
       '@babel/traverse': 7.27.0
       '@babel/types': 7.27.0
       convert-source-map: 2.0.0
-      debug: 4.3.7
+      debug: 4.4.0
       gensync: 1.0.0-beta.2
       json5: 2.2.3
       semver: 6.3.1
@@ -13945,6 +13969,10 @@ snapshots:
     dependencies:
       tslib: 2.8.1
 
+  '@types/asn1@0.2.4':
+    dependencies:
+      '@types/node': 22.13.4
+
   '@types/babel__core@7.20.5':
     dependencies:
       '@babel/parser': 7.26.2
@@ -14401,7 +14429,7 @@ snapshots:
       '@typescript-eslint/types': 8.17.0
       '@typescript-eslint/typescript-estree': 8.17.0(typescript@5.7.2)
       '@typescript-eslint/visitor-keys': 8.17.0
-      debug: 4.3.7
+      debug: 4.4.0
       eslint: 9.15.0(jiti@1.21.0)
     optionalDependencies:
       typescript: 5.7.2
@@ -14414,7 +14442,7 @@ snapshots:
       '@typescript-eslint/types': 8.24.1
       '@typescript-eslint/typescript-estree': 8.24.1(typescript@5.7.3)
       '@typescript-eslint/visitor-keys': 8.24.1
-      debug: 4.3.7
+      debug: 4.4.0
       eslint: 9.20.1(jiti@1.21.0)
       typescript: 5.7.3
     transitivePeerDependencies:
@@ -14476,7 +14504,7 @@ snapshots:
     dependencies:
       '@typescript-eslint/types': 8.24.1
       '@typescript-eslint/visitor-keys': 8.24.1
-      debug: 4.3.7
+      debug: 4.4.0
       fast-glob: 3.3.2
       is-glob: 4.0.3
       minimatch: 9.0.4
@@ -14832,6 +14860,10 @@ snapshots:
 
   asap@2.0.6: {}
 
+  asn1@0.2.6:
+    dependencies:
+      safer-buffer: 2.1.2
+
   async-lock@1.4.1: {}
 
   async@3.2.5: {}
@@ -15750,7 +15782,7 @@ snapshots:
   detect-port@1.5.1:
     dependencies:
       address: 1.2.2
-      debug: 4.3.7
+      debug: 4.4.0
     transitivePeerDependencies:
       - supports-color
 
@@ -15871,7 +15903,7 @@ snapshots:
   engine.io-client@6.6.2:
     dependencies:
       '@socket.io/component-emitter': 3.1.0
-      debug: 4.3.4
+      debug: 4.3.7
       engine.io-parser: 5.2.2
       ws: 8.17.1
       xmlhttprequest-ssl: 2.1.2
@@ -15891,7 +15923,7 @@ snapshots:
       base64id: 2.0.0
       cookie: 0.7.2
       cors: 2.8.5
-      debug: 4.3.4
+      debug: 4.3.7
       engine.io-parser: 5.2.2
       ws: 8.17.1
     transitivePeerDependencies:
@@ -16795,7 +16827,7 @@ snapshots:
   ioredis@4.28.5:
     dependencies:
       cluster-key-slot: 1.1.2
-      debug: 4.3.7
+      debug: 4.4.0
       denque: 1.5.1
       lodash.defaults: 4.2.0
       lodash.flatten: 4.4.0
@@ -17544,6 +17576,17 @@ snapshots:
 
   layout-base@2.0.1: {}
 
+  ldapts@7.4.0:
+    dependencies:
+      '@types/asn1': 0.2.4
+      asn1: 0.2.6
+      debug: 4.4.0
+      strict-event-emitter-types: 2.0.0
+      uuid: 11.1.0
+      whatwg-url: 14.2.0
+    transitivePeerDependencies:
+      - supports-color
+
   leac@0.6.0: {}
 
   less@4.2.0:
@@ -19390,7 +19433,7 @@ snapshots:
 
   socket.io-adapter@2.5.4:
     dependencies:
-      debug: 4.3.4
+      debug: 4.3.7
       ws: 8.11.0
     transitivePeerDependencies:
       - bufferutil
@@ -19411,7 +19454,7 @@ snapshots:
   socket.io-parser@4.2.4:
     dependencies:
       '@socket.io/component-emitter': 3.1.0
-      debug: 4.3.4
+      debug: 4.3.7
     transitivePeerDependencies:
       - supports-color
 
@@ -19487,6 +19530,8 @@ snapshots:
 
   streamsearch@1.1.0: {}
 
+  strict-event-emitter-types@2.0.0: {}
+
   string-length@4.0.2:
     dependencies:
       char-regex: 1.0.2
@@ -19746,6 +19791,10 @@ snapshots:
     dependencies:
       punycode: 2.3.1
 
+  tr46@5.1.1:
+    dependencies:
+      punycode: 2.3.1
+
   tree-kill@1.2.2: {}
 
   truncate-utf8-bytes@1.0.2:
@@ -20170,6 +20219,11 @@ snapshots:
       tr46: 5.0.0
       webidl-conversions: 7.0.0
 
+  whatwg-url@14.2.0:
+    dependencies:
+      tr46: 5.1.1
+      webidl-conversions: 7.0.0
+
   whatwg-url@5.0.0:
     dependencies:
       tr46: 0.0.3

From f12866cf422f27a906f43bad796bed9ac82c5c15 Mon Sep 17 00:00:00 2001
From: Philip Okugbe <16838612+Philipinho@users.noreply.github.com>
Date: Tue, 2 Sep 2025 05:27:01 +0100
Subject: [PATCH 22/46] feat(EE): full-text search in attachments (#1502)

* feat(EE): fulltext search in attachments

* feat: global search
- search filters
- attachments search ui
- and more

* fix import

* fix import

* rename migration

* add GIN index

* fix table name

* sanitize
---
 .../components/layouts/global/app-header.tsx  |  17 ++
 .../src/components/layouts/global/layout.tsx  |   9 +-
 .../src/features/editor/page-editor.tsx       |   5 +
 .../src/features/editor/title-editor.tsx      |  17 +-
 .../search/components/search-result-item.tsx  | 124 +++++++++
 .../search-spotlight-filters.module.css       |  19 ++
 .../components/search-spotlight-filters.tsx   | 252 ++++++++++++++++++
 .../search/components/search-spotlight.tsx    | 104 ++++++++
 .../share-search-spotlight.tsx                |   8 +-
 .../search/hooks/use-unified-search.ts        |  42 +++
 .../features/search/queries/search-query.ts   |  16 +-
 .../src/features/search/search-spotlight.tsx  |  83 ------
 .../search/services/search-service.ts         |  10 +-
 .../src/features/search/types/search.types.ts |  22 ++
 .../features/share/components/share-shell.tsx |   2 +-
 .../components/sidebar/space-sidebar.tsx      |   3 -
 apps/client/src/lib/app-route.ts              |   1 +
 apps/server/package.json                      |   2 +
 apps/server/src/common/helpers/utils.ts       |   9 +
 .../processors/attachment.processor.ts        |  34 ++-
 .../attachment/services/attachment.service.ts |  22 ++
 apps/server/src/core/search/dto/search.dto.ts |   4 +-
 .../server/src/core/share/share.controller.ts |  17 +-
 .../20250901T184612-attachments-search.ts     |  29 ++
 .../repos/attachment/attachment.repo.ts       |  26 +-
 apps/server/src/database/types/db.d.ts        |   2 +
 apps/server/src/ee                            |   2 +-
 .../queue/constants/queue.constants.ts        |   2 +
 pnpm-lock.yaml                                | 182 +++++++++++++
 29 files changed, 956 insertions(+), 109 deletions(-)
 create mode 100644 apps/client/src/features/search/components/search-result-item.tsx
 create mode 100644 apps/client/src/features/search/components/search-spotlight-filters.module.css
 create mode 100644 apps/client/src/features/search/components/search-spotlight-filters.tsx
 create mode 100644 apps/client/src/features/search/components/search-spotlight.tsx
 rename apps/client/src/features/search/{ => components}/share-search-spotlight.tsx (90%)
 create mode 100644 apps/client/src/features/search/hooks/use-unified-search.ts
 delete mode 100644 apps/client/src/features/search/search-spotlight.tsx
 create mode 100644 apps/server/src/database/migrations/20250901T184612-attachments-search.ts

diff --git a/apps/client/src/components/layouts/global/app-header.tsx b/apps/client/src/components/layouts/global/app-header.tsx
index 09b95539..eb1ca74f 100644
--- a/apps/client/src/components/layouts/global/app-header.tsx
+++ b/apps/client/src/components/layouts/global/app-header.tsx
@@ -14,6 +14,14 @@ import SidebarToggle from "@/components/ui/sidebar-toggle-button.tsx";
 import { useTranslation } from "react-i18next";
 import useTrial from "@/ee/hooks/use-trial.tsx";
 import { isCloud } from "@/lib/config.ts";
+import {
+  SearchControl,
+  SearchMobileControl,
+} from "@/features/search/components/search-control.tsx";
+import {
+  searchSpotlight,
+  shareSearchSpotlight,
+} from "@/features/search/constants.ts";
 
 const links = [{ link: APP_ROUTE.HOME, label: "Home" }];
 
@@ -79,6 +87,15 @@ export function AppHeader() {
           </Group>
         </Group>
 
+        <div>
+          <Group visibleFrom="sm">
+            <SearchControl onClick={searchSpotlight.open} />
+          </Group>
+          <Group hiddenFrom="sm">
+            <SearchMobileControl onSearch={searchSpotlight.open} />
+          </Group>
+        </div>
+
         <Group px={"xl"} wrap="nowrap">
           {isCloud() && isTrial && trialDaysLeft !== 0 && (
             <Badge
diff --git a/apps/client/src/components/layouts/global/layout.tsx b/apps/client/src/components/layouts/global/layout.tsx
index e15149d7..46e82fe5 100644
--- a/apps/client/src/components/layouts/global/layout.tsx
+++ b/apps/client/src/components/layouts/global/layout.tsx
@@ -1,16 +1,23 @@
 import { UserProvider } from "@/features/user/user-provider.tsx";
-import { Outlet } from "react-router-dom";
+import { Outlet, useParams } from "react-router-dom";
 import GlobalAppShell from "@/components/layouts/global/global-app-shell.tsx";
 import { PosthogUser } from "@/ee/components/posthog-user.tsx";
 import { isCloud } from "@/lib/config.ts";
+import { SearchSpotlight } from "@/features/search/components/search-spotlight.tsx";
+import React from "react";
+import { useGetSpaceBySlugQuery } from "@/features/space/queries/space-query.ts";
 
 export default function Layout() {
+  const { spaceSlug } = useParams();
+  const { data: space } = useGetSpaceBySlugQuery(spaceSlug);
+
   return (
     <UserProvider>
       <GlobalAppShell>
         <Outlet />
       </GlobalAppShell>
       {isCloud() && <PosthogUser />}
+      <SearchSpotlight spaceId={space?.id} />
     </UserProvider>
   );
 }
diff --git a/apps/client/src/features/editor/page-editor.tsx b/apps/client/src/features/editor/page-editor.tsx
index f68f50de..e97a783f 100644
--- a/apps/client/src/features/editor/page-editor.tsx
+++ b/apps/client/src/features/editor/page-editor.tsx
@@ -50,6 +50,7 @@ import { extractPageSlugId } from "@/lib";
 import { FIVE_MINUTES } from "@/lib/constants.ts";
 import { PageEditMode } from "@/features/user/types/user.types.ts";
 import { jwtDecode } from "jwt-decode";
+import { searchSpotlight } from '@/features/search/constants.ts';
 
 interface PageEditorProps {
   pageId: string;
@@ -222,6 +223,10 @@ export default function PageEditor({
               event.preventDefault();
               return true;
             }
+            if ((event.ctrlKey || event.metaKey) && event.code === 'KeyK') {
+              searchSpotlight.open();
+              return true;
+            }
             if (["ArrowUp", "ArrowDown", "Enter"].includes(event.key)) {
               const slashCommand = document.querySelector("#slash-command");
               if (slashCommand) {
diff --git a/apps/client/src/features/editor/title-editor.tsx b/apps/client/src/features/editor/title-editor.tsx
index 937ae374..f7665ecb 100644
--- a/apps/client/src/features/editor/title-editor.tsx
+++ b/apps/client/src/features/editor/title-editor.tsx
@@ -26,6 +26,7 @@ import { UpdateEvent } from "@/features/websocket/types";
 import localEmitter from "@/lib/local-emitter.ts";
 import { currentUserAtom } from "@/features/user/atoms/current-user-atom.ts";
 import { PageEditMode } from "@/features/user/types/user.types.ts";
+import { searchSpotlight } from "@/features/search/constants.ts";
 
 export interface TitleEditorProps {
   pageId: string;
@@ -86,6 +87,20 @@ export function TitleEditor({
     content: title,
     immediatelyRender: true,
     shouldRerenderOnTransaction: false,
+    editorProps: {
+      handleDOMEvents: {
+        keydown: (_view, event) => {
+          if ((event.ctrlKey || event.metaKey) && event.code === "KeyS") {
+            event.preventDefault();
+            return true;
+          }
+          if ((event.ctrlKey || event.metaKey) && event.code === "KeyK") {
+            searchSpotlight.open();
+            return true;
+          }
+        },
+      },
+    },
   });
 
   useEffect(() => {
@@ -193,7 +208,7 @@ export function TitleEditor({
       onKeyDown={(event) => {
         // First handle the search hotkey
         getHotkeyHandler([["mod+F", openSearchDialog]])(event);
-        
+
         // Then handle other key events
         handleTitleKeyDown(event);
       }}
diff --git a/apps/client/src/features/search/components/search-result-item.tsx b/apps/client/src/features/search/components/search-result-item.tsx
new file mode 100644
index 00000000..76b74f29
--- /dev/null
+++ b/apps/client/src/features/search/components/search-result-item.tsx
@@ -0,0 +1,124 @@
+import React from "react";
+import { Group, Center, Text, Badge, ActionIcon } from "@mantine/core";
+import { Spotlight } from "@mantine/spotlight";
+import { Link } from "react-router-dom";
+import { IconFile, IconDownload } from "@tabler/icons-react";
+import { buildPageUrl } from "@/features/page/page.utils";
+import { getPageIcon } from "@/lib";
+import {
+  IAttachmentSearch,
+  IPageSearch,
+} from "@/features/search/types/search.types";
+import DOMPurify from "dompurify";
+
+interface SearchResultItemProps {
+  result: IPageSearch | IAttachmentSearch;
+  isAttachmentResult: boolean;
+  showSpace?: boolean;
+}
+
+export function SearchResultItem({
+  result,
+  isAttachmentResult,
+  showSpace,
+}: SearchResultItemProps) {
+  if (isAttachmentResult) {
+    const attachmentResult = result as IAttachmentSearch;
+
+    const handleDownload = (e: React.MouseEvent) => {
+      e.preventDefault();
+      e.stopPropagation();
+      const downloadUrl = `/api/files/${attachmentResult.id}/${attachmentResult.fileName}`;
+      window.open(downloadUrl, "_blank");
+    };
+
+    return (
+      <Spotlight.Action
+        component={Link}
+        //@ts-ignore
+        to={buildPageUrl(
+          attachmentResult.space.slug,
+          attachmentResult.page.slugId,
+          attachmentResult.page.title,
+        )}
+        style={{ userSelect: "none" }}
+      >
+        <Group wrap="nowrap" w="100%">
+          <Center>
+            <IconFile size={20} />
+          </Center>
+
+          <div style={{ flex: 1 }}>
+            <Text>{attachmentResult.fileName}</Text>
+            <Text size="xs" opacity={0.6}>
+              {attachmentResult.space.name} • {attachmentResult.page.title}
+            </Text>
+
+            {attachmentResult?.highlight && (
+              <Text
+                opacity={0.6}
+                size="xs"
+                dangerouslySetInnerHTML={{
+                  __html: DOMPurify.sanitize(attachmentResult.highlight, {
+                    ALLOWED_TAGS: ["mark", "em", "strong", "b"],
+                    ALLOWED_ATTR: []
+                  }),
+                }}
+              />
+            )}
+          </div>
+
+          <ActionIcon
+            variant="subtle"
+            color="gray"
+            onClick={handleDownload}
+            title="Download attachment"
+          >
+            <IconDownload size={18} />
+          </ActionIcon>
+        </Group>
+      </Spotlight.Action>
+    );
+  } else {
+    const pageResult = result as IPageSearch;
+    return (
+      <Spotlight.Action
+        component={Link}
+        //@ts-ignore
+        to={buildPageUrl(
+          pageResult.space.slug,
+          pageResult.slugId,
+          pageResult.title,
+        )}
+        style={{ userSelect: "none" }}
+      >
+        <Group wrap="nowrap" w="100%">
+          <Center>{getPageIcon(pageResult?.icon)}</Center>
+
+          <div style={{ flex: 1 }}>
+            <Text>{pageResult.title}</Text>
+
+            {showSpace && pageResult.space && (
+              <Badge variant="light" size="xs" color="gray">
+                {pageResult.space.name}
+              </Badge>
+            )}
+
+            {pageResult?.highlight && (
+              <Text
+                opacity={0.6}
+                size="xs"
+                dangerouslySetInnerHTML={{
+                  __html: DOMPurify.sanitize(pageResult.highlight, {
+                    ALLOWED_TAGS: ["mark", "em", "strong", "b"],
+                    ALLOWED_ATTR: []
+                  }),
+                }}
+              />
+            )}
+          </div>
+        </Group>
+      </Spotlight.Action>
+    );
+  }
+}
diff --git a/apps/client/src/features/search/components/search-spotlight-filters.module.css b/apps/client/src/features/search/components/search-spotlight-filters.module.css
new file mode 100644
index 00000000..e8073aab
--- /dev/null
+++ b/apps/client/src/features/search/components/search-spotlight-filters.module.css
@@ -0,0 +1,19 @@
+.filtersContainer {
+  display: flex;
+  gap: 8px;
+  overflow-x: auto;
+  padding: 8px 0;
+  scrollbar-width: thin;
+}
+
+.filterButton {
+  white-space: nowrap;
+  flex-shrink: 0;
+  font-size: 13px;
+  height: 32px;
+  padding: 0 12px;
+  color: light-dark(var(--mantine-color-gray-7), var(--mantine-color-gray-6));
+  &:hover {
+    color: light-dark(var(--mantine-color-gray-7), var(--mantine-color-gray-6));
+  }
+}
diff --git a/apps/client/src/features/search/components/search-spotlight-filters.tsx b/apps/client/src/features/search/components/search-spotlight-filters.tsx
new file mode 100644
index 00000000..d8f770e7
--- /dev/null
+++ b/apps/client/src/features/search/components/search-spotlight-filters.tsx
@@ -0,0 +1,252 @@
+import React, { useState, useMemo, useEffect } from "react";
+import {
+  Button,
+  Menu,
+  Text,
+  TextInput,
+  Divider,
+  Badge,
+  ScrollArea,
+  Avatar,
+  Group,
+  getDefaultZIndex,
+} from "@mantine/core";
+import {
+  IconChevronDown,
+  IconBuilding,
+  IconFileDescription,
+  IconSearch,
+  IconCheck,
+} from "@tabler/icons-react";
+import { useTranslation } from "react-i18next";
+import { useDebouncedValue } from "@mantine/hooks";
+import { useGetSpacesQuery } from "@/features/space/queries/space-query";
+import { useLicense } from "@/ee/hooks/use-license";
+import classes from "./search-spotlight-filters.module.css";
+
+interface SearchSpotlightFiltersProps {
+  onFiltersChange?: (filters: any) => void;
+  spaceId?: string;
+}
+
+export function SearchSpotlightFilters({
+  onFiltersChange,
+  spaceId,
+}: SearchSpotlightFiltersProps) {
+  const { t } = useTranslation();
+  const { hasLicenseKey } = useLicense();
+  const [selectedSpaceId, setSelectedSpaceId] = useState<string | null>(
+    spaceId || null,
+  );
+  const [spaceSearchQuery, setSpaceSearchQuery] = useState("");
+  const [debouncedSpaceQuery] = useDebouncedValue(spaceSearchQuery, 300);
+  const [contentType, setContentType] = useState<string | null>("page");
+
+  const { data: spacesData } = useGetSpacesQuery({
+    page: 1,
+    limit: 100,
+    query: debouncedSpaceQuery,
+  });
+
+  const selectedSpaceData = useMemo(() => {
+    if (!spacesData?.items || !selectedSpaceId) return null;
+    return spacesData.items.find((space) => space.id === selectedSpaceId);
+  }, [spacesData?.items, selectedSpaceId]);
+
+  const availableSpaces = useMemo(() => {
+    const spaces = spacesData?.items || [];
+    if (!selectedSpaceId) return spaces;
+
+    // Sort to put selected space first
+    return [...spaces].sort((a, b) => {
+      if (a.id === selectedSpaceId) return -1;
+      if (b.id === selectedSpaceId) return 1;
+      return 0;
+    });
+  }, [spacesData?.items, selectedSpaceId]);
+
+  useEffect(() => {
+    if (onFiltersChange) {
+      onFiltersChange({
+        spaceId: selectedSpaceId,
+        contentType,
+      });
+    }
+  }, []);
+
+  const contentTypeOptions = [
+    { value: "page", label: "Pages" },
+    {
+      value: "attachment",
+      label: "Attachments",
+      disabled: !hasLicenseKey,
+    },
+  ];
+
+  const handleSpaceSelect = (spaceId: string | null) => {
+    setSelectedSpaceId(spaceId);
+
+    if (onFiltersChange) {
+      onFiltersChange({
+        spaceId: spaceId,
+        contentType,
+      });
+    }
+  };
+
+  const handleFilterChange = (filterType: string, value: any) => {
+    let newSelectedSpaceId = selectedSpaceId;
+    let newContentType = contentType;
+
+    switch (filterType) {
+      case "spaceId":
+        newSelectedSpaceId = value;
+        setSelectedSpaceId(value);
+        break;
+      case "contentType":
+        newContentType = value;
+        setContentType(value);
+        break;
+    }
+
+    if (onFiltersChange) {
+      onFiltersChange({
+        spaceId: newSelectedSpaceId,
+        contentType: newContentType,
+      });
+    }
+  };
+
+  return (
+    <div className={classes.filtersContainer}>
+      <Menu
+        shadow="md"
+        width={250}
+        position="bottom-start"
+        zIndex={getDefaultZIndex("max")}
+      >
+        <Menu.Target>
+          <Button
+            variant="subtle"
+            color="gray"
+            size="sm"
+            rightSection={<IconChevronDown size={14} />}
+            leftSection={<IconBuilding size={16} />}
+            className={classes.filterButton}
+            fw={500}
+          >
+            {selectedSpaceId
+              ? `Space: ${selectedSpaceData?.name || "Unknown"}`
+              : "Space: All spaces"}
+          </Button>
+        </Menu.Target>
+        <Menu.Dropdown>
+          <TextInput
+            placeholder="Find a space"
+            data-autofocus
+            autoFocus
+            leftSection={<IconSearch size={16} />}
+            value={spaceSearchQuery}
+            onChange={(e) => setSpaceSearchQuery(e.target.value)}
+            size="sm"
+            variant="filled"
+            radius="sm"
+            styles={{ input: { marginBottom: 8 } }}
+          />
+
+          <ScrollArea.Autosize mah={280}>
+            <Menu.Item onClick={() => handleSpaceSelect(null)}>
+              <Group flex="1" gap="xs">
+                <Avatar
+                  color="initials"
+                  variant="filled"
+                  name="All spaces"
+                  size={20}
+                />
+                <div style={{ flex: 1 }}>
+                  <Text size="sm" fw={500}>
+                    All spaces
+                  </Text>
+                  <Text size="xs" c="dimmed">
+                    Search in all your spaces
+                  </Text>
+                </div>
+                {!selectedSpaceId && <IconCheck size={20} />}
+              </Group>
+            </Menu.Item>
+
+            <Divider my="xs" />
+
+            {availableSpaces.map((space) => (
+              <Menu.Item
+                key={space.id}
+                onClick={() => handleSpaceSelect(space.id)}
+              >
+                <Group flex="1" gap="xs">
+                  <Avatar
+                    color="initials"
+                    variant="filled"
+                    name={space.name}
+                    size={20}
+                  />
+                  <Text size="sm" fw={500} style={{ flex: 1 }} truncate>
+                    {space.name}
+                  </Text>
+                  {selectedSpaceId === space.id && <IconCheck size={20} />}
+                </Group>
+              </Menu.Item>
+            ))}
+          </ScrollArea.Autosize>
+        </Menu.Dropdown>
+      </Menu>
+
+      <Menu
+        shadow="md"
+        width={220}
+        position="bottom-start"
+        zIndex={getDefaultZIndex("max")}
+      >
+        <Menu.Target>
+          <Button
+            variant="subtle"
+            color="gray"
+            size="sm"
+            rightSection={<IconChevronDown size={14} />}
+            leftSection={<IconFileDescription size={16} />}
+            className={classes.filterButton}
+            fw={500}
+          >
+            {contentType
+              ? `Type: ${contentTypeOptions.find((opt) => opt.value === contentType)?.label || contentType}`
+              : "Type"}
+          </Button>
+        </Menu.Target>
+        <Menu.Dropdown>
+          {contentTypeOptions.map((option) => (
+            <Menu.Item
+              key={option.value}
+              onClick={() =>
+                !option.disabled &&
+                contentType !== option.value &&
+                handleFilterChange("contentType", option.value)
+              }
+              disabled={option.disabled}
+            >
+              <Group flex="1" gap="xs">
+                <div>
+                  <Text size="sm">{option.label}</Text>
+                  {option.disabled && (
+                    <Badge size="xs" mt={4}>
+                      Enterprise
+                    </Badge>
+                  )}
+                </div>
+                {contentType === option.value && <IconCheck size={20} />}
+              </Group>
+            </Menu.Item>
+          ))}
+        </Menu.Dropdown>
+      </Menu>
+    </div>
+  );
+}
diff --git a/apps/client/src/features/search/components/search-spotlight.tsx b/apps/client/src/features/search/components/search-spotlight.tsx
new file mode 100644
index 00000000..e7e3c9f7
--- /dev/null
+++ b/apps/client/src/features/search/components/search-spotlight.tsx
@@ -0,0 +1,104 @@
+import { Spotlight } from "@mantine/spotlight";
+import { IconSearch } from "@tabler/icons-react";
+import React, { useState, useMemo } from "react";
+import { useDebouncedValue } from "@mantine/hooks";
+import { useTranslation } from "react-i18next";
+import { searchSpotlightStore } from "../constants.ts";
+import { SearchSpotlightFilters } from "./search-spotlight-filters.tsx";
+import { useUnifiedSearch } from "../hooks/use-unified-search.ts";
+import { SearchResultItem } from "./search-result-item.tsx";
+import { useLicense } from "@/ee/hooks/use-license.tsx";
+
+interface SearchSpotlightProps {
+  spaceId?: string;
+}
+export function SearchSpotlight({ spaceId }: SearchSpotlightProps) {
+  const { t } = useTranslation();
+  const { hasLicenseKey } = useLicense();
+  const [query, setQuery] = useState("");
+  const [debouncedSearchQuery] = useDebouncedValue(query, 300);
+  const [filters, setFilters] = useState<{
+    spaceId?: string | null;
+    contentType?: string;
+  }>({
+    contentType: "page",
+  });
+
+  // Build unified search params
+  const searchParams = useMemo(() => {
+    const params: any = {
+      query: debouncedSearchQuery,
+      contentType: filters.contentType || "page", // Only used for frontend routing
+    };
+
+    // Handle space filtering - only pass spaceId if a specific space is selected
+    if (filters.spaceId) {
+      params.spaceId = filters.spaceId;
+    }
+
+    return params;
+  }, [debouncedSearchQuery, filters]);
+
+  const { data: searchResults, isLoading } = useUnifiedSearch(searchParams);
+
+  // Determine result type for rendering
+  const isAttachmentSearch =
+    filters.contentType === "attachment" && hasLicenseKey;
+
+  const resultItems = (searchResults || []).map((result) => (
+    <SearchResultItem
+      key={result.id}
+      result={result}
+      isAttachmentResult={isAttachmentSearch}
+      showSpace={!filters.spaceId}
+    />
+  ));
+
+  const handleFiltersChange = (newFilters: any) => {
+    setFilters(newFilters);
+  };
+
+  return (
+    <>
+      <Spotlight.Root
+        size="xl"
+        maxHeight={600}
+        store={searchSpotlightStore}
+        query={query}
+        onQueryChange={setQuery}
+        scrollable
+        overlayProps={{
+          backgroundOpacity: 0.55,
+        }}
+      >
+        <Spotlight.Search
+          placeholder={t("Search...")}
+          leftSection={<IconSearch size={20} stroke={1.5} />}
+        />
+
+        <div
+          style={{
+            padding: "4px 16px",
+          }}
+        >
+          <SearchSpotlightFilters
+            onFiltersChange={handleFiltersChange}
+            spaceId={spaceId}
+          />
+        </div>
+
+        <Spotlight.ActionsList>
+          {query.length === 0 && resultItems.length === 0 && (
+            <Spotlight.Empty>{t("Start typing to search...")}</Spotlight.Empty>
+          )}
+
+          {query.length > 0 && !isLoading && resultItems.length === 0 && (
+            <Spotlight.Empty>{t("No results found...")}</Spotlight.Empty>
+          )}
+
+          {resultItems.length > 0 && <>{resultItems}</>}
+        </Spotlight.ActionsList>
+      </Spotlight.Root>
+    </>
+  );
+}
diff --git a/apps/client/src/features/search/share-search-spotlight.tsx b/apps/client/src/features/search/components/share-search-spotlight.tsx
similarity index 90%
rename from apps/client/src/features/search/share-search-spotlight.tsx
rename to apps/client/src/features/search/components/share-search-spotlight.tsx
index bfbced6e..dd0d5181 100644
--- a/apps/client/src/features/search/share-search-spotlight.tsx
+++ b/apps/client/src/features/search/components/share-search-spotlight.tsx
@@ -9,6 +9,7 @@ import { buildSharedPageUrl } from "@/features/page/page.utils.ts";
 import { getPageIcon } from "@/lib";
 import { useTranslation } from "react-i18next";
 import { shareSearchSpotlightStore } from "@/features/search/constants.ts";
+import DOMPurify from "dompurify";
 
 interface ShareSearchSpotlightProps {
   shareId?: string;
@@ -47,7 +48,12 @@ export function ShareSearchSpotlight({ shareId }: ShareSearchSpotlightProps) {
             <Text
               opacity={0.6}
               size="xs"
-              dangerouslySetInnerHTML={{ __html: page.highlight }}
+              dangerouslySetInnerHTML={{
+                __html: DOMPurify.sanitize(page.highlight, {
+                  ALLOWED_TAGS: ["mark", "em", "strong", "b"],
+                  ALLOWED_ATTR: []
+                }),
+              }}
             />
           )}
         </div>
diff --git a/apps/client/src/features/search/hooks/use-unified-search.ts b/apps/client/src/features/search/hooks/use-unified-search.ts
new file mode 100644
index 00000000..2adccc25
--- /dev/null
+++ b/apps/client/src/features/search/hooks/use-unified-search.ts
@@ -0,0 +1,42 @@
+import { useQuery, UseQueryResult } from "@tanstack/react-query";
+import {
+  searchPage,
+  searchAttachments,
+} from "@/features/search/services/search-service";
+import {
+  IAttachmentSearch,
+  IPageSearch,
+  IPageSearchParams,
+} from "@/features/search/types/search.types";
+import { useLicense } from "@/ee/hooks/use-license";
+
+export type UnifiedSearchResult = IPageSearch | IAttachmentSearch;
+
+export interface UseUnifiedSearchParams extends IPageSearchParams {
+  contentType?: string;
+}
+
+export function useUnifiedSearch(
+  params: UseUnifiedSearchParams,
+): UseQueryResult<UnifiedSearchResult[], Error> {
+  const { hasLicenseKey } = useLicense();
+
+  const isAttachmentSearch =
+    params.contentType === "attachment" && hasLicenseKey;
+  const searchType = isAttachmentSearch ? "attachment" : "page";
+
+  return useQuery({
+    queryKey: ["unified-search", searchType, params],
+    queryFn: async () => {
+      // Remove contentType from backend params since it's only used for frontend routing
+      const { contentType, ...backendParams } = params;
+
+      if (isAttachmentSearch) {
+        return await searchAttachments(backendParams);
+      } else {
+        return await searchPage(backendParams);
+      }
+    },
+    enabled: !!params.query,
+  });
+}
diff --git a/apps/client/src/features/search/queries/search-query.ts b/apps/client/src/features/search/queries/search-query.ts
index 6b8c0296..bc91dfac 100644
--- a/apps/client/src/features/search/queries/search-query.ts
+++ b/apps/client/src/features/search/queries/search-query.ts
@@ -1,15 +1,17 @@
 import { useQuery, UseQueryResult } from "@tanstack/react-query";
 import {
+  searchAttachments,
   searchPage,
   searchShare,
   searchSuggestions,
-} from "@/features/search/services/search-service";
+} from '@/features/search/services/search-service';
 import {
+  IAttachmentSearch,
   IPageSearch,
   IPageSearchParams,
   ISuggestionResult,
   SearchSuggestionParams,
-} from "@/features/search/types/search.types";
+} from '@/features/search/types/search.types';
 
 export function usePageSearchQuery(
   params: IPageSearchParams,
@@ -41,3 +43,13 @@ export function useShareSearchQuery(
     enabled: !!params.query,
   });
 }
+
+export function useAttachmentSearchQuery(
+  params: IPageSearchParams,
+): UseQueryResult<IAttachmentSearch[], Error> {
+  return useQuery({
+    queryKey: ["attachment-search", params],
+    queryFn: () => searchAttachments(params),
+    enabled: !!params.query,
+  });
+}
diff --git a/apps/client/src/features/search/search-spotlight.tsx b/apps/client/src/features/search/search-spotlight.tsx
deleted file mode 100644
index 581524fc..00000000
--- a/apps/client/src/features/search/search-spotlight.tsx
+++ /dev/null
@@ -1,83 +0,0 @@
-import { Group, Center, Text } from "@mantine/core";
-import { Spotlight } from "@mantine/spotlight";
-import { IconSearch } from "@tabler/icons-react";
-import React, { useState } from "react";
-import { Link } from "react-router-dom";
-import { useDebouncedValue } from "@mantine/hooks";
-import { usePageSearchQuery } from "@/features/search/queries/search-query";
-import { buildPageUrl } from "@/features/page/page.utils.ts";
-import { getPageIcon } from "@/lib";
-import { useTranslation } from "react-i18next";
-import { searchSpotlightStore } from "./constants";
-
-interface SearchSpotlightProps {
-  spaceId?: string;
-}
-export function SearchSpotlight({ spaceId }: SearchSpotlightProps) {
-  const { t } = useTranslation();
-  const [query, setQuery] = useState("");
-  const [debouncedSearchQuery] = useDebouncedValue(query, 300);
-
-  const { data: searchResults } = usePageSearchQuery({
-    query: debouncedSearchQuery,
-    spaceId,
-  });
-
-  const pages = (
-    searchResults && searchResults.length > 0 ? searchResults : []
-  ).map((page) => (
-    <Spotlight.Action
-      key={page.id}
-      component={Link}
-      //@ts-ignore
-      to={buildPageUrl(page.space.slug, page.slugId, page.title)}
-      style={{ userSelect: "none" }}
-    >
-      <Group wrap="nowrap" w="100%">
-        <Center>{getPageIcon(page?.icon)}</Center>
-
-        <div style={{ flex: 1 }}>
-          <Text>{page.title}</Text>
-
-          {page?.highlight && (
-            <Text
-              opacity={0.6}
-              size="xs"
-              dangerouslySetInnerHTML={{ __html: page.highlight }}
-            />
-          )}
-        </div>
-      </Group>
-    </Spotlight.Action>
-  ));
-
-  return (
-    <>
-      <Spotlight.Root
-        store={searchSpotlightStore}
-        query={query}
-        onQueryChange={setQuery}
-        scrollable
-        overlayProps={{
-          backgroundOpacity: 0.55,
-        }}
-      >
-        <Spotlight.Search
-          placeholder={t("Search...")}
-          leftSection={<IconSearch size={20} stroke={1.5} />}
-        />
-        <Spotlight.ActionsList>
-          {query.length === 0 && pages.length === 0 && (
-            <Spotlight.Empty>{t("Start typing to search...")}</Spotlight.Empty>
-          )}
-
-          {query.length > 0 && pages.length === 0 && (
-            <Spotlight.Empty>{t("No results found...")}</Spotlight.Empty>
-          )}
-
-          {pages.length > 0 && pages}
-        </Spotlight.ActionsList>
-      </Spotlight.Root>
-    </>
-  );
-}
diff --git a/apps/client/src/features/search/services/search-service.ts b/apps/client/src/features/search/services/search-service.ts
index 8ea4e6a6..417e3f11 100644
--- a/apps/client/src/features/search/services/search-service.ts
+++ b/apps/client/src/features/search/services/search-service.ts
@@ -1,10 +1,11 @@
 import api from "@/lib/api-client";
 import {
+  IAttachmentSearch,
   IPageSearch,
   IPageSearchParams,
   ISuggestionResult,
   SearchSuggestionParams,
-} from "@/features/search/types/search.types";
+} from '@/features/search/types/search.types';
 
 export async function searchPage(
   params: IPageSearchParams,
@@ -26,3 +27,10 @@ export async function searchShare(
   const req = await api.post<IPageSearch[]>("/search/share-search", params);
   return req.data;
 }
+
+export async function searchAttachments(
+  params: IPageSearchParams,
+): Promise<IAttachmentSearch[]> {
+  const req = await api.post<IAttachmentSearch[]>("/search-attachments", params);
+  return req.data;
+}
diff --git a/apps/client/src/features/search/types/search.types.ts b/apps/client/src/features/search/types/search.types.ts
index 1338e121..9962b9ca 100644
--- a/apps/client/src/features/search/types/search.types.ts
+++ b/apps/client/src/features/search/types/search.types.ts
@@ -37,3 +37,25 @@ export interface IPageSearchParams {
   spaceId?: string;
   shareId?: string;
 }
+
+export interface IAttachmentSearch {
+  id: string;
+  fileName: string;
+  pageId: string;
+  creatorId: string;
+  createdAt: Date;
+  updatedAt: Date;
+  rank: string;
+  highlight: string;
+  space: {
+    id: string;
+    name: string;
+    slug: string;
+    icon: string;
+  };
+  page: {
+    id: string;
+    title: string;
+    slugId: string;
+  };
+}
diff --git a/apps/client/src/features/share/components/share-shell.tsx b/apps/client/src/features/share/components/share-shell.tsx
index 10b2a74d..a300172e 100644
--- a/apps/client/src/features/share/components/share-shell.tsx
+++ b/apps/client/src/features/share/components/share-shell.tsx
@@ -34,7 +34,7 @@ import {
   SearchControl,
   SearchMobileControl,
 } from "@/features/search/components/search-control.tsx";
-import { ShareSearchSpotlight } from "@/features/search/share-search-spotlight";
+import { ShareSearchSpotlight } from "@/features/search/components/share-search-spotlight.tsx";
 import { shareSearchSpotlight } from "@/features/search/constants";
 import ShareBranding from '@/features/share/components/share-branding.tsx';
 
diff --git a/apps/client/src/features/space/components/sidebar/space-sidebar.tsx b/apps/client/src/features/space/components/sidebar/space-sidebar.tsx
index f0235b3e..d650b178 100644
--- a/apps/client/src/features/space/components/sidebar/space-sidebar.tsx
+++ b/apps/client/src/features/space/components/sidebar/space-sidebar.tsx
@@ -19,7 +19,6 @@ import {
 import classes from "./space-sidebar.module.css";
 import React from "react";
 import { useAtom } from "jotai";
-import { SearchSpotlight } from "@/features/search/search-spotlight.tsx";
 import { treeApiAtom } from "@/features/page/tree/atoms/tree-api-atom.ts";
 import { Link, useLocation, useParams } from "react-router-dom";
 import clsx from "clsx";
@@ -195,8 +194,6 @@ export function SpaceSidebar() {
         onClose={closeSettings}
         spaceId={space?.slug}
       />
-
-      <SearchSpotlight spaceId={space.id} />
     </>
   );
 }
diff --git a/apps/client/src/lib/app-route.ts b/apps/client/src/lib/app-route.ts
index dc42dad5..0151c856 100644
--- a/apps/client/src/lib/app-route.ts
+++ b/apps/client/src/lib/app-route.ts
@@ -1,6 +1,7 @@
 const APP_ROUTE = {
   HOME: "/home",
   SPACES: "/spaces",
+  SEARCH: "/search",
   AUTH: {
     LOGIN: "/login",
     SIGNUP: "/signup",
diff --git a/apps/server/package.json b/apps/server/package.json
index 267abe00..35f17339 100644
--- a/apps/server/package.json
+++ b/apps/server/package.json
@@ -67,6 +67,7 @@
     "kysely": "^0.28.2",
     "kysely-migration-cli": "^0.4.2",
     "ldapts": "^7.4.0",
+    "mammoth": "^1.10.0",
     "mime-types": "^2.1.35",
     "nanoid": "3.3.11",
     "nestjs-kysely": "^1.2.0",
@@ -76,6 +77,7 @@
     "p-limit": "^6.2.0",
     "passport-google-oauth20": "^2.0.0",
     "passport-jwt": "^4.0.1",
+    "pdfjs-dist": "^5.4.54",
     "pg": "^8.16.0",
     "pg-tsquery": "^8.4.2",
     "postmark": "^4.0.5",
diff --git a/apps/server/src/common/helpers/utils.ts b/apps/server/src/common/helpers/utils.ts
index 0bc7d708..1b672610 100644
--- a/apps/server/src/common/helpers/utils.ts
+++ b/apps/server/src/common/helpers/utils.ts
@@ -87,3 +87,12 @@ export function extractBearerTokenFromHeader(
   const [type, token] = request.headers.authorization?.split(' ') ?? [];
   return type === 'Bearer' ? token : undefined;
 }
+
+export function hasLicenseOrEE(opts: {
+  licenseKey: string;
+  plan: string;
+  isCloud: boolean;
+}): boolean {
+  const { licenseKey, plan, isCloud } = opts;
+  return Boolean(licenseKey) || (isCloud && plan === 'business');
+}
diff --git a/apps/server/src/core/attachment/processors/attachment.processor.ts b/apps/server/src/core/attachment/processors/attachment.processor.ts
index 935c20a2..83323de5 100644
--- a/apps/server/src/core/attachment/processors/attachment.processor.ts
+++ b/apps/server/src/core/attachment/processors/attachment.processor.ts
@@ -3,12 +3,15 @@ import { OnWorkerEvent, Processor, WorkerHost } from '@nestjs/bullmq';
 import { Job } from 'bullmq';
 import { AttachmentService } from '../services/attachment.service';
 import { QueueJob, QueueName } from 'src/integrations/queue/constants';
-import { Space } from '@docmost/db/types/entity.types';
+import { ModuleRef } from '@nestjs/core';
 
 @Processor(QueueName.ATTACHMENT_QUEUE)
 export class AttachmentProcessor extends WorkerHost implements OnModuleDestroy {
   private readonly logger = new Logger(AttachmentProcessor.name);
-  constructor(private readonly attachmentService: AttachmentService) {
+  constructor(
+    private readonly attachmentService: AttachmentService,
+    private moduleRef: ModuleRef,
+  ) {
     super();
   }
 
@@ -25,6 +28,33 @@ export class AttachmentProcessor extends WorkerHost implements OnModuleDestroy {
           job.data.pageId,
         );
       }
+      if (
+        job.name === QueueJob.ATTACHMENT_INDEX_CONTENT ||
+        job.name === QueueJob.ATTACHMENT_INDEXING
+      ) {
+        let AttachmentEeModule: any;
+        try {
+          // eslint-disable-next-line @typescript-eslint/no-require-imports
+          AttachmentEeModule = require('./../../../ee/attachments-ee/attachment-ee.service');
+        } catch (err) {
+          this.logger.error(
+            'Attachment enterprise module requested but EE module not bundled in this build',
+          );
+          return;
+        }
+        const attachmentEeService = this.moduleRef.get(
+          AttachmentEeModule.AttachmentEeService,
+          { strict: false },
+        );
+
+        if (job.name === QueueJob.ATTACHMENT_INDEX_CONTENT) {
+          await attachmentEeService.indexAttachment(job.data.attachmentId);
+        } else if (job.name === QueueJob.ATTACHMENT_INDEXING) {
+          await attachmentEeService.indexAttachments(
+            job.data.workspaceId,
+          );
+        }
+      }
     } catch (err) {
       throw err;
     }
diff --git a/apps/server/src/core/attachment/services/attachment.service.ts b/apps/server/src/core/attachment/services/attachment.service.ts
index 6472c671..299ddb60 100644
--- a/apps/server/src/core/attachment/services/attachment.service.ts
+++ b/apps/server/src/core/attachment/services/attachment.service.ts
@@ -22,6 +22,9 @@ import { executeTx } from '@docmost/db/utils';
 import { UserRepo } from '@docmost/db/repos/user/user.repo';
 import { WorkspaceRepo } from '@docmost/db/repos/workspace/workspace.repo';
 import { SpaceRepo } from '@docmost/db/repos/space/space.repo';
+import { InjectQueue } from '@nestjs/bullmq';
+import { QueueJob, QueueName } from '../../../integrations/queue/constants';
+import { Queue } from 'bullmq';
 
 @Injectable()
 export class AttachmentService {
@@ -33,6 +36,7 @@ export class AttachmentService {
     private readonly workspaceRepo: WorkspaceRepo,
     private readonly spaceRepo: SpaceRepo,
     @InjectKysely() private readonly db: KyselyDB,
+    @InjectQueue(QueueName.ATTACHMENT_QUEUE) private attachmentQueue: Queue,
   ) {}
 
   async uploadFile(opts: {
@@ -99,6 +103,23 @@ export class AttachmentService {
           pageId,
         });
       }
+
+      // Only index PDFs and DOCX files
+      if (['.pdf', '.docx'].includes(attachment.fileExt.toLowerCase())) {
+        await this.attachmentQueue.add(
+          QueueJob.ATTACHMENT_INDEX_CONTENT,
+          {
+            attachmentId: attachmentId,
+          },
+          {
+            attempts: 2,
+            backoff: {
+              type: 'exponential',
+              delay: 10000,
+            },
+          },
+        );
+      }
     } catch (err) {
       // delete uploaded file on error
       this.logger.error(err);
@@ -367,4 +388,5 @@ export class AttachmentService {
       throw err;
     }
   }
+
 }
diff --git a/apps/server/src/core/search/dto/search.dto.ts b/apps/server/src/core/search/dto/search.dto.ts
index 8dffef02..40486a52 100644
--- a/apps/server/src/core/search/dto/search.dto.ts
+++ b/apps/server/src/core/search/dto/search.dto.ts
@@ -5,15 +5,13 @@ import {
   IsOptional,
   IsString,
 } from 'class-validator';
-import { PartialType } from '@nestjs/mapped-types';
-import { CreateWorkspaceDto } from '../../workspace/dto/create-workspace.dto';
 
 export class SearchDTO {
   @IsNotEmpty()
   @IsString()
   query: string;
 
-  @IsNotEmpty()
+  @IsOptional()
   @IsString()
   spaceId: string;
 
diff --git a/apps/server/src/core/share/share.controller.ts b/apps/server/src/core/share/share.controller.ts
index b9a9fcbf..ef6e9b2a 100644
--- a/apps/server/src/core/share/share.controller.ts
+++ b/apps/server/src/core/share/share.controller.ts
@@ -31,6 +31,7 @@ import { Public } from '../../common/decorators/public.decorator';
 import { ShareRepo } from '@docmost/db/repos/share/share.repo';
 import { PaginationOptions } from '@docmost/db/pagination/pagination-options';
 import { EnvironmentService } from '../../integrations/environment/environment.service';
+import { hasLicenseOrEE } from '../../common/helpers';
 
 @UseGuards(JwtAuthGuard)
 @Controller('shares')
@@ -65,9 +66,11 @@ export class ShareController {
 
     return {
       ...(await this.shareService.getSharedPage(dto, workspace.id)),
-      hasLicenseKey:
-        Boolean(workspace.licenseKey) ||
-        (this.environmentService.isCloud() && workspace.plan === 'business'),
+      hasLicenseKey: hasLicenseOrEE({
+        licenseKey: workspace.licenseKey,
+        isCloud: this.environmentService.isCloud(),
+        plan: workspace.plan,
+      }),
     };
   }
 
@@ -175,9 +178,11 @@ export class ShareController {
   ) {
     return {
       ...(await this.shareService.getShareTree(dto.shareId, workspace.id)),
-      hasLicenseKey:
-        Boolean(workspace.licenseKey) ||
-        (this.environmentService.isCloud() && workspace.plan === 'business'),
+      hasLicenseKey: hasLicenseOrEE({
+        licenseKey: workspace.licenseKey,
+        isCloud: this.environmentService.isCloud(),
+        plan: workspace.plan,
+      }),
     };
   }
 }
diff --git a/apps/server/src/database/migrations/20250901T184612-attachments-search.ts b/apps/server/src/database/migrations/20250901T184612-attachments-search.ts
new file mode 100644
index 00000000..a543adf6
--- /dev/null
+++ b/apps/server/src/database/migrations/20250901T184612-attachments-search.ts
@@ -0,0 +1,29 @@
+import { type Kysely, sql } from 'kysely';
+
+export async function up(db: Kysely<any>): Promise<void> {
+  await db.schema
+    .alterTable('attachments')
+    .addColumn('text_content', 'text', (col) => col)
+    .addColumn('tsv', sql`tsvector`, (col) => col)
+    .execute();
+
+  await db.schema
+    .createIndex('attachments_tsv_idx')
+    .on('attachments')
+    .using('GIN')
+    .column('tsv')
+    .execute();
+}
+
+export async function down(db: Kysely<any>): Promise<void> {
+  await db.schema
+    .alterTable('attachments')
+    .dropIndex('attachments_tsv_idx')
+    .execute();
+
+  await db.schema
+    .alterTable('attachments')
+    .dropColumn('text_content')
+    .dropColumn('tsv')
+    .execute();
+}
diff --git a/apps/server/src/database/repos/attachment/attachment.repo.ts b/apps/server/src/database/repos/attachment/attachment.repo.ts
index 784e6c84..5824ce5f 100644
--- a/apps/server/src/database/repos/attachment/attachment.repo.ts
+++ b/apps/server/src/database/repos/attachment/attachment.repo.ts
@@ -12,6 +12,23 @@ import {
 export class AttachmentRepo {
   constructor(@InjectKysely() private readonly db: KyselyDB) {}
 
+  private baseFields: Array<keyof Attachment> = [
+    'id',
+    'fileName',
+    'filePath',
+    'fileSize',
+    'fileExt',
+    'mimeType',
+    'type',
+    'creatorId',
+    'pageId',
+    'spaceId',
+    'workspaceId',
+    'createdAt',
+    'updatedAt',
+    'deletedAt',
+  ];
+
   async findById(
     attachmentId: string,
     opts?: {
@@ -22,7 +39,7 @@ export class AttachmentRepo {
 
     return db
       .selectFrom('attachments')
-      .selectAll()
+      .select(this.baseFields)
       .where('id', '=', attachmentId)
       .executeTakeFirst();
   }
@@ -36,7 +53,7 @@ export class AttachmentRepo {
     return db
       .insertInto('attachments')
       .values(insertableAttachment)
-      .returningAll()
+      .returning(this.baseFields)
       .executeTakeFirst();
   }
 
@@ -50,7 +67,7 @@ export class AttachmentRepo {
 
     return db
       .selectFrom('attachments')
-      .selectAll()
+      .select(this.baseFields)
       .where('spaceId', '=', spaceId)
       .execute();
   }
@@ -64,6 +81,7 @@ export class AttachmentRepo {
       .updateTable('attachments')
       .set(updatableAttachment)
       .where('pageId', 'in', pageIds)
+      .returning(this.baseFields)
       .executeTakeFirst();
   }
 
@@ -75,7 +93,7 @@ export class AttachmentRepo {
       .updateTable('attachments')
       .set(updatableAttachment)
       .where('id', '=', attachmentId)
-      .returningAll()
+      .returning(this.baseFields)
       .executeTakeFirst();
   }
 
diff --git a/apps/server/src/database/types/db.d.ts b/apps/server/src/database/types/db.d.ts
index 0d0922c8..2f8baaf7 100644
--- a/apps/server/src/database/types/db.d.ts
+++ b/apps/server/src/database/types/db.d.ts
@@ -37,6 +37,8 @@ export interface Attachments {
   mimeType: string | null;
   pageId: string | null;
   spaceId: string | null;
+  textContent: string | null;
+  tsv: string | null;
   type: string | null;
   updatedAt: Generated<Timestamp>;
   workspaceId: string;
diff --git a/apps/server/src/ee b/apps/server/src/ee
index 505081bb..3775df60 160000
--- a/apps/server/src/ee
+++ b/apps/server/src/ee
@@ -1 +1 @@
-Subproject commit 505081bb85d283a0d620165fa9f210f7c8e14232
+Subproject commit 3775df60137366b6953d80037f90547fe8ee4ac7
diff --git a/apps/server/src/integrations/queue/constants/queue.constants.ts b/apps/server/src/integrations/queue/constants/queue.constants.ts
index 150c098e..4a1b1d1c 100644
--- a/apps/server/src/integrations/queue/constants/queue.constants.ts
+++ b/apps/server/src/integrations/queue/constants/queue.constants.ts
@@ -9,6 +9,8 @@ export enum QueueName {
 export enum QueueJob {
   SEND_EMAIL = 'send-email',
   DELETE_SPACE_ATTACHMENTS = 'delete-space-attachments',
+  ATTACHMENT_INDEX_CONTENT = 'attachment-index-content',
+  ATTACHMENT_INDEXING = 'attachment-indexing',
   DELETE_PAGE_ATTACHMENTS = 'delete-page-attachments',
   PAGE_CONTENT_UPDATE = 'page-content-update',
 
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index 3e22bafa..58479826 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -537,6 +537,9 @@ importers:
       ldapts:
         specifier: ^7.4.0
         version: 7.4.0
+      mammoth:
+        specifier: ^1.10.0
+        version: 1.10.0
       mime-types:
         specifier: ^2.1.35
         version: 2.1.35
@@ -564,6 +567,9 @@ importers:
       passport-jwt:
         specifier: ^4.0.1
         version: 4.0.1
+      pdfjs-dist:
+        specifier: ^5.4.54
+        version: 5.4.54
       pg:
         specifier: ^8.16.0
         version: 8.16.0
@@ -2619,6 +2625,70 @@ packages:
     cpu: [x64]
     os: [win32]
 
+  '@napi-rs/canvas-android-arm64@0.1.77':
+    resolution: {integrity: sha512-jC8YX0rbAnu9YrLK1A52KM2HX9EDjrJSCLVuBf9Dsov4IC6GgwMLS2pwL9GFLJnSZBFgdwnA84efBehHT9eshA==}
+    engines: {node: '>= 10'}
+    cpu: [arm64]
+    os: [android]
+
+  '@napi-rs/canvas-darwin-arm64@0.1.77':
+    resolution: {integrity: sha512-VFaCaCgAV0+hPwXajDIiHaaGx4fVCuUVYp/CxCGXmTGz699ngIEBx3Sa2oDp0uk3X+6RCRLueb7vD44BKBiPIg==}
+    engines: {node: '>= 10'}
+    cpu: [arm64]
+    os: [darwin]
+
+  '@napi-rs/canvas-darwin-x64@0.1.77':
+    resolution: {integrity: sha512-uD2NSkf6I4S3o0POJDwweK85FE4rfLNA2N714MgiEEMMw5AmupfSJGgpYzcyEXtPzdaca6rBfKcqNvzR1+EyLQ==}
+    engines: {node: '>= 10'}
+    cpu: [x64]
+    os: [darwin]
+
+  '@napi-rs/canvas-linux-arm-gnueabihf@0.1.77':
+    resolution: {integrity: sha512-03GxMMZGhHRQxiA4gyoKT6iQSz8xnA6T9PAfg/WNJnbkVMFZG782DwUJUb39QIZ1uE1euMCPnDgWAJ092MmgJQ==}
+    engines: {node: '>= 10'}
+    cpu: [arm]
+    os: [linux]
+
+  '@napi-rs/canvas-linux-arm64-gnu@0.1.77':
+    resolution: {integrity: sha512-ZO+d2gRU9JU1Bb7SgJcJ1k9wtRMCpSWjJAJ+2phhu0Lw5As8jYXXXmLKmMTGs1bOya2dBMYDLzwp7KS/S/+aCA==}
+    engines: {node: '>= 10'}
+    cpu: [arm64]
+    os: [linux]
+
+  '@napi-rs/canvas-linux-arm64-musl@0.1.77':
+    resolution: {integrity: sha512-S1KtnP1+nWs2RApzNkdNf8X4trTLrHaY7FivV61ZRaL8NvuGOkSkKa+gWN2iedIGFEDz6gecpl/JAUSewwFXYg==}
+    engines: {node: '>= 10'}
+    cpu: [arm64]
+    os: [linux]
+
+  '@napi-rs/canvas-linux-riscv64-gnu@0.1.77':
+    resolution: {integrity: sha512-A4YIKFYUwDtrSzCtdCAO5DYmRqlhCVKHdpq0+dBGPnIEhOQDFkPBTfoTAjO3pjlEnorlfKmNMOH21sKQg2esGA==}
+    engines: {node: '>= 10'}
+    cpu: [riscv64]
+    os: [linux]
+
+  '@napi-rs/canvas-linux-x64-gnu@0.1.77':
+    resolution: {integrity: sha512-Lt6Sef5l0+5O1cSZ8ysO0JI+x+rSrqZyXs5f7+kVkCAOVq8X5WTcDVbvWvEs2aRhrWTp5y25Jf2Bn+3IcNHOuQ==}
+    engines: {node: '>= 10'}
+    cpu: [x64]
+    os: [linux]
+
+  '@napi-rs/canvas-linux-x64-musl@0.1.77':
+    resolution: {integrity: sha512-NiNFvC+D+omVeJ3IjYlIbyt/igONSABVe9z0ZZph29epHgZYu4eHwV9osfpRt1BGGOAM8LkFrHk4LBdn2EDymA==}
+    engines: {node: '>= 10'}
+    cpu: [x64]
+    os: [linux]
+
+  '@napi-rs/canvas-win32-x64-msvc@0.1.77':
+    resolution: {integrity: sha512-fP6l0hZiWykyjvpZTS3sI46iib8QEflbPakNoUijtwyxRuOPTTBfzAWZUz5z2vKpJJ/8r305wnZeZ8lhsBHY5A==}
+    engines: {node: '>= 10'}
+    cpu: [x64]
+    os: [win32]
+
+  '@napi-rs/canvas@0.1.77':
+    resolution: {integrity: sha512-N9w2DkEKE1AXGp3q55GBOP6BEoFrqChDiFqJtKViTpQCWNOSVuMz7LkoGehbnpxtidppbsC36P0kCZNqJKs29w==}
+    engines: {node: '>= 10'}
+
   '@napi-rs/wasm-runtime@0.2.4':
     resolution: {integrity: sha512-9zESzOO5aDByvhIAsOy9TbpZ0Ur2AJbUI7UT73kcUTS2mxAMHOBaa1st/jAymNoCtvrit99kkzT1FZuXVcgfIQ==}
 
@@ -4948,6 +5018,9 @@ packages:
   bl@4.1.0:
     resolution: {integrity: sha512-1W07cM9gS6DcLperZfFSj+bWLtaPGSOHWhPiGzXmvVJbRLdG82sH/Kn8EtW1VqWVA54AKf2h5k5BbnIbwF3h6w==}
 
+  bluebird@3.4.7:
+    resolution: {integrity: sha512-iD3898SR7sWVRHbiQv+sHUtHnMvC1o3nW5rAcqnq3uOn07DSAppZYUkIGslDz6gXC7HfunPe7YVBgoEJASPcHA==}
+
   bluebird@3.7.2:
     resolution: {integrity: sha512-XpNj6GDQzdfW+r2Wnn7xiSAd7TM3jzkxGXBGTtWKuSXv1xUV+azxAm8jdWZN06QTQk+2N2XB9jRDkvbmQmcRtg==}
 
@@ -5679,6 +5752,9 @@ packages:
   dijkstrajs@1.0.3:
     resolution: {integrity: sha512-qiSlmBq9+BCdCA/L46dw8Uy93mloxsPSbwnm5yrKn2vMPiy8KyAskTF6zuV/j5BMsmOGZDPs7KjU+mjb670kfA==}
 
+  dingbat-to-unicode@1.0.1:
+    resolution: {integrity: sha512-98l0sW87ZT58pU4i61wa2OHwxbiYSbuxsCBozaVnYX2iCnr3bLM3fIes1/ej7h1YdOKuKt/MLs706TVnALA65w==}
+
   dnd-core@14.0.1:
     resolution: {integrity: sha512-+PVS2VPTgKFPYWo3vAFEA8WPbTf7/xo43TifH9G8S1KqnrQu0o77A3unrF5yOugy4mIz7K5wAVFHUcha7wsz6A==}
 
@@ -5727,6 +5803,9 @@ packages:
     resolution: {integrity: sha512-47qPchRCykZC03FhkYAhrvwU4xDBFIj1QPqaarj6mdM/hgUzfPHcpkHJOn3mJAufFeeAxAzeGsr5X0M4k6fLZQ==}
     engines: {node: '>=12'}
 
+  duck@0.1.12:
+    resolution: {integrity: sha512-wkctla1O6VfP89gQ+J/yDesM0S7B7XLXjKGzXxMDVFg7uEn706niAtyYovKbyq1oT9YwDcly721/iUWoc8MVRg==}
+
   eastasianwidth@0.2.0:
     resolution: {integrity: sha512-I88TYZWc9XiYHRQ4/3c5rjjfgkjhLyW2luGIheGERbNQ6OY7yTybanSpDXZa8y7VUP9YmDcYa+eyq4ca7iLqWA==}
 
@@ -7181,6 +7260,9 @@ packages:
     resolution: {integrity: sha512-lyuxPGr/Wfhrlem2CL/UcnUc1zcqKAImBDzukY7Y5F/yQiNdko6+fRLevlw1HgMySw7f611UIY408EtxRSoK3Q==}
     hasBin: true
 
+  lop@0.4.2:
+    resolution: {integrity: sha512-RefILVDQ4DKoRZsJ4Pj22TxE3omDO47yFpkIBoDKzkqPRISs5U1cnAdg/5583YPkWPaLIYHOKRMQSvjFsO26cw==}
+
   lowlight@3.3.0:
     resolution: {integrity: sha512-0JNhgFoPvP6U6lE/UdVsSq99tn6DhjjpAj5MxG49ewd2mOBVtwWYIT8ClyABhq198aXXODMU6Ox8DrGy/CpTZQ==}
 
@@ -7227,6 +7309,11 @@ packages:
   makeerror@1.0.12:
     resolution: {integrity: sha512-JmqCvUhmt43madlpFzG4BQzG2Z3m6tvQDNKdClZnO3VbIudJYmxsT0FNJMeiB2+JTSlTQTSbU8QdesVmwJcmLg==}
 
+  mammoth@1.10.0:
+    resolution: {integrity: sha512-9HOmqt8uJ5rz7q8XrECU5gRjNftCq4GNG0YIrA6f9iQPCeLgpvgcmRBHi9NQWJQIpT/MAXeg1oKliAK1xoB3eg==}
+    engines: {node: '>=12.0.0'}
+    hasBin: true
+
   mantine-form-zod-resolver@1.3.0:
     resolution: {integrity: sha512-XlXXkJCYuUuOllW0zedYW+m/lbdFQ/bso1Vz+pJOYkxgjhoGvzN2EXWCS2+0iTOT9Q7WnOwWvHmvpTJN3PxSXw==}
     engines: {node: '>=16.6.0'}
@@ -7686,6 +7773,9 @@ packages:
   optics-ts@2.4.1:
     resolution: {integrity: sha512-HaYzMHvC80r7U/LqAd4hQyopDezC60PO2qF5GuIwALut2cl5rK1VWHsqTp0oqoJJWjiv6uXKqsO+Q2OO0C3MmQ==}
 
+  option@0.2.4:
+    resolution: {integrity: sha512-pkEqbDyl8ou5cpq+VsnQbe/WlEy5qS7xPzMS1U55OCG9KPvwFD46zDbxQIj3egJSFc3D+XhYOPUzz49zQAVy7A==}
+
   optionator@0.9.3:
     resolution: {integrity: sha512-JjCoypp+jKn1ttEFExxhetCKeJt9zhAgAve5FXHixTvFDW/5aEktX9bufBKLRRMdU7bNtpLfcGu94B3cdEJgjg==}
     engines: {node: '>= 0.8.0'}
@@ -7834,6 +7924,10 @@ packages:
   pause@0.0.1:
     resolution: {integrity: sha512-KG8UEiEVkR3wGEb4m5yZkVCzigAD+cVEJck2CzYZO37ZGJfctvVptVO192MwrtPhzONn6go8ylnOdMhKqi4nfg==}
 
+  pdfjs-dist@5.4.54:
+    resolution: {integrity: sha512-TBAiTfQw89gU/Z4LW98Vahzd2/LoCFprVGvGbTgFt+QCB1F+woyOPmNNVgLa6djX9Z9GGTnj7qE1UzpOVJiINw==}
+    engines: {node: '>=20.16.0 || >=22.3.0'}
+
   peberminta@0.9.0:
     resolution: {integrity: sha512-XIxfHpEuSJbITd1H3EeQwpcZbTLHc+VVr8ANI9t5sit565tsI4/xK3KWTUFE2e6QiangUkh3B0jihzmGnNrRsQ==}
 
@@ -9212,6 +9306,9 @@ packages:
   unbox-primitive@1.0.2:
     resolution: {integrity: sha512-61pPlCD9h51VoreyJ0BReideM3MDKMKnh6+V9L08331ipq6Q8OFXZYiqP6n/tbHx4s5I9uRhcye6BrbkizkBDw==}
 
+  underscore@1.13.7:
+    resolution: {integrity: sha512-GMXzWtsc57XAtguZgaQViUOzs0KTkk8ojr3/xAxXLITqf/3EMwxC0inyETfDFjH/Krbhuep0HNbbjI9i/q3F3g==}
+
   undici-types@6.20.0:
     resolution: {integrity: sha512-Ny6QZ2Nju20vw1SRHe3d9jVu6gJ+4e3+MMpqu7pqE5HT6WsTSlce++GQmK5UXS8mzV8DSYHrQH+Xrf2jVcuKNg==}
 
@@ -9580,6 +9677,10 @@ packages:
     resolution: {integrity: sha512-T4rieHaC1EXcES0Kxxj4JWgaUQHDk+qwHcYOCFHfiwKz7tOVPLq7Hjq9dM1WCMhylqMEfP7hMcOIChvotiZegA==}
     engines: {node: '>=4.0.0'}
 
+  xmlbuilder@10.1.1:
+    resolution: {integrity: sha512-OyzrcFLL/nb6fMGHbiRDuPup9ljBycsdCypwuyg5AAHvyWzGfChJpCXMG88AGTIMFhGZ9RccFN1e6lhg3hkwKg==}
+    engines: {node: '>=4.0'}
+
   xmlbuilder@11.0.1:
     resolution: {integrity: sha512-fDlsI/kFEx7gLvbecc0/ohLG50fugQp8ryHzMTuW9vSa1GJ0XYWKnhsUx7oie3G98+r56aTQIUB4kht42R3JvA==}
     engines: {node: '>=4.0'}
@@ -12452,6 +12553,50 @@ snapshots:
   '@msgpackr-extract/msgpackr-extract-win32-x64@3.0.2':
     optional: true
 
+  '@napi-rs/canvas-android-arm64@0.1.77':
+    optional: true
+
+  '@napi-rs/canvas-darwin-arm64@0.1.77':
+    optional: true
+
+  '@napi-rs/canvas-darwin-x64@0.1.77':
+    optional: true
+
+  '@napi-rs/canvas-linux-arm-gnueabihf@0.1.77':
+    optional: true
+
+  '@napi-rs/canvas-linux-arm64-gnu@0.1.77':
+    optional: true
+
+  '@napi-rs/canvas-linux-arm64-musl@0.1.77':
+    optional: true
+
+  '@napi-rs/canvas-linux-riscv64-gnu@0.1.77':
+    optional: true
+
+  '@napi-rs/canvas-linux-x64-gnu@0.1.77':
+    optional: true
+
+  '@napi-rs/canvas-linux-x64-musl@0.1.77':
+    optional: true
+
+  '@napi-rs/canvas-win32-x64-msvc@0.1.77':
+    optional: true
+
+  '@napi-rs/canvas@0.1.77':
+    optionalDependencies:
+      '@napi-rs/canvas-android-arm64': 0.1.77
+      '@napi-rs/canvas-darwin-arm64': 0.1.77
+      '@napi-rs/canvas-darwin-x64': 0.1.77
+      '@napi-rs/canvas-linux-arm-gnueabihf': 0.1.77
+      '@napi-rs/canvas-linux-arm64-gnu': 0.1.77
+      '@napi-rs/canvas-linux-arm64-musl': 0.1.77
+      '@napi-rs/canvas-linux-riscv64-gnu': 0.1.77
+      '@napi-rs/canvas-linux-x64-gnu': 0.1.77
+      '@napi-rs/canvas-linux-x64-musl': 0.1.77
+      '@napi-rs/canvas-win32-x64-msvc': 0.1.77
+    optional: true
+
   '@napi-rs/wasm-runtime@0.2.4':
     dependencies:
       '@emnapi/core': 1.2.0
@@ -15049,6 +15194,8 @@ snapshots:
       inherits: 2.0.4
       readable-stream: 3.6.2
 
+  bluebird@3.4.7: {}
+
   bluebird@3.7.2: {}
 
   boolbase@1.0.0: {}
@@ -15805,6 +15952,8 @@ snapshots:
 
   dijkstrajs@1.0.3: {}
 
+  dingbat-to-unicode@1.0.1: {}
+
   dnd-core@14.0.1:
     dependencies:
       '@react-dnd/asap': 4.0.1
@@ -15862,6 +16011,10 @@ snapshots:
 
   dotenv@16.4.7: {}
 
+  duck@0.1.12:
+    dependencies:
+      underscore: 1.13.7
+
   eastasianwidth@0.2.0: {}
 
   ecdsa-sig-formatter@1.0.11:
@@ -17707,6 +17860,12 @@ snapshots:
     dependencies:
       js-tokens: 4.0.0
 
+  lop@0.4.2:
+    dependencies:
+      duck: 0.1.12
+      option: 0.2.4
+      underscore: 1.13.7
+
   lowlight@3.3.0:
     dependencies:
       '@types/hast': 3.0.4
@@ -17753,6 +17912,19 @@ snapshots:
     dependencies:
       tmpl: 1.0.5
 
+  mammoth@1.10.0:
+    dependencies:
+      '@xmldom/xmldom': 0.8.10
+      argparse: 1.0.10
+      base64-js: 1.5.1
+      bluebird: 3.4.7
+      dingbat-to-unicode: 1.0.1
+      jszip: 3.10.1
+      lop: 0.4.2
+      path-is-absolute: 1.0.1
+      underscore: 1.13.7
+      xmlbuilder: 10.1.1
+
   mantine-form-zod-resolver@1.3.0(@mantine/form@8.1.3(react@18.3.1))(zod@3.25.56):
     dependencies:
       '@mantine/form': 8.1.3(react@18.3.1)
@@ -18337,6 +18509,8 @@ snapshots:
 
   optics-ts@2.4.1: {}
 
+  option@0.2.4: {}
+
   optionator@0.9.3:
     dependencies:
       '@aashutoshrathi/word-wrap': 1.2.6
@@ -18498,6 +18672,10 @@ snapshots:
 
   pause@0.0.1: {}
 
+  pdfjs-dist@5.4.54:
+    optionalDependencies:
+      '@napi-rs/canvas': 0.1.77
+
   peberminta@0.9.0: {}
 
   peek-readable@7.0.0: {}
@@ -20005,6 +20183,8 @@ snapshots:
       has-symbols: 1.0.3
       which-boxed-primitive: 1.1.0
 
+  underscore@1.13.7: {}
+
   undici-types@6.20.0: {}
 
   undici@7.10.0: {}
@@ -20332,6 +20512,8 @@ snapshots:
       sax: 1.4.1
       xmlbuilder: 11.0.1
 
+  xmlbuilder@10.1.1: {}
+
   xmlbuilder@11.0.1: {}
 
   xmlbuilder@15.1.1: {}

From 1f797c3d2734cccdc0b0b2be67b1e30f71b40d29 Mon Sep 17 00:00:00 2001
From: Philip Okugbe <16838612+Philipinho@users.noreply.github.com>
Date: Tue, 2 Sep 2025 21:19:09 -0700
Subject: [PATCH 23/46] fix: confluence drawio import (#1518)

* POC

* WIP - working

* WIP

* WIP

* sync

* fix drawio preview image
---
 apps/server/src/ee                            |   2 +-
 .../services/import-attachment.service.ts     | 764 ++++++++++++++----
 2 files changed, 595 insertions(+), 171 deletions(-)

diff --git a/apps/server/src/ee b/apps/server/src/ee
index 3775df60..aa33dcd2 160000
--- a/apps/server/src/ee
+++ b/apps/server/src/ee
@@ -1 +1 @@
-Subproject commit 3775df60137366b6953d80037f90547fe8ee4ac7
+Subproject commit aa33dcd2ba310705d6799d1e468390774e0cf3e7
diff --git a/apps/server/src/integrations/import/services/import-attachment.service.ts b/apps/server/src/integrations/import/services/import-attachment.service.ts
index b9a488a9..874ff892 100644
--- a/apps/server/src/integrations/import/services/import-attachment.service.ts
+++ b/apps/server/src/integrations/import/services/import-attachment.service.ts
@@ -6,6 +6,7 @@ import { cleanUrlString } from '../utils/file.utils';
 import { StorageService } from '../../storage/storage.service';
 import { createReadStream } from 'node:fs';
 import { promises as fs } from 'fs';
+import { Readable } from 'stream';
 import { getMimeType, sanitizeFileName } from '../../../common/helpers';
 import { v7 } from 'uuid';
 import { FileTask } from '@docmost/db/types/entity.types';
@@ -16,6 +17,18 @@ import { resolveRelativeAttachmentPath } from '../utils/import.utils';
 import { load } from 'cheerio';
 import pLimit from 'p-limit';
 
+interface AttachmentInfo {
+  href: string;
+  fileName: string;
+  mimeType: string;
+}
+
+interface DrawioPair {
+  drawioFile?: AttachmentInfo;
+  pngFile?: AttachmentInfo;
+  baseName: string;
+}
+
 @Injectable()
 export class ImportAttachmentService {
   private readonly logger = new Logger(ImportAttachmentService.name);
@@ -35,6 +48,7 @@ export class ImportAttachmentService {
     pageId: string;
     fileTask: FileTask;
     attachmentCandidates: Map<string, string>;
+    pageAttachments?: AttachmentInfo[];
   }): Promise<string> {
     const {
       html,
@@ -43,6 +57,7 @@ export class ImportAttachmentService {
       pageId,
       fileTask,
       attachmentCandidates,
+      pageAttachments = [],
     } = opts;
 
     const attachmentTasks: (() => Promise<void>)[] = [];
@@ -57,7 +72,7 @@ export class ImportAttachmentService {
     /**
      * Cache keyed by the *relative* path that appears in the HTML.
      * Ensures we upload (and DB-insert) each attachment at most once,
-     * even if it’s referenced multiple times on the page.
+     * even if it's referenced multiple times on the page.
      */
     const processed = new Map<
       string,
@@ -70,6 +85,99 @@ export class ImportAttachmentService {
       }
     >();
 
+    // Analyze attachments to identify Draw.io pairs
+    const { drawioPairs, skipFiles } = this.analyzeAttachments(pageAttachments);
+
+    // Map to store processed Draw.io SVGs
+    const drawioSvgMap = new Map<
+      string,
+      {
+        attachmentId: string;
+        apiFilePath: string;
+        fileName: string;
+      }
+    >();
+
+    this.logger.debug(`Found ${drawioPairs.size} Draw.io pairs to process`);
+
+    // Process Draw.io pairs and create combined SVG files
+    for (const [drawioHref, pair] of drawioPairs) {
+      if (!pair.drawioFile) continue;
+
+      const drawioAbsPath = attachmentCandidates.get(drawioHref);
+      if (!drawioAbsPath) continue;
+
+      const pngAbsPath = pair.pngFile
+        ? attachmentCandidates.get(pair.pngFile.href)
+        : undefined;
+
+      try {
+        // Create combined SVG with Draw.io data and PNG image
+        const svgBuffer = await this.createDrawioSvg(drawioAbsPath, pngAbsPath);
+
+        // Generate file details - always use "diagram.drawio.svg" as filename
+        const attachmentId = v7();
+        const fileName = 'diagram.drawio.svg';
+        const storageFilePath = `${getAttachmentFolderPath(
+          AttachmentType.File,
+          fileTask.workspaceId,
+        )}/${attachmentId}/${fileName}`;
+        const apiFilePath = `/api/files/${attachmentId}/${fileName}`;
+
+        // Upload the SVG file
+        attachmentTasks.push(async () => {
+          try {
+            const stream = Readable.from(svgBuffer);
+
+            // Upload to storage
+            await this.storageService.uploadStream(storageFilePath, stream);
+
+            // Insert into database
+            await this.db
+              .insertInto('attachments')
+              .values({
+                id: attachmentId,
+                filePath: storageFilePath,
+                fileName: fileName,
+                fileSize: svgBuffer.length,
+                mimeType: 'image/svg+xml',
+                type: 'file',
+                fileExt: '.svg',
+                creatorId: fileTask.creatorId,
+                workspaceId: fileTask.workspaceId,
+                pageId,
+                spaceId: fileTask.spaceId,
+              })
+              .execute();
+
+            uploadStats.completed++;
+          } catch (error) {
+            uploadStats.failed++;
+            uploadStats.failedFiles.push(fileName);
+            this.logger.error(
+              `Failed to upload Draw.io SVG ${fileName}:`,
+              error,
+            );
+          }
+        });
+
+        // Store the mapping for both Draw.io and PNG references
+        drawioSvgMap.set(drawioHref, { attachmentId, apiFilePath, fileName });
+        if (pair.pngFile) {
+          drawioSvgMap.set(pair.pngFile.href, {
+            attachmentId,
+            apiFilePath,
+            fileName,
+          });
+        }
+      } catch (error) {
+        this.logger.error(
+          `Failed to process Draw.io pair ${pair.baseName}:`,
+          error,
+        );
+      }
+    }
+
     const uploadOnce = (relPath: string) => {
       const abs = attachmentCandidates.get(relPath)!;
       const attachmentId = v7();
@@ -85,16 +193,18 @@ export class ImportAttachmentService {
 
       const apiFilePath = `/api/files/${attachmentId}/${fileNameWithExt}`;
 
-      attachmentTasks.push(() => this.uploadWithRetry({
-        abs,
-        storageFilePath,
-        attachmentId,
-        fileNameWithExt,
-        ext,
-        pageId,
-        fileTask,
-        uploadStats,
-      }));
+      attachmentTasks.push(() =>
+        this.uploadWithRetry({
+          abs,
+          storageFilePath,
+          attachmentId,
+          fileNameWithExt,
+          ext,
+          pageId,
+          fileTask,
+          uploadStats,
+        }),
+      );
 
       return {
         attachmentId,
@@ -121,195 +231,301 @@ export class ImportAttachmentService {
     const pageDir = path.dirname(pageRelativePath);
     const $ = load(html);
 
-    // image
-    for (const imgEl of $('img').toArray()) {
-      const $img = $(imgEl);
-      const src = cleanUrlString($img.attr('src') ?? '')!;
-      if (!src || src.startsWith('http')) continue;
+    // Cache for resolved paths to avoid repeated lookups
+    const resolvedPathCache = new Map<string, string | null>();
 
-      const relPath = resolveRelativeAttachmentPath(
-        src,
+    const getCachedResolvedPath = (rawPath: string): string | null => {
+      if (resolvedPathCache.has(rawPath)) {
+        return resolvedPathCache.get(rawPath)!;
+      }
+      const resolved = resolveRelativeAttachmentPath(
+        rawPath,
         pageDir,
         attachmentCandidates,
       );
-      if (!relPath) continue;
+      resolvedPathCache.set(rawPath, resolved);
+      return resolved;
+    };
 
-      const { attachmentId, apiFilePath, abs } = processFile(relPath);
-      const stat = await fs.stat(abs);
+    // Cache for file stats to avoid repeated file system calls
+    const statCache = new Map<string, any>();
 
-      const width = $img.attr('width') ?? '100%';
-      const align = $img.attr('data-align') ?? 'center';
+    const getCachedStat = async (absPath: string) => {
+      if (statCache.has(absPath)) {
+        return statCache.get(absPath);
+      }
+      const stat = await fs.stat(absPath);
+      statCache.set(absPath, stat);
+      return stat;
+    };
 
-      $img
-        .attr('src', apiFilePath)
-        .attr('data-attachment-id', attachmentId)
-        .attr('data-size', stat.size.toString())
-        .attr('width', width)
-        .attr('data-align', align);
+    // Single DOM traversal for all attachment elements
+    const selector =
+      'img, video, div[data-type="attachment"], a, div[data-type="excalidraw"], div[data-type="drawio"]';
+    const elements = $(selector).toArray();
 
-      unwrapFromParagraph($, $img);
-    }
+    for (const element of elements) {
+      const $el = $(element);
+      const tagName = element.tagName.toLowerCase();
 
-    // video
-    for (const vidEl of $('video').toArray()) {
-      const $vid = $(vidEl);
-      const src = cleanUrlString($vid.attr('src') ?? '')!;
-      if (!src || src.startsWith('http')) continue;
+      // Process based on element type
+      if (tagName === 'img') {
+        const src = cleanUrlString($el.attr('src') ?? '');
+        if (!src || src.startsWith('http')) continue;
 
-      const relPath = resolveRelativeAttachmentPath(
-        src,
-        pageDir,
-        attachmentCandidates,
-      );
-      if (!relPath) continue;
+        const relPath = getCachedResolvedPath(src);
+        if (!relPath) continue;
 
-      const { attachmentId, apiFilePath, abs } = processFile(relPath);
-      const stat = await fs.stat(abs);
+        // Check if this image is part of a Draw.io pair
+        const drawioSvg = drawioSvgMap.get(relPath);
+        if (drawioSvg) {
+          const $drawio = $('<div>')
+            .attr('data-type', 'drawio')
+            .attr('data-src', drawioSvg.apiFilePath)
+            .attr('data-title', 'diagram')
+            .attr('data-width', '100%')
+            .attr('data-align', 'center')
+            .attr('data-attachment-id', drawioSvg.attachmentId);
 
-      const width = $vid.attr('width') ?? '100%';
-      const align = $vid.attr('data-align') ?? 'center';
+          $el.replaceWith($drawio);
+          unwrapFromParagraph($, $drawio);
+          continue;
+        }
 
-      $vid
-        .attr('src', apiFilePath)
-        .attr('data-attachment-id', attachmentId)
-        .attr('data-size', stat.size.toString())
-        .attr('width', width)
-        .attr('data-align', align);
+        const { attachmentId, apiFilePath, abs } = processFile(relPath);
+        const stat = await getCachedStat(abs);
 
-      unwrapFromParagraph($, $vid);
-    }
-
-    // <div data-type="attachment">
-    for (const el of $('div[data-type="attachment"]').toArray()) {
-      const $oldDiv = $(el);
-      const rawUrl = cleanUrlString($oldDiv.attr('data-attachment-url') ?? '')!;
-      if (!rawUrl || rawUrl.startsWith('http')) continue;
-
-      const relPath = resolveRelativeAttachmentPath(
-        rawUrl,
-        pageDir,
-        attachmentCandidates,
-      );
-      if (!relPath) continue;
-
-      const { attachmentId, apiFilePath, abs } = processFile(relPath);
-      const stat = await fs.stat(abs);
-      const fileName = path.basename(abs);
-      const mime = getMimeType(abs);
-
-      const $newDiv = $('<div>')
-        .attr('data-type', 'attachment')
-        .attr('data-attachment-url', apiFilePath)
-        .attr('data-attachment-name', fileName)
-        .attr('data-attachment-mime', mime)
-        .attr('data-attachment-size', stat.size.toString())
-        .attr('data-attachment-id', attachmentId);
-
-      $oldDiv.replaceWith($newDiv);
-      unwrapFromParagraph($, $newDiv);
-    }
-
-    // rewrite other attachments via <a>
-    for (const aEl of $('a').toArray()) {
-      const $a = $(aEl);
-      const href = cleanUrlString($a.attr('href') ?? '')!;
-      if (!href || href.startsWith('http')) continue;
-
-      const relPath = resolveRelativeAttachmentPath(
-        href,
-        pageDir,
-        attachmentCandidates,
-      );
-      if (!relPath) continue;
-
-      const { attachmentId, apiFilePath, abs } = processFile(relPath);
-      const stat = await fs.stat(abs);
-      const ext = path.extname(relPath).toLowerCase();
-
-      if (ext === '.mp4') {
-        const $video = $('<video>')
+        $el
           .attr('src', apiFilePath)
           .attr('data-attachment-id', attachmentId)
           .attr('data-size', stat.size.toString())
-          .attr('width', '100%')
-          .attr('data-align', 'center');
-        $a.replaceWith($video);
-        unwrapFromParagraph($, $video);
-      } else {
-        const confAliasName = $a.attr('data-linked-resource-default-alias');
-        let attachmentName = path.basename(abs);
-        if (confAliasName) attachmentName = confAliasName;
+          .attr('width', $el.attr('width') ?? '100%')
+          .attr('data-align', $el.attr('data-align') ?? 'center');
 
-        const $div = $('<div>')
-          .attr('data-type', 'attachment')
-          .attr('data-attachment-url', apiFilePath)
-          .attr('data-attachment-name', attachmentName)
-          .attr('data-attachment-mime', getMimeType(abs))
-          .attr('data-attachment-size', stat.size.toString())
-          .attr('data-attachment-id', attachmentId);
+        unwrapFromParagraph($, $el);
+      } else if (tagName === 'video') {
+        const src = cleanUrlString($el.attr('src') ?? '');
+        if (!src || src.startsWith('http')) continue;
 
-        $a.replaceWith($div);
-        unwrapFromParagraph($, $div);
-      }
-    }
-
-    // excalidraw and drawio
-    for (const type of ['excalidraw', 'drawio'] as const) {
-      for (const el of $(`div[data-type="${type}"]`).toArray()) {
-        const $oldDiv = $(el);
-        const rawSrc = cleanUrlString($oldDiv.attr('data-src') ?? '')!;
-        if (!rawSrc || rawSrc.startsWith('http')) continue;
-
-        const relPath = resolveRelativeAttachmentPath(
-          rawSrc,
-          pageDir,
-          attachmentCandidates,
-        );
+        const relPath = getCachedResolvedPath(src);
         if (!relPath) continue;
 
         const { attachmentId, apiFilePath, abs } = processFile(relPath);
-        const stat = await fs.stat(abs);
-        const fileName = path.basename(abs);
+        const stat = await getCachedStat(abs);
 
-        const width = $oldDiv.attr('data-width') || '100%';
-        const align = $oldDiv.attr('data-align') || 'center';
-
-        const $newDiv = $('<div>')
-          .attr('data-type', type)
-          .attr('data-src', apiFilePath)
-          .attr('data-title', fileName)
-          .attr('data-width', width)
+        $el
+          .attr('src', apiFilePath)
+          .attr('data-attachment-id', attachmentId)
           .attr('data-size', stat.size.toString())
-          .attr('data-align', align)
+          .attr('width', $el.attr('width') ?? '100%')
+          .attr('data-align', $el.attr('data-align') ?? 'center');
+
+        unwrapFromParagraph($, $el);
+      } else if (tagName === 'div') {
+        const dataType = $el.attr('data-type');
+
+        if (dataType === 'attachment') {
+          const rawUrl = cleanUrlString($el.attr('data-attachment-url') ?? '');
+          if (!rawUrl || rawUrl.startsWith('http')) continue;
+
+          const relPath = getCachedResolvedPath(rawUrl);
+          if (!relPath) continue;
+
+          const { attachmentId, apiFilePath, abs } = processFile(relPath);
+          const stat = await getCachedStat(abs);
+          const fileName = path.basename(abs);
+          const mime = getMimeType(abs);
+
+          const $newDiv = $('<div>')
+            .attr('data-type', 'attachment')
+            .attr('data-attachment-url', apiFilePath)
+            .attr('data-attachment-name', fileName)
+            .attr('data-attachment-mime', mime)
+            .attr('data-attachment-size', stat.size.toString())
+            .attr('data-attachment-id', attachmentId);
+
+          $el.replaceWith($newDiv);
+          unwrapFromParagraph($, $newDiv);
+        } else if (dataType === 'excalidraw' || dataType === 'drawio') {
+          const rawSrc = cleanUrlString($el.attr('data-src') ?? '');
+          if (!rawSrc || rawSrc.startsWith('http')) continue;
+
+          const relPath = getCachedResolvedPath(rawSrc);
+          if (!relPath) continue;
+
+          const { attachmentId, apiFilePath, abs } = processFile(relPath);
+          const stat = await getCachedStat(abs);
+          const fileName = path.basename(abs);
+
+          const $newDiv = $('<div>')
+            .attr('data-type', dataType)
+            .attr('data-src', apiFilePath)
+            .attr('data-title', fileName)
+            .attr('data-width', $el.attr('data-width') || '100%')
+            .attr('data-size', stat.size.toString())
+            .attr('data-align', $el.attr('data-align') || 'center')
+            .attr('data-attachment-id', attachmentId);
+
+          $el.replaceWith($newDiv);
+          unwrapFromParagraph($, $newDiv);
+        }
+      } else if (tagName === 'a') {
+        const href = cleanUrlString($el.attr('href') ?? '');
+        if (!href || href.startsWith('http')) continue;
+
+        const relPath = getCachedResolvedPath(href);
+        if (!relPath) continue;
+
+        // Check if this is a Draw.io file
+        const drawioSvg = drawioSvgMap.get(relPath);
+        if (drawioSvg) {
+          const $drawio = $('<div>')
+            .attr('data-type', 'drawio')
+            .attr('data-src', drawioSvg.apiFilePath)
+            .attr('data-title', 'diagram')
+            .attr('data-width', '100%')
+            .attr('data-align', 'center')
+            .attr('data-attachment-id', drawioSvg.attachmentId);
+
+          $el.replaceWith($drawio);
+          unwrapFromParagraph($, $drawio);
+          continue;
+        }
+
+        // Skip files that should be ignored
+        if (skipFiles.has(relPath)) {
+          $el.remove();
+          continue;
+        }
+
+        const { attachmentId, apiFilePath, abs } = processFile(relPath);
+        const stat = await getCachedStat(abs);
+        const ext = path.extname(relPath).toLowerCase();
+
+        if (ext === '.mp4') {
+          const $video = $('<video>')
+            .attr('src', apiFilePath)
+            .attr('data-attachment-id', attachmentId)
+            .attr('data-size', stat.size.toString())
+            .attr('width', '100%')
+            .attr('data-align', 'center');
+          $el.replaceWith($video);
+          unwrapFromParagraph($, $video);
+        } else {
+          const confAliasName = $el.attr('data-linked-resource-default-alias');
+          let attachmentName = path.basename(abs);
+          if (confAliasName) attachmentName = confAliasName;
+
+          const $div = $('<div>')
+            .attr('data-type', 'attachment')
+            .attr('data-attachment-url', apiFilePath)
+            .attr('data-attachment-name', attachmentName)
+            .attr('data-attachment-mime', getMimeType(abs))
+            .attr('data-attachment-size', stat.size.toString())
+            .attr('data-attachment-id', attachmentId);
+
+          $el.replaceWith($div);
+          unwrapFromParagraph($, $div);
+        }
+      }
+    }
+
+    // Collect all attachment IDs in the HTML in a single DOM traversal - O(n)
+    const usedAttachmentIds = new Set<string>();
+    $.root()
+      .find('[data-attachment-id]')
+      .each((_, el) => {
+        const attachmentId = $(el).attr('data-attachment-id');
+        if (attachmentId) {
+          usedAttachmentIds.add(attachmentId);
+        }
+      });
+
+    // Add Draw.io diagrams that weren't referenced in the HTML content
+    for (const [drawioHref, pair] of drawioPairs) {
+      const drawioSvg = drawioSvgMap.get(drawioHref);
+      if (!drawioSvg) continue;
+
+      if (usedAttachmentIds.has(drawioSvg.attachmentId)) {
+        continue; // Already in content
+      }
+
+      const $drawio = $('<div>')
+        .attr('data-type', 'drawio')
+        .attr('data-src', drawioSvg.apiFilePath)
+        .attr('data-title', 'diagram')
+        .attr('data-width', '100%')
+        .attr('data-align', 'center')
+        .attr('data-attachment-id', drawioSvg.attachmentId);
+
+      $.root().append($drawio);
+    }
+
+    // Process attachments from the attachment section that weren't referenced in HTML
+    // These need to be added as attachment nodes so they get uploaded
+    for (const attachment of pageAttachments) {
+      const { href, fileName, mimeType } = attachment;
+
+      // Skip temporary files or files that should be ignored
+      if (skipFiles.has(href)) {
+        continue;
+      }
+
+      // Check if this was part of a Draw.io pair that was already handled
+      if (drawioSvgMap.has(href)) {
+        continue;
+      }
+
+      // Check if already processed (was referenced in HTML)
+      if (processed.has(href)) {
+        continue;
+      }
+
+      // Skip if the file doesn't exist
+      if (!attachmentCandidates.has(href)) {
+        continue;
+      }
+
+      // This attachment was in the list but not referenced in HTML - add it
+      const { attachmentId, apiFilePath, abs } = processFile(href);
+
+      try {
+        const stat = await fs.stat(abs);
+        const mime = mimeType || getMimeType(abs);
+
+        // Add as attachment node at the end
+        const $attachmentDiv = $('<div>')
+          .attr('data-type', 'attachment')
+          .attr('data-attachment-url', apiFilePath)
+          .attr('data-attachment-name', fileName)
+          .attr('data-attachment-mime', mime)
+          .attr('data-attachment-size', stat.size.toString())
           .attr('data-attachment-id', attachmentId);
 
-        $oldDiv.replaceWith($newDiv);
-        unwrapFromParagraph($, $newDiv);
+        $.root().append($attachmentDiv);
+      } catch (error) {
+        this.logger.error(`Failed to process attachment ${fileName}:`, error);
       }
     }
 
     // wait for all uploads & DB inserts
     uploadStats.total = attachmentTasks.length;
-    
+
     if (uploadStats.total > 0) {
-      this.logger.debug(`Starting upload of ${uploadStats.total} attachments...`);
-      
       try {
-        await Promise.all(
-          attachmentTasks.map(task => limit(task))
-        );
+        await Promise.all(attachmentTasks.map((task) => limit(task)));
       } catch (err) {
         this.logger.error('Import attachment upload error', err);
       }
-      
+
       this.logger.debug(
-        `Upload completed: ${uploadStats.completed}/${uploadStats.total} successful, ${uploadStats.failed} failed`
+        `Upload completed: ${uploadStats.completed}/${uploadStats.total} successful, ${uploadStats.failed} failed`,
       );
-      
+
       if (uploadStats.failed > 0) {
         this.logger.warn(
           `Failed to upload ${uploadStats.failed} files:`,
-          uploadStats.failedFiles
+          uploadStats.failedFiles,
         );
       }
     }
@@ -317,6 +533,214 @@ export class ImportAttachmentService {
     return $.root().html() || '';
   }
 
+  private analyzeAttachments(attachments: AttachmentInfo[]): {
+    drawioPairs: Map<string, DrawioPair>;
+    skipFiles: Set<string>;
+  } {
+    const drawioPairs = new Map<string, DrawioPair>();
+    const skipFiles = new Set<string>();
+
+    // Group attachments by type
+    const drawioFiles: AttachmentInfo[] = [];
+    const pngByBaseName = new Map<string, AttachmentInfo[]>();
+
+    const nonDrawioExtensions = new Set([
+      '.png',
+      '.jpg',
+      '.jpeg',
+      '.gif',
+      '.svg',
+      '.txt',
+      '.pdf',
+      '.doc',
+      '.docx',
+      '.xls',
+      '.xlsx',
+      '.csv',
+      '.zip',
+      '.tar',
+      '.gz',
+    ]);
+
+    // Single pass through attachments
+    for (const attachment of attachments) {
+      const { fileName, mimeType, href } = attachment;
+      const fileNameLower = fileName.toLowerCase();
+
+      // Skip temporary files
+      if (fileName.endsWith('.tmp') || fileName.includes('~drawio~')) {
+        skipFiles.add(href);
+        continue;
+      }
+
+      // Check for Draw.io files
+      if (mimeType === 'application/vnd.jgraph.mxfile') {
+        const ext = fileNameLower.substring(fileNameLower.lastIndexOf('.'));
+        if (!nonDrawioExtensions.has(ext)) {
+          drawioFiles.push(attachment);
+        } else {
+          //Skipped non-Draw.io file with mxfile MIME.}`,
+        }
+      }
+
+      if (mimeType === 'image/png' || fileNameLower.endsWith('.png')) {
+        const baseNames: string[] = [];
+
+        if (fileName.endsWith('.drawio.png')) {
+          // Cloud format: "name.drawio.png" -> base is "name"
+          baseNames.push(fileName.slice(0, -11)); // Remove .drawio.png
+        } else if (fileName.endsWith('.png')) {
+          // Server format: "name.png" -> base is "name"
+          baseNames.push(fileName.slice(0, -4)); // Remove .png
+        }
+
+        for (const baseName of baseNames) {
+          if (!pngByBaseName.has(baseName)) {
+            pngByBaseName.set(baseName, []);
+          }
+          pngByBaseName.get(baseName)!.push(attachment);
+        }
+      }
+    }
+
+    // Match Draw.io files with PNG counterparts
+    for (const drawio of drawioFiles) {
+      let baseName: string;
+
+      if (drawio.fileName.endsWith('.drawio')) {
+        baseName = drawio.fileName.slice(0, -7); // Remove .drawio
+      } else {
+        // Confluence Server: no extension
+        baseName = drawio.fileName;
+      }
+
+      const candidatePngs = pngByBaseName.get(baseName) || [];
+      let matchingPng: AttachmentInfo | undefined;
+
+      // Extract the attachment ID from the Draw.io href
+      // Format: attachments/16941088/36044817.png -> ID is 36044817
+      const drawioIdMatch = drawio.href.match(/\/(\d+)\.\w+$/);
+      const drawioId = drawioIdMatch ? drawioIdMatch[1] : null;
+
+      if (drawioId) {
+        // Look for PNG with adjacent ID (usually PNG ID = Draw.io ID + small increment)
+        // In Confluence, related files often have sequential or near-sequential IDs
+        for (const png of candidatePngs) {
+          const pngIdMatch = png.href.match(/\/(\d+)\.png$/);
+          const pngId = pngIdMatch ? pngIdMatch[1] : null;
+
+          //TODO: should revisit this
+          // but seem to be the best option for now
+          // to prevent reusing the first drawio preview image if there are more with the same name
+          if (pngId && drawioId) {
+            const idDiff = Math.abs(parseInt(pngId) - parseInt(drawioId));
+            // PNG is usually within ~30 IDs of the Draw.io file
+            if (idDiff <= 30) {
+              // Verify filename match
+              if (
+                png.fileName === `${baseName}.drawio.png` ||
+                (!drawio.fileName.endsWith('.drawio') &&
+                  png.fileName === `${baseName}.png`)
+              ) {
+                matchingPng = png;
+                break;
+              }
+            }
+          }
+        }
+      }
+
+      // Fallback to name-only matching if ID-based matching fails
+      if (!matchingPng) {
+        for (const png of candidatePngs) {
+          if (png.fileName === `${baseName}.drawio.png`) {
+            matchingPng = png;
+            break;
+          }
+          if (
+            !drawio.fileName.endsWith('.drawio') &&
+            png.fileName === `${baseName}.png`
+          ) {
+            matchingPng = png;
+            break;
+          }
+        }
+      }
+
+      if (matchingPng) {
+        this.logger.debug(
+          `Found Draw.io pair: ${drawio.fileName} -> ${matchingPng.fileName}`,
+        );
+      } else {
+        this.logger.debug(`No PNG found for Draw.io file: ${drawio.fileName}`);
+      }
+
+      const pair: DrawioPair = {
+        drawioFile: drawio,
+        pngFile: matchingPng,
+        baseName,
+      };
+
+      drawioPairs.set(drawio.href, pair);
+      skipFiles.add(drawio.href);
+      if (matchingPng) {
+        skipFiles.add(matchingPng.href);
+        // Remove the matched PNG from the candidates to prevent reuse
+        const remainingPngs = pngByBaseName
+          .get(baseName)
+          ?.filter((png) => png.href !== matchingPng.href);
+        if (remainingPngs && remainingPngs.length > 0) {
+          pngByBaseName.set(baseName, remainingPngs);
+        } else {
+          pngByBaseName.delete(baseName);
+        }
+      }
+    }
+
+    return { drawioPairs, skipFiles };
+  }
+
+  private async createDrawioSvg(
+    drawioPath: string,
+    pngPath?: string,
+  ): Promise<Buffer> {
+    try {
+      const drawioContent = await fs.readFile(drawioPath, 'utf-8');
+      const drawioBase64 = Buffer.from(drawioContent).toString('base64');
+
+      let imageElement = '';
+      // If we have a PNG, include it in the SVG
+      if (pngPath) {
+        try {
+          const pngBuffer = await fs.readFile(pngPath);
+          const pngBase64 = pngBuffer.toString('base64');
+
+          imageElement = `<image href="data:image/png;base64,${pngBase64}" width="100%" height="100%"/>`;
+        } catch (error) {
+          this.logger.warn(
+            `Could not read PNG file for Draw.io diagram: ${pngPath}`,
+            error,
+          );
+        }
+      }
+
+      // Create the SVG with embedded Draw.io data and image
+      // Default dimensions for Draw.io diagrams if no image is provided
+      const svgContent = `<?xml version="1.0" encoding="UTF-8"?>
+      <svg xmlns="http://www.w3.org/2000/svg" 
+      xmlns:xlink="http://www.w3.org/1999/xlink"
+      width="600"
+      height="400"
+      viewBox="0 0 600 400"
+      content="${drawioBase64}">${imageElement}</svg>`;
+
+      return Buffer.from(svgContent, 'utf-8');
+    } catch (error) {
+      this.logger.error(`Failed to create Draw.io SVG: ${error}`);
+      throw error;
+    }
+  }
+
   private async uploadWithRetry(opts: {
     abs: string;
     storageFilePath: string;
@@ -344,7 +768,7 @@ export class ImportAttachmentService {
     } = opts;
 
     let lastError: Error;
-    
+
     for (let attempt = 1; attempt <= this.MAX_RETRIES; attempt++) {
       try {
         const fileStream = createReadStream(abs);
@@ -367,35 +791,35 @@ export class ImportAttachmentService {
             spaceId: fileTask.spaceId,
           })
           .execute();
-        
+
         uploadStats.completed++;
-        
+
         if (uploadStats.completed % 10 === 0) {
           this.logger.debug(
-            `Upload progress: ${uploadStats.completed}/${uploadStats.total}`
+            `Upload progress: ${uploadStats.completed}/${uploadStats.total}`,
           );
         }
-        
+
         return;
       } catch (error) {
         lastError = error as Error;
         this.logger.warn(
-          `Upload attempt ${attempt}/${this.MAX_RETRIES} failed for ${fileNameWithExt}: ${error instanceof Error ? error.message : String(error)}`
+          `Upload attempt ${attempt}/${this.MAX_RETRIES} failed for ${fileNameWithExt}: ${error instanceof Error ? error.message : String(error)}`,
         );
-        
+
         if (attempt < this.MAX_RETRIES) {
-          await new Promise(resolve => 
-            setTimeout(resolve, this.RETRY_DELAY * attempt)
+          await new Promise((resolve) =>
+            setTimeout(resolve, this.RETRY_DELAY * attempt),
           );
         }
       }
     }
-    
+
     uploadStats.failed++;
     uploadStats.failedFiles.push(fileNameWithExt);
     this.logger.error(
       `Failed to upload ${fileNameWithExt} after ${this.MAX_RETRIES} attempts:`,
-      lastError
+      lastError,
     );
   }
 }

From 5ee6e46535f97ecdd942f88286927fdba9e4a3d1 Mon Sep 17 00:00:00 2001
From: Sarthak Mittal <80532254+iam-sarthak@users.noreply.github.com>
Date: Wed, 3 Sep 2025 09:53:28 +0530
Subject: [PATCH 24/46] checkbox aligned to text (#1486)

---
 apps/client/src/features/editor/styles/task-list.css | 1 +
 1 file changed, 1 insertion(+)

diff --git a/apps/client/src/features/editor/styles/task-list.css b/apps/client/src/features/editor/styles/task-list.css
index a2c5f6f4..b8b9fb89 100644
--- a/apps/client/src/features/editor/styles/task-list.css
+++ b/apps/client/src/features/editor/styles/task-list.css
@@ -10,6 +10,7 @@ ul[data-type="taskList"] {
         display: flex;
 
         > label {
+            padding-top: 0.2rem;
             flex: 0 0 auto;
             margin-right: 0.5rem;
             user-select: none;

From 00e499b3e52ba20867b48539e737967f4a4b813f Mon Sep 17 00:00:00 2001
From: Eshwar Tangirala <83142845+Eshwar1212-maker@users.noreply.github.com>
Date: Wed, 3 Sep 2025 00:25:48 -0400
Subject: [PATCH 25/46] Fixing extra page bug on print (#1478)

---
 apps/client/src/features/editor/styles/print.css | 1 +
 1 file changed, 1 insertion(+)

diff --git a/apps/client/src/features/editor/styles/print.css b/apps/client/src/features/editor/styles/print.css
index ab105b40..6fb6436d 100644
--- a/apps/client/src/features/editor/styles/print.css
+++ b/apps/client/src/features/editor/styles/print.css
@@ -7,5 +7,6 @@
 
     .mantine-AppShell-main {
         padding-top: 0 !important;
+        min-height: auto !important;
     }
 }

From f9e10805f0c6a49af81f0d2c54b14c8b7415455f Mon Sep 17 00:00:00 2001
From: Philipinho <16838612+Philipinho@users.noreply.github.com>
Date: Tue, 2 Sep 2025 21:38:14 -0700
Subject: [PATCH 26/46] sync

---
 .../components/callout/callout-menu.tsx       | 26 +++++++++----------
 apps/server/src/ee                            |  2 +-
 2 files changed, 13 insertions(+), 15 deletions(-)

diff --git a/apps/client/src/features/editor/components/callout/callout-menu.tsx b/apps/client/src/features/editor/components/callout/callout-menu.tsx
index 400460e7..988f214a 100644
--- a/apps/client/src/features/editor/components/callout/callout-menu.tsx
+++ b/apps/client/src/features/editor/components/callout/callout-menu.tsx
@@ -23,7 +23,7 @@ import EmojiPicker from "@/components/ui/emoji-picker.tsx";
 
 export function CalloutMenu({ editor }: EditorMenuProps) {
   const { t } = useTranslation();
-  
+
   const shouldShow = useCallback(
     ({ state }: ShouldShowProps) => {
       if (!state) {
@@ -164,19 +164,17 @@ export function CalloutMenu({ editor }: EditorMenuProps) {
           </ActionIcon>
         </Tooltip>
 
-        <Tooltip position="top" label={t("Custom emoji")}>
-          <EmojiPicker
-            onEmojiSelect={setCalloutIcon}
-            removeEmojiAction={removeCalloutIcon}
-            readOnly={false}
-            icon={currentIcon || <IconMoodSmile size={18} />}
-            actionIconProps={{
-              size: "lg",
-              variant: "default",
-              c: undefined
-            }}
-          />
-        </Tooltip>
+        <EmojiPicker
+          onEmojiSelect={setCalloutIcon}
+          removeEmojiAction={removeCalloutIcon}
+          readOnly={false}
+          icon={currentIcon || <IconMoodSmile size={18} />}
+          actionIconProps={{
+            size: "lg",
+            variant: "default",
+            c: undefined,
+          }}
+        />
       </ActionIcon.Group>
     </BaseBubbleMenu>
   );
diff --git a/apps/server/src/ee b/apps/server/src/ee
index aa33dcd2..38de2d0d 160000
--- a/apps/server/src/ee
+++ b/apps/server/src/ee
@@ -1 +1 @@
-Subproject commit aa33dcd2ba310705d6799d1e468390774e0cf3e7
+Subproject commit 38de2d0dc1ae233668cf546f3ab74046afa8986a

From adec36d5449f8cb5dd068389d2e5c86e027b4906 Mon Sep 17 00:00:00 2001
From: Philipinho <16838612+Philipinho@users.noreply.github.com>
Date: Tue, 2 Sep 2025 21:45:38 -0700
Subject: [PATCH 27/46] fix: adjust margins - use default browser highlight
 background

---
 apps/client/src/features/editor/styles/core.css | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/apps/client/src/features/editor/styles/core.css b/apps/client/src/features/editor/styles/core.css
index de60d710..051921de 100644
--- a/apps/client/src/features/editor/styles/core.css
+++ b/apps/client/src/features/editor/styles/core.css
@@ -33,8 +33,8 @@
   }
 
   p {
-    margin-top: 0.65em;
-    margin-bottom: 0.65em;
+    margin-top: 0.5em;
+    margin-bottom: 0.5em;
   }
 
   ul,
@@ -57,6 +57,7 @@
   h5,
   h6 {
     line-height: 1.1;
+    margin-bottom: 10px;
   }
 
   code {
@@ -136,7 +137,7 @@
 
   .selection,
   *::selection {
-    background-color: light-dark(var(--mantine-color-gray-2), var(--mantine-color-gray-7));
+    background-color: Highlight;
   }
 
   .comment-mark {

From cf7534de3d6d1628b71ffd6157e1a31cc02208b6 Mon Sep 17 00:00:00 2001
From: Philipinho <16838612+Philipinho@users.noreply.github.com>
Date: Wed, 3 Sep 2025 09:37:29 -0700
Subject: [PATCH 28/46] fix version display

---
 apps/client/src/components/settings/app-version.tsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/apps/client/src/components/settings/app-version.tsx b/apps/client/src/components/settings/app-version.tsx
index cb332478..5ba9ce2a 100644
--- a/apps/client/src/components/settings/app-version.tsx
+++ b/apps/client/src/components/settings/app-version.tsx
@@ -50,7 +50,7 @@ export default function AppVersion() {
             href="https://github.com/docmost/docmost/releases"
             target="_blank"
           >
-            v{APP_VERSION}
+            {appVersion?.currentVersion && <>v{appVersion?.currentVersion}</>}
           </Text>
         </Indicator>
       </Tooltip>

From 73b78f625dd101d088d00bd6836343f3daf4bb11 Mon Sep 17 00:00:00 2001
From: Philipinho <16838612+Philipinho@users.noreply.github.com>
Date: Wed, 3 Sep 2025 10:11:19 -0700
Subject: [PATCH 29/46] more translations

---
 .../public/locales/en-US/translation.json     | 29 ++++++++++++++++++-
 .../security/components/allowed-domains.tsx   |  6 ++--
 .../security/components/sso-google-form.tsx   |  3 +-
 .../ee/security/components/sso-ldap-form.tsx  |  4 +--
 .../ee/security/components/sso-oidc-form.tsx  |  2 +-
 .../components/sso-provider-modal.tsx         |  7 ++++-
 .../ee/security/components/sso-saml-form.tsx  |  5 ++--
 .../search/components/search-result-item.tsx  | 22 ++++++++------
 .../components/search-spotlight-filters.tsx   | 22 +++++++-------
 9 files changed, 70 insertions(+), 30 deletions(-)

diff --git a/apps/client/public/locales/en-US/translation.json b/apps/client/public/locales/en-US/translation.json
index 3efcdfec..e4019584 100644
--- a/apps/client/public/locales/en-US/translation.json
+++ b/apps/client/public/locales/en-US/translation.json
@@ -53,6 +53,7 @@
   "e.g Space for product team": "e.g Space for product team",
   "e.g Space for sales team to collaborate": "e.g Space for sales team to collaborate",
   "Edit": "Edit",
+  "Read": "Read",
   "Edit group": "Edit group",
   "Email": "Email",
   "Enter a strong password": "Enter a strong password",
@@ -500,5 +501,31 @@
   "Failed to load subpages": "Failed to load subpages",
   "No subpages": "No subpages",
   "Subpages (Child pages)": "Subpages (Child pages)",
-  "List all subpages of the current page": "List all subpages of the current page"
+  "List all subpages of the current page": "List all subpages of the current page",
+  "Attachments": "Attachments",
+  "All spaces": "All spaces",
+  "Unknown": "Unknown",
+  "Find a space": "Find a space",
+  "Search in all your spaces": "Search in all your spaces",
+  "Type": "Type",
+  "Enterprise": "Enterprise",
+  "Download attachment": "Download attachment",
+  "Allowed email domains": "Allowed email domains",
+  "Only users with email addresses from these domains can signup via SSO.": "Only users with email addresses from these domains can signup via SSO.",
+  "Enter valid domain names separated by comma or space": "Enter valid domain names separated by comma or space",
+  "Enforce two-factor authentication": "Enforce two-factor authentication",
+  "Once enforced, all members must enable two-factor authentication to access the workspace." : "Once enforced, all members must enable two-factor authentication to access the workspace.",
+  "Toggle MFA enforcement": "Toggle MFA enforcement",
+  "Display name": "Display name",
+  "Allow signup": "Allow signup",
+  "Enabled": "Enabled",
+  "Advanced Settings": "Advanced Settings",
+  "Enable TLS/SSL": "Enable TLS/SSL",
+  "Use secure connection to LDAP server": "Use secure connection to LDAP server",
+  "Group sync": "Group sync",
+  "No SSO providers found.": "No SSO providers found.",
+  "Delete SSO provider": "Delete SSO provider",
+  "Are you sure you want to delete this SSO provider?": "Are you sure you want to delete this SSO provider?",
+  "Action": "Action",
+  "{{ssoProviderType}} configuration": "{{ssoProviderType}} configuration"
 }
diff --git a/apps/client/src/ee/security/components/allowed-domains.tsx b/apps/client/src/ee/security/components/allowed-domains.tsx
index 6576c460..d1050975 100644
--- a/apps/client/src/ee/security/components/allowed-domains.tsx
+++ b/apps/client/src/ee/security/components/allowed-domains.tsx
@@ -55,9 +55,11 @@ export default function AllowedDomains() {
   return (
     <>
       <div>
-        <Text size="md">Allowed email domains</Text>
+        <Text size="md">{t("Allowed email domains")}</Text>
         <Text size="sm" c="dimmed">
-          Only users with email addresses from these domains can signup via SSO.
+          {t(
+            "Only users with email addresses from these domains can signup via SSO.",
+          )}
         </Text>
       </div>
       <form onSubmit={form.onSubmit(handleSubmit)}>
diff --git a/apps/client/src/ee/security/components/sso-google-form.tsx b/apps/client/src/ee/security/components/sso-google-form.tsx
index 97a39a3b..ddd14b0f 100644
--- a/apps/client/src/ee/security/components/sso-google-form.tsx
+++ b/apps/client/src/ee/security/components/sso-google-form.tsx
@@ -1,6 +1,7 @@
 import React from "react";
 import { z } from "zod";
-import { useForm, zodResolver } from "@mantine/form";
+import { useForm } from "@mantine/form";
+import { zodResolver } from "mantine-form-zod-resolver";
 import { Box, Button, Group, Stack, Switch, TextInput } from "@mantine/core";
 import classes from "@/ee/security/components/sso.module.css";
 import { IAuthProvider } from "@/ee/security/types/security.types.ts";
diff --git a/apps/client/src/ee/security/components/sso-ldap-form.tsx b/apps/client/src/ee/security/components/sso-ldap-form.tsx
index c570a51c..662e8458 100644
--- a/apps/client/src/ee/security/components/sso-ldap-form.tsx
+++ b/apps/client/src/ee/security/components/sso-ldap-form.tsx
@@ -110,7 +110,7 @@ export function SsoLDAPForm({ provider, onClose }: SsoFormProps) {
       <form onSubmit={form.onSubmit(handleSubmit)}>
         <Stack>
           <TextInput
-            label="Display name"
+            label={t("Display name")}
             placeholder="e.g Company LDAP"
             data-autofocus
             {...form.getInputProps("name")}
@@ -155,7 +155,7 @@ export function SsoLDAPForm({ provider, onClose }: SsoFormProps) {
           <Accordion variant="separated">
             <Accordion.Item value="advanced">
               <Accordion.Control icon={<IconInfoCircle size={20} />}>
-                Advanced Settings
+                {t("Advanced Settings")}
               </Accordion.Control>
               <Accordion.Panel>
                 <Stack>
diff --git a/apps/client/src/ee/security/components/sso-oidc-form.tsx b/apps/client/src/ee/security/components/sso-oidc-form.tsx
index b1c19aa4..6f12e5d2 100644
--- a/apps/client/src/ee/security/components/sso-oidc-form.tsx
+++ b/apps/client/src/ee/security/components/sso-oidc-form.tsx
@@ -83,7 +83,7 @@ export function SsoOIDCForm({ provider, onClose }: SsoFormProps) {
       <form onSubmit={form.onSubmit(handleSubmit)}>
         <Stack>
           <TextInput
-            label="Display name"
+            label={t("Display name")}
             placeholder="e.g Google SSO"
             data-autofocus
             {...form.getInputProps("name")}
diff --git a/apps/client/src/ee/security/components/sso-provider-modal.tsx b/apps/client/src/ee/security/components/sso-provider-modal.tsx
index bf05dd54..6bc90017 100644
--- a/apps/client/src/ee/security/components/sso-provider-modal.tsx
+++ b/apps/client/src/ee/security/components/sso-provider-modal.tsx
@@ -6,6 +6,7 @@ import { SSO_PROVIDER } from "@/ee/security/contants.ts";
 import { SsoOIDCForm } from "@/ee/security/components/sso-oidc-form.tsx";
 import { SsoGoogleForm } from "@/ee/security/components/sso-google-form.tsx";
 import { SsoLDAPForm } from "@/ee/security/components/sso-ldap-form.tsx";
+import { useTranslation } from "react-i18next";
 
 interface SsoModalProps {
   opened: boolean;
@@ -18,6 +19,8 @@ export default function SsoProviderModal({
   onClose,
   provider,
 }: SsoModalProps) {
+  const { t } = useTranslation();
+
   if (!provider) {
     return null;
   }
@@ -25,7 +28,9 @@ export default function SsoProviderModal({
   return (
     <Modal
       opened={opened}
-      title={`${provider.type.toUpperCase()} Configuration`}
+      title={t("{{ssoProviderType}} configuration", {
+        ssoProviderType: provider.type.toUpperCase(),
+      })}
       onClose={onClose}
     >
       {provider.type === SSO_PROVIDER.SAML && (
diff --git a/apps/client/src/ee/security/components/sso-saml-form.tsx b/apps/client/src/ee/security/components/sso-saml-form.tsx
index 696277bd..bf374697 100644
--- a/apps/client/src/ee/security/components/sso-saml-form.tsx
+++ b/apps/client/src/ee/security/components/sso-saml-form.tsx
@@ -1,6 +1,7 @@
 import React from "react";
 import { z } from "zod";
-import { useForm, zodResolver } from "@mantine/form";
+import { useForm } from "@mantine/form";
+import { zodResolver } from "mantine-form-zod-resolver";
 import {
   Box,
   Button,
@@ -91,7 +92,7 @@ export function SsoSamlForm({ provider, onClose }: SsoFormProps) {
       <form onSubmit={form.onSubmit(handleSubmit)}>
         <Stack>
           <TextInput
-            label="Display name"
+            label={t("Display name")}
             placeholder="e.g Azure Entra"
             data-autofocus
             {...form.getInputProps("name")}
diff --git a/apps/client/src/features/search/components/search-result-item.tsx b/apps/client/src/features/search/components/search-result-item.tsx
index 76b74f29..8b7fb80e 100644
--- a/apps/client/src/features/search/components/search-result-item.tsx
+++ b/apps/client/src/features/search/components/search-result-item.tsx
@@ -1,5 +1,5 @@
 import React from "react";
-import { Group, Center, Text, Badge, ActionIcon } from "@mantine/core";
+import { Group, Center, Text, Badge, ActionIcon, Tooltip } from "@mantine/core";
 import { Spotlight } from "@mantine/spotlight";
 import { Link } from "react-router-dom";
 import { IconFile, IconDownload } from "@tabler/icons-react";
@@ -10,6 +10,7 @@ import {
   IPageSearch,
 } from "@/features/search/types/search.types";
 import DOMPurify from "dompurify";
+import { useTranslation } from "react-i18next";
 
 interface SearchResultItemProps {
   result: IPageSearch | IAttachmentSearch;
@@ -22,6 +23,8 @@ export function SearchResultItem({
   isAttachmentResult,
   showSpace,
 }: SearchResultItemProps) {
+  const { t } = useTranslation();
+  
   if (isAttachmentResult) {
     const attachmentResult = result as IAttachmentSearch;
 
@@ -68,14 +71,15 @@ export function SearchResultItem({
             )}
           </div>
 
-          <ActionIcon
-            variant="subtle"
-            color="gray"
-            onClick={handleDownload}
-            title="Download attachment"
-          >
-            <IconDownload size={18} />
-          </ActionIcon>
+          <Tooltip label={t("Download attachment")} withArrow>
+            <ActionIcon
+              variant="subtle"
+              color="gray"
+              onClick={handleDownload}
+            >
+              <IconDownload size={18} />
+            </ActionIcon>
+          </Tooltip>
         </Group>
       </Spotlight.Action>
     );
diff --git a/apps/client/src/features/search/components/search-spotlight-filters.tsx b/apps/client/src/features/search/components/search-spotlight-filters.tsx
index d8f770e7..ce8bda02 100644
--- a/apps/client/src/features/search/components/search-spotlight-filters.tsx
+++ b/apps/client/src/features/search/components/search-spotlight-filters.tsx
@@ -75,10 +75,10 @@ export function SearchSpotlightFilters({
   }, []);
 
   const contentTypeOptions = [
-    { value: "page", label: "Pages" },
+    { value: "page", label: t("Pages") },
     {
       value: "attachment",
-      label: "Attachments",
+      label: t("Attachments"),
       disabled: !hasLicenseKey,
     },
   ];
@@ -136,13 +136,13 @@ export function SearchSpotlightFilters({
             fw={500}
           >
             {selectedSpaceId
-              ? `Space: ${selectedSpaceData?.name || "Unknown"}`
-              : "Space: All spaces"}
+              ? `${t("Space")}: ${selectedSpaceData?.name || t("Unknown")}`
+              : `${t("Space")}: ${t("All spaces")}`}
           </Button>
         </Menu.Target>
         <Menu.Dropdown>
           <TextInput
-            placeholder="Find a space"
+            placeholder={t("Find a space")}
             data-autofocus
             autoFocus
             leftSection={<IconSearch size={16} />}
@@ -160,15 +160,15 @@ export function SearchSpotlightFilters({
                 <Avatar
                   color="initials"
                   variant="filled"
-                  name="All spaces"
+                  name={t("All spaces")}
                   size={20}
                 />
                 <div style={{ flex: 1 }}>
                   <Text size="sm" fw={500}>
-                    All spaces
+                    {t("All spaces")}
                   </Text>
                   <Text size="xs" c="dimmed">
-                    Search in all your spaces
+                    {t("Search in all your spaces")}
                   </Text>
                 </div>
                 {!selectedSpaceId && <IconCheck size={20} />}
@@ -217,8 +217,8 @@ export function SearchSpotlightFilters({
             fw={500}
           >
             {contentType
-              ? `Type: ${contentTypeOptions.find((opt) => opt.value === contentType)?.label || contentType}`
-              : "Type"}
+              ? `${t("Type")}: ${contentTypeOptions.find((opt) => opt.value === contentType)?.label || t(contentType === "page" ? "Pages" : "Attachments")}`
+              : t("Type")}
           </Button>
         </Menu.Target>
         <Menu.Dropdown>
@@ -237,7 +237,7 @@ export function SearchSpotlightFilters({
                   <Text size="sm">{option.label}</Text>
                   {option.disabled && (
                     <Badge size="xs" mt={4}>
-                      Enterprise
+                      {t("Enterprise")}
                     </Badge>
                   )}
                 </div>

From 7951b2e0c6c63b67cc2fffe69615a9cea89b92c0 Mon Sep 17 00:00:00 2001
From: Philip Okugbe <16838612+Philipinho@users.noreply.github.com>
Date: Wed, 3 Sep 2025 18:28:30 +0100
Subject: [PATCH 30/46] New Crowdin updates (#1509)

* New translations translation.json (French)

* New translations translation.json (Spanish)

* New translations translation.json (German)

* New translations translation.json (Italian)

* New translations translation.json (Japanese)

* New translations translation.json (Korean)

* New translations translation.json (Dutch)

* New translations translation.json (Russian)

* New translations translation.json (Ukrainian)

* New translations translation.json (Chinese Simplified)

* New translations translation.json (English)

* New translations translation.json (Portuguese, Brazilian)

* New translations translation.json (French)

* New translations translation.json (Spanish)

* New translations translation.json (German)

* New translations translation.json (Italian)

* New translations translation.json (Japanese)

* New translations translation.json (Korean)

* New translations translation.json (Dutch)

* New translations translation.json (Russian)

* New translations translation.json (Ukrainian)

* New translations translation.json (Chinese Simplified)

* New translations translation.json (English)

* New translations translation.json (Portuguese, Brazilian)
---
 .../public/locales/de-DE/translation.json     | 34 ++++++++++++++++++-
 .../public/locales/en-US/translation.json     |  2 +-
 .../public/locales/es-ES/translation.json     | 34 ++++++++++++++++++-
 .../public/locales/fr-FR/translation.json     | 34 ++++++++++++++++++-
 .../public/locales/it-IT/translation.json     | 34 ++++++++++++++++++-
 .../public/locales/ja-JP/translation.json     | 34 ++++++++++++++++++-
 .../public/locales/ko-KR/translation.json     | 34 ++++++++++++++++++-
 .../public/locales/nl-NL/translation.json     | 34 ++++++++++++++++++-
 .../public/locales/pt-BR/translation.json     | 34 ++++++++++++++++++-
 .../public/locales/ru-RU/translation.json     | 34 ++++++++++++++++++-
 .../public/locales/uk-UA/translation.json     | 34 ++++++++++++++++++-
 .../public/locales/zh-CN/translation.json     | 34 ++++++++++++++++++-
 12 files changed, 364 insertions(+), 12 deletions(-)

diff --git a/apps/client/public/locales/de-DE/translation.json b/apps/client/public/locales/de-DE/translation.json
index 0199a502..768d54c3 100644
--- a/apps/client/public/locales/de-DE/translation.json
+++ b/apps/client/public/locales/de-DE/translation.json
@@ -53,6 +53,7 @@
   "e.g Space for product team": "z.B. Bereich für das Produktteam",
   "e.g Space for sales team to collaborate": "z.B. Bereich für das Vertriebsteam zur Zusammenarbeit",
   "Edit": "Bearbeiten",
+  "Read": "Read",
   "Edit group": "Gruppe bearbeiten",
   "Email": "E-Mail",
   "Enter a strong password": "Geben Sie ein starkes Passwort ein",
@@ -495,5 +496,36 @@
   "Page restored successfully": "Seite erfolgreich wiederhergestellt",
   "Deleted by": "Gelöscht von",
   "Deleted at": "Gelöscht am",
-  "Preview": "Vorschau"
+  "Preview": "Vorschau",
+  "Subpages": "Subpages",
+  "Failed to load subpages": "Failed to load subpages",
+  "No subpages": "No subpages",
+  "Subpages (Child pages)": "Subpages (Child pages)",
+  "List all subpages of the current page": "List all subpages of the current page",
+  "Attachments": "Attachments",
+  "All spaces": "All spaces",
+  "Unknown": "Unknown",
+  "Find a space": "Find a space",
+  "Search in all your spaces": "Search in all your spaces",
+  "Type": "Type",
+  "Enterprise": "Enterprise",
+  "Download attachment": "Download attachment",
+  "Allowed email domains": "Allowed email domains",
+  "Only users with email addresses from these domains can signup via SSO.": "Only users with email addresses from these domains can signup via SSO.",
+  "Enter valid domain names separated by comma or space": "Enter valid domain names separated by comma or space",
+  "Enforce two-factor authentication": "Enforce two-factor authentication",
+  "Once enforced, all members must enable two-factor authentication to access the workspace.": "Once enforced, all members must enable two-factor authentication to access the workspace.",
+  "Toggle MFA enforcement": "Toggle MFA enforcement",
+  "Display name": "Display name",
+  "Allow signup": "Allow signup",
+  "Enabled": "Enabled",
+  "Advanced Settings": "Advanced Settings",
+  "Enable TLS/SSL": "Enable TLS/SSL",
+  "Use secure connection to LDAP server": "Use secure connection to LDAP server",
+  "Group sync": "Group sync",
+  "No SSO providers found.": "No SSO providers found.",
+  "Delete SSO provider": "Delete SSO provider",
+  "Are you sure you want to delete this SSO provider?": "Are you sure you want to delete this SSO provider?",
+  "Action": "Action",
+  "{{ssoProviderType}} configuration": "{{ssoProviderType}} configuration"
 }
diff --git a/apps/client/public/locales/en-US/translation.json b/apps/client/public/locales/en-US/translation.json
index e4019584..1dd6ef58 100644
--- a/apps/client/public/locales/en-US/translation.json
+++ b/apps/client/public/locales/en-US/translation.json
@@ -514,7 +514,7 @@
   "Only users with email addresses from these domains can signup via SSO.": "Only users with email addresses from these domains can signup via SSO.",
   "Enter valid domain names separated by comma or space": "Enter valid domain names separated by comma or space",
   "Enforce two-factor authentication": "Enforce two-factor authentication",
-  "Once enforced, all members must enable two-factor authentication to access the workspace." : "Once enforced, all members must enable two-factor authentication to access the workspace.",
+  "Once enforced, all members must enable two-factor authentication to access the workspace.": "Once enforced, all members must enable two-factor authentication to access the workspace.",
   "Toggle MFA enforcement": "Toggle MFA enforcement",
   "Display name": "Display name",
   "Allow signup": "Allow signup",
diff --git a/apps/client/public/locales/es-ES/translation.json b/apps/client/public/locales/es-ES/translation.json
index 407b9f14..7ad0195a 100644
--- a/apps/client/public/locales/es-ES/translation.json
+++ b/apps/client/public/locales/es-ES/translation.json
@@ -53,6 +53,7 @@
   "e.g Space for product team": "ej: Espacio para el equipo de producto",
   "e.g Space for sales team to collaborate": "ej: Espacio para que el equipo de ventas colabore",
   "Edit": "Editar",
+  "Read": "Read",
   "Edit group": "Editar grupo",
   "Email": "Correo electrónico",
   "Enter a strong password": "Introduce una contraseña fuerte",
@@ -495,5 +496,36 @@
   "Page restored successfully": "Página restaurada con éxito",
   "Deleted by": "Eliminado por",
   "Deleted at": "Eliminado en",
-  "Preview": "Vista previa"
+  "Preview": "Vista previa",
+  "Subpages": "Subpages",
+  "Failed to load subpages": "Failed to load subpages",
+  "No subpages": "No subpages",
+  "Subpages (Child pages)": "Subpages (Child pages)",
+  "List all subpages of the current page": "List all subpages of the current page",
+  "Attachments": "Attachments",
+  "All spaces": "All spaces",
+  "Unknown": "Unknown",
+  "Find a space": "Find a space",
+  "Search in all your spaces": "Search in all your spaces",
+  "Type": "Type",
+  "Enterprise": "Enterprise",
+  "Download attachment": "Download attachment",
+  "Allowed email domains": "Allowed email domains",
+  "Only users with email addresses from these domains can signup via SSO.": "Only users with email addresses from these domains can signup via SSO.",
+  "Enter valid domain names separated by comma or space": "Enter valid domain names separated by comma or space",
+  "Enforce two-factor authentication": "Enforce two-factor authentication",
+  "Once enforced, all members must enable two-factor authentication to access the workspace.": "Once enforced, all members must enable two-factor authentication to access the workspace.",
+  "Toggle MFA enforcement": "Toggle MFA enforcement",
+  "Display name": "Display name",
+  "Allow signup": "Allow signup",
+  "Enabled": "Enabled",
+  "Advanced Settings": "Advanced Settings",
+  "Enable TLS/SSL": "Enable TLS/SSL",
+  "Use secure connection to LDAP server": "Use secure connection to LDAP server",
+  "Group sync": "Group sync",
+  "No SSO providers found.": "No SSO providers found.",
+  "Delete SSO provider": "Delete SSO provider",
+  "Are you sure you want to delete this SSO provider?": "Are you sure you want to delete this SSO provider?",
+  "Action": "Action",
+  "{{ssoProviderType}} configuration": "{{ssoProviderType}} configuration"
 }
diff --git a/apps/client/public/locales/fr-FR/translation.json b/apps/client/public/locales/fr-FR/translation.json
index a502af11..0a65ed5b 100644
--- a/apps/client/public/locales/fr-FR/translation.json
+++ b/apps/client/public/locales/fr-FR/translation.json
@@ -53,6 +53,7 @@
   "e.g Space for product team": "par ex. Espace pour l'équipe produit",
   "e.g Space for sales team to collaborate": "par ex. Espace pour l'équipe de vente pour collaborer",
   "Edit": "Modifier",
+  "Read": "Read",
   "Edit group": "Modifier groupe",
   "Email": "Email",
   "Enter a strong password": "Entrez un mot de passe fort",
@@ -495,5 +496,36 @@
   "Page restored successfully": "Page restaurée avec succès",
   "Deleted by": "Supprimé par",
   "Deleted at": "Supprimé à",
-  "Preview": "Aperçu"
+  "Preview": "Aperçu",
+  "Subpages": "Subpages",
+  "Failed to load subpages": "Failed to load subpages",
+  "No subpages": "No subpages",
+  "Subpages (Child pages)": "Subpages (Child pages)",
+  "List all subpages of the current page": "List all subpages of the current page",
+  "Attachments": "Attachments",
+  "All spaces": "All spaces",
+  "Unknown": "Unknown",
+  "Find a space": "Find a space",
+  "Search in all your spaces": "Search in all your spaces",
+  "Type": "Type",
+  "Enterprise": "Enterprise",
+  "Download attachment": "Download attachment",
+  "Allowed email domains": "Allowed email domains",
+  "Only users with email addresses from these domains can signup via SSO.": "Only users with email addresses from these domains can signup via SSO.",
+  "Enter valid domain names separated by comma or space": "Enter valid domain names separated by comma or space",
+  "Enforce two-factor authentication": "Enforce two-factor authentication",
+  "Once enforced, all members must enable two-factor authentication to access the workspace.": "Once enforced, all members must enable two-factor authentication to access the workspace.",
+  "Toggle MFA enforcement": "Toggle MFA enforcement",
+  "Display name": "Display name",
+  "Allow signup": "Allow signup",
+  "Enabled": "Enabled",
+  "Advanced Settings": "Advanced Settings",
+  "Enable TLS/SSL": "Enable TLS/SSL",
+  "Use secure connection to LDAP server": "Use secure connection to LDAP server",
+  "Group sync": "Group sync",
+  "No SSO providers found.": "No SSO providers found.",
+  "Delete SSO provider": "Delete SSO provider",
+  "Are you sure you want to delete this SSO provider?": "Are you sure you want to delete this SSO provider?",
+  "Action": "Action",
+  "{{ssoProviderType}} configuration": "{{ssoProviderType}} configuration"
 }
diff --git a/apps/client/public/locales/it-IT/translation.json b/apps/client/public/locales/it-IT/translation.json
index f72c58c7..f1cd92a9 100644
--- a/apps/client/public/locales/it-IT/translation.json
+++ b/apps/client/public/locales/it-IT/translation.json
@@ -53,6 +53,7 @@
   "e.g Space for product team": "es. Spazio per il team di prodotto",
   "e.g Space for sales team to collaborate": "es. Spazio per la collaborazione del team di vendita",
   "Edit": "Modifica",
+  "Read": "Read",
   "Edit group": "Modifica gruppo",
   "Email": "Email",
   "Enter a strong password": "Inserisci una password sicura",
@@ -495,5 +496,36 @@
   "Page restored successfully": "Pagina ripristinata con successo",
   "Deleted by": "Eliminato da",
   "Deleted at": "Eliminato il",
-  "Preview": "Anteprima"
+  "Preview": "Anteprima",
+  "Subpages": "Subpages",
+  "Failed to load subpages": "Failed to load subpages",
+  "No subpages": "No subpages",
+  "Subpages (Child pages)": "Subpages (Child pages)",
+  "List all subpages of the current page": "List all subpages of the current page",
+  "Attachments": "Attachments",
+  "All spaces": "All spaces",
+  "Unknown": "Unknown",
+  "Find a space": "Find a space",
+  "Search in all your spaces": "Search in all your spaces",
+  "Type": "Type",
+  "Enterprise": "Enterprise",
+  "Download attachment": "Download attachment",
+  "Allowed email domains": "Allowed email domains",
+  "Only users with email addresses from these domains can signup via SSO.": "Only users with email addresses from these domains can signup via SSO.",
+  "Enter valid domain names separated by comma or space": "Enter valid domain names separated by comma or space",
+  "Enforce two-factor authentication": "Enforce two-factor authentication",
+  "Once enforced, all members must enable two-factor authentication to access the workspace.": "Once enforced, all members must enable two-factor authentication to access the workspace.",
+  "Toggle MFA enforcement": "Toggle MFA enforcement",
+  "Display name": "Display name",
+  "Allow signup": "Allow signup",
+  "Enabled": "Enabled",
+  "Advanced Settings": "Advanced Settings",
+  "Enable TLS/SSL": "Enable TLS/SSL",
+  "Use secure connection to LDAP server": "Use secure connection to LDAP server",
+  "Group sync": "Group sync",
+  "No SSO providers found.": "No SSO providers found.",
+  "Delete SSO provider": "Delete SSO provider",
+  "Are you sure you want to delete this SSO provider?": "Are you sure you want to delete this SSO provider?",
+  "Action": "Action",
+  "{{ssoProviderType}} configuration": "{{ssoProviderType}} configuration"
 }
diff --git a/apps/client/public/locales/ja-JP/translation.json b/apps/client/public/locales/ja-JP/translation.json
index 3e7950db..8948d00f 100644
--- a/apps/client/public/locales/ja-JP/translation.json
+++ b/apps/client/public/locales/ja-JP/translation.json
@@ -53,6 +53,7 @@
   "e.g Space for product team": "例: 製品チームのスペース",
   "e.g Space for sales team to collaborate": "例: 営業チーム連携用スペース",
   "Edit": "編集",
+  "Read": "Read",
   "Edit group": "グループを編集",
   "Email": "メールアドレス",
   "Enter a strong password": "強力なパスワードを入力してください",
@@ -495,5 +496,36 @@
   "Page restored successfully": "ページが正常に復元されました",
   "Deleted by": "削除者",
   "Deleted at": "削除日時",
-  "Preview": "プレビュー"
+  "Preview": "プレビュー",
+  "Subpages": "Subpages",
+  "Failed to load subpages": "Failed to load subpages",
+  "No subpages": "No subpages",
+  "Subpages (Child pages)": "Subpages (Child pages)",
+  "List all subpages of the current page": "List all subpages of the current page",
+  "Attachments": "Attachments",
+  "All spaces": "All spaces",
+  "Unknown": "Unknown",
+  "Find a space": "Find a space",
+  "Search in all your spaces": "Search in all your spaces",
+  "Type": "Type",
+  "Enterprise": "Enterprise",
+  "Download attachment": "Download attachment",
+  "Allowed email domains": "Allowed email domains",
+  "Only users with email addresses from these domains can signup via SSO.": "Only users with email addresses from these domains can signup via SSO.",
+  "Enter valid domain names separated by comma or space": "Enter valid domain names separated by comma or space",
+  "Enforce two-factor authentication": "Enforce two-factor authentication",
+  "Once enforced, all members must enable two-factor authentication to access the workspace.": "Once enforced, all members must enable two-factor authentication to access the workspace.",
+  "Toggle MFA enforcement": "Toggle MFA enforcement",
+  "Display name": "Display name",
+  "Allow signup": "Allow signup",
+  "Enabled": "Enabled",
+  "Advanced Settings": "Advanced Settings",
+  "Enable TLS/SSL": "Enable TLS/SSL",
+  "Use secure connection to LDAP server": "Use secure connection to LDAP server",
+  "Group sync": "Group sync",
+  "No SSO providers found.": "No SSO providers found.",
+  "Delete SSO provider": "Delete SSO provider",
+  "Are you sure you want to delete this SSO provider?": "Are you sure you want to delete this SSO provider?",
+  "Action": "Action",
+  "{{ssoProviderType}} configuration": "{{ssoProviderType}} configuration"
 }
diff --git a/apps/client/public/locales/ko-KR/translation.json b/apps/client/public/locales/ko-KR/translation.json
index fdf35b72..0e50cc5f 100644
--- a/apps/client/public/locales/ko-KR/translation.json
+++ b/apps/client/public/locales/ko-KR/translation.json
@@ -53,6 +53,7 @@
   "e.g Space for product team": "예: 제품 팀을 위한 Space",
   "e.g Space for sales team to collaborate": "예: 영업 팀의 Space",
   "Edit": "편집",
+  "Read": "Read",
   "Edit group": "팀 편집",
   "Email": "이메일",
   "Enter a strong password": "강력한 비밀번호를 입력하세요",
@@ -495,5 +496,36 @@
   "Page restored successfully": "페이지가 성공적으로 복구되었습니다",
   "Deleted by": "삭제자",
   "Deleted at": "삭제 시간",
-  "Preview": "미리보기"
+  "Preview": "미리보기",
+  "Subpages": "Subpages",
+  "Failed to load subpages": "Failed to load subpages",
+  "No subpages": "No subpages",
+  "Subpages (Child pages)": "Subpages (Child pages)",
+  "List all subpages of the current page": "List all subpages of the current page",
+  "Attachments": "Attachments",
+  "All spaces": "All spaces",
+  "Unknown": "Unknown",
+  "Find a space": "Find a space",
+  "Search in all your spaces": "Search in all your spaces",
+  "Type": "Type",
+  "Enterprise": "Enterprise",
+  "Download attachment": "Download attachment",
+  "Allowed email domains": "Allowed email domains",
+  "Only users with email addresses from these domains can signup via SSO.": "Only users with email addresses from these domains can signup via SSO.",
+  "Enter valid domain names separated by comma or space": "Enter valid domain names separated by comma or space",
+  "Enforce two-factor authentication": "Enforce two-factor authentication",
+  "Once enforced, all members must enable two-factor authentication to access the workspace.": "Once enforced, all members must enable two-factor authentication to access the workspace.",
+  "Toggle MFA enforcement": "Toggle MFA enforcement",
+  "Display name": "Display name",
+  "Allow signup": "Allow signup",
+  "Enabled": "Enabled",
+  "Advanced Settings": "Advanced Settings",
+  "Enable TLS/SSL": "Enable TLS/SSL",
+  "Use secure connection to LDAP server": "Use secure connection to LDAP server",
+  "Group sync": "Group sync",
+  "No SSO providers found.": "No SSO providers found.",
+  "Delete SSO provider": "Delete SSO provider",
+  "Are you sure you want to delete this SSO provider?": "Are you sure you want to delete this SSO provider?",
+  "Action": "Action",
+  "{{ssoProviderType}} configuration": "{{ssoProviderType}} configuration"
 }
diff --git a/apps/client/public/locales/nl-NL/translation.json b/apps/client/public/locales/nl-NL/translation.json
index 1757f92e..f2fabf36 100644
--- a/apps/client/public/locales/nl-NL/translation.json
+++ b/apps/client/public/locales/nl-NL/translation.json
@@ -53,6 +53,7 @@
   "e.g Space for product team": "bijv. Ruimte voor productteam",
   "e.g Space for sales team to collaborate": "bijv. Ruimte voor verkoopteam om samen te werken",
   "Edit": "Bewerken",
+  "Read": "Read",
   "Edit group": "Groep bewerken",
   "Email": "E-mailadres",
   "Enter a strong password": "Voer een sterk wachtwoord in",
@@ -495,5 +496,36 @@
   "Page restored successfully": "Pagina succesvol hersteld",
   "Deleted by": "Verwijderd door",
   "Deleted at": "Verwijderd op",
-  "Preview": "Voorbeeld"
+  "Preview": "Voorbeeld",
+  "Subpages": "Subpages",
+  "Failed to load subpages": "Failed to load subpages",
+  "No subpages": "No subpages",
+  "Subpages (Child pages)": "Subpages (Child pages)",
+  "List all subpages of the current page": "List all subpages of the current page",
+  "Attachments": "Attachments",
+  "All spaces": "All spaces",
+  "Unknown": "Unknown",
+  "Find a space": "Find a space",
+  "Search in all your spaces": "Search in all your spaces",
+  "Type": "Type",
+  "Enterprise": "Enterprise",
+  "Download attachment": "Download attachment",
+  "Allowed email domains": "Allowed email domains",
+  "Only users with email addresses from these domains can signup via SSO.": "Only users with email addresses from these domains can signup via SSO.",
+  "Enter valid domain names separated by comma or space": "Enter valid domain names separated by comma or space",
+  "Enforce two-factor authentication": "Enforce two-factor authentication",
+  "Once enforced, all members must enable two-factor authentication to access the workspace.": "Once enforced, all members must enable two-factor authentication to access the workspace.",
+  "Toggle MFA enforcement": "Toggle MFA enforcement",
+  "Display name": "Display name",
+  "Allow signup": "Allow signup",
+  "Enabled": "Enabled",
+  "Advanced Settings": "Advanced Settings",
+  "Enable TLS/SSL": "Enable TLS/SSL",
+  "Use secure connection to LDAP server": "Use secure connection to LDAP server",
+  "Group sync": "Group sync",
+  "No SSO providers found.": "No SSO providers found.",
+  "Delete SSO provider": "Delete SSO provider",
+  "Are you sure you want to delete this SSO provider?": "Are you sure you want to delete this SSO provider?",
+  "Action": "Action",
+  "{{ssoProviderType}} configuration": "{{ssoProviderType}} configuration"
 }
diff --git a/apps/client/public/locales/pt-BR/translation.json b/apps/client/public/locales/pt-BR/translation.json
index 1ed2c6e5..ca68792e 100644
--- a/apps/client/public/locales/pt-BR/translation.json
+++ b/apps/client/public/locales/pt-BR/translation.json
@@ -53,6 +53,7 @@
   "e.g Space for product team": "ex.: Espaço para a equipe de produto",
   "e.g Space for sales team to collaborate": "ex.: Espaço para a equipe de vendas colaborar",
   "Edit": "Editar",
+  "Read": "Read",
   "Edit group": "Editar grupo",
   "Email": "Email",
   "Enter a strong password": "Insira uma senha forte",
@@ -495,5 +496,36 @@
   "Page restored successfully": "Página restaurada com sucesso",
   "Deleted by": "Excluído por",
   "Deleted at": "Excluído em",
-  "Preview": "Visualização"
+  "Preview": "Visualização",
+  "Subpages": "Subpages",
+  "Failed to load subpages": "Failed to load subpages",
+  "No subpages": "No subpages",
+  "Subpages (Child pages)": "Subpages (Child pages)",
+  "List all subpages of the current page": "List all subpages of the current page",
+  "Attachments": "Attachments",
+  "All spaces": "All spaces",
+  "Unknown": "Unknown",
+  "Find a space": "Find a space",
+  "Search in all your spaces": "Search in all your spaces",
+  "Type": "Type",
+  "Enterprise": "Enterprise",
+  "Download attachment": "Download attachment",
+  "Allowed email domains": "Allowed email domains",
+  "Only users with email addresses from these domains can signup via SSO.": "Only users with email addresses from these domains can signup via SSO.",
+  "Enter valid domain names separated by comma or space": "Enter valid domain names separated by comma or space",
+  "Enforce two-factor authentication": "Enforce two-factor authentication",
+  "Once enforced, all members must enable two-factor authentication to access the workspace.": "Once enforced, all members must enable two-factor authentication to access the workspace.",
+  "Toggle MFA enforcement": "Toggle MFA enforcement",
+  "Display name": "Display name",
+  "Allow signup": "Allow signup",
+  "Enabled": "Enabled",
+  "Advanced Settings": "Advanced Settings",
+  "Enable TLS/SSL": "Enable TLS/SSL",
+  "Use secure connection to LDAP server": "Use secure connection to LDAP server",
+  "Group sync": "Group sync",
+  "No SSO providers found.": "No SSO providers found.",
+  "Delete SSO provider": "Delete SSO provider",
+  "Are you sure you want to delete this SSO provider?": "Are you sure you want to delete this SSO provider?",
+  "Action": "Action",
+  "{{ssoProviderType}} configuration": "{{ssoProviderType}} configuration"
 }
diff --git a/apps/client/public/locales/ru-RU/translation.json b/apps/client/public/locales/ru-RU/translation.json
index 3ad0607f..ebe0ca36 100644
--- a/apps/client/public/locales/ru-RU/translation.json
+++ b/apps/client/public/locales/ru-RU/translation.json
@@ -53,6 +53,7 @@
   "e.g Space for product team": "например, Пространство для продуктовой команды",
   "e.g Space for sales team to collaborate": "например, Пространство для совместной работы команды продаж",
   "Edit": "Редактировать",
+  "Read": "Read",
   "Edit group": "Редактировать группу",
   "Email": "Электронная почта",
   "Enter a strong password": "Введите надёжный пароль",
@@ -495,5 +496,36 @@
   "Page restored successfully": "Страница успешно восстановлена",
   "Deleted by": "Удалено пользователем",
   "Deleted at": "Удалено в",
-  "Preview": "Предпросмотр"
+  "Preview": "Предпросмотр",
+  "Subpages": "Subpages",
+  "Failed to load subpages": "Failed to load subpages",
+  "No subpages": "No subpages",
+  "Subpages (Child pages)": "Subpages (Child pages)",
+  "List all subpages of the current page": "List all subpages of the current page",
+  "Attachments": "Attachments",
+  "All spaces": "All spaces",
+  "Unknown": "Unknown",
+  "Find a space": "Find a space",
+  "Search in all your spaces": "Search in all your spaces",
+  "Type": "Type",
+  "Enterprise": "Enterprise",
+  "Download attachment": "Download attachment",
+  "Allowed email domains": "Allowed email domains",
+  "Only users with email addresses from these domains can signup via SSO.": "Only users with email addresses from these domains can signup via SSO.",
+  "Enter valid domain names separated by comma or space": "Enter valid domain names separated by comma or space",
+  "Enforce two-factor authentication": "Enforce two-factor authentication",
+  "Once enforced, all members must enable two-factor authentication to access the workspace.": "Once enforced, all members must enable two-factor authentication to access the workspace.",
+  "Toggle MFA enforcement": "Toggle MFA enforcement",
+  "Display name": "Display name",
+  "Allow signup": "Allow signup",
+  "Enabled": "Enabled",
+  "Advanced Settings": "Advanced Settings",
+  "Enable TLS/SSL": "Enable TLS/SSL",
+  "Use secure connection to LDAP server": "Use secure connection to LDAP server",
+  "Group sync": "Group sync",
+  "No SSO providers found.": "No SSO providers found.",
+  "Delete SSO provider": "Delete SSO provider",
+  "Are you sure you want to delete this SSO provider?": "Are you sure you want to delete this SSO provider?",
+  "Action": "Action",
+  "{{ssoProviderType}} configuration": "{{ssoProviderType}} configuration"
 }
diff --git a/apps/client/public/locales/uk-UA/translation.json b/apps/client/public/locales/uk-UA/translation.json
index e3f359a3..76dc76ce 100644
--- a/apps/client/public/locales/uk-UA/translation.json
+++ b/apps/client/public/locales/uk-UA/translation.json
@@ -53,6 +53,7 @@
   "e.g Space for product team": "наприклад, Простір для продуктової команди",
   "e.g Space for sales team to collaborate": "наприклад, Простір для спільної роботи команди продажів",
   "Edit": "Редагувати",
+  "Read": "Read",
   "Edit group": "Редагувати групу",
   "Email": "Електронна пошта",
   "Enter a strong password": "Введіть надійний пароль",
@@ -495,5 +496,36 @@
   "Page restored successfully": "Сторінку успішно відновлено",
   "Deleted by": "Видалено",
   "Deleted at": "Видалено о",
-  "Preview": "Попередній перегляд"
+  "Preview": "Попередній перегляд",
+  "Subpages": "Subpages",
+  "Failed to load subpages": "Failed to load subpages",
+  "No subpages": "No subpages",
+  "Subpages (Child pages)": "Subpages (Child pages)",
+  "List all subpages of the current page": "List all subpages of the current page",
+  "Attachments": "Attachments",
+  "All spaces": "All spaces",
+  "Unknown": "Unknown",
+  "Find a space": "Find a space",
+  "Search in all your spaces": "Search in all your spaces",
+  "Type": "Type",
+  "Enterprise": "Enterprise",
+  "Download attachment": "Download attachment",
+  "Allowed email domains": "Allowed email domains",
+  "Only users with email addresses from these domains can signup via SSO.": "Only users with email addresses from these domains can signup via SSO.",
+  "Enter valid domain names separated by comma or space": "Enter valid domain names separated by comma or space",
+  "Enforce two-factor authentication": "Enforce two-factor authentication",
+  "Once enforced, all members must enable two-factor authentication to access the workspace.": "Once enforced, all members must enable two-factor authentication to access the workspace.",
+  "Toggle MFA enforcement": "Toggle MFA enforcement",
+  "Display name": "Display name",
+  "Allow signup": "Allow signup",
+  "Enabled": "Enabled",
+  "Advanced Settings": "Advanced Settings",
+  "Enable TLS/SSL": "Enable TLS/SSL",
+  "Use secure connection to LDAP server": "Use secure connection to LDAP server",
+  "Group sync": "Group sync",
+  "No SSO providers found.": "No SSO providers found.",
+  "Delete SSO provider": "Delete SSO provider",
+  "Are you sure you want to delete this SSO provider?": "Are you sure you want to delete this SSO provider?",
+  "Action": "Action",
+  "{{ssoProviderType}} configuration": "{{ssoProviderType}} configuration"
 }
diff --git a/apps/client/public/locales/zh-CN/translation.json b/apps/client/public/locales/zh-CN/translation.json
index 56c7ec85..20598eb6 100644
--- a/apps/client/public/locales/zh-CN/translation.json
+++ b/apps/client/public/locales/zh-CN/translation.json
@@ -53,6 +53,7 @@
   "e.g Space for product team": "例如：产品团队的空间",
   "e.g Space for sales team to collaborate": "例如：销售团队协作的空间",
   "Edit": "编辑",
+  "Read": "Read",
   "Edit group": "编辑群组",
   "Email": "电子邮箱",
   "Enter a strong password": "输入一个强密码",
@@ -495,5 +496,36 @@
   "Page restored successfully": "页面恢复成功",
   "Deleted by": "删除人",
   "Deleted at": "删除时间",
-  "Preview": "预览"
+  "Preview": "预览",
+  "Subpages": "Subpages",
+  "Failed to load subpages": "Failed to load subpages",
+  "No subpages": "No subpages",
+  "Subpages (Child pages)": "Subpages (Child pages)",
+  "List all subpages of the current page": "List all subpages of the current page",
+  "Attachments": "Attachments",
+  "All spaces": "All spaces",
+  "Unknown": "Unknown",
+  "Find a space": "Find a space",
+  "Search in all your spaces": "Search in all your spaces",
+  "Type": "Type",
+  "Enterprise": "Enterprise",
+  "Download attachment": "Download attachment",
+  "Allowed email domains": "Allowed email domains",
+  "Only users with email addresses from these domains can signup via SSO.": "Only users with email addresses from these domains can signup via SSO.",
+  "Enter valid domain names separated by comma or space": "Enter valid domain names separated by comma or space",
+  "Enforce two-factor authentication": "Enforce two-factor authentication",
+  "Once enforced, all members must enable two-factor authentication to access the workspace.": "Once enforced, all members must enable two-factor authentication to access the workspace.",
+  "Toggle MFA enforcement": "Toggle MFA enforcement",
+  "Display name": "Display name",
+  "Allow signup": "Allow signup",
+  "Enabled": "Enabled",
+  "Advanced Settings": "Advanced Settings",
+  "Enable TLS/SSL": "Enable TLS/SSL",
+  "Use secure connection to LDAP server": "Use secure connection to LDAP server",
+  "Group sync": "Group sync",
+  "No SSO providers found.": "No SSO providers found.",
+  "Delete SSO provider": "Delete SSO provider",
+  "Are you sure you want to delete this SSO provider?": "Are you sure you want to delete this SSO provider?",
+  "Action": "Action",
+  "{{ssoProviderType}} configuration": "{{ssoProviderType}} configuration"
 }

From 1919eba340df0d7f5e052207a041ec64b1419f1f Mon Sep 17 00:00:00 2001
From: Philip Okugbe <16838612+Philipinho@users.noreply.github.com>
Date: Wed, 3 Sep 2025 21:17:08 +0100
Subject: [PATCH 31/46] New Crowdin updates (#1522)

* New translations translation.json (French)

* New translations translation.json (Spanish)

* New translations translation.json (German)

* New translations translation.json (Italian)

* New translations translation.json (Japanese)

* New translations translation.json (Korean)

* New translations translation.json (Dutch)

* New translations translation.json (Russian)

* New translations translation.json (Ukrainian)

* New translations translation.json (Chinese Simplified)

* New translations translation.json (Portuguese, Brazilian)
---
 .../public/locales/de-DE/translation.json     | 64 +++++++++----------
 .../public/locales/es-ES/translation.json     | 64 +++++++++----------
 .../public/locales/fr-FR/translation.json     | 60 ++++++++---------
 .../public/locales/it-IT/translation.json     | 64 +++++++++----------
 .../public/locales/ja-JP/translation.json     | 64 +++++++++----------
 .../public/locales/ko-KR/translation.json     | 64 +++++++++----------
 .../public/locales/nl-NL/translation.json     | 62 +++++++++---------
 .../public/locales/pt-BR/translation.json     | 64 +++++++++----------
 .../public/locales/ru-RU/translation.json     | 64 +++++++++----------
 .../public/locales/uk-UA/translation.json     | 64 +++++++++----------
 .../public/locales/zh-CN/translation.json     | 64 +++++++++----------
 11 files changed, 349 insertions(+), 349 deletions(-)

diff --git a/apps/client/public/locales/de-DE/translation.json b/apps/client/public/locales/de-DE/translation.json
index 768d54c3..bc1bd1f2 100644
--- a/apps/client/public/locales/de-DE/translation.json
+++ b/apps/client/public/locales/de-DE/translation.json
@@ -53,7 +53,7 @@
   "e.g Space for product team": "z.B. Bereich für das Produktteam",
   "e.g Space for sales team to collaborate": "z.B. Bereich für das Vertriebsteam zur Zusammenarbeit",
   "Edit": "Bearbeiten",
-  "Read": "Read",
+  "Read": "Lesen",
   "Edit group": "Gruppe bearbeiten",
   "Email": "E-Mail",
   "Enter a strong password": "Geben Sie ein starkes Passwort ein",
@@ -497,35 +497,35 @@
   "Deleted by": "Gelöscht von",
   "Deleted at": "Gelöscht am",
   "Preview": "Vorschau",
-  "Subpages": "Subpages",
-  "Failed to load subpages": "Failed to load subpages",
-  "No subpages": "No subpages",
-  "Subpages (Child pages)": "Subpages (Child pages)",
-  "List all subpages of the current page": "List all subpages of the current page",
-  "Attachments": "Attachments",
-  "All spaces": "All spaces",
-  "Unknown": "Unknown",
-  "Find a space": "Find a space",
-  "Search in all your spaces": "Search in all your spaces",
-  "Type": "Type",
-  "Enterprise": "Enterprise",
-  "Download attachment": "Download attachment",
-  "Allowed email domains": "Allowed email domains",
-  "Only users with email addresses from these domains can signup via SSO.": "Only users with email addresses from these domains can signup via SSO.",
-  "Enter valid domain names separated by comma or space": "Enter valid domain names separated by comma or space",
-  "Enforce two-factor authentication": "Enforce two-factor authentication",
-  "Once enforced, all members must enable two-factor authentication to access the workspace.": "Once enforced, all members must enable two-factor authentication to access the workspace.",
-  "Toggle MFA enforcement": "Toggle MFA enforcement",
-  "Display name": "Display name",
-  "Allow signup": "Allow signup",
-  "Enabled": "Enabled",
-  "Advanced Settings": "Advanced Settings",
-  "Enable TLS/SSL": "Enable TLS/SSL",
-  "Use secure connection to LDAP server": "Use secure connection to LDAP server",
-  "Group sync": "Group sync",
-  "No SSO providers found.": "No SSO providers found.",
-  "Delete SSO provider": "Delete SSO provider",
-  "Are you sure you want to delete this SSO provider?": "Are you sure you want to delete this SSO provider?",
-  "Action": "Action",
-  "{{ssoProviderType}} configuration": "{{ssoProviderType}} configuration"
+  "Subpages": "Unterseiten",
+  "Failed to load subpages": "Fehler beim Laden von Unterseiten",
+  "No subpages": "Keine Unterseiten",
+  "Subpages (Child pages)": "Unterseiten (Untergeordnete Seiten)",
+  "List all subpages of the current page": "Alle Unterseiten der aktuellen Seite auflisten",
+  "Attachments": "Anhänge",
+  "All spaces": "Alle Bereiche",
+  "Unknown": "Unbekannt",
+  "Find a space": "Einen Bereich finden",
+  "Search in all your spaces": "In all deinen Bereichen suchen",
+  "Type": "Art",
+  "Enterprise": "Unternehmen",
+  "Download attachment": "Anhang herunterladen",
+  "Allowed email domains": "Erlaubte E-Mail-Domains",
+  "Only users with email addresses from these domains can signup via SSO.": "Nur Benutzer mit E-Mail-Adressen aus diesen Domains können sich über SSO registrieren.",
+  "Enter valid domain names separated by comma or space": "Geben Sie gültige Domainnamen ein, durch Kommas oder Leerzeichen getrennt",
+  "Enforce two-factor authentication": "Erzwingen der Zwei-Faktor-Authentifizierung",
+  "Once enforced, all members must enable two-factor authentication to access the workspace.": "Sobald es erzwungen wird, müssen alle Mitglieder die Zwei-Faktor-Authentifizierung aktivieren, um auf den Arbeitsbereich zugreifen zu können.",
+  "Toggle MFA enforcement": "Umschalten der MFA-Erzwingung",
+  "Display name": "Anzeigename",
+  "Allow signup": "Registrierung erlauben",
+  "Enabled": "Aktiviert",
+  "Advanced Settings": "Erweiterte Einstellungen",
+  "Enable TLS/SSL": "TLS/SSL aktivieren",
+  "Use secure connection to LDAP server": "Sichere Verbindung zum LDAP-Server verwenden",
+  "Group sync": "Gruppensynchronisation",
+  "No SSO providers found.": "Keine SSO-Anbieter gefunden.",
+  "Delete SSO provider": "SSO-Anbieter löschen",
+  "Are you sure you want to delete this SSO provider?": "Sind Sie sicher, dass Sie diesen SSO-Anbieter löschen möchten?",
+  "Action": "Aktion",
+  "{{ssoProviderType}} configuration": "{{ssoProviderType}}-Konfiguration"
 }
diff --git a/apps/client/public/locales/es-ES/translation.json b/apps/client/public/locales/es-ES/translation.json
index 7ad0195a..3450f27d 100644
--- a/apps/client/public/locales/es-ES/translation.json
+++ b/apps/client/public/locales/es-ES/translation.json
@@ -53,7 +53,7 @@
   "e.g Space for product team": "ej: Espacio para el equipo de producto",
   "e.g Space for sales team to collaborate": "ej: Espacio para que el equipo de ventas colabore",
   "Edit": "Editar",
-  "Read": "Read",
+  "Read": "Leer",
   "Edit group": "Editar grupo",
   "Email": "Correo electrónico",
   "Enter a strong password": "Introduce una contraseña fuerte",
@@ -497,35 +497,35 @@
   "Deleted by": "Eliminado por",
   "Deleted at": "Eliminado en",
   "Preview": "Vista previa",
-  "Subpages": "Subpages",
-  "Failed to load subpages": "Failed to load subpages",
-  "No subpages": "No subpages",
-  "Subpages (Child pages)": "Subpages (Child pages)",
-  "List all subpages of the current page": "List all subpages of the current page",
-  "Attachments": "Attachments",
-  "All spaces": "All spaces",
-  "Unknown": "Unknown",
-  "Find a space": "Find a space",
-  "Search in all your spaces": "Search in all your spaces",
-  "Type": "Type",
-  "Enterprise": "Enterprise",
-  "Download attachment": "Download attachment",
-  "Allowed email domains": "Allowed email domains",
-  "Only users with email addresses from these domains can signup via SSO.": "Only users with email addresses from these domains can signup via SSO.",
-  "Enter valid domain names separated by comma or space": "Enter valid domain names separated by comma or space",
-  "Enforce two-factor authentication": "Enforce two-factor authentication",
-  "Once enforced, all members must enable two-factor authentication to access the workspace.": "Once enforced, all members must enable two-factor authentication to access the workspace.",
-  "Toggle MFA enforcement": "Toggle MFA enforcement",
-  "Display name": "Display name",
-  "Allow signup": "Allow signup",
-  "Enabled": "Enabled",
-  "Advanced Settings": "Advanced Settings",
-  "Enable TLS/SSL": "Enable TLS/SSL",
-  "Use secure connection to LDAP server": "Use secure connection to LDAP server",
-  "Group sync": "Group sync",
-  "No SSO providers found.": "No SSO providers found.",
-  "Delete SSO provider": "Delete SSO provider",
-  "Are you sure you want to delete this SSO provider?": "Are you sure you want to delete this SSO provider?",
-  "Action": "Action",
-  "{{ssoProviderType}} configuration": "{{ssoProviderType}} configuration"
+  "Subpages": "Subpáginas",
+  "Failed to load subpages": "Error al cargar subpáginas",
+  "No subpages": "Sin subpáginas",
+  "Subpages (Child pages)": "Subpáginas (Páginas hijas)",
+  "List all subpages of the current page": "Listar todas las subpáginas de la página actual",
+  "Attachments": "Adjuntos",
+  "All spaces": "Todos los espacios",
+  "Unknown": "Desconocido",
+  "Find a space": "Encontrar un espacio",
+  "Search in all your spaces": "Buscar en todos tus espacios",
+  "Type": "Tipo",
+  "Enterprise": "Empresa",
+  "Download attachment": "Descargar adjunto",
+  "Allowed email domains": "Dominios de correo electrónico permitidos",
+  "Only users with email addresses from these domains can signup via SSO.": "Solo los usuarios con direcciones de correo electrónico de estos dominios pueden registrarse a través de SSO.",
+  "Enter valid domain names separated by comma or space": "Introduce nombres de dominio válidos separados por coma o espacio",
+  "Enforce two-factor authentication": "Aplicar autenticación de dos factores",
+  "Once enforced, all members must enable two-factor authentication to access the workspace.": "Una vez aplicada, todos los miembros deben habilitar la autenticación de dos factores para acceder al espacio de trabajo.",
+  "Toggle MFA enforcement": "Alternar la aplicación de MFA",
+  "Display name": "Nombre para mostrar",
+  "Allow signup": "Permitir registro",
+  "Enabled": "Habilitado",
+  "Advanced Settings": "Configuración avanzada",
+  "Enable TLS/SSL": "Habilitar TLS/SSL",
+  "Use secure connection to LDAP server": "Usar conexión segura al servidor LDAP",
+  "Group sync": "Sincronización de grupos",
+  "No SSO providers found.": "No se encontraron proveedores de SSO.",
+  "Delete SSO provider": "Eliminar proveedor de SSO",
+  "Are you sure you want to delete this SSO provider?": "¿Está seguro de que desea eliminar este proveedor de SSO?",
+  "Action": "Acción",
+  "{{ssoProviderType}} configuration": "Configuración de {{ssoProviderType}}"
 }
diff --git a/apps/client/public/locales/fr-FR/translation.json b/apps/client/public/locales/fr-FR/translation.json
index 0a65ed5b..0dbd62ac 100644
--- a/apps/client/public/locales/fr-FR/translation.json
+++ b/apps/client/public/locales/fr-FR/translation.json
@@ -53,7 +53,7 @@
   "e.g Space for product team": "par ex. Espace pour l'équipe produit",
   "e.g Space for sales team to collaborate": "par ex. Espace pour l'équipe de vente pour collaborer",
   "Edit": "Modifier",
-  "Read": "Read",
+  "Read": "Lire",
   "Edit group": "Modifier groupe",
   "Email": "Email",
   "Enter a strong password": "Entrez un mot de passe fort",
@@ -497,35 +497,35 @@
   "Deleted by": "Supprimé par",
   "Deleted at": "Supprimé à",
   "Preview": "Aperçu",
-  "Subpages": "Subpages",
-  "Failed to load subpages": "Failed to load subpages",
-  "No subpages": "No subpages",
-  "Subpages (Child pages)": "Subpages (Child pages)",
-  "List all subpages of the current page": "List all subpages of the current page",
-  "Attachments": "Attachments",
-  "All spaces": "All spaces",
-  "Unknown": "Unknown",
-  "Find a space": "Find a space",
-  "Search in all your spaces": "Search in all your spaces",
+  "Subpages": "Sous-pages",
+  "Failed to load subpages": "Échec du chargement des sous-pages",
+  "No subpages": "Pas de sous-pages",
+  "Subpages (Child pages)": "Sous-pages (Pages enfants)",
+  "List all subpages of the current page": "Lister toutes les sous-pages de la page actuelle",
+  "Attachments": "Pièces jointes",
+  "All spaces": "Tous les espaces",
+  "Unknown": "Inconnu",
+  "Find a space": "Trouver un espace",
+  "Search in all your spaces": "Rechercher dans tous vos espaces",
   "Type": "Type",
-  "Enterprise": "Enterprise",
-  "Download attachment": "Download attachment",
-  "Allowed email domains": "Allowed email domains",
-  "Only users with email addresses from these domains can signup via SSO.": "Only users with email addresses from these domains can signup via SSO.",
-  "Enter valid domain names separated by comma or space": "Enter valid domain names separated by comma or space",
-  "Enforce two-factor authentication": "Enforce two-factor authentication",
-  "Once enforced, all members must enable two-factor authentication to access the workspace.": "Once enforced, all members must enable two-factor authentication to access the workspace.",
-  "Toggle MFA enforcement": "Toggle MFA enforcement",
-  "Display name": "Display name",
-  "Allow signup": "Allow signup",
-  "Enabled": "Enabled",
-  "Advanced Settings": "Advanced Settings",
-  "Enable TLS/SSL": "Enable TLS/SSL",
-  "Use secure connection to LDAP server": "Use secure connection to LDAP server",
-  "Group sync": "Group sync",
-  "No SSO providers found.": "No SSO providers found.",
-  "Delete SSO provider": "Delete SSO provider",
-  "Are you sure you want to delete this SSO provider?": "Are you sure you want to delete this SSO provider?",
+  "Enterprise": "Entreprise",
+  "Download attachment": "Télécharger la pièce jointe",
+  "Allowed email domains": "Domaines de messagerie autorisés",
+  "Only users with email addresses from these domains can signup via SSO.": "Seuls les utilisateurs possédant des adresses e-mail provenant de ces domaines peuvent s'inscrire via SSO.",
+  "Enter valid domain names separated by comma or space": "Entrez des noms de domaine valides séparés par une virgule ou un espace",
+  "Enforce two-factor authentication": "Imposer l'authentification à deux facteurs",
+  "Once enforced, all members must enable two-factor authentication to access the workspace.": "Une fois appliquée, tous les membres doivent activer l'authentification à deux facteurs pour accéder à l'espace de travail.",
+  "Toggle MFA enforcement": "Basculer l'application de l'AMF",
+  "Display name": "Nom d'affichage",
+  "Allow signup": "Autoriser l'inscription",
+  "Enabled": "Activé",
+  "Advanced Settings": "Paramètres avancés",
+  "Enable TLS/SSL": "Activer TLS/SSL",
+  "Use secure connection to LDAP server": "Utiliser une connexion sécurisée au serveur LDAP",
+  "Group sync": "Synchronisation de groupe",
+  "No SSO providers found.": "Aucun fournisseur SSO trouvé.",
+  "Delete SSO provider": "Supprimer le fournisseur SSO",
+  "Are you sure you want to delete this SSO provider?": "Êtes-vous sûr de vouloir supprimer ce fournisseur SSO ?",
   "Action": "Action",
-  "{{ssoProviderType}} configuration": "{{ssoProviderType}} configuration"
+  "{{ssoProviderType}} configuration": "Configuration {{ssoProviderType}}"
 }
diff --git a/apps/client/public/locales/it-IT/translation.json b/apps/client/public/locales/it-IT/translation.json
index f1cd92a9..8ed1f2c8 100644
--- a/apps/client/public/locales/it-IT/translation.json
+++ b/apps/client/public/locales/it-IT/translation.json
@@ -53,7 +53,7 @@
   "e.g Space for product team": "es. Spazio per il team di prodotto",
   "e.g Space for sales team to collaborate": "es. Spazio per la collaborazione del team di vendita",
   "Edit": "Modifica",
-  "Read": "Read",
+  "Read": "Leggi",
   "Edit group": "Modifica gruppo",
   "Email": "Email",
   "Enter a strong password": "Inserisci una password sicura",
@@ -497,35 +497,35 @@
   "Deleted by": "Eliminato da",
   "Deleted at": "Eliminato il",
   "Preview": "Anteprima",
-  "Subpages": "Subpages",
-  "Failed to load subpages": "Failed to load subpages",
-  "No subpages": "No subpages",
-  "Subpages (Child pages)": "Subpages (Child pages)",
-  "List all subpages of the current page": "List all subpages of the current page",
-  "Attachments": "Attachments",
-  "All spaces": "All spaces",
-  "Unknown": "Unknown",
-  "Find a space": "Find a space",
-  "Search in all your spaces": "Search in all your spaces",
-  "Type": "Type",
-  "Enterprise": "Enterprise",
-  "Download attachment": "Download attachment",
-  "Allowed email domains": "Allowed email domains",
-  "Only users with email addresses from these domains can signup via SSO.": "Only users with email addresses from these domains can signup via SSO.",
-  "Enter valid domain names separated by comma or space": "Enter valid domain names separated by comma or space",
-  "Enforce two-factor authentication": "Enforce two-factor authentication",
-  "Once enforced, all members must enable two-factor authentication to access the workspace.": "Once enforced, all members must enable two-factor authentication to access the workspace.",
-  "Toggle MFA enforcement": "Toggle MFA enforcement",
-  "Display name": "Display name",
-  "Allow signup": "Allow signup",
-  "Enabled": "Enabled",
-  "Advanced Settings": "Advanced Settings",
-  "Enable TLS/SSL": "Enable TLS/SSL",
-  "Use secure connection to LDAP server": "Use secure connection to LDAP server",
-  "Group sync": "Group sync",
-  "No SSO providers found.": "No SSO providers found.",
-  "Delete SSO provider": "Delete SSO provider",
-  "Are you sure you want to delete this SSO provider?": "Are you sure you want to delete this SSO provider?",
-  "Action": "Action",
-  "{{ssoProviderType}} configuration": "{{ssoProviderType}} configuration"
+  "Subpages": "Sottopagine",
+  "Failed to load subpages": "Caricamento delle sottopagine non riuscito",
+  "No subpages": "Nessuna sottopagina",
+  "Subpages (Child pages)": "Sottopagine (Pagine figlie)",
+  "List all subpages of the current page": "Elenca tutte le sottopagine della pagina corrente",
+  "Attachments": "Allegati",
+  "All spaces": "Tutti gli spazi",
+  "Unknown": "Sconosciuto",
+  "Find a space": "Trova uno spazio",
+  "Search in all your spaces": "Cerca in tutti i tuoi spazi",
+  "Type": "Tipo",
+  "Enterprise": "Impresa",
+  "Download attachment": "Scarica allegato",
+  "Allowed email domains": "Domini email consentiti",
+  "Only users with email addresses from these domains can signup via SSO.": "Solo gli utenti con indirizzi email provenienti da questi domini possono registrarsi tramite SSO.",
+  "Enter valid domain names separated by comma or space": "Inserisci nomi di dominio validi separati da virgole o spazi",
+  "Enforce two-factor authentication": "Imponi l'autenticazione a due fattori",
+  "Once enforced, all members must enable two-factor authentication to access the workspace.": "Una volta impostata, tutti i membri devono abilitare l'autenticazione a due fattori per accedere all'area di lavoro.",
+  "Toggle MFA enforcement": "Attiva disattiva l'applicazione MFA",
+  "Display name": "Nome visualizzato",
+  "Allow signup": "Consenti iscrizione",
+  "Enabled": "Abilitato",
+  "Advanced Settings": "Impostazioni avanzate",
+  "Enable TLS/SSL": "Abilita TLS/SSL",
+  "Use secure connection to LDAP server": "Usa connessione sicura al server LDAP",
+  "Group sync": "Sincronizzazione gruppi",
+  "No SSO providers found.": "Nessun provider SSO trovato.",
+  "Delete SSO provider": "Elimina provider SSO",
+  "Are you sure you want to delete this SSO provider?": "Sei sicuro di voler eliminare questo provider SSO?",
+  "Action": "Azione",
+  "{{ssoProviderType}} configuration": "Configurazione {{ssoProviderType}}"
 }
diff --git a/apps/client/public/locales/ja-JP/translation.json b/apps/client/public/locales/ja-JP/translation.json
index 8948d00f..4e1811f3 100644
--- a/apps/client/public/locales/ja-JP/translation.json
+++ b/apps/client/public/locales/ja-JP/translation.json
@@ -53,7 +53,7 @@
   "e.g Space for product team": "例: 製品チームのスペース",
   "e.g Space for sales team to collaborate": "例: 営業チーム連携用スペース",
   "Edit": "編集",
-  "Read": "Read",
+  "Read": "読む",
   "Edit group": "グループを編集",
   "Email": "メールアドレス",
   "Enter a strong password": "強力なパスワードを入力してください",
@@ -497,35 +497,35 @@
   "Deleted by": "削除者",
   "Deleted at": "削除日時",
   "Preview": "プレビュー",
-  "Subpages": "Subpages",
-  "Failed to load subpages": "Failed to load subpages",
-  "No subpages": "No subpages",
-  "Subpages (Child pages)": "Subpages (Child pages)",
-  "List all subpages of the current page": "List all subpages of the current page",
-  "Attachments": "Attachments",
-  "All spaces": "All spaces",
-  "Unknown": "Unknown",
-  "Find a space": "Find a space",
-  "Search in all your spaces": "Search in all your spaces",
-  "Type": "Type",
-  "Enterprise": "Enterprise",
-  "Download attachment": "Download attachment",
-  "Allowed email domains": "Allowed email domains",
-  "Only users with email addresses from these domains can signup via SSO.": "Only users with email addresses from these domains can signup via SSO.",
-  "Enter valid domain names separated by comma or space": "Enter valid domain names separated by comma or space",
-  "Enforce two-factor authentication": "Enforce two-factor authentication",
-  "Once enforced, all members must enable two-factor authentication to access the workspace.": "Once enforced, all members must enable two-factor authentication to access the workspace.",
-  "Toggle MFA enforcement": "Toggle MFA enforcement",
-  "Display name": "Display name",
-  "Allow signup": "Allow signup",
-  "Enabled": "Enabled",
-  "Advanced Settings": "Advanced Settings",
-  "Enable TLS/SSL": "Enable TLS/SSL",
-  "Use secure connection to LDAP server": "Use secure connection to LDAP server",
-  "Group sync": "Group sync",
-  "No SSO providers found.": "No SSO providers found.",
-  "Delete SSO provider": "Delete SSO provider",
-  "Are you sure you want to delete this SSO provider?": "Are you sure you want to delete this SSO provider?",
-  "Action": "Action",
-  "{{ssoProviderType}} configuration": "{{ssoProviderType}} configuration"
+  "Subpages": "サブページ",
+  "Failed to load subpages": "サブページの読み込みに失敗しました",
+  "No subpages": "サブページがありません",
+  "Subpages (Child pages)": "サブページ（子ページ）",
+  "List all subpages of the current page": "現在のページのすべてのサブページをリスト",
+  "Attachments": "添付ファイル",
+  "All spaces": "すべてのスペース",
+  "Unknown": "不明",
+  "Find a space": "スペースを探す",
+  "Search in all your spaces": "あなたのすべてのスペースで検索",
+  "Type": "タイプ",
+  "Enterprise": "エンタープライズ",
+  "Download attachment": "添付ファイルをダウンロード",
+  "Allowed email domains": "許可されたメールドメイン",
+  "Only users with email addresses from these domains can signup via SSO.": "これらのドメインからのメールアドレスを持つユーザーのみがSSOで登録できます。",
+  "Enter valid domain names separated by comma or space": "コンマまたはスペースで区切って有効なドメイン名を入力してください",
+  "Enforce two-factor authentication": "二要素認証を強制する",
+  "Once enforced, all members must enable two-factor authentication to access the workspace.": "一度強制されると、すべてのメンバーはワークスペースにアクセスするために二要素認証を有効にする必要があります。",
+  "Toggle MFA enforcement": "MFAの強制を切り替える",
+  "Display name": "表示名",
+  "Allow signup": "登録を許可する",
+  "Enabled": "有効",
+  "Advanced Settings": "詳細設定",
+  "Enable TLS/SSL": "TLS/SSLを有効にする",
+  "Use secure connection to LDAP server": "LDAPサーバーへの安全な接続を使用する",
+  "Group sync": "グループ同期",
+  "No SSO providers found.": "SSOプロバイダーが見つかりませんでした。",
+  "Delete SSO provider": "SSOプロバイダーを削除する",
+  "Are you sure you want to delete this SSO provider?": "このSSOプロバイダーを削除してもよろしいですか？",
+  "Action": "アクション",
+  "{{ssoProviderType}} configuration": "{{ssoProviderType}}の構成"
 }
diff --git a/apps/client/public/locales/ko-KR/translation.json b/apps/client/public/locales/ko-KR/translation.json
index 0e50cc5f..c6e3dc88 100644
--- a/apps/client/public/locales/ko-KR/translation.json
+++ b/apps/client/public/locales/ko-KR/translation.json
@@ -53,7 +53,7 @@
   "e.g Space for product team": "예: 제품 팀을 위한 Space",
   "e.g Space for sales team to collaborate": "예: 영업 팀의 Space",
   "Edit": "편집",
-  "Read": "Read",
+  "Read": "읽기",
   "Edit group": "팀 편집",
   "Email": "이메일",
   "Enter a strong password": "강력한 비밀번호를 입력하세요",
@@ -497,35 +497,35 @@
   "Deleted by": "삭제자",
   "Deleted at": "삭제 시간",
   "Preview": "미리보기",
-  "Subpages": "Subpages",
-  "Failed to load subpages": "Failed to load subpages",
-  "No subpages": "No subpages",
-  "Subpages (Child pages)": "Subpages (Child pages)",
-  "List all subpages of the current page": "List all subpages of the current page",
-  "Attachments": "Attachments",
-  "All spaces": "All spaces",
-  "Unknown": "Unknown",
-  "Find a space": "Find a space",
-  "Search in all your spaces": "Search in all your spaces",
-  "Type": "Type",
-  "Enterprise": "Enterprise",
-  "Download attachment": "Download attachment",
-  "Allowed email domains": "Allowed email domains",
-  "Only users with email addresses from these domains can signup via SSO.": "Only users with email addresses from these domains can signup via SSO.",
-  "Enter valid domain names separated by comma or space": "Enter valid domain names separated by comma or space",
-  "Enforce two-factor authentication": "Enforce two-factor authentication",
-  "Once enforced, all members must enable two-factor authentication to access the workspace.": "Once enforced, all members must enable two-factor authentication to access the workspace.",
-  "Toggle MFA enforcement": "Toggle MFA enforcement",
-  "Display name": "Display name",
-  "Allow signup": "Allow signup",
-  "Enabled": "Enabled",
-  "Advanced Settings": "Advanced Settings",
-  "Enable TLS/SSL": "Enable TLS/SSL",
-  "Use secure connection to LDAP server": "Use secure connection to LDAP server",
-  "Group sync": "Group sync",
-  "No SSO providers found.": "No SSO providers found.",
-  "Delete SSO provider": "Delete SSO provider",
-  "Are you sure you want to delete this SSO provider?": "Are you sure you want to delete this SSO provider?",
-  "Action": "Action",
-  "{{ssoProviderType}} configuration": "{{ssoProviderType}} configuration"
+  "Subpages": "하위 페이지",
+  "Failed to load subpages": "하위 페이지 로드 실패",
+  "No subpages": "하위 페이지 없음",
+  "Subpages (Child pages)": "하위 페이지 (자식 페이지)",
+  "List all subpages of the current page": "현재 페이지의 모든 하위 페이지 목록",
+  "Attachments": "첨부 파일",
+  "All spaces": "전체 공간",
+  "Unknown": "알 수 없음",
+  "Find a space": "공간 찾기",
+  "Search in all your spaces": "모든 공간에서 검색",
+  "Type": "유형",
+  "Enterprise": "기업",
+  "Download attachment": "첨부 파일 다운로드",
+  "Allowed email domains": "허용된 이메일 도메인",
+  "Only users with email addresses from these domains can signup via SSO.": "이 도메인의 이메일 주소를 가진 사용자만 SSO를 통해 가입할 수 있습니다.",
+  "Enter valid domain names separated by comma or space": "콤마 또는 공백으로 구분하여 유효한 도메인 이름 입력",
+  "Enforce two-factor authentication": "이중 인증 시행",
+  "Once enforced, all members must enable two-factor authentication to access the workspace.": "시행되면 모든 멤버가 작업 공간에 액세스하기 위해 이중 인증을 활성화해야 합니다.",
+  "Toggle MFA enforcement": "MFA 시행 전환",
+  "Display name": "표시 이름",
+  "Allow signup": "가입 허용",
+  "Enabled": "활성화됨",
+  "Advanced Settings": "고급 설정",
+  "Enable TLS/SSL": "TLS\\/SSL 활성화",
+  "Use secure connection to LDAP server": "LDAP 서버에 안전한 연결 사용",
+  "Group sync": "그룹 동기화",
+  "No SSO providers found.": "SSO 제공자를 찾을 수 없습니다.",
+  "Delete SSO provider": "SSO 제공자 삭제",
+  "Are you sure you want to delete this SSO provider?": "이 SSO 제공자를 삭제하시겠습니까?",
+  "Action": "작업",
+  "{{ssoProviderType}} configuration": "{{ssoProviderType}} 구성"
 }
diff --git a/apps/client/public/locales/nl-NL/translation.json b/apps/client/public/locales/nl-NL/translation.json
index f2fabf36..7429bfe1 100644
--- a/apps/client/public/locales/nl-NL/translation.json
+++ b/apps/client/public/locales/nl-NL/translation.json
@@ -53,7 +53,7 @@
   "e.g Space for product team": "bijv. Ruimte voor productteam",
   "e.g Space for sales team to collaborate": "bijv. Ruimte voor verkoopteam om samen te werken",
   "Edit": "Bewerken",
-  "Read": "Read",
+  "Read": "Lezen",
   "Edit group": "Groep bewerken",
   "Email": "E-mailadres",
   "Enter a strong password": "Voer een sterk wachtwoord in",
@@ -497,35 +497,35 @@
   "Deleted by": "Verwijderd door",
   "Deleted at": "Verwijderd op",
   "Preview": "Voorbeeld",
-  "Subpages": "Subpages",
-  "Failed to load subpages": "Failed to load subpages",
-  "No subpages": "No subpages",
-  "Subpages (Child pages)": "Subpages (Child pages)",
-  "List all subpages of the current page": "List all subpages of the current page",
-  "Attachments": "Attachments",
-  "All spaces": "All spaces",
-  "Unknown": "Unknown",
-  "Find a space": "Find a space",
-  "Search in all your spaces": "Search in all your spaces",
+  "Subpages": "Subpagina's",
+  "Failed to load subpages": "Laden van subpagina's mislukt",
+  "No subpages": "Geen subpagina's",
+  "Subpages (Child pages)": "Subpagina's (Kindpagina's)",
+  "List all subpages of the current page": "Lijst van alle subpagina's van de huidige pagina",
+  "Attachments": "Bijlagen",
+  "All spaces": "Alle ruimtes",
+  "Unknown": "Onbekend",
+  "Find a space": "Vind een ruimte",
+  "Search in all your spaces": "Zoek in al je ruimtes",
   "Type": "Type",
-  "Enterprise": "Enterprise",
-  "Download attachment": "Download attachment",
-  "Allowed email domains": "Allowed email domains",
-  "Only users with email addresses from these domains can signup via SSO.": "Only users with email addresses from these domains can signup via SSO.",
-  "Enter valid domain names separated by comma or space": "Enter valid domain names separated by comma or space",
-  "Enforce two-factor authentication": "Enforce two-factor authentication",
-  "Once enforced, all members must enable two-factor authentication to access the workspace.": "Once enforced, all members must enable two-factor authentication to access the workspace.",
-  "Toggle MFA enforcement": "Toggle MFA enforcement",
-  "Display name": "Display name",
-  "Allow signup": "Allow signup",
-  "Enabled": "Enabled",
-  "Advanced Settings": "Advanced Settings",
-  "Enable TLS/SSL": "Enable TLS/SSL",
-  "Use secure connection to LDAP server": "Use secure connection to LDAP server",
-  "Group sync": "Group sync",
-  "No SSO providers found.": "No SSO providers found.",
-  "Delete SSO provider": "Delete SSO provider",
-  "Are you sure you want to delete this SSO provider?": "Are you sure you want to delete this SSO provider?",
-  "Action": "Action",
-  "{{ssoProviderType}} configuration": "{{ssoProviderType}} configuration"
+  "Enterprise": "Onderneming",
+  "Download attachment": "Bijlage downloaden",
+  "Allowed email domains": "Toegestane e-maildomeinen",
+  "Only users with email addresses from these domains can signup via SSO.": "Alleen gebruikers met e-mailadressen van deze domeinen kunnen zich aanmelden via SSO.",
+  "Enter valid domain names separated by comma or space": "Voer geldige domeinnamen in, gescheiden door komma of spatie",
+  "Enforce two-factor authentication": "Handhaaf tweefactorauthenticatie",
+  "Once enforced, all members must enable two-factor authentication to access the workspace.": "Na handhaving moeten alle leden tweefactorauthenticatie inschakelen om toegang te krijgen tot de werkomgeving.",
+  "Toggle MFA enforcement": "Schakel MFA-handhaving in of uit",
+  "Display name": "Weergavenaam",
+  "Allow signup": "Aanmelden toestaan",
+  "Enabled": "Ingeschakeld",
+  "Advanced Settings": "Geavanceerde instellingen",
+  "Enable TLS/SSL": "TLS/SSL inschakelen",
+  "Use secure connection to LDAP server": "Gebruik een beveiligde verbinding met de LDAP-server",
+  "Group sync": "Groepssynchronisatie",
+  "No SSO providers found.": "Geen SSO-providers gevonden.",
+  "Delete SSO provider": "Verwijder SSO-provider",
+  "Are you sure you want to delete this SSO provider?": "Weet u zeker dat u deze SSO-provider wilt verwijderen?",
+  "Action": "Actie",
+  "{{ssoProviderType}} configuration": "{{ssoProviderType}} configuratie"
 }
diff --git a/apps/client/public/locales/pt-BR/translation.json b/apps/client/public/locales/pt-BR/translation.json
index ca68792e..c4564830 100644
--- a/apps/client/public/locales/pt-BR/translation.json
+++ b/apps/client/public/locales/pt-BR/translation.json
@@ -53,7 +53,7 @@
   "e.g Space for product team": "ex.: Espaço para a equipe de produto",
   "e.g Space for sales team to collaborate": "ex.: Espaço para a equipe de vendas colaborar",
   "Edit": "Editar",
-  "Read": "Read",
+  "Read": "Ler",
   "Edit group": "Editar grupo",
   "Email": "Email",
   "Enter a strong password": "Insira uma senha forte",
@@ -497,35 +497,35 @@
   "Deleted by": "Excluído por",
   "Deleted at": "Excluído em",
   "Preview": "Visualização",
-  "Subpages": "Subpages",
-  "Failed to load subpages": "Failed to load subpages",
-  "No subpages": "No subpages",
-  "Subpages (Child pages)": "Subpages (Child pages)",
-  "List all subpages of the current page": "List all subpages of the current page",
-  "Attachments": "Attachments",
-  "All spaces": "All spaces",
-  "Unknown": "Unknown",
-  "Find a space": "Find a space",
-  "Search in all your spaces": "Search in all your spaces",
-  "Type": "Type",
-  "Enterprise": "Enterprise",
-  "Download attachment": "Download attachment",
-  "Allowed email domains": "Allowed email domains",
-  "Only users with email addresses from these domains can signup via SSO.": "Only users with email addresses from these domains can signup via SSO.",
-  "Enter valid domain names separated by comma or space": "Enter valid domain names separated by comma or space",
-  "Enforce two-factor authentication": "Enforce two-factor authentication",
-  "Once enforced, all members must enable two-factor authentication to access the workspace.": "Once enforced, all members must enable two-factor authentication to access the workspace.",
-  "Toggle MFA enforcement": "Toggle MFA enforcement",
-  "Display name": "Display name",
-  "Allow signup": "Allow signup",
-  "Enabled": "Enabled",
-  "Advanced Settings": "Advanced Settings",
-  "Enable TLS/SSL": "Enable TLS/SSL",
-  "Use secure connection to LDAP server": "Use secure connection to LDAP server",
-  "Group sync": "Group sync",
-  "No SSO providers found.": "No SSO providers found.",
-  "Delete SSO provider": "Delete SSO provider",
-  "Are you sure you want to delete this SSO provider?": "Are you sure you want to delete this SSO provider?",
-  "Action": "Action",
-  "{{ssoProviderType}} configuration": "{{ssoProviderType}} configuration"
+  "Subpages": "Subpáginas",
+  "Failed to load subpages": "Falha ao carregar subpáginas",
+  "No subpages": "Sem subpáginas",
+  "Subpages (Child pages)": "Subpáginas (Páginas filhas)",
+  "List all subpages of the current page": "Listar todas as subpáginas da página atual",
+  "Attachments": "Anexos",
+  "All spaces": "Todos os espaços",
+  "Unknown": "Desconhecido",
+  "Find a space": "Encontrar um espaço",
+  "Search in all your spaces": "Pesquisar em todos os seus espaços",
+  "Type": "Tipo",
+  "Enterprise": "Empresa",
+  "Download attachment": "Baixar anexo",
+  "Allowed email domains": "Domínios de email permitidos",
+  "Only users with email addresses from these domains can signup via SSO.": "Apenas usuários com endereços de email desses domínios podem se inscrever via SSO.",
+  "Enter valid domain names separated by comma or space": "Insira nomes de domínio válidos separados por vírgula ou espaço",
+  "Enforce two-factor authentication": "Impor autenticação de dois fatores",
+  "Once enforced, all members must enable two-factor authentication to access the workspace.": "Uma vez imposto, todos os membros devem habilitar a autenticação de dois fatores para acessar o espaço de trabalho.",
+  "Toggle MFA enforcement": "Alternar imposição de MFA",
+  "Display name": "Nome de exibição",
+  "Allow signup": "Permitir inscrição",
+  "Enabled": "Habilitado",
+  "Advanced Settings": "Configurações Avançadas",
+  "Enable TLS/SSL": "Habilitar TLS/SSL",
+  "Use secure connection to LDAP server": "Usar conexão segura com o servidor LDAP",
+  "Group sync": "Sincronização de grupo",
+  "No SSO providers found.": "Nenhum provedor de SSO encontrado.",
+  "Delete SSO provider": "Excluir provedor de SSO",
+  "Are you sure you want to delete this SSO provider?": "Tem certeza de que deseja excluir este provedor de SSO?",
+  "Action": "Ação",
+  "{{ssoProviderType}} configuration": "Configuração de {{ssoProviderType}}"
 }
diff --git a/apps/client/public/locales/ru-RU/translation.json b/apps/client/public/locales/ru-RU/translation.json
index ebe0ca36..fab5389e 100644
--- a/apps/client/public/locales/ru-RU/translation.json
+++ b/apps/client/public/locales/ru-RU/translation.json
@@ -53,7 +53,7 @@
   "e.g Space for product team": "например, Пространство для продуктовой команды",
   "e.g Space for sales team to collaborate": "например, Пространство для совместной работы команды продаж",
   "Edit": "Редактировать",
-  "Read": "Read",
+  "Read": "Читать",
   "Edit group": "Редактировать группу",
   "Email": "Электронная почта",
   "Enter a strong password": "Введите надёжный пароль",
@@ -497,35 +497,35 @@
   "Deleted by": "Удалено пользователем",
   "Deleted at": "Удалено в",
   "Preview": "Предпросмотр",
-  "Subpages": "Subpages",
-  "Failed to load subpages": "Failed to load subpages",
-  "No subpages": "No subpages",
-  "Subpages (Child pages)": "Subpages (Child pages)",
-  "List all subpages of the current page": "List all subpages of the current page",
-  "Attachments": "Attachments",
-  "All spaces": "All spaces",
-  "Unknown": "Unknown",
-  "Find a space": "Find a space",
-  "Search in all your spaces": "Search in all your spaces",
-  "Type": "Type",
-  "Enterprise": "Enterprise",
-  "Download attachment": "Download attachment",
-  "Allowed email domains": "Allowed email domains",
-  "Only users with email addresses from these domains can signup via SSO.": "Only users with email addresses from these domains can signup via SSO.",
-  "Enter valid domain names separated by comma or space": "Enter valid domain names separated by comma or space",
-  "Enforce two-factor authentication": "Enforce two-factor authentication",
-  "Once enforced, all members must enable two-factor authentication to access the workspace.": "Once enforced, all members must enable two-factor authentication to access the workspace.",
-  "Toggle MFA enforcement": "Toggle MFA enforcement",
-  "Display name": "Display name",
-  "Allow signup": "Allow signup",
-  "Enabled": "Enabled",
-  "Advanced Settings": "Advanced Settings",
-  "Enable TLS/SSL": "Enable TLS/SSL",
-  "Use secure connection to LDAP server": "Use secure connection to LDAP server",
-  "Group sync": "Group sync",
-  "No SSO providers found.": "No SSO providers found.",
-  "Delete SSO provider": "Delete SSO provider",
-  "Are you sure you want to delete this SSO provider?": "Are you sure you want to delete this SSO provider?",
-  "Action": "Action",
-  "{{ssoProviderType}} configuration": "{{ssoProviderType}} configuration"
+  "Subpages": "Подстраницы",
+  "Failed to load subpages": "Не удалось загрузить подстраницы",
+  "No subpages": "Нет подстраниц",
+  "Subpages (Child pages)": "Подстраницы (вложенные страницы)",
+  "List all subpages of the current page": "Показать все подстраницы текущей страницы",
+  "Attachments": "Вложения",
+  "All spaces": "Все пространства",
+  "Unknown": "Неизвестно",
+  "Find a space": "Найти пространство",
+  "Search in all your spaces": "Поиск во всех ваших пространствах",
+  "Type": "Тип",
+  "Enterprise": "Предприятие",
+  "Download attachment": "Скачать вложение",
+  "Allowed email domains": "Разрешенные домены электронной почты",
+  "Only users with email addresses from these domains can signup via SSO.": "Только пользователи с электронными адресами из этих доменов могут зарегистрироваться через SSO.",
+  "Enter valid domain names separated by comma or space": "Введите допустимые доменные имена, разделённые запятыми или пробелами",
+  "Enforce two-factor authentication": "Обязательная двухфакторная аутентификация",
+  "Once enforced, all members must enable two-factor authentication to access the workspace.": "После введения обязательности все участники должны будут включить двухфакторную аутентификацию для доступа к рабочему пространству.",
+  "Toggle MFA enforcement": "Переключить обязательность MFA",
+  "Display name": "Отображаемое имя",
+  "Allow signup": "Разрешить регистрацию",
+  "Enabled": "Включено",
+  "Advanced Settings": "Расширенные настройки",
+  "Enable TLS/SSL": "Включить TLS/SSL",
+  "Use secure connection to LDAP server": "Использовать защищённое соединение с сервером LDAP",
+  "Group sync": "Синхронизация группы",
+  "No SSO providers found.": "Поставщики SSO не найдены.",
+  "Delete SSO provider": "Удалить поставщика SSO",
+  "Are you sure you want to delete this SSO provider?": "Вы уверены, что хотите удалить этого поставщика SSO?",
+  "Action": "Действие",
+  "{{ssoProviderType}} configuration": "Настройка {{ssoProviderType}}"
 }
diff --git a/apps/client/public/locales/uk-UA/translation.json b/apps/client/public/locales/uk-UA/translation.json
index 76dc76ce..e6d5427f 100644
--- a/apps/client/public/locales/uk-UA/translation.json
+++ b/apps/client/public/locales/uk-UA/translation.json
@@ -53,7 +53,7 @@
   "e.g Space for product team": "наприклад, Простір для продуктової команди",
   "e.g Space for sales team to collaborate": "наприклад, Простір для спільної роботи команди продажів",
   "Edit": "Редагувати",
-  "Read": "Read",
+  "Read": "Читати",
   "Edit group": "Редагувати групу",
   "Email": "Електронна пошта",
   "Enter a strong password": "Введіть надійний пароль",
@@ -497,35 +497,35 @@
   "Deleted by": "Видалено",
   "Deleted at": "Видалено о",
   "Preview": "Попередній перегляд",
-  "Subpages": "Subpages",
-  "Failed to load subpages": "Failed to load subpages",
-  "No subpages": "No subpages",
-  "Subpages (Child pages)": "Subpages (Child pages)",
-  "List all subpages of the current page": "List all subpages of the current page",
-  "Attachments": "Attachments",
-  "All spaces": "All spaces",
-  "Unknown": "Unknown",
-  "Find a space": "Find a space",
-  "Search in all your spaces": "Search in all your spaces",
-  "Type": "Type",
-  "Enterprise": "Enterprise",
-  "Download attachment": "Download attachment",
-  "Allowed email domains": "Allowed email domains",
-  "Only users with email addresses from these domains can signup via SSO.": "Only users with email addresses from these domains can signup via SSO.",
-  "Enter valid domain names separated by comma or space": "Enter valid domain names separated by comma or space",
-  "Enforce two-factor authentication": "Enforce two-factor authentication",
-  "Once enforced, all members must enable two-factor authentication to access the workspace.": "Once enforced, all members must enable two-factor authentication to access the workspace.",
-  "Toggle MFA enforcement": "Toggle MFA enforcement",
-  "Display name": "Display name",
-  "Allow signup": "Allow signup",
-  "Enabled": "Enabled",
-  "Advanced Settings": "Advanced Settings",
-  "Enable TLS/SSL": "Enable TLS/SSL",
-  "Use secure connection to LDAP server": "Use secure connection to LDAP server",
-  "Group sync": "Group sync",
-  "No SSO providers found.": "No SSO providers found.",
-  "Delete SSO provider": "Delete SSO provider",
-  "Are you sure you want to delete this SSO provider?": "Are you sure you want to delete this SSO provider?",
-  "Action": "Action",
-  "{{ssoProviderType}} configuration": "{{ssoProviderType}} configuration"
+  "Subpages": "Підсторінки",
+  "Failed to load subpages": "Не вдалося завантажити підсторінки",
+  "No subpages": "Немає підсторінок",
+  "Subpages (Child pages)": "Підсторінки (дочірні сторінки)",
+  "List all subpages of the current page": "Перелік всіх підсторінок поточної сторінки",
+  "Attachments": "Вкладення",
+  "All spaces": "Усі простори",
+  "Unknown": "Невідомо",
+  "Find a space": "Знайти простір",
+  "Search in all your spaces": "Шукати у всіх ваших просторах",
+  "Type": "Тип",
+  "Enterprise": "Підприємство",
+  "Download attachment": "Завантажити вкладення",
+  "Allowed email domains": "Дозволені домени електронної пошти",
+  "Only users with email addresses from these domains can signup via SSO.": "Лише користувачі з адресами електронної пошти з цих доменів можуть реєструватися через SSO.",
+  "Enter valid domain names separated by comma or space": "Введіть дійсні доменні імена, розділені комою або пробілом",
+  "Enforce two-factor authentication": "Вимагати двофакторну автентифікацію",
+  "Once enforced, all members must enable two-factor authentication to access the workspace.": "Після увімкнення всі учасники повинні ввімкнути двофакторну автентифікацію для доступу до робочого простору.",
+  "Toggle MFA enforcement": "Перемикання вимоги MFA",
+  "Display name": "Відображуване ім'я",
+  "Allow signup": "Дозволити реєстрацію",
+  "Enabled": "Увімкнено",
+  "Advanced Settings": "Розширені налаштування",
+  "Enable TLS/SSL": "Увімкнути TLS/SSL",
+  "Use secure connection to LDAP server": "Використовувати захищене з'єднання з сервером LDAP",
+  "Group sync": "Синхронізація групи",
+  "No SSO providers found.": "Постачальників SSO не знайдено.",
+  "Delete SSO provider": "Видалити постачальника SSO",
+  "Are you sure you want to delete this SSO provider?": "Ви впевнені, що хочете видалити цього постачальника SSO?",
+  "Action": "Дія",
+  "{{ssoProviderType}} configuration": "Конфігурація {{ssoProviderType}}"
 }
diff --git a/apps/client/public/locales/zh-CN/translation.json b/apps/client/public/locales/zh-CN/translation.json
index 20598eb6..33373155 100644
--- a/apps/client/public/locales/zh-CN/translation.json
+++ b/apps/client/public/locales/zh-CN/translation.json
@@ -53,7 +53,7 @@
   "e.g Space for product team": "例如：产品团队的空间",
   "e.g Space for sales team to collaborate": "例如：销售团队协作的空间",
   "Edit": "编辑",
-  "Read": "Read",
+  "Read": "阅读",
   "Edit group": "编辑群组",
   "Email": "电子邮箱",
   "Enter a strong password": "输入一个强密码",
@@ -497,35 +497,35 @@
   "Deleted by": "删除人",
   "Deleted at": "删除时间",
   "Preview": "预览",
-  "Subpages": "Subpages",
-  "Failed to load subpages": "Failed to load subpages",
-  "No subpages": "No subpages",
-  "Subpages (Child pages)": "Subpages (Child pages)",
-  "List all subpages of the current page": "List all subpages of the current page",
-  "Attachments": "Attachments",
-  "All spaces": "All spaces",
-  "Unknown": "Unknown",
-  "Find a space": "Find a space",
-  "Search in all your spaces": "Search in all your spaces",
-  "Type": "Type",
-  "Enterprise": "Enterprise",
-  "Download attachment": "Download attachment",
-  "Allowed email domains": "Allowed email domains",
-  "Only users with email addresses from these domains can signup via SSO.": "Only users with email addresses from these domains can signup via SSO.",
-  "Enter valid domain names separated by comma or space": "Enter valid domain names separated by comma or space",
-  "Enforce two-factor authentication": "Enforce two-factor authentication",
-  "Once enforced, all members must enable two-factor authentication to access the workspace.": "Once enforced, all members must enable two-factor authentication to access the workspace.",
-  "Toggle MFA enforcement": "Toggle MFA enforcement",
-  "Display name": "Display name",
-  "Allow signup": "Allow signup",
-  "Enabled": "Enabled",
-  "Advanced Settings": "Advanced Settings",
-  "Enable TLS/SSL": "Enable TLS/SSL",
-  "Use secure connection to LDAP server": "Use secure connection to LDAP server",
-  "Group sync": "Group sync",
-  "No SSO providers found.": "No SSO providers found.",
-  "Delete SSO provider": "Delete SSO provider",
-  "Are you sure you want to delete this SSO provider?": "Are you sure you want to delete this SSO provider?",
-  "Action": "Action",
-  "{{ssoProviderType}} configuration": "{{ssoProviderType}} configuration"
+  "Subpages": "子页面",
+  "Failed to load subpages": "加载子页面失败",
+  "No subpages": "没有子页面",
+  "Subpages (Child pages)": "子页面（子页面）",
+  "List all subpages of the current page": "列出当前页面的所有子页面",
+  "Attachments": "附件",
+  "All spaces": "所有空间",
+  "Unknown": "未知",
+  "Find a space": "查找空间",
+  "Search in all your spaces": "在您的所有空间中搜索",
+  "Type": "类型",
+  "Enterprise": "企业",
+  "Download attachment": "下载附件",
+  "Allowed email domains": "允许的电子邮件域",
+  "Only users with email addresses from these domains can signup via SSO.": "只有来自这些域的电子邮件地址的用户才能通过SSO注册。",
+  "Enter valid domain names separated by comma or space": "输入用逗号或空格分隔的有效域名",
+  "Enforce two-factor authentication": "强制实施双因素认证",
+  "Once enforced, all members must enable two-factor authentication to access the workspace.": "一旦实施，所有成员必须启用双因素认证才能访问工作区。",
+  "Toggle MFA enforcement": "切换多因素认证实施",
+  "Display name": "显示名称",
+  "Allow signup": "允许注册",
+  "Enabled": "已启用",
+  "Advanced Settings": "高级设置",
+  "Enable TLS/SSL": "启用TLS/SSL",
+  "Use secure connection to LDAP server": "使用安全连接到LDAP服务器",
+  "Group sync": "组同步",
+  "No SSO providers found.": "未找到SSO提供商。",
+  "Delete SSO provider": "删除SSO提供商",
+  "Are you sure you want to delete this SSO provider?": "您确定要删除此SSO提供商吗？",
+  "Action": "操作",
+  "{{ssoProviderType}} configuration": "{{ssoProviderType}} 配置"
 }

From db55de94067cc3e9b12f28263042cf57bb19c48f Mon Sep 17 00:00:00 2001
From: Hoie Kim <61715204+hoiekim@users.noreply.github.com>
Date: Wed, 3 Sep 2025 17:33:52 -0700
Subject: [PATCH 32/46] feat: progressive web app (#614)

* feat: progressive web app

* replace icons

---------

Co-authored-by: Philipinho <16838612+Philipinho@users.noreply.github.com>
---
 apps/client/index.html                        |  14 ++++++--
 apps/client/public/favicon-16x16.png          | Bin 562 -> 0 bytes
 apps/client/public/favicon-32x32.png          | Bin 1064 -> 0 bytes
 apps/client/public/icons/app-icon-192x192.png | Bin 0 -> 4722 bytes
 apps/client/public/icons/app-icon-512x512.png | Bin 0 -> 13696 bytes
 apps/client/public/icons/favicon-16x16.png    | Bin 0 -> 509 bytes
 apps/client/public/icons/favicon-32x32.png    | Bin 0 -> 881 bytes
 apps/client/public/manifest.json              |  30 ++++++++++++++++++
 8 files changed, 41 insertions(+), 3 deletions(-)
 delete mode 100644 apps/client/public/favicon-16x16.png
 delete mode 100644 apps/client/public/favicon-32x32.png
 create mode 100644 apps/client/public/icons/app-icon-192x192.png
 create mode 100644 apps/client/public/icons/app-icon-512x512.png
 create mode 100644 apps/client/public/icons/favicon-16x16.png
 create mode 100644 apps/client/public/icons/favicon-32x32.png
 create mode 100644 apps/client/public/manifest.json

diff --git a/apps/client/index.html b/apps/client/index.html
index c96058cb..28679e40 100644
--- a/apps/client/index.html
+++ b/apps/client/index.html
@@ -2,10 +2,18 @@
 <html lang="en">
   <head>
     <meta charset="UTF-8" />
-    <link rel="icon" type="image/png" sizes="32x32" href="/favicon-32x32.png">
-    <link rel="icon" type="image/png" sizes="16x16" href="/favicon-16x16.png">
-    <meta name="viewport" content="width=device-width, initial-scale=1.0" />
+    <link rel="icon" type="image/png" sizes="32x32" href="/icons/favicon-32x32.png" />
+    <link rel="icon" type="image/png" sizes="16x16" href="/icons/favicon-16x16.png" />
+    <meta name="viewport" content="width=device-width, initial-scale=1.0 user-scalable=no" />
     <title>Docmost</title>
+    <meta name="theme-color" content="#1f1f1f" media="(prefers-color-scheme: dark)" />
+    <meta name="theme-color" content="#f6f7f9" media="(prefers-color-scheme: light)" />
+    <link rel="manifest" href="/manifest.json" />
+    <meta name="mobile-web-app-capable" content="yes" />
+    <meta name="apple-touch-fullscreen" content="yes" />
+    <meta name="apple-mobile-web-app-title" content="Docmost" />
+    <meta name="apple-mobile-web-app-capable" content="yes" />
+    <meta name="apple-mobile-web-app-status-bar-style" content="default" />
     <!--meta-tags-->
   </head>
   <body>
diff --git a/apps/client/public/favicon-16x16.png b/apps/client/public/favicon-16x16.png
deleted file mode 100644
index 6298fe8a9ab3a722257a19179ca368f761d97374..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 562
zcmV-20?qx2P)<h;3K|Lk000e1NJLTq000mG000mO1^@s6AM^iV00001b5ch_0Itp)
z=>Px$>`6pHR5(v<lg)10Koo_)8wtOGU5Tc!fk$XoF;VfFsI<?Lu!xjhR*iU(&?Zf?
zg9yTllq$lc#elmEo2l-Me}Y;s{4<{W>6|n7iom%+&cJwxfH9PpfEX|W=(>CA9oQP-
zLf>CNJi*v4`6m0+V!d*vtuG-4wmCZ6pRo&=tItbRpenSyjGqDAS9ln5H5g<CPQZLI
z=l<@Ve!tJ3G%ds^K~)!`bfF!!84ZUVh9R3YWlw}=qseLS6yFaxYK6pcyyK{}fDkEQ
zG$IImmdk`ZRL}F6PN&3+m`~l$h&UT!q|9AO?I^Me{2(AnlG3PwkKHa`2Uk?9Ret?m
z+AP$BGoKw*p}_Z9t`eJmF0o##^J6xn-TuJi<k7_}4q@`6iK2+%a76INcM1xCP_MsZ
zHv4G-<ME_um7P<F+7UyWK|o?ND4XiIbIiBvYxeiw^1OI1j@K%%4ggi4A^N^5SY`4J
zl}d%lc+7gUq0{LUwn__GqAG9n@W8>rd(t#TWRFI(LGPqTtzM%Qws@L9?R0mcK(Vdx
zh@0;>Mf++{i#X=??v~3hm#o(7qH&7p5W(!s&#P&09jhsqi?#={xl-%;|3wh*HAR$a
zZMkD`1=-6^>*+8F=NQg(B3-oqAK!l&vPHP~3sigV1?f|%AOHXW07*qoM6N<$f}Pq9
AW&i*H

diff --git a/apps/client/public/favicon-32x32.png b/apps/client/public/favicon-32x32.png
deleted file mode 100644
index 40d6a30e9cbdf66d344942fb9ba0d8378e6a92c6..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1064
zcmV+@1lRkCP)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F800001b5ch_0Itp)
z=>Px&;z>k7R9HuqSHDXmK@|Qbm4ASsR^kQmVj)}tf*@z1TuwZ&w6oG8T11OPlT$2W
z0+-~<1Fy2s%2K?LLn{SEPQ^wLZ1pakVC6+{j+xmXGrKdpdt2yc_RV|WydU3tLjc4;
zPz1;#p|l$SDEmX~7xqd(#VUXNzlA)PaKt19)-LgnGSL>L_y(ZDq}BkGWEshpV^V1L
zDs?caFI>zotJ%HI*8TwCCy%CHFBNUC4{%G}7eR|pge?fq`W>e^k}fcAa19={BhU3Q
zGgS2!Ve$8BaV#mx<U^@Bv)K)iq8d4tLYtz~3p$(4Vs38E=$Dt57qnU}Twh<~;NSpf
zXJ?itRCfeL*7~LwDVNJA7K<7HRz=u_VM$zFU15278OO)R?jDnMt5S%QJ{mz8z|v9{
z4-dbcYGt-NIyw-K$B|B_F)}j3zrDV`Vr69o_4-%8izOzplOZreWB`do0=Kuf3ILfq
z#@>%%dwUyweSLg6lgVIf>$}WM+E8j8WG@N;1<nvM08>)*^z`sN=<V&r^Yb%?hK6u=
zcW2BYW+$-nO&$oU)`^J;93CEWk)53#%+Ag#;)2Glauxs>g}4i{bSMCQ4dML!9K*xI
z+zVY@U3hwW@_?|2omn?=7~5eAL11D7C=?2)R4Ux))YK<58b8coP)JOsGy;@2tumxQ
zV$e;(pb)TclarHZG#XqipU<OKt9$yX8~e~4C=`o4QA|lFFso`(sT6))T=3vlYgJyB
z>f_3L_)u0vuvy;3XGTOC4;YaXAo(td%gak{vsSBdFPNgOA!HY;ISEyu>bL@=(;v`m
z{^W{QS6A`nOV#27b)T;ncvIER0ahl15)p;vKrWX<waSbF)6>(~-{03)yr=@-1m@@u
zE<<zroSd9sbaWK$b{pN@-FSR_)MB=XNIy!rWhk1FKMD0=V1^k0_U!HLVP<9~&|$t~
z$P1xF<Wb$(*@@HBQ}p-u<8Ql-R5FR1o16aw;A6r98<=Ge=u3!|-tO)$-VO|a5`ug#
zhkCv4H|{xdC=b~4!2J9??(grF?!nsen|K@_(`k&4k0Ta~fl`W6sf3M<4Q@QpfHUIr
zp<bRYM0=2_SUrkYmYD%>*K8nZHk)R*d-{j>j-eoC<+QMnvCiSw=^e?Aj*j?1BA?sP
zuN-9|9tv}y<z%U$24=NJT@a&+>y}|?xBHfMB$sgMZfbr$R2;&7$k(taUI^pH;FNH#
zW=;YG*ff6<i6|bu+Z5Urf-RPWYoMfL+7#t%dQg#0vCcvmqd<`Wi`2TL2D3+C1C_Sw
i09b1TEwJl3A(el<%gpN2c=yKu0000<MNUMnLSTXn-tWZ#

diff --git a/apps/client/public/icons/app-icon-192x192.png b/apps/client/public/icons/app-icon-192x192.png
new file mode 100644
index 0000000000000000000000000000000000000000..46bce9e52cd0e83455e850638f0555f7f2fedd0b
GIT binary patch
literal 4722
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

literal 0
HcmV?d00001

diff --git a/apps/client/public/icons/app-icon-512x512.png b/apps/client/public/icons/app-icon-512x512.png
new file mode 100644
index 0000000000000000000000000000000000000000..65b91ed0ea7a8eab7a63d832bbaf640161df5cc5
GIT binary patch
literal 13696
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

literal 0
HcmV?d00001

diff --git a/apps/client/public/icons/favicon-16x16.png b/apps/client/public/icons/favicon-16x16.png
new file mode 100644
index 0000000000000000000000000000000000000000..c8d2d56fe4abab83637996db42875793894aba47
GIT binary patch
literal 509
zcmeAS@N?(olHy`uVBq!ia0vp^0wB!63?wyl`GbKJV{wqX6XVU3I`u#fXMsm#F#`j)
zFbFd;%$g$s6kHeJ6XFV_F@dhGu9ugWwY9Z?fPjaGhoPY%6BE<@`}hC<|F5E=vT@_a
zr%#_oMn*n<{MgUW@7J$i|Ni}Ra&pSb%DR2~_LC=1_V3@XqoecZ&mT@sPG)B2Z{NNt
zDJi{w|6WZ^O;1m6%9JUBf`WVY?3plOLUeTW;>C+gOG_U;di3?{S5Z;X`uh5|wzl5h
z-l<ckHa9o3v$G>RZ(`HAFd*NmB*-t=@5%pv7u1dc-9!rbyW^<T%Jq?nKvNcZx;TbZ
z%n3ao%gyL0!uH_%UH;rp7ljHpE{V~Ye(nE%#-gP=1Wvk5+~K(G>blK`eO~XKX?fmf
zc`=8OT8N_|pY8$GWdAt1SN#sHMawo+o_1X@alsLZ4;5wsYVRGsW-KUc`0qA%Vq18V
z-1>}nTnz_V*RE~*#wIcELS*)fPm+m8re<=noWB2s>G9r}UokZY&plwzT3#8~UUF&w
i(`6;<o6k&9T+2T#P4i~l^gEwGVc_ZN=d#Wzp$Pz^3Fg=U

literal 0
HcmV?d00001

diff --git a/apps/client/public/icons/favicon-32x32.png b/apps/client/public/icons/favicon-32x32.png
new file mode 100644
index 0000000000000000000000000000000000000000..3ccc0fb012e5fb7988f03dcd3a3feccb7a477323
GIT binary patch
literal 881
zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE3?yBabR7dyjKx9jPK-BC>eK@{oCO|{#S9GG
z!XV7ZFl&wkP=Q5&Plzi}l1LyWCDq;CJ$drv=;&x$Tif2=-bs@t)z;Q}dwX+oa&Fza
z_5c6>Ha0dwLPB4@d|AGHxwN$Ov17-AgM&LdIzE2<=;PxP5)#7B&i?Avt6#r<g@%Tf
zmzO_y@E|NKZ13K^K|w*`;o;WS)*Cl&+`W7EfddCFUcC74-@nzXSF5Y5-@kvKiHRv9
zA|fUxMovyHGBT2fhv(0qKT%Op4<A0fcI}$KzyH&xPdz+5OifMW;^H_sIHpgZE-Wm(
zfB*h(-@ctYckboOm#V6&IyyRw7A-O}GuyOjlY@i9l`B_RSXho8J?iG>R$X2F>C-0#
z1qD%2QDtRi4Gj%lU0ow1BXe_eXJ=;-5fQXdvg`3#1{BID3GxeO;Gg&M-~V5i(iv}u
z9Qg?h2I_<FyWLxY&(zjT1IAmNr;B4q#hlj3r@fs51&%$x9Hc+>;%V0%C%TlhJhU`;
zJEy%>%BWmjzk1q5t&S54O$%H&s-7=n*PZ0hw1izF<>XqM;xq2gOMZ(P&zUK2eBbg8
zcay+N6{-A&iPy`P>X^&;&9<A!?bojRz^%9Lf4|L&r#T$+PY9WAc>bJgxlqPKOOM|P
zqML*(ez0z-|8QuEz5CJ5?^X-=PKdm|=M%+j@@VUp-J0`58q;j1-rX9v+Ce&=QB&`y
zzR7{99gdk7KFrl}IL;~W_THjYPSfGKqWrM}?Md&07_0b}?Elc)ajl!_$tIy054gV^
z{m-Igv&ViJLt`@Mmrun!Z?q3Qn8&hgg2s`Bv8)_wa^2@8R@qD63zT2AKrp9x9^1Ap
z4886vy|^3}o~>^%Ff%#evnQr&O?Jc0h?Pd2TeS{+JzA+JDKP&~<#uuHskOrI{5M^;
vv6-g3f#LDpch6&Dm?WQR72R6LsdL%9_<8gT0m*DNP=tHB`njxgN@xNAgAS1J

literal 0
HcmV?d00001

diff --git a/apps/client/public/manifest.json b/apps/client/public/manifest.json
new file mode 100644
index 00000000..3e4b35dd
--- /dev/null
+++ b/apps/client/public/manifest.json
@@ -0,0 +1,30 @@
+{
+  "name": "Docmost",
+  "short_name": "Docmost",
+  "start_url": "/",
+  "display": "standalone",
+  "background_color": "#222",
+  "theme_color": "#222",
+  "icons": [
+    {
+      "src": "icons/favicon-16x16.png",
+      "type": "image/png",
+      "sizes": "16x16"
+    },
+    {
+      "src": "icons/favicon-32x32.png",
+      "type": "image/png",
+      "sizes": "32x32"
+    },
+    {
+      "src": "icons/app-icon-192x192.png",
+      "type": "image/png",
+      "sizes": "180x180 192x192"
+    },
+    {
+      "src": "icons/app-icon-512x512.png",
+      "type": "image/png",
+      "sizes": "512x512"
+    }
+  ]
+}

From 3e9f6b11cc63a391d139c4712d49d9c9e9251de1 Mon Sep 17 00:00:00 2001
From: Quinten Van Damme <58103738+quintenvandamme@users.noreply.github.com>
Date: Thu, 4 Sep 2025 04:55:32 +0200
Subject: [PATCH 33/46] Remove version from docker-compose.yml [deprecated]
 (#1011)

---
 docker-compose.yml | 2 --
 1 file changed, 2 deletions(-)

diff --git a/docker-compose.yml b/docker-compose.yml
index f7fbc60a..76887fae 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -1,5 +1,3 @@
-version: '3'
-
 services:
   docmost:
     image: docmost/docmost:latest

From 5d91eb4f5f78ded128bd7b88b998512a39e6ec93 Mon Sep 17 00:00:00 2001
From: Philipinho <16838612+Philipinho@users.noreply.github.com>
Date: Thu, 4 Sep 2025 09:38:30 -0700
Subject: [PATCH 34/46] feat: queue imported attachments for indexing

---
 apps/server/src/ee                            |  2 +-
 .../services/import-attachment.service.ts     | 36 ++++++++++++++++++-
 2 files changed, 36 insertions(+), 2 deletions(-)

diff --git a/apps/server/src/ee b/apps/server/src/ee
index 38de2d0d..d658a0d6 160000
--- a/apps/server/src/ee
+++ b/apps/server/src/ee
@@ -1 +1 @@
-Subproject commit 38de2d0dc1ae233668cf546f3ab74046afa8986a
+Subproject commit d658a0d6dc5110e11168e6a99f2db644a25af4e5
diff --git a/apps/server/src/integrations/import/services/import-attachment.service.ts b/apps/server/src/integrations/import/services/import-attachment.service.ts
index 874ff892..dd73b26a 100644
--- a/apps/server/src/integrations/import/services/import-attachment.service.ts
+++ b/apps/server/src/integrations/import/services/import-attachment.service.ts
@@ -16,6 +16,9 @@ import { unwrapFromParagraph } from '../utils/import-formatter';
 import { resolveRelativeAttachmentPath } from '../utils/import.utils';
 import { load } from 'cheerio';
 import pLimit from 'p-limit';
+import { InjectQueue } from '@nestjs/bullmq';
+import { Queue } from 'bullmq';
+import { QueueJob, QueueName } from '../../queue/constants';
 
 interface AttachmentInfo {
   href: string;
@@ -39,6 +42,7 @@ export class ImportAttachmentService {
   constructor(
     private readonly storageService: StorageService,
     @InjectKysely() private readonly db: KyselyDB,
+    @InjectQueue(QueueName.ATTACHMENT_QUEUE) private attachmentQueue: Queue,
   ) {}
 
   async processAttachments(opts: {
@@ -579,7 +583,7 @@ export class ImportAttachmentService {
         if (!nonDrawioExtensions.has(ext)) {
           drawioFiles.push(attachment);
         } else {
-          //Skipped non-Draw.io file with mxfile MIME.}`,
+          //Skipped non-Draw.io file with mxfile MIME.
         }
       }
 
@@ -792,6 +796,36 @@ export class ImportAttachmentService {
           })
           .execute();
 
+        // Queue PDF and DOCX files for indexing
+        const supportedExtensions = ['.pdf', '.docx'];
+        if (supportedExtensions.includes(ext.toLowerCase())) {
+          try {
+            await this.attachmentQueue.add(
+              QueueJob.ATTACHMENT_INDEX_CONTENT,
+              { attachmentId },
+              {
+                attempts: 2,
+                backoff: {
+                  type: 'exponential',
+                  delay: 30 * 1000,
+                },
+                deduplication: {
+                  id: attachmentId,
+                },
+                removeOnComplete: true,
+                removeOnFail: false,
+              },
+            );
+            this.logger.debug(
+              `Queued ${fileNameWithExt} for indexing (attachment ID: ${attachmentId})`,
+            );
+          } catch (err) {
+            this.logger.error(
+              `Failed to queue indexing for imported attachment ${attachmentId}: ${err}`,
+            );
+          }
+        }
+
         uploadStats.completed++;
 
         if (uploadStats.completed % 10 === 0) {

From d43ee77617cd00611357c0fce771a151eaf7ec91 Mon Sep 17 00:00:00 2001
From: Philipinho <16838612+Philipinho@users.noreply.github.com>
Date: Thu, 4 Sep 2025 09:40:17 -0700
Subject: [PATCH 35/46] remove debug log

---
 .../integrations/import/services/import-attachment.service.ts   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/apps/server/src/integrations/import/services/import-attachment.service.ts b/apps/server/src/integrations/import/services/import-attachment.service.ts
index dd73b26a..2b3bfa43 100644
--- a/apps/server/src/integrations/import/services/import-attachment.service.ts
+++ b/apps/server/src/integrations/import/services/import-attachment.service.ts
@@ -102,7 +102,7 @@ export class ImportAttachmentService {
       }
     >();
 
-    this.logger.debug(`Found ${drawioPairs.size} Draw.io pairs to process`);
+    //this.logger.debug(`Found ${drawioPairs.size} Draw.io pairs to process`);
 
     // Process Draw.io pairs and create combined SVG files
     for (const [drawioHref, pair] of drawioPairs) {

From b08d37fbf0e25a1b4c384af3d5dcf8c228270453 Mon Sep 17 00:00:00 2001
From: Philipinho <16838612+Philipinho@users.noreply.github.com>
Date: Thu, 4 Sep 2025 10:57:17 -0700
Subject: [PATCH 36/46] fix

---
 .../search/components/search-result-item.tsx  | 30 ++++++++++++-------
 .../components/search-spotlight-filters.tsx   |  3 +-
 2 files changed, 21 insertions(+), 12 deletions(-)

diff --git a/apps/client/src/features/search/components/search-result-item.tsx b/apps/client/src/features/search/components/search-result-item.tsx
index 8b7fb80e..24d3472b 100644
--- a/apps/client/src/features/search/components/search-result-item.tsx
+++ b/apps/client/src/features/search/components/search-result-item.tsx
@@ -1,5 +1,13 @@
 import React from "react";
-import { Group, Center, Text, Badge, ActionIcon, Tooltip } from "@mantine/core";
+import {
+  Group,
+  Center,
+  Text,
+  Badge,
+  ActionIcon,
+  Tooltip,
+  getDefaultZIndex,
+} from "@mantine/core";
 import { Spotlight } from "@mantine/spotlight";
 import { Link } from "react-router-dom";
 import { IconFile, IconDownload } from "@tabler/icons-react";
@@ -24,7 +32,7 @@ export function SearchResultItem({
   showSpace,
 }: SearchResultItemProps) {
   const { t } = useTranslation();
-  
+
   if (isAttachmentResult) {
     const attachmentResult = result as IAttachmentSearch;
 
@@ -48,7 +56,7 @@ export function SearchResultItem({
       >
         <Group wrap="nowrap" w="100%">
           <Center>
-            <IconFile size={20} />
+            <IconFile size={16} />
           </Center>
 
           <div style={{ flex: 1 }}>
@@ -64,19 +72,19 @@ export function SearchResultItem({
                 dangerouslySetInnerHTML={{
                   __html: DOMPurify.sanitize(attachmentResult.highlight, {
                     ALLOWED_TAGS: ["mark", "em", "strong", "b"],
-                    ALLOWED_ATTR: []
+                    ALLOWED_ATTR: [],
                   }),
                 }}
               />
             )}
           </div>
 
-          <Tooltip label={t("Download attachment")} withArrow>
-            <ActionIcon
-              variant="subtle"
-              color="gray"
-              onClick={handleDownload}
-            >
+          <Tooltip
+            label={t("Download attachment")}
+            zIndex={getDefaultZIndex("max")}
+            withArrow
+          >
+            <ActionIcon variant="subtle" color="gray" onClick={handleDownload}>
               <IconDownload size={18} />
             </ActionIcon>
           </Tooltip>
@@ -115,7 +123,7 @@ export function SearchResultItem({
                 dangerouslySetInnerHTML={{
                   __html: DOMPurify.sanitize(pageResult.highlight, {
                     ALLOWED_TAGS: ["mark", "em", "strong", "b"],
-                    ALLOWED_ATTR: []
+                    ALLOWED_ATTR: [],
                   }),
                 }}
               />
diff --git a/apps/client/src/features/search/components/search-spotlight-filters.tsx b/apps/client/src/features/search/components/search-spotlight-filters.tsx
index ce8bda02..fe0b9e7c 100644
--- a/apps/client/src/features/search/components/search-spotlight-filters.tsx
+++ b/apps/client/src/features/search/components/search-spotlight-filters.tsx
@@ -23,6 +23,7 @@ import { useDebouncedValue } from "@mantine/hooks";
 import { useGetSpacesQuery } from "@/features/space/queries/space-query";
 import { useLicense } from "@/ee/hooks/use-license";
 import classes from "./search-spotlight-filters.module.css";
+import { isCloud } from "@/lib/config.ts";
 
 interface SearchSpotlightFiltersProps {
   onFiltersChange?: (filters: any) => void;
@@ -79,7 +80,7 @@ export function SearchSpotlightFilters({
     {
       value: "attachment",
       label: t("Attachments"),
-      disabled: !hasLicenseKey,
+      disabled: !isCloud() && !hasLicenseKey,
     },
   ];
 

From 7d2ff346fa258776ad1ce5c23b630d5f330886b4 Mon Sep 17 00:00:00 2001
From: Philipinho <16838612+Philipinho@users.noreply.github.com>
Date: Thu, 4 Sep 2025 11:35:04 -0700
Subject: [PATCH 37/46] UI fixes

---
 .../components/ui/responsive-settings-row.tsx | 47 +++++++++++
 .../src/ee/mfa/components/mfa-settings.tsx    | 79 ++++++++++---------
 .../security/components/sso-provider-list.tsx |  6 +-
 .../user/components/page-state-pref.tsx       | 15 ++--
 .../user/components/page-width-pref.tsx       | 15 ++--
 .../components/workspace-invites-table.tsx    |  2 +-
 .../components/workspace-members-table.tsx    |  4 +-
 7 files changed, 113 insertions(+), 55 deletions(-)
 create mode 100644 apps/client/src/components/ui/responsive-settings-row.tsx

diff --git a/apps/client/src/components/ui/responsive-settings-row.tsx b/apps/client/src/components/ui/responsive-settings-row.tsx
new file mode 100644
index 00000000..ec3f65f7
--- /dev/null
+++ b/apps/client/src/components/ui/responsive-settings-row.tsx
@@ -0,0 +1,47 @@
+import { Box } from "@mantine/core";
+import React from "react";
+
+interface ResponsiveSettingsRowProps {
+  children: React.ReactNode;
+}
+
+export function ResponsiveSettingsRow({ children }: ResponsiveSettingsRowProps) {
+  return (
+    <Box
+      style={{
+        display: "flex",
+        flexDirection: "row",
+        justifyContent: "space-between",
+        alignItems: "center",
+        gap: "1rem",
+        flexWrap: "wrap",
+      }}
+    >
+      {children}
+    </Box>
+  );
+}
+
+interface ResponsiveSettingsContentProps {
+  children: React.ReactNode;
+}
+
+export function ResponsiveSettingsContent({ children }: ResponsiveSettingsContentProps) {
+  return (
+    <Box style={{ flex: "1 1 300px", minWidth: 0 }}>
+      {children}
+    </Box>
+  );
+}
+
+interface ResponsiveSettingsControlProps {
+  children: React.ReactNode;
+}
+
+export function ResponsiveSettingsControl({ children }: ResponsiveSettingsControlProps) {
+  return (
+    <Box style={{ flex: "0 0 auto" }}>
+      {children}
+    </Box>
+  );
+}
diff --git a/apps/client/src/ee/mfa/components/mfa-settings.tsx b/apps/client/src/ee/mfa/components/mfa-settings.tsx
index bf849f3e..73d9247d 100644
--- a/apps/client/src/ee/mfa/components/mfa-settings.tsx
+++ b/apps/client/src/ee/mfa/components/mfa-settings.tsx
@@ -9,6 +9,7 @@ import { MfaDisableModal } from "@/ee/mfa";
 import { MfaBackupCodesModal } from "@/ee/mfa";
 import { isCloud } from "@/lib/config.ts";
 import useLicense from "@/ee/hooks/use-license.tsx";
+import { ResponsiveSettingsRow, ResponsiveSettingsContent, ResponsiveSettingsControl } from "@/components/ui/responsive-settings-row";
 
 export function MfaSettings() {
   const { t } = useTranslation();
@@ -53,8 +54,8 @@ export function MfaSettings() {
 
   return (
     <>
-      <Group justify="space-between" wrap="nowrap" gap="xl">
-        <div style={{ minWidth: 0, flex: 1 }}>
+      <ResponsiveSettingsRow>
+        <ResponsiveSettingsContent>
           <Text size="md">{t("2-step verification")}</Text>
           <Text size="sm" c="dimmed">
             {!isMfaEnabled
@@ -63,44 +64,46 @@ export function MfaSettings() {
                 )
               : t("Two-factor authentication is active on your account.")}
           </Text>
-        </div>
+        </ResponsiveSettingsContent>
 
-        {!isMfaEnabled ? (
-          <Tooltip
-            label={t("Available in enterprise edition")}
-            disabled={canUseMfa}
-          >
-            <Button
-              disabled={!canUseMfa}
-              variant="default"
-              onClick={() => setSetupModalOpen(true)}
-              style={{ whiteSpace: "nowrap" }}
+        <ResponsiveSettingsControl>
+          {!isMfaEnabled ? (
+            <Tooltip
+              label={t("Available in enterprise edition")}
+              disabled={canUseMfa}
             >
-              {t("Add 2FA method")}
-            </Button>
-          </Tooltip>
-        ) : (
-          <Group gap="sm" wrap="nowrap">
-            <Button
-              variant="default"
-              size="sm"
-              onClick={() => setBackupCodesModalOpen(true)}
-              style={{ whiteSpace: "nowrap" }}
-            >
-              {t("Backup codes")} ({mfaStatus?.backupCodesCount || 0})
-            </Button>
-            <Button
-              variant="default"
-              size="sm"
-              color="red"
-              onClick={() => setDisableModalOpen(true)}
-              style={{ whiteSpace: "nowrap" }}
-            >
-              {t("Disable")}
-            </Button>
-          </Group>
-        )}
-      </Group>
+              <Button
+                disabled={!canUseMfa}
+                variant="default"
+                onClick={() => setSetupModalOpen(true)}
+                style={{ whiteSpace: "nowrap" }}
+              >
+                {t("Add 2FA method")}
+              </Button>
+            </Tooltip>
+          ) : (
+            <Group gap="sm" wrap="nowrap">
+              <Button
+                variant="default"
+                size="sm"
+                onClick={() => setBackupCodesModalOpen(true)}
+                style={{ whiteSpace: "nowrap" }}
+              >
+                {t("Backup codes")} ({mfaStatus?.backupCodesCount || 0})
+              </Button>
+              <Button
+                variant="default"
+                size="sm"
+                color="red"
+                onClick={() => setDisableModalOpen(true)}
+                style={{ whiteSpace: "nowrap" }}
+              >
+                {t("Disable")}
+              </Button>
+            </Group>
+          )}
+        </ResponsiveSettingsControl>
+      </ResponsiveSettingsRow>
 
       <MfaSetupModal
         opened={setupModalOpen}
diff --git a/apps/client/src/ee/security/components/sso-provider-list.tsx b/apps/client/src/ee/security/components/sso-provider-list.tsx
index bde78b5a..00807524 100644
--- a/apps/client/src/ee/security/components/sso-provider-list.tsx
+++ b/apps/client/src/ee/security/components/sso-provider-list.tsx
@@ -69,7 +69,7 @@ export default function SsoProviderList() {
   return (
     <>
       <Card shadow="sm" radius="sm">
-        <Table.ScrollContainer minWidth={500}>
+        <Table.ScrollContainer minWidth={600}>
           <Table verticalSpacing="sm">
             <Table.Thead>
               <Table.Tr>
@@ -104,7 +104,7 @@ export default function SsoProviderList() {
                       </Group>
                     </Table.Td>
                     <Table.Td>
-                      <Badge color={"gray"} variant="light">
+                      <Badge color={"gray"} variant="light" style={{ whiteSpace: "nowrap" }}>
                         {provider.type.toUpperCase()}
                       </Badge>
                     </Table.Td>
@@ -133,6 +133,7 @@ export default function SsoProviderList() {
                       )}
                     </Table.Td>
                     <Table.Td>
+                      <Group gap="xs" wrap="nowrap">
                       <ActionIcon
                         variant="subtle"
                         color="gray"
@@ -168,6 +169,7 @@ export default function SsoProviderList() {
                           </Menu.Item>
                         </Menu.Dropdown>
                       </Menu>
+                      </Group>
                     </Table.Td>
                   </Table.Tr>
                 ))}
diff --git a/apps/client/src/features/user/components/page-state-pref.tsx b/apps/client/src/features/user/components/page-state-pref.tsx
index 12ba2d6f..283dc6bf 100644
--- a/apps/client/src/features/user/components/page-state-pref.tsx
+++ b/apps/client/src/features/user/components/page-state-pref.tsx
@@ -1,25 +1,28 @@
-import { Group, Text, MantineSize, SegmentedControl } from "@mantine/core";
+import { Text, MantineSize, SegmentedControl } from "@mantine/core";
 import { useAtom } from "jotai";
 import { userAtom } from "@/features/user/atoms/current-user-atom.ts";
 import { updateUser } from "@/features/user/services/user-service.ts";
 import React, { useCallback, useEffect, useState } from "react";
 import { useTranslation } from "react-i18next";
 import { PageEditMode } from "@/features/user/types/user.types.ts";
+import { ResponsiveSettingsRow, ResponsiveSettingsContent, ResponsiveSettingsControl } from "@/components/ui/responsive-settings-row";
 
 export default function PageStatePref() {
   const { t } = useTranslation();
 
   return (
-    <Group justify="space-between" wrap="nowrap" gap="xl">
-      <div>
+    <ResponsiveSettingsRow>
+      <ResponsiveSettingsContent>
         <Text size="md">{t("Default page edit mode")}</Text>
         <Text size="sm" c="dimmed">
           {t("Choose your preferred page edit mode. Avoid accidental edits.")}
         </Text>
-      </div>
+      </ResponsiveSettingsContent>
 
-      <PageStateSegmentedControl />
-    </Group>
+      <ResponsiveSettingsControl>
+        <PageStateSegmentedControl />
+      </ResponsiveSettingsControl>
+    </ResponsiveSettingsRow>
   );
 }
 
diff --git a/apps/client/src/features/user/components/page-width-pref.tsx b/apps/client/src/features/user/components/page-width-pref.tsx
index 6ad66062..c1ce4816 100644
--- a/apps/client/src/features/user/components/page-width-pref.tsx
+++ b/apps/client/src/features/user/components/page-width-pref.tsx
@@ -1,24 +1,27 @@
 import { userAtom } from "@/features/user/atoms/current-user-atom.ts";
 import { updateUser } from "@/features/user/services/user-service.ts";
-import { Group, MantineSize, Switch, Text } from "@mantine/core";
+import { MantineSize, Switch, Text } from "@mantine/core";
 import { useAtom } from "jotai/index";
 import React, { useState } from "react";
 import { useTranslation } from "react-i18next";
+import { ResponsiveSettingsRow, ResponsiveSettingsContent, ResponsiveSettingsControl } from "@/components/ui/responsive-settings-row";
 
 export default function PageWidthPref() {
   const { t } = useTranslation();
 
   return (
-    <Group justify="space-between" wrap="nowrap" gap="xl">
-      <div>
+    <ResponsiveSettingsRow>
+      <ResponsiveSettingsContent>
         <Text size="md">{t("Full page width")}</Text>
         <Text size="sm" c="dimmed">
           {t("Choose your preferred page width.")}
         </Text>
-      </div>
+      </ResponsiveSettingsContent>
 
-      <PageWidthToggle />
-    </Group>
+      <ResponsiveSettingsControl>
+        <PageWidthToggle />
+      </ResponsiveSettingsControl>
+    </ResponsiveSettingsRow>
   );
 }
 
diff --git a/apps/client/src/features/workspace/components/members/components/workspace-invites-table.tsx b/apps/client/src/features/workspace/components/members/components/workspace-invites-table.tsx
index bc7b9db5..81d5437e 100644
--- a/apps/client/src/features/workspace/components/members/components/workspace-invites-table.tsx
+++ b/apps/client/src/features/workspace/components/members/components/workspace-invites-table.tsx
@@ -26,7 +26,7 @@ export default function WorkspaceInvitesTable() {
         )}
       </Alert>
 
-      <Table.ScrollContainer minWidth={500}>
+      <Table.ScrollContainer minWidth={600}>
         <Table highlightOnHover verticalSpacing="sm">
           <Table.Thead>
             <Table.Tr>
diff --git a/apps/client/src/features/workspace/components/members/components/workspace-members-table.tsx b/apps/client/src/features/workspace/components/members/components/workspace-members-table.tsx
index 427d78fe..49b9bf97 100644
--- a/apps/client/src/features/workspace/components/members/components/workspace-members-table.tsx
+++ b/apps/client/src/features/workspace/components/members/components/workspace-members-table.tsx
@@ -4,7 +4,7 @@ import {
   useWorkspaceMembersQuery,
 } from "@/features/workspace/queries/workspace-query.ts";
 import { CustomAvatar } from "@/components/ui/custom-avatar.tsx";
-import React, { useCallback, useRef, useState } from "react";
+import React from "react";
 import RoleSelectMenu from "@/components/ui/role-select-menu.tsx";
 import {
   getUserRoleLabel,
@@ -54,7 +54,7 @@ export default function WorkspaceMembersTable() {
   return (
     <>
       <SearchInput onSearch={handleSearch} />
-      <Table.ScrollContainer minWidth={500}>
+      <Table.ScrollContainer minWidth={600}>
         <Table highlightOnHover verticalSpacing="sm">
           <Table.Thead>
             <Table.Tr>

From 6cc58c57f5e1b03aa4f8e208a513b9b3c5f4ded9 Mon Sep 17 00:00:00 2001
From: Philipinho <16838612+Philipinho@users.noreply.github.com>
Date: Thu, 4 Sep 2025 12:16:30 -0700
Subject: [PATCH 38/46] sync

---
 apps/server/src/ee | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/apps/server/src/ee b/apps/server/src/ee
index d658a0d6..7615e82c 160000
--- a/apps/server/src/ee
+++ b/apps/server/src/ee
@@ -1 +1 @@
-Subproject commit d658a0d6dc5110e11168e6a99f2db644a25af4e5
+Subproject commit 7615e82ce383bde22bcd942563498bcdf9d67132

From 26ea04e2a3e10e8aa7f1c183ae2dd6e40b8192d5 Mon Sep 17 00:00:00 2001
From: Philipinho <16838612+Philipinho@users.noreply.github.com>
Date: Thu, 4 Sep 2025 12:25:53 -0700
Subject: [PATCH 39/46] sync

---
 apps/server/src/ee | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/apps/server/src/ee b/apps/server/src/ee
index 7615e82c..3f219dd5 160000
--- a/apps/server/src/ee
+++ b/apps/server/src/ee
@@ -1 +1 @@
-Subproject commit 7615e82ce383bde22bcd942563498bcdf9d67132
+Subproject commit 3f219dd5ccbbd3edfd3aafb78b63a11697c9b864

From c99bfb8ef10545a51060150ec102a89e871963c3 Mon Sep 17 00:00:00 2001
From: Philipinho <16838612+Philipinho@users.noreply.github.com>
Date: Thu, 4 Sep 2025 13:22:43 -0700
Subject: [PATCH 40/46] make print better

---
 .../editor/components/drawio/drawio-view.tsx  |  1 +
 .../components/excalidraw/excalidraw-view.tsx |  1 +
 .../src/features/editor/styles/print.css      | 29 +++++++++++++------
 3 files changed, 22 insertions(+), 9 deletions(-)

diff --git a/apps/client/src/features/editor/components/drawio/drawio-view.tsx b/apps/client/src/features/editor/components/drawio/drawio-view.tsx
index 468e26a0..bb901044 100644
--- a/apps/client/src/features/editor/components/drawio/drawio-view.tsx
+++ b/apps/client/src/features/editor/components/drawio/drawio-view.tsx
@@ -145,6 +145,7 @@ export default function DrawioView(props: NodeViewProps) {
               variant="default"
               color="gray"
               mx="xs"
+              className="print-hide"
               style={{
                 position: "absolute",
                 top: 8,
diff --git a/apps/client/src/features/editor/components/excalidraw/excalidraw-view.tsx b/apps/client/src/features/editor/components/excalidraw/excalidraw-view.tsx
index d898e5a2..35d8de94 100644
--- a/apps/client/src/features/editor/components/excalidraw/excalidraw-view.tsx
+++ b/apps/client/src/features/editor/components/excalidraw/excalidraw-view.tsx
@@ -183,6 +183,7 @@ export default function ExcalidrawView(props: NodeViewProps) {
               variant="default"
               color="gray"
               mx="xs"
+              className="print-hide"
               style={{
                 position: "absolute",
                 top: 8,
diff --git a/apps/client/src/features/editor/styles/print.css b/apps/client/src/features/editor/styles/print.css
index 6fb6436d..c63e376b 100644
--- a/apps/client/src/features/editor/styles/print.css
+++ b/apps/client/src/features/editor/styles/print.css
@@ -1,12 +1,23 @@
 @media print {
-    .mantine-AppShell-header,
-    .mantine-AppShell-navbar,
-    .mantine-AppShell-aside{
-        display: none !important;
-    }
+  .mantine-AppShell-header,
+  .mantine-AppShell-navbar,
+  .mantine-AppShell-aside,
+  .print-hide,
+  .drag-handle {
+    display: none !important;
+  }
 
-    .mantine-AppShell-main {
-        padding-top: 0 !important;
-        min-height: auto !important;
-    }
+  .mantine-AppShell-main {
+    padding-top: 0 !important;
+    min-height: auto !important;
+  }
+
+  .ProseMirror-selectednode {
+    outline: none !important;
+    box-shadow: none !important;
+  }
+
+  .tableWrapper {
+    overflow: hidden !important;
+  }
 }

From eb8e8507ea801e477e4129ec5a0a7731cadc2bab Mon Sep 17 00:00:00 2001
From: Philipinho <16838612+Philipinho@users.noreply.github.com>
Date: Thu, 4 Sep 2025 13:27:15 -0700
Subject: [PATCH 41/46] use debug

---
 .../src/core/attachment/processors/attachment.processor.ts      | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/apps/server/src/core/attachment/processors/attachment.processor.ts b/apps/server/src/core/attachment/processors/attachment.processor.ts
index 83323de5..66c9f328 100644
--- a/apps/server/src/core/attachment/processors/attachment.processor.ts
+++ b/apps/server/src/core/attachment/processors/attachment.processor.ts
@@ -37,7 +37,7 @@ export class AttachmentProcessor extends WorkerHost implements OnModuleDestroy {
           // eslint-disable-next-line @typescript-eslint/no-require-imports
           AttachmentEeModule = require('./../../../ee/attachments-ee/attachment-ee.service');
         } catch (err) {
-          this.logger.error(
+          this.logger.debug(
             'Attachment enterprise module requested but EE module not bundled in this build',
           );
           return;

From 31053e2b204425f159a34bffe8221c0b052b41a8 Mon Sep 17 00:00:00 2001
From: Philipinho <16838612+Philipinho@users.noreply.github.com>
Date: Thu, 4 Sep 2025 13:41:55 -0700
Subject: [PATCH 42/46] update mermaid

---
 apps/client/package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/apps/client/package.json b/apps/client/package.json
index 78306af7..7c705b06 100644
--- a/apps/client/package.json
+++ b/apps/client/package.json
@@ -40,7 +40,7 @@
     "katex": "0.16.22",
     "lowlight": "^3.3.0",
     "mantine-form-zod-resolver": "^1.3.0",
-    "mermaid": "^11.6.0",
+    "mermaid": "^11.11.0",
     "mitt": "^3.0.1",
     "posthog-js": "^1.255.1",
     "react": "^18.3.1",

From 9df6061e1a97db006beafc7026342292e0670bf1 Mon Sep 17 00:00:00 2001
From: Philipinho <16838612+Philipinho@users.noreply.github.com>
Date: Thu, 4 Sep 2025 13:42:33 -0700
Subject: [PATCH 43/46] lock file

---
 pnpm-lock.yaml | 156 ++++++++++++++++++++++++++++++++-----------------
 1 file changed, 101 insertions(+), 55 deletions(-)

diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index 58479826..f62f416c 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -306,8 +306,8 @@ importers:
         specifier: ^1.3.0
         version: 1.3.0(@mantine/form@8.1.3(react@18.3.1))(zod@3.25.56)
       mermaid:
-        specifier: ^11.6.0
-        version: 11.6.0
+        specifier: ^11.11.0
+        version: 11.11.0
       mitt:
         specifier: ^3.0.1
         version: 3.0.1
@@ -737,11 +737,11 @@ packages:
     resolution: {integrity: sha512-AP6FvhMybCYs3gs+vzEAzSU1K//AFT3SVTRFv+C3WMO5dLeAHeGzM8I2dxD5EHQQtqIE/8apP6CxGrnpA5YlFg==}
     engines: {node: ^18.19.1 || ^20.11.1 || >=22.0.0, npm: ^6.11.0 || ^7.5.6 || >=8.0.0, yarn: '>= 1.13.0'}
 
-  '@antfu/install-pkg@0.4.1':
-    resolution: {integrity: sha512-T7yB5QNG29afhWVkVq7XeIMBa5U/vs9mX69YqayXypPRmYzUmzwnYltplHmPtZ4HPCn+sQKeXW8I47wCbuBOjw==}
+  '@antfu/install-pkg@1.1.0':
+    resolution: {integrity: sha512-MGQsmw10ZyI+EJo45CdSER4zEb+p31LpDAFp2Z3gkSd1yqVZGi0Ebx++YTEMonJy4oChEMLsxZ64j8FH6sSqtQ==}
 
-  '@antfu/utils@0.7.10':
-    resolution: {integrity: sha512-+562v9k4aI80m1+VuMHehNJWLOFjBnXn3tdOitzD0il5b7smkSBal4+a3oKiQTbrwMmN/TBUMDvbdoWDehgOww==}
+  '@antfu/utils@9.2.0':
+    resolution: {integrity: sha512-Oq1d9BGZakE/FyoEtcNeSwM7MpDO2vUBi11RWBZXf75zPsbUVWmUs03EqkRFrcgbXyKTas0BdZWC1wcuSoqSAw==}
 
   '@asamuzakjp/css-color@2.8.3':
     resolution: {integrity: sha512-GIc76d9UI1hCvOATjZPyHFmE5qhRccp3/zGfMPapK3jBi+yocEzp6BBB0UnfRYP9NP4FANqUZYb0hnfs3TM3hw==}
@@ -2280,8 +2280,8 @@ packages:
   '@iconify/types@2.0.0':
     resolution: {integrity: sha512-+wluvCrRhXrhyOmRDJ3q8mux9JkKy5SJ/v8ol2tu4FVjyYvtEzkc/3pK15ET6RKg4b4w4BmTk1+gsCUhf21Ykg==}
 
-  '@iconify/utils@2.1.33':
-    resolution: {integrity: sha512-jP9h6v/g0BIZx0p7XGJJVtkVnydtbgTgt9mVNcGDYwaa7UhdHdI9dvoq+gKj9sijMSJKxUPEG2JyjsgXjxL7Kw==}
+  '@iconify/utils@3.0.1':
+    resolution: {integrity: sha512-A78CUEnFGX8I/WlILxJCuIJXloL0j/OJ9PSchPAfCargEIKmUBWvvEMmKWB5oONwiUqlNt+5eRufdkLxeHIWYw==}
 
   '@inquirer/checkbox@4.1.2':
     resolution: {integrity: sha512-PL9ixC5YsPXzXhAZFUPmkXGxfgjkdfZdPEPPmt4kFwQ4LBMDG9n/nHXYRGGZSKZJs+d1sGKWgS2GiPzVRKUdtQ==}
@@ -2592,8 +2592,8 @@ packages:
     resolution: {integrity: sha512-Yhlar6v9WQgUp/He7BdgzOz8lqMQ8sU+jkCq7Wx8Myc5YFJLbEe7lgui/V7G1qB1DJykHSGwreceSaD60Y0PUQ==}
     hasBin: true
 
-  '@mermaid-js/parser@0.4.0':
-    resolution: {integrity: sha512-wla8XOWvQAwuqy+gxiZqY+c7FokraOTHRWMsbB4AgRx9Sy7zKslNyejy7E+a77qHfey5GXw/ik3IXv/NHMJgaA==}
+  '@mermaid-js/parser@0.6.2':
+    resolution: {integrity: sha512-+PO02uGF6L6Cs0Bw8RpGhikVvMWEysfAyl27qTlroUB8jSWr1lL0Sf6zi78ZxlSnmgSY2AMMKVgghnN9jTtwkQ==}
 
   '@msgpackr-extract/msgpackr-extract-darwin-arm64@3.0.2':
     resolution: {integrity: sha512-9bfjwDxIDWmmOKusUcqdS4Rw+SETlp9Dy39Xui9BEGEk19dDwH0jhipwFzEff/pFg95NKymc6TOTbRKcWeRqyQ==}
@@ -4761,6 +4761,11 @@ packages:
     engines: {node: '>=0.4.0'}
     hasBin: true
 
+  acorn@8.15.0:
+    resolution: {integrity: sha512-NZyJarBfL7nWwIq+FDL6Zp/yHEhePMNnnJ0y3qfieCrmNvYct8uvtiV41UvlSe6apAfk0fY1FbWx+NwfmpvtTg==}
+    engines: {node: '>=0.4.0'}
+    hasBin: true
+
   address@1.2.2:
     resolution: {integrity: sha512-4B/qKCfeE/ODUaAUpSwfzazo5x29WD4r3vXiWsB7I2mSDAihwEqKO+g8GELZUQSSAo5e1XTYh3ZVfLyxBc12nA==}
     engines: {node: '>= 10.0.0'}
@@ -5313,6 +5318,9 @@ packages:
   confbox@0.1.8:
     resolution: {integrity: sha512-RMtmw0iFkeR4YV+fUOSucriAQNb9g8zFR52MWCtl+cCZOFRNL6zeB395vPzFhEjjn4fMxXudmELnl/KF/WrK6w==}
 
+  confbox@0.2.2:
+    resolution: {integrity: sha512-1NB+BKqhtNipMsov4xI/NnhCKp9XG9NamYp5PVm9klAT0fsrNPjaFICsCFhNhwZJKNh7zB/3q8qXz0E9oaMNtQ==}
+
   config-chain@1.1.13:
     resolution: {integrity: sha512-qj+f8APARXHrM0hraqXYb2/bOVSV4PvJQlNZ/DVj0QrmNM2q2euizkeuVckQ57J+W0mRH6Hvi+k50M4Jul2VRQ==}
 
@@ -5646,6 +5654,15 @@ packages:
       supports-color:
         optional: true
 
+  debug@4.4.1:
+    resolution: {integrity: sha512-KcKCqiftBJcZr++7ykoDIEwSa3XWowTfNPo92BYxjXiyYEVrUQh2aLyhxBCwww+heortUFxEJYcRzosstTEBYQ==}
+    engines: {node: '>=6.0'}
+    peerDependencies:
+      supports-color: '*'
+    peerDependenciesMeta:
+      supports-color:
+        optional: true
+
   decamelize@1.2.0:
     resolution: {integrity: sha512-z2S+W9X73hAUUki+N+9Za2lBlun89zigOyGrsax+KUQ6wKW4ZoWpEYBkGhQjwAjjDCkWxhY0VKEhk8wzY7F5cA==}
     engines: {node: '>=0.10.0'}
@@ -6067,6 +6084,9 @@ packages:
     resolution: {integrity: sha512-2Zks0hf1VLFYI1kbh0I5jP3KHHyCHpkfyHBzsSXRFgl/Bg9mWYfMW8oD+PdMPlEwy5HNsR9JutYy6pMeOh61nw==}
     engines: {node: ^14.15.0 || ^16.10.0 || >=18.0.0}
 
+  exsolve@1.0.7:
+    resolution: {integrity: sha512-VO5fQUzZtI6C+vx4w/4BWJpg3s/5l+6pRQEHzFRM8WFi4XffSP1Z+4qi7GbjWbvRQEbdIco5mIMq+zX4rPuLrw==}
+
   external-editor@3.1.0:
     resolution: {integrity: sha512-hMQ4CX1p1izmuLYyZqLMO/qGNw10wSv9QDCPfzXfyFrOaCSSoRfqE1Kf1s5an66J5JZC62NewG+mK49jOCtQew==}
     engines: {node: '>=4'}
@@ -7185,8 +7205,8 @@ packages:
     resolution: {integrity: sha512-3R/1M+yS3j5ou80Me59j7F9IMs4PXs3VqRrm0TU3AbKPxlmpoY1TNscJV/oGJXo8qCatFGTfDbY6W6ipGOYXfg==}
     engines: {node: '>=6.11.5'}
 
-  local-pkg@0.5.1:
-    resolution: {integrity: sha512-9rrA30MRRP3gBD3HTGnC6cDFpaE1kVDWxWgqWJUN0RvDNAo+Nz/9GxB+nHOH0ifbVFy0hSA1V6vFDvnx54lTEQ==}
+  local-pkg@1.1.2:
+    resolution: {integrity: sha512-arhlxbFRmoQHl33a0Zkle/YWlmNwoyt6QNZEIJcqNbdrsix5Lvc4HyyI3EnwxTYlZYc32EbYrQ8SzEZ7dqgg9A==}
     engines: {node: '>=14'}
 
   locate-path@5.0.0:
@@ -7371,8 +7391,8 @@ packages:
   mermaid@10.9.3:
     resolution: {integrity: sha512-V80X1isSEvAewIL3xhmz/rVmc27CVljcsbWxkxlWJWY/1kQa4XOABqpDl2qQLGKzpKm6WbTfUEKImBlUfFYArw==}
 
-  mermaid@11.6.0:
-    resolution: {integrity: sha512-PE8hGUy1LDlWIHWBP05SFdqUHGmRcCcK4IzpOKPE35eOw+G9zZgcnMpyunJVUEOgb//KBORPjysKndw8bFLuRg==}
+  mermaid@11.11.0:
+    resolution: {integrity: sha512-9lb/VNkZqWTRjVgCV+l1N+t4kyi94y+l5xrmBmbbxZYkfRl5hEDaTPMOcaWKCl1McG8nBEaMlWwkcAEEgjhBgg==}
 
   methods@1.1.2:
     resolution: {integrity: sha512-iclAHeNqNm68zFtnZ0e+1L2yUIdvzNoauKU4WBA3VvH/vPFieF7qfRlwUZU+DA9P9bPXIS90ulxoUoCH23sV2w==}
@@ -7526,8 +7546,8 @@ packages:
     engines: {node: '>=10'}
     hasBin: true
 
-  mlly@1.7.3:
-    resolution: {integrity: sha512-xUsx5n/mN0uQf4V548PKQ+YShA4/IW0KI1dZhrNrPCLG+xizETbHTkOa1f8/xut9JRPp8kQuMnz0oqwkTiLo/A==}
+  mlly@1.8.0:
+    resolution: {integrity: sha512-l8D9ODSRWLe2KHJSifWGwBqpTZXIXTeo8mlKjY+E2HAakaTeNpqAyBZ8GSqLzHgw4XmHmC8whvpjJNMbFZN7/g==}
 
   mri@1.2.0:
     resolution: {integrity: sha512-tzzskb3bG8LvYGFF/mDTpq3jpI6Q9wc3LEmBaghu+DdCssd1FakN7Bc0hVNmEyGq1bq3RgfkCb3cmQLpNPOroA==}
@@ -7829,8 +7849,8 @@ packages:
   package-json-from-dist@1.0.0:
     resolution: {integrity: sha512-dATvCeZN/8wQsGywez1mzHtTlP22H8OEfPrVMLNr4/eGa+ijtLn/6M5f0dY8UKNrC2O9UCU6SSoG3qRKnt7STw==}
 
-  package-manager-detector@0.2.5:
-    resolution: {integrity: sha512-3dS7y28uua+UDbRCLBqltMBrbI+A5U2mI9YuxHRxIWYmLj3DwntEBmERYzIAQ4DMeuCUOBSak7dBHHoXKpOTYQ==}
+  package-manager-detector@1.3.0:
+    resolution: {integrity: sha512-ZsEbbZORsyHuO00lY1kV3/t72yp6Ysay6Pd17ZAlNGuGwmWDLCJxFpRs0IzfXfj1o4icJOkUEioexFHzyPurSQ==}
 
   pako@1.0.11:
     resolution: {integrity: sha512-4hLB8Py4zZce5s4yd9XzopqwVv/yGNhV1Bl8NTmCq1763HeK2+EwVTv+leGeL13Dnh2wfbqowVPXCIO0z4taYw==}
@@ -7918,8 +7938,8 @@ packages:
     resolution: {integrity: sha512-gDKb8aZMDeD/tZWs9P6+q0J9Mwkdl6xMV8TjnGP3qJVJ06bdMgkbBlLU8IdfOsIsFz2BW1rNVT3XuNEl8zPAvw==}
     engines: {node: '>=8'}
 
-  pathe@1.1.2:
-    resolution: {integrity: sha512-whLdWMYL2TwI08hn8/ZqAbrVemu0LNaNNJZX73O6qaIdCTfXutsLhMkjdENX0qhsQ9uIimo4/aQOmXkoon2nDQ==}
+  pathe@2.0.3:
+    resolution: {integrity: sha512-WUjGcAqP1gQacoQe+OBJsFA7Ld4DyXuUIjZ5cc75cLHvJ7dtNsTugphxIADwspS+AraAUePCKrSVtPLFj/F88w==}
 
   pause@0.0.1:
     resolution: {integrity: sha512-KG8UEiEVkR3wGEb4m5yZkVCzigAD+cVEJck2CzYZO37ZGJfctvVptVO192MwrtPhzONn6go8ylnOdMhKqi4nfg==}
@@ -8032,8 +8052,11 @@ packages:
     resolution: {integrity: sha512-HRDzbaKjC+AOWVXxAU/x54COGeIv9eb+6CkDSQoNTt4XyWoIJvuPsXizxu/Fr23EiekbtZwmh1IcIG/l/a10GQ==}
     engines: {node: '>=8'}
 
-  pkg-types@1.2.1:
-    resolution: {integrity: sha512-sQoqa8alT3nHjGuTjuKgOnvjo4cljkufdtLMnO2LBP/wRwuDlo1tkaEdMxCRhyGRPacv/ztlZgDPm2b7FAmEvw==}
+  pkg-types@1.3.1:
+    resolution: {integrity: sha512-/Jm5M4RvtBFVkKWRu2BLUTNP8/M2a+UwuAX+ae4770q1qVGtfjG+WTCupoZixokjmHiry8uI+dlY8KXYV5HVVQ==}
+
+  pkg-types@2.3.0:
+    resolution: {integrity: sha512-SIqCzDRg0s9npO5XQ3tNZioRY1uK06lA41ynBC1YmFTmnY6FjUjVt6s4LoADmwoig1qqD0oK8h1p/8mlMx8Oig==}
 
   pluralize@8.0.0:
     resolution: {integrity: sha512-Nc3IT5yHzflTfbjgqWcCPpo7DaKy4FnpB0l/zCAW0Tc7jxAiuqSxHasntB3D7887LSrA93kDJ9IXovxJYxyLCA==}
@@ -8301,6 +8324,9 @@ packages:
     resolution: {integrity: sha512-trVZiI6RMOkO476zLGaBIzszOdFPnCCXHPG9kn0yuS1uz6xdVxPfZdB3vUig9pxPFDM9BRAgz/YUIVQ1/vuiUg==}
     engines: {node: '>=0.6'}
 
+  quansync@0.2.11:
+    resolution: {integrity: sha512-AifT7QEbW9Nri4tAwR5M/uzpBuqfZf+zwaEM/QkzEjj7NBuFD2rBuy0K3dE+8wltbezDV7JMA0WfnCPYRSYbXA==}
+
   queue-microtask@1.2.3:
     resolution: {integrity: sha512-NuaNSa6flKT5JaSYQzJok04JzTL1CA6aGhv5rfLW3PgqA+M2ChpZQnAC8h8i4ZFkBS8X5RqkDBHA7r4hej3K9A==}
 
@@ -9039,8 +9065,8 @@ packages:
   thread-stream@3.0.2:
     resolution: {integrity: sha512-cBL4xF2A3lSINV4rD5tyqnKH4z/TgWPvT+NaVhJDSwK962oo/Ye7cHSMbDzwcu7tAE1SfU6Q4XtV6Hucmi6Hlw==}
 
-  tinyexec@0.3.1:
-    resolution: {integrity: sha512-WiCJLEECkO18gwqIp6+hJg0//p23HXp4S+gGtAKu3mI2F2/sXC4FvHvXvB0zJVVaTPhx1/tOwdbRsa1sOBIKqQ==}
+  tinyexec@1.0.1:
+    resolution: {integrity: sha512-5uC6DDlmeqiOwCPmK9jMSdOuZTh8bU39Ys6yidB+UTt5hfZUPGAypSgFRiEp+jbi9qH40BLDvy85jIU88wKSqw==}
 
   tinyglobby@0.2.12:
     resolution: {integrity: sha512-qkf4trmKSIiMTs/E63cxH+ojC2unam7rJ0WrauAzpT3ECNTxGRMlaXxVbfxMUC/w0LaYk6jQ4y/nGR9uBO3tww==}
@@ -9285,8 +9311,8 @@ packages:
   uc.micro@2.1.0:
     resolution: {integrity: sha512-ARDJmphmdvUk6Glw7y9DQ2bFkKBHwQHLi2lsaH6PPmz/Ka9sFOBsBluozhDltWmnv9u/cF6Rt87znRTPV+yp/A==}
 
-  ufo@1.5.4:
-    resolution: {integrity: sha512-UsUk3byDzKd04EyoZ7U4DOlxQaD14JUKQl6/P7wiX4FNvUfm3XL246n9W5AmqwW5RSFJ27NAuM0iLscAOYUiGQ==}
+  ufo@1.6.1:
+    resolution: {integrity: sha512-9a4/uxlTWJ4+a5i0ooc1rU7C7YOw3wT+UGqdeNNHWnOF9qcMBgLRS+4IYUqbczewFx4mLEig6gawh7X6mFlEkA==}
 
   uid2@0.0.4:
     resolution: {integrity: sha512-IevTus0SbGwQzYh3+fRsAMTVVPOoIVufzacXcHPmdlle1jUpq7BRL+mw3dgeLanvGZdwwbWhRV6XrcFNdBmjWA==}
@@ -9862,12 +9888,12 @@ snapshots:
     transitivePeerDependencies:
       - chokidar
 
-  '@antfu/install-pkg@0.4.1':
+  '@antfu/install-pkg@1.1.0':
     dependencies:
-      package-manager-detector: 0.2.5
-      tinyexec: 0.3.1
+      package-manager-detector: 1.3.0
+      tinyexec: 1.0.1
 
-  '@antfu/utils@0.7.10': {}
+  '@antfu/utils@9.2.0': {}
 
   '@asamuzakjp/css-color@2.8.3':
     dependencies:
@@ -12085,15 +12111,16 @@ snapshots:
 
   '@iconify/types@2.0.0': {}
 
-  '@iconify/utils@2.1.33':
+  '@iconify/utils@3.0.1':
     dependencies:
-      '@antfu/install-pkg': 0.4.1
-      '@antfu/utils': 0.7.10
+      '@antfu/install-pkg': 1.1.0
+      '@antfu/utils': 9.2.0
       '@iconify/types': 2.0.0
-      debug: 4.4.0
+      debug: 4.4.1
+      globals: 15.15.0
       kolorist: 1.8.0
-      local-pkg: 0.5.1
-      mlly: 1.7.3
+      local-pkg: 1.1.2
+      mlly: 1.8.0
     transitivePeerDependencies:
       - supports-color
 
@@ -12531,7 +12558,7 @@ snapshots:
       - encoding
       - supports-color
 
-  '@mermaid-js/parser@0.4.0':
+  '@mermaid-js/parser@0.6.2':
     dependencies:
       langium: 3.3.1
 
@@ -14839,6 +14866,8 @@ snapshots:
 
   acorn@8.14.0: {}
 
+  acorn@8.15.0: {}
+
   address@1.2.2: {}
 
   agent-base@6.0.2:
@@ -15505,6 +15534,8 @@ snapshots:
 
   confbox@0.1.8: {}
 
+  confbox@0.2.2: {}
+
   config-chain@1.1.13:
     dependencies:
       ini: 1.3.8
@@ -15870,6 +15901,10 @@ snapshots:
     dependencies:
       ms: 2.1.3
 
+  debug@4.4.1:
+    dependencies:
+      ms: 2.1.3
+
   decamelize@1.2.0: {}
 
   decimal.js@10.4.3: {}
@@ -16451,6 +16486,8 @@ snapshots:
       jest-message-util: 29.7.0
       jest-util: 29.7.0
 
+  exsolve@1.0.7: {}
+
   external-editor@3.1.0:
     dependencies:
       chardet: 0.7.0
@@ -17802,10 +17839,11 @@ snapshots:
 
   loader-runner@4.3.0: {}
 
-  local-pkg@0.5.1:
+  local-pkg@1.1.2:
     dependencies:
-      mlly: 1.7.3
-      pkg-types: 1.2.1
+      mlly: 1.8.0
+      pkg-types: 2.3.0
+      quansync: 0.2.11
 
   locate-path@5.0.0:
     dependencies:
@@ -18008,11 +18046,11 @@ snapshots:
     transitivePeerDependencies:
       - supports-color
 
-  mermaid@11.6.0:
+  mermaid@11.11.0:
     dependencies:
       '@braintree/sanitize-url': 7.1.0
-      '@iconify/utils': 2.1.33
-      '@mermaid-js/parser': 0.4.0
+      '@iconify/utils': 3.0.1
+      '@mermaid-js/parser': 0.6.2
       '@types/d3': 7.4.3
       cytoscape: 3.30.2
       cytoscape-cose-bilkent: 4.1.0(cytoscape@3.30.2)
@@ -18236,12 +18274,12 @@ snapshots:
 
   mkdirp@1.0.4: {}
 
-  mlly@1.7.3:
+  mlly@1.8.0:
     dependencies:
-      acorn: 8.14.0
-      pathe: 1.1.2
-      pkg-types: 1.2.1
-      ufo: 1.5.4
+      acorn: 8.15.0
+      pathe: 2.0.3
+      pkg-types: 1.3.1
+      ufo: 1.6.1
 
   mri@1.2.0: {}
 
@@ -18577,7 +18615,7 @@ snapshots:
 
   package-json-from-dist@1.0.0: {}
 
-  package-manager-detector@0.2.5: {}
+  package-manager-detector@1.3.0: {}
 
   pako@1.0.11: {}
 
@@ -18668,7 +18706,7 @@ snapshots:
 
   path-type@4.0.0: {}
 
-  pathe@1.1.2: {}
+  pathe@2.0.3: {}
 
   pause@0.0.1: {}
 
@@ -18783,11 +18821,17 @@ snapshots:
     dependencies:
       find-up: 4.1.0
 
-  pkg-types@1.2.1:
+  pkg-types@1.3.1:
     dependencies:
       confbox: 0.1.8
-      mlly: 1.7.3
-      pathe: 1.1.2
+      mlly: 1.8.0
+      pathe: 2.0.3
+
+  pkg-types@2.3.0:
+    dependencies:
+      confbox: 0.2.2
+      exsolve: 1.0.7
+      pathe: 2.0.3
 
   pluralize@8.0.0: {}
 
@@ -19068,6 +19112,8 @@ snapshots:
     dependencies:
       side-channel: 1.0.6
 
+  quansync@0.2.11: {}
+
   queue-microtask@1.2.3: {}
 
   quick-format-unescaped@4.0.4: {}
@@ -19906,7 +19952,7 @@ snapshots:
     dependencies:
       real-require: 0.2.0
 
-  tinyexec@0.3.1: {}
+  tinyexec@1.0.1: {}
 
   tinyglobby@0.2.12:
     dependencies:
@@ -20164,7 +20210,7 @@ snapshots:
 
   uc.micro@2.1.0: {}
 
-  ufo@1.5.4: {}
+  ufo@1.6.1: {}
 
   uid2@0.0.4: {}
 

From ae24ea29ba3d013ea3ddf83a27df0061653e542c Mon Sep 17 00:00:00 2001
From: Philipinho <16838612+Philipinho@users.noreply.github.com>
Date: Thu, 4 Sep 2025 13:42:59 -0700
Subject: [PATCH 44/46] v0.23.0

---
 apps/client/package.json | 2 +-
 apps/server/package.json | 2 +-
 package.json             | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/apps/client/package.json b/apps/client/package.json
index 7c705b06..20a8539c 100644
--- a/apps/client/package.json
+++ b/apps/client/package.json
@@ -1,7 +1,7 @@
 {
   "name": "client",
   "private": true,
-  "version": "0.22.2",
+  "version": "0.23.0",
   "scripts": {
     "dev": "vite",
     "build": "tsc && vite build",
diff --git a/apps/server/package.json b/apps/server/package.json
index 35f17339..1760ed87 100644
--- a/apps/server/package.json
+++ b/apps/server/package.json
@@ -1,6 +1,6 @@
 {
   "name": "server",
-  "version": "0.22.2",
+  "version": "0.23.0",
   "description": "",
   "author": "",
   "private": true,
diff --git a/package.json b/package.json
index 707c262f..ec2f9f9a 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "docmost",
   "homepage": "https://docmost.com",
-  "version": "0.22.2",
+  "version": "0.23.0",
   "private": true,
   "scripts": {
     "build": "nx run-many -t build",

From 091e790b83edd13435267dc5cff84c50b5440fc9 Mon Sep 17 00:00:00 2001
From: Philipinho <16838612+Philipinho@users.noreply.github.com>
Date: Thu, 4 Sep 2025 14:22:40 -0700
Subject: [PATCH 45/46] fix attachment search in cloud

---
 apps/client/src/features/search/hooks/use-unified-search.ts | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/apps/client/src/features/search/hooks/use-unified-search.ts b/apps/client/src/features/search/hooks/use-unified-search.ts
index 2adccc25..dbc5563f 100644
--- a/apps/client/src/features/search/hooks/use-unified-search.ts
+++ b/apps/client/src/features/search/hooks/use-unified-search.ts
@@ -9,6 +9,7 @@ import {
   IPageSearchParams,
 } from "@/features/search/types/search.types";
 import { useLicense } from "@/ee/hooks/use-license";
+import { isCloud } from "@/lib/config";
 
 export type UnifiedSearchResult = IPageSearch | IAttachmentSearch;
 
@@ -22,7 +23,7 @@ export function useUnifiedSearch(
   const { hasLicenseKey } = useLicense();
 
   const isAttachmentSearch =
-    params.contentType === "attachment" && hasLicenseKey;
+    params.contentType === "attachment" && (isCloud() || hasLicenseKey);
   const searchType = isAttachmentSearch ? "attachment" : "page";
 
   return useQuery({

From dc0650289d65437e144b29f7c456039a9c62433d Mon Sep 17 00:00:00 2001
From: Philipinho <16838612+Philipinho@users.noreply.github.com>
Date: Thu, 4 Sep 2025 15:07:01 -0700
Subject: [PATCH 46/46] sync

---
 .../attachment/processors/attachment.processor.ts    | 12 +++++++++---
 apps/server/src/ee                                   |  2 +-
 .../import/services/import-attachment.service.ts     |  2 +-
 3 files changed, 11 insertions(+), 5 deletions(-)

diff --git a/apps/server/src/core/attachment/processors/attachment.processor.ts b/apps/server/src/core/attachment/processors/attachment.processor.ts
index 66c9f328..bcf8a08a 100644
--- a/apps/server/src/core/attachment/processors/attachment.processor.ts
+++ b/apps/server/src/core/attachment/processors/attachment.processor.ts
@@ -67,9 +67,15 @@ export class AttachmentProcessor extends WorkerHost implements OnModuleDestroy {
 
   @OnWorkerEvent('failed')
   onError(job: Job) {
-    this.logger.error(
-      `Error processing ${job.name} job. Reason: ${job.failedReason}`,
-    );
+    if (job.name === QueueJob.ATTACHMENT_INDEX_CONTENT) {
+      this.logger.debug(
+        `Error processing ${job.name} job for attachment ${job.data?.attachmentId}. Reason: ${job.failedReason}`,
+      );
+    } else {
+      this.logger.error(
+        `Error processing ${job.name} job. Reason: ${job.failedReason}`,
+      );
+    }
   }
 
   @OnWorkerEvent('completed')
diff --git a/apps/server/src/ee b/apps/server/src/ee
index 3f219dd5..e71f70c2 160000
--- a/apps/server/src/ee
+++ b/apps/server/src/ee
@@ -1 +1 @@
-Subproject commit 3f219dd5ccbbd3edfd3aafb78b63a11697c9b864
+Subproject commit e71f70c29950efc02f9fe795b7d4b4c9d1060db4
diff --git a/apps/server/src/integrations/import/services/import-attachment.service.ts b/apps/server/src/integrations/import/services/import-attachment.service.ts
index 2b3bfa43..660239eb 100644
--- a/apps/server/src/integrations/import/services/import-attachment.service.ts
+++ b/apps/server/src/integrations/import/services/import-attachment.service.ts
@@ -804,7 +804,7 @@ export class ImportAttachmentService {
               QueueJob.ATTACHMENT_INDEX_CONTENT,
               { attachmentId },
               {
-                attempts: 2,
+                attempts: 1,
                 backoff: {
                   type: 'exponential',
                   delay: 30 * 1000,