-> [!NOTE] -> Docmost is currently in **beta**. We value your feedback as we progress towards a stable release. - ## Getting started To get started with Docmost, please refer to our [documentation](https://docmost.com/docs). From 29bb52db0ca874a497b31706700673006a055d99 Mon Sep 17 00:00:00 2001 From: Philipinho <16838612+Philipinho@users.noreply.github.com> Date: Wed, 9 Apr 2025 19:14:51 +0100 Subject: [PATCH 13/63] v0.10.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 b64d910b..5b6ee046 100644 --- a/apps/client/package.json +++ b/apps/client/package.json @@ -1,7 +1,7 @@ { "name": "client", "private": true, - "version": "0.9.0", + "version": "0.10.0", "scripts": { "dev": "vite", "build": "tsc && vite build", diff --git a/apps/server/package.json b/apps/server/package.json index a44cf59e..83a2e85f 100644 --- a/apps/server/package.json +++ b/apps/server/package.json @@ -1,6 +1,6 @@ { "name": "server", - "version": "0.9.0", + "version": "0.10.0", "description": "", "author": "", "private": true, diff --git a/package.json b/package.json index 64cf9267..290e09a3 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "docmost", "homepage": "https://docmost.com", - "version": "0.9.0", + "version": "0.10.0", "private": true, "scripts": { "build": "nx run-many -t build", From f9711918a370e2363bb9c8d273e2225bdc0d9ca8 Mon Sep 17 00:00:00 2001 From: Philipinho <16838612+Philipinho@users.noreply.github.com> Date: Fri, 11 Apr 2025 12:32:54 +0100 Subject: [PATCH 14/63] fix comment editor padding --- .../client/src/features/comment/components/comment.module.css | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/apps/client/src/features/comment/components/comment.module.css b/apps/client/src/features/comment/components/comment.module.css index 87dc5994..b3d0a261 100644 --- a/apps/client/src/features/comment/components/comment.module.css +++ b/apps/client/src/features/comment/components/comment.module.css @@ -19,8 +19,7 @@ box-shadow: 0 0 0 2px var(--mantine-color-blue-3); } - .ProseMirror { - width: 100%; + .ProseMirror :global(.ProseMirror){ max-width: 100%; white-space: pre-wrap; word-break: break-word; @@ -29,7 +28,6 @@ padding-right: 6px; margin-top: 2px; margin-bottom: 2px; - font-size: 14px; overflow: hidden auto; } From 27fa45a76998e32c4a90fb2cdc56d3eabda9bbb3 Mon Sep 17 00:00:00 2001 From: Philip Okugbe <16838612+Philipinho@users.noreply.github.com> Date: Fri, 11 Apr 2025 13:18:44 +0100 Subject: [PATCH 15/63] fix local attachment paths in exports (#1013) --- .../src/integrations/export/export.service.ts | 4 +-- apps/server/src/integrations/export/utils.ts | 27 ++++++++++++++----- 2 files changed, 22 insertions(+), 9 deletions(-) diff --git a/apps/server/src/integrations/export/export.service.ts b/apps/server/src/integrations/export/export.service.ts index 9cf33234..09fdb5fd 100644 --- a/apps/server/src/integrations/export/export.service.ts +++ b/apps/server/src/integrations/export/export.service.ts @@ -21,7 +21,7 @@ import { getProsemirrorContent, PageExportTree, replaceInternalLinks, - updateAttachmentUrls, + updateAttachmentUrlsToLocalPaths, } from './utils'; import { PageRepo } from '@docmost/db/repos/page/page.repo'; import { Node } from '@tiptap/pm/model'; @@ -193,7 +193,7 @@ export class ExportService { if (includeAttachments) { await this.zipAttachments(updatedJsonContent, page.spaceId, folder); - updatedJsonContent = updateAttachmentUrls(updatedJsonContent); + updatedJsonContent = updateAttachmentUrlsToLocalPaths(updatedJsonContent); } const pageTitle = getPageTitle(page.title); diff --git a/apps/server/src/integrations/export/utils.ts b/apps/server/src/integrations/export/utils.ts index e296f194..f99f337a 100644 --- a/apps/server/src/integrations/export/utils.ts +++ b/apps/server/src/integrations/export/utils.ts @@ -62,17 +62,30 @@ export function isAttachmentNode(nodeType: string) { return attachmentNodeTypes.includes(nodeType); } -export function updateAttachmentUrls(prosemirrorJson: any) { +export function updateAttachmentUrlsToLocalPaths(prosemirrorJson: any) { const doc = jsonToNode(prosemirrorJson); + if (!doc) return null; + + // Helper function to replace specific URL prefixes + const replacePrefix = (url: string): string => { + const prefixes = ['/files', '/api/files']; + for (const prefix of prefixes) { + if (url.startsWith(prefix)) { + return url.replace(prefix, 'files'); + } + } + return url; + }; doc?.descendants((node: Node) => { if (isAttachmentNode(node.type.name)) { - if (node.attrs.src && node.attrs.src.startsWith('/files')) { - //@ts-expect-error - node.attrs.src = node.attrs.src.replace('/files', 'files'); - } else if (node.attrs.url && node.attrs.url.startsWith('/files')) { - //@ts-expect-error - node.attrs.url = node.attrs.url.replace('/files', 'files'); + if (node.attrs.src) { + // @ts-ignore + node.attrs.src = replacePrefix(node.attrs.src); + } + if (node.attrs.url) { + // @ts-ignore + node.attrs.url = replacePrefix(node.attrs.url); } } }); From 268001ae26dc8f647fcb3f96dbc3d51ef87c569b Mon Sep 17 00:00:00 2001 From: Philipinho <16838612+Philipinho@users.noreply.github.com> Date: Fri, 11 Apr 2025 13:23:42 +0100 Subject: [PATCH 16/63] v0.10.1 --- 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 5b6ee046..c88a2860 100644 --- a/apps/client/package.json +++ b/apps/client/package.json @@ -1,7 +1,7 @@ { "name": "client", "private": true, - "version": "0.10.0", + "version": "0.10.1", "scripts": { "dev": "vite", "build": "tsc && vite build", diff --git a/apps/server/package.json b/apps/server/package.json index 83a2e85f..54cd1661 100644 --- a/apps/server/package.json +++ b/apps/server/package.json @@ -1,6 +1,6 @@ { "name": "server", - "version": "0.10.0", + "version": "0.10.1", "description": "", "author": "", "private": true, diff --git a/package.json b/package.json index 290e09a3..d67cc4cd 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "docmost", "homepage": "https://docmost.com", - "version": "0.10.0", + "version": "0.10.1", "private": true, "scripts": { "build": "nx run-many -t build", From 49d0f1cc9a105e6488be20a7138dde3a69819ac0 Mon Sep 17 00:00:00 2001 From: Philipinho <16838612+Philipinho@users.noreply.github.com> Date: Fri, 11 Apr 2025 13:41:43 +0100 Subject: [PATCH 17/63] Add click handler --- apps/client/src/components/settings/app-version.tsx | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/apps/client/src/components/settings/app-version.tsx b/apps/client/src/components/settings/app-version.tsx index f5097d51..cb332478 100644 --- a/apps/client/src/components/settings/app-version.tsx +++ b/apps/client/src/components/settings/app-version.tsx @@ -35,6 +35,12 @@ export default function AppVersion() { position="middle-end" style={{ cursor: "pointer" }} disabled={!hasUpdate} + onClick={() => { + window.open( + "https://github.com/docmost/docmost/releases", + "_blank", + ); + }} >
Website | - Documentation + Documentation | + Twitter / X
## Getting started -To get started with Docmost, please refer to our [documentation](https://docmost.com/docs). +To get started with Docmost, please refer to our [documentation](https://docmost.com/docs) or try our [cloud version](https://docmost.com/pricing) . ## Features @@ -46,3 +47,16 @@ All files in the following directories are licensed under the Docmost Enterprise ### Contributing See the [development documentation](https://docmost.com/docs/self-hosting/development) + +## Thanks +Special thanks to; + +
+ {props.isShare && (
+
+ {t("Table of contents")}
+
+ )}
+ (
+ "showTOC",
+ true,
+);
+
+export const mobileTableOfContentAsideAtom = atom(false);
\ No newline at end of file
diff --git a/apps/client/src/features/share/components/share-action-menu.tsx b/apps/client/src/features/share/components/share-action-menu.tsx
new file mode 100644
index 00000000..398e25e9
--- /dev/null
+++ b/apps/client/src/features/share/components/share-action-menu.tsx
@@ -0,0 +1,106 @@
+import { Menu, ActionIcon, Text } from "@mantine/core";
+import React from "react";
+import {
+ IconCopy,
+ IconDots,
+ IconFileDescription,
+ IconTrash,
+} from "@tabler/icons-react";
+import { modals } from "@mantine/modals";
+import { useTranslation } from "react-i18next";
+import { ISharedItem } from "@/features/share/types/share.types.ts";
+import {
+ buildPageUrl,
+ buildSharedPageUrl,
+} from "@/features/page/page.utils.ts";
+import { useClipboard } from "@mantine/hooks";
+import { notifications } from "@mantine/notifications";
+import { useNavigate } from "react-router-dom";
+import { useDeleteShareMutation } from "@/features/share/queries/share-query.ts";
+
+interface Props {
+ share: ISharedItem;
+}
+export default function ShareActionMenu({ share }: Props) {
+ const { t } = useTranslation();
+ const navigate = useNavigate();
+ const clipboard = useClipboard();
+ const deleteShareMutation = useDeleteShareMutation();
+
+ const openPage = () => {
+ const pageLink = buildPageUrl(
+ share.space.slug,
+ share.page.slugId,
+ share.page.title,
+ );
+ navigate(pageLink);
+ };
+
+ const copyLink = () => {
+ const shareLink = buildSharedPageUrl({
+ shareId: share.key,
+ pageTitle: share.page.title,
+ pageSlugId: share.page.slugId,
+ });
+
+ clipboard.copy(shareLink);
+ notifications.show({ message: t("Link copied") });
+ };
+ const onDelete = async () => {
+ deleteShareMutation.mutateAsync(share.key);
+ };
+
+ const openDeleteModal = () =>
+ modals.openConfirmModal({
+ title: t("Delete public share link"),
+ children: (
+
+ {t("Are you sure you want to delete this shared link?")}
+
+ ),
+ centered: true,
+ labels: { confirm: t("Delete"), cancel: t("Don't") },
+ confirmProps: { color: "red" },
+ onConfirm: onDelete,
+ });
+
+ return (
+ <>
+
+
+ );
+}
diff --git a/apps/client/src/features/share/components/share-layout.tsx b/apps/client/src/features/share/components/share-layout.tsx
new file mode 100644
index 00000000..e3b2eb17
--- /dev/null
+++ b/apps/client/src/features/share/components/share-layout.tsx
@@ -0,0 +1,10 @@
+import { Outlet } from "react-router-dom";
+import ShareShell from "@/features/share/components/share-shell.tsx";
+
+export default function ShareLayout() {
+ return (
+
+
+ );
+}
diff --git a/apps/client/src/features/share/components/share-list.tsx b/apps/client/src/features/share/components/share-list.tsx
new file mode 100644
index 00000000..d5acbbd6
--- /dev/null
+++ b/apps/client/src/features/share/components/share-list.tsx
@@ -0,0 +1,97 @@
+import { Table, Group, Text, Anchor } from "@mantine/core";
+import React, { useState } from "react";
+import { Link } from "react-router-dom";
+import { useTranslation } from "react-i18next";
+import Paginate from "@/components/common/paginate.tsx";
+import { useGetSharesQuery } from "@/features/share/queries/share-query.ts";
+import { ISharedItem } from "@/features/share/types/share.types.ts";
+import { format } from "date-fns";
+import ShareActionMenu from "@/features/share/components/share-action-menu.tsx";
+import { buildSharedPageUrl } from "@/features/page/page.utils.ts";
+import { getPageIcon } from "@/lib";
+import { CustomAvatar } from "@/components/ui/custom-avatar.tsx";
+import classes from "./share.module.css";
+
+export default function ShareList() {
+ const { t } = useTranslation();
+ const [page, setPage] = useState(1);
+ const { data, isLoading } = useGetSharesQuery({ page });
+
+ return (
+ <>
+
+
+
+
+
+ {data?.items.length > 0 && (
+ (false);
+ useEffect(() => {
+ if (share) {
+ setIsPagePublic(true);
+ } else {
+ setIsPagePublic(false);
+ }
+ }, [share, pageId]);
+
+ const handleChange = async (event: React.ChangeEvent) => {
+ const value = event.currentTarget.checked;
+
+ if (value) {
+ createShareMutation.mutateAsync({
+ pageId: pageId,
+ includeSubPages: true,
+ searchIndexing: true,
+ });
+ setIsPagePublic(value);
+ } else {
+ if (share && share.id) {
+ deleteShareMutation.mutateAsync(share.id);
+ setIsPagePublic(value);
+ }
+ }
+ };
+
+ const handleSubPagesChange = async (
+ event: React.ChangeEvent,
+ ) => {
+ const value = event.currentTarget.checked;
+ updateShareMutation.mutateAsync({
+ shareId: share.id,
+ includeSubPages: value,
+ });
+ };
+
+ const handleIndexSearchChange = async (
+ event: React.ChangeEvent,
+ ) => {
+ const value = event.currentTarget.checked;
+ updateShareMutation.mutateAsync({
+ shareId: share.id,
+ searchIndexing: value,
+ });
+ };
+
+ const shareLink = useMemo(() => (
+
+
+
+
+ ), [publicLink]);
+
+ return (
+
+
+
+
+
+ {isDescendantShared ? (
+ <>
+ {t("Inherits public sharing from")}
+
+
+ {getPageIcon(share.sharedPage.icon)}
+
+
+
+ {shareLink}
+
+ ) : (
+ <>
+
+
+
+ {pageIsShared && (
+ <>
+ {shareLink}
+
+
+
+
+
+ )}
+
+ )}
+
+
+ );
+}
diff --git a/apps/client/src/features/share/components/share-shell.tsx b/apps/client/src/features/share/components/share-shell.tsx
new file mode 100644
index 00000000..82863b34
--- /dev/null
+++ b/apps/client/src/features/share/components/share-shell.tsx
@@ -0,0 +1,196 @@
+import React, { useState } from "react";
+import {
+ ActionIcon,
+ Affix,
+ AppShell,
+ Button,
+ Group,
+ ScrollArea,
+ Tooltip,
+} from "@mantine/core";
+import { useGetSharedPageTreeQuery } from "@/features/share/queries/share-query.ts";
+import { useParams } from "react-router-dom";
+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 { useAtom } from "jotai";
+import {
+ desktopSidebarAtom,
+ mobileSidebarAtom,
+} from "@/components/layouts/global/hooks/atoms/sidebar-atom.ts";
+import SidebarToggle from "@/components/ui/sidebar-toggle-button.tsx";
+import { useTranslation } from "react-i18next";
+import { useToggleSidebar } from "@/components/layouts/global/hooks/hooks/use-toggle-sidebar.ts";
+import {
+ mobileTableOfContentAsideAtom,
+ tableOfContentAsideAtom,
+} from "@/features/share/atoms/sidebar-atom.ts";
+import { IconList } from "@tabler/icons-react";
+import { useToggleToc } from "@/features/share/hooks/use-toggle-toc.ts";
+import classes from "./share.module.css";
+import { useClickOutside } from "@mantine/hooks";
+
+const MemoizedSharedTree = React.memo(SharedTree);
+
+export default function ShareShell({
+ children,
+}: {
+ children: React.ReactNode;
+}) {
+ const { t } = useTranslation();
+ const [mobileOpened] = useAtom(mobileSidebarAtom);
+ const [desktopOpened] = useAtom(desktopSidebarAtom);
+ const toggleMobile = useToggleSidebar(mobileSidebarAtom);
+ const toggleDesktop = useToggleSidebar(desktopSidebarAtom);
+
+ const [tocOpened] = useAtom(tableOfContentAsideAtom);
+ const [mobileTocOpened] = useAtom(mobileTableOfContentAsideAtom);
+ const toggleTocMobile = useToggleToc(mobileTableOfContentAsideAtom);
+ const toggleToc = useToggleToc(tableOfContentAsideAtom);
+
+ const { shareId } = useParams();
+ const { data } = useGetSharedPageTreeQuery(shareId);
+ const readOnlyEditor = useAtomValue(readOnlyEditorAtom);
+
+ const [navbarOutside, setNavbarOutside] = useState(null);
+ const [asideOutside, setAsideOutside] = useState(null);
+
+ useClickOutside(
+ () => {
+ if (mobileOpened) {
+ toggleMobile();
+ }
+ if (mobileTocOpened) {
+ toggleTocMobile();
+ }
+ },
+ null,
+ [navbarOutside, asideOutside],
+ );
+
+ return (
+ 1 && {
+ navbar: {
+ width: 300,
+ breakpoint: "sm",
+ collapsed: {
+ mobile: !mobileOpened,
+ desktop: !desktopOpened,
+ },
+ },
+ })}
+ aside={{
+ width: 300,
+ breakpoint: "sm",
+ collapsed: {
+ mobile: !mobileTocOpened,
+ desktop: !tocOpened,
+ },
+ }}
+ padding="md"
+ >
+
+
+
+ {data?.pageTree?.length > 1 && (
+ <>
+
+
+
+
+
+
+ )}
+
+
+ <>
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {data?.pageTree?.length > 1 && (
+
+
+ )}
+
+
+ {children}
+
+
+
+
+
+
+
+
+
+
+
+ );
+}
diff --git a/apps/client/src/features/share/components/share.module.css b/apps/client/src/features/share/components/share.module.css
new file mode 100644
index 00000000..617768ff
--- /dev/null
+++ b/apps/client/src/features/share/components/share.module.css
@@ -0,0 +1,20 @@
+.shareLinkText {
+ @mixin light {
+ border-bottom: 0.05em solid var(--mantine-color-dark-0);
+ }
+ @mixin dark {
+ border-bottom: 0.05em solid var(--mantine-color-dark-2);
+ }
+}
+
+.treeNode {
+ text-decoration: none;
+ user-select: none;
+}
+
+.navbar,
+.aside {
+ @media (max-width: $mantine-breakpoint-sm) {
+ width: 350px;
+ }
+}
diff --git a/apps/client/src/features/share/components/shared-tree.tsx b/apps/client/src/features/share/components/shared-tree.tsx
new file mode 100644
index 00000000..5e85ab57
--- /dev/null
+++ b/apps/client/src/features/share/components/shared-tree.tsx
@@ -0,0 +1,179 @@
+import { ISharedPageTree } from "@/features/share/types/share.types.ts";
+import { NodeApi, NodeRendererProps, Tree, TreeApi } from "react-arborist";
+import {
+ buildSharedPageTree,
+ SharedPageTreeNode,
+} from "@/features/share/utils.ts";
+import { useEffect, useMemo, useRef, useState } from "react";
+import { useElementSize, useMergedRef } from "@mantine/hooks";
+import { SpaceTreeNode } from "@/features/page/tree/types.ts";
+import { Link, useParams } from "react-router-dom";
+import { atom, useAtom } from "jotai/index";
+import { useTranslation } from "react-i18next";
+import { buildSharedPageUrl } from "@/features/page/page.utils.ts";
+import clsx from "clsx";
+import {
+ IconChevronDown,
+ IconChevronRight,
+ IconPointFilled,
+} from "@tabler/icons-react";
+import { ActionIcon, Box } from "@mantine/core";
+import { extractPageSlugId } from "@/lib";
+import { OpenMap } from "react-arborist/dist/main/state/open-slice";
+import classes from "@/features/page/tree/styles/tree.module.css";
+import styles from "./share.module.css";
+import { mobileSidebarAtom } from "@/components/layouts/global/hooks/atoms/sidebar-atom.ts";
+
+interface SharedTree {
+ sharedPageTree: ISharedPageTree;
+}
+
+const openSharedTreeNodesAtom = atom({});
+
+export default function SharedTree({ sharedPageTree }: SharedTree) {
+ const [tree, setTree] = useState<
+ TreeApi | null | undefined
+ >(null);
+ const rootElement = useRef();
+ const { ref: sizeRef, width, height } = useElementSize();
+ const mergedRef = useMergedRef(rootElement, sizeRef);
+ const { pageSlug } = useParams();
+ const [openTreeNodes, setOpenTreeNodes] = useAtom(
+ openSharedTreeNodesAtom,
+ );
+
+ const currentNodeId = extractPageSlugId(pageSlug);
+
+ const treeData: SharedPageTreeNode[] = useMemo(() => {
+ if (!sharedPageTree?.pageTree) return;
+ return buildSharedPageTree(sharedPageTree.pageTree);
+ }, [sharedPageTree?.pageTree]);
+
+ useEffect(() => {
+ const parentNodeId = treeData?.[0]?.slugId;
+
+ if (parentNodeId && tree) {
+ const parentNode = tree.get(parentNodeId);
+
+ setTimeout(() => {
+ if (parentNode) {
+ tree.openSiblings(parentNode);
+ }
+ });
+
+ // open direct children of parent node
+ parentNode?.children.forEach((node) => {
+ tree.openSiblings(node);
+ });
+ }
+ }, [treeData, tree]);
+
+ useEffect(() => {
+ if (currentNodeId && tree) {
+ setTimeout(() => {
+ // focus on node and open all parents
+ tree?.select(currentNodeId, { align: "auto" });
+ }, 200);
+ } else {
+ tree?.deselectAll();
+ }
+ }, [currentNodeId, tree]);
+
+ if (!sharedPageTree || !sharedPageTree?.pageTree) {
+ return null;
+ }
+
+ return (
+ ) {
+ const { shareId } = useParams();
+ const { t } = useTranslation();
+ const [, setMobileSidebarState] = useAtom(mobileSidebarAtom);
+
+ const pageUrl = buildSharedPageUrl({
+ shareId: shareId,
+ pageSlugId: node.data.slugId,
+ pageTitle: node.data.name,
+ });
+
+ return (
+ <>
+ {
+ setMobileSidebarState(false);
+ }}
+ >
+
+
+ );
+}
+
+interface PageArrowProps {
+ node: NodeApi;
+}
+
+function PageArrow({ node }: PageArrowProps) {
+ return (
+ {
+ e.preventDefault();
+ e.stopPropagation();
+ node.toggle();
+ }}
+ >
+ {node.isInternal ? (
+ node.children && (node.children.length > 0 || node.data.hasChildren) ? (
+ node.isOpen ? (
+
+ );
+}
diff --git a/apps/client/src/features/share/hooks/use-toggle-toc.ts b/apps/client/src/features/share/hooks/use-toggle-toc.ts
new file mode 100644
index 00000000..ec43086a
--- /dev/null
+++ b/apps/client/src/features/share/hooks/use-toggle-toc.ts
@@ -0,0 +1,8 @@
+import { useAtom } from "jotai";
+
+export function useToggleToc(tocAtom: any) {
+ const [tocState, setTocState] = useAtom(tocAtom);
+ return () => {
+ setTocState(!tocState);
+ }
+}
diff --git a/apps/client/src/features/share/queries/share-query.ts b/apps/client/src/features/share/queries/share-query.ts
new file mode 100644
index 00000000..dea047bf
--- /dev/null
+++ b/apps/client/src/features/share/queries/share-query.ts
@@ -0,0 +1,179 @@
+import {
+ keepPreviousData,
+ useMutation,
+ useQuery,
+ useQueryClient,
+ UseQueryResult,
+} from "@tanstack/react-query";
+import { notifications } from "@mantine/notifications";
+import { useTranslation } from "react-i18next";
+import {
+ ICreateShare,
+ IShare,
+ ISharedItem,
+ ISharedPage,
+ ISharedPageTree,
+ IShareForPage,
+ IShareInfoInput,
+ IUpdateShare,
+} from "@/features/share/types/share.types.ts";
+import {
+ createShare,
+ deleteShare,
+ getSharedPageTree,
+ getShareForPage,
+ getShareInfo,
+ getSharePageInfo,
+ getShares,
+ updateShare,
+} from "@/features/share/services/share-service.ts";
+import { IPage } from "@/features/page/types/page.types.ts";
+import { IPagination, QueryParams } from "@/lib/types.ts";
+import { useEffect } from "react";
+
+export function useGetSharesQuery(
+ params?: QueryParams,
+): UseQueryResult, Error> {
+ return useQuery({
+ queryKey: ["share-list"],
+ queryFn: () => getShares(params),
+ placeholderData: keepPreviousData,
+ });
+}
+
+export function useGetShareByIdQuery(
+ shareId: string,
+): UseQueryResult {
+ const query = useQuery({
+ queryKey: ["share-by-id", shareId],
+ queryFn: () => getShareInfo(shareId),
+ enabled: !!shareId,
+ });
+
+ return query;
+}
+
+export function useSharePageQuery(
+ shareInput: Partial,
+): UseQueryResult {
+ const query = useQuery({
+ queryKey: ["shares", shareInput],
+ queryFn: () => getSharePageInfo(shareInput),
+ enabled: !!shareInput.pageId,
+ });
+
+ return query;
+}
+
+export function useShareForPageQuery(
+ pageId: string,
+): UseQueryResult {
+ const query = useQuery({
+ queryKey: ["share-for-page", pageId],
+ queryFn: () => getShareForPage(pageId),
+ enabled: !!pageId,
+ staleTime: 0,
+ retry: false,
+ });
+
+ return query;
+}
+
+export function useCreateShareMutation() {
+ const { t } = useTranslation();
+ const queryClient = useQueryClient();
+
+ return useMutation({
+ mutationFn: (data) => createShare(data),
+ onSuccess: (data) => {
+ queryClient.invalidateQueries({
+ predicate: (item) =>
+ ["share-for-page", "share-list"].includes(item.queryKey[0] as string),
+ });
+ },
+ onError: (error) => {
+ notifications.show({ message: t("Failed to share page"), color: "red" });
+ },
+ });
+}
+
+export function useUpdateShareMutation() {
+ const { t } = useTranslation();
+ const queryClient = useQueryClient();
+
+ return useMutation({
+ mutationFn: (data) => updateShare(data),
+ onSuccess: (data) => {
+ queryClient.invalidateQueries({
+ predicate: (item) =>
+ ["share-for-page", "share-list"].includes(item.queryKey[0] as string),
+ });
+ },
+ onError: (error, params) => {
+ if (error?.["status"] === 404) {
+ queryClient.removeQueries({
+ predicate: (item) =>
+ ["share-for-page"].includes(item.queryKey[0] as string),
+ });
+
+ notifications.show({
+ message: t("Share not found"),
+ color: "red",
+ });
+ return;
+ }
+
+ notifications.show({
+ message: error?.["response"]?.data?.message || "Share not found",
+ color: "red",
+ });
+ },
+ });
+}
+
+export function useDeleteShareMutation() {
+ const { t } = useTranslation();
+ const queryClient = useQueryClient();
+
+ return useMutation({
+ mutationFn: (shareId: string) => deleteShare(shareId),
+ onSuccess: (data) => {
+ queryClient.removeQueries({
+ predicate: (item) =>
+ ["share-for-page"].includes(item.queryKey[0] as string),
+ });
+
+ queryClient.invalidateQueries({
+ predicate: (item) =>
+ ["share-list"].includes(item.queryKey[0] as string),
+ });
+
+ notifications.show({ message: t("Share deleted successfully") });
+ },
+ onError: (error) => {
+ if (error?.["status"] === 404) {
+ queryClient.removeQueries({
+ predicate: (item) =>
+ ["share-for-page"].includes(item.queryKey[0] as string),
+ });
+ }
+
+ notifications.show({
+ message: error?.["response"]?.data?.message || "Failed to delete share",
+ color: "red",
+ });
+ },
+ });
+}
+
+export function useGetSharedPageTreeQuery(
+ shareId: string,
+): UseQueryResult {
+ return useQuery({
+ queryKey: ["shared-page-tree", shareId],
+ queryFn: () => getSharedPageTree(shareId),
+ enabled: !!shareId,
+ placeholderData: keepPreviousData,
+ staleTime: 60 * 60 * 1000,
+ });
+}
diff --git a/apps/client/src/features/share/services/share-service.ts b/apps/client/src/features/share/services/share-service.ts
new file mode 100644
index 00000000..2f43ba20
--- /dev/null
+++ b/apps/client/src/features/share/services/share-service.ts
@@ -0,0 +1,59 @@
+import api from "@/lib/api-client";
+import { IPage } from "@/features/page/types/page.types";
+
+import {
+ ICreateShare,
+ IShare,
+ ISharedItem,
+ ISharedPage,
+ ISharedPageTree,
+ IShareForPage,
+ IShareInfoInput,
+ IUpdateShare,
+} from "@/features/share/types/share.types.ts";
+import { IPagination, QueryParams } from "@/lib/types.ts";
+
+export async function getShares(
+ params?: QueryParams,
+): Promise> {
+ const req = await api.post("/shares", params);
+ return req.data;
+}
+
+export async function createShare(data: ICreateShare): Promise {
+ const req = await api.post("/shares/create", data);
+ return req.data;
+}
+
+export async function getShareInfo(shareId: string): Promise {
+ const req = await api.post("/shares/info", { shareId });
+ return req.data;
+}
+
+export async function updateShare(data: IUpdateShare): Promise {
+ const req = await api.post("/shares/update", data);
+ return req.data;
+}
+
+export async function getShareForPage(pageId: string): Promise {
+ const req = await api.post("/shares/for-page", { pageId });
+ return req.data;
+}
+
+export async function getSharePageInfo(
+ shareInput: Partial,
+): Promise {
+ const req = await api.post("/shares/page-info", shareInput);
+ return req.data;
+}
+
+export async function deleteShare(shareId: string): Promise {
+ await api.post("/shares/delete", { shareId });
+}
+
+export async function getSharedPageTree(
+ shareId: string,
+): Promise {
+ const req = await api.post("/shares/tree", { shareId });
+ return req.data;
+}
diff --git a/apps/client/src/features/share/types/share.types.ts b/apps/client/src/features/share/types/share.types.ts
new file mode 100644
index 00000000..c40801e8
--- /dev/null
+++ b/apps/client/src/features/share/types/share.types.ts
@@ -0,0 +1,73 @@
+import { IPage } from "@/features/page/types/page.types.ts";
+
+export interface IShare {
+ id: string;
+ key: string;
+ pageId: string;
+ includeSubPages: boolean;
+ searchIndexing: boolean;
+ creatorId: string;
+ spaceId: string;
+ workspaceId: string;
+ createdAt: string;
+ updatedAt: string;
+ deletedAt: string | null;
+ sharedPage?: ISharePage;
+}
+
+export interface ISharedItem extends IShare {
+ page: {
+ id: string;
+ title: string;
+ slugId: string;
+ icon: string | null;
+ };
+ space: {
+ id: string;
+ name: string;
+ slug: string;
+ userRole: string;
+ };
+ creator: {
+ id: string;
+ name: string;
+ avatarUrl: string | null;
+ };
+}
+
+export interface ISharedPage extends IShare {
+ page: IPage;
+ share: IShare & {
+ level: number;
+ sharedPage: { id: string; slugId: string; title: string; icon: string };
+ };
+}
+
+export interface IShareForPage extends IShare {
+ level: number;
+ sharedPage: ISharePage;
+}
+
+interface ISharePage {
+ id: string;
+ slugId: string;
+ title: string;
+ icon: string;
+}
+
+export interface ICreateShare {
+ pageId?: string;
+ includeSubPages?: boolean;
+ searchIndexing?: boolean;
+}
+
+export type IUpdateShare = ICreateShare & { shareId: string; pageId?: string };
+
+export interface IShareInfoInput {
+ pageId: string;
+}
+
+export interface ISharedPageTree {
+ share: IShare;
+ pageTree: Partial;
+}
diff --git a/apps/client/src/features/share/utils.ts b/apps/client/src/features/share/utils.ts
new file mode 100644
index 00000000..74ec349f
--- /dev/null
+++ b/apps/client/src/features/share/utils.ts
@@ -0,0 +1,60 @@
+import { IPage } from "@/features/page/types/page.types.ts";
+import { sortPositionKeys } from "@/features/page/tree/utils";
+
+export type SharedPageTreeNode = {
+ id: string;
+ slugId: string;
+ name: string;
+ icon?: string;
+ position: string;
+ spaceId: string;
+ parentPageId: string;
+ hasChildren: boolean;
+ children: SharedPageTreeNode[];
+ label: string,
+ value: string,
+};
+
+export function buildSharedPageTree(pages: Partial): SharedPageTreeNode[] {
+ const pageMap: Record = {};
+
+ // Initialize each page as a tree node and store it in a map.
+ pages.forEach((page) => {
+ pageMap[page.id] = {
+ id: page.slugId,
+ slugId: page.slugId,
+ name: page.title,
+ icon: page.icon,
+ position: page.position,
+ // Initially assume a page has no children.
+ hasChildren: false,
+ spaceId: page.spaceId,
+ parentPageId: page.parentPageId,
+ label: page.title || 'untitled',
+ value: page.id,
+ children: [],
+ };
+ });
+
+ // Build the tree structure.
+ const tree: SharedPageTreeNode[] = [];
+ pages.forEach((page) => {
+ if (page.parentPageId) {
+ // If the page has a parent, add it as a child of the parent node.
+ const parentNode = pageMap[page.parentPageId];
+ if (parentNode) {
+ parentNode.children.push(pageMap[page.id]);
+ parentNode.hasChildren = true;
+ } else {
+ // Parent not found – treat this page as a top-level node.
+ tree.push(pageMap[page.id]);
+ }
+ } else {
+ // No parentPageId indicates a top-level page.
+ tree.push(pageMap[page.id]);
+ }
+ });
+
+ // Return the sorted tree.
+ return sortPositionKeys(tree);
+}
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 1df7a2c1..528e8051 100644
--- a/apps/client/src/features/space/components/sidebar/space-sidebar.tsx
+++ b/apps/client/src/features/space/components/sidebar/space-sidebar.tsx
@@ -38,6 +38,8 @@ import PageImportModal from "@/features/page/components/page-import-modal.tsx";
import { useTranslation } from "react-i18next";
import { SwitchSpace } from "./switch-space";
import ExportModal from "@/components/common/export-modal";
+import { mobileSidebarAtom } from "@/components/layouts/global/hooks/atoms/sidebar-atom.ts";
+import { useToggleSidebar } from "@/components/layouts/global/hooks/hooks/use-toggle-sidebar.ts";
export function SpaceSidebar() {
const { t } = useTranslation();
@@ -45,6 +47,9 @@ export function SpaceSidebar() {
const location = useLocation();
const [opened, { open: openSettings, close: closeSettings }] =
useDisclosure(false);
+ const [mobileSidebarOpened] = useAtom(mobileSidebarAtom);
+ const toggleMobileSidebar = useToggleSidebar(mobileSidebarAtom);
+
const { spaceSlug } = useParams();
const { data: space, isLoading, isError } = useGetSpaceBySlugQuery(spaceSlug);
@@ -123,7 +128,12 @@ export function SpaceSidebar() {
) && (
{
+ handleCreatePage();
+ if (mobileSidebarOpened) {
+ toggleMobileSidebar();
+ }
+ }}
>
+
+
+ {t("Public sharing")} - {getAppName()}
+
+
+ {
+ const { attachmentId, pageId, workspaceId } = opts;
+ const payload: JwtAttachmentPayload = {
+ attachmentId: attachmentId,
+ pageId: pageId,
+ workspaceId: workspaceId,
+ type: JwtType.ATTACHMENT,
+ };
+ return this.jwtService.sign(payload, { expiresIn: '1h' });
+ }
+
async verifyJwt(token: string, tokenType: string) {
const payload = await this.jwtService.verifyAsync(token, {
secret: this.environmentService.getAppSecret(),
diff --git a/apps/server/src/core/casl/abilities/space-ability.factory.ts b/apps/server/src/core/casl/abilities/space-ability.factory.ts
index d2173383..53a57a0c 100644
--- a/apps/server/src/core/casl/abilities/space-ability.factory.ts
+++ b/apps/server/src/core/casl/abilities/space-ability.factory.ts
@@ -45,6 +45,7 @@ function buildSpaceAdminAbility() {
can(SpaceCaslAction.Manage, SpaceCaslSubject.Settings);
can(SpaceCaslAction.Manage, SpaceCaslSubject.Member);
can(SpaceCaslAction.Manage, SpaceCaslSubject.Page);
+ can(SpaceCaslAction.Manage, SpaceCaslSubject.Share);
return build();
}
@@ -55,6 +56,7 @@ function buildSpaceWriterAbility() {
can(SpaceCaslAction.Read, SpaceCaslSubject.Settings);
can(SpaceCaslAction.Read, SpaceCaslSubject.Member);
can(SpaceCaslAction.Manage, SpaceCaslSubject.Page);
+ can(SpaceCaslAction.Manage, SpaceCaslSubject.Share);
return build();
}
@@ -65,5 +67,6 @@ function buildSpaceReaderAbility() {
can(SpaceCaslAction.Read, SpaceCaslSubject.Settings);
can(SpaceCaslAction.Read, SpaceCaslSubject.Member);
can(SpaceCaslAction.Read, SpaceCaslSubject.Page);
+ can(SpaceCaslAction.Read, SpaceCaslSubject.Share);
return build();
}
diff --git a/apps/server/src/core/casl/interfaces/space-ability.type.ts b/apps/server/src/core/casl/interfaces/space-ability.type.ts
index c927229b..d7801cab 100644
--- a/apps/server/src/core/casl/interfaces/space-ability.type.ts
+++ b/apps/server/src/core/casl/interfaces/space-ability.type.ts
@@ -9,9 +9,11 @@ export enum SpaceCaslSubject {
Settings = 'settings',
Member = 'member',
Page = 'page',
+ Share = 'share',
}
export type ISpaceAbility =
| [SpaceCaslAction, SpaceCaslSubject.Settings]
| [SpaceCaslAction, SpaceCaslSubject.Member]
- | [SpaceCaslAction, SpaceCaslSubject.Page];
+ | [SpaceCaslAction, SpaceCaslSubject.Page]
+ | [SpaceCaslAction, SpaceCaslSubject.Share];
diff --git a/apps/server/src/core/core.module.ts b/apps/server/src/core/core.module.ts
index 182a1420..f7f4f785 100644
--- a/apps/server/src/core/core.module.ts
+++ b/apps/server/src/core/core.module.ts
@@ -15,6 +15,7 @@ import { SpaceModule } from './space/space.module';
import { GroupModule } from './group/group.module';
import { CaslModule } from './casl/casl.module';
import { DomainMiddleware } from '../common/middlewares/domain.middleware';
+import { ShareModule } from './share/share.module';
@Module({
imports: [
@@ -28,6 +29,7 @@ import { DomainMiddleware } from '../common/middlewares/domain.middleware';
SpaceModule,
GroupModule,
CaslModule,
+ ShareModule,
],
})
export class CoreModule implements NestModule {
diff --git a/apps/server/src/core/page/services/page.service.ts b/apps/server/src/core/page/services/page.service.ts
index 43d8f1d2..5e4553c6 100644
--- a/apps/server/src/core/page/services/page.service.ts
+++ b/apps/server/src/core/page/services/page.service.ts
@@ -212,7 +212,7 @@ export class PageService {
trx,
);
const pageIds = await this.pageRepo
- .getPageAndDescendants(rootPage.id)
+ .getPageAndDescendants(rootPage.id, { includeContent: false })
.then((pages) => pages.map((page) => page.id));
// The first id is the root page id
if (pageIds.length > 1) {
@@ -223,6 +223,16 @@ export class PageService {
trx,
);
}
+
+ // update spaceId in shares
+ if (pageIds.length > 0) {
+ await trx
+ .updateTable('shares')
+ .set({ spaceId: spaceId })
+ .where('pageId', 'in', pageIds)
+ .execute();
+ }
+
// Update attachments
await this.attachmentRepo.updateAttachmentsByPageId(
{ spaceId },
diff --git a/apps/server/src/core/share/dto/share.dto.ts b/apps/server/src/core/share/dto/share.dto.ts
new file mode 100644
index 00000000..b6e789ec
--- /dev/null
+++ b/apps/server/src/core/share/dto/share.dto.ts
@@ -0,0 +1,58 @@
+import {
+ IsBoolean,
+ IsNotEmpty,
+ IsOptional,
+ IsString,
+ IsUUID,
+} from 'class-validator';
+
+export class CreateShareDto {
+ @IsString()
+ @IsNotEmpty()
+ pageId: string;
+
+ @IsBoolean()
+ @IsOptional()
+ includeSubPages: boolean;
+
+ @IsOptional()
+ @IsBoolean()
+ searchIndexing: boolean;
+}
+
+export class UpdateShareDto extends CreateShareDto {
+ @IsString()
+ @IsNotEmpty()
+ shareId: string;
+
+ @IsString()
+ @IsOptional()
+ pageId: string;
+}
+
+export class ShareIdDto {
+ @IsString()
+ @IsNotEmpty()
+ shareId: string;
+}
+
+export class SpaceIdDto {
+ @IsUUID()
+ spaceId: string;
+}
+
+export class ShareInfoDto {
+ @IsString()
+ @IsOptional()
+ shareId?: string;
+
+ @IsString()
+ @IsOptional()
+ pageId: string;
+}
+
+export class SharePageIdDto {
+ @IsString()
+ @IsNotEmpty()
+ pageId: string;
+}
diff --git a/apps/server/src/core/share/share-seo.controller.ts b/apps/server/src/core/share/share-seo.controller.ts
new file mode 100644
index 00000000..ecacecf0
--- /dev/null
+++ b/apps/server/src/core/share/share-seo.controller.ts
@@ -0,0 +1,109 @@
+import { Controller, Get, Param, Req, Res } from '@nestjs/common';
+import { ShareService } from './share.service';
+import { FastifyReply, FastifyRequest } from 'fastify';
+import { join } from 'path';
+import * as fs from 'node:fs';
+import { validate as isValidUUID } from 'uuid';
+import { WorkspaceRepo } from '@docmost/db/repos/workspace/workspace.repo';
+import { EnvironmentService } from '../../integrations/environment/environment.service';
+import { Workspace } from '@docmost/db/types/entity.types';
+
+@Controller('share')
+export class ShareSeoController {
+ constructor(
+ private readonly shareService: ShareService,
+ private workspaceRepo: WorkspaceRepo,
+ private environmentService: EnvironmentService,
+ ) {}
+
+ /*
+ * add meta tags to publicly shared pages
+ */
+ @Get([':shareId/p/:pageSlug', 'p/:pageSlug'])
+ async getShare(
+ @Res({ passthrough: false }) res: FastifyReply,
+ @Req() req: FastifyRequest,
+ @Param('shareId') shareId: string,
+ @Param('pageSlug') pageSlug: string,
+ ) {
+ // Nestjs does not to apply middlewares to paths excluded from the global /api prefix
+ // https://github.com/nestjs/nest/issues/9124
+ // https://github.com/nestjs/nest/issues/11572
+ // https://github.com/nestjs/nest/issues/13401
+ // we have to duplicate the DomainMiddleware code here as a workaround
+
+ let workspace: Workspace = null;
+ if (this.environmentService.isSelfHosted()) {
+ workspace = await this.workspaceRepo.findFirst();
+ } else {
+ const header = req.raw.headers.host;
+ const subdomain = header.split('.')[0];
+ workspace = await this.workspaceRepo.findByHostname(subdomain);
+ }
+
+ const clientDistPath = join(
+ __dirname,
+ '..',
+ '..',
+ '..',
+ '..',
+ 'client/dist',
+ );
+
+ if (fs.existsSync(clientDistPath)) {
+ const indexFilePath = join(clientDistPath, 'index.html');
+
+ if (!workspace) {
+ return this.sendIndex(indexFilePath, res);
+ }
+
+ const pageId = this.extractPageSlugId(pageSlug);
+
+ const share = await this.shareService.getShareForPage(
+ pageId,
+ workspace.id,
+ );
+
+ if (!share) {
+ return this.sendIndex(indexFilePath, res);
+ }
+
+ const rawTitle = share.sharedPage.title ?? 'untitled';
+ const metaTitle =
+ rawTitle.length > 80 ? `${rawTitle.slice(0, 77)}…` : rawTitle;
+
+ const metaTagVar = '';
+
+ const metaTags = [
+ ``,
+ ``,
+ !share.searchIndexing ? `` : '',
+ ]
+ .filter(Boolean)
+ .join('\n ');
+
+ const html = fs.readFileSync(indexFilePath, 'utf8');
+ const transformedHtml = html
+ .replace(/[\s\S]*?<\/title>/i, `<title>${metaTitle} `)
+ .replace(metaTagVar, metaTags);
+
+ res.type('text/html').send(transformedHtml);
+ }
+ }
+
+ sendIndex(indexFilePath: string, res: FastifyReply) {
+ const stream = fs.createReadStream(indexFilePath);
+ res.type('text/html').send(stream);
+ }
+
+ extractPageSlugId(slug: string): string {
+ if (!slug) {
+ return undefined;
+ }
+ if (isValidUUID(slug)) {
+ return slug;
+ }
+ const parts = slug.split('-');
+ return parts.length > 1 ? parts[parts.length - 1] : slug;
+ }
+}
diff --git a/apps/server/src/core/share/share.controller.ts b/apps/server/src/core/share/share.controller.ts
new file mode 100644
index 00000000..5e8debe0
--- /dev/null
+++ b/apps/server/src/core/share/share.controller.ts
@@ -0,0 +1,171 @@
+import {
+ BadRequestException,
+ Body,
+ Controller,
+ ForbiddenException,
+ HttpCode,
+ HttpStatus,
+ NotFoundException,
+ Post,
+ UseGuards,
+} from '@nestjs/common';
+import { AuthUser } from '../../common/decorators/auth-user.decorator';
+import { User, Workspace } from '@docmost/db/types/entity.types';
+import {
+ SpaceCaslAction,
+ SpaceCaslSubject,
+} from '../casl/interfaces/space-ability.type';
+import { AuthWorkspace } from '../../common/decorators/auth-workspace.decorator';
+import SpaceAbilityFactory from '../casl/abilities/space-ability.factory';
+import { ShareService } from './share.service';
+import {
+ CreateShareDto,
+ ShareIdDto,
+ ShareInfoDto,
+ SharePageIdDto,
+ UpdateShareDto,
+} from './dto/share.dto';
+import { PageRepo } from '@docmost/db/repos/page/page.repo';
+import { JwtAuthGuard } from '../../common/guards/jwt-auth.guard';
+import { Public } from '../../common/decorators/public.decorator';
+import { ShareRepo } from '@docmost/db/repos/share/share.repo';
+import { PaginationOptions } from '@docmost/db/pagination/pagination-options';
+
+@UseGuards(JwtAuthGuard)
+@Controller('shares')
+export class ShareController {
+ constructor(
+ private readonly shareService: ShareService,
+ private readonly spaceAbility: SpaceAbilityFactory,
+ private readonly shareRepo: ShareRepo,
+ private readonly pageRepo: PageRepo,
+ ) {}
+
+ @HttpCode(HttpStatus.OK)
+ @Post('/')
+ async getShares(
+ @AuthUser() user: User,
+ @Body() pagination: PaginationOptions,
+ ) {
+ return this.shareRepo.getShares(user.id, pagination);
+ }
+
+ @Public()
+ @HttpCode(HttpStatus.OK)
+ @Post('/page-info')
+ async getSharedPageInfo(
+ @Body() dto: ShareInfoDto,
+ @AuthWorkspace() workspace: Workspace,
+ ) {
+ if (!dto.pageId && !dto.shareId) {
+ throw new BadRequestException();
+ }
+
+ return this.shareService.getSharedPage(dto, workspace.id);
+ }
+
+ @Public()
+ @HttpCode(HttpStatus.OK)
+ @Post('/info')
+ async getShare(@Body() dto: ShareIdDto) {
+ const share = await this.shareRepo.findById(dto.shareId, {
+ includeSharedPage: true,
+ });
+
+ if (!share) {
+ throw new NotFoundException('Share not found');
+ }
+
+ return share;
+ }
+
+ @HttpCode(HttpStatus.OK)
+ @Post('/for-page')
+ async getShareForPage(
+ @Body() dto: SharePageIdDto,
+ @AuthUser() user: User,
+ @AuthWorkspace() workspace: Workspace,
+ ) {
+ const page = await this.pageRepo.findById(dto.pageId);
+ if (!page) {
+ throw new NotFoundException('Shared page not found');
+ }
+
+ const ability = await this.spaceAbility.createForUser(user, page.spaceId);
+ if (ability.cannot(SpaceCaslAction.Read, SpaceCaslSubject.Share)) {
+ throw new ForbiddenException();
+ }
+
+ return this.shareService.getShareForPage(page.id, workspace.id);
+ }
+
+ @HttpCode(HttpStatus.OK)
+ @Post('create')
+ async create(
+ @Body() createShareDto: CreateShareDto,
+ @AuthUser() user: User,
+ @AuthWorkspace() workspace: Workspace,
+ ) {
+ const page = await this.pageRepo.findById(createShareDto.pageId);
+
+ if (!page || workspace.id !== page.workspaceId) {
+ throw new NotFoundException('Page not found');
+ }
+
+ const ability = await this.spaceAbility.createForUser(user, page.spaceId);
+ if (ability.cannot(SpaceCaslAction.Create, SpaceCaslSubject.Share)) {
+ throw new ForbiddenException();
+ }
+
+ return this.shareService.createShare({
+ page,
+ authUserId: user.id,
+ workspaceId: workspace.id,
+ createShareDto,
+ });
+ }
+
+ @HttpCode(HttpStatus.OK)
+ @Post('update')
+ async update(@Body() updateShareDto: UpdateShareDto, @AuthUser() user: User) {
+ const share = await this.shareRepo.findById(updateShareDto.shareId);
+
+ if (!share) {
+ throw new NotFoundException('Share not found');
+ }
+
+ const ability = await this.spaceAbility.createForUser(user, share.spaceId);
+ if (ability.cannot(SpaceCaslAction.Edit, SpaceCaslSubject.Share)) {
+ throw new ForbiddenException();
+ }
+
+ return this.shareService.updateShare(share.id, updateShareDto);
+ }
+
+ @HttpCode(HttpStatus.OK)
+ @Post('delete')
+ async delete(@Body() shareIdDto: ShareIdDto, @AuthUser() user: User) {
+ const share = await this.shareRepo.findById(shareIdDto.shareId);
+
+ if (!share) {
+ throw new NotFoundException('Share not found');
+ }
+
+ const ability = await this.spaceAbility.createForUser(user, share.spaceId);
+ if (ability.cannot(SpaceCaslAction.Manage, SpaceCaslSubject.Share)) {
+ throw new ForbiddenException();
+ }
+
+ await this.shareRepo.deleteShare(share.id);
+ }
+
+ @Public()
+ @HttpCode(HttpStatus.OK)
+ @Post('/tree')
+ async getSharePageTree(
+ @Body() dto: ShareIdDto,
+ @AuthWorkspace() workspace: Workspace,
+ ) {
+ return this.shareService.getShareTree(dto.shareId, workspace.id);
+ }
+}
diff --git a/apps/server/src/core/share/share.module.ts b/apps/server/src/core/share/share.module.ts
new file mode 100644
index 00000000..2ba9764e
--- /dev/null
+++ b/apps/server/src/core/share/share.module.ts
@@ -0,0 +1,13 @@
+import { Module } from '@nestjs/common';
+import { ShareController } from './share.controller';
+import { ShareService } from './share.service';
+import { TokenModule } from '../auth/token.module';
+import { ShareSeoController } from './share-seo.controller';
+
+@Module({
+ imports: [TokenModule],
+ controllers: [ShareController, ShareSeoController],
+ providers: [ShareService],
+ exports: [ShareService],
+})
+export class ShareModule {}
diff --git a/apps/server/src/core/share/share.service.ts b/apps/server/src/core/share/share.service.ts
new file mode 100644
index 00000000..a9140c0b
--- /dev/null
+++ b/apps/server/src/core/share/share.service.ts
@@ -0,0 +1,297 @@
+import {
+ BadRequestException,
+ Injectable,
+ Logger,
+ NotFoundException,
+} from '@nestjs/common';
+import { CreateShareDto, ShareInfoDto, UpdateShareDto } from './dto/share.dto';
+import { InjectKysely } from 'nestjs-kysely';
+import { KyselyDB } from '@docmost/db/types/kysely.types';
+import { nanoIdGen } from '../../common/helpers';
+import { PageRepo } from '@docmost/db/repos/page/page.repo';
+import { TokenService } from '../auth/services/token.service';
+import { jsonToNode } from '../../collaboration/collaboration.util';
+import {
+ getAttachmentIds,
+ getProsemirrorContent,
+ isAttachmentNode,
+} from '../../common/helpers/prosemirror/utils';
+import { Node } from '@tiptap/pm/model';
+import { ShareRepo } from '@docmost/db/repos/share/share.repo';
+import { updateAttachmentAttr } from './share.util';
+import { Page } from '@docmost/db/types/entity.types';
+import { validate as isValidUUID } from 'uuid';
+import { sql } from 'kysely';
+
+@Injectable()
+export class ShareService {
+ private readonly logger = new Logger(ShareService.name);
+
+ constructor(
+ private readonly shareRepo: ShareRepo,
+ private readonly pageRepo: PageRepo,
+ @InjectKysely() private readonly db: KyselyDB,
+ private readonly tokenService: TokenService,
+ ) {}
+
+ async getShareTree(shareId: string, workspaceId: string) {
+ const share = await this.shareRepo.findById(shareId);
+ if (!share || share.workspaceId !== workspaceId) {
+ throw new NotFoundException('Share not found');
+ }
+
+ if (share.includeSubPages) {
+ const pageList = await this.pageRepo.getPageAndDescendants(share.pageId, {
+ includeContent: false,
+ });
+
+ return { share, pageTree: pageList };
+ } else {
+ return { share, pageTree: [] };
+ }
+ }
+
+ async createShare(opts: {
+ authUserId: string;
+ workspaceId: string;
+ page: Page;
+ createShareDto: CreateShareDto;
+ }) {
+ const { authUserId, workspaceId, page, createShareDto } = opts;
+
+ try {
+ const shares = await this.shareRepo.findByPageId(page.id);
+ if (shares) {
+ return shares;
+ }
+
+ return await this.shareRepo.insertShare({
+ key: nanoIdGen().toLowerCase(),
+ pageId: page.id,
+ includeSubPages: createShareDto.includeSubPages || true,
+ searchIndexing: createShareDto.searchIndexing || true,
+ creatorId: authUserId,
+ spaceId: page.spaceId,
+ workspaceId,
+ });
+ } catch (err) {
+ this.logger.error(err);
+ throw new BadRequestException('Failed to share page');
+ }
+ }
+
+ async updateShare(shareId: string, updateShareDto: UpdateShareDto) {
+ try {
+ return this.shareRepo.updateShare(
+ {
+ includeSubPages: updateShareDto.includeSubPages,
+ searchIndexing: updateShareDto.searchIndexing,
+ },
+ shareId,
+ );
+ } catch (err) {
+ this.logger.error(err);
+ throw new BadRequestException('Failed to update share');
+ }
+ }
+
+ async getSharedPage(dto: ShareInfoDto, workspaceId: string) {
+ const share = await this.getShareForPage(dto.pageId, workspaceId);
+
+ if (!share) {
+ throw new NotFoundException('Shared page not found');
+ }
+
+ const page = await this.pageRepo.findById(dto.pageId, {
+ includeContent: true,
+ includeCreator: true,
+ });
+
+ page.content = await this.updatePublicAttachments(page);
+
+ if (!page) {
+ throw new NotFoundException('Shared page not found');
+ }
+
+ return { page, share };
+ }
+
+ async getShareForPage(pageId: string, workspaceId: string) {
+ // here we try to check if a page was shared directly or if it inherits the share from its closest shared ancestor
+ const share = await this.db
+ .withRecursive('page_hierarchy', (cte) =>
+ cte
+ .selectFrom('pages')
+ .select([
+ 'id',
+ 'slugId',
+ 'pages.title',
+ 'pages.icon',
+ 'parentPageId',
+ sql`0`.as('level'),
+ ])
+ .where(isValidUUID(pageId) ? 'id' : 'slugId', '=', pageId)
+ .unionAll((union) =>
+ union
+ .selectFrom('pages as p')
+ .select([
+ 'p.id',
+ 'p.slugId',
+ 'p.title',
+ 'p.icon',
+ 'p.parentPageId',
+ // Increase the level by 1 for each ancestor.
+ sql`ph.level + 1`.as('level'),
+ ])
+ .innerJoin('page_hierarchy as ph', 'ph.parentPageId', 'p.id'),
+ ),
+ )
+ .selectFrom('page_hierarchy')
+ .leftJoin('shares', 'shares.pageId', 'page_hierarchy.id')
+ .select([
+ 'page_hierarchy.id as sharedPageId',
+ 'page_hierarchy.slugId as sharedPageSlugId',
+ 'page_hierarchy.title as sharedPageTitle',
+ 'page_hierarchy.icon as sharedPageIcon',
+ 'page_hierarchy.level as level',
+ 'shares.id',
+ 'shares.key',
+ 'shares.pageId',
+ 'shares.includeSubPages',
+ 'shares.searchIndexing',
+ 'shares.creatorId',
+ 'shares.spaceId',
+ 'shares.workspaceId',
+ 'shares.createdAt',
+ 'shares.updatedAt',
+ ])
+ .where('shares.id', 'is not', null)
+ .orderBy('page_hierarchy.level', 'asc')
+ .executeTakeFirst();
+
+ if (!share || share.workspaceId != workspaceId) {
+ return undefined;
+ }
+
+ if (share.level === 1 && !share.includeSubPages) {
+ // we can only show a page if its shared ancestor permits it
+ return undefined;
+ }
+
+ return {
+ id: share.id,
+ key: share.key,
+ includeSubPages: share.includeSubPages,
+ searchIndexing: share.searchIndexing,
+ pageId: share.pageId,
+ creatorId: share.creatorId,
+ spaceId: share.spaceId,
+ workspaceId: share.workspaceId,
+ createdAt: share.createdAt,
+ level: share.level,
+ sharedPage: {
+ id: share.sharedPageId,
+ slugId: share.sharedPageSlugId,
+ title: share.sharedPageTitle,
+ icon: share.sharedPageIcon,
+ },
+ };
+ }
+
+ async getShareAncestorPage(
+ ancestorPageId: string,
+ childPageId: string,
+ ): Promise {
+ let ancestor = null;
+ try {
+ ancestor = await this.db
+ .withRecursive('page_ancestors', (db) =>
+ db
+ .selectFrom('pages')
+ .select([
+ 'id',
+ 'slugId',
+ 'title',
+ 'parentPageId',
+ 'spaceId',
+ (eb) =>
+ eb
+ .case()
+ .when(eb.ref('id'), '=', ancestorPageId)
+ .then(true)
+ .else(false)
+ .end()
+ .as('found'),
+ ])
+ .where(
+ isValidUUID(childPageId) ? 'id' : 'slugId',
+ '=',
+ childPageId,
+ )
+ .unionAll((exp) =>
+ exp
+ .selectFrom('pages as p')
+ .select([
+ 'p.id',
+ 'p.slugId',
+ 'p.title',
+ 'p.parentPageId',
+ 'p.spaceId',
+ (eb) =>
+ eb
+ .case()
+ .when(eb.ref('p.id'), '=', ancestorPageId)
+ .then(true)
+ .else(false)
+ .end()
+ .as('found'),
+ ])
+ .innerJoin('page_ancestors as pa', 'pa.parentPageId', 'p.id')
+ // Continue recursing only when the target ancestor hasn't been found on that branch.
+ .where('pa.found', '=', false),
+ ),
+ )
+ .selectFrom('page_ancestors')
+ .selectAll()
+ .where('found', '=', true)
+ .limit(1)
+ .executeTakeFirst();
+ } catch (err) {
+ // empty
+ }
+
+ return ancestor;
+ }
+
+ async updatePublicAttachments(page: Page): Promise {
+ const prosemirrorJson = getProsemirrorContent(page.content);
+ const attachmentIds = getAttachmentIds(prosemirrorJson);
+ const attachmentMap = new Map();
+
+ await Promise.all(
+ attachmentIds.map(async (attachmentId: string) => {
+ const token = await this.tokenService.generateAttachmentToken({
+ attachmentId,
+ pageId: page.id,
+ workspaceId: page.workspaceId,
+ });
+ attachmentMap.set(attachmentId, token);
+ }),
+ );
+
+ const doc = jsonToNode(prosemirrorJson);
+
+ doc?.descendants((node: Node) => {
+ if (!isAttachmentNode(node.type.name)) return;
+
+ const attachmentId = node.attrs.attachmentId;
+ const token = attachmentMap.get(attachmentId);
+ if (!token) return;
+
+ updateAttachmentAttr(node, 'src', token);
+ updateAttachmentAttr(node, 'url', token);
+ });
+
+ return doc.toJSON();
+ }
+}
diff --git a/apps/server/src/core/share/share.util.ts b/apps/server/src/core/share/share.util.ts
new file mode 100644
index 00000000..e21f55aa
--- /dev/null
+++ b/apps/server/src/core/share/share.util.ts
@@ -0,0 +1,22 @@
+import { Node } from '@tiptap/pm/model';
+
+export function updateAttachmentAttr(
+ node: Node,
+ attr: 'src' | 'url',
+ token: string,
+) {
+ const attrVal = node.attrs[attr];
+ if (
+ attrVal &&
+ (attrVal.startsWith('/files') || attrVal.startsWith('/api/files'))
+ ) {
+ // @ts-ignore
+ node.attrs[attr] = updateAttachmentUrl(attrVal, token);
+ }
+}
+
+function updateAttachmentUrl(src: string, jwtToken: string) {
+ const updatedSrc = src.replace('/files/', '/files/public/');
+ const separator = updatedSrc.includes('?') ? '&' : '?';
+ return `${updatedSrc}${separator}jwt=${jwtToken}`;
+}
diff --git a/apps/server/src/database/database.module.ts b/apps/server/src/database/database.module.ts
index 930bb59b..68c35dd3 100644
--- a/apps/server/src/database/database.module.ts
+++ b/apps/server/src/database/database.module.ts
@@ -24,6 +24,7 @@ import * as process from 'node:process';
import { MigrationService } from '@docmost/db/services/migration.service';
import { UserTokenRepo } from './repos/user-token/user-token.repo';
import { BacklinkRepo } from '@docmost/db/repos/backlink/backlink.repo';
+import { ShareRepo } from '@docmost/db/repos/share/share.repo';
// https://github.com/brianc/node-postgres/issues/811
types.setTypeParser(types.builtins.INT8, (val) => Number(val));
@@ -74,6 +75,7 @@ types.setTypeParser(types.builtins.INT8, (val) => Number(val));
AttachmentRepo,
UserTokenRepo,
BacklinkRepo,
+ ShareRepo
],
exports: [
WorkspaceRepo,
@@ -88,6 +90,7 @@ types.setTypeParser(types.builtins.INT8, (val) => Number(val));
AttachmentRepo,
UserTokenRepo,
BacklinkRepo,
+ ShareRepo
],
})
export class DatabaseModule
diff --git a/apps/server/src/database/migrations/20250408T191830-shares.ts b/apps/server/src/database/migrations/20250408T191830-shares.ts
new file mode 100644
index 00000000..39d91454
--- /dev/null
+++ b/apps/server/src/database/migrations/20250408T191830-shares.ts
@@ -0,0 +1,38 @@
+import { Kysely, sql } from 'kysely';
+
+export async function up(db: Kysely): Promise {
+ await db.schema
+ .createTable('shares')
+ .addColumn('id', 'uuid', (col) =>
+ col.primaryKey().defaultTo(sql`gen_uuid_v7()`),
+ )
+ .addColumn('key', 'varchar', (col) => col.notNull())
+ .addColumn('page_id', 'uuid', (col) =>
+ col.references('pages.id').onDelete('cascade'),
+ )
+ .addColumn('include_sub_pages', 'boolean', (col) => col.defaultTo(false))
+ .addColumn('search_indexing', 'boolean', (col) => col.defaultTo(false))
+ .addColumn('creator_id', 'uuid', (col) => col.references('users.id'))
+ .addColumn('space_id', 'uuid', (col) =>
+ col.references('spaces.id').onDelete('cascade').notNull(),
+ )
+ .addColumn('workspace_id', 'uuid', (col) =>
+ col.references('workspaces.id').onDelete('cascade').notNull(),
+ )
+ .addColumn('created_at', 'timestamptz', (col) =>
+ col.notNull().defaultTo(sql`now()`),
+ )
+ .addColumn('updated_at', 'timestamptz', (col) =>
+ col.notNull().defaultTo(sql`now()`),
+ )
+ .addColumn('deleted_at', 'timestamptz', (col) => col)
+ .addUniqueConstraint('shares_key_workspace_id_unique', [
+ 'key',
+ 'workspace_id',
+ ])
+ .execute();
+}
+
+export async function down(db: Kysely): Promise {
+ await db.schema.dropTable('shares').execute();
+}
diff --git a/apps/server/src/database/repos/page/page.repo.ts b/apps/server/src/database/repos/page/page.repo.ts
index 850fb2d1..8f06c4d4 100644
--- a/apps/server/src/database/repos/page/page.repo.ts
+++ b/apps/server/src/database/repos/page/page.repo.ts
@@ -211,7 +211,10 @@ export class PageRepo {
).as('contributors');
}
- async getPageAndDescendants(parentPageId: string) {
+ async getPageAndDescendants(
+ parentPageId: string,
+ opts: { includeContent: boolean },
+ ) {
return this.db
.withRecursive('page_hierarchy', (db) =>
db
@@ -221,11 +224,12 @@ export class PageRepo {
'slugId',
'title',
'icon',
- 'content',
+ 'position',
'parentPageId',
'spaceId',
'workspaceId',
])
+ .$if(opts?.includeContent, (qb) => qb.select('content'))
.where('id', '=', parentPageId)
.unionAll((exp) =>
exp
@@ -235,11 +239,12 @@ export class PageRepo {
'p.slugId',
'p.title',
'p.icon',
- 'p.content',
+ 'p.position',
'p.parentPageId',
'p.spaceId',
'p.workspaceId',
])
+ .$if(opts?.includeContent, (qb) => qb.select('content'))
.innerJoin('page_hierarchy as ph', 'p.parentPageId', 'ph.id'),
),
)
diff --git a/apps/server/src/database/repos/share/share.repo.ts b/apps/server/src/database/repos/share/share.repo.ts
new file mode 100644
index 00000000..c2943c07
--- /dev/null
+++ b/apps/server/src/database/repos/share/share.repo.ts
@@ -0,0 +1,242 @@
+import { Injectable } from '@nestjs/common';
+import { InjectKysely } from 'nestjs-kysely';
+import { KyselyDB, KyselyTransaction } from '../../types/kysely.types';
+import { dbOrTx } from '../../utils';
+import {
+ InsertableShare,
+ Share,
+ UpdatableShare,
+} from '@docmost/db/types/entity.types';
+import { PaginationOptions } from '@docmost/db/pagination/pagination-options';
+import { executeWithPagination } from '@docmost/db/pagination/pagination';
+import { validate as isValidUUID } from 'uuid';
+import { ExpressionBuilder, sql } from 'kysely';
+import { DB } from '@docmost/db/types/db';
+import { jsonObjectFrom } from 'kysely/helpers/postgres';
+import { SpaceMemberRepo } from '@docmost/db/repos/space/space-member.repo';
+
+@Injectable()
+export class ShareRepo {
+ constructor(
+ @InjectKysely() private readonly db: KyselyDB,
+ private spaceMemberRepo: SpaceMemberRepo,
+ ) {}
+
+ private baseFields: Array = [
+ 'id',
+ 'key',
+ 'pageId',
+ 'includeSubPages',
+ 'searchIndexing',
+ 'creatorId',
+ 'spaceId',
+ 'workspaceId',
+ 'createdAt',
+ 'updatedAt',
+ 'deletedAt',
+ ];
+
+ async findById(
+ shareId: string,
+ opts?: {
+ includeSharedPage?: boolean;
+ includeCreator?: boolean;
+ withLock?: boolean;
+ trx?: KyselyTransaction;
+ },
+ ): Promise {
+ const db = dbOrTx(this.db, opts?.trx);
+
+ let query = db.selectFrom('shares').select(this.baseFields);
+
+ if (opts?.includeSharedPage) {
+ query = query.select((eb) => this.withSharedPage(eb));
+ }
+
+ if (opts?.includeCreator) {
+ query = query.select((eb) => this.withCreator(eb));
+ }
+
+ if (opts?.withLock && opts?.trx) {
+ query = query.forUpdate();
+ }
+
+ if (isValidUUID(shareId)) {
+ query = query.where('id', '=', shareId);
+ } else {
+ query = query.where(sql`LOWER(key)`, '=', shareId.toLowerCase());
+ }
+
+ return query.executeTakeFirst();
+ }
+
+ async findByPageId(
+ pageId: string,
+ opts?: {
+ includeCreator?: boolean;
+ withLock?: boolean;
+ trx?: KyselyTransaction;
+ },
+ ): Promise {
+ const db = dbOrTx(this.db, opts?.trx);
+
+ let query = db
+ .selectFrom('shares')
+ .select(this.baseFields)
+ .where('pageId', '=', pageId);
+
+ if (opts?.includeCreator) {
+ query = query.select((eb) => this.withCreator(eb));
+ }
+
+ if (opts?.withLock && opts?.trx) {
+ query = query.forUpdate();
+ }
+ return query.executeTakeFirst();
+ }
+
+ async updateShare(
+ updatableShare: UpdatableShare,
+ shareId: string,
+ trx?: KyselyTransaction,
+ ) {
+ return dbOrTx(this.db, trx)
+ .updateTable('shares')
+ .set({ ...updatableShare, updatedAt: new Date() })
+ .where(
+ isValidUUID(shareId) ? 'id' : sql`LOWER(key)`,
+ '=',
+ shareId.toLowerCase(),
+ )
+ .returning(this.baseFields)
+ .executeTakeFirst();
+ }
+
+ async insertShare(
+ insertableShare: InsertableShare,
+ trx?: KyselyTransaction,
+ ): Promise {
+ const db = dbOrTx(this.db, trx);
+ return db
+ .insertInto('shares')
+ .values(insertableShare)
+ .returning(this.baseFields)
+ .executeTakeFirst();
+ }
+
+ async deleteShare(shareId: string): Promise {
+ let query = this.db.deleteFrom('shares');
+
+ if (isValidUUID(shareId)) {
+ query = query.where('id', '=', shareId);
+ } else {
+ query = query.where(sql`LOWER(key)`, '=', shareId.toLowerCase());
+ }
+
+ await query.execute();
+ }
+
+ async getShares(userId: string, pagination: PaginationOptions) {
+ const userSpaceIds = await this.spaceMemberRepo.getUserSpaceIds(userId);
+
+ const query = this.db
+ .selectFrom('shares')
+ .select(this.baseFields)
+ .select((eb) => this.withPage(eb))
+ .select((eb) => this.withSpace(eb, userId))
+ .select((eb) => this.withCreator(eb))
+ .where('spaceId', 'in', userSpaceIds)
+ .orderBy('updatedAt', 'desc');
+
+ const hasEmptyIds = userSpaceIds.length === 0;
+ const result = executeWithPagination(query, {
+ page: pagination.page,
+ perPage: pagination.limit,
+ hasEmptyIds,
+ });
+
+ return result;
+ }
+
+ withPage(eb: ExpressionBuilder) {
+ return jsonObjectFrom(
+ eb
+ .selectFrom('pages')
+ .select(['pages.id', 'pages.title', 'pages.slugId', 'pages.icon'])
+ .whereRef('pages.id', '=', 'shares.pageId'),
+ ).as('page');
+ }
+
+ withSpace(eb: ExpressionBuilder, userId?: string) {
+ return jsonObjectFrom(
+ eb
+ .selectFrom('spaces')
+ .select(['spaces.id', 'spaces.name', 'spaces.slug'])
+ .$if(Boolean(userId), (qb) =>
+ qb.select((eb) => this.withUserSpaceRole(eb, userId)),
+ )
+ .whereRef('spaces.id', '=', 'shares.spaceId'),
+ ).as('space');
+ }
+
+ withUserSpaceRole(eb: ExpressionBuilder, userId: string) {
+ return eb
+ .selectFrom(
+ eb
+ .selectFrom('spaceMembers')
+ .select(['spaceMembers.role'])
+ .whereRef('spaceMembers.spaceId', '=', 'spaces.id')
+ .where('spaceMembers.userId', '=', userId)
+ .unionAll(
+ eb
+ .selectFrom('spaceMembers')
+ .innerJoin(
+ 'groupUsers',
+ 'groupUsers.groupId',
+ 'spaceMembers.groupId',
+ )
+ .select(['spaceMembers.role'])
+ .whereRef('spaceMembers.spaceId', '=', 'spaces.id')
+ .where('groupUsers.userId', '=', userId),
+ )
+ .as('roles_union'),
+ )
+ .select('roles_union.role')
+ .orderBy(
+ sql`CASE roles_union.role
+ WHEN 'admin' THEN 3
+ WHEN 'writer' THEN 2
+ WHEN 'reader' THEN 1
+ ELSE 0
+ END`,
+
+ 'desc',
+ )
+ .limit(1)
+ .as('userRole');
+ }
+
+ withCreator(eb: ExpressionBuilder) {
+ return jsonObjectFrom(
+ eb
+ .selectFrom('users')
+ .select(['users.id', 'users.name', 'users.avatarUrl'])
+ .whereRef('users.id', '=', 'shares.creatorId'),
+ ).as('creator');
+ }
+
+ withSharedPage(eb: ExpressionBuilder) {
+ return jsonObjectFrom(
+ eb
+ .selectFrom('pages')
+ .select([
+ 'pages.id',
+ 'pages.slugId',
+ 'pages.title',
+ 'pages.icon',
+ 'pages.parentPageId',
+ ])
+ .whereRef('pages.id', '=', 'shares.pageId'),
+ ).as('sharedPage');
+ }
+}
diff --git a/apps/server/src/database/types/db.d.ts b/apps/server/src/database/types/db.d.ts
index eae94943..8c4cbd57 100644
--- a/apps/server/src/database/types/db.d.ts
+++ b/apps/server/src/database/types/db.d.ts
@@ -183,6 +183,20 @@ export interface Pages {
ydoc: Buffer | null;
}
+export interface Shares {
+ createdAt: Generated;
+ creatorId: string | null;
+ deletedAt: Timestamp | null;
+ id: Generated;
+ includeSubPages: Generated;
+ key: string;
+ pageId: string | null;
+ searchIndexing: Generated;
+ spaceId: string;
+ updatedAt: Generated;
+ workspaceId: string;
+}
+
export interface SpaceMembers {
addedById: string | null;
createdAt: Generated;
@@ -288,6 +302,7 @@ export interface DB {
groupUsers: GroupUsers;
pageHistory: PageHistory;
pages: Pages;
+ shares: Shares;
spaceMembers: SpaceMembers;
spaces: Spaces;
users: Users;
diff --git a/apps/server/src/database/types/entity.types.ts b/apps/server/src/database/types/entity.types.ts
index 8abd9f98..6cb55a11 100644
--- a/apps/server/src/database/types/entity.types.ts
+++ b/apps/server/src/database/types/entity.types.ts
@@ -16,6 +16,7 @@ import {
Billing as BillingSubscription,
AuthProviders,
AuthAccounts,
+ Shares,
} from './db';
// Workspace
@@ -101,3 +102,8 @@ export type UpdatableAuthProvider = Updateable>;
export type AuthAccount = Selectable;
export type InsertableAuthAccount = Insertable;
export type UpdatableAuthAccount = Updateable>;
+
+// Share
+export type Share = Selectable;
+export type InsertableShare = Insertable;
+export type UpdatableShare = Updateable>;
diff --git a/apps/server/src/integrations/export/export.service.ts b/apps/server/src/integrations/export/export.service.ts
index 09fdb5fd..4bb5146f 100644
--- a/apps/server/src/integrations/export/export.service.ts
+++ b/apps/server/src/integrations/export/export.service.ts
@@ -15,10 +15,8 @@ import { StorageService } from '../storage/storage.service';
import {
buildTree,
computeLocalPath,
- getAttachmentIds,
getExportExtension,
getPageTitle,
- getProsemirrorContent,
PageExportTree,
replaceInternalLinks,
updateAttachmentUrlsToLocalPaths,
@@ -29,6 +27,10 @@ import { EditorState } from '@tiptap/pm/state';
// eslint-disable-next-line @typescript-eslint/no-require-imports
import slugify = require('@sindresorhus/slugify');
import { EnvironmentService } from '../environment/environment.service';
+import {
+ getAttachmentIds,
+ getProsemirrorContent,
+} from '../../common/helpers/prosemirror/utils';
@Injectable()
export class ExportService {
@@ -76,8 +78,11 @@ export class ExportService {
`;
}
- if (format === ExportFormat.Markdown) {
- const newPageHtml = pageHtml.replace(/]*>[\s\S]*?<\/colgroup>/gmi, '');
+ if (format === ExportFormat.Markdown) {
+ const newPageHtml = pageHtml.replace(
+ /]*>[\s\S]*?<\/colgroup>/gim,
+ '',
+ );
return turndown(newPageHtml);
}
@@ -85,7 +90,9 @@ export class ExportService {
}
async exportPageWithChildren(pageId: string, format: string) {
- const pages = await this.pageRepo.getPageAndDescendants(pageId);
+ const pages = await this.pageRepo.getPageAndDescendants(pageId, {
+ includeContent: true,
+ });
if (!pages || pages.length === 0) {
throw new BadRequestException('No pages to export');
@@ -260,14 +267,7 @@ export class ExportService {
const pages = await this.db
.selectFrom('pages')
- .select([
- 'id',
- 'slugId',
- 'title',
- 'creatorId',
- 'spaceId',
- 'workspaceId',
- ])
+ .select(['id', 'slugId', 'title', 'creatorId', 'spaceId', 'workspaceId'])
.select((eb) => this.pageRepo.withSpace(eb))
.where('id', 'in', pageMentionIds)
.where('workspaceId', '=', workspaceId)
diff --git a/apps/server/src/integrations/export/utils.ts b/apps/server/src/integrations/export/utils.ts
index f99f337a..fe1815b0 100644
--- a/apps/server/src/integrations/export/utils.ts
+++ b/apps/server/src/integrations/export/utils.ts
@@ -4,6 +4,7 @@ import { Node } from '@tiptap/pm/model';
import { validate as isValidUUID } from 'uuid';
import * as path from 'path';
import { Page } from '@docmost/db/types/entity.types';
+import { isAttachmentNode } from '../../common/helpers/prosemirror/utils';
export type PageExportTree = Record;
@@ -25,43 +26,6 @@ export function getPageTitle(title: string) {
return title ? title : 'untitled';
}
-export function getProsemirrorContent(content: any) {
- return (
- content ?? {
- type: 'doc',
- content: [{ type: 'paragraph', attrs: { textAlign: 'left' } }],
- }
- );
-}
-
-export function getAttachmentIds(prosemirrorJson: any) {
- const doc = jsonToNode(prosemirrorJson);
- const attachmentIds = [];
-
- doc?.descendants((node: Node) => {
- if (isAttachmentNode(node.type.name)) {
- if (node.attrs.attachmentId && isValidUUID(node.attrs.attachmentId)) {
- if (!attachmentIds.includes(node.attrs.attachmentId)) {
- attachmentIds.push(node.attrs.attachmentId);
- }
- }
- }
- });
-
- return attachmentIds;
-}
-
-export function isAttachmentNode(nodeType: string) {
- const attachmentNodeTypes = [
- 'attachment',
- 'image',
- 'video',
- 'excalidraw',
- 'drawio',
- ];
- return attachmentNodeTypes.includes(nodeType);
-}
-
export function updateAttachmentUrlsToLocalPaths(prosemirrorJson: any) {
const doc = jsonToNode(prosemirrorJson);
if (!doc) return null;
diff --git a/apps/server/src/main.ts b/apps/server/src/main.ts
index 3ceeb789..95df255d 100644
--- a/apps/server/src/main.ts
+++ b/apps/server/src/main.ts
@@ -4,7 +4,12 @@ import {
FastifyAdapter,
NestFastifyApplication,
} from '@nestjs/platform-fastify';
-import { Logger, NotFoundException, ValidationPipe } from '@nestjs/common';
+import {
+ Logger,
+ NotFoundException,
+ RequestMethod,
+ ValidationPipe,
+} from '@nestjs/common';
import { TransformHttpResponseInterceptor } from './common/interceptors/http-response.interceptor';
import { WsRedisIoAdapter } from './ws/adapter/ws-redis.adapter';
import { InternalLogFilter } from './common/logger/internal-log-filter';
@@ -26,7 +31,9 @@ async function bootstrap() {
},
);
- app.setGlobalPrefix('api', { exclude: ['robots.txt'] });
+ app.setGlobalPrefix('api', {
+ exclude: ['robots.txt', 'share/:shareId/p/:pageSlug'],
+ });
const reflector = app.get(Reflector);
const redisIoAdapter = new WsRedisIoAdapter(app);
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index 8772d574..2fd73d8b 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -419,43 +419,43 @@ importers:
version: 8.1.1
'@nestjs/bullmq':
specifier: ^11.0.2
- version: 11.0.2(@nestjs/common@11.0.10(class-transformer@0.5.1)(class-validator@0.14.1)(reflect-metadata@0.2.2)(rxjs@7.8.1))(@nestjs/core@11.0.10)(bullmq@5.41.3)
+ version: 11.0.2(@nestjs/common@11.0.20(class-transformer@0.5.1)(class-validator@0.14.1)(reflect-metadata@0.2.2)(rxjs@7.8.1))(@nestjs/core@11.0.20)(bullmq@5.41.3)
'@nestjs/common':
- specifier: ^11.0.10
- version: 11.0.10(class-transformer@0.5.1)(class-validator@0.14.1)(reflect-metadata@0.2.2)(rxjs@7.8.1)
+ specifier: ^11.0.20
+ version: 11.0.20(class-transformer@0.5.1)(class-validator@0.14.1)(reflect-metadata@0.2.2)(rxjs@7.8.1)
'@nestjs/config':
- specifier: ^4.0.0
- version: 4.0.0(@nestjs/common@11.0.10(class-transformer@0.5.1)(class-validator@0.14.1)(reflect-metadata@0.2.2)(rxjs@7.8.1))(rxjs@7.8.1)
+ specifier: ^4.0.2
+ version: 4.0.2(@nestjs/common@11.0.20(class-transformer@0.5.1)(class-validator@0.14.1)(reflect-metadata@0.2.2)(rxjs@7.8.1))(rxjs@7.8.1)
'@nestjs/core':
- specifier: ^11.0.10
- version: 11.0.10(@nestjs/common@11.0.10(class-transformer@0.5.1)(class-validator@0.14.1)(reflect-metadata@0.2.2)(rxjs@7.8.1))(@nestjs/websockets@11.0.10)(reflect-metadata@0.2.2)(rxjs@7.8.1)
+ specifier: ^11.0.20
+ version: 11.0.20(@nestjs/common@11.0.20(class-transformer@0.5.1)(class-validator@0.14.1)(reflect-metadata@0.2.2)(rxjs@7.8.1))(@nestjs/websockets@11.0.20)(reflect-metadata@0.2.2)(rxjs@7.8.1)
'@nestjs/event-emitter':
specifier: ^3.0.0
- version: 3.0.0(@nestjs/common@11.0.10(class-transformer@0.5.1)(class-validator@0.14.1)(reflect-metadata@0.2.2)(rxjs@7.8.1))(@nestjs/core@11.0.10)
+ version: 3.0.0(@nestjs/common@11.0.20(class-transformer@0.5.1)(class-validator@0.14.1)(reflect-metadata@0.2.2)(rxjs@7.8.1))(@nestjs/core@11.0.20)
'@nestjs/jwt':
specifier: ^11.0.0
- version: 11.0.0(@nestjs/common@11.0.10(class-transformer@0.5.1)(class-validator@0.14.1)(reflect-metadata@0.2.2)(rxjs@7.8.1))
+ version: 11.0.0(@nestjs/common@11.0.20(class-transformer@0.5.1)(class-validator@0.14.1)(reflect-metadata@0.2.2)(rxjs@7.8.1))
'@nestjs/mapped-types':
specifier: ^2.1.0
- version: 2.1.0(@nestjs/common@11.0.10(class-transformer@0.5.1)(class-validator@0.14.1)(reflect-metadata@0.2.2)(rxjs@7.8.1))(class-transformer@0.5.1)(class-validator@0.14.1)(reflect-metadata@0.2.2)
+ version: 2.1.0(@nestjs/common@11.0.20(class-transformer@0.5.1)(class-validator@0.14.1)(reflect-metadata@0.2.2)(rxjs@7.8.1))(class-transformer@0.5.1)(class-validator@0.14.1)(reflect-metadata@0.2.2)
'@nestjs/passport':
specifier: ^11.0.5
- version: 11.0.5(@nestjs/common@11.0.10(class-transformer@0.5.1)(class-validator@0.14.1)(reflect-metadata@0.2.2)(rxjs@7.8.1))(passport@0.7.0)
+ version: 11.0.5(@nestjs/common@11.0.20(class-transformer@0.5.1)(class-validator@0.14.1)(reflect-metadata@0.2.2)(rxjs@7.8.1))(passport@0.7.0)
'@nestjs/platform-fastify':
- specifier: ^11.0.10
- version: 11.0.10(@fastify/static@8.1.1)(@nestjs/common@11.0.10(class-transformer@0.5.1)(class-validator@0.14.1)(reflect-metadata@0.2.2)(rxjs@7.8.1))(@nestjs/core@11.0.10)
+ specifier: ^11.0.20
+ version: 11.0.20(@fastify/static@8.1.1)(@nestjs/common@11.0.20(class-transformer@0.5.1)(class-validator@0.14.1)(reflect-metadata@0.2.2)(rxjs@7.8.1))(@nestjs/core@11.0.20)
'@nestjs/platform-socket.io':
- specifier: ^11.0.10
- version: 11.0.10(@nestjs/common@11.0.10(class-transformer@0.5.1)(class-validator@0.14.1)(reflect-metadata@0.2.2)(rxjs@7.8.1))(@nestjs/websockets@11.0.10)(rxjs@7.8.1)
+ specifier: ^11.0.20
+ version: 11.0.20(@nestjs/common@11.0.20(class-transformer@0.5.1)(class-validator@0.14.1)(reflect-metadata@0.2.2)(rxjs@7.8.1))(@nestjs/websockets@11.0.20)(rxjs@7.8.1)
'@nestjs/schedule':
specifier: ^5.0.1
- version: 5.0.1(@nestjs/common@11.0.10(class-transformer@0.5.1)(class-validator@0.14.1)(reflect-metadata@0.2.2)(rxjs@7.8.1))(@nestjs/core@11.0.10)
+ version: 5.0.1(@nestjs/common@11.0.20(class-transformer@0.5.1)(class-validator@0.14.1)(reflect-metadata@0.2.2)(rxjs@7.8.1))(@nestjs/core@11.0.20)
'@nestjs/terminus':
specifier: ^11.0.0
- version: 11.0.0(@nestjs/common@11.0.10(class-transformer@0.5.1)(class-validator@0.14.1)(reflect-metadata@0.2.2)(rxjs@7.8.1))(@nestjs/core@11.0.10)(reflect-metadata@0.2.2)(rxjs@7.8.1)
+ version: 11.0.0(@nestjs/common@11.0.20(class-transformer@0.5.1)(class-validator@0.14.1)(reflect-metadata@0.2.2)(rxjs@7.8.1))(@nestjs/core@11.0.20)(reflect-metadata@0.2.2)(rxjs@7.8.1)
'@nestjs/websockets':
- specifier: ^11.0.10
- version: 11.0.10(@nestjs/common@11.0.10(class-transformer@0.5.1)(class-validator@0.14.1)(reflect-metadata@0.2.2)(rxjs@7.8.1))(@nestjs/core@11.0.10)(@nestjs/platform-socket.io@11.0.10)(reflect-metadata@0.2.2)(rxjs@7.8.1)
+ specifier: ^11.0.20
+ version: 11.0.20(@nestjs/common@11.0.20(class-transformer@0.5.1)(class-validator@0.14.1)(reflect-metadata@0.2.2)(rxjs@7.8.1))(@nestjs/core@11.0.20)(@nestjs/platform-socket.io@11.0.20)(reflect-metadata@0.2.2)(rxjs@7.8.1)
'@node-saml/passport-saml':
specifier: ^5.0.1
version: 5.0.1
@@ -509,7 +509,7 @@ importers:
version: 3.3.11
nestjs-kysely:
specifier: ^1.1.0
- version: 1.1.0(@nestjs/common@11.0.10(class-transformer@0.5.1)(class-validator@0.14.1)(reflect-metadata@0.2.2)(rxjs@7.8.1))(@nestjs/core@11.0.10)(kysely@0.27.5)(reflect-metadata@0.2.2)
+ version: 1.1.0(@nestjs/common@11.0.20(class-transformer@0.5.1)(class-validator@0.14.1)(reflect-metadata@0.2.2)(rxjs@7.8.1))(@nestjs/core@11.0.20)(kysely@0.27.5)(reflect-metadata@0.2.2)
nodemailer:
specifier: ^6.10.0
version: 6.10.0
@@ -564,7 +564,7 @@ importers:
version: 11.0.1(chokidar@4.0.3)(typescript@5.7.3)
'@nestjs/testing':
specifier: ^11.0.10
- version: 11.0.10(@nestjs/common@11.0.10(class-transformer@0.5.1)(class-validator@0.14.1)(reflect-metadata@0.2.2)(rxjs@7.8.1))(@nestjs/core@11.0.10)
+ version: 11.0.10(@nestjs/common@11.0.20(class-transformer@0.5.1)(class-validator@0.14.1)(reflect-metadata@0.2.2)(rxjs@7.8.1))(@nestjs/core@11.0.20)
'@types/bcrypt':
specifier: ^5.0.2
version: 5.0.2
@@ -2083,8 +2083,8 @@ packages:
'@fastify/cookie@11.0.2':
resolution: {integrity: sha512-GWdwdGlgJxyvNv+QcKiGNevSspMQXncjMZ1J8IvuDQk0jvkzgWWZFNC2En3s+nHndZBGV8IbLwOI/sxCZw/mzA==}
- '@fastify/cors@10.0.2':
- resolution: {integrity: sha512-DGdxOG36sS/tZv1NFiCJGi7wGuXOSPL2CmNX5PbOVKx0C6LuIALRMrqLByHTCcX1Rbl8NJ9IWlJex32bzydvlw==}
+ '@fastify/cors@11.0.1':
+ resolution: {integrity: sha512-dmZaE7M1f4SM8ZZuk5RhSsDJ+ezTgI7v3HHRj8Ow9CneczsPLZV6+2j2uwdaSLn8zhTv6QV0F4ZRcqdalGx1pQ==}
'@fastify/deepmerge@2.0.2':
resolution: {integrity: sha512-3wuLdX5iiiYeZWP6bQrjqhrcvBIf0NHbQH1Ur1WbHvoiuTYUEItgygea3zs8aHpiitn0lOB8gX20u1qO+FDm7Q==}
@@ -2566,8 +2566,8 @@ packages:
'@swc/core':
optional: true
- '@nestjs/common@11.0.10':
- resolution: {integrity: sha512-pzGXp14KF2Q4CDZGQgPK4l8zEg7i6cNkb+10yc8ZA5K41cLe3ZbWW1YxtY2e/glHauOJwTLSVjH4tiRVtOTizg==}
+ '@nestjs/common@11.0.20':
+ resolution: {integrity: sha512-/GH8NDCczjn6+6RNEtSNAts/nq/wQE8L1qZ9TRjqjNqEsZNE1vpFuRIhmcO2isQZ0xY5rySnpaRdrOAul3gQ3A==}
peerDependencies:
class-transformer: '*'
class-validator: '*'
@@ -2579,14 +2579,14 @@ packages:
class-validator:
optional: true
- '@nestjs/config@4.0.0':
- resolution: {integrity: sha512-hyhUMtVwlT+tavtPNyekl8iP0QTU1U6awKrgdOSxhMhp3TQMltx7hz2yqGTcARp+19zWPfgJudyxthuD3lPp/Q==}
+ '@nestjs/config@4.0.2':
+ resolution: {integrity: sha512-McMW6EXtpc8+CwTUwFdg6h7dYcBUpH5iUILCclAsa+MbCEvC9ZKu4dCHRlJqALuhjLw97pbQu62l4+wRwGeZqA==}
peerDependencies:
'@nestjs/common': ^10.0.0 || ^11.0.0
rxjs: ^7.1.0
- '@nestjs/core@11.0.10':
- resolution: {integrity: sha512-f0qB8ztNWZeAD4E4fUdHConmNYCa/A78U7WJu5mX9OLYfOAs3ESYCDfsH9MRUvkA4Ft4Y1uMmyJo5L4fg4+beg==}
+ '@nestjs/core@11.0.20':
+ resolution: {integrity: sha512-yUkEzBGiRNSEThVl6vMCXgoA9sDGWoRbJsTLdYdCC7lg7PE1iXBnna1FiBfQjT995pm0fjyM1e3WsXmyWeJXbw==}
engines: {node: '>= 20'}
peerDependencies:
'@nestjs/common': ^11.0.0
@@ -2633,11 +2633,11 @@ packages:
'@nestjs/common': ^10.0.0 || ^11.0.0
passport: ^0.5.0 || ^0.6.0 || ^0.7.0
- '@nestjs/platform-fastify@11.0.10':
- resolution: {integrity: sha512-aOvuFsSUsfGziy6OmJwVDNx6aXougCMeUpEAlphuCLehSwfZQxhpy4SpThxTAtHU7RdmgGO7VfUGH+uUY8vHdQ==}
+ '@nestjs/platform-fastify@11.0.20':
+ resolution: {integrity: sha512-MZnjO77N/XesVzXhn8qnSEcnjXVIHxkh5zTz8SEIr6K2yWgGJZbTlNm7ul6l7QBeaCeNZtZJlvY/F+4Dbx8yCQ==}
peerDependencies:
'@fastify/static': ^8.0.0
- '@fastify/view': ^10.0.0
+ '@fastify/view': ^10.0.0 || ^11.0.0
'@nestjs/common': ^11.0.0
'@nestjs/core': ^11.0.0
peerDependenciesMeta:
@@ -2646,8 +2646,8 @@ packages:
'@fastify/view':
optional: true
- '@nestjs/platform-socket.io@11.0.10':
- resolution: {integrity: sha512-39lAjq0+kZRiMuscDcugoG+onPDciM4jhuf8ZDjVcuSwtib1OGwrFtErSzp/KJsmHPSStgapbNev7eFi32uWQA==}
+ '@nestjs/platform-socket.io@11.0.20':
+ resolution: {integrity: sha512-fUyDjLt0wJ4WK+rXrd5/oSWw5xWpfDOknpP7YNgaFfvYW726KuS5gWysV7JPD2mgH85S6i+qiO3qZvHIs5DvxQ==}
peerDependencies:
'@nestjs/common': ^11.0.0
'@nestjs/websockets': ^11.0.0
@@ -2725,8 +2725,8 @@ packages:
'@nestjs/platform-express':
optional: true
- '@nestjs/websockets@11.0.10':
- resolution: {integrity: sha512-GPIEfqJyAkTHrHGK9w2OU8LJaZAZKW8WpWcTplThLxMelRq7mBkYOaGvc6dpr7fE1wWzWkwY0ZjQEnwnVmmxSg==}
+ '@nestjs/websockets@11.0.20':
+ resolution: {integrity: sha512-qcybahXdrPJFMILhAwJML9D/bExBEBFsfwFiePCeI4f//tiP0rXiLspLVOHClSeUPBaCNrx+Ae/HVe9UP+wtOg==}
peerDependencies:
'@nestjs/common': ^11.0.0
'@nestjs/core': ^11.0.0
@@ -3747,6 +3747,13 @@ packages:
'@tiptap/core': ^2.7.0
'@tiptap/pm': ^2.7.0
+ '@tokenizer/inflate@0.2.7':
+ resolution: {integrity: sha512-MADQgmZT1eKjp06jpI2yozxaU9uVs4GzzgSL+uEq7bVcJ9V1ZXQkeGNql1fsSI0gMy1vhvNTNbUqrx+pZfJVmg==}
+ engines: {node: '>=18'}
+
+ '@tokenizer/token@0.3.0':
+ resolution: {integrity: sha512-OvjF+z51L3ov0OyAU0duzsYuvO01PH7x4t6DJx+guahgTnBHkhJdG7soQeTSFLWN3efnHyibZ4Z8l2EuWwJN3A==}
+
'@tsconfig/node10@1.0.9':
resolution: {integrity: sha512-jNsYVVxU8v5g43Erja32laIDHXeoNvFEpX33OK4d6hljo3jDhCBDhx5dhCCTMWUojscpAagGiRkBKxpdl9fxqA==}
@@ -5134,6 +5141,15 @@ packages:
supports-color:
optional: true
+ debug@4.4.0:
+ resolution: {integrity: sha512-6WTZ/IxCY/T6BALoZHaE4ctp9xm+Z5kY/pzYaCHRFeyVhojxlrm+46y68HA6hr0TcwEssoxNiDEUJQjfPZ/RYA==}
+ engines: {node: '>=6.0'}
+ peerDependencies:
+ supports-color: '*'
+ peerDependenciesMeta:
+ supports-color:
+ optional: true
+
decimal.js@10.4.3:
resolution: {integrity: sha512-VBBaLc1MgL5XpzgIP7ny5Z6Nx3UrRkIViUkPUdtl9aya5amy3De1gsUUSB1g3+3sExYNjCAsAznmukyxCb1GRA==}
@@ -5564,8 +5580,8 @@ packages:
fastify-plugin@5.0.1:
resolution: {integrity: sha512-HCxs+YnRaWzCl+cWRYFnHmeRFyR5GVnJTAaCJQiYzQSDwK9MgJdyAsuL3nh0EWRCYMgQ5MeziymvmAhUHYHDUQ==}
- fastify@5.2.1:
- resolution: {integrity: sha512-rslrNBF67eg8/Gyn7P2URV8/6pz8kSAscFL4EThZJ8JBMaXacVdVE4hmUcnPNKERl5o/xTiBSLfdowBRhVF1WA==}
+ fastify@5.3.0:
+ resolution: {integrity: sha512-vDpCJa4KRkHrdDMpDNtyPaIDi/ptCwoJ0M8RiefuIMvyXTgG63xYGe9DYYiCpydjh0ETIaLoSyKBNKkh7ew1eA==}
fastq@1.17.1:
resolution: {integrity: sha512-sRVD3lWVIXWg6By68ZN7vho9a1pQcN/WBFaAAsDDFzlJjvoGx0P8z7V1t72grFJfJhu3YPZBuu25f7Kaw2jN1w==}
@@ -5581,6 +5597,9 @@ packages:
picomatch:
optional: true
+ fflate@0.8.2:
+ resolution: {integrity: sha512-cPJU47OaAoCbg0pBvzsgpTPhmhqI5eJjh/JIu8tPj5q+T7iLvW/JAYUqmE7KOB4R1ZyEhzBaIQpQpardBF5z8A==}
+
figures@3.2.0:
resolution: {integrity: sha512-yaduQFRKLXYOGgEn6AZau90j3ggSOyiqXU0F9JZfeXYhNa+Jk4X+s45A2zg5jns87GAFa34BBm2kXw4XpNcbdg==}
engines: {node: '>=8'}
@@ -5592,6 +5611,10 @@ packages:
file-saver@2.0.5:
resolution: {integrity: sha512-P9bmyZ3h/PRG+Nzga+rbdI4OEpNDzAVyy74uVO9ATgzLK6VtAsYybF/+TOCvrc0MO793d6+42lLyZTw7/ArVzA==}
+ file-type@20.4.1:
+ resolution: {integrity: sha512-hw9gNZXUfZ02Jo0uafWLaFVPter5/k2rfcrjFJJHX/77xtSDOfJuEFb6oKlFV86FLP1SuyHMW1PSk0U9M5tKkQ==}
+ engines: {node: '>=18'}
+
filelist@1.0.4:
resolution: {integrity: sha512-w1cEuf3S+DrLCQL7ET6kz+gmlJdbq9J7yXCSjK/OZCPA+qEN1WyF4ZAf0YYJa4/shHJra2t/d/r8SV4Ji+x+8Q==}
@@ -6560,6 +6583,10 @@ packages:
linkifyjs@4.2.0:
resolution: {integrity: sha512-pCj3PrQyATaoTYKHrgWRF3SJwsm61udVh+vuls/Rl6SptiDhgE7ziUIudAedRY9QEfynmM7/RmLEfPUyw1HPCw==}
+ load-esm@1.0.2:
+ resolution: {integrity: sha512-nVAvWk/jeyrWyXEAs84mpQCYccxRqgKY4OznLuJhJCa0XsPSfdOIr2zvBZEj3IHEHbX97jjscKRRV539bW0Gpw==}
+ engines: {node: '>=13.2.0'}
+
loader-runner@4.3.0:
resolution: {integrity: sha512-3R/1M+yS3j5ou80Me59j7F9IMs4PXs3VqRrm0TU3AbKPxlmpoY1TNscJV/oGJXo8qCatFGTfDbY6W6ipGOYXfg==}
engines: {node: '>=6.11.5'}
@@ -6813,9 +6840,6 @@ packages:
mlly@1.7.3:
resolution: {integrity: sha512-xUsx5n/mN0uQf4V548PKQ+YShA4/IW0KI1dZhrNrPCLG+xizETbHTkOa1f8/xut9JRPp8kQuMnz0oqwkTiLo/A==}
- mnemonist@0.39.8:
- resolution: {integrity: sha512-vyWo2K3fjrUw8YeeZ1zF0fy6Mu59RHokURlld8ymdUPjMlD9EC9ov1/YPqTgqRvUN9nTr3Gqfz29LYAmu0PHPQ==}
-
ms@2.1.2:
resolution: {integrity: sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==}
@@ -7002,9 +7026,6 @@ packages:
resolution: {integrity: sha512-yBYjY9QX2hnRmZHAjG/f13MzmBzxzYgQhFrke06TTyKY5zSTEqkOeukBzIdVA3j3ulu8Qa3MbVFShV7T2RmGtQ==}
engines: {node: '>= 0.4'}
- obliterator@2.0.4:
- resolution: {integrity: sha512-lgHwxlxV1qIg1Eap7LgIeoBWIMFibOjbrYPIPJZcI1mmGAI2m3lNYpK12Y+GBdPQ0U1hRwSord7GIaawz962qQ==}
-
obuf@1.1.2:
resolution: {integrity: sha512-PX1wu0AmAdPqOL1mWhqmlOd8kOIZQwGZw6rh7uby9fTc5lhaOWFLX3I6R1hrF9k3zUY40e6igsLGkDXK92LJNg==}
@@ -7165,6 +7186,10 @@ packages:
peberminta@0.9.0:
resolution: {integrity: sha512-XIxfHpEuSJbITd1H3EeQwpcZbTLHc+VVr8ANI9t5sit565tsI4/xK3KWTUFE2e6QiangUkh3B0jihzmGnNrRsQ==}
+ peek-readable@7.0.0:
+ resolution: {integrity: sha512-nri2TO5JE3/mRryik9LlHFT53cgHfRK0Lt0BAZQXku/AW3E6XLt2GaY8siWi7dvW/m1z0ecn+J+bpDa9ZN3IsQ==}
+ engines: {node: '>=18'}
+
pg-cloudflare@1.1.1:
resolution: {integrity: sha512-xWPagP/4B6BgFO+EKz3JONXv3YDgvkbVrGw2mTo3D6tVDQRh1e7cqVGvyR3BE+eQgAvx1XhW/iEASj4/jCWl3Q==}
@@ -7388,6 +7413,9 @@ packages:
process-warning@4.0.0:
resolution: {integrity: sha512-/MyYDxttz7DfGMMHiysAsFE4qF+pQYAA8ziO/3NcRVrQ5fSk+Mns4QZA/oRPFzvcqNoVJXQNWNAsdwBXLUkQKw==}
+ process-warning@5.0.0:
+ resolution: {integrity: sha512-a39t9ApHNx2L4+HBnQKqxxHNs1r7KF+Intd8Q/g1bUh6q0WIp9voPXJ/x0j+ZL45KF1pJd9+q2jLIRMfvEshkA==}
+
process@0.11.10:
resolution: {integrity: sha512-cdGef/drWFoydD1JsMzuFf8100nZl+GT+yacc2bEced5f9Rjk4z+WtFUTBu9PhOi9j/jfmBPu0mMEY4wIdAF8A==}
engines: {node: '>= 0.6.0'}
@@ -7874,6 +7902,9 @@ packages:
secure-json-parse@3.0.2:
resolution: {integrity: sha512-H6nS2o8bWfpFEV6U38sOSjS7bTbdgbCGU9wEM6W14P5H0QOsz94KCusifV44GpHDTu2nqZbuDNhTzu+mjDSw1w==}
+ secure-json-parse@4.0.0:
+ resolution: {integrity: sha512-dxtLJO6sc35jWidmLxo7ij+Eg48PM/kleBsxpC8QJE0qJICe+KawkDQmvCMZUr9u7WKVHgMW6vy3fQ7zMiFZMA==}
+
selderee@0.11.0:
resolution: {integrity: sha512-5TF+l7p4+OsnP8BCCvSyZiSPc4x4//p5uPwK8TCnVPJYRmU2aYKMpOXvw8zM5a5JvuuCGN1jmsMwuU2W02ukfA==}
@@ -8091,6 +8122,10 @@ packages:
strnum@1.0.5:
resolution: {integrity: sha512-J8bbNyKKXl5qYcR36TIO8W3mVGVHrmmxsd5PAItGkmyzwJvybiw2IVq5nqd0i4LSNSkB/sx9VHllbfFdr9k1JA==}
+ strtok3@10.2.2:
+ resolution: {integrity: sha512-Xt18+h4s7Z8xyZ0tmBoRmzxcop97R4BAh+dXouUDCYn+Em+1P3qpkUfI5ueWLT8ynC5hZ+q4iPEmGG1urvQGBg==}
+ engines: {node: '>=18'}
+
styled-jsx@5.1.1:
resolution: {integrity: sha512-pW7uC1l4mBZ8ugbiZrcIsiIvVx1UmTfw7UkC3Um2tmfUq9Bhk8IiyEIPl6F8agHgjzku6j0xQEZbfA5uSgSaCw==}
engines: {node: '>= 12.0.0'}
@@ -8234,6 +8269,10 @@ packages:
resolution: {integrity: sha512-o5sSPKEkg/DIQNmH43V0/uerLrpzVedkUh8tGNvaeXpfpuwjKenlSox/2O/BTlZUtEe+JG7s5YhEz608PlAHRA==}
engines: {node: '>=0.6'}
+ token-types@6.0.0:
+ resolution: {integrity: sha512-lbDrTLVsHhOMljPscd0yitpozq7Ga2M5Cvez5AjGg8GASBjtt6iERCAJ93yommPmz62fb45oFIXHEZ3u9bfJEA==}
+ engines: {node: '>=14.16'}
+
tough-cookie@5.1.0:
resolution: {integrity: sha512-rvZUv+7MoBYTiDmFPBrhL7Ujx9Sk+q9wwm22x8c8T5IJaR+Wsyc7TNxbVxo84kZoRJZZMazowFLqpankBEQrGg==}
engines: {node: '>=16'}
@@ -8432,6 +8471,10 @@ packages:
resolution: {integrity: sha512-u3xV3X7uzvi5b1MncmZo3i2Aw222Zk1keqLA1YkHldREkAhAqi65wuPfe7lHx8H/Wzy+8CE7S7uS3jekIM5s8g==}
engines: {node: '>=8'}
+ uint8array-extras@1.4.0:
+ resolution: {integrity: sha512-ZPtzy0hu4cZjv3z5NW9gfKnNLjoz4y6uv4HlelAjDK7sY/xOkKZv9xK/WQpcsBB3jEybChz9DPC2U/+cusjJVQ==}
+ engines: {node: '>=18'}
+
unbox-primitive@1.0.2:
resolution: {integrity: sha512-61pPlCD9h51VoreyJ0BReideM3MDKMKnh6+V9L08331ipq6Q8OFXZYiqP6n/tbHx4s5I9uRhcye6BrbkizkBDw==}
@@ -10906,8 +10949,8 @@ snapshots:
'@fastify/ajv-compiler@4.0.2':
dependencies:
- ajv: 8.12.0
- ajv-formats: 3.0.1(ajv@8.12.0)
+ ajv: 8.17.1
+ ajv-formats: 3.0.1(ajv@8.17.1)
fast-uri: 3.0.6
'@fastify/busboy@3.1.1': {}
@@ -10917,10 +10960,10 @@ snapshots:
cookie: 1.0.2
fastify-plugin: 5.0.1
- '@fastify/cors@10.0.2':
+ '@fastify/cors@11.0.1':
dependencies:
fastify-plugin: 5.0.1
- mnemonist: 0.39.8
+ toad-cache: 3.7.0
'@fastify/deepmerge@2.0.2': {}
@@ -11545,17 +11588,17 @@ snapshots:
'@emnapi/runtime': 1.2.0
'@tybys/wasm-util': 0.9.0
- '@nestjs/bull-shared@11.0.2(@nestjs/common@11.0.10(class-transformer@0.5.1)(class-validator@0.14.1)(reflect-metadata@0.2.2)(rxjs@7.8.1))(@nestjs/core@11.0.10)':
+ '@nestjs/bull-shared@11.0.2(@nestjs/common@11.0.20(class-transformer@0.5.1)(class-validator@0.14.1)(reflect-metadata@0.2.2)(rxjs@7.8.1))(@nestjs/core@11.0.20)':
dependencies:
- '@nestjs/common': 11.0.10(class-transformer@0.5.1)(class-validator@0.14.1)(reflect-metadata@0.2.2)(rxjs@7.8.1)
- '@nestjs/core': 11.0.10(@nestjs/common@11.0.10(class-transformer@0.5.1)(class-validator@0.14.1)(reflect-metadata@0.2.2)(rxjs@7.8.1))(@nestjs/websockets@11.0.10)(reflect-metadata@0.2.2)(rxjs@7.8.1)
+ '@nestjs/common': 11.0.20(class-transformer@0.5.1)(class-validator@0.14.1)(reflect-metadata@0.2.2)(rxjs@7.8.1)
+ '@nestjs/core': 11.0.20(@nestjs/common@11.0.20(class-transformer@0.5.1)(class-validator@0.14.1)(reflect-metadata@0.2.2)(rxjs@7.8.1))(@nestjs/websockets@11.0.20)(reflect-metadata@0.2.2)(rxjs@7.8.1)
tslib: 2.8.1
- '@nestjs/bullmq@11.0.2(@nestjs/common@11.0.10(class-transformer@0.5.1)(class-validator@0.14.1)(reflect-metadata@0.2.2)(rxjs@7.8.1))(@nestjs/core@11.0.10)(bullmq@5.41.3)':
+ '@nestjs/bullmq@11.0.2(@nestjs/common@11.0.20(class-transformer@0.5.1)(class-validator@0.14.1)(reflect-metadata@0.2.2)(rxjs@7.8.1))(@nestjs/core@11.0.20)(bullmq@5.41.3)':
dependencies:
- '@nestjs/bull-shared': 11.0.2(@nestjs/common@11.0.10(class-transformer@0.5.1)(class-validator@0.14.1)(reflect-metadata@0.2.2)(rxjs@7.8.1))(@nestjs/core@11.0.10)
- '@nestjs/common': 11.0.10(class-transformer@0.5.1)(class-validator@0.14.1)(reflect-metadata@0.2.2)(rxjs@7.8.1)
- '@nestjs/core': 11.0.10(@nestjs/common@11.0.10(class-transformer@0.5.1)(class-validator@0.14.1)(reflect-metadata@0.2.2)(rxjs@7.8.1))(@nestjs/websockets@11.0.10)(reflect-metadata@0.2.2)(rxjs@7.8.1)
+ '@nestjs/bull-shared': 11.0.2(@nestjs/common@11.0.20(class-transformer@0.5.1)(class-validator@0.14.1)(reflect-metadata@0.2.2)(rxjs@7.8.1))(@nestjs/core@11.0.20)
+ '@nestjs/common': 11.0.20(class-transformer@0.5.1)(class-validator@0.14.1)(reflect-metadata@0.2.2)(rxjs@7.8.1)
+ '@nestjs/core': 11.0.20(@nestjs/common@11.0.20(class-transformer@0.5.1)(class-validator@0.14.1)(reflect-metadata@0.2.2)(rxjs@7.8.1))(@nestjs/websockets@11.0.20)(reflect-metadata@0.2.2)(rxjs@7.8.1)
bullmq: 5.41.3
tslib: 2.8.1
@@ -11588,9 +11631,11 @@ snapshots:
- uglify-js
- webpack-cli
- '@nestjs/common@11.0.10(class-transformer@0.5.1)(class-validator@0.14.1)(reflect-metadata@0.2.2)(rxjs@7.8.1)':
+ '@nestjs/common@11.0.20(class-transformer@0.5.1)(class-validator@0.14.1)(reflect-metadata@0.2.2)(rxjs@7.8.1)':
dependencies:
+ file-type: 20.4.1
iterare: 1.2.1
+ load-esm: 1.0.2
reflect-metadata: 0.2.2
rxjs: 7.8.1
tslib: 2.8.1
@@ -11598,18 +11643,20 @@ snapshots:
optionalDependencies:
class-transformer: 0.5.1
class-validator: 0.14.1
+ transitivePeerDependencies:
+ - supports-color
- '@nestjs/config@4.0.0(@nestjs/common@11.0.10(class-transformer@0.5.1)(class-validator@0.14.1)(reflect-metadata@0.2.2)(rxjs@7.8.1))(rxjs@7.8.1)':
+ '@nestjs/config@4.0.2(@nestjs/common@11.0.20(class-transformer@0.5.1)(class-validator@0.14.1)(reflect-metadata@0.2.2)(rxjs@7.8.1))(rxjs@7.8.1)':
dependencies:
- '@nestjs/common': 11.0.10(class-transformer@0.5.1)(class-validator@0.14.1)(reflect-metadata@0.2.2)(rxjs@7.8.1)
+ '@nestjs/common': 11.0.20(class-transformer@0.5.1)(class-validator@0.14.1)(reflect-metadata@0.2.2)(rxjs@7.8.1)
dotenv: 16.4.7
dotenv-expand: 12.0.1
lodash: 4.17.21
rxjs: 7.8.1
- '@nestjs/core@11.0.10(@nestjs/common@11.0.10(class-transformer@0.5.1)(class-validator@0.14.1)(reflect-metadata@0.2.2)(rxjs@7.8.1))(@nestjs/websockets@11.0.10)(reflect-metadata@0.2.2)(rxjs@7.8.1)':
+ '@nestjs/core@11.0.20(@nestjs/common@11.0.20(class-transformer@0.5.1)(class-validator@0.14.1)(reflect-metadata@0.2.2)(rxjs@7.8.1))(@nestjs/websockets@11.0.20)(reflect-metadata@0.2.2)(rxjs@7.8.1)':
dependencies:
- '@nestjs/common': 11.0.10(class-transformer@0.5.1)(class-validator@0.14.1)(reflect-metadata@0.2.2)(rxjs@7.8.1)
+ '@nestjs/common': 11.0.20(class-transformer@0.5.1)(class-validator@0.14.1)(reflect-metadata@0.2.2)(rxjs@7.8.1)
'@nuxt/opencollective': 0.4.1
fast-safe-stringify: 2.1.1
iterare: 1.2.1
@@ -11619,51 +11666,52 @@ snapshots:
tslib: 2.8.1
uid: 2.0.2
optionalDependencies:
- '@nestjs/websockets': 11.0.10(@nestjs/common@11.0.10(class-transformer@0.5.1)(class-validator@0.14.1)(reflect-metadata@0.2.2)(rxjs@7.8.1))(@nestjs/core@11.0.10)(@nestjs/platform-socket.io@11.0.10)(reflect-metadata@0.2.2)(rxjs@7.8.1)
+ '@nestjs/websockets': 11.0.20(@nestjs/common@11.0.20(class-transformer@0.5.1)(class-validator@0.14.1)(reflect-metadata@0.2.2)(rxjs@7.8.1))(@nestjs/core@11.0.20)(@nestjs/platform-socket.io@11.0.20)(reflect-metadata@0.2.2)(rxjs@7.8.1)
- '@nestjs/event-emitter@3.0.0(@nestjs/common@11.0.10(class-transformer@0.5.1)(class-validator@0.14.1)(reflect-metadata@0.2.2)(rxjs@7.8.1))(@nestjs/core@11.0.10)':
+ '@nestjs/event-emitter@3.0.0(@nestjs/common@11.0.20(class-transformer@0.5.1)(class-validator@0.14.1)(reflect-metadata@0.2.2)(rxjs@7.8.1))(@nestjs/core@11.0.20)':
dependencies:
- '@nestjs/common': 11.0.10(class-transformer@0.5.1)(class-validator@0.14.1)(reflect-metadata@0.2.2)(rxjs@7.8.1)
- '@nestjs/core': 11.0.10(@nestjs/common@11.0.10(class-transformer@0.5.1)(class-validator@0.14.1)(reflect-metadata@0.2.2)(rxjs@7.8.1))(@nestjs/websockets@11.0.10)(reflect-metadata@0.2.2)(rxjs@7.8.1)
+ '@nestjs/common': 11.0.20(class-transformer@0.5.1)(class-validator@0.14.1)(reflect-metadata@0.2.2)(rxjs@7.8.1)
+ '@nestjs/core': 11.0.20(@nestjs/common@11.0.20(class-transformer@0.5.1)(class-validator@0.14.1)(reflect-metadata@0.2.2)(rxjs@7.8.1))(@nestjs/websockets@11.0.20)(reflect-metadata@0.2.2)(rxjs@7.8.1)
eventemitter2: 6.4.9
- '@nestjs/jwt@11.0.0(@nestjs/common@11.0.10(class-transformer@0.5.1)(class-validator@0.14.1)(reflect-metadata@0.2.2)(rxjs@7.8.1))':
+ '@nestjs/jwt@11.0.0(@nestjs/common@11.0.20(class-transformer@0.5.1)(class-validator@0.14.1)(reflect-metadata@0.2.2)(rxjs@7.8.1))':
dependencies:
- '@nestjs/common': 11.0.10(class-transformer@0.5.1)(class-validator@0.14.1)(reflect-metadata@0.2.2)(rxjs@7.8.1)
+ '@nestjs/common': 11.0.20(class-transformer@0.5.1)(class-validator@0.14.1)(reflect-metadata@0.2.2)(rxjs@7.8.1)
'@types/jsonwebtoken': 9.0.7
jsonwebtoken: 9.0.2
- '@nestjs/mapped-types@2.1.0(@nestjs/common@11.0.10(class-transformer@0.5.1)(class-validator@0.14.1)(reflect-metadata@0.2.2)(rxjs@7.8.1))(class-transformer@0.5.1)(class-validator@0.14.1)(reflect-metadata@0.2.2)':
+ '@nestjs/mapped-types@2.1.0(@nestjs/common@11.0.20(class-transformer@0.5.1)(class-validator@0.14.1)(reflect-metadata@0.2.2)(rxjs@7.8.1))(class-transformer@0.5.1)(class-validator@0.14.1)(reflect-metadata@0.2.2)':
dependencies:
- '@nestjs/common': 11.0.10(class-transformer@0.5.1)(class-validator@0.14.1)(reflect-metadata@0.2.2)(rxjs@7.8.1)
+ '@nestjs/common': 11.0.20(class-transformer@0.5.1)(class-validator@0.14.1)(reflect-metadata@0.2.2)(rxjs@7.8.1)
reflect-metadata: 0.2.2
optionalDependencies:
class-transformer: 0.5.1
class-validator: 0.14.1
- '@nestjs/passport@11.0.5(@nestjs/common@11.0.10(class-transformer@0.5.1)(class-validator@0.14.1)(reflect-metadata@0.2.2)(rxjs@7.8.1))(passport@0.7.0)':
+ '@nestjs/passport@11.0.5(@nestjs/common@11.0.20(class-transformer@0.5.1)(class-validator@0.14.1)(reflect-metadata@0.2.2)(rxjs@7.8.1))(passport@0.7.0)':
dependencies:
- '@nestjs/common': 11.0.10(class-transformer@0.5.1)(class-validator@0.14.1)(reflect-metadata@0.2.2)(rxjs@7.8.1)
+ '@nestjs/common': 11.0.20(class-transformer@0.5.1)(class-validator@0.14.1)(reflect-metadata@0.2.2)(rxjs@7.8.1)
passport: 0.7.0
- '@nestjs/platform-fastify@11.0.10(@fastify/static@8.1.1)(@nestjs/common@11.0.10(class-transformer@0.5.1)(class-validator@0.14.1)(reflect-metadata@0.2.2)(rxjs@7.8.1))(@nestjs/core@11.0.10)':
+ '@nestjs/platform-fastify@11.0.20(@fastify/static@8.1.1)(@nestjs/common@11.0.20(class-transformer@0.5.1)(class-validator@0.14.1)(reflect-metadata@0.2.2)(rxjs@7.8.1))(@nestjs/core@11.0.20)':
dependencies:
- '@fastify/cors': 10.0.2
+ '@fastify/cors': 11.0.1
'@fastify/formbody': 8.0.2
'@fastify/middie': 9.0.3
- '@nestjs/common': 11.0.10(class-transformer@0.5.1)(class-validator@0.14.1)(reflect-metadata@0.2.2)(rxjs@7.8.1)
- '@nestjs/core': 11.0.10(@nestjs/common@11.0.10(class-transformer@0.5.1)(class-validator@0.14.1)(reflect-metadata@0.2.2)(rxjs@7.8.1))(@nestjs/websockets@11.0.10)(reflect-metadata@0.2.2)(rxjs@7.8.1)
- fastify: 5.2.1
+ '@nestjs/common': 11.0.20(class-transformer@0.5.1)(class-validator@0.14.1)(reflect-metadata@0.2.2)(rxjs@7.8.1)
+ '@nestjs/core': 11.0.20(@nestjs/common@11.0.20(class-transformer@0.5.1)(class-validator@0.14.1)(reflect-metadata@0.2.2)(rxjs@7.8.1))(@nestjs/websockets@11.0.20)(reflect-metadata@0.2.2)(rxjs@7.8.1)
+ fast-querystring: 1.1.2
+ fastify: 5.3.0
light-my-request: 6.6.0
path-to-regexp: 8.2.0
tslib: 2.8.1
optionalDependencies:
'@fastify/static': 8.1.1
- '@nestjs/platform-socket.io@11.0.10(@nestjs/common@11.0.10(class-transformer@0.5.1)(class-validator@0.14.1)(reflect-metadata@0.2.2)(rxjs@7.8.1))(@nestjs/websockets@11.0.10)(rxjs@7.8.1)':
+ '@nestjs/platform-socket.io@11.0.20(@nestjs/common@11.0.20(class-transformer@0.5.1)(class-validator@0.14.1)(reflect-metadata@0.2.2)(rxjs@7.8.1))(@nestjs/websockets@11.0.20)(rxjs@7.8.1)':
dependencies:
- '@nestjs/common': 11.0.10(class-transformer@0.5.1)(class-validator@0.14.1)(reflect-metadata@0.2.2)(rxjs@7.8.1)
- '@nestjs/websockets': 11.0.10(@nestjs/common@11.0.10(class-transformer@0.5.1)(class-validator@0.14.1)(reflect-metadata@0.2.2)(rxjs@7.8.1))(@nestjs/core@11.0.10)(@nestjs/platform-socket.io@11.0.10)(reflect-metadata@0.2.2)(rxjs@7.8.1)
+ '@nestjs/common': 11.0.20(class-transformer@0.5.1)(class-validator@0.14.1)(reflect-metadata@0.2.2)(rxjs@7.8.1)
+ '@nestjs/websockets': 11.0.20(@nestjs/common@11.0.20(class-transformer@0.5.1)(class-validator@0.14.1)(reflect-metadata@0.2.2)(rxjs@7.8.1))(@nestjs/core@11.0.20)(@nestjs/platform-socket.io@11.0.20)(reflect-metadata@0.2.2)(rxjs@7.8.1)
rxjs: 7.8.1
socket.io: 4.8.1
tslib: 2.8.1
@@ -11672,10 +11720,10 @@ snapshots:
- supports-color
- utf-8-validate
- '@nestjs/schedule@5.0.1(@nestjs/common@11.0.10(class-transformer@0.5.1)(class-validator@0.14.1)(reflect-metadata@0.2.2)(rxjs@7.8.1))(@nestjs/core@11.0.10)':
+ '@nestjs/schedule@5.0.1(@nestjs/common@11.0.20(class-transformer@0.5.1)(class-validator@0.14.1)(reflect-metadata@0.2.2)(rxjs@7.8.1))(@nestjs/core@11.0.20)':
dependencies:
- '@nestjs/common': 11.0.10(class-transformer@0.5.1)(class-validator@0.14.1)(reflect-metadata@0.2.2)(rxjs@7.8.1)
- '@nestjs/core': 11.0.10(@nestjs/common@11.0.10(class-transformer@0.5.1)(class-validator@0.14.1)(reflect-metadata@0.2.2)(rxjs@7.8.1))(@nestjs/websockets@11.0.10)(reflect-metadata@0.2.2)(rxjs@7.8.1)
+ '@nestjs/common': 11.0.20(class-transformer@0.5.1)(class-validator@0.14.1)(reflect-metadata@0.2.2)(rxjs@7.8.1)
+ '@nestjs/core': 11.0.20(@nestjs/common@11.0.20(class-transformer@0.5.1)(class-validator@0.14.1)(reflect-metadata@0.2.2)(rxjs@7.8.1))(@nestjs/websockets@11.0.20)(reflect-metadata@0.2.2)(rxjs@7.8.1)
cron: 3.5.0
'@nestjs/schematics@11.0.1(chokidar@4.0.3)(typescript@5.7.3)':
@@ -11689,32 +11737,32 @@ snapshots:
transitivePeerDependencies:
- chokidar
- '@nestjs/terminus@11.0.0(@nestjs/common@11.0.10(class-transformer@0.5.1)(class-validator@0.14.1)(reflect-metadata@0.2.2)(rxjs@7.8.1))(@nestjs/core@11.0.10)(reflect-metadata@0.2.2)(rxjs@7.8.1)':
+ '@nestjs/terminus@11.0.0(@nestjs/common@11.0.20(class-transformer@0.5.1)(class-validator@0.14.1)(reflect-metadata@0.2.2)(rxjs@7.8.1))(@nestjs/core@11.0.20)(reflect-metadata@0.2.2)(rxjs@7.8.1)':
dependencies:
- '@nestjs/common': 11.0.10(class-transformer@0.5.1)(class-validator@0.14.1)(reflect-metadata@0.2.2)(rxjs@7.8.1)
- '@nestjs/core': 11.0.10(@nestjs/common@11.0.10(class-transformer@0.5.1)(class-validator@0.14.1)(reflect-metadata@0.2.2)(rxjs@7.8.1))(@nestjs/websockets@11.0.10)(reflect-metadata@0.2.2)(rxjs@7.8.1)
+ '@nestjs/common': 11.0.20(class-transformer@0.5.1)(class-validator@0.14.1)(reflect-metadata@0.2.2)(rxjs@7.8.1)
+ '@nestjs/core': 11.0.20(@nestjs/common@11.0.20(class-transformer@0.5.1)(class-validator@0.14.1)(reflect-metadata@0.2.2)(rxjs@7.8.1))(@nestjs/websockets@11.0.20)(reflect-metadata@0.2.2)(rxjs@7.8.1)
boxen: 5.1.2
check-disk-space: 3.4.0
reflect-metadata: 0.2.2
rxjs: 7.8.1
- '@nestjs/testing@11.0.10(@nestjs/common@11.0.10(class-transformer@0.5.1)(class-validator@0.14.1)(reflect-metadata@0.2.2)(rxjs@7.8.1))(@nestjs/core@11.0.10)':
+ '@nestjs/testing@11.0.10(@nestjs/common@11.0.20(class-transformer@0.5.1)(class-validator@0.14.1)(reflect-metadata@0.2.2)(rxjs@7.8.1))(@nestjs/core@11.0.20)':
dependencies:
- '@nestjs/common': 11.0.10(class-transformer@0.5.1)(class-validator@0.14.1)(reflect-metadata@0.2.2)(rxjs@7.8.1)
- '@nestjs/core': 11.0.10(@nestjs/common@11.0.10(class-transformer@0.5.1)(class-validator@0.14.1)(reflect-metadata@0.2.2)(rxjs@7.8.1))(@nestjs/websockets@11.0.10)(reflect-metadata@0.2.2)(rxjs@7.8.1)
+ '@nestjs/common': 11.0.20(class-transformer@0.5.1)(class-validator@0.14.1)(reflect-metadata@0.2.2)(rxjs@7.8.1)
+ '@nestjs/core': 11.0.20(@nestjs/common@11.0.20(class-transformer@0.5.1)(class-validator@0.14.1)(reflect-metadata@0.2.2)(rxjs@7.8.1))(@nestjs/websockets@11.0.20)(reflect-metadata@0.2.2)(rxjs@7.8.1)
tslib: 2.8.1
- '@nestjs/websockets@11.0.10(@nestjs/common@11.0.10(class-transformer@0.5.1)(class-validator@0.14.1)(reflect-metadata@0.2.2)(rxjs@7.8.1))(@nestjs/core@11.0.10)(@nestjs/platform-socket.io@11.0.10)(reflect-metadata@0.2.2)(rxjs@7.8.1)':
+ '@nestjs/websockets@11.0.20(@nestjs/common@11.0.20(class-transformer@0.5.1)(class-validator@0.14.1)(reflect-metadata@0.2.2)(rxjs@7.8.1))(@nestjs/core@11.0.20)(@nestjs/platform-socket.io@11.0.20)(reflect-metadata@0.2.2)(rxjs@7.8.1)':
dependencies:
- '@nestjs/common': 11.0.10(class-transformer@0.5.1)(class-validator@0.14.1)(reflect-metadata@0.2.2)(rxjs@7.8.1)
- '@nestjs/core': 11.0.10(@nestjs/common@11.0.10(class-transformer@0.5.1)(class-validator@0.14.1)(reflect-metadata@0.2.2)(rxjs@7.8.1))(@nestjs/websockets@11.0.10)(reflect-metadata@0.2.2)(rxjs@7.8.1)
+ '@nestjs/common': 11.0.20(class-transformer@0.5.1)(class-validator@0.14.1)(reflect-metadata@0.2.2)(rxjs@7.8.1)
+ '@nestjs/core': 11.0.20(@nestjs/common@11.0.20(class-transformer@0.5.1)(class-validator@0.14.1)(reflect-metadata@0.2.2)(rxjs@7.8.1))(@nestjs/websockets@11.0.20)(reflect-metadata@0.2.2)(rxjs@7.8.1)
iterare: 1.2.1
object-hash: 3.0.0
reflect-metadata: 0.2.2
rxjs: 7.8.1
tslib: 2.8.1
optionalDependencies:
- '@nestjs/platform-socket.io': 11.0.10(@nestjs/common@11.0.10(class-transformer@0.5.1)(class-validator@0.14.1)(reflect-metadata@0.2.2)(rxjs@7.8.1))(@nestjs/websockets@11.0.10)(rxjs@7.8.1)
+ '@nestjs/platform-socket.io': 11.0.20(@nestjs/common@11.0.20(class-transformer@0.5.1)(class-validator@0.14.1)(reflect-metadata@0.2.2)(rxjs@7.8.1))(@nestjs/websockets@11.0.20)(rxjs@7.8.1)
'@next/env@14.2.10': {}
@@ -11798,7 +11846,7 @@ snapshots:
nx: 20.4.5(@swc/core@1.5.25(@swc/helpers@0.5.5))
semver: 7.6.3
tmp: 0.2.1
- tslib: 2.8.0
+ tslib: 2.8.1
yargs-parser: 21.1.1
'@nx/js@20.4.5(@babel/traverse@7.27.0)(@swc/core@1.5.25(@swc/helpers@0.5.5))(@types/node@22.13.4)(nx@20.4.5(@swc/core@1.5.25(@swc/helpers@0.5.5)))(typescript@5.7.3)':
@@ -11880,7 +11928,7 @@ snapshots:
chalk: 4.1.2
enquirer: 2.3.6
nx: 20.4.5(@swc/core@1.5.25(@swc/helpers@0.5.5))
- tslib: 2.8.0
+ tslib: 2.8.1
yargs-parser: 21.1.1
transitivePeerDependencies:
- '@swc-node/register'
@@ -12797,6 +12845,16 @@ snapshots:
'@tiptap/core': 2.10.3(@tiptap/pm@2.10.3)
'@tiptap/pm': 2.10.3
+ '@tokenizer/inflate@0.2.7':
+ dependencies:
+ debug: 4.4.0
+ fflate: 0.8.2
+ token-types: 6.0.0
+ transitivePeerDependencies:
+ - supports-color
+
+ '@tokenizer/token@0.3.0': {}
+
'@tsconfig/node10@1.0.9': {}
'@tsconfig/node12@1.0.11': {}
@@ -13521,10 +13579,6 @@ snapshots:
optionalDependencies:
ajv: 8.12.0
- ajv-formats@3.0.1(ajv@8.12.0):
- optionalDependencies:
- ajv: 8.12.0
-
ajv-formats@3.0.1(ajv@8.17.1):
optionalDependencies:
ajv: 8.17.1
@@ -14459,6 +14513,10 @@ snapshots:
dependencies:
ms: 2.1.3
+ debug@4.4.0:
+ dependencies:
+ ms: 2.1.3
+
decimal.js@10.4.3: {}
dedent@1.5.1(babel-plugin-macros@3.1.0):
@@ -14574,7 +14632,7 @@ snapshots:
dotenv-expand@11.0.6:
dependencies:
- dotenv: 16.4.5
+ dotenv: 16.4.7
dotenv-expand@12.0.1:
dependencies:
@@ -15034,8 +15092,8 @@ snapshots:
fast-json-stringify@6.0.1:
dependencies:
'@fastify/merge-json-schemas': 0.2.1
- ajv: 8.12.0
- ajv-formats: 3.0.1(ajv@8.12.0)
+ ajv: 8.17.1
+ ajv-formats: 3.0.1(ajv@8.17.1)
fast-uri: 3.0.6
json-schema-ref-resolver: 2.0.1
rfdc: 1.3.1
@@ -15058,7 +15116,7 @@ snapshots:
fastify-plugin@5.0.1: {}
- fastify@5.2.1:
+ fastify@5.3.0:
dependencies:
'@fastify/ajv-compiler': 4.0.2
'@fastify/error': 4.0.0
@@ -15070,10 +15128,10 @@ snapshots:
find-my-way: 9.2.0
light-my-request: 6.6.0
pino: 9.1.0
- process-warning: 4.0.0
+ process-warning: 5.0.0
rfdc: 1.3.1
- secure-json-parse: 3.0.2
- semver: 7.6.3
+ secure-json-parse: 4.0.0
+ semver: 7.7.1
toad-cache: 3.7.0
fastq@1.17.1:
@@ -15088,6 +15146,8 @@ snapshots:
optionalDependencies:
picomatch: 4.0.2
+ fflate@0.8.2: {}
+
figures@3.2.0:
dependencies:
escape-string-regexp: 1.0.5
@@ -15098,6 +15158,15 @@ snapshots:
file-saver@2.0.5: {}
+ file-type@20.4.1:
+ dependencies:
+ '@tokenizer/inflate': 0.2.7
+ strtok3: 10.2.2
+ token-types: 6.0.0
+ uint8array-extras: 1.4.0
+ transitivePeerDependencies:
+ - supports-color
+
filelist@1.0.4:
dependencies:
minimatch: 5.1.6
@@ -16293,6 +16362,8 @@ snapshots:
linkifyjs@4.2.0: {}
+ load-esm@1.0.2: {}
+
loader-runner@4.3.0: {}
local-pkg@0.5.1:
@@ -16529,10 +16600,6 @@ snapshots:
pkg-types: 1.2.1
ufo: 1.5.4
- mnemonist@0.39.8:
- dependencies:
- obliterator: 2.0.4
-
ms@2.1.2: {}
ms@2.1.3: {}
@@ -16571,10 +16638,10 @@ snapshots:
neo-async@2.6.2: {}
- nestjs-kysely@1.1.0(@nestjs/common@11.0.10(class-transformer@0.5.1)(class-validator@0.14.1)(reflect-metadata@0.2.2)(rxjs@7.8.1))(@nestjs/core@11.0.10)(kysely@0.27.5)(reflect-metadata@0.2.2):
+ nestjs-kysely@1.1.0(@nestjs/common@11.0.20(class-transformer@0.5.1)(class-validator@0.14.1)(reflect-metadata@0.2.2)(rxjs@7.8.1))(@nestjs/core@11.0.20)(kysely@0.27.5)(reflect-metadata@0.2.2):
dependencies:
- '@nestjs/common': 11.0.10(class-transformer@0.5.1)(class-validator@0.14.1)(reflect-metadata@0.2.2)(rxjs@7.8.1)
- '@nestjs/core': 11.0.10(@nestjs/common@11.0.10(class-transformer@0.5.1)(class-validator@0.14.1)(reflect-metadata@0.2.2)(rxjs@7.8.1))(@nestjs/websockets@11.0.10)(reflect-metadata@0.2.2)(rxjs@7.8.1)
+ '@nestjs/common': 11.0.20(class-transformer@0.5.1)(class-validator@0.14.1)(reflect-metadata@0.2.2)(rxjs@7.8.1)
+ '@nestjs/core': 11.0.20(@nestjs/common@11.0.20(class-transformer@0.5.1)(class-validator@0.14.1)(reflect-metadata@0.2.2)(rxjs@7.8.1))(@nestjs/websockets@11.0.20)(reflect-metadata@0.2.2)(rxjs@7.8.1)
kysely: 0.27.5
reflect-metadata: 0.2.2
@@ -16748,8 +16815,6 @@ snapshots:
define-properties: 1.2.1
es-object-atoms: 1.0.0
- obliterator@2.0.4: {}
-
obuf@1.1.2: {}
oidc-token-hash@5.0.3: {}
@@ -16919,6 +16984,8 @@ snapshots:
peberminta@0.9.0: {}
+ peek-readable@7.0.0: {}
+
pg-cloudflare@1.1.1:
optional: true
@@ -17128,6 +17195,8 @@ snapshots:
process-warning@4.0.0: {}
+ process-warning@5.0.0: {}
+
process@0.11.10: {}
prompts@2.4.2:
@@ -17703,6 +17772,8 @@ snapshots:
secure-json-parse@3.0.2: {}
+ secure-json-parse@4.0.0: {}
+
selderee@0.11.0:
dependencies:
parseley: 0.12.1
@@ -17958,6 +18029,11 @@ snapshots:
strnum@1.0.5: {}
+ strtok3@10.2.2:
+ dependencies:
+ '@tokenizer/token': 0.3.0
+ peek-readable: 7.0.0
+
styled-jsx@5.1.1(@babel/core@7.24.5)(babel-plugin-macros@3.1.0)(react@18.3.1):
dependencies:
client-only: 0.0.1
@@ -18099,6 +18175,11 @@ snapshots:
toidentifier@1.0.1: {}
+ token-types@6.0.0:
+ dependencies:
+ '@tokenizer/token': 0.3.0
+ ieee754: 1.2.1
+
tough-cookie@5.1.0:
dependencies:
tldts: 6.1.72
@@ -18304,6 +18385,8 @@ snapshots:
dependencies:
'@lukeed/csprng': 1.1.0
+ uint8array-extras@1.4.0: {}
+
unbox-primitive@1.0.2:
dependencies:
call-bind: 1.0.7
From 3430f715ec2c3aec9e81a032edcb5b0d20666662 Mon Sep 17 00:00:00 2001
From: Diego Ochoa <88157175+daoch@users.noreply.github.com>
Date: Tue, 22 Apr 2025 14:47:57 -0500
Subject: [PATCH 28/63] feat: remember and restore previous route when exiting
settings (#1046)
Improves user experience by allowing users to return to the previous
page after visiting the Settings section.
Co-authored-by: Philipinho <16838612+Philipinho@users.noreply.github.com>
---
apps/client/src/App.tsx | 4 +++-
.../settings/atoms/settings-origin-atom.ts | 10 ++++++++++
.../src/components/settings/settings-sidebar.tsx | 12 +++++++++---
apps/client/src/hooks/use-settings-navigation.ts | 14 ++++++++++++++
apps/client/src/hooks/use-track-origin.ts | 16 ++++++++++++++++
5 files changed, 52 insertions(+), 4 deletions(-)
create mode 100644 apps/client/src/components/settings/atoms/settings-origin-atom.ts
create mode 100644 apps/client/src/hooks/use-settings-navigation.ts
create mode 100644 apps/client/src/hooks/use-track-origin.ts
diff --git a/apps/client/src/App.tsx b/apps/client/src/App.tsx
index 4399062f..6fab378c 100644
--- a/apps/client/src/App.tsx
+++ b/apps/client/src/App.tsx
@@ -30,10 +30,12 @@ import SharedPage from "@/pages/share/shared-page.tsx";
import Shares from "@/pages/settings/shares/shares.tsx";
import ShareLayout from "@/features/share/components/share-layout.tsx";
import ShareRedirect from '@/pages/share/share-redirect.tsx';
+import { useTrackOrigin } from "@/hooks/use-track-origin";
export default function App() {
const { t } = useTranslation();
useRedirectToCloudSelect();
+ useTrackOrigin();
return (
<>
@@ -59,7 +61,7 @@ export default function App() {
= atom(
+ null,
+ (get, set, newValue) => {
+ if (get(settingsOriginAtom) !== newValue) {
+ set(settingsOriginAtom, newValue);
+ }
+ }
+);
diff --git a/apps/client/src/components/settings/settings-sidebar.tsx b/apps/client/src/components/settings/settings-sidebar.tsx
index 483c0026..79ee511d 100644
--- a/apps/client/src/components/settings/settings-sidebar.tsx
+++ b/apps/client/src/components/settings/settings-sidebar.tsx
@@ -13,7 +13,7 @@ import {
IconKey,
IconWorld,
} from "@tabler/icons-react";
-import { Link, useLocation, useNavigate } from "react-router-dom";
+import { Link, useLocation } from "react-router-dom";
import classes from "./settings.module.css";
import { useTranslation } from "react-i18next";
import { isCloud } from "@/lib/config.ts";
@@ -32,6 +32,7 @@ import {
import AppVersion from "@/components/settings/app-version.tsx";
import { mobileSidebarAtom } from "@/components/layouts/global/hooks/atoms/sidebar-atom.ts";
import { useToggleSidebar } from "@/components/layouts/global/hooks/hooks/use-toggle-sidebar.ts";
+import { useSettingsNavigation } from "@/hooks/use-settings-navigation";
interface DataItem {
label: string;
@@ -105,7 +106,7 @@ export default function SettingsSidebar() {
const { t } = useTranslation();
const location = useLocation();
const [active, setActive] = useState(location.pathname);
- const navigate = useNavigate();
+ const { goBack } = useSettingsNavigation();
const { isAdmin } = useUserRole();
const [workspace] = useAtom(workspaceAtom);
const [mobileSidebarOpened] = useAtom(mobileSidebarAtom);
@@ -210,7 +211,12 @@ export default function SettingsSidebar() {
navigate(-1)}
+ onClick={() => {
+ goBack();
+ if (mobileSidebarOpened) {
+ toggleMobileSidebar();
+ }
+ }}
variant="transparent"
c="gray"
aria-label="Back"
diff --git a/apps/client/src/hooks/use-settings-navigation.ts b/apps/client/src/hooks/use-settings-navigation.ts
new file mode 100644
index 00000000..389445c5
--- /dev/null
+++ b/apps/client/src/hooks/use-settings-navigation.ts
@@ -0,0 +1,14 @@
+import { settingsOriginAtom } from "@/components/settings/atoms/settings-origin-atom";
+import { useAtomValue } from "jotai";
+import { useNavigate } from "react-router-dom";
+
+export function useSettingsNavigation() {
+ const navigate = useNavigate();
+ const origin = useAtomValue(settingsOriginAtom);
+
+ const goBack = () => {
+ navigate(origin ?? "/home", { replace: true });
+ };
+
+ return { goBack };
+}
\ No newline at end of file
diff --git a/apps/client/src/hooks/use-track-origin.ts b/apps/client/src/hooks/use-track-origin.ts
new file mode 100644
index 00000000..089dffbe
--- /dev/null
+++ b/apps/client/src/hooks/use-track-origin.ts
@@ -0,0 +1,16 @@
+import { settingsOriginAtom } from "@/components/settings/atoms/settings-origin-atom";
+import { useAtomValue, useSetAtom } from "jotai";
+import { useEffect } from "react";
+import { useLocation } from "react-router-dom";
+
+export function useTrackOrigin() {
+ const location = useLocation();
+ const setOrigin = useSetAtom(settingsOriginAtom);
+
+ useEffect(() => {
+ const isInSettings = location.pathname.startsWith("/settings");
+ if (!isInSettings) {
+ setOrigin(location.pathname);
+ }
+ }, [location.pathname, setOrigin]);
+}
\ No newline at end of file
From 00d92a369057766bf9cd95be52efec8379a094c2 Mon Sep 17 00:00:00 2001
From: Philip Okugbe <16838612+Philipinho@users.noreply.github.com>
Date: Tue, 22 Apr 2025 20:57:07 +0100
Subject: [PATCH 29/63] New Crowdin updates (#1008)
* New translations translation.json (Russian)
* New translations translation.json (Russian)
* New translations translation.json (Chinese Simplified)
* New translations translation.json (Spanish)
* 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 (Chinese Simplified)
* New translations translation.json (English)
* New translations translation.json (Portuguese, Brazilian)
---
.../public/locales/de-DE/translation.json | 23 +++++++++-
.../public/locales/es-ES/translation.json | 25 ++++++++++-
.../public/locales/fr-FR/translation.json | 23 +++++++++-
.../public/locales/it-IT/translation.json | 23 +++++++++-
.../public/locales/ja-JP/translation.json | 23 +++++++++-
.../public/locales/ko-KR/translation.json | 23 +++++++++-
.../public/locales/nl-NL/translation.json | 23 +++++++++-
.../public/locales/pt-BR/translation.json | 23 +++++++++-
.../public/locales/ru-RU/translation.json | 45 ++++++++++++++-----
.../public/locales/zh-CN/translation.json | 25 ++++++++++-
10 files changed, 233 insertions(+), 23 deletions(-)
diff --git a/apps/client/public/locales/de-DE/translation.json b/apps/client/public/locales/de-DE/translation.json
index 294bfa79..3ba481d1 100644
--- a/apps/client/public/locales/de-DE/translation.json
+++ b/apps/client/public/locales/de-DE/translation.json
@@ -362,5 +362,26 @@
"Move page to a different space.": "Seite in einen anderen Bereich verschieben.",
"Real-time editor connection lost. Retrying...": "Echtzeit-Editor-Verbindung verloren. Wiederholen...",
"Table of contents": "Inhaltsverzeichnis",
- "Add headings (H1, H2, H3) to generate a table of contents.": "Fügen Sie Überschriften (H1, H2, H3) hinzu, um ein Inhaltsverzeichnis zu erstellen."
+ "Add headings (H1, H2, H3) to generate a table of contents.": "Fügen Sie Überschriften (H1, H2, H3) hinzu, um ein Inhaltsverzeichnis zu erstellen.",
+ "Share": "Teilen",
+ "Public sharing": "Öffentliches Teilen",
+ "Shared by": "Geteilt von",
+ "Shared at": "Geteilt am",
+ "Inherits public sharing from": "Erbt das öffentliche Teilen von",
+ "Share to web": "Im Web teilen",
+ "Shared to web": "Im Web geteilt",
+ "Anyone with the link can view this page": "Jeder mit dem Link kann diese Seite ansehen",
+ "Make this page publicly accessible": "Diese Seite öffentlich zugänglich machen",
+ "Include sub-pages": "Unterseiten einbeziehen",
+ "Make sub-pages public too": "Unterseiten auch öffentlich machen",
+ "Allow search engines to index page": "Suchmaschinen erlauben, die Seite zu indexieren",
+ "Open page": "Seite öffnen",
+ "Page": "Seite",
+ "Delete public share link": "Öffentlichen Freigabelink löschen",
+ "Delete share": "Freigabe löschen",
+ "Are you sure you want to delete this shared link?": "Möchten Sie diesen Freigabelink wirklich löschen?",
+ "Publicly shared pages from spaces you are a member of will appear here": "Öffentlich geteilte Seiten aus Bereichen, in denen Sie Mitglied sind, erscheinen hier",
+ "Share deleted successfully": "Freigabe erfolgreich gelöscht",
+ "Share not found": "Freigabe nicht gefunden",
+ "Failed to share page": "Fehler beim Teilen der Seite"
}
diff --git a/apps/client/public/locales/es-ES/translation.json b/apps/client/public/locales/es-ES/translation.json
index f17d13d9..eed09b2c 100644
--- a/apps/client/public/locales/es-ES/translation.json
+++ b/apps/client/public/locales/es-ES/translation.json
@@ -94,7 +94,7 @@
"Invited members will be granted access to spaces the groups can access": "Los miembros invitados recibirán acceso a los espacios a los que los grupos pueden acceder",
"Join the workspace": "Unirse al espacio de trabajo",
"Language": "Idioma",
- "Light": "Ligero",
+ "Light": "Claro",
"Link copied": "Enlace copiado",
"Login": "Iniciar sesión",
"Logout": "Cerrar sesión",
@@ -362,5 +362,26 @@
"Move page to a different space.": "Mover página a un espacio diferente.",
"Real-time editor connection lost. Retrying...": "Conexión del editor en tiempo real perdida. Reintentando...",
"Table of contents": "Índice de contenidos",
- "Add headings (H1, H2, H3) to generate a table of contents.": "Añadir encabezados (H1, H2, H3) para generar un índice de contenidos."
+ "Add headings (H1, H2, H3) to generate a table of contents.": "Añadir encabezados (H1, H2, H3) para generar un índice de contenidos.",
+ "Share": "Compartir",
+ "Public sharing": "Compartición pública",
+ "Shared by": "Compartido por",
+ "Shared at": "Compartido en",
+ "Inherits public sharing from": "Hereda la compartición pública de",
+ "Share to web": "Compartir en la web",
+ "Shared to web": "Compartido en la web",
+ "Anyone with the link can view this page": "Cualquiera con el enlace puede ver esta página",
+ "Make this page publicly accessible": "Hacer esta página accesible públicamente",
+ "Include sub-pages": "Incluir subpáginas",
+ "Make sub-pages public too": "Hacer públicas también las subpáginas",
+ "Allow search engines to index page": "Permitir a los motores de búsqueda indexar la página",
+ "Open page": "Abrir página",
+ "Page": "Página",
+ "Delete public share link": "Eliminar enlace de compartición pública",
+ "Delete share": "Eliminar compartición",
+ "Are you sure you want to delete this shared link?": "¿Está seguro de que desea eliminar este enlace compartido?",
+ "Publicly shared pages from spaces you are a member of will appear here": "Las páginas compartidas públicamente de los espacios a los que pertenece aparecerán aquí",
+ "Share deleted successfully": "Compartición eliminada con éxito",
+ "Share not found": "Compartición no encontrada",
+ "Failed to share page": "Error al compartir la página"
}
diff --git a/apps/client/public/locales/fr-FR/translation.json b/apps/client/public/locales/fr-FR/translation.json
index 408ff420..4a8b32f7 100644
--- a/apps/client/public/locales/fr-FR/translation.json
+++ b/apps/client/public/locales/fr-FR/translation.json
@@ -362,5 +362,26 @@
"Move page to a different space.": "Déplacer la page vers un autre espace.",
"Real-time editor connection lost. Retrying...": "Connexion avec l'éditeur en temps réel perdue. Nouvelle tentative...",
"Table of contents": "",
- "Add headings (H1, H2, H3) to generate a table of contents.": "Ajoutez des titres (H1, H2, H3) pour générer une table des matières."
+ "Add headings (H1, H2, H3) to generate a table of contents.": "Ajoutez des titres (H1, H2, H3) pour générer une table des matières.",
+ "Share": "Partager",
+ "Public sharing": "Partage public",
+ "Shared by": "Partagé par",
+ "Shared at": "Partagé à",
+ "Inherits public sharing from": "Hérite du partage public de",
+ "Share to web": "Partager sur le web",
+ "Shared to web": "Partagé sur le web",
+ "Anyone with the link can view this page": "Toute personne avec le lien peut voir cette page",
+ "Make this page publicly accessible": "Rendre cette page accessible au public",
+ "Include sub-pages": "Inclure les sous-pages",
+ "Make sub-pages public too": "Rendre également les sous-pages publiques",
+ "Allow search engines to index page": "Autoriser les moteurs de recherche à indexer la page",
+ "Open page": "Ouvrir la page",
+ "Page": "Page",
+ "Delete public share link": "Supprimer le lien de partage public",
+ "Delete share": "Supprimer le partage",
+ "Are you sure you want to delete this shared link?": "Êtes-vous sûr de vouloir supprimer ce lien partagé ?",
+ "Publicly shared pages from spaces you are a member of will appear here": "Les pages partagées publiquement des espaces dont vous êtes membre apparaîtront ici",
+ "Share deleted successfully": "Partage supprimé avec succès",
+ "Share not found": "Partage non trouvé",
+ "Failed to share page": "Échec du partage de la page"
}
diff --git a/apps/client/public/locales/it-IT/translation.json b/apps/client/public/locales/it-IT/translation.json
index b92377c7..28eb6771 100644
--- a/apps/client/public/locales/it-IT/translation.json
+++ b/apps/client/public/locales/it-IT/translation.json
@@ -362,5 +362,26 @@
"Move page to a different space.": "Sposta la pagina in un altro spazio.",
"Real-time editor connection lost. Retrying...": "Connessione all'editor in tempo reale persa. Riprovo...",
"Table of contents": "Indice dei contenuti",
- "Add headings (H1, H2, H3) to generate a table of contents.": "Aggiungi intestazioni (H1, H2, H3) per generare un sommario."
+ "Add headings (H1, H2, H3) to generate a table of contents.": "Aggiungi intestazioni (H1, H2, H3) per generare un sommario.",
+ "Share": "Condividi",
+ "Public sharing": "Condivisione pubblica",
+ "Shared by": "Condiviso da",
+ "Shared at": "Condiviso il",
+ "Inherits public sharing from": "Eredita la condivisione pubblica da",
+ "Share to web": "Condividi su web",
+ "Shared to web": "Condiviso su web",
+ "Anyone with the link can view this page": "Chiunque abbia il link può visualizzare questa pagina",
+ "Make this page publicly accessible": "Rendi questa pagina accessibile pubblicamente",
+ "Include sub-pages": "Includi sotto-pagine",
+ "Make sub-pages public too": "Rendi pubbliche anche le sotto-pagine",
+ "Allow search engines to index page": "Permetti ai motori di ricerca di indicizzare la pagina",
+ "Open page": "Apri pagina",
+ "Page": "Pagina",
+ "Delete public share link": "Elimina il link di condivisione pubblica",
+ "Delete share": "Elimina condivisione",
+ "Are you sure you want to delete this shared link?": "Sei sicuro di voler eliminare questo link condiviso?",
+ "Publicly shared pages from spaces you are a member of will appear here": "Le pagine condivise pubblicamente dagli spazi di cui sei membro appariranno qui",
+ "Share deleted successfully": "Condivisione eliminata con successo",
+ "Share not found": "Condivisione non trovata",
+ "Failed to share page": "Condivisione della pagina fallita"
}
diff --git a/apps/client/public/locales/ja-JP/translation.json b/apps/client/public/locales/ja-JP/translation.json
index cc6141c4..cba12e63 100644
--- a/apps/client/public/locales/ja-JP/translation.json
+++ b/apps/client/public/locales/ja-JP/translation.json
@@ -362,5 +362,26 @@
"Move page to a different space.": "ページを別のスペースに移動します。",
"Real-time editor connection lost. Retrying...": "リアルタイムエディターの接続が失われました。再試行しています…",
"Table of contents": "目次",
- "Add headings (H1, H2, H3) to generate a table of contents.": "見出し（H1、H2、H3）を追加して目次を生成します。"
+ "Add headings (H1, H2, H3) to generate a table of contents.": "見出し（H1、H2、H3）を追加して目次を生成します。",
+ "Share": "共有",
+ "Public sharing": "公開共有",
+ "Shared by": "共有者",
+ "Shared at": "共有日時",
+ "Inherits public sharing from": "から公開共有を継承する",
+ "Share to web": "ウェブで共有",
+ "Shared to web": "ウェブに共有済み",
+ "Anyone with the link can view this page": "リンクを持っている人はこのページを閲覧できます",
+ "Make this page publicly accessible": "このページを公開します",
+ "Include sub-pages": "サブページを含む",
+ "Make sub-pages public too": "サブページも公開する",
+ "Allow search engines to index page": "検索エンジンにページのインデックス作成を許可する",
+ "Open page": "ページを開く",
+ "Page": "ページ",
+ "Delete public share link": "公開リンクを削除",
+ "Delete share": "共有を削除",
+ "Are you sure you want to delete this shared link?": "この共有リンクを削除してもよろしいですか?",
+ "Publicly shared pages from spaces you are a member of will appear here": "メンバーであるスペースからの公開ページがここに表示されます",
+ "Share deleted successfully": "共有が正常に削除されました",
+ "Share not found": "共有が見つかりません",
+ "Failed to share page": "ページの共有に失敗しました"
}
diff --git a/apps/client/public/locales/ko-KR/translation.json b/apps/client/public/locales/ko-KR/translation.json
index 1e87c62e..fd8db95b 100644
--- a/apps/client/public/locales/ko-KR/translation.json
+++ b/apps/client/public/locales/ko-KR/translation.json
@@ -362,5 +362,26 @@
"Move page to a different space.": "페이지를 다른 공간으로 이동합니다.",
"Real-time editor connection lost. Retrying...": "실시간 편집기 연결이 끊어졌습니다. 재시도 중...",
"Table of contents": "목차",
- "Add headings (H1, H2, H3) to generate a table of contents.": "목차를 생성하려면 제목 (H1, H2, H3)을 추가하세요."
+ "Add headings (H1, H2, H3) to generate a table of contents.": "목차를 생성하려면 제목 (H1, H2, H3)을 추가하세요.",
+ "Share": "공유",
+ "Public sharing": "공개 공유",
+ "Shared by": "공유자",
+ "Shared at": "공유 시간",
+ "Inherits public sharing from": "로부터 공개 공유를 상속함",
+ "Share to web": "웹에 공유",
+ "Shared to web": "웹에 공유됨",
+ "Anyone with the link can view this page": "링크가 있는 사람은 이 페이지를 볼 수 있습니다",
+ "Make this page publicly accessible": "이 페이지를 공개적으로 접근 가능하게 만들기",
+ "Include sub-pages": "하위 페이지 포함",
+ "Make sub-pages public too": "하위 페이지도 공개로 설정",
+ "Allow search engines to index page": "검색 엔진이 페이지를 색인할 수 있도록 허용",
+ "Open page": "페이지 열기",
+ "Page": "페이지",
+ "Delete public share link": "공유 링크 삭제",
+ "Delete share": "공유 삭제",
+ "Are you sure you want to delete this shared link?": "이 공유 링크를 삭제하시겠습니까?",
+ "Publicly shared pages from spaces you are a member of will appear here": "회원인 공간의 공개 공유된 페이지가 여기에 표시됩니다",
+ "Share deleted successfully": "공유가 성공적으로 삭제되었습니다",
+ "Share not found": "공유를 찾을 수 없습니다",
+ "Failed to share page": "페이지 공유에 실패했습니다"
}
diff --git a/apps/client/public/locales/nl-NL/translation.json b/apps/client/public/locales/nl-NL/translation.json
index dba2ee9a..1879078e 100644
--- a/apps/client/public/locales/nl-NL/translation.json
+++ b/apps/client/public/locales/nl-NL/translation.json
@@ -362,5 +362,26 @@
"Move page to a different space.": "Verplaats pagina naar een andere ruimte.",
"Real-time editor connection lost. Retrying...": "Realtime editorverbinding verloren. Opnieuw proberen...",
"Table of contents": "Inhoudsopgave",
- "Add headings (H1, H2, H3) to generate a table of contents.": "Voeg koppen (H1, H2, H3) toe om een inhoudsopgave te genereren."
+ "Add headings (H1, H2, H3) to generate a table of contents.": "Voeg koppen (H1, H2, H3) toe om een inhoudsopgave te genereren.",
+ "Share": "Delen",
+ "Public sharing": "Openbaar delen",
+ "Shared by": "Gedeeld door",
+ "Shared at": "Gedeeld op",
+ "Inherits public sharing from": "Erft openbaar delen van",
+ "Share to web": "Delen naar web",
+ "Shared to web": "Gedeeld naar web",
+ "Anyone with the link can view this page": "Iedereen met de link kan deze pagina bekijken",
+ "Make this page publicly accessible": "Maak deze pagina openbaar toegankelijk",
+ "Include sub-pages": "Inclusief subpagina's",
+ "Make sub-pages public too": "Maak subpagina's ook openbaar",
+ "Allow search engines to index page": "Sta zoekmachines toe om pagina te indexeren",
+ "Open page": "Pagina openen",
+ "Page": "Pagina",
+ "Delete public share link": "Verwijder openbare deel-link",
+ "Delete share": "Verwijder deel",
+ "Are you sure you want to delete this shared link?": "Weet u zeker dat u deze gedeelde link wilt verwijderen?",
+ "Publicly shared pages from spaces you are a member of will appear here": "Openbaar gedeelde pagina's van ruimtes waarvan u lid bent, verschijnen hier",
+ "Share deleted successfully": "Delen succesvol verwijderd",
+ "Share not found": "Delen niet gevonden",
+ "Failed to share page": "Pagina delen mislukt"
}
diff --git a/apps/client/public/locales/pt-BR/translation.json b/apps/client/public/locales/pt-BR/translation.json
index 526d298f..0986a2b7 100644
--- a/apps/client/public/locales/pt-BR/translation.json
+++ b/apps/client/public/locales/pt-BR/translation.json
@@ -362,5 +362,26 @@
"Move page to a different space.": "Mover página para um espaço diferente.",
"Real-time editor connection lost. Retrying...": "Conexão do editor em tempo real perdida. Tentando novamente...",
"Table of contents": "Tabela de conteúdos",
- "Add headings (H1, H2, H3) to generate a table of contents.": "Adicionar títulos (H1, H2, H3) para gerar uma tabela de conteúdo."
+ "Add headings (H1, H2, H3) to generate a table of contents.": "Adicionar títulos (H1, H2, H3) para gerar uma tabela de conteúdo.",
+ "Share": "Compartilhar",
+ "Public sharing": "Compartilhamento público",
+ "Shared by": "Compartilhado por",
+ "Shared at": "Compartilhado em",
+ "Inherits public sharing from": "Herdado do compartilhamento público de",
+ "Share to web": "Compartilhar na web",
+ "Shared to web": "Compartilhado na web",
+ "Anyone with the link can view this page": "Qualquer um com o link pode ver esta página",
+ "Make this page publicly accessible": "Tornar esta página publicamente acessível",
+ "Include sub-pages": "Incluir sub-páginas",
+ "Make sub-pages public too": "Tornar as sub-páginas públicas também",
+ "Allow search engines to index page": "Permitir que mecanismos de busca indexem a página",
+ "Open page": "Abrir página",
+ "Page": "Página",
+ "Delete public share link": "Excluir o link público compartilhado",
+ "Delete share": "Excluir compartilhamento",
+ "Are you sure you want to delete this shared link?": "Tem certeza de que deseja excluir este link compartilhado?",
+ "Publicly shared pages from spaces you are a member of will appear here": "Páginas compartilhadas publicamente de espaços que você é membro aparecerão aqui",
+ "Share deleted successfully": "Compartilhamento excluído com sucesso",
+ "Share not found": "Compartilhamento não encontrado",
+ "Failed to share page": "Falha ao compartilhar página"
}
diff --git a/apps/client/public/locales/ru-RU/translation.json b/apps/client/public/locales/ru-RU/translation.json
index dce96d80..27105bfc 100644
--- a/apps/client/public/locales/ru-RU/translation.json
+++ b/apps/client/public/locales/ru-RU/translation.json
@@ -13,11 +13,11 @@
"Are you sure you want to remove this user from the group? The user will lose access to resources this group has access to.": "Вы уверены, что хотите удалить этого пользователя из группы? Пользователь потеряет доступ к материалам, к которым у этой группы есть доступ.",
"Are you sure you want to remove this user from the space? The user will lose all access to this space.": "Вы уверены, что хотите удалить этого пользователя из пространства? Пользователь потеряет весь доступ к этому пространству.",
"Are you sure you want to restore this version? Any changes not versioned will be lost.": "Вы уверены, что хотите восстановить эту версию? Все не зафиксированные изменения будут потеряны.",
- "Can become members of groups and spaces in workspace": "Могут становиться участниками групп и пространств в рабочем пространстве",
+ "Can become members of groups and spaces in workspace": "Могут становиться участниками групп и пространств в рабочей области",
"Can create and edit pages in space.": "Может создавать и редактировать страницы в пространстве.",
"Can edit": "Может изменять",
- "Can manage workspace": "Может управлять рабочим пространством",
- "Can manage workspace but cannot delete it": "Может управлять рабочим пространством, но не может его удалить",
+ "Can manage workspace": "Может управлять рабочей областью",
+ "Can manage workspace but cannot delete it": "Может управлять рабочей областью, но не может ее удалить",
"Can view": "Может просматривать",
"Can view pages in space but not edit.": "Может просматривать страницы в пространстве, но не может их редактировать.",
"Cancel": "Отменить",
@@ -34,7 +34,7 @@
"Create group": "Создать группу",
"Create page": "Создать страницу",
"Create space": "Создать пространство",
- "Create workspace": "Создать рабочее пространство",
+ "Create workspace": "Создать рабочую область",
"Current password": "Текущий пароль",
"Dark": "Темная",
"Date": "Дата",
@@ -92,7 +92,7 @@
"Invite new members": "Пригласить новых участников",
"Invited members who are yet to accept their invitation will appear here.": "Приглашённые участники, которые ещё не приняли приглашение, появятся здесь.",
"Invited members will be granted access to spaces the groups can access": "Приглашённые участники получат доступ к пространствам, доступ к которым есть у группы",
- "Join the workspace": "Присоединиться к рабочему пространству",
+ "Join the workspace": "Присоединиться к рабочей области",
"Language": "Язык",
"Light": "Светлая",
"Link copied": "Ссылка скопирована",
@@ -150,7 +150,7 @@
"Send invitation": "Отправить приглашение",
"Invitation sent": "Приглашение отправлено",
"Settings": "Настройки",
- "Setup workspace": "Настроить рабочее пространство",
+ "Setup workspace": "Настроить рабочую область",
"Sign In": "Вход",
"Sign Up": "Регистрация",
"Slug": "Slug",
@@ -177,9 +177,9 @@
"Untitled": "Без названия",
"Updated successfully": "Обновлено успешно",
"User": "Пользователь",
- "Workspace": "Рабочее пространство",
- "Workspace Name": "Имя рабочего пространства",
- "Workspace settings": "Настройки рабочего пространства",
+ "Workspace": "Рабочая область",
+ "Workspace Name": "Имя рабочей области",
+ "Workspace settings": "Настройки рабочей области",
"You can change your password here.": "Вы можете изменить свой пароль здесь.",
"Your Email": "Ваш адрес электронной почты",
"Your import is complete.": "Ваш импорт завершен.",
@@ -217,9 +217,9 @@
"Revoke invitation": "Отозвать приглашение",
"Revoke": "Отозвать",
"Don't": "Нет",
- "Are you sure you want to revoke this invitation? The user will not be able to join the workspace.": "Вы уверены, что хотите отозвать это приглашение? Пользователь не сможет присоединиться к рабочему пространству.",
+ "Are you sure you want to revoke this invitation? The user will not be able to join the workspace.": "Вы уверены, что хотите отозвать это приглашение? Пользователь не сможет присоединиться к рабочей области.",
"Resend invitation": "Отправить приглашение повторно",
- "Anyone with this link can join this workspace.": "Любой, у кого есть эта ссылка, может присоединиться к этому рабочему пространству.",
+ "Anyone with this link can join this workspace.": "Любой, у кого есть данная ссылка, может присоединиться к этой рабочей области.",
"Invite link": "Ссылка для приглашения",
"Copy": "Копировать",
"Copied": "Скопировано",
@@ -362,5 +362,26 @@
"Move page to a different space.": "Переместите страницу в другое пространство.",
"Real-time editor connection lost. Retrying...": "Соединение с редактором в реальном времени потеряно. Повторная попытка...",
"Table of contents": "Содержание",
- "Add headings (H1, H2, H3) to generate a table of contents.": "Добавьте заголовки (H1, H2, H3), чтобы создать оглавление."
+ "Add headings (H1, H2, H3) to generate a table of contents.": "Добавьте заголовки (H1, H2, H3), чтобы создать оглавление.",
+ "Share": "Поделиться",
+ "Public sharing": "Общий доступ",
+ "Shared by": "Поделился",
+ "Shared at": "Поделился в",
+ "Inherits public sharing from": "Наследует общий доступ от",
+ "Share to web": "Поделиться в интернете",
+ "Shared to web": "Размещено в интернете",
+ "Anyone with the link can view this page": "Любой, у кого есть ссылка, может просмотреть эту страницу",
+ "Make this page publicly accessible": "Сделать эту страницу общедоступной",
+ "Include sub-pages": "Включить подстраницы",
+ "Make sub-pages public too": "Сделать подстраницы также общедоступными",
+ "Allow search engines to index page": "Разрешить поисковым системам индексировать страницу",
+ "Open page": "Открыть страницу",
+ "Page": "Страница",
+ "Delete public share link": "Удалить ссылку на общий доступ",
+ "Delete share": "Удалить общий доступ",
+ "Are you sure you want to delete this shared link?": "Вы уверены, что хотите удалить эту ссылку общего доступа?",
+ "Publicly shared pages from spaces you are a member of will appear here": "Общие страницы из пространств, участником которых вы являетесь, появятся здесь",
+ "Share deleted successfully": "Общий доступ успешно удален",
+ "Share not found": "Общий доступ не найден",
+ "Failed to share page": "Не удалось поделиться страницей"
}
diff --git a/apps/client/public/locales/zh-CN/translation.json b/apps/client/public/locales/zh-CN/translation.json
index 9763c602..94c3007c 100644
--- a/apps/client/public/locales/zh-CN/translation.json
+++ b/apps/client/public/locales/zh-CN/translation.json
@@ -298,7 +298,7 @@
"Heading 2": "2 级标题",
"Heading 3": "3 级标题",
"To-do List": "代办列表",
- "Bullet List": "无需列表",
+ "Bullet List": "无序列表",
"Numbered List": "有序列表",
"Blockquote": "引用块",
"Just start typing with plain text.": "只需开始键入纯文本",
@@ -362,5 +362,26 @@
"Move page to a different space.": "将页面移动到不同的空间。",
"Real-time editor connection lost. Retrying...": "实时编辑器连接丢失。重试中……",
"Table of contents": "目录",
- "Add headings (H1, H2, H3) to generate a table of contents.": "添加标题（H1，H2，H3）以生成目录。"
+ "Add headings (H1, H2, H3) to generate a table of contents.": "添加标题（H1，H2，H3）以生成目录。",
+ "Share": "分享",
+ "Public sharing": "公开分享",
+ "Shared by": "分享者",
+ "Shared at": "分享时间",
+ "Inherits public sharing from": "继承自的公开分享",
+ "Share to web": "分享到网页",
+ "Shared to web": "已分享到网页",
+ "Anyone with the link can view this page": "任何有链接的人都可以查看此页面",
+ "Make this page publicly accessible": "使此页面可公开访问",
+ "Include sub-pages": "包括子页面",
+ "Make sub-pages public too": "将子页面也设为公开",
+ "Allow search engines to index page": "允许搜索引擎索引页面",
+ "Open page": "打开页面",
+ "Page": "页面",
+ "Delete public share link": "删除公开分享链接",
+ "Delete share": "删除分享",
+ "Are you sure you want to delete this shared link?": "您确定要删除此分享链接吗？",
+ "Publicly shared pages from spaces you are a member of will appear here": "您所在空间的公开共享页面会显示在此处",
+ "Share deleted successfully": "分享已成功删除",
+ "Share not found": "未找到分享",
+ "Failed to share page": "页面分享失败"
}
From acffeacdbcb408b7d152b3619f93c404c1907fd5 Mon Sep 17 00:00:00 2001
From: Philipinho <16838612+Philipinho@users.noreply.github.com>
Date: Tue, 22 Apr 2025 22:47:34 +0100
Subject: [PATCH 30/63] fix TOC
---
apps/client/src/features/share/components/share-shell.tsx | 7 +------
1 file changed, 1 insertion(+), 6 deletions(-)
diff --git a/apps/client/src/features/share/components/share-shell.tsx b/apps/client/src/features/share/components/share-shell.tsx
index 82863b34..799958d2 100644
--- a/apps/client/src/features/share/components/share-shell.tsx
+++ b/apps/client/src/features/share/components/share-shell.tsx
@@ -55,19 +55,15 @@ export default function ShareShell({
const readOnlyEditor = useAtomValue(readOnlyEditorAtom);
const [navbarOutside, setNavbarOutside] = useState(null);
- const [asideOutside, setAsideOutside] = useState(null);
useClickOutside(
() => {
if (mobileOpened) {
toggleMobile();
}
- if (mobileTocOpened) {
- toggleTocMobile();
- }
},
null,
- [navbarOutside, asideOutside],
+ [navbarOutside],
);
return (
@@ -181,7 +177,6 @@ export default function ShareShell({
p="md"
withBorder={mobileTocOpened}
className={classes.aside}
- ref={setAsideOutside}
>
+
+ ) {
}}
>
): SharedPageTreeNode[] {
+export function buildSharedPageTree(
+ pages: Partial,
+): SharedPageTreeNode[] {
const pageMap: Record = {};
// Initialize each page as a tree node and store it in a map.
@@ -30,7 +32,7 @@ export function buildSharedPageTree(pages: Partial): SharedPageTreeNode
hasChildren: false,
spaceId: page.spaceId,
parentPageId: page.parentPageId,
- label: page.title || 'untitled',
+ label: page.title || "untitled",
value: page.id,
children: [],
};
@@ -55,6 +57,12 @@ export function buildSharedPageTree(pages: Partial): SharedPageTreeNode
}
});
- // Return the sorted tree.
- return sortPositionKeys(tree);
+ function sortTree(nodes: SharedPageTreeNode[]): SharedPageTreeNode[] {
+ return sortPositionKeys(nodes).map((node: SharedPageTreeNode) => ({
+ ...node,
+ children: sortTree(node.children),
+ }));
+ }
+
+ return sortTree(tree);
}
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 528e8051..5dbd420a 100644
--- a/apps/client/src/features/space/components/sidebar/space-sidebar.tsx
+++ b/apps/client/src/features/space/components/sidebar/space-sidebar.tsx
@@ -6,7 +6,6 @@ import {
Tooltip,
UnstyledButton,
} from "@mantine/core";
-import { spotlight } from "@mantine/spotlight";
import {
IconArrowDown,
IconDots,
@@ -16,9 +15,8 @@ import {
IconSearch,
IconSettings,
} from "@tabler/icons-react";
-
import classes from "./space-sidebar.module.css";
-import React, { useMemo } from "react";
+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";
@@ -40,6 +38,7 @@ import { SwitchSpace } from "./switch-space";
import ExportModal from "@/components/common/export-modal";
import { mobileSidebarAtom } from "@/components/layouts/global/hooks/atoms/sidebar-atom.ts";
import { useToggleSidebar } from "@/components/layouts/global/hooks/hooks/use-toggle-sidebar.ts";
+import { searchSpotlight } from "@/features/search/constants";
export function SpaceSidebar() {
const { t } = useTranslation();
@@ -51,7 +50,7 @@ export function SpaceSidebar() {
const toggleMobileSidebar = useToggleSidebar(mobileSidebarAtom);
const { spaceSlug } = useParams();
- const { data: space, isLoading, isError } = useGetSpaceBySlugQuery(spaceSlug);
+ const { data: space } = useGetSpaceBySlugQuery(spaceSlug);
const spaceRules = space?.membership?.permissions;
const spaceAbility = useSpaceAbility(spaceRules);
@@ -100,7 +99,10 @@ export function SpaceSidebar() {
-
+
{
if (query.length < 1) {
return;
}
const searchQuery = tsquery(query.trim() + '*');
- const queryResults = await this.db
+ let queryResults = this.db
.selectFrom('pages')
.select([
'id',
@@ -43,18 +49,71 @@ export class SearchService {
'highlight',
),
])
- .select((eb) => this.pageRepo.withSpace(eb))
- .where('spaceId', '=', searchParams.spaceId)
.where('tsv', '@@', sql`to_tsquery(${searchQuery})`)
.$if(Boolean(searchParams.creatorId), (qb) =>
qb.where('creatorId', '=', searchParams.creatorId),
)
.orderBy('rank', 'desc')
.limit(searchParams.limit | 20)
- .offset(searchParams.offset || 0)
- .execute();
+ .offset(searchParams.offset || 0);
- const searchResults = queryResults.map((result) => {
+ if (!searchParams.shareId) {
+ queryResults = queryResults.select((eb) => this.pageRepo.withSpace(eb));
+ }
+
+ if (searchParams.spaceId) {
+ // search by spaceId
+ queryResults = queryResults.where('spaceId', '=', searchParams.spaceId);
+ } else if (opts.userId && !searchParams.spaceId) {
+ // only search spaces the user is a member of
+ const userSpaceIds = await this.spaceMemberRepo.getUserSpaceIds(
+ opts.userId,
+ );
+ if (userSpaceIds.length > 0) {
+ queryResults = queryResults
+ .where('spaceId', 'in', userSpaceIds)
+ .where('workspaceId', '=', opts.workspaceId);
+ } else {
+ return [];
+ }
+ } else if (searchParams.shareId && !searchParams.spaceId && !opts.userId) {
+ // search in shares
+ const shareId = searchParams.shareId;
+ const share = await this.shareRepo.findById(shareId);
+ if (!share || share.workspaceId !== opts.workspaceId) {
+ return [];
+ }
+
+ const pageIdsToSearch = [];
+ if (share.includeSubPages) {
+ const pageList = await this.pageRepo.getPageAndDescendants(
+ share.pageId,
+ {
+ includeContent: false,
+ },
+ );
+
+ pageIdsToSearch.push(...pageList.map((page) => page.id));
+ } else {
+ pageIdsToSearch.push(share.pageId);
+ }
+
+ if (pageIdsToSearch.length > 0) {
+ queryResults = queryResults
+ .where('id', 'in', pageIdsToSearch)
+ .where('workspaceId', '=', opts.workspaceId);
+ } else {
+ return [];
+ }
+ } else {
+ return [];
+ }
+
+ //@ts-ignore
+ queryResults = await queryResults.execute();
+
+ //@ts-ignore
+ const searchResults = queryResults.map((result: SearchResponseDto) => {
if (result.highlight) {
result.highlight = result.highlight
.replace(/\r\n|\r|\n/g, ' ')
diff --git a/apps/server/src/core/share/share.service.ts b/apps/server/src/core/share/share.service.ts
index a9140c0b..d71b6acd 100644
--- a/apps/server/src/core/share/share.service.ts
+++ b/apps/server/src/core/share/share.service.ts
@@ -15,6 +15,7 @@ import {
getAttachmentIds,
getProsemirrorContent,
isAttachmentNode,
+ removeMarkTypeFromDoc,
} from '../../common/helpers/prosemirror/utils';
import { Node } from '@tiptap/pm/model';
import { ShareRepo } from '@docmost/db/repos/share/share.repo';
@@ -223,11 +224,7 @@ export class ShareService {
.end()
.as('found'),
])
- .where(
- isValidUUID(childPageId) ? 'id' : 'slugId',
- '=',
- childPageId,
- )
+ .where(isValidUUID(childPageId) ? 'id' : 'slugId', '=', childPageId)
.unionAll((exp) =>
exp
.selectFrom('pages as p')
@@ -292,6 +289,7 @@ export class ShareService {
updateAttachmentAttr(node, 'url', token);
});
- return doc.toJSON();
+ const removeCommentMarks = removeMarkTypeFromDoc(doc, 'comment');
+ return removeCommentMarks.toJSON();
}
}
From c528f7e8584a144669e0525e83cd9df208442128 Mon Sep 17 00:00:00 2001
From: Philipinho <16838612+Philipinho@users.noreply.github.com>
Date: Wed, 23 Apr 2025 14:34:28 +0100
Subject: [PATCH 34/63] v0.20.1
---
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 e56b7e68..57e0026a 100644
--- a/apps/client/package.json
+++ b/apps/client/package.json
@@ -1,7 +1,7 @@
{
"name": "client",
"private": true,
- "version": "0.20.0",
+ "version": "0.20.1",
"scripts": {
"dev": "vite",
"build": "tsc && vite build",
diff --git a/apps/server/package.json b/apps/server/package.json
index 935647ed..a1a6f081 100644
--- a/apps/server/package.json
+++ b/apps/server/package.json
@@ -1,6 +1,6 @@
{
"name": "server",
- "version": "0.20.0",
+ "version": "0.20.1",
"description": "",
"author": "",
"private": true,
diff --git a/package.json b/package.json
index 0cafcc3f..8e9fcead 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
{
"name": "docmost",
"homepage": "https://docmost.com",
- "version": "0.20.0",
+ "version": "0.20.1",
"private": true,
"scripts": {
"build": "nx run-many -t build",
From 08f223899a415b5d95b53a0c1d003401778f0dc2 Mon Sep 17 00:00:00 2001
From: Philipinho <16838612+Philipinho@users.noreply.github.com>
Date: Wed, 23 Apr 2025 16:07:58 +0100
Subject: [PATCH 35/63] cloud trial refactor
---
apps/client/src/ee/billing/components/billing-trial.tsx | 5 +++--
apps/client/src/ee/hooks/use-trial-end-action.tsx | 4 ++--
apps/client/src/lib/config.ts | 4 ++++
apps/client/vite.config.ts | 2 ++
apps/server/src/ee | 2 +-
apps/server/src/integrations/static/static.module.ts | 3 +++
6 files changed, 15 insertions(+), 5 deletions(-)
diff --git a/apps/client/src/ee/billing/components/billing-trial.tsx b/apps/client/src/ee/billing/components/billing-trial.tsx
index 82dcbb03..38acc17c 100644
--- a/apps/client/src/ee/billing/components/billing-trial.tsx
+++ b/apps/client/src/ee/billing/components/billing-trial.tsx
@@ -1,6 +1,7 @@
import { Alert } from "@mantine/core";
import { useBillingQuery } from "@/ee/billing/queries/billing-query.ts";
import useTrial from "@/ee/hooks/use-trial.tsx";
+import { getBillingTrialDays } from '@/lib/config.ts';
export default function BillingTrial() {
const { data: billing, isLoading } = useBillingQuery();
@@ -15,14 +16,14 @@ export default function BillingTrial() {
{trialDaysLeft > 0 && !billing && (
You have {trialDaysLeft} {trialDaysLeft === 1 ? "day" : "days"} left
- in your 7-day trial. Please subscribe to a plan before your trial
+ in your {getBillingTrialDays()}-day free trial. Please subscribe to a paid plan before your trial
ends.
)}
{trialDaysLeft === 0 && (
- Your 7-day trial has come to an end. Please subscribe to a plan to
+ Your {getBillingTrialDays()}-day free trial has come to an end. Please subscribe to a paid plan to
continue using this service.
)}
diff --git a/apps/client/src/ee/hooks/use-trial-end-action.tsx b/apps/client/src/ee/hooks/use-trial-end-action.tsx
index 931fd6a8..09248c6a 100644
--- a/apps/client/src/ee/hooks/use-trial-end-action.tsx
+++ b/apps/client/src/ee/hooks/use-trial-end-action.tsx
@@ -1,6 +1,6 @@
import { useEffect } from "react";
import { useLocation, useNavigate } from "react-router-dom";
-import { isCloud } from "@/lib/config.ts";
+import { getBillingTrialDays, isCloud } from "@/lib/config.ts";
import APP_ROUTE from "@/lib/app-route.ts";
import useUserRole from "@/hooks/use-user-role.tsx";
import { notifications } from "@mantine/notifications";
@@ -18,7 +18,7 @@ export const useTrialEndAction = () => {
notifications.show({
position: "top-right",
color: "red",
- title: "Your 7-day trial has ended",
+ title: `Your ${getBillingTrialDays()}-day trial has ended`,
message:
"Please upgrade to a paid plan or contact your workspace admin.",
autoClose: false,
diff --git a/apps/client/src/lib/config.ts b/apps/client/src/lib/config.ts
index 9e1efc30..2f621b91 100644
--- a/apps/client/src/lib/config.ts
+++ b/apps/client/src/lib/config.ts
@@ -74,6 +74,10 @@ export function getDrawioUrl() {
return getConfigValue("DRAWIO_URL", "https://embed.diagrams.net");
}
+export function getBillingTrialDays() {
+ return getConfigValue("BILLING_TRIAL_DAYS");
+}
+
function getConfigValue(key: string, defaultValue: string = undefined): string {
const rawValue = import.meta.env.DEV
? process?.env?.[key]
diff --git a/apps/client/vite.config.ts b/apps/client/vite.config.ts
index 2e557fe5..a6efc4bc 100644
--- a/apps/client/vite.config.ts
+++ b/apps/client/vite.config.ts
@@ -12,6 +12,7 @@ export default defineConfig(({ mode }) => {
CLOUD,
SUBDOMAIN_HOST,
COLLAB_URL,
+ BILLING_TRIAL_DAYS,
} = loadEnv(mode, envPath, "");
return {
@@ -23,6 +24,7 @@ export default defineConfig(({ mode }) => {
CLOUD,
SUBDOMAIN_HOST,
COLLAB_URL,
+ BILLING_TRIAL_DAYS,
},
APP_VERSION: JSON.stringify(process.env.npm_package_version),
},
diff --git a/apps/server/src/ee b/apps/server/src/ee
index d3095f2d..4e7319ab 160000
--- a/apps/server/src/ee
+++ b/apps/server/src/ee
@@ -1 +1 @@
-Subproject commit d3095f2d8bd2870da7f3b534c83c84e8fb3099bc
+Subproject commit 4e7319ab01f0ea535bb4dd6b98ea996fcd1c3ffc
diff --git a/apps/server/src/integrations/static/static.module.ts b/apps/server/src/integrations/static/static.module.ts
index e5152ef8..15db42b0 100644
--- a/apps/server/src/integrations/static/static.module.ts
+++ b/apps/server/src/integrations/static/static.module.ts
@@ -42,6 +42,9 @@ export class StaticModule implements OnModuleInit {
? this.environmentService.getSubdomainHost()
: undefined,
COLLAB_URL: this.environmentService.getCollabUrl(),
+ BILLING_TRIAL_DAYS: this.environmentService.isCloud()
+ ? this.environmentService.getBillingTrialDays()
+ : undefined,
};
const windowScriptContent = ``;
From 33c314d4e8679f4ced56754208ed51ca49dc3b79 Mon Sep 17 00:00:00 2001
From: Philipinho <16838612+Philipinho@users.noreply.github.com>
Date: Thu, 24 Apr 2025 17:56:54 +0100
Subject: [PATCH 36/63] remove clickoutside hook
---
.../src/components/layouts/global/global-app-shell.tsx | 10 +---------
1 file changed, 1 insertion(+), 9 deletions(-)
diff --git a/apps/client/src/components/layouts/global/global-app-shell.tsx b/apps/client/src/components/layouts/global/global-app-shell.tsx
index c8aff4cc..58ff5609 100644
--- a/apps/client/src/components/layouts/global/global-app-shell.tsx
+++ b/apps/client/src/components/layouts/global/global-app-shell.tsx
@@ -14,7 +14,6 @@ import { AppHeader } from "@/components/layouts/global/app-header.tsx";
import Aside from "@/components/layouts/global/aside.tsx";
import classes from "./app-shell.module.css";
import { useTrialEndAction } from "@/ee/hooks/use-trial-end-action.tsx";
-import { useClickOutside, useMergedRef } from "@mantine/hooks";
import { useToggleSidebar } from "@/components/layouts/global/hooks/hooks/use-toggle-sidebar.ts";
export default function GlobalAppShell({
@@ -30,13 +29,6 @@ export default function GlobalAppShell({
const [sidebarWidth, setSidebarWidth] = useAtom(sidebarWidthAtom);
const [isResizing, setIsResizing] = useState(false);
const sidebarRef = useRef(null);
- const navbarOutsideRef = useClickOutside(() => {
- if (mobileOpened) {
- toggleMobile();
- }
- });
-
- const mergedRef = useMergedRef(sidebarRef, navbarOutsideRef);
const startResizing = React.useCallback((mouseDownEvent) => {
mouseDownEvent.preventDefault();
@@ -112,7 +104,7 @@ export default function GlobalAppShell({
{isSpaceRoute && {
diff --git a/apps/server/src/collaboration/extensions/persistence.extension.ts b/apps/server/src/collaboration/extensions/persistence.extension.ts
index a1f9f519..3c206e1a 100644
--- a/apps/server/src/collaboration/extensions/persistence.extension.ts
+++ b/apps/server/src/collaboration/extensions/persistence.extension.ts
@@ -130,7 +130,7 @@ export class PersistenceExtension implements Extension {
);
this.contributors.delete(documentName);
} catch (err) {
- this.logger.log('Contributors error:' + err?.['message']);
+ this.logger.debug('Contributors error:' + err?.['message']);
}
await this.pageRepo.updatePage(
diff --git a/apps/server/src/main.ts b/apps/server/src/main.ts
index 95df255d..a371b9b9 100644
--- a/apps/server/src/main.ts
+++ b/apps/server/src/main.ts
@@ -4,12 +4,7 @@ import {
FastifyAdapter,
NestFastifyApplication,
} from '@nestjs/platform-fastify';
-import {
- Logger,
- NotFoundException,
- RequestMethod,
- ValidationPipe,
-} from '@nestjs/common';
+import { Logger, NotFoundException, ValidationPipe } from '@nestjs/common';
import { TransformHttpResponseInterceptor } from './common/interceptors/http-response.interceptor';
import { WsRedisIoAdapter } from './ws/adapter/ws-redis.adapter';
import { InternalLogFilter } from './common/logger/internal-log-filter';
@@ -92,6 +87,14 @@ async function bootstrap() {
const logger = new Logger('NestApplication');
+ process.on('unhandledRejection', (reason, promise) => {
+ logger.error(`UnhandledRejection: ${promise}, reason: ${reason}`);
+ });
+
+ process.on('uncaughtException', (error) => {
+ logger.error('UncaughtException:', error);
+ });
+
const port = process.env.PORT || 3000;
await app.listen(port, '0.0.0.0', () => {
logger.log(
From 8327251ab680452579bfe528370e6003c193b641 Mon Sep 17 00:00:00 2001
From: Philipinho <16838612+Philipinho@users.noreply.github.com>
Date: Tue, 29 Apr 2025 23:30:12 +0100
Subject: [PATCH 42/63] fix typo
---
apps/client/src/ee/security/components/enforce-sso.tsx | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/apps/client/src/ee/security/components/enforce-sso.tsx b/apps/client/src/ee/security/components/enforce-sso.tsx
index 4cbbc7ac..31a9f6fa 100644
--- a/apps/client/src/ee/security/components/enforce-sso.tsx
+++ b/apps/client/src/ee/security/components/enforce-sso.tsx
@@ -15,7 +15,7 @@ export default function EnforceSso() {
{t("Enforce SSO")}
{t(
- "Once enforced, members will not able able to login with email and password.",
+ "Once enforced, members will not able to login with email and password.",
)}
From 0402f7efb590d1efbecb5be4dfe20de264186e75 Mon Sep 17 00:00:00 2001
From: Philipinho <16838612+Philipinho@users.noreply.github.com>
Date: Wed, 30 Apr 2025 14:33:01 +0100
Subject: [PATCH 43/63] 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 4e7319ab..96404fc1 160000
--- a/apps/server/src/ee
+++ b/apps/server/src/ee
@@ -1 +1 @@
-Subproject commit 4e7319ab01f0ea535bb4dd6b98ea996fcd1c3ffc
+Subproject commit 96404fc121844a707bd0fb1e280df6e2d52e8973
From de7982fe301dfc162ad7ad128ab506882b73ab82 Mon Sep 17 00:00:00 2001
From: Philip Okugbe <16838612+Philipinho@users.noreply.github.com>
Date: Wed, 30 Apr 2025 14:43:16 +0100
Subject: [PATCH 44/63] feat: copy page to different space (#1118)
* Add copy page to space endpoint
* copy storage function
* copy function
* feat: copy attachments too
* Copy page - WIP
* fix type
* sync
* cleanup
---
.../public/locales/en-US/translation.json | 5 +-
.../page/components/copy-page-modal.tsx | 105 +++++++++++
.../components/header/page-header-menu.tsx | 8 +-
.../page/components/move-page-modal.tsx | 8 +-
.../features/page/services/page-service.ts | 6 +
.../page/tree/components/space-tree.tsx | 24 +++
.../src/features/page/types/page.types.ts | 7 +-
.../src/common/helpers/prosemirror/utils.ts | 25 ++-
.../server/src/core/page/dto/copy-page.dto.ts | 24 +++
.../server/src/core/page/dto/move-page.dto.ts | 10 +-
apps/server/src/core/page/page.controller.ts | 31 ++++
apps/server/src/core/page/page.module.ts | 2 +
.../src/core/page/services/page.service.ts | 166 +++++++++++++++++-
.../storage/drivers/local.driver.ts | 10 ++
.../integrations/storage/drivers/s3.driver.ts | 17 ++
.../interfaces/storage-driver.interface.ts | 2 +
.../integrations/storage/storage.service.ts | 5 +
17 files changed, 441 insertions(+), 14 deletions(-)
create mode 100644 apps/client/src/features/page/components/copy-page-modal.tsx
create mode 100644 apps/server/src/core/page/dto/copy-page.dto.ts
diff --git a/apps/client/public/locales/en-US/translation.json b/apps/client/public/locales/en-US/translation.json
index 0746ed15..127730d5 100644
--- a/apps/client/public/locales/en-US/translation.json
+++ b/apps/client/public/locales/en-US/translation.json
@@ -383,5 +383,8 @@
"Publicly shared pages from spaces you are a member of will appear here": "Publicly shared pages from spaces you are a member of will appear here",
"Share deleted successfully": "Share deleted successfully",
"Share not found": "Share not found",
- "Failed to share page": "Failed to share page"
+ "Failed to share page": "Failed to share page",
+ "Copy page": "Copy page",
+ "Copy page to a different space.": "Copy page to a different space.",
+ "Page copied successfully": "Page copied successfully"
}
diff --git a/apps/client/src/features/page/components/copy-page-modal.tsx b/apps/client/src/features/page/components/copy-page-modal.tsx
new file mode 100644
index 00000000..e639fbac
--- /dev/null
+++ b/apps/client/src/features/page/components/copy-page-modal.tsx
@@ -0,0 +1,105 @@
+import { Modal, Button, Group, Text } from "@mantine/core";
+import { copyPageToSpace } from "@/features/page/services/page-service.ts";
+import { useState } from "react";
+import { notifications } from "@mantine/notifications";
+import { useTranslation } from "react-i18next";
+import { ISpace } from "@/features/space/types/space.types.ts";
+import { queryClient } from "@/main.tsx";
+import { SpaceSelect } from "@/features/space/components/sidebar/space-select.tsx";
+import { useNavigate } from "react-router-dom";
+import { buildPageUrl } from "@/features/page/page.utils.ts";
+
+interface CopyPageModalProps {
+ pageId: string;
+ currentSpaceSlug: string;
+ open: boolean;
+ onClose: () => void;
+}
+
+export default function CopyPageModal({
+ pageId,
+ currentSpaceSlug,
+ open,
+ onClose,
+}: CopyPageModalProps) {
+ const { t } = useTranslation();
+ const [targetSpace, setTargetSpace] = useState(null);
+ const navigate = useNavigate();
+
+ const handleCopy = async () => {
+ if (!targetSpace) return;
+
+ try {
+ const copiedPage = await copyPageToSpace({
+ pageId,
+ spaceId: targetSpace.id,
+ });
+ queryClient.removeQueries({
+ predicate: (item) =>
+ ["pages", "sidebar-pages", "root-sidebar-pages"].includes(
+ item.queryKey[0] as string,
+ ),
+ });
+
+ const pageUrl = buildPageUrl(
+ copiedPage.space.slug,
+ copiedPage.slugId,
+ copiedPage.title,
+ );
+ navigate(pageUrl);
+ notifications.show({
+ message: t("Page copied successfully"),
+ });
+ onClose();
+ setTargetSpace(null);
+ } catch (err) {
+ notifications.show({
+ message: err.response?.data.message || "An error occurred",
+ color: "red",
+ });
+ console.log(err);
+ }
+ };
+
+ const handleChange = (space: ISpace) => {
+ setTargetSpace(space);
+ };
+
+ return (
+ e.stopPropagation()}
+ >
+
+
+ {t("Copy page")}
+
+
+
+ {t("Copy page to a different space.")}
+
+
+
+
+
+
+
+
+
+ );
+}
diff --git a/apps/client/src/features/page/components/header/page-header-menu.tsx b/apps/client/src/features/page/components/header/page-header-menu.tsx
index 9267ad9e..09305491 100644
--- a/apps/client/src/features/page/components/header/page-header-menu.tsx
+++ b/apps/client/src/features/page/components/header/page-header-menu.tsx
@@ -12,7 +12,7 @@ import {
IconTrash,
IconWifiOff,
} from "@tabler/icons-react";
-import React, { useEffect } from "react";
+import React from "react";
import useToggleAside from "@/hooks/use-toggle-aside.tsx";
import { useAtom } from "jotai";
import { historyAtoms } from "@/features/page-history/atoms/history-atoms.ts";
@@ -35,7 +35,7 @@ import {
import { formattedDate, timeAgo } from "@/lib/time.ts";
import MovePageModal from "@/features/page/components/move-page-modal.tsx";
import { useTimeAgo } from "@/hooks/use-time-ago.tsx";
-import ShareModal from '@/features/share/components/share-modal.tsx';
+import ShareModal from "@/features/share/components/share-modal.tsx";
interface PageHeaderMenuProps {
readOnly?: boolean;
@@ -59,7 +59,7 @@ export default function PageHeaderMenu({ readOnly }: PageHeaderMenuProps) {
)}
-
+
{
const pageUrl =
diff --git a/apps/client/src/features/page/components/move-page-modal.tsx b/apps/client/src/features/page/components/move-page-modal.tsx
index 4788951b..74880084 100644
--- a/apps/client/src/features/page/components/move-page-modal.tsx
+++ b/apps/client/src/features/page/components/move-page-modal.tsx
@@ -46,6 +46,7 @@ export default function MovePageModal({
message: t("Page moved successfully"),
});
onClose();
+ setTargetSpace(null);
} catch (err) {
notifications.show({
message: err.response?.data.message || "An error occurred",
@@ -53,7 +54,6 @@ export default function MovePageModal({
});
console.log(err);
}
- setTargetSpace(null);
};
const handleChange = (space: ISpace) => {
@@ -69,7 +69,7 @@ export default function MovePageModal({
yOffset="10vh"
xOffset={0}
mah={400}
- onClick={e => e.stopPropagation()}
+ onClick={(e) => e.stopPropagation()}
>
@@ -78,7 +78,9 @@ export default function MovePageModal({
- {t("Move page to a different space.")}
+
+ {t("Move page to a different space.")}
+
{
await api.post("/pages/move-to-space", data);
}
+export async function copyPageToSpace(data: ICopyPageToSpace): Promise {
+ const req = await api.post("/pages/copy-to-space", data);
+ return req.data;
+}
+
export async function getSidebarPages(
params: SidebarPagesParams,
): Promise> {
diff --git a/apps/client/src/features/page/tree/components/space-tree.tsx b/apps/client/src/features/page/tree/components/space-tree.tsx
index 5a00f258..1df62678 100644
--- a/apps/client/src/features/page/tree/components/space-tree.tsx
+++ b/apps/client/src/features/page/tree/components/space-tree.tsx
@@ -15,6 +15,7 @@ import {
IconArrowRight,
IconChevronDown,
IconChevronRight,
+ IconCopy,
IconDotsVertical,
IconFileDescription,
IconFileExport,
@@ -60,6 +61,7 @@ import ExportModal from "@/components/common/export-modal";
import MovePageModal from "../../components/move-page-modal.tsx";
import { mobileSidebarAtom } from "@/components/layouts/global/hooks/atoms/sidebar-atom.ts";
import { useToggleSidebar } from "@/components/layouts/global/hooks/hooks/use-toggle-sidebar.ts";
+import CopyPageModal from "../../components/copy-page-modal.tsx";
interface SpaceTreeProps {
spaceId: string;
@@ -448,6 +450,10 @@ function NodeMenu({ node, treeApi }: NodeMenuProps) {
movePageModalOpened,
{ open: openMovePageModal, close: closeMoveSpaceModal },
] = useDisclosure(false);
+ const [
+ copyPageModalOpened,
+ { open: openCopyPageModal, close: closeCopySpaceModal },
+ ] = useDisclosure(false);
const handleCopyLink = () => {
const pageUrl =
@@ -511,6 +517,17 @@ function NodeMenu({ node, treeApi }: NodeMenuProps) {
{t("Move")}
+
+ ability.cannot(SpaceCaslAction.Edit, SpaceCaslSubject.Page),
+ )
+ ) {
+ throw new ForbiddenException();
+ }
+
+ return this.pageService.copyPageToSpace(copiedPage, dto.spaceId, user);
+ }
+
@HttpCode(HttpStatus.OK)
@Post('move')
async movePage(@Body() dto: MovePageDto, @AuthUser() user: User) {
diff --git a/apps/server/src/core/page/page.module.ts b/apps/server/src/core/page/page.module.ts
index 93f8f719..fd336537 100644
--- a/apps/server/src/core/page/page.module.ts
+++ b/apps/server/src/core/page/page.module.ts
@@ -2,10 +2,12 @@ import { Module } from '@nestjs/common';
import { PageService } from './services/page.service';
import { PageController } from './page.controller';
import { PageHistoryService } from './services/page-history.service';
+import { StorageModule } from '../../integrations/storage/storage.module';
@Module({
controllers: [PageController],
providers: [PageService, PageHistoryService],
exports: [PageService, PageHistoryService],
+ imports: [StorageModule]
})
export class PageModule {}
diff --git a/apps/server/src/core/page/services/page.service.ts b/apps/server/src/core/page/services/page.service.ts
index 5e4553c6..41f3055e 100644
--- a/apps/server/src/core/page/services/page.service.ts
+++ b/apps/server/src/core/page/services/page.service.ts
@@ -1,12 +1,13 @@
import {
BadRequestException,
Injectable,
+ Logger,
NotFoundException,
} from '@nestjs/common';
import { CreatePageDto } from '../dto/create-page.dto';
import { UpdatePageDto } from '../dto/update-page.dto';
import { PageRepo } from '@docmost/db/repos/page/page.repo';
-import { Page } from '@docmost/db/types/entity.types';
+import { InsertablePage, Page, User } from '@docmost/db/types/entity.types';
import { PaginationOptions } from '@docmost/db/pagination/pagination-options';
import {
executeWithPagination,
@@ -21,13 +22,28 @@ import { DB } from '@docmost/db/types/db';
import { generateSlugId } from '../../../common/helpers';
import { executeTx } from '@docmost/db/utils';
import { AttachmentRepo } from '@docmost/db/repos/attachment/attachment.repo';
+import { v7 as uuid7 } from 'uuid';
+import {
+ createYdocFromJson,
+ getAttachmentIds,
+ getProsemirrorContent,
+ isAttachmentNode,
+ removeMarkTypeFromDoc,
+} from '../../../common/helpers/prosemirror/utils';
+import { jsonToNode, jsonToText } from 'src/collaboration/collaboration.util';
+import { CopyPageMapEntry, ICopyPageAttachment } from '../dto/copy-page.dto';
+import { Node as PMNode } from '@tiptap/pm/model';
+import { StorageService } from '../../../integrations/storage/storage.service';
@Injectable()
export class PageService {
+ private readonly logger = new Logger(PageService.name);
+
constructor(
private pageRepo: PageRepo,
private attachmentRepo: AttachmentRepo,
@InjectKysely() private readonly db: KyselyDB,
+ private readonly storageService: StorageService,
) {}
async findById(
@@ -242,6 +258,154 @@ export class PageService {
});
}
+ async copyPageToSpace(rootPage: Page, spaceId: string, authUser: User) {
+ //TODO:
+ // i. maintain internal links within copied pages
+
+ const nextPosition = await this.nextPagePosition(spaceId);
+
+ const pages = await this.pageRepo.getPageAndDescendants(rootPage.id, {
+ includeContent: true,
+ });
+
+ const pageMap = new Map();
+ pages.forEach((page) => {
+ pageMap.set(page.id, {
+ newPageId: uuid7(),
+ newSlugId: generateSlugId(),
+ oldSlugId: page.slugId,
+ });
+ });
+
+ const attachmentMap = new Map();
+
+ const insertablePages: InsertablePage[] = await Promise.all(
+ pages.map(async (page) => {
+ const pageContent = getProsemirrorContent(page.content);
+ const pageFromMap = pageMap.get(page.id);
+
+ const doc = jsonToNode(pageContent);
+ const prosemirrorDoc = removeMarkTypeFromDoc(doc, 'comment');
+
+ const attachmentIds = getAttachmentIds(prosemirrorDoc.toJSON());
+
+ if (attachmentIds.length > 0) {
+ attachmentIds.forEach((attachmentId: string) => {
+ const newPageId = pageFromMap.newPageId;
+ const newAttachmentId = uuid7();
+ attachmentMap.set(attachmentId, {
+ newPageId: newPageId,
+ oldPageId: page.id,
+ oldAttachmentId: attachmentId,
+ newAttachmentId: newAttachmentId,
+ });
+
+ prosemirrorDoc.descendants((node: PMNode) => {
+ if (isAttachmentNode(node.type.name)) {
+ if (node.attrs.attachmentId === attachmentId) {
+ //@ts-ignore
+ node.attrs.attachmentId = newAttachmentId;
+
+ if (node.attrs.src) {
+ //@ts-ignore
+ node.attrs.src = node.attrs.src.replace(
+ attachmentId,
+ newAttachmentId,
+ );
+ }
+ if (node.attrs.src) {
+ //@ts-ignore
+ node.attrs.src = node.attrs.src.replace(
+ attachmentId,
+ newAttachmentId,
+ );
+ }
+ }
+ }
+ });
+ });
+ }
+
+ const prosemirrorJson = prosemirrorDoc.toJSON();
+
+ return {
+ id: pageFromMap.newPageId,
+ slugId: pageFromMap.newSlugId,
+ title: page.title,
+ icon: page.icon,
+ content: prosemirrorJson,
+ textContent: jsonToText(prosemirrorJson),
+ ydoc: createYdocFromJson(prosemirrorJson),
+ position: page.id === rootPage.id ? nextPosition : page.position,
+ spaceId: spaceId,
+ workspaceId: page.workspaceId,
+ creatorId: authUser.id,
+ lastUpdatedById: authUser.id,
+ parentPageId: page.parentPageId
+ ? pageMap.get(page.parentPageId)?.newPageId
+ : null,
+ };
+ }),
+ );
+
+ await this.db.insertInto('pages').values(insertablePages).execute();
+
+ //TODO: best to handle this in a queue
+ const attachmentsIds = Array.from(attachmentMap.keys());
+ if (attachmentsIds.length > 0) {
+ const attachments = await this.db
+ .selectFrom('attachments')
+ .selectAll()
+ .where('id', 'in', attachmentsIds)
+ .where('workspaceId', '=', rootPage.workspaceId)
+ .execute();
+
+ for (const attachment of attachments) {
+ try {
+ const pageAttachment = attachmentMap.get(attachment.id);
+
+ // make sure the copied attachment belongs to the page it was copied from
+ if (attachment.pageId !== pageAttachment.oldPageId) {
+ continue;
+ }
+
+ const newAttachmentId = pageAttachment.newAttachmentId;
+
+ const newPageId = pageAttachment.newPageId;
+
+ const newPathFile = attachment.filePath.replace(
+ attachment.id,
+ newAttachmentId,
+ );
+ await this.storageService.copy(attachment.filePath, newPathFile);
+ await this.db
+ .insertInto('attachments')
+ .values({
+ id: newAttachmentId,
+ type: attachment.type,
+ filePath: newPathFile,
+ fileName: attachment.fileName,
+ fileSize: attachment.fileSize,
+ mimeType: attachment.mimeType,
+ fileExt: attachment.fileExt,
+ creatorId: attachment.creatorId,
+ workspaceId: attachment.workspaceId,
+ pageId: newPageId,
+ spaceId: spaceId,
+ })
+ .execute();
+ } catch (err) {
+ this.logger.log(err);
+ }
+ }
+ }
+
+ const newPageId = pageMap.get(rootPage.id).newPageId;
+ return await this.pageRepo.findById(newPageId, {
+ includeSpace: true,
+ });
+ }
+
async movePage(dto: MovePageDto, movedPage: Page) {
// validate position value by attempting to generate a key
try {
diff --git a/apps/server/src/integrations/storage/drivers/local.driver.ts b/apps/server/src/integrations/storage/drivers/local.driver.ts
index f2553733..e3da7700 100644
--- a/apps/server/src/integrations/storage/drivers/local.driver.ts
+++ b/apps/server/src/integrations/storage/drivers/local.driver.ts
@@ -25,6 +25,16 @@ export class LocalDriver implements StorageDriver {
}
}
+ async copy(fromFilePath: string, toFilePath: string): Promise {
+ try {
+ if (await this.exists(fromFilePath)) {
+ await fs.copy(fromFilePath, toFilePath);
+ }
+ } catch (err) {
+ throw new Error(`Failed to copy file: ${(err as Error).message}`);
+ }
+ }
+
async read(filePath: string): Promise {
try {
return await fs.readFile(this._fullPath(filePath));
diff --git a/apps/server/src/integrations/storage/drivers/s3.driver.ts b/apps/server/src/integrations/storage/drivers/s3.driver.ts
index 78f7548c..41feb365 100644
--- a/apps/server/src/integrations/storage/drivers/s3.driver.ts
+++ b/apps/server/src/integrations/storage/drivers/s3.driver.ts
@@ -1,5 +1,6 @@
import { S3StorageConfig, StorageDriver, StorageOption } from '../interfaces';
import {
+ CopyObjectCommand,
DeleteObjectCommand,
GetObjectCommand,
HeadObjectCommand,
@@ -39,6 +40,22 @@ export class S3Driver implements StorageDriver {
}
}
+ async copy(fromFilePath: string, toFilePath: string): Promise {
+ try {
+ if (await this.exists(fromFilePath)) {
+ await this.s3Client.send(
+ new CopyObjectCommand({
+ Bucket: this.config.bucket,
+ CopySource: `${this.config.bucket}/${fromFilePath}`,
+ Key: toFilePath,
+ }),
+ );
+ }
+ } catch (err) {
+ throw new Error(`Failed to copy file: ${(err as Error).message}`);
+ }
+ }
+
async read(filePath: string): Promise {
try {
const command = new GetObjectCommand({
diff --git a/apps/server/src/integrations/storage/interfaces/storage-driver.interface.ts b/apps/server/src/integrations/storage/interfaces/storage-driver.interface.ts
index 419587f4..6f18ff45 100644
--- a/apps/server/src/integrations/storage/interfaces/storage-driver.interface.ts
+++ b/apps/server/src/integrations/storage/interfaces/storage-driver.interface.ts
@@ -1,6 +1,8 @@
export interface StorageDriver {
upload(filePath: string, file: Buffer): Promise;
+ copy(fromFilePath: string, toFilePath: string): Promise;
+
read(filePath: string): Promise;
exists(filePath: string): Promise;
diff --git a/apps/server/src/integrations/storage/storage.service.ts b/apps/server/src/integrations/storage/storage.service.ts
index acbd2188..fe4c1cb5 100644
--- a/apps/server/src/integrations/storage/storage.service.ts
+++ b/apps/server/src/integrations/storage/storage.service.ts
@@ -14,6 +14,11 @@ export class StorageService {
this.logger.debug(`File uploaded successfully. Path: ${filePath}`);
}
+ async copy(fromFilePath: string, toFilePath: string) {
+ await this.storageDriver.copy(fromFilePath, toFilePath);
+ this.logger.debug(`File copied successfully. Path: ${toFilePath}`);
+ }
+
async read(filePath: string): Promise {
return this.storageDriver.read(filePath);
}
From 7adbf85030c5f7397ebc795f631231fa418bc21d Mon Sep 17 00:00:00 2001
From: Philipinho <16838612+Philipinho@users.noreply.github.com>
Date: Wed, 30 Apr 2025 14:44:58 +0100
Subject: [PATCH 45/63] v0.20.4
---
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 cc1c2d0b..586f50a1 100644
--- a/apps/client/package.json
+++ b/apps/client/package.json
@@ -1,7 +1,7 @@
{
"name": "client",
"private": true,
- "version": "0.20.3",
+ "version": "0.20.4",
"scripts": {
"dev": "vite",
"build": "tsc && vite build",
diff --git a/apps/server/package.json b/apps/server/package.json
index 2f3a99bd..5082d129 100644
--- a/apps/server/package.json
+++ b/apps/server/package.json
@@ -1,6 +1,6 @@
{
"name": "server",
- "version": "0.20.3",
+ "version": "0.20.4",
"description": "",
"author": "",
"private": true,
diff --git a/package.json b/package.json
index 4ef488db..3731015c 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
{
"name": "docmost",
"homepage": "https://docmost.com",
- "version": "0.20.3",
+ "version": "0.20.4",
"private": true,
"scripts": {
"build": "nx run-many -t build",
From bc3cb2d63f942f221bb91b4bde31fd1c93cd79df Mon Sep 17 00:00:00 2001
From: Philipinho <16838612+Philipinho@users.noreply.github.com>
Date: Wed, 7 May 2025 15:10:58 +0100
Subject: [PATCH 46/63] fix: increase random subdomain suffix
---
apps/server/src/core/workspace/services/workspace.service.ts | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/apps/server/src/core/workspace/services/workspace.service.ts b/apps/server/src/core/workspace/services/workspace.service.ts
index eb42f9e9..d6359893 100644
--- a/apps/server/src/core/workspace/services/workspace.service.ts
+++ b/apps/server/src/core/workspace/services/workspace.service.ts
@@ -387,14 +387,14 @@ export class WorkspaceService {
.replace(/[^a-z0-9]/g, '')
.substring(0, 20);
// Ensure we leave room for a random suffix.
- const maxSuffixLength = 3;
+ const maxSuffixLength = 6;
if (subdomain.length < 4) {
subdomain = `${subdomain}-${generateRandomSuffix(maxSuffixLength)}`;
}
if (DISALLOWED_HOSTNAMES.includes(subdomain)) {
- subdomain = `myworkspace-${generateRandomSuffix(maxSuffixLength)}`;
+ subdomain = `workspace-${generateRandomSuffix(maxSuffixLength)}`;
}
let uniqueHostname = subdomain;
From 55d1a2c9326171c091063bf567f3954f3021cb72 Mon Sep 17 00:00:00 2001
From: edo0 <16632292+edo0@users.noreply.github.com>
Date: Fri, 9 May 2025 11:11:02 +0100
Subject: [PATCH 47/63] Fix typo in enforce-sso.tsx (#1145)
---
apps/client/src/ee/security/components/enforce-sso.tsx | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/apps/client/src/ee/security/components/enforce-sso.tsx b/apps/client/src/ee/security/components/enforce-sso.tsx
index 31a9f6fa..183046e3 100644
--- a/apps/client/src/ee/security/components/enforce-sso.tsx
+++ b/apps/client/src/ee/security/components/enforce-sso.tsx
@@ -15,7 +15,7 @@ export default function EnforceSso() {
{t("Enforce SSO")}
{t(
- "Once enforced, members will not able to login with email and password.",
+ "Once enforced, members will not be able to login with email and password.",
)}
From c6bca6a602783791428429f4bad312e48133d771 Mon Sep 17 00:00:00 2001
From: Philipinho <16838612+Philipinho@users.noreply.github.com>
Date: Fri, 9 May 2025 16:44:33 +0100
Subject: [PATCH 48/63] fix deprecated kysely usage
---
apps/server/src/database/repos/user-token/user-token.repo.ts | 2 +-
apps/server/src/database/repos/workspace/workspace.repo.ts | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/apps/server/src/database/repos/user-token/user-token.repo.ts b/apps/server/src/database/repos/user-token/user-token.repo.ts
index 58971dc4..0137cb0a 100644
--- a/apps/server/src/database/repos/user-token/user-token.repo.ts
+++ b/apps/server/src/database/repos/user-token/user-token.repo.ts
@@ -70,7 +70,7 @@ export class UserTokenRepo {
.where('userId', '=', userId)
.where('workspaceId', '=', workspaceId)
.where('type', '=', tokenType)
- .orderBy('expiresAt desc')
+ .orderBy('expiresAt', 'desc')
.execute();
}
diff --git a/apps/server/src/database/repos/workspace/workspace.repo.ts b/apps/server/src/database/repos/workspace/workspace.repo.ts
index a38d02a7..8b9765f4 100644
--- a/apps/server/src/database/repos/workspace/workspace.repo.ts
+++ b/apps/server/src/database/repos/workspace/workspace.repo.ts
@@ -70,7 +70,7 @@ export class WorkspaceRepo {
return await this.db
.selectFrom('workspaces')
.selectAll()
- .orderBy('createdAt asc')
+ .orderBy('createdAt', 'asc')
.limit(1)
.executeTakeFirst();
}
From 3a75251e75fe6dd52cb7604219e5ed8a829c2c95 Mon Sep 17 00:00:00 2001
From: fuscodev
Date: Fri, 16 May 2025 17:00:47 +0200
Subject: [PATCH 49/63] fix alignment in shared page (#1123)
---
apps/server/src/collaboration/collaboration.util.ts | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/apps/server/src/collaboration/collaboration.util.ts b/apps/server/src/collaboration/collaboration.util.ts
index f91d5722..db2771b2 100644
--- a/apps/server/src/collaboration/collaboration.util.ts
+++ b/apps/server/src/collaboration/collaboration.util.ts
@@ -46,7 +46,7 @@ export const tiptapExtensions = [
codeBlock: false,
}),
Comment,
- TextAlign,
+ TextAlign.configure({ types: ["heading", "paragraph"] }),
TaskList,
TaskItem,
Underline,
From 00f4588c21316e6de541e61687b4e79a0e7202c5 Mon Sep 17 00:00:00 2001
From: fuscodev
Date: Fri, 16 May 2025 17:11:29 +0200
Subject: [PATCH 50/63] fix title update (#1154)
---
.../src/features/editor/title-editor.tsx | 10 +++--
.../src/features/page/queries/page-query.ts | 44 +++++++++++--------
2 files changed, 33 insertions(+), 21 deletions(-)
diff --git a/apps/client/src/features/editor/title-editor.tsx b/apps/client/src/features/editor/title-editor.tsx
index 9cb17aa0..e5ac7da6 100644
--- a/apps/client/src/features/editor/title-editor.tsx
+++ b/apps/client/src/features/editor/title-editor.tsx
@@ -10,7 +10,7 @@ import {
pageEditorAtom,
titleEditorAtom,
} from "@/features/editor/atoms/editor-atoms";
-import { useUpdatePageMutation } from "@/features/page/queries/page-query";
+import { updatePageData, useUpdateTitlePageMutation } from "@/features/page/queries/page-query";
import { useDebouncedCallback } from "@mantine/hooks";
import { useAtom } from "jotai";
import { useQueryEmit } from "@/features/websocket/use-query-emit.ts";
@@ -38,7 +38,7 @@ export function TitleEditor({
editable,
}: TitleEditorProps) {
const { t } = useTranslation();
- const { mutateAsync: updatePageMutationAsync } = useUpdatePageMutation();
+ const { mutateAsync: updateTitlePageMutationAsync } = useUpdateTitlePageMutation();
const pageEditor = useAtomValue(pageEditorAtom);
const [, setTitleEditor] = useAtom(titleEditorAtom);
const emit = useQueryEmit();
@@ -94,7 +94,7 @@ export function TitleEditor({
return;
}
- updatePageMutationAsync({
+ updateTitlePageMutationAsync({
pageId: pageId,
title: titleEditor.getText(),
}).then((page) => {
@@ -106,6 +106,10 @@ export function TitleEditor({
payload: { title: page.title, slugId: page.slugId },
};
+ if (page.title !== titleEditor.getText()) return;
+
+ updatePageData(page);
+
localEmitter.emit("message", event);
emit(event);
});
diff --git a/apps/client/src/features/page/queries/page-query.ts b/apps/client/src/features/page/queries/page-query.ts
index 1e41b519..6842cc9e 100644
--- a/apps/client/src/features/page/queries/page-query.ts
+++ b/apps/client/src/features/page/queries/page-query.ts
@@ -63,28 +63,36 @@ export function useCreatePageMutation() {
});
}
-export function useUpdatePageMutation() {
- const queryClient = useQueryClient();
+export function updatePageData(data: IPage) {
+ const pageBySlug = queryClient.getQueryData([
+ "pages",
+ data.slugId,
+ ]);
+ const pageById = queryClient.getQueryData(["pages", data.id]);
+ if (pageBySlug) {
+ queryClient.setQueryData(["pages", data.slugId], {
+ ...pageBySlug,
+ ...data,
+ });
+ }
+
+ if (pageById) {
+ queryClient.setQueryData(["pages", data.id], { ...pageById, ...data });
+ }
+}
+
+export function useUpdateTitlePageMutation() {
+ return useMutation>({
+ mutationFn: (data) => updatePage(data),
+ });
+}
+
+export function useUpdatePageMutation() {
return useMutation>({
mutationFn: (data) => updatePage(data),
onSuccess: (data) => {
- const pageBySlug = queryClient.getQueryData([
- "pages",
- data.slugId,
- ]);
- const pageById = queryClient.getQueryData(["pages", data.id]);
-
- if (pageBySlug) {
- queryClient.setQueryData(["pages", data.slugId], {
- ...pageBySlug,
- ...data,
- });
- }
-
- if (pageById) {
- queryClient.setQueryData(["pages", data.id], { ...pageById, ...data });
- }
+ updatePage(data);
},
});
}
From 1413033568b31f11adb38cd99e30487aa42ddb11 Mon Sep 17 00:00:00 2001
From: fuscodev
Date: Fri, 16 May 2025 17:18:23 +0200
Subject: [PATCH 51/63] feat: realtime comments (#1144)
* init
* fix: close bubblemenu after comment and wait before scroll
* scroll to comment when click
* highlight comment animation
---
.../comment/components/comment-dialog.tsx | 17 +++++++++-
.../comment/components/comment-editor.tsx | 4 +++
.../comment/components/comment-list-item.tsx | 34 +++++++++++++++++--
.../comment/components/comment-list.tsx | 17 +++++++---
.../comment/components/comment.module.css | 1 +
.../src/features/editor/page-editor.tsx | 9 +++--
.../src/features/editor/styles/core.css | 13 +++++++
.../src/features/websocket/types/types.ts | 7 +++-
.../websocket/use-query-subscription.ts | 6 ++++
9 files changed, 96 insertions(+), 12 deletions(-)
diff --git a/apps/client/src/features/comment/components/comment-dialog.tsx b/apps/client/src/features/comment/components/comment-dialog.tsx
index 2e27f65b..080c731f 100644
--- a/apps/client/src/features/comment/components/comment-dialog.tsx
+++ b/apps/client/src/features/comment/components/comment-dialog.tsx
@@ -15,6 +15,7 @@ import { asideStateAtom } from "@/components/layouts/global/hooks/atoms/sidebar-
import { useEditor } from "@tiptap/react";
import { CustomAvatar } from "@/components/ui/custom-avatar.tsx";
import { useTranslation } from "react-i18next";
+import { useQueryEmit } from "@/features/websocket/use-query-emit";
interface CommentDialogProps {
editor: ReturnType;
@@ -35,6 +36,8 @@ function CommentDialog({ editor, pageId }: CommentDialogProps) {
const createCommentMutation = useCreateCommentMutation();
const { isPending } = createCommentMutation;
+ const emit = useQueryEmit();
+
const handleDialogClose = () => {
setShowCommentPopup(false);
editor.chain().focus().unsetCommentDecoration().run();
@@ -63,11 +66,23 @@ function CommentDialog({ editor, pageId }: CommentDialogProps) {
.run();
setActiveCommentId(createdComment.id);
+ //unselect text to close bubble menu
+ editor.commands.setTextSelection({ from: editor.view.state.selection.from, to: editor.view.state.selection.from });
+
setAsideState({ tab: "comments", isAsideOpen: true });
setTimeout(() => {
const selector = `div[data-comment-id="${createdComment.id}"]`;
const commentElement = document.querySelector(selector);
- commentElement?.scrollIntoView();
+ commentElement?.scrollIntoView({ behavior: "smooth", block: "center" });
+
+ editor.view.dispatch(
+ editor.state.tr.scrollIntoView()
+ );
+ }, 400);
+
+ emit({
+ operation: "invalidateComment",
+ pageId: pageId,
});
} finally {
setShowCommentPopup(false);
diff --git a/apps/client/src/features/comment/components/comment-editor.tsx b/apps/client/src/features/comment/components/comment-editor.tsx
index 09116f1a..32339a3d 100644
--- a/apps/client/src/features/comment/components/comment-editor.tsx
+++ b/apps/client/src/features/comment/components/comment-editor.tsx
@@ -53,6 +53,10 @@ const CommentEditor = forwardRef(
autofocus: (autofocus && "end") || false,
});
+ useEffect(() => {
+ commentEditor.commands.setContent(defaultContent);
+ }, [defaultContent]);
+
useEffect(() => {
setTimeout(() => {
if (autofocus) {
diff --git a/apps/client/src/features/comment/components/comment-list-item.tsx b/apps/client/src/features/comment/components/comment-list-item.tsx
index 293c4f9e..9e136a1d 100644
--- a/apps/client/src/features/comment/components/comment-list-item.tsx
+++ b/apps/client/src/features/comment/components/comment-list-item.tsx
@@ -1,5 +1,5 @@
import { Group, Text, Box } from "@mantine/core";
-import React, { useState } from "react";
+import React, { useEffect, useState } from "react";
import classes from "./comment.module.css";
import { useAtom, useAtomValue } from "jotai";
import { timeAgo } from "@/lib/time";
@@ -15,12 +15,14 @@ import {
import { IComment } from "@/features/comment/types/comment.types";
import { CustomAvatar } from "@/components/ui/custom-avatar.tsx";
import { currentUserAtom } from "@/features/user/atoms/current-user-atom.ts";
+import { useQueryEmit } from "@/features/websocket/use-query-emit";
interface CommentListItemProps {
comment: IComment;
+ pageId: string;
}
-function CommentListItem({ comment }: CommentListItemProps) {
+function CommentListItem({ comment, pageId }: CommentListItemProps) {
const { hovered, ref } = useHover();
const [isEditing, setIsEditing] = useState(false);
const [isLoading, setIsLoading] = useState(false);
@@ -29,6 +31,11 @@ function CommentListItem({ comment }: CommentListItemProps) {
const updateCommentMutation = useUpdateCommentMutation();
const deleteCommentMutation = useDeleteCommentMutation(comment.pageId);
const [currentUser] = useAtom(currentUserAtom);
+ const emit = useQueryEmit();
+
+ useEffect(() => {
+ setContent(comment.content)
+ }, [comment]);
async function handleUpdateComment() {
try {
@@ -39,6 +46,11 @@ function CommentListItem({ comment }: CommentListItemProps) {
};
await updateCommentMutation.mutateAsync(commentToUpdate);
setIsEditing(false);
+
+ emit({
+ operation: "invalidateComment",
+ pageId: pageId,
+ });
} catch (error) {
console.error("Failed to update comment:", error);
} finally {
@@ -50,11 +62,27 @@ function CommentListItem({ comment }: CommentListItemProps) {
try {
await deleteCommentMutation.mutateAsync(comment.id);
editor?.commands.unsetComment(comment.id);
+
+ emit({
+ operation: "invalidateComment",
+ pageId: pageId,
+ });
} catch (error) {
console.error("Failed to delete comment:", error);
}
}
+ function handleCommentClick(comment: IComment) {
+ const el = document.querySelector(`.comment-mark[data-comment-id="${comment.id}"]`);
+ if (el) {
+ el.scrollIntoView({ behavior: "smooth", block: "center" });
+ el.classList.add("comment-highlight");
+ setTimeout(() => {
+ el.classList.remove("comment-highlight");
+ }, 3000);
+ }
+ }
+
function handleEditToggle() {
setIsEditing(true);
}
@@ -99,7 +127,7 @@ function CommentListItem({ comment }: CommentListItemProps) {
{
+ const req = await api.post("/file-tasks/info", {
+ fileTaskId: fileTaskId,
+ });
+ return req.data;
+}
+
+export async function getFileTasks(): Promise {
+ const req = await api.post("/file-tasks");
+ return req.data;
+}
diff --git a/apps/client/src/features/file-task/types/file-task.types.ts b/apps/client/src/features/file-task/types/file-task.types.ts
new file mode 100644
index 00000000..917e1757
--- /dev/null
+++ b/apps/client/src/features/file-task/types/file-task.types.ts
@@ -0,0 +1,17 @@
+export interface IFileTask {
+ id: string;
+ type: "import" | "export";
+ source: string;
+ status: string;
+ fileName: string;
+ filePath: string;
+ fileSize: number;
+ fileExt: string;
+ errorMessage: string | null;
+ creatorId: string;
+ spaceId: string;
+ workspaceId: string;
+ createdAt: string;
+ updatedAt: string;
+ deletedAt: string | null;
+}
\ No newline at end of file
diff --git a/apps/client/src/features/page/components/page-import-modal.tsx b/apps/client/src/features/page/components/page-import-modal.tsx
index f07fd8a9..90c08bb6 100644
--- a/apps/client/src/features/page/components/page-import-modal.tsx
+++ b/apps/client/src/features/page/components/page-import-modal.tsx
@@ -1,18 +1,38 @@
-import { Modal, Button, SimpleGrid, FileButton } from "@mantine/core";
import {
+ Modal,
+ Button,
+ SimpleGrid,
+ FileButton,
+ Group,
+ Text,
+ Tooltip,
+} from "@mantine/core";
+import {
+ IconBrandNotion,
IconCheck,
IconFileCode,
+ IconFileTypeZip,
IconMarkdown,
IconX,
} from "@tabler/icons-react";
-import { importPage } from "@/features/page/services/page-service.ts";
+import {
+ importPage,
+ importZip,
+} from "@/features/page/services/page-service.ts";
import { notifications } from "@mantine/notifications";
import { treeDataAtom } from "@/features/page/tree/atoms/tree-data-atom.ts";
import { useAtom } from "jotai";
import { buildTree } from "@/features/page/tree/utils";
import { IPage } from "@/features/page/types/page.types.ts";
-import React from "react";
+import React, { useEffect, useState } from "react";
import { useTranslation } from "react-i18next";
+import { ConfluenceIcon } from "@/components/icons/confluence-icon.tsx";
+import { getFileImportSizeLimit, isCloud } from "@/lib/config.ts";
+import { formatBytes } from "@/lib";
+import { workspaceAtom } from "@/features/user/atoms/current-user-atom.ts";
+import { getFileTaskById } from "@/features/file-task/services/file-task-service.ts";
+import { queryClient } from "@/main.tsx";
+import { useQueryEmit } from "@/features/websocket/use-query-emit.ts";
interface PageImportModalProps {
spaceId: string;
@@ -36,6 +56,7 @@ export default function PageImportModal({
yOffset="10vh"
xOffset={0}
mah={400}
+ keepMounted={true}
>
@@ -59,6 +80,133 @@ interface ImportFormatSelection {
function ImportFormatSelection({ spaceId, onClose }: ImportFormatSelection) {
const { t } = useTranslation();
const [treeData, setTreeData] = useAtom(treeDataAtom);
+ const [workspace] = useAtom(workspaceAtom);
+ const [fileTaskId, setFileTaskId] = useState(null);
+ const emit = useQueryEmit();
+
+ const canUseConfluence = isCloud() || workspace?.hasLicenseKey;
+
+ const handleZipUpload = async (selectedFile: File, source: string) => {
+ if (!selectedFile) {
+ return;
+ }
+
+ try {
+ onClose();
+
+ notifications.show({
+ id: "import",
+ title: t("Uploading import file"),
+ message: t("Please don't close this tab."),
+ loading: true,
+ withCloseButton: false,
+ autoClose: false,
+ });
+
+ const importTask = await importZip(selectedFile, spaceId, source);
+ notifications.update({
+ id: "import",
+ title: t("Importing pages"),
+ message: t(
+ "Page import is in progress. You can check back later if this takes longer.",
+ ),
+ loading: true,
+ withCloseButton: true,
+ autoClose: false,
+ });
+
+ setFileTaskId(importTask.id);
+ } catch (err) {
+ console.log("Failed to upload import file", err);
+ notifications.update({
+ id: "import",
+ color: "red",
+ title: t("Failed to upload import file"),
+ message: err?.response.data.message,
+ icon:
@@ -148,7 +297,76 @@ function ImportFormatSelection({ spaceId, onClose }: ImportFormatSelection) {
)}
+
+ handleZipUpload(file, "notion")}
+ accept="application/zip"
+ >
+ {(props) => (
+ }
+ {...props}
+ >
+ Notion
+
+ )}
+
+ handleZipUpload(file, "confluence")}
+ accept="application/zip"
+ >
+ {(props) => (
+
+ }
+ {...props}
+ >
+ Confluence
+
+
+ )}
+
+
+
+
);
}
diff --git a/apps/client/src/features/page/services/page-service.ts b/apps/client/src/features/page/services/page-service.ts
index e7e15608..a8e3d256 100644
--- a/apps/client/src/features/page/services/page-service.ts
+++ b/apps/client/src/features/page/services/page-service.ts
@@ -7,10 +7,11 @@ import {
IPage,
IPageInput,
SidebarPagesParams,
-} from "@/features/page/types/page.types";
+} from '@/features/page/types/page.types';
import { IAttachment, IPagination } from "@/lib/types.ts";
import { saveAs } from "file-saver";
import { InfiniteData } from "@tanstack/react-query";
+import { IFileTask } from '@/features/file-task/types/file-task.types.ts';
export async function createPage(data: Partial): Promise {
const req = await api.post("/pages/create", data);
@@ -119,6 +120,25 @@ export async function importPage(file: File, spaceId: string) {
return req.data;
}
+export async function importZip(
+ file: File,
+ spaceId: string,
+ source?: string,
+): Promise {
+ const formData = new FormData();
+ formData.append("spaceId", spaceId);
+ formData.append("source", source);
+ formData.append("file", file);
+
+ const req = await api.post("/pages/import-zip", formData, {
+ headers: {
+ "Content-Type": "multipart/form-data",
+ },
+ });
+
+ return req.data;
+}
+
export async function uploadFile(
file: File,
pageId: string,
diff --git a/apps/client/src/features/page/tree/components/space-tree.tsx b/apps/client/src/features/page/tree/components/space-tree.tsx
index da5b1832..db818518 100644
--- a/apps/client/src/features/page/tree/components/space-tree.tsx
+++ b/apps/client/src/features/page/tree/components/space-tree.tsx
@@ -24,7 +24,10 @@ import {
IconPointFilled,
IconTrash,
} from "@tabler/icons-react";
-import { appendNodeChildrenAtom, treeDataAtom } from "@/features/page/tree/atoms/tree-data-atom.ts";
+import {
+ appendNodeChildrenAtom,
+ treeDataAtom,
+} from "@/features/page/tree/atoms/tree-data-atom.ts";
import clsx from "clsx";
import EmojiPicker from "@/components/ui/emoji-picker.tsx";
import { useTreeMutation } from "@/features/page/tree/hooks/use-tree-mutation.ts";
@@ -32,6 +35,7 @@ import {
appendNodeChildren,
buildTree,
buildTreeWithChildren,
+ mergeRootTrees,
updateTreeNodeIcon,
} from "@/features/page/tree/utils/utils.ts";
import { SpaceTreeNode } from "@/features/page/tree/types.ts";
@@ -104,17 +108,17 @@ export default function SpaceTree({ spaceId, readOnly }: SpaceTreeProps) {
const allItems = pagesData.pages.flatMap((page) => page.items);
const treeData = buildTree(allItems);
- if (data.length < 1 || data?.[0].spaceId !== spaceId) {
- //Thoughts
- // don't reset if there is data in state
- // we only expect to call this once on initial load
- // even if we decide to refetch, it should only update
- // and append root pages instead of resetting the entire tree
- // which looses async loaded children too
- setData(treeData);
- setIsDataLoaded(true);
- setOpenTreeNodes({});
- }
+ setData((prev) => {
+ // fresh space; full reset
+ if (prev.length === 0 || prev[0]?.spaceId !== spaceId) {
+ setIsDataLoaded(true);
+ setOpenTreeNodes({});
+ return treeData;
+ }
+
+ // same space; append only missing roots
+ return mergeRootTrees(prev, treeData);
+ });
}
}, [pagesData, hasNextPage]);
@@ -297,17 +301,19 @@ function Node({ node, style, dragHandle, tree }: NodeRendererProps) {
const handleEmojiSelect = (emoji: { native: string }) => {
handleUpdateNodeIcon(node.id, emoji.native);
- updatePageMutation.mutateAsync({ pageId: node.id, icon: emoji.native }).then((data) => {
- setTimeout(() => {
- emit({
- operation: "updateOne",
- spaceId: node.data.spaceId,
- entity: ["pages"],
- id: node.id,
- payload: { icon: emoji.native, parentPageId: data.parentPageId},
- });
- }, 50);
- });
+ updatePageMutation
+ .mutateAsync({ pageId: node.id, icon: emoji.native })
+ .then((data) => {
+ setTimeout(() => {
+ emit({
+ operation: "updateOne",
+ spaceId: node.data.spaceId,
+ entity: ["pages"],
+ id: node.id,
+ payload: { icon: emoji.native, parentPageId: data.parentPageId },
+ });
+ }, 50);
+ });
};
const handleRemoveEmoji = () => {
@@ -570,7 +576,7 @@ interface PageArrowProps {
function PageArrow({ node, onExpandTree }: PageArrowProps) {
useEffect(() => {
- if(node.isOpen){
+ if (node.isOpen) {
onExpandTree();
}
}, []);
diff --git a/apps/client/src/features/page/tree/utils/utils.ts b/apps/client/src/features/page/tree/utils/utils.ts
index 910799c8..8ec1b884 100644
--- a/apps/client/src/features/page/tree/utils/utils.ts
+++ b/apps/client/src/features/page/tree/utils/utils.ts
@@ -121,7 +121,6 @@ export const deleteTreeNode = (
.filter((node) => node !== null);
};
-
export function buildTreeWithChildren(items: SpaceTreeNode[]): SpaceTreeNode[] {
const nodeMap = {};
let result: SpaceTreeNode[] = [];
@@ -167,10 +166,12 @@ export function appendNodeChildren(
// Preserve deeper children if they exist and remove node if deleted
return treeItems.map((node) => {
if (node.id === nodeId) {
- const newIds = new Set(children.map(c => c.id));
+ const newIds = new Set(children.map((c) => c.id));
const existingMap = new Map(
- (node.children ?? []).filter(c => newIds.has(c.id)).map(c => [c.id, c])
+ (node.children ?? [])
+ .filter((c) => newIds.has(c.id))
+ .map((c) => [c.id, c]),
);
const merged = children.map((newChild) => {
@@ -196,3 +197,21 @@ export function appendNodeChildren(
return node;
});
}
+
+/**
+ * Merge root nodes; keep existing ones intact, append new ones,
+ */
+export function mergeRootTrees(
+ prevRoots: SpaceTreeNode[],
+ incomingRoots: SpaceTreeNode[],
+): SpaceTreeNode[] {
+ const seen = new Set(prevRoots.map((r) => r.id));
+
+ // add new roots that were not present before
+ const merged = [...prevRoots];
+ incomingRoots.forEach((node) => {
+ if (!seen.has(node.id)) merged.push(node);
+ });
+
+ return sortPositionKeys(merged);
+}
diff --git a/apps/client/src/features/websocket/types/types.ts b/apps/client/src/features/websocket/types/types.ts
index bda76b4e..25b57df9 100644
--- a/apps/client/src/features/websocket/types/types.ts
+++ b/apps/client/src/features/websocket/types/types.ts
@@ -47,15 +47,28 @@ export type MoveTreeNodeEvent = {
parentId: string;
index: number;
position: string;
- }
+ };
};
export type DeleteTreeNodeEvent = {
operation: "deleteTreeNode";
spaceId: string;
payload: {
- node: SpaceTreeNode
- }
+ node: SpaceTreeNode;
+ };
};
-export type WebSocketEvent = InvalidateEvent | InvalidateCommentsEvent | UpdateEvent | DeleteEvent | AddTreeNodeEvent | MoveTreeNodeEvent | DeleteTreeNodeEvent;
+export type RefetchRootTreeNodeEvent = {
+ operation: "refetchRootTreeNodeEvent";
+ spaceId: string;
+};
+
+export type WebSocketEvent =
+ | InvalidateEvent
+ | InvalidateCommentsEvent
+ | UpdateEvent
+ | DeleteEvent
+ | AddTreeNodeEvent
+ | MoveTreeNodeEvent
+ | DeleteTreeNodeEvent
+ | RefetchRootTreeNodeEvent;
diff --git a/apps/client/src/features/websocket/use-query-subscription.ts b/apps/client/src/features/websocket/use-query-subscription.ts
index 8e3ad569..29a815be 100644
--- a/apps/client/src/features/websocket/use-query-subscription.ts
+++ b/apps/client/src/features/websocket/use-query-subscription.ts
@@ -5,8 +5,14 @@ import { InfiniteData, useQueryClient } from "@tanstack/react-query";
import { WebSocketEvent } from "@/features/websocket/types";
import { IPage } from "../page/types/page.types";
import { IPagination } from "@/lib/types";
-import { invalidateOnCreatePage, invalidateOnDeletePage, invalidateOnMovePage, invalidateOnUpdatePage } from "../page/queries/page-query";
+import {
+ invalidateOnCreatePage,
+ invalidateOnDeletePage,
+ invalidateOnMovePage,
+ invalidateOnUpdatePage,
+} from "../page/queries/page-query";
import { RQ_KEY } from "../comment/queries/comment-query";
+import { queryClient } from "@/main.tsx";
export const useQuerySubscription = () => {
const queryClient = useQueryClient();
@@ -37,8 +43,7 @@ export const useQuerySubscription = () => {
invalidateOnMovePage();
break;
case "deleteTreeNode":
- const pageId = data.payload.node.id;
- invalidateOnDeletePage(pageId);
+ invalidateOnDeletePage(data.payload.node.id);
break;
case "updateOne":
entity = data.entity[0];
@@ -50,17 +55,23 @@ export const useQuerySubscription = () => {
}
// only update if data was already in cache
- if(queryClient.getQueryData([...data.entity, queryKeyId])){
+ if (queryClient.getQueryData([...data.entity, queryKeyId])) {
queryClient.setQueryData([...data.entity, queryKeyId], {
...queryClient.getQueryData([...data.entity, queryKeyId]),
...data.payload,
});
}
-
+
if (entity === "pages") {
- invalidateOnUpdatePage(data.spaceId, data.payload.parentPageId, data.id, data.payload.title, data.payload.icon);
+ invalidateOnUpdatePage(
+ data.spaceId,
+ data.payload.parentPageId,
+ data.id,
+ data.payload.title,
+ data.payload.icon,
+ );
}
-
+
/*
queryClient.setQueriesData(
{ queryKey: [data.entity, data.id] },
@@ -72,8 +83,19 @@ export const useQuerySubscription = () => {
: update(oldData as Record);
},
);
- */
+ */
break;
+ case "refetchRootTreeNodeEvent": {
+ const spaceId = data.spaceId;
+ queryClient.refetchQueries({
+ queryKey: ["root-sidebar-pages", spaceId],
+ });
+
+ queryClient.invalidateQueries({
+ queryKey: ["recent-changes", spaceId],
+ });
+ break;
+ }
}
});
}, [queryClient, socket]);
diff --git a/apps/client/src/lib/config.ts b/apps/client/src/lib/config.ts
index 2f621b91..717bf9ff 100644
--- a/apps/client/src/lib/config.ts
+++ b/apps/client/src/lib/config.ts
@@ -70,6 +70,11 @@ export function getFileUploadSizeLimit() {
return bytes(limit);
}
+export function getFileImportSizeLimit() {
+ const limit = getConfigValue("FILE_IMPORT_SIZE_LIMIT", "200mb");
+ return bytes(limit);
+}
+
export function getDrawioUrl() {
return getConfigValue("DRAWIO_URL", "https://embed.diagrams.net");
}
diff --git a/apps/client/vite.config.ts b/apps/client/vite.config.ts
index a6efc4bc..cc8a01fd 100644
--- a/apps/client/vite.config.ts
+++ b/apps/client/vite.config.ts
@@ -8,6 +8,7 @@ export default defineConfig(({ mode }) => {
const {
APP_URL,
FILE_UPLOAD_SIZE_LIMIT,
+ FILE_IMPORT_SIZE_LIMIT,
DRAWIO_URL,
CLOUD,
SUBDOMAIN_HOST,
@@ -20,6 +21,7 @@ export default defineConfig(({ mode }) => {
"process.env": {
APP_URL,
FILE_UPLOAD_SIZE_LIMIT,
+ FILE_IMPORT_SIZE_LIMIT,
DRAWIO_URL,
CLOUD,
SUBDOMAIN_HOST,
diff --git a/apps/server/package.json b/apps/server/package.json
index 5082d129..d105f20c 100644
--- a/apps/server/package.json
+++ b/apps/server/package.json
@@ -31,6 +31,7 @@
},
"dependencies": {
"@aws-sdk/client-s3": "3.701.0",
+ "@aws-sdk/lib-storage": "3.701.0",
"@aws-sdk/s3-request-presigner": "3.701.0",
"@casl/ability": "^6.7.3",
"@fastify/cookie": "^11.0.2",
@@ -56,6 +57,7 @@
"bcrypt": "^5.1.1",
"bullmq": "^5.41.3",
"cache-manager": "^6.4.0",
+ "cheerio": "^1.0.0",
"class-transformer": "^0.5.1",
"class-validator": "^0.14.1",
"cookie": "^1.0.2",
@@ -80,7 +82,9 @@
"sanitize-filename-ts": "^1.0.2",
"socket.io": "^4.8.1",
"stripe": "^17.5.0",
- "ws": "^8.18.0"
+ "tmp-promise": "^3.0.3",
+ "ws": "^8.18.0",
+ "yauzl": "^3.2.0"
},
"devDependencies": {
"@eslint/js": "^9.20.0",
@@ -99,6 +103,7 @@
"@types/pg": "^8.11.11",
"@types/supertest": "^6.0.2",
"@types/ws": "^8.5.14",
+ "@types/yauzl": "^2.10.3",
"eslint": "^9.20.1",
"eslint-config-prettier": "^10.0.1",
"globals": "^15.15.0",
diff --git a/apps/server/src/collaboration/extensions/persistence.extension.ts b/apps/server/src/collaboration/extensions/persistence.extension.ts
index 3c206e1a..88284fd2 100644
--- a/apps/server/src/collaboration/extensions/persistence.extension.ts
+++ b/apps/server/src/collaboration/extensions/persistence.extension.ts
@@ -130,7 +130,7 @@ export class PersistenceExtension implements Extension {
);
this.contributors.delete(documentName);
} catch (err) {
- this.logger.debug('Contributors error:' + err?.['message']);
+ //this.logger.debug('Contributors error:' + err?.['message']);
}
await this.pageRepo.updatePage(
diff --git a/apps/server/src/common/helpers/utils.ts b/apps/server/src/common/helpers/utils.ts
index e2a4d5eb..d1748850 100644
--- a/apps/server/src/common/helpers/utils.ts
+++ b/apps/server/src/common/helpers/utils.ts
@@ -1,5 +1,6 @@
import * as path from 'path';
import * as bcrypt from 'bcrypt';
+import { sanitize } from 'sanitize-filename-ts';
export const envPath = path.resolve(process.cwd(), '..', '..', '.env');
@@ -62,3 +63,8 @@ export function extractDateFromUuid7(uuid7: string) {
return new Date(timestamp);
}
+
+export function sanitizeFileName(fileName: string): string {
+ const sanitizedFilename = sanitize(fileName).replace(/ /g, '_');
+ return sanitizedFilename.slice(0, 255);
+}
diff --git a/apps/server/src/database/migrations/20250521T154949-file_tasks.ts b/apps/server/src/database/migrations/20250521T154949-file_tasks.ts
new file mode 100644
index 00000000..523ae86b
--- /dev/null
+++ b/apps/server/src/database/migrations/20250521T154949-file_tasks.ts
@@ -0,0 +1,39 @@
+import { Kysely, sql } from 'kysely';
+
+export async function up(db: Kysely): Promise {
+ await db.schema
+ .createTable('file_tasks')
+ .addColumn('id', 'uuid', (col) =>
+ col.primaryKey().defaultTo(sql`gen_uuid_v7()`),
+ )
+ // type (import, export)
+ .addColumn('type', 'varchar', (col) => col)
+ // source (generic, notion, confluence)
+ .addColumn('source', 'varchar', (col) => col)
+ // status (pending|processing|success|failed),
+ .addColumn('status', 'varchar', (col) => col)
+ .addColumn('file_name', 'varchar', (col) => col.notNull())
+ .addColumn('file_path', 'varchar', (col) => col.notNull())
+ .addColumn('file_size', 'int8', (col) => col)
+ .addColumn('file_ext', 'varchar', (col) => col)
+ .addColumn('error_message', 'varchar', (col) => col)
+ .addColumn('creator_id', 'uuid', (col) => col.references('users.id'))
+ .addColumn('space_id', 'uuid', (col) =>
+ col.references('spaces.id').onDelete('cascade'),
+ )
+ .addColumn('workspace_id', 'uuid', (col) =>
+ col.references('workspaces.id').onDelete('cascade').notNull(),
+ )
+ .addColumn('created_at', 'timestamptz', (col) =>
+ col.notNull().defaultTo(sql`now()`),
+ )
+ .addColumn('updated_at', 'timestamptz', (col) =>
+ col.notNull().defaultTo(sql`now()`),
+ )
+ .addColumn('deleted_at', 'timestamptz', (col) => col)
+ .execute();
+}
+
+export async function down(db: Kysely): Promise {
+ await db.schema.dropTable('file_tasks').execute();
+}
diff --git a/apps/server/src/database/types/db.d.ts b/apps/server/src/database/types/db.d.ts
index 8c4cbd57..4545ebc4 100644
--- a/apps/server/src/database/types/db.d.ts
+++ b/apps/server/src/database/types/db.d.ts
@@ -122,6 +122,24 @@ export interface Comments {
workspaceId: string;
}
+export interface FileTasks {
+ createdAt: Generated;
+ creatorId: string | null;
+ deletedAt: Timestamp | null;
+ errorMessage: string | null;
+ fileExt: string | null;
+ fileName: string;
+ filePath: string;
+ fileSize: Int8 | null;
+ id: Generated;
+ source: string | null;
+ spaceId: string | null;
+ status: string | null;
+ type: string | null;
+ updatedAt: Generated;
+ workspaceId: string;
+}
+
export interface Groups {
createdAt: Generated;
creatorId: string | null;
@@ -298,6 +316,7 @@ export interface DB {
backlinks: Backlinks;
billing: Billing;
comments: Comments;
+ fileTasks: FileTasks;
groups: Groups;
groupUsers: GroupUsers;
pageHistory: PageHistory;
diff --git a/apps/server/src/database/types/entity.types.ts b/apps/server/src/database/types/entity.types.ts
index 6cb55a11..db2c2823 100644
--- a/apps/server/src/database/types/entity.types.ts
+++ b/apps/server/src/database/types/entity.types.ts
@@ -17,6 +17,7 @@ import {
AuthProviders,
AuthAccounts,
Shares,
+ FileTasks,
} from './db';
// Workspace
@@ -107,3 +108,8 @@ export type UpdatableAuthAccount = Updateable>;
export type Share = Selectable;
export type InsertableShare = Insertable;
export type UpdatableShare = Updateable>;
+
+// File Task
+export type FileTask = Selectable;
+export type InsertableFileTask = Insertable;
+export type UpdatableFileTask = Updateable>;
diff --git a/apps/server/src/ee b/apps/server/src/ee
index b312008b..70eb45ea 160000
--- a/apps/server/src/ee
+++ b/apps/server/src/ee
@@ -1 +1 @@
-Subproject commit b312008b4b7ed3d5862436b279d91aeddb6048d7
+Subproject commit 70eb45eaec84f61cb94a83a153915ce443ccc437
diff --git a/apps/server/src/integrations/environment/environment.service.ts b/apps/server/src/integrations/environment/environment.service.ts
index ac26b4fb..d6336993 100644
--- a/apps/server/src/integrations/environment/environment.service.ts
+++ b/apps/server/src/integrations/environment/environment.service.ts
@@ -67,6 +67,10 @@ export class EnvironmentService {
return this.configService.get('FILE_UPLOAD_SIZE_LIMIT', '50mb');
}
+ getFileImportSizeLimit(): string {
+ return this.configService.get('FILE_IMPORT_SIZE_LIMIT', '200mb');
+ }
+
getAwsS3AccessKeyId(): string {
return this.configService.get('AWS_S3_ACCESS_KEY_ID');
}
diff --git a/apps/server/src/integrations/export/turndown-utils.ts b/apps/server/src/integrations/export/turndown-utils.ts
index 44e606f3..54fdef12 100644
--- a/apps/server/src/integrations/export/turndown-utils.ts
+++ b/apps/server/src/integrations/export/turndown-utils.ts
@@ -1,5 +1,6 @@
import * as TurndownService from '@joplin/turndown';
import * as TurndownPluginGfm from '@joplin/turndown-plugin-gfm';
+import * as path from 'path';
export function turndown(html: string): string {
const turndownService = new TurndownService({
@@ -23,6 +24,7 @@ export function turndown(html: string): string {
mathInline,
mathBlock,
iframeEmbed,
+ video,
]);
return turndownService.turndown(html).replaceAll('
', ' '); } @@ -87,8 +89,12 @@ function preserveDetail(turndownService: TurndownService) { } const detailsContent = Array.from(node.childNodes) - .filter(child => child.nodeName !== 'SUMMARY') - .map(child => (child.nodeType === 1 ? turndownService.turndown((child as HTMLElement).outerHTML) : child.textContent)) + .filter((child) => child.nodeName !== 'SUMMARY') + .map((child) => + child.nodeType === 1 + ? turndownService.turndown((child as HTMLElement).outerHTML) + : child.textContent, + ) .join(''); return `\n): Promise {
+ try {
+ switch (job.name) {
+ case QueueJob.IMPORT_TASK:
+ await this.fileTaskService.processZIpImport(job.data.fileTaskId);
+ break;
+ case QueueJob.EXPORT_TASK:
+ // TODO: export task
+ break;
+ }
+ } catch (err) {
+ this.logger.error('File task failed', err);
+ throw err;
+ }
+ }
+
+ @OnWorkerEvent('active')
+ onActive(job: Job) {
+ this.logger.debug(`Processing ${job.name} job`);
+ }
+
+ @OnWorkerEvent('failed')
+ async onFailed(job: Job) {
+ this.logger.error(
+ `Error processing ${job.name} job. Reason: ${job.failedReason}`,
+ );
+
+ try {
+ const fileTaskId = job.data.fileTaskId;
+ await this.fileTaskService.updateTaskStatus(
+ fileTaskId,
+ FileTaskStatus.Failed,
+ job.failedReason,
+ );
+
+ const fileTask = await this.fileTaskService.getFileTask(fileTaskId);
+ if (fileTask) {
+ await this.storageService.delete(fileTask.filePath);
+ }
+ } catch (err) {
+ this.logger.error(err);
+ }
+ }
+
+ @OnWorkerEvent('completed')
+ onCompleted(job: Job) {
+ this.logger.log(
+ `Completed ${job.name} job for File task ID ${job.data.fileTaskId}`,
+ );
+ }
+
+ async onModuleDestroy(): Promise {
+ if (this.worker) {
+ await this.worker.close();
+ }
+ }
+}
diff --git a/apps/server/src/integrations/import/services/file-task.service.ts b/apps/server/src/integrations/import/services/file-task.service.ts
new file mode 100644
index 00000000..f054017d
--- /dev/null
+++ b/apps/server/src/integrations/import/services/file-task.service.ts
@@ -0,0 +1,346 @@
+import { Injectable, Logger } from '@nestjs/common';
+import * as path from 'path';
+import { jsonToText } from '../../../collaboration/collaboration.util';
+import { InjectKysely } from 'nestjs-kysely';
+import { KyselyDB } from '@docmost/db/types/kysely.types';
+import {
+ extractZip,
+ FileImportSource,
+ FileTaskStatus,
+} from '../utils/file.utils';
+import { StorageService } from '../../storage/storage.service';
+import * as tmp from 'tmp-promise';
+import { pipeline } from 'node:stream/promises';
+import { createWriteStream } from 'node:fs';
+import { ImportService } from './import.service';
+import { promises as fs } from 'fs';
+import { generateSlugId } from '../../../common/helpers';
+import { v7 } from 'uuid';
+import { generateJitteredKeyBetween } from 'fractional-indexing-jittered';
+import { FileTask, InsertablePage } from '@docmost/db/types/entity.types';
+import { markdownToHtml } from '@docmost/editor-ext';
+import { getProsemirrorContent } from '../../../common/helpers/prosemirror/utils';
+import { formatImportHtml } from '../utils/import-formatter';
+import {
+ buildAttachmentCandidates,
+ collectMarkdownAndHtmlFiles,
+} from '../utils/import.utils';
+import { executeTx } from '@docmost/db/utils';
+import { BacklinkRepo } from '@docmost/db/repos/backlink/backlink.repo';
+import { ImportAttachmentService } from './import-attachment.service';
+import { ModuleRef } from '@nestjs/core';
+import { PageService } from '../../../core/page/services/page.service';
+import { ImportPageNode } from '../dto/file-task-dto';
+
+@Injectable()
+export class FileTaskService {
+ private readonly logger = new Logger(FileTaskService.name);
+
+ constructor(
+ private readonly storageService: StorageService,
+ private readonly importService: ImportService,
+ private readonly pageService: PageService,
+ private readonly backlinkRepo: BacklinkRepo,
+ @InjectKysely() private readonly db: KyselyDB,
+ private readonly importAttachmentService: ImportAttachmentService,
+ private moduleRef: ModuleRef,
+ ) {}
+
+ async processZIpImport(fileTaskId: string): Promise {
+ const fileTask = await this.db
+ .selectFrom('fileTasks')
+ .selectAll()
+ .where('id', '=', fileTaskId)
+ .executeTakeFirst();
+
+ if (!fileTask) {
+ this.logger.log(`Import file task with ID ${fileTaskId} not found`);
+ return;
+ }
+
+ if (fileTask.status === FileTaskStatus.Failed) {
+ return;
+ }
+
+ if (fileTask.status === FileTaskStatus.Success) {
+ this.logger.log('Imported task already processed.');
+ return;
+ }
+
+ const { path: tmpZipPath, cleanup: cleanupTmpFile } = await tmp.file({
+ prefix: 'docmost-import',
+ postfix: '.zip',
+ discardDescriptor: true,
+ });
+
+ const { path: tmpExtractDir, cleanup: cleanupTmpDir } = await tmp.dir({
+ prefix: 'docmost-extract-',
+ unsafeCleanup: true,
+ });
+
+ try {
+ const fileStream = await this.storageService.readStream(
+ fileTask.filePath,
+ );
+ await pipeline(fileStream, createWriteStream(tmpZipPath));
+ await extractZip(tmpZipPath, tmpExtractDir);
+ } catch (err) {
+ await cleanupTmpFile();
+ await cleanupTmpDir();
+
+ throw err;
+ }
+
+ try {
+ if (
+ fileTask.source === FileImportSource.Generic ||
+ fileTask.source === FileImportSource.Notion
+ ) {
+ await this.processGenericImport({
+ extractDir: tmpExtractDir,
+ fileTask,
+ });
+ }
+
+ if (fileTask.source === FileImportSource.Confluence) {
+ let ConfluenceModule: any;
+ try {
+ // eslint-disable-next-line @typescript-eslint/no-require-imports
+ ConfluenceModule = require('./../../../ee/confluence-import/confluence-import.service');
+ } catch (err) {
+ this.logger.error(
+ 'Confluence import requested but EE module not bundled in this build',
+ );
+ return;
+ }
+ const confluenceImportService = this.moduleRef.get(
+ ConfluenceModule.ConfluenceImportService,
+ { strict: false },
+ );
+
+ await confluenceImportService.processConfluenceImport({
+ extractDir: tmpExtractDir,
+ fileTask,
+ });
+ }
+ try {
+ await this.updateTaskStatus(fileTaskId, FileTaskStatus.Success, null);
+ await cleanupTmpFile();
+ await cleanupTmpDir();
+ // delete stored file on success
+ await this.storageService.delete(fileTask.filePath);
+ } catch (err) {
+ this.logger.error(
+ `Failed to delete import file from storage. Task ID: ${fileTaskId}`,
+ err,
+ );
+ }
+ } catch (err) {
+ await cleanupTmpFile();
+ await cleanupTmpDir();
+
+ throw err;
+ }
+ }
+
+ async processGenericImport(opts: {
+ extractDir: string;
+ fileTask: FileTask;
+ }): Promise {
+ const { extractDir, fileTask } = opts;
+ const allFiles = await collectMarkdownAndHtmlFiles(extractDir);
+ const attachmentCandidates = await buildAttachmentCandidates(extractDir);
+
+ const pagesMap = new Map();
+
+ for (const absPath of allFiles) {
+ const relPath = path
+ .relative(extractDir, absPath)
+ .split(path.sep)
+ .join('/'); // normalize to forward-slashes
+ const ext = path.extname(relPath).toLowerCase();
+ let content = await fs.readFile(absPath, 'utf-8');
+
+ if (ext.toLowerCase() === '.md') {
+ content = await markdownToHtml(content);
+ }
+
+ pagesMap.set(relPath, {
+ id: v7(),
+ slugId: generateSlugId(),
+ name: path.basename(relPath, ext),
+ content,
+ parentPageId: null,
+ fileExtension: ext,
+ filePath: relPath,
+ });
+ }
+
+ // parent/child linking
+ pagesMap.forEach((page, filePath) => {
+ const segments = filePath.split('/');
+ segments.pop();
+ let parentPage = null;
+ while (segments.length) {
+ const tryMd = segments.join('/') + '.md';
+ const tryHtml = segments.join('/') + '.html';
+ if (pagesMap.has(tryMd)) {
+ parentPage = pagesMap.get(tryMd)!;
+ break;
+ }
+ if (pagesMap.has(tryHtml)) {
+ parentPage = pagesMap.get(tryHtml)!;
+ break;
+ }
+ segments.pop();
+ }
+ if (parentPage) page.parentPageId = parentPage.id;
+ });
+
+ // generate position keys
+ const siblingsMap = new Map();
+
+ pagesMap.forEach((page) => {
+ const group = siblingsMap.get(page.parentPageId) ?? [];
+ group.push(page);
+ siblingsMap.set(page.parentPageId, group);
+ });
+
+ // get root pages
+ const rootSibs = siblingsMap.get(null);
+
+ if (rootSibs?.length) {
+ rootSibs.sort((a, b) => a.name.localeCompare(b.name));
+
+ // get first position key from the server
+ const nextPosition = await this.pageService.nextPagePosition(
+ fileTask.spaceId,
+ );
+
+ let prevPos: string | null = null;
+ rootSibs.forEach((page, idx) => {
+ if (idx === 0) {
+ page.position = nextPosition;
+ } else {
+ page.position = generateJitteredKeyBetween(prevPos, null);
+ }
+ prevPos = page.position;
+ });
+ }
+
+ // non-root buckets (children & deeper levels)
+ siblingsMap.forEach((sibs, parentId) => {
+ if (parentId === null) return; // root already done
+
+ sibs.sort((a, b) => a.name.localeCompare(b.name));
+
+ let prevPos: string | null = null;
+ for (const page of sibs) {
+ page.position = generateJitteredKeyBetween(prevPos, null);
+ prevPos = page.position;
+ }
+ });
+
+ // internal page links
+ const filePathToPageMetaMap = new Map<
+ string,
+ { id: string; title: string; slugId: string }
+ >();
+ pagesMap.forEach((page) => {
+ filePathToPageMetaMap.set(page.filePath, {
+ id: page.id,
+ title: page.name,
+ slugId: page.slugId,
+ });
+ });
+
+ const pageResults = await Promise.all(
+ Array.from(pagesMap.values()).map(async (page) => {
+ const htmlContent =
+ await this.importAttachmentService.processAttachments({
+ html: page.content,
+ pageRelativePath: page.filePath,
+ extractDir,
+ pageId: page.id,
+ fileTask,
+ attachmentCandidates,
+ });
+
+ const { html, backlinks } = await formatImportHtml({
+ html: htmlContent,
+ currentFilePath: page.filePath,
+ filePathToPageMetaMap: filePathToPageMetaMap,
+ creatorId: fileTask.creatorId,
+ sourcePageId: page.id,
+ workspaceId: fileTask.workspaceId,
+ });
+
+ const pmState = getProsemirrorContent(
+ await this.importService.processHTML(html),
+ );
+
+ const { title, prosemirrorJson } =
+ this.importService.extractTitleAndRemoveHeading(pmState);
+
+ const insertablePage: InsertablePage = {
+ id: page.id,
+ slugId: page.slugId,
+ title: title || page.name,
+ content: prosemirrorJson,
+ textContent: jsonToText(prosemirrorJson),
+ ydoc: await this.importService.createYdoc(prosemirrorJson),
+ position: page.position!,
+ spaceId: fileTask.spaceId,
+ workspaceId: fileTask.workspaceId,
+ creatorId: fileTask.creatorId,
+ lastUpdatedById: fileTask.creatorId,
+ parentPageId: page.parentPageId,
+ };
+
+ return { insertablePage, backlinks };
+ }),
+ );
+
+ const insertablePages = pageResults.map((r) => r.insertablePage);
+ const insertableBacklinks = pageResults.flatMap((r) => r.backlinks);
+
+ if (insertablePages.length < 1) return;
+ const validPageIds = new Set(insertablePages.map((row) => row.id));
+ const filteredBacklinks = insertableBacklinks.filter(
+ ({ sourcePageId, targetPageId }) =>
+ validPageIds.has(sourcePageId) && validPageIds.has(targetPageId),
+ );
+
+ await executeTx(this.db, async (trx) => {
+ await trx.insertInto('pages').values(insertablePages).execute();
+
+ if (filteredBacklinks.length > 0) {
+ await this.backlinkRepo.insertBacklink(filteredBacklinks, trx);
+ }
+ });
+ }
+
+ async getFileTask(fileTaskId: string) {
+ return this.db
+ .selectFrom('fileTasks')
+ .selectAll()
+ .where('id', '=', fileTaskId)
+ .executeTakeFirst();
+ }
+
+ async updateTaskStatus(
+ fileTaskId: string,
+ status: FileTaskStatus,
+ errorMessage?: string,
+ ) {
+ try {
+ await this.db
+ .updateTable('fileTasks')
+ .set({ status: status, errorMessage, updatedAt: new Date() })
+ .where('id', '=', fileTaskId)
+ .execute();
+ } catch (err) {
+ this.logger.error(err);
+ }
+ }
+}
diff --git a/apps/server/src/integrations/import/services/import-attachment.service.ts b/apps/server/src/integrations/import/services/import-attachment.service.ts
new file mode 100644
index 00000000..cd9039e2
--- /dev/null
+++ b/apps/server/src/integrations/import/services/import-attachment.service.ts
@@ -0,0 +1,303 @@
+import { Injectable, Logger } from '@nestjs/common';
+import * as path from 'path';
+import { InjectKysely } from 'nestjs-kysely';
+import { KyselyDB } from '@docmost/db/types/kysely.types';
+import { cleanUrlString } from '../utils/file.utils';
+import { StorageService } from '../../storage/storage.service';
+import { createReadStream } from 'node:fs';
+import { promises as fs } from 'fs';
+import { getMimeType, sanitizeFileName } from '../../../common/helpers';
+import { v7 } from 'uuid';
+import { FileTask } from '@docmost/db/types/entity.types';
+import { getAttachmentFolderPath } from '../../../core/attachment/attachment.utils';
+import { AttachmentType } from '../../../core/attachment/attachment.constants';
+import { unwrapFromParagraph } from '../utils/import-formatter';
+import { resolveRelativeAttachmentPath } from '../utils/import.utils';
+import { load } from 'cheerio';
+
+@Injectable()
+export class ImportAttachmentService {
+ private readonly logger = new Logger(ImportAttachmentService.name);
+
+ constructor(
+ private readonly storageService: StorageService,
+ @InjectKysely() private readonly db: KyselyDB,
+ ) {}
+
+ async processAttachments(opts: {
+ html: string;
+ pageRelativePath: string;
+ extractDir: string;
+ pageId: string;
+ fileTask: FileTask;
+ attachmentCandidates: Map;
+ }): Promise {
+ const {
+ html,
+ pageRelativePath,
+ extractDir,
+ pageId,
+ fileTask,
+ attachmentCandidates,
+ } = opts;
+
+ const attachmentTasks: Promise[] = [];
+
+ /**
+ * 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.
+ */
+ const processed = new Map<
+ string,
+ {
+ attachmentId: string;
+ storageFilePath: string;
+ apiFilePath: string;
+ fileNameWithExt: string;
+ abs: string;
+ }
+ >();
+
+ const uploadOnce = (relPath: string) => {
+ const abs = attachmentCandidates.get(relPath)!;
+ const attachmentId = v7();
+ const ext = path.extname(abs);
+
+ const fileNameWithExt =
+ sanitizeFileName(path.basename(abs, ext)) + ext.toLowerCase();
+
+ const storageFilePath = `${getAttachmentFolderPath(
+ AttachmentType.File,
+ fileTask.workspaceId,
+ )}/${attachmentId}/${fileNameWithExt}`;
+
+ const apiFilePath = `/api/files/${attachmentId}/${fileNameWithExt}`;
+
+ attachmentTasks.push(
+ (async () => {
+ const fileStream = createReadStream(abs);
+ await this.storageService.uploadStream(storageFilePath, fileStream);
+ const stat = await fs.stat(abs);
+
+ await this.db
+ .insertInto('attachments')
+ .values({
+ id: attachmentId,
+ filePath: storageFilePath,
+ fileName: fileNameWithExt,
+ fileSize: stat.size,
+ mimeType: getMimeType(fileNameWithExt),
+ type: 'file',
+ fileExt: ext,
+ creatorId: fileTask.creatorId,
+ workspaceId: fileTask.workspaceId,
+ pageId,
+ spaceId: fileTask.spaceId,
+ })
+ .execute();
+ })(),
+ );
+
+ return {
+ attachmentId,
+ storageFilePath,
+ apiFilePath,
+ fileNameWithExt,
+ abs,
+ };
+ };
+
+ /**
+ * – Returns cached data if we’ve already processed this path.
+ * – Otherwise calls `uploadOnce`, stores the result, and returns it.
+ */
+ const processFile = (relPath: string) => {
+ const cached = processed.get(relPath);
+ if (cached) return cached;
+
+ const fresh = uploadOnce(relPath);
+ processed.set(relPath, fresh);
+ return fresh;
+ };
+
+ 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;
+
+ const relPath = resolveRelativeAttachmentPath(
+ src,
+ pageDir,
+ attachmentCandidates,
+ );
+ if (!relPath) continue;
+
+ const { attachmentId, apiFilePath, abs } = processFile(relPath);
+ const stat = await fs.stat(abs);
+
+ const width = $img.attr('width') ?? '100%';
+ const align = $img.attr('data-align') ?? 'center';
+
+ $img
+ .attr('src', apiFilePath)
+ .attr('data-attachment-id', attachmentId)
+ .attr('data-size', stat.size.toString())
+ .attr('width', width)
+ .attr('data-align', align);
+
+ unwrapFromParagraph($, $img);
+ }
+
+ // video
+ for (const vidEl of $('video').toArray()) {
+ const $vid = $(vidEl);
+ const src = cleanUrlString($vid.attr('src') ?? '')!;
+ if (!src || src.startsWith('http')) continue;
+
+ const relPath = resolveRelativeAttachmentPath(
+ src,
+ pageDir,
+ attachmentCandidates,
+ );
+ if (!relPath) continue;
+
+ const { attachmentId, apiFilePath, abs } = processFile(relPath);
+ const stat = await fs.stat(abs);
+
+ const width = $vid.attr('width') ?? '100%';
+ const align = $vid.attr('data-align') ?? 'center';
+
+ $vid
+ .attr('src', apiFilePath)
+ .attr('data-attachment-id', attachmentId)
+ .attr('data-size', stat.size.toString())
+ .attr('width', width)
+ .attr('data-align', align);
+
+ unwrapFromParagraph($, $vid);
+ }
+
+ //
{links.map((item, idx) => (
component="button"
diff --git a/apps/client/src/features/editor/readonly-page-editor.tsx b/apps/client/src/features/editor/readonly-page-editor.tsx
new file mode 100644
index 00000000..bd6b9f6b
--- /dev/null
+++ b/apps/client/src/features/editor/readonly-page-editor.tsx
@@ -0,0 +1,67 @@
+import "@/features/editor/styles/index.css";
+import React, { useMemo } from "react";
+import { EditorProvider } from "@tiptap/react";
+import { mainExtensions } from "@/features/editor/extensions/extensions";
+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";
+
+interface PageEditorProps {
+ title: string;
+ content: any;
+}
+
+export default function ReadonlyPageEditor({
+ title,
+ content,
+}: PageEditorProps) {
+ const [, setReadOnlyEditor] = useAtom(readOnlyEditorAtom);
+
+ const extensions = useMemo(() => {
+ return [...mainExtensions];
+ }, []);
+
+ const titleExtensions = [
+ Document.extend({
+ content: "heading",
+ }),
+ Heading,
+ Text,
+ Placeholder.configure({
+ placeholder: "Untitled",
+ showOnlyWhenEditable: false,
+ }),
+ ];
+
+ return (
+ <>
+ {
+ if (editor) {
+ // @ts-ignore
+ setReadOnlyEditor(editor);
+ }
+ }}
+ >
+
+
+ );
+}
diff --git a/apps/client/src/features/page/components/breadcrumbs/breadcrumb.module.css b/apps/client/src/features/page/components/breadcrumbs/breadcrumb.module.css
index cf3637b2..cebee031 100644
--- a/apps/client/src/features/page/components/breadcrumbs/breadcrumb.module.css
+++ b/apps/client/src/features/page/components/breadcrumbs/breadcrumb.module.css
@@ -2,6 +2,7 @@
display: flex;
align-items: center;
overflow: hidden;
+ flex-wrap: nowrap;
a {
color: var(--mantine-color-default-color);
diff --git a/apps/client/src/features/page/components/breadcrumbs/breadcrumb.tsx b/apps/client/src/features/page/components/breadcrumbs/breadcrumb.tsx
index 367b2682..9d78f38c 100644
--- a/apps/client/src/features/page/components/breadcrumbs/breadcrumb.tsx
+++ b/apps/client/src/features/page/components/breadcrumbs/breadcrumb.tsx
@@ -1,6 +1,6 @@
import { useAtomValue } from "jotai";
import { treeDataAtom } from "@/features/page/tree/atoms/tree-data-atom.ts";
-import React, { useEffect, useState } from "react";
+import React, { useCallback, useEffect, useState } from "react";
import { findBreadcrumbPath } from "@/features/page/tree/utils";
import {
Button,
@@ -9,14 +9,16 @@ import {
Breadcrumbs,
ActionIcon,
Text,
+ Tooltip,
} from "@mantine/core";
-import { IconDots } from "@tabler/icons-react";
+import { IconCornerDownRightDouble, IconDots } from "@tabler/icons-react";
import { Link, useParams } from "react-router-dom";
import classes from "./breadcrumb.module.css";
import { SpaceTreeNode } from "@/features/page/tree/types.ts";
import { buildPageUrl } from "@/features/page/page.utils.ts";
import { usePageQuery } from "@/features/page/queries/page-query.ts";
import { extractPageSlugId } from "@/lib";
+import { useMediaQuery } from "@mantine/hooks";
function getTitle(name: string, icon: string) {
if (icon) {
@@ -34,6 +36,7 @@ export default function Breadcrumb() {
const { data: currentPage } = usePageQuery({
pageId: extractPageSlugId(pageSlug),
});
+ const isMobile = useMediaQuery("(max-width: 48em)");
useEffect(() => {
if (treeData?.length > 0 && currentPage) {
@@ -43,7 +46,7 @@ export default function Breadcrumb() {
}, [currentPage?.id, treeData]);
const HiddenNodesTooltipContent = () =>
- breadcrumbNodes?.slice(1, -2).map((node) => (
+ breadcrumbNodes?.slice(1, -1).map((node) => (
+
);
}
diff --git a/apps/client/src/features/page/tree/styles/tree.module.css b/apps/client/src/features/page/tree/styles/tree.module.css
index 0a258fb5..716101e0 100644
--- a/apps/client/src/features/page/tree/styles/tree.module.css
+++ b/apps/client/src/features/page/tree/styles/tree.module.css
@@ -18,7 +18,7 @@
align-items: center;
height: 100%;
width: 93%; /* not to overlap with scroll bar */
-
+ text-decoration: none;
color: light-dark(var(--mantine-color-gray-7), var(--mantine-color-dark-0));
&:hover {
@@ -70,6 +70,10 @@
background-color: light-dark(var(--mantine-color-gray-3), var(--mantine-color-dark-5));
}
+.row:focus .node:global(.isFocused) {
+ background-color: light-dark(var(--mantine-color-gray-3), var(--mantine-color-dark-5));
+}
+
.row {
white-space: nowrap;
cursor: pointer;
diff --git a/apps/client/src/features/page/tree/utils/utils.ts b/apps/client/src/features/page/tree/utils/utils.ts
index 0dfe8ed4..7ae84e38 100644
--- a/apps/client/src/features/page/tree/utils/utils.ts
+++ b/apps/client/src/features/page/tree/utils/utils.ts
@@ -1,7 +1,7 @@
import { IPage } from "@/features/page/types/page.types.ts";
import { SpaceTreeNode } from "@/features/page/tree/types.ts";
-function sortPositionKeys(keys: any[]) {
+export function sortPositionKeys(keys: any[]) {
return keys.sort((a, b) => {
if (a.position < b.position) return -1;
if (a.position > b.position) return 1;
diff --git a/apps/client/src/features/share/atoms/sidebar-atom.ts b/apps/client/src/features/share/atoms/sidebar-atom.ts
new file mode 100644
index 00000000..0bc9d681
--- /dev/null
+++ b/apps/client/src/features/share/atoms/sidebar-atom.ts
@@ -0,0 +1,9 @@
+import { atomWithWebStorage } from "@/lib/jotai-helper.ts";
+import { atom } from 'jotai';
+
+export const tableOfContentAsideAtom = atomWithWebStorage
+
+ {share.sharedPage.title || t("untitled")}
+
+
+
+
+ {isPagePublic ? t("Shared to web") : t("Share to web")}
+
+
+ {isPagePublic
+ ? t("Anyone with the link can view this page")
+ : t("Make this page publicly accessible")}
+
+
+
+ {t("Include sub-pages")}
+
+ {t("Make sub-pages public too")}
+
+
+
+
+ {t("Search engine indexing")}
+
+ {t("Allow search engines to index page")}
+
+
+
+ {readOnlyEditor && (
+
+
+ {rootElement.current && (
+ setTree(t)}
+ openByDefault={false}
+ disableMultiSelection={true}
+ className={classes.tree}
+ rowClassName={classes.row}
+ rowHeight={30}
+ overscanCount={10}
+ dndRootElement={rootElement.current}
+ onToggle={() => {
+ setOpenTreeNodes(tree?.openState);
+ }}
+ initialOpenState={openTreeNodes}
+ onClick={(e) => {
+ if (tree && tree.focusedNode) {
+ tree.select(tree.focusedNode);
+ }
+ }}
+ >
+ {Node}
+
+ )}
+
+ );
+}
+
+function Node({ node, style, tree }: NodeRendererProps{t("Error fetching page data.")}
;
+ }
+
+ return (
+
+
+ {`${data?.page?.title || t("untitled")}`}
+ {!data?.share.searchIndexing && (
+
+ )}
+
+
+
+
+
+ );
+}
diff --git a/apps/server/package.json b/apps/server/package.json
index fced5e33..efd8d8ca 100644
--- a/apps/server/package.json
+++ b/apps/server/package.json
@@ -37,18 +37,18 @@
"@fastify/multipart": "^9.0.3",
"@fastify/static": "^8.1.1",
"@nestjs/bullmq": "^11.0.2",
- "@nestjs/common": "^11.0.10",
- "@nestjs/config": "^4.0.0",
- "@nestjs/core": "^11.0.10",
+ "@nestjs/common": "^11.0.20",
+ "@nestjs/config": "^4.0.2",
+ "@nestjs/core": "^11.0.20",
"@nestjs/event-emitter": "^3.0.0",
"@nestjs/jwt": "^11.0.0",
"@nestjs/mapped-types": "^2.1.0",
"@nestjs/passport": "^11.0.5",
- "@nestjs/platform-fastify": "^11.0.10",
- "@nestjs/platform-socket.io": "^11.0.10",
+ "@nestjs/platform-fastify": "^11.0.20",
+ "@nestjs/platform-socket.io": "^11.0.20",
"@nestjs/schedule": "^5.0.1",
"@nestjs/terminus": "^11.0.0",
- "@nestjs/websockets": "^11.0.10",
+ "@nestjs/websockets": "^11.0.20",
"@node-saml/passport-saml": "^5.0.1",
"@react-email/components": "0.0.28",
"@react-email/render": "1.0.2",
diff --git a/apps/server/src/common/helpers/prosemirror/utils.ts b/apps/server/src/common/helpers/prosemirror/utils.ts
index 9d9b5ebe..aaadcd56 100644
--- a/apps/server/src/common/helpers/prosemirror/utils.ts
+++ b/apps/server/src/common/helpers/prosemirror/utils.ts
@@ -1,5 +1,6 @@
import { Node } from '@tiptap/pm/model';
import { jsonToNode } from '../../../collaboration/collaboration.util';
+import { validate as isValidUUID } from 'uuid';
export interface MentionNode {
id: string;
@@ -56,3 +57,41 @@ export function extractPageMentions(mentionList: MentionNode[]): MentionNode[] {
}
return pageMentionList as MentionNode[];
}
+
+
+export function getProsemirrorContent(content: any) {
+ return (
+ content ?? {
+ type: 'doc',
+ content: [{ type: 'paragraph', attrs: { textAlign: 'left' } }],
+ }
+ );
+}
+
+export function isAttachmentNode(nodeType: string) {
+ const attachmentNodeTypes = [
+ 'attachment',
+ 'image',
+ 'video',
+ 'excalidraw',
+ 'drawio',
+ ];
+ return attachmentNodeTypes.includes(nodeType);
+}
+
+export function getAttachmentIds(prosemirrorJson: any) {
+ const doc = jsonToNode(prosemirrorJson);
+ const attachmentIds = [];
+
+ doc?.descendants((node: Node) => {
+ if (isAttachmentNode(node.type.name)) {
+ if (node.attrs.attachmentId && isValidUUID(node.attrs.attachmentId)) {
+ if (!attachmentIds.includes(node.attrs.attachmentId)) {
+ attachmentIds.push(node.attrs.attachmentId);
+ }
+ }
+ }
+ });
+
+ return attachmentIds;
+}
\ No newline at end of file
diff --git a/apps/server/src/core/attachment/attachment.controller.ts b/apps/server/src/core/attachment/attachment.controller.ts
index 4804fce6..160d950b 100644
--- a/apps/server/src/core/attachment/attachment.controller.ts
+++ b/apps/server/src/core/attachment/attachment.controller.ts
@@ -1,310 +1,373 @@
import {
- BadRequestException,
- Controller,
- ForbiddenException,
- Get,
- HttpCode,
- HttpStatus,
- Logger,
- NotFoundException,
- Param,
- Post,
- Req,
- Res,
- UseGuards,
- UseInterceptors,
+ BadRequestException,
+ Controller,
+ ForbiddenException,
+ Get,
+ HttpCode,
+ HttpStatus,
+ Logger,
+ NotFoundException,
+ Param,
+ Post,
+ Query,
+ Req,
+ Res,
+ UseGuards,
+ UseInterceptors,
} from '@nestjs/common';
-import {AttachmentService} from './services/attachment.service';
-import {FastifyReply} from 'fastify';
-import {FileInterceptor} from '../../common/interceptors/file.interceptor';
+import { AttachmentService } from './services/attachment.service';
+import { FastifyReply } from 'fastify';
+import { FileInterceptor } from '../../common/interceptors/file.interceptor';
import * as bytes from 'bytes';
-import {AuthUser} from '../../common/decorators/auth-user.decorator';
-import {AuthWorkspace} from '../../common/decorators/auth-workspace.decorator';
-import {JwtAuthGuard} from '../../common/guards/jwt-auth.guard';
-import {User, Workspace} from '@docmost/db/types/entity.types';
-import {StorageService} from '../../integrations/storage/storage.service';
+import { AuthUser } from '../../common/decorators/auth-user.decorator';
+import { AuthWorkspace } from '../../common/decorators/auth-workspace.decorator';
+import { JwtAuthGuard } from '../../common/guards/jwt-auth.guard';
+import { User, Workspace } from '@docmost/db/types/entity.types';
+import { StorageService } from '../../integrations/storage/storage.service';
import {
- getAttachmentFolderPath,
- validAttachmentTypes,
+ getAttachmentFolderPath,
+ validAttachmentTypes,
} from './attachment.utils';
-import {getMimeType} from '../../common/helpers';
+import { getMimeType } from '../../common/helpers';
import {
- AttachmentType,
- inlineFileExtensions,
- MAX_AVATAR_SIZE,
+ AttachmentType,
+ inlineFileExtensions,
+ MAX_AVATAR_SIZE,
} from './attachment.constants';
import {
- SpaceCaslAction,
- SpaceCaslSubject,
+ SpaceCaslAction,
+ SpaceCaslSubject,
} from '../casl/interfaces/space-ability.type';
import SpaceAbilityFactory from '../casl/abilities/space-ability.factory';
import {
- WorkspaceCaslAction,
- WorkspaceCaslSubject,
+ WorkspaceCaslAction,
+ WorkspaceCaslSubject,
} from '../casl/interfaces/workspace-ability.type';
import WorkspaceAbilityFactory from '../casl/abilities/workspace-ability.factory';
-import {PageRepo} from '@docmost/db/repos/page/page.repo';
-import {AttachmentRepo} from '@docmost/db/repos/attachment/attachment.repo';
-import {validate as isValidUUID} from 'uuid';
-import {EnvironmentService} from "../../integrations/environment/environment.service";
+import { PageRepo } from '@docmost/db/repos/page/page.repo';
+import { AttachmentRepo } from '@docmost/db/repos/attachment/attachment.repo';
+import { validate as isValidUUID } from 'uuid';
+import { EnvironmentService } from '../../integrations/environment/environment.service';
+import { TokenService } from '../auth/services/token.service';
+import { JwtAttachmentPayload, JwtType } from '../auth/dto/jwt-payload';
@Controller()
export class AttachmentController {
- private readonly logger = new Logger(AttachmentController.name);
+ private readonly logger = new Logger(AttachmentController.name);
- constructor(
- private readonly attachmentService: AttachmentService,
- private readonly storageService: StorageService,
- private readonly workspaceAbility: WorkspaceAbilityFactory,
- private readonly spaceAbility: SpaceAbilityFactory,
- private readonly pageRepo: PageRepo,
- private readonly attachmentRepo: AttachmentRepo,
- private readonly environmentService: EnvironmentService,
- ) {
- }
+ constructor(
+ private readonly attachmentService: AttachmentService,
+ private readonly storageService: StorageService,
+ private readonly workspaceAbility: WorkspaceAbilityFactory,
+ private readonly spaceAbility: SpaceAbilityFactory,
+ private readonly pageRepo: PageRepo,
+ private readonly attachmentRepo: AttachmentRepo,
+ private readonly environmentService: EnvironmentService,
+ private readonly tokenService: TokenService,
+ ) {}
- @UseGuards(JwtAuthGuard)
- @HttpCode(HttpStatus.OK)
- @Post('files/upload')
- @UseInterceptors(FileInterceptor)
- async uploadFile(
- @Req() req: any,
- @Res() res: FastifyReply,
- @AuthUser() user: User,
- @AuthWorkspace() workspace: Workspace,
- ) {
- const maxFileSize = bytes(this.environmentService.getFileUploadSizeLimit());
+ @UseGuards(JwtAuthGuard)
+ @HttpCode(HttpStatus.OK)
+ @Post('files/upload')
+ @UseInterceptors(FileInterceptor)
+ async uploadFile(
+ @Req() req: any,
+ @Res() res: FastifyReply,
+ @AuthUser() user: User,
+ @AuthWorkspace() workspace: Workspace,
+ ) {
+ const maxFileSize = bytes(this.environmentService.getFileUploadSizeLimit());
- let file = null;
- try {
- file = await req.file({
- limits: {fileSize: maxFileSize, fields: 3, files: 1},
- });
- } catch (err: any) {
- this.logger.error(err.message);
- if (err?.statusCode === 413) {
- throw new BadRequestException(
- `File too large. Exceeds the ${this.environmentService.getFileUploadSizeLimit()} limit`,
- );
- }
- }
-
- if (!file) {
- throw new BadRequestException('Failed to upload file');
- }
-
- const pageId = file.fields?.pageId?.value;
-
- if (!pageId) {
- throw new BadRequestException('PageId is required');
- }
-
- const page = await this.pageRepo.findById(pageId);
-
- if (!page) {
- throw new NotFoundException('Page not found');
- }
-
- const spaceAbility = await this.spaceAbility.createForUser(
- user,
- page.spaceId,
+ let file = null;
+ try {
+ file = await req.file({
+ limits: { fileSize: maxFileSize, fields: 3, files: 1 },
+ });
+ } catch (err: any) {
+ this.logger.error(err.message);
+ if (err?.statusCode === 413) {
+ throw new BadRequestException(
+ `File too large. Exceeds the ${this.environmentService.getFileUploadSizeLimit()} limit`,
);
- if (spaceAbility.cannot(SpaceCaslAction.Manage, SpaceCaslSubject.Page)) {
- throw new ForbiddenException();
- }
-
- const spaceId = page.spaceId;
-
- const attachmentId = file.fields?.attachmentId?.value;
- if (attachmentId && !isValidUUID(attachmentId)) {
- throw new BadRequestException('Invalid attachment id');
- }
-
- try {
- const fileResponse = await this.attachmentService.uploadFile({
- filePromise: file,
- pageId: pageId,
- spaceId: spaceId,
- userId: user.id,
- workspaceId: workspace.id,
- attachmentId: attachmentId,
- });
-
- return res.send(fileResponse);
- } catch (err: any) {
- if (err?.statusCode === 413) {
- const errMessage = `File too large. Exceeds the ${this.environmentService.getFileUploadSizeLimit()} limit`;
- this.logger.error(errMessage);
- throw new BadRequestException(errMessage);
- }
- this.logger.error(err);
- throw new BadRequestException('Error processing file upload.');
- }
+ }
}
- @UseGuards(JwtAuthGuard)
- @Get('/files/:fileId/:fileName')
- async getFile(
- @Res() res: FastifyReply,
- @AuthUser() user: User,
- @AuthWorkspace() workspace: Workspace,
- @Param('fileId') fileId: string,
- @Param('fileName') fileName?: string,
+ if (!file) {
+ throw new BadRequestException('Failed to upload file');
+ }
+
+ const pageId = file.fields?.pageId?.value;
+
+ if (!pageId) {
+ throw new BadRequestException('PageId is required');
+ }
+
+ const page = await this.pageRepo.findById(pageId);
+
+ if (!page) {
+ throw new NotFoundException('Page not found');
+ }
+
+ const spaceAbility = await this.spaceAbility.createForUser(
+ user,
+ page.spaceId,
+ );
+ if (spaceAbility.cannot(SpaceCaslAction.Manage, SpaceCaslSubject.Page)) {
+ throw new ForbiddenException();
+ }
+
+ const spaceId = page.spaceId;
+
+ const attachmentId = file.fields?.attachmentId?.value;
+ if (attachmentId && !isValidUUID(attachmentId)) {
+ throw new BadRequestException('Invalid attachment id');
+ }
+
+ try {
+ const fileResponse = await this.attachmentService.uploadFile({
+ filePromise: file,
+ pageId: pageId,
+ spaceId: spaceId,
+ userId: user.id,
+ workspaceId: workspace.id,
+ attachmentId: attachmentId,
+ });
+
+ return res.send(fileResponse);
+ } catch (err: any) {
+ if (err?.statusCode === 413) {
+ const errMessage = `File too large. Exceeds the ${this.environmentService.getFileUploadSizeLimit()} limit`;
+ this.logger.error(errMessage);
+ throw new BadRequestException(errMessage);
+ }
+ this.logger.error(err);
+ throw new BadRequestException('Error processing file upload.');
+ }
+ }
+
+ @UseGuards(JwtAuthGuard)
+ @Get('/files/:fileId/:fileName')
+ async getFile(
+ @Res() res: FastifyReply,
+ @AuthUser() user: User,
+ @AuthWorkspace() workspace: Workspace,
+ @Param('fileId') fileId: string,
+ @Param('fileName') fileName?: string,
+ ) {
+ if (!isValidUUID(fileId)) {
+ throw new NotFoundException('Invalid file id');
+ }
+
+ const attachment = await this.attachmentRepo.findById(fileId);
+ if (
+ !attachment ||
+ attachment.workspaceId !== workspace.id ||
+ !attachment.pageId ||
+ !attachment.spaceId
) {
- if (!isValidUUID(fileId)) {
- throw new NotFoundException('Invalid file id');
- }
+ throw new NotFoundException();
+ }
- const attachment = await this.attachmentRepo.findById(fileId);
- if (
- !attachment ||
- attachment.workspaceId !== workspace.id ||
- !attachment.pageId ||
- !attachment.spaceId
- ) {
- throw new NotFoundException();
- }
+ const spaceAbility = await this.spaceAbility.createForUser(
+ user,
+ attachment.spaceId,
+ );
- const spaceAbility = await this.spaceAbility.createForUser(
- user,
- attachment.spaceId,
+ if (spaceAbility.cannot(SpaceCaslAction.Read, SpaceCaslSubject.Page)) {
+ throw new ForbiddenException();
+ }
+
+ try {
+ const fileStream = await this.storageService.read(attachment.filePath);
+ res.headers({
+ 'Content-Type': attachment.mimeType,
+ 'Cache-Control': 'private, max-age=3600',
+ });
+
+ if (!inlineFileExtensions.includes(attachment.fileExt)) {
+ res.header(
+ 'Content-Disposition',
+ `attachment; filename="${encodeURIComponent(attachment.fileName)}"`,
);
+ }
- if (spaceAbility.cannot(SpaceCaslAction.Read, SpaceCaslSubject.Page)) {
- throw new ForbiddenException();
- }
+ return res.send(fileStream);
+ } catch (err) {
+ this.logger.error(err);
+ throw new NotFoundException('File not found');
+ }
+ }
- try {
- const fileStream = await this.storageService.read(attachment.filePath);
- res.headers({
- 'Content-Type': attachment.mimeType,
- 'Cache-Control': 'private, max-age=3600',
- });
-
- if (!inlineFileExtensions.includes(attachment.fileExt)) {
- res.header(
- 'Content-Disposition',
- `attachment; filename="${encodeURIComponent(attachment.fileName)}"`,
- );
- }
-
- return res.send(fileStream);
- } catch (err) {
- this.logger.error(err);
- throw new NotFoundException('File not found');
- }
+ @Get('/files/public/:fileId/:fileName')
+ async getPublicFile(
+ @Res() res: FastifyReply,
+ @AuthWorkspace() workspace: Workspace,
+ @Param('fileId') fileId: string,
+ @Param('fileName') fileName?: string,
+ @Query('jwt') jwtToken?: string,
+ ) {
+ let jwtPayload: JwtAttachmentPayload = null;
+ try {
+ jwtPayload = await this.tokenService.verifyJwt(
+ jwtToken,
+ JwtType.ATTACHMENT,
+ );
+ } catch (err) {
+ throw new BadRequestException(
+ 'Expired or invalid attachment access token',
+ );
}
- @UseGuards(JwtAuthGuard)
- @HttpCode(HttpStatus.OK)
- @Post('attachments/upload-image')
- @UseInterceptors(FileInterceptor)
- async uploadAvatarOrLogo(
- @Req() req: any,
- @Res() res: FastifyReply,
- @AuthUser() user: User,
- @AuthWorkspace() workspace: Workspace,
+ if (
+ !isValidUUID(fileId) ||
+ fileId !== jwtPayload.attachmentId ||
+ jwtPayload.workspaceId !== workspace.id
) {
- const maxFileSize = bytes(MAX_AVATAR_SIZE);
-
- let file = null;
- try {
- file = await req.file({
- limits: {fileSize: maxFileSize, fields: 3, files: 1},
- });
- } catch (err: any) {
- if (err?.statusCode === 413) {
- throw new BadRequestException(
- `File too large. Exceeds the ${MAX_AVATAR_SIZE} limit`,
- );
- }
- }
-
- if (!file) {
- throw new BadRequestException('Invalid file upload');
- }
-
- const attachmentType = file.fields?.type?.value;
- const spaceId = file.fields?.spaceId?.value;
-
- if (!attachmentType) {
- throw new BadRequestException('attachment type is required');
- }
-
- if (
- !validAttachmentTypes.includes(attachmentType) ||
- attachmentType === AttachmentType.File
- ) {
- throw new BadRequestException('Invalid image attachment type');
- }
-
- if (attachmentType === AttachmentType.WorkspaceLogo) {
- const ability = this.workspaceAbility.createForUser(user, workspace);
- if (
- ability.cannot(
- WorkspaceCaslAction.Manage,
- WorkspaceCaslSubject.Settings,
- )
- ) {
- throw new ForbiddenException();
- }
- }
-
- if (attachmentType === AttachmentType.SpaceLogo) {
- if (!spaceId) {
- throw new BadRequestException('spaceId is required');
- }
-
- const spaceAbility = await this.spaceAbility.createForUser(user, spaceId);
- if (
- spaceAbility.cannot(SpaceCaslAction.Manage, SpaceCaslSubject.Settings)
- ) {
- throw new ForbiddenException();
- }
- }
-
- try {
- const fileResponse = await this.attachmentService.uploadImage(
- file,
- attachmentType,
- user.id,
- workspace.id,
- spaceId,
- );
-
- return res.send(fileResponse);
- } catch (err: any) {
- this.logger.error(err);
- throw new BadRequestException('Error processing file upload.');
- }
+ throw new NotFoundException('File not found');
}
- @Get('attachments/img/:attachmentType/:fileName')
- async getLogoOrAvatar(
- @Res() res: FastifyReply,
- @AuthWorkspace() workspace: Workspace,
- @Param('attachmentType') attachmentType: AttachmentType,
- @Param('fileName') fileName?: string,
+ const attachment = await this.attachmentRepo.findById(fileId);
+ if (
+ !attachment ||
+ attachment.workspaceId !== workspace.id ||
+ !attachment.pageId ||
+ !attachment.spaceId ||
+ jwtPayload.pageId !== attachment.pageId
) {
- if (
- !validAttachmentTypes.includes(attachmentType) ||
- attachmentType === AttachmentType.File
- ) {
- throw new BadRequestException('Invalid image attachment type');
- }
-
- const filePath = `${getAttachmentFolderPath(attachmentType, workspace.id)}/${fileName}`;
-
- try {
- const fileStream = await this.storageService.read(filePath);
- res.headers({
- 'Content-Type': getMimeType(filePath),
- 'Cache-Control': 'private, max-age=86400',
- });
- return res.send(fileStream);
- } catch (err) {
- this.logger.error(err);
- throw new NotFoundException('File not found');
- }
+ throw new NotFoundException('File not found');
}
+
+ try {
+ const fileStream = await this.storageService.read(attachment.filePath);
+ res.headers({
+ 'Content-Type': attachment.mimeType,
+ 'Cache-Control': 'public, max-age=3600',
+ });
+
+ if (!inlineFileExtensions.includes(attachment.fileExt)) {
+ res.header(
+ 'Content-Disposition',
+ `attachment; filename="${encodeURIComponent(attachment.fileName)}"`,
+ );
+ }
+
+ return res.send(fileStream);
+ } catch (err) {
+ this.logger.error(err);
+ throw new NotFoundException('File not found');
+ }
+ }
+
+ @UseGuards(JwtAuthGuard)
+ @HttpCode(HttpStatus.OK)
+ @Post('attachments/upload-image')
+ @UseInterceptors(FileInterceptor)
+ async uploadAvatarOrLogo(
+ @Req() req: any,
+ @Res() res: FastifyReply,
+ @AuthUser() user: User,
+ @AuthWorkspace() workspace: Workspace,
+ ) {
+ const maxFileSize = bytes(MAX_AVATAR_SIZE);
+
+ let file = null;
+ try {
+ file = await req.file({
+ limits: { fileSize: maxFileSize, fields: 3, files: 1 },
+ });
+ } catch (err: any) {
+ if (err?.statusCode === 413) {
+ throw new BadRequestException(
+ `File too large. Exceeds the ${MAX_AVATAR_SIZE} limit`,
+ );
+ }
+ }
+
+ if (!file) {
+ throw new BadRequestException('Invalid file upload');
+ }
+
+ const attachmentType = file.fields?.type?.value;
+ const spaceId = file.fields?.spaceId?.value;
+
+ if (!attachmentType) {
+ throw new BadRequestException('attachment type is required');
+ }
+
+ if (
+ !validAttachmentTypes.includes(attachmentType) ||
+ attachmentType === AttachmentType.File
+ ) {
+ throw new BadRequestException('Invalid image attachment type');
+ }
+
+ if (attachmentType === AttachmentType.WorkspaceLogo) {
+ const ability = this.workspaceAbility.createForUser(user, workspace);
+ if (
+ ability.cannot(
+ WorkspaceCaslAction.Manage,
+ WorkspaceCaslSubject.Settings,
+ )
+ ) {
+ throw new ForbiddenException();
+ }
+ }
+
+ if (attachmentType === AttachmentType.SpaceLogo) {
+ if (!spaceId) {
+ throw new BadRequestException('spaceId is required');
+ }
+
+ const spaceAbility = await this.spaceAbility.createForUser(user, spaceId);
+ if (
+ spaceAbility.cannot(SpaceCaslAction.Manage, SpaceCaslSubject.Settings)
+ ) {
+ throw new ForbiddenException();
+ }
+ }
+
+ try {
+ const fileResponse = await this.attachmentService.uploadImage(
+ file,
+ attachmentType,
+ user.id,
+ workspace.id,
+ spaceId,
+ );
+
+ return res.send(fileResponse);
+ } catch (err: any) {
+ this.logger.error(err);
+ throw new BadRequestException('Error processing file upload.');
+ }
+ }
+
+ @Get('attachments/img/:attachmentType/:fileName')
+ async getLogoOrAvatar(
+ @Res() res: FastifyReply,
+ @AuthWorkspace() workspace: Workspace,
+ @Param('attachmentType') attachmentType: AttachmentType,
+ @Param('fileName') fileName?: string,
+ ) {
+ if (
+ !validAttachmentTypes.includes(attachmentType) ||
+ attachmentType === AttachmentType.File
+ ) {
+ throw new BadRequestException('Invalid image attachment type');
+ }
+
+ const filePath = `${getAttachmentFolderPath(attachmentType, workspace.id)}/${fileName}`;
+
+ try {
+ const fileStream = await this.storageService.read(filePath);
+ res.headers({
+ 'Content-Type': getMimeType(filePath),
+ 'Cache-Control': 'private, max-age=86400',
+ });
+ return res.send(fileStream);
+ } catch (err) {
+ this.logger.error(err);
+ throw new NotFoundException('File not found');
+ }
+ }
}
diff --git a/apps/server/src/core/attachment/attachment.module.ts b/apps/server/src/core/attachment/attachment.module.ts
index 7dc47ed8..f80a2eb7 100644
--- a/apps/server/src/core/attachment/attachment.module.ts
+++ b/apps/server/src/core/attachment/attachment.module.ts
@@ -5,9 +5,10 @@ import { StorageModule } from '../../integrations/storage/storage.module';
import { UserModule } from '../user/user.module';
import { WorkspaceModule } from '../workspace/workspace.module';
import { AttachmentProcessor } from './processors/attachment.processor';
+import { TokenModule } from '../auth/token.module';
@Module({
- imports: [StorageModule, UserModule, WorkspaceModule],
+ imports: [StorageModule, UserModule, WorkspaceModule, TokenModule],
controllers: [AttachmentController],
providers: [AttachmentService, AttachmentProcessor],
})
diff --git a/apps/server/src/core/auth/dto/jwt-payload.ts b/apps/server/src/core/auth/dto/jwt-payload.ts
index ad172b78..b9ce13c4 100644
--- a/apps/server/src/core/auth/dto/jwt-payload.ts
+++ b/apps/server/src/core/auth/dto/jwt-payload.ts
@@ -2,6 +2,7 @@ export enum JwtType {
ACCESS = 'access',
COLLAB = 'collab',
EXCHANGE = 'exchange',
+ ATTACHMENT = 'attachment',
}
export type JwtPayload = {
sub: string;
@@ -21,3 +22,11 @@ export type JwtExchangePayload = {
workspaceId: string;
type: 'exchange';
};
+
+export type JwtAttachmentPayload = {
+ attachmentId: string;
+ pageId: string;
+ workspaceId: string;
+ type: 'attachment';
+};
+
diff --git a/apps/server/src/core/auth/services/token.service.ts b/apps/server/src/core/auth/services/token.service.ts
index ad745290..963e8e65 100644
--- a/apps/server/src/core/auth/services/token.service.ts
+++ b/apps/server/src/core/auth/services/token.service.ts
@@ -6,6 +6,7 @@ import {
import { JwtService } from '@nestjs/jwt';
import { EnvironmentService } from '../../../integrations/environment/environment.service';
import {
+ JwtAttachmentPayload,
JwtCollabPayload,
JwtExchangePayload,
JwtPayload,
@@ -59,6 +60,21 @@ export class TokenService {
return this.jwtService.sign(payload, { expiresIn: '10s' });
}
+ async generateAttachmentToken(opts: {
+ attachmentId: string;
+ pageId: string;
+ workspaceId: string;
+ }): Promise
From 0ec3ff2965880db3d1775b2015f0c684e76a6adc Mon Sep 17 00:00:00 2001
From: Philipinho <16838612+Philipinho@users.noreply.github.com>
Date: Tue, 22 Apr 2025 22:48:12 +0100
Subject: [PATCH 31/63] Add empty placeholder text
---
.../components/table-of-contents/table-of-contents.tsx | 6 ++++++
1 file changed, 6 insertions(+)
diff --git a/apps/client/src/features/editor/components/table-of-contents/table-of-contents.tsx b/apps/client/src/features/editor/components/table-of-contents/table-of-contents.tsx
index b309d67d..123889f3 100644
--- a/apps/client/src/features/editor/components/table-of-contents/table-of-contents.tsx
+++ b/apps/client/src/features/editor/components/table-of-contents/table-of-contents.tsx
@@ -143,6 +143,12 @@ export const TableOfContents: FC = (props) => {
{t("Add headings (H1, H2, H3) to generate a table of contents.")}
)}
+
+ {props.isShare && (
+
+ {t("No table of contents.")}
+
+ )}
);
}
From de5f90309c5dd3e0615bab3a3ec910422967609e Mon Sep 17 00:00:00 2001
From: Philipinho <16838612+Philipinho@users.noreply.github.com>
Date: Tue, 22 Apr 2025 22:49:45 +0100
Subject: [PATCH 32/63] v0.20.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 ffd94cae..e56b7e68 100644
--- a/apps/client/package.json
+++ b/apps/client/package.json
@@ -1,7 +1,7 @@
{
"name": "client",
"private": true,
- "version": "0.10.2",
+ "version": "0.20.0",
"scripts": {
"dev": "vite",
"build": "tsc && vite build",
diff --git a/apps/server/package.json b/apps/server/package.json
index efd8d8ca..935647ed 100644
--- a/apps/server/package.json
+++ b/apps/server/package.json
@@ -1,6 +1,6 @@
{
"name": "server",
- "version": "0.10.2",
+ "version": "0.20.0",
"description": "",
"author": "",
"private": true,
diff --git a/package.json b/package.json
index d84046e5..0cafcc3f 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
{
"name": "docmost",
"homepage": "https://docmost.com",
- "version": "0.10.2",
+ "version": "0.20.0",
"private": true,
"scripts": {
"build": "nx run-many -t build",
From c26a851d52394e5c01717bf8674ae953ed7080e8 Mon Sep 17 00:00:00 2001
From: Philip Okugbe <16838612+Philipinho@users.noreply.github.com>
Date: Wed, 23 Apr 2025 14:32:35 +0100
Subject: [PATCH 33/63] feat: enhance public sharing (#1057)
* fix tree nodes sort
* remove comment mark in shares
* remove clickoutside hook for now
* feat: search in shared pages
* fix user-select
* use Link
* render page icons
---
.../components/search-control.module.css | 44 ++++++++++
.../search/components/search-control.tsx | 56 ++++++++++++
apps/client/src/features/search/constants.ts | 7 ++
.../features/search/queries/search-query.ts | 11 +++
.../src/features/search/search-spotlight.tsx | 21 ++---
.../search/services/search-service.ts | 7 ++
.../search/share-search-spotlight.tsx | 87 +++++++++++++++++++
.../src/features/search/types/search.types.ts | 1 +
.../features/share/components/share-shell.tsx | 46 +++++-----
.../features/share/components/shared-tree.tsx | 16 ++++
apps/client/src/features/share/utils.ts | 20 +++--
.../components/sidebar/space-sidebar.tsx | 12 +--
.../src/common/helpers/prosemirror/utils.ts | 13 +++
apps/server/src/core/search/dto/search.dto.ts | 17 ++++
.../src/core/search/search.controller.ts | 42 +++++++--
apps/server/src/core/search/search.service.ts | 71 +++++++++++++--
apps/server/src/core/share/share.service.ts | 10 +--
17 files changed, 420 insertions(+), 61 deletions(-)
create mode 100644 apps/client/src/features/search/components/search-control.module.css
create mode 100644 apps/client/src/features/search/components/search-control.tsx
create mode 100644 apps/client/src/features/search/constants.ts
create mode 100644 apps/client/src/features/search/share-search-spotlight.tsx
diff --git a/apps/client/src/features/search/components/search-control.module.css b/apps/client/src/features/search/components/search-control.module.css
new file mode 100644
index 00000000..5e5a9c26
--- /dev/null
+++ b/apps/client/src/features/search/components/search-control.module.css
@@ -0,0 +1,44 @@
+.root {
+ height: 34px;
+ padding-left: var(--mantine-spacing-sm);
+ padding-right: 4px;
+ border-radius: var(--mantine-radius-md);
+ color: var(--mantine-color-placeholder);
+ border: 1px solid;
+
+ @mixin light {
+ border-color: var(--mantine-color-gray-3);
+ background-color: var(--mantine-color-white);
+ }
+
+ @mixin dark {
+ border-color: var(--mantine-color-dark-4);
+ background-color: var(--mantine-color-dark-6);
+ }
+
+ @mixin rtl {
+ padding-left: 4px;
+ padding-right: var(--mantine-spacing-sm);
+ }
+}
+
+.shortcut {
+ font-size: 11px;
+ line-height: 1;
+ padding: 4px 7px;
+ border-radius: var(--mantine-radius-sm);
+ border: 1px solid;
+ font-weight: bold;
+
+ @mixin light {
+ color: var(--mantine-color-gray-7);
+ border-color: var(--mantine-color-gray-2);
+ background-color: var(--mantine-color-gray-0);
+ }
+
+ @mixin dark {
+ color: var(--mantine-color-dark-0);
+ border-color: var(--mantine-color-dark-7);
+ background-color: var(--mantine-color-dark-7);
+ }
+}
\ No newline at end of file
diff --git a/apps/client/src/features/search/components/search-control.tsx b/apps/client/src/features/search/components/search-control.tsx
new file mode 100644
index 00000000..3ae74da2
--- /dev/null
+++ b/apps/client/src/features/search/components/search-control.tsx
@@ -0,0 +1,56 @@
+import { IconSearch } from "@tabler/icons-react";
+import cx from "clsx";
+import {
+ ActionIcon,
+ BoxProps,
+ ElementProps,
+ Group,
+ rem,
+ Text,
+ Tooltip,
+ UnstyledButton,
+} from "@mantine/core";
+import classes from "./search-control.module.css";
+import React from "react";
+import { useTranslation } from "react-i18next";
+
+interface SearchControlProps extends BoxProps, ElementProps<"button"> {}
+
+export function SearchControl({ className, ...others }: SearchControlProps) {
+ const { t } = useTranslation();
+
+ return (
+
+
+
+ {t("Search")}
+
+
+ Ctrl + K
+
+
+
+ );
+}
+
+interface SearchMobileControlProps {
+ onSearch: () => void;
+}
+
+export function SearchMobileControl({ onSearch }: SearchMobileControlProps) {
+ const { t } = useTranslation();
+
+ return (
+
+
+
+
+ );
+}
diff --git a/apps/client/src/features/search/constants.ts b/apps/client/src/features/search/constants.ts
new file mode 100644
index 00000000..a4c6c2f7
--- /dev/null
+++ b/apps/client/src/features/search/constants.ts
@@ -0,0 +1,7 @@
+import { createSpotlight } from '@mantine/spotlight';
+
+export const [searchSpotlightStore, searchSpotlight] = createSpotlight();
+
+export const [shareSearchSpotlightStore, shareSearchSpotlight] =
+ createSpotlight();
+
diff --git a/apps/client/src/features/search/queries/search-query.ts b/apps/client/src/features/search/queries/search-query.ts
index 2505e7a2..6b8c0296 100644
--- a/apps/client/src/features/search/queries/search-query.ts
+++ b/apps/client/src/features/search/queries/search-query.ts
@@ -1,6 +1,7 @@
import { useQuery, UseQueryResult } from "@tanstack/react-query";
import {
searchPage,
+ searchShare,
searchSuggestions,
} from "@/features/search/services/search-service";
import {
@@ -30,3 +31,13 @@ export function useSearchSuggestionsQuery(
enabled: !!params.query,
});
}
+
+export function useShareSearchQuery(
+ params: IPageSearchParams,
+): UseQueryResult {
+ return useQuery({
+ queryKey: ["share-search", params],
+ queryFn: () => searchShare(params),
+ enabled: !!params.query,
+ });
+}
diff --git a/apps/client/src/features/search/search-spotlight.tsx b/apps/client/src/features/search/search-spotlight.tsx
index 52e24557..581524fc 100644
--- a/apps/client/src/features/search/search-spotlight.tsx
+++ b/apps/client/src/features/search/search-spotlight.tsx
@@ -2,36 +2,36 @@ import { Group, Center, Text } from "@mantine/core";
import { Spotlight } from "@mantine/spotlight";
import { IconSearch } from "@tabler/icons-react";
import React, { useState } from "react";
-import { useNavigate } from "react-router-dom";
+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 navigate = useNavigate();
const [query, setQuery] = useState("");
const [debouncedSearchQuery] = useDebouncedValue(query, 300);
- const {
- data: searchResults,
- isLoading,
- error,
- } = usePageSearchQuery({ query: debouncedSearchQuery, spaceId });
+ const { data: searchResults } = usePageSearchQuery({
+ query: debouncedSearchQuery,
+ spaceId,
+ });
const pages = (
searchResults && searchResults.length > 0 ? searchResults : []
).map((page) => (
- navigate(buildPageUrl(page.space.slug, page.slugId, page.title))
- }
+ component={Link}
+ //@ts-ignore
+ to={buildPageUrl(page.space.slug, page.slugId, page.title)}
+ style={{ userSelect: "none" }}
>
{getPageIcon(page?.icon)}
@@ -54,6 +54,7 @@ export function SearchSpotlight({ spaceId }: SearchSpotlightProps) {
return (
<>
("/search/suggest", params);
return req.data;
}
+
+export async function searchShare(
+ params: IPageSearchParams,
+): Promise {
+ const req = await api.post("/search/share-search", params);
+ return req.data;
+}
diff --git a/apps/client/src/features/search/share-search-spotlight.tsx b/apps/client/src/features/search/share-search-spotlight.tsx
new file mode 100644
index 00000000..bfbced6e
--- /dev/null
+++ b/apps/client/src/features/search/share-search-spotlight.tsx
@@ -0,0 +1,87 @@
+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 { useShareSearchQuery } from "@/features/search/queries/search-query";
+import { buildSharedPageUrl } from "@/features/page/page.utils.ts";
+import { getPageIcon } from "@/lib";
+import { useTranslation } from "react-i18next";
+import { shareSearchSpotlightStore } from "@/features/search/constants.ts";
+
+interface ShareSearchSpotlightProps {
+ shareId?: string;
+}
+export function ShareSearchSpotlight({ shareId }: ShareSearchSpotlightProps) {
+ const { t } = useTranslation();
+ const [query, setQuery] = useState("");
+ const [debouncedSearchQuery] = useDebouncedValue(query, 300);
+
+ const { data: searchResults } = useShareSearchQuery({
+ query: debouncedSearchQuery,
+ shareId,
+ });
+
+ const pages = (
+ searchResults && searchResults.length > 0 ? searchResults : []
+ ).map((page) => (
+
+
+ {getPageIcon(page?.icon)}
+
+
+
+ ));
+
+ return (
+ <>
+
+
+ {query.length === 0 && pages.length === 0 && (
+ {t("Start typing to search...")}
+ )}
+
+ {query.length > 0 && pages.length === 0 && (
+ {t("No results found...")}
+ )}
+
+ {pages.length > 0 && pages}
+
+
+
+ );
+}
diff --git a/apps/client/src/features/search/types/search.types.ts b/apps/client/src/features/search/types/search.types.ts
index 5a346f6b..1338e121 100644
--- a/apps/client/src/features/search/types/search.types.ts
+++ b/apps/client/src/features/search/types/search.types.ts
@@ -35,4 +35,5 @@ export interface ISuggestionResult {
export interface IPageSearchParams {
query: string;
spaceId?: string;
+ shareId?: string;
}
diff --git a/apps/client/src/features/share/components/share-shell.tsx b/apps/client/src/features/share/components/share-shell.tsx
index 799958d2..7fa0c941 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, { useState } from "react";
+import React from "react";
import {
ActionIcon,
Affix,
@@ -30,7 +30,12 @@ import {
import { IconList } from "@tabler/icons-react";
import { useToggleToc } from "@/features/share/hooks/use-toggle-toc.ts";
import classes from "./share.module.css";
-import { useClickOutside } from "@mantine/hooks";
+import {
+ SearchControl,
+ SearchMobileControl,
+} from "@/features/search/components/search-control.tsx";
+import { ShareSearchSpotlight } from "@/features/search/share-search-spotlight";
+import { shareSearchSpotlight } from "@/features/search/constants";
const MemoizedSharedTree = React.memo(SharedTree);
@@ -54,21 +59,9 @@ export default function ShareShell({
const { data } = useGetSharedPageTreeQuery(shareId);
const readOnlyEditor = useAtomValue(readOnlyEditorAtom);
- const [navbarOutside, setNavbarOutside] = useState(null);
-
- useClickOutside(
- () => {
- if (mobileOpened) {
- toggleMobile();
- }
- },
- null,
- [navbarOutside],
- );
-
return (
1 && {
navbar: {
width: 300,
@@ -91,7 +84,7 @@ export default function ShareShell({
>
-
+
{data?.pageTree?.length > 1 && (
<>
@@ -116,8 +109,21 @@ export default function ShareShell({
)}
+
+ {shareId && (
+
+
+ )}
+
<>
+ {shareId && (
+
+
+ )}
+
{data?.pageTree?.length > 1 && (
-
+
)}
@@ -186,6 +188,8 @@ export default function ShareShell({
+ {page.title}
+
+ {page?.highlight && (
+
+
+ {}}
+ icon={
+ node.data.icon ? (
+ node.data.icon
+ ) : (
+
{node.data.name || t("untitled")}
diff --git a/apps/client/src/features/share/utils.ts b/apps/client/src/features/share/utils.ts
index 74ec349f..cc73eb57 100644
--- a/apps/client/src/features/share/utils.ts
+++ b/apps/client/src/features/share/utils.ts
@@ -11,11 +11,13 @@ export type SharedPageTreeNode = {
parentPageId: string;
hasChildren: boolean;
children: SharedPageTreeNode[];
- label: string,
- value: string,
+ label: string;
+ value: string;
};
-export function buildSharedPageTree(pages: Partial
{!comment.parentCommentId && comment?.selection && (
-
+ handleCommentClick(comment)}>
{comment?.selection}
)}
diff --git a/apps/client/src/features/comment/components/comment-list.tsx b/apps/client/src/features/comment/components/comment-list.tsx
index 3296d5ea..6f0d877a 100644
--- a/apps/client/src/features/comment/components/comment-list.tsx
+++ b/apps/client/src/features/comment/components/comment-list.tsx
@@ -14,6 +14,7 @@ import { usePageQuery } from "@/features/page/queries/page-query.ts";
import { IPagination } from "@/lib/types.ts";
import { extractPageSlugId } from "@/lib";
import { useTranslation } from "react-i18next";
+import { useQueryEmit } from "@/features/websocket/use-query-emit";
function CommentList() {
const { t } = useTranslation();
@@ -26,6 +27,7 @@ function CommentList() {
} = useCommentsQuery({ pageId: page?.id, limit: 100 });
const createCommentMutation = useCreateCommentMutation();
const [isLoading, setIsLoading] = useState(false);
+ const emit = useQueryEmit();
const handleAddReply = useCallback(
async (commentId: string, content: string) => {
@@ -38,6 +40,11 @@ function CommentList() {
};
await createCommentMutation.mutateAsync(commentData);
+
+ emit({
+ operation: "invalidateComment",
+ pageId: page?.id,
+ });
} catch (error) {
console.error("Failed to post comment:", error);
} finally {
@@ -59,8 +66,8 @@ function CommentList() {
data-comment-id={comment.id}
>
;
parentId: string;
+ pageId: string;
}
-const ChildComments = ({ comments, parentId }: ChildCommentsProps) => {
+const ChildComments = ({ comments, parentId, pageId }: ChildCommentsProps) => {
const getChildComments = useCallback(
(parentId: string) =>
comments.items.filter(
@@ -113,10 +121,11 @@ const ChildComments = ({ comments, parentId }: ChildCommentsProps) => {
Date: Sun, 8 Jun 2025 04:27:09 +0200
Subject: [PATCH 60/63] fix: sidebar list when changing workspace (#1150)
* init
* navigate in overview if current page is in deleted node
* fix: implement pagination in sidebar-pages queries
* fix: appendNodeChildren()
Preserve deeper children if they exist and remove node if deleted
---
.../src/features/editor/title-editor.tsx | 2 +-
.../src/features/page/queries/page-query.ts | 193 +++++++++++++++++-
.../features/page/services/page-service.ts | 27 +++
.../page/tree/atoms/tree-data-atom.ts | 15 ++
.../page/tree/components/space-tree.tsx | 61 +++---
.../page/tree/hooks/use-tree-mutation.ts | 24 ++-
.../src/features/page/tree/utils/utils.ts | 35 +++-
.../src/features/websocket/types/types.ts | 5 +-
.../websocket/use-query-subscription.ts | 23 ++-
9 files changed, 326 insertions(+), 59 deletions(-)
diff --git a/apps/client/src/features/editor/title-editor.tsx b/apps/client/src/features/editor/title-editor.tsx
index e5ac7da6..869cb1eb 100644
--- a/apps/client/src/features/editor/title-editor.tsx
+++ b/apps/client/src/features/editor/title-editor.tsx
@@ -103,7 +103,7 @@ export function TitleEditor({
spaceId: page.spaceId,
entity: ["pages"],
id: page.id,
- payload: { title: page.title, slugId: page.slugId },
+ payload: { title: page.title, slugId: page.slugId, parentPageId: page.parentPageId, icon: page.icon },
};
if (page.title !== titleEditor.getText()) return;
diff --git a/apps/client/src/features/page/queries/page-query.ts b/apps/client/src/features/page/queries/page-query.ts
index 6842cc9e..6a460c68 100644
--- a/apps/client/src/features/page/queries/page-query.ts
+++ b/apps/client/src/features/page/queries/page-query.ts
@@ -1,5 +1,8 @@
import {
+ InfiniteData,
+ QueryKey,
useInfiniteQuery,
+ UseInfiniteQueryResult,
useMutation,
useQuery,
useQueryClient,
@@ -14,6 +17,7 @@ import {
movePage,
getPageBreadcrumbs,
getRecentChanges,
+ getAllSidebarPages,
} from "@/features/page/services/page-service";
import {
IMovePage,
@@ -56,7 +60,9 @@ export function useCreatePageMutation() {
const { t } = useTranslation();
return useMutation>({
mutationFn: (data) => createPage(data),
- onSuccess: (data) => {},
+ onSuccess: (data) => {
+ invalidateOnCreatePage(data);
+ },
onError: (error) => {
notifications.show({ message: t("Failed to create page"), color: "red" });
},
@@ -80,6 +86,8 @@ export function updatePageData(data: IPage) {
if (pageById) {
queryClient.setQueryData(["pages", data.id], { ...pageById, ...data });
}
+
+ invalidateOnUpdatePage(data.spaceId, data.parentPageId, data.id, data.title, data.icon);
}
export function useUpdateTitlePageMutation() {
@@ -93,6 +101,8 @@ export function useUpdatePageMutation() {
mutationFn: (data) => updatePage(data),
onSuccess: (data) => {
updatePage(data);
+
+ invalidateOnUpdatePage(data.spaceId, data.parentPageId, data.id, data.title, data.icon);
},
});
}
@@ -101,8 +111,9 @@ export function useDeletePageMutation() {
const { t } = useTranslation();
return useMutation({
mutationFn: (pageId: string) => deletePage(pageId),
- onSuccess: () => {
+ onSuccess: (data, pageId) => {
notifications.show({ message: t("Page deleted successfully") });
+ invalidateOnDeletePage(pageId);
},
onError: (error) => {
notifications.show({ message: t("Failed to delete page"), color: "red" });
@@ -113,15 +124,21 @@ export function useDeletePageMutation() {
export function useMovePageMutation() {
return useMutation({
mutationFn: (data) => movePage(data),
+ onSuccess: () => {
+ invalidateOnMovePage();
+ },
});
}
-export function useGetSidebarPagesQuery(
- data: SidebarPagesParams,
-): UseQueryResult, Error> {
- return useQuery({
+export function useGetSidebarPagesQuery(data: SidebarPagesParams|null): UseInfiniteQueryResult, unknown>> {
+ return useInfiniteQuery({
queryKey: ["sidebar-pages", data],
- queryFn: () => getSidebarPages(data),
+ queryFn: ({ pageParam }) => getSidebarPages({ ...data, page: pageParam }),
+ initialPageParam: 1,
+ getPreviousPageParam: (firstPage) =>
+ firstPage.meta.hasPrevPage ? firstPage.meta.page - 1 : undefined,
+ getNextPageParam: (lastPage) =>
+ lastPage.meta.hasNextPage ? lastPage.meta.page + 1 : undefined,
});
}
@@ -149,14 +166,16 @@ export function usePageBreadcrumbsQuery(
});
}
-export async function fetchAncestorChildren(params: SidebarPagesParams) {
+export async function fetchAllAncestorChildren(params: SidebarPagesParams) {
// not using a hook here, so we can call it inside a useEffect hook
const response = await queryClient.fetchQuery({
queryKey: ["sidebar-pages", params],
- queryFn: () => getSidebarPages(params),
+ queryFn: () => getAllSidebarPages(params),
staleTime: 30 * 60 * 1000,
});
- return buildTree(response.items);
+
+ const allItems = response.pages.flatMap((page) => page.items);
+ return buildTree(allItems);
}
export function useRecentChangesQuery(
@@ -168,3 +187,157 @@ export function useRecentChangesQuery(
refetchOnMount: true,
});
}
+
+export function invalidateOnCreatePage(data: Partial) {
+ const newPage: Partial = {
+ creatorId: data.creatorId,
+ hasChildren: data.hasChildren,
+ icon: data.icon,
+ id: data.id,
+ parentPageId: data.parentPageId,
+ position: data.position,
+ slugId: data.slugId,
+ spaceId: data.spaceId,
+ title: data.title,
+ };
+
+ let queryKey: QueryKey = null;
+ if (data.parentPageId===null) {
+ queryKey = ['root-sidebar-pages', data.spaceId];
+ }else{
+ queryKey = ['sidebar-pages', {pageId: data.parentPageId, spaceId: data.spaceId}]
+ }
+
+ //update all sidebar pages
+ queryClient.setQueryData>>>(queryKey, (old) => {
+ if (!old) return old;
+ return {
+ ...old,
+ pages: old.pages.map((page,index) => {
+ if (index === old.pages.length - 1) {
+ return {
+ ...page,
+ items: [...page.items, newPage],
+ };
+ }
+ return page;
+ }),
+ };
+ });
+
+ //update sidebar haschildren
+ if (data.parentPageId!==null){
+ //update sub sidebar pages haschildern
+ const subSideBarMatches = queryClient.getQueriesData({
+ queryKey: ['sidebar-pages'],
+ exact: false,
+ });
+
+ subSideBarMatches.forEach(([key, d]) => {
+ queryClient.setQueryData>>(key, (old) => {
+ if (!old) return old;
+ return {
+ ...old,
+ pages: old.pages.map((page) => ({
+ ...page,
+ items: page.items.map((sidebarPage: IPage) =>
+ sidebarPage.id === data.parentPageId ? { ...sidebarPage, hasChildren: true } : sidebarPage
+ )
+ })),
+ };
+ });
+ });
+
+ //update root sidebar pages haschildern
+ const rootSideBarMatches = queryClient.getQueriesData({
+ queryKey: ['root-sidebar-pages', data.spaceId],
+ exact: false,
+ });
+
+ rootSideBarMatches.forEach(([key, d]) => {
+ queryClient.setQueryData>>(key, (old) => {
+ if (!old) return old;
+ return {
+ ...old,
+ pages: old.pages.map((page) => ({
+ ...page,
+ items: page.items.map((sidebarPage: IPage) =>
+ sidebarPage.id === data.parentPageId ? { ...sidebarPage, hasChildren: true } : sidebarPage
+ )
+ })),
+ };
+ });
+ });
+ }
+
+ //update recent changes
+ queryClient.invalidateQueries({
+ queryKey: ["recent-changes", data.spaceId],
+ });
+}
+
+export function invalidateOnUpdatePage(spaceId: string, parentPageId: string, id: string, title: string, icon: string) {
+ let queryKey: QueryKey = null;
+ if(parentPageId===null){
+ queryKey = ['root-sidebar-pages', spaceId];
+ }else{
+ queryKey = ['sidebar-pages', {pageId: parentPageId, spaceId: spaceId}]
+ }
+ //update all sidebar pages
+ queryClient.setQueryData>>(queryKey, (old) => {
+ if (!old) return old;
+ return {
+ ...old,
+ pages: old.pages.map((page) => ({
+ ...page,
+ items: page.items.map((sidebarPage: IPage) =>
+ sidebarPage.id === id ? { ...sidebarPage, title: title, icon: icon } : sidebarPage
+ )
+ })),
+ };
+ });
+
+ //update recent changes
+ queryClient.invalidateQueries({
+ queryKey: ["recent-changes", spaceId],
+ });
+}
+
+export function invalidateOnMovePage() {
+ //for move invalidate all sidebars for now (how to do???)
+ //invalidate all root sidebar pages
+ queryClient.invalidateQueries({
+ queryKey: ["root-sidebar-pages"],
+ });
+ //invalidate all sub sidebar pages
+ queryClient.invalidateQueries({
+ queryKey: ['sidebar-pages'],
+ });
+ // ---
+}
+
+export function invalidateOnDeletePage(pageId: string) {
+ //update all sidebar pages
+ const allSideBarMatches = queryClient.getQueriesData({
+ predicate: (query) =>
+ query.queryKey[0] === 'root-sidebar-pages' || query.queryKey[0] === 'sidebar-pages',
+ });
+
+ allSideBarMatches.forEach(([key, d]) => {
+ queryClient.setQueryData>>(key, (old) => {
+ if (!old) return old;
+ return {
+ ...old,
+ pages: old.pages.map((page) => ({
+ ...page,
+ items: page.items.filter((sidebarPage: IPage) => sidebarPage.id !== pageId),
+ })),
+ };
+ });
+ });
+
+ //update recent changes
+ queryClient.invalidateQueries({
+ queryKey: ["recent-changes"],
+ });
+}
\ No newline at end of file
diff --git a/apps/client/src/features/page/services/page-service.ts b/apps/client/src/features/page/services/page-service.ts
index 5e69a34a..e7e15608 100644
--- a/apps/client/src/features/page/services/page-service.ts
+++ b/apps/client/src/features/page/services/page-service.ts
@@ -10,6 +10,7 @@ import {
} from "@/features/page/types/page.types";
import { IAttachment, IPagination } from "@/lib/types.ts";
import { saveAs } from "file-saver";
+import { InfiniteData } from "@tanstack/react-query";
export async function createPage(data: Partial): Promise {
const req = await api.post("/pages/create", data);
@@ -52,6 +53,32 @@ export async function getSidebarPages(
return req.data;
}
+export async function getAllSidebarPages(
+ params: SidebarPagesParams,
+): Promise, unknown>> {
+ let page = 1;
+ let hasNextPage = false;
+ const pages: IPagination[] = [];
+ const pageParams: number[] = [];
+
+ do {
+ const req = await api.post("/pages/sidebar-pages", { ...params, page: page });
+
+ const data: IPagination = req.data;
+ pages.push(data);
+ pageParams.push(page);
+
+ hasNextPage = data.meta.hasNextPage;
+
+ page += 1;
+ } while (hasNextPage);
+
+ return {
+ pageParams,
+ pages,
+ };
+}
+
export async function getPageBreadcrumbs(
pageId: string,
): Promise> {
diff --git a/apps/client/src/features/page/tree/atoms/tree-data-atom.ts b/apps/client/src/features/page/tree/atoms/tree-data-atom.ts
index e3910cb8..7d0ec503 100644
--- a/apps/client/src/features/page/tree/atoms/tree-data-atom.ts
+++ b/apps/client/src/features/page/tree/atoms/tree-data-atom.ts
@@ -1,4 +1,19 @@
import { atom } from "jotai";
import { SpaceTreeNode } from "@/features/page/tree/types";
+import { appendNodeChildren } from "../utils";
export const treeDataAtom = atom([]);
+
+// Atom
+export const appendNodeChildrenAtom = atom(
+ null,
+ (
+ get,
+ set,
+ { parentId, children }: { parentId: string; children: SpaceTreeNode[] }
+ ) => {
+ const currentTree = get(treeDataAtom);
+ const updatedTree = appendNodeChildren(currentTree, parentId, children);
+ set(treeDataAtom, updatedTree);
+ }
+);
diff --git a/apps/client/src/features/page/tree/components/space-tree.tsx b/apps/client/src/features/page/tree/components/space-tree.tsx
index 1df62678..da5b1832 100644
--- a/apps/client/src/features/page/tree/components/space-tree.tsx
+++ b/apps/client/src/features/page/tree/components/space-tree.tsx
@@ -2,7 +2,7 @@ import { NodeApi, NodeRendererProps, Tree, TreeApi } from "react-arborist";
import { atom, useAtom } from "jotai";
import { treeApiAtom } from "@/features/page/tree/atoms/tree-api-atom.ts";
import {
- fetchAncestorChildren,
+ fetchAllAncestorChildren,
useGetRootSidebarPagesQuery,
usePageQuery,
useUpdatePageMutation,
@@ -24,7 +24,7 @@ import {
IconPointFilled,
IconTrash,
} from "@tabler/icons-react";
-import { treeDataAtom } from "@/features/page/tree/atoms/tree-data-atom.ts";
+import { appendNodeChildrenAtom, treeDataAtom } from "@/features/page/tree/atoms/tree-data-atom.ts";
import clsx from "clsx";
import EmojiPicker from "@/components/ui/emoji-picker.tsx";
import { useTreeMutation } from "@/features/page/tree/hooks/use-tree-mutation.ts";
@@ -140,7 +140,7 @@ export default function SpaceTree({ spaceId, readOnly }: SpaceTreeProps) {
if (ancestor.id === currentPage.id) {
return;
}
- const children = await fetchAncestorChildren({
+ const children = await fetchAllAncestorChildren({
pageId: ancestor.id,
spaceId: ancestor.spaceId,
});
@@ -237,6 +237,7 @@ function Node({ node, style, dragHandle, tree }: NodeRendererProps) {
const { t } = useTranslation();
const updatePageMutation = useUpdatePageMutation();
const [treeData, setTreeData] = useAtom(treeDataAtom);
+ const [, appendChildren] = useAtom(appendNodeChildrenAtom);
const emit = useQueryEmit();
const { spaceSlug } = useParams();
const timerRef = useRef(null);
@@ -262,9 +263,10 @@ function Node({ node, style, dragHandle, tree }: NodeRendererProps) {
async function handleLoadChildren(node: NodeApi) {
if (!node.data.hasChildren) return;
- if (node.data.children && node.data.children.length > 0) {
- return;
- }
+ // in conflict with use-query-subscription.ts => case "addTreeNode","moveTreeNode" etc with websocket
+ // if (node.data.children && node.data.children.length > 0) {
+ // return;
+ // }
try {
const params: SidebarPagesParams = {
@@ -272,21 +274,12 @@ function Node({ node, style, dragHandle, tree }: NodeRendererProps) {
spaceId: node.data.spaceId,
};
- const newChildren = await queryClient.fetchQuery({
- queryKey: ["sidebar-pages", params],
- queryFn: () => getSidebarPages(params),
- staleTime: 10 * 60 * 1000,
+ const childrenTree = await fetchAllAncestorChildren(params);
+
+ appendChildren({
+ parentId: node.data.id,
+ children: childrenTree,
});
-
- const childrenTree = buildTree(newChildren.items);
-
- const updatedTreeData = appendNodeChildren(
- treeData,
- node.data.id,
- childrenTree,
- );
-
- setTreeData(updatedTreeData);
} catch (error) {
console.error("Failed to fetch children:", error);
}
@@ -304,17 +297,17 @@ function Node({ node, style, dragHandle, tree }: NodeRendererProps) {
const handleEmojiSelect = (emoji: { native: string }) => {
handleUpdateNodeIcon(node.id, emoji.native);
- updatePageMutation.mutateAsync({ pageId: node.id, icon: emoji.native });
-
- setTimeout(() => {
- emit({
- operation: "updateOne",
- spaceId: node.data.spaceId,
- entity: ["pages"],
- id: node.id,
- payload: { icon: emoji.native },
- });
- }, 50);
+ updatePageMutation.mutateAsync({ pageId: node.id, icon: emoji.native }).then((data) => {
+ setTimeout(() => {
+ emit({
+ operation: "updateOne",
+ spaceId: node.data.spaceId,
+ entity: ["pages"],
+ id: node.id,
+ payload: { icon: emoji.native, parentPageId: data.parentPageId},
+ });
+ }, 50);
+ });
};
const handleRemoveEmoji = () => {
@@ -576,6 +569,12 @@ interface PageArrowProps {
}
function PageArrow({ node, onExpandTree }: PageArrowProps) {
+ useEffect(() => {
+ if(node.isOpen){
+ onExpandTree();
+ }
+ }, []);
+
return (
(spaceId: string) {
return data;
};
- const onMove: MoveHandler = (args: {
+ const onMove: MoveHandler = async (args: {
dragIds: string[];
dragNodes: NodeApi[];
parentId: string | null;
@@ -176,7 +176,7 @@ export function useTreeMutation(spaceId: string) {
};
try {
- movePageMutation.mutateAsync(payload);
+ await movePageMutation.mutateAsync(payload);
setTimeout(() => {
emit({
@@ -206,6 +206,23 @@ export function useTreeMutation(spaceId: string) {
}
};
+ const isPageInNode = (
+ node: { data: SpaceTreeNode; children?: any[] },
+ pageSlug: string
+ ): boolean => {
+ if (node.data.slugId === pageSlug) {
+ return true;
+ }
+ for (const item of node.children) {
+ if (item.data.slugId === pageSlug) {
+ return true;
+ } else {
+ return isPageInNode(item, pageSlug);
+ }
+ }
+ return false;
+ };
+
const onDelete: DeleteHandler = async (args: { ids: string[] }) => {
try {
await deletePageMutation.mutateAsync(args.ids[0]);
@@ -218,8 +235,7 @@ export function useTreeMutation(spaceId: string) {
tree.drop({ id: args.ids[0] });
setData(tree.data);
- // navigate only if the current url is same as the deleted page
- if (pageSlug && node.data.slugId === pageSlug.split("-")[1]) {
+ if (pageSlug && isPageInNode(node, pageSlug.split("-")[1])) {
navigate(getSpaceUrl(spaceSlug));
}
diff --git a/apps/client/src/features/page/tree/utils/utils.ts b/apps/client/src/features/page/tree/utils/utils.ts
index 7ae84e38..910799c8 100644
--- a/apps/client/src/features/page/tree/utils/utils.ts
+++ b/apps/client/src/features/page/tree/utils/utils.ts
@@ -164,16 +164,35 @@ export function appendNodeChildren(
nodeId: string,
children: SpaceTreeNode[],
) {
- return treeItems.map((nodeItem) => {
- if (nodeItem.id === nodeId) {
- return { ...nodeItem, children };
- }
- if (nodeItem.children) {
+ // Preserve deeper children if they exist and remove node if deleted
+ return treeItems.map((node) => {
+ if (node.id === nodeId) {
+ const newIds = new Set(children.map(c => c.id));
+
+ const existingMap = new Map(
+ (node.children ?? []).filter(c => newIds.has(c.id)).map(c => [c.id, c])
+ );
+
+ const merged = children.map((newChild) => {
+ const existing = existingMap.get(newChild.id);
+ return existing && existing.children
+ ? { ...newChild, children: existing.children }
+ : newChild;
+ });
+
return {
- ...nodeItem,
- children: appendNodeChildren(nodeItem.children, nodeId, children),
+ ...node,
+ children: merged,
};
}
- return nodeItem;
+
+ if (node.children) {
+ return {
+ ...node,
+ children: appendNodeChildren(node.children, nodeId, children),
+ };
+ }
+
+ return node;
});
}
diff --git a/apps/client/src/features/websocket/types/types.ts b/apps/client/src/features/websocket/types/types.ts
index 48e7d819..bda76b4e 100644
--- a/apps/client/src/features/websocket/types/types.ts
+++ b/apps/client/src/features/websocket/types/types.ts
@@ -1,4 +1,5 @@
import { SpaceTreeNode } from "@/features/page/tree/types.ts";
+import { IPage } from "@/features/page/types/page.types";
export type InvalidateEvent = {
operation: "invalidate";
@@ -17,7 +18,7 @@ export type UpdateEvent = {
spaceId: string;
entity: Array;
id: string;
- payload: Partial;
+ payload: Partial;
};
export type DeleteEvent = {
@@ -25,7 +26,7 @@ export type DeleteEvent = {
spaceId: string;
entity: Array;
id: string;
- payload?: Partial;
+ payload?: Partial;
};
export type AddTreeNodeEvent = {
diff --git a/apps/client/src/features/websocket/use-query-subscription.ts b/apps/client/src/features/websocket/use-query-subscription.ts
index c9e53aa6..8e3ad569 100644
--- a/apps/client/src/features/websocket/use-query-subscription.ts
+++ b/apps/client/src/features/websocket/use-query-subscription.ts
@@ -1,8 +1,11 @@
import React from "react";
import { socketAtom } from "@/features/websocket/atoms/socket-atom.ts";
import { useAtom } from "jotai";
-import { useQueryClient } from "@tanstack/react-query";
+import { InfiniteData, useQueryClient } from "@tanstack/react-query";
import { WebSocketEvent } from "@/features/websocket/types";
+import { IPage } from "../page/types/page.types";
+import { IPagination } from "@/lib/types";
+import { invalidateOnCreatePage, invalidateOnDeletePage, invalidateOnMovePage, invalidateOnUpdatePage } from "../page/queries/page-query";
import { RQ_KEY } from "../comment/queries/comment-query";
export const useQuerySubscription = () => {
@@ -27,6 +30,16 @@ export const useQuerySubscription = () => {
queryKey: RQ_KEY(data.pageId),
});
break;
+ case "addTreeNode":
+ invalidateOnCreatePage(data.payload.data);
+ break;
+ case "moveTreeNode":
+ invalidateOnMovePage();
+ break;
+ case "deleteTreeNode":
+ const pageId = data.payload.node.id;
+ invalidateOnDeletePage(pageId);
+ break;
case "updateOne":
entity = data.entity[0];
if (entity === "pages") {
@@ -43,7 +56,11 @@ export const useQuerySubscription = () => {
...data.payload,
});
}
-
+
+ if (entity === "pages") {
+ invalidateOnUpdatePage(data.spaceId, data.payload.parentPageId, data.id, data.payload.title, data.payload.icon);
+ }
+
/*
queryClient.setQueriesData(
{ queryKey: [data.entity, data.id] },
@@ -55,7 +72,7 @@ export const useQuerySubscription = () => {
: update(oldData as Record);
},
);
- */
+ */
break;
}
});
From 6d024fc3de140e0d6748abec543dd6670f4b1882 Mon Sep 17 00:00:00 2001
From: Philip Okugbe <16838612+Philipinho@users.noreply.github.com>
Date: Mon, 9 Jun 2025 04:29:27 +0100
Subject: [PATCH 61/63] feat: bulk page imports (#1219)
* refactor imports - WIP
* Add readstream
* WIP
* fix attachmentId render
* fix attachmentId render
* turndown video tag
* feat: add stream upload support and improve file handling
- Add stream upload functionality to storage drivers\n- Improve ZIP file extraction with better encoding handling\n- Fix attachment ID rendering issues\n- Add AWS S3 upload stream support\n- Update dependencies for better compatibility
* WIP
* notion formatter
* move embed parser to editor-ext package
* import embeds
* utility files
* cleanup
* Switch from happy-dom to cheerio
* Refine code
* WIP
* bug fixes and UI
* sync
* WIP
* sync
* keep import modal mounted
* Show modal during upload
* WIP
* WIP
---
.../src/components/icons/confluence-icon.tsx | 20 +
.../editor/components/embed/embed-view.tsx | 7 +-
.../file-task/services/file-task-service.ts | 14 +
.../file-task/types/file-task.types.ts | 17 +
.../page/components/page-import-modal.tsx | 224 +++++++++++-
.../features/page/services/page-service.ts | 22 +-
.../page/tree/components/space-tree.tsx | 54 +--
.../src/features/page/tree/utils/utils.ts | 25 +-
.../src/features/websocket/types/types.ts | 21 +-
.../websocket/use-query-subscription.ts | 38 +-
apps/client/src/lib/config.ts | 5 +
apps/client/vite.config.ts | 2 +
apps/server/package.json | 7 +-
.../extensions/persistence.extension.ts | 2 +-
apps/server/src/common/helpers/utils.ts | 6 +
.../migrations/20250521T154949-file_tasks.ts | 39 ++
apps/server/src/database/types/db.d.ts | 19 +
.../server/src/database/types/entity.types.ts | 6 +
apps/server/src/ee | 2 +-
.../environment/environment.service.ts | 4 +
.../src/integrations/export/turndown-utils.ts | 23 +-
.../integrations/import/dto/file-task-dto.ts | 18 +
.../import/file-task.controller.ts | 79 ++++
.../integrations/import/import.controller.ts | 77 +++-
.../src/integrations/import/import.module.ts | 19 +-
.../import/processors/file-task.processor.ts | 76 ++++
.../import/services/file-task.service.ts | 346 ++++++++++++++++++
.../services/import-attachment.service.ts | 303 +++++++++++++++
.../import/{ => services}/import.service.ts | 104 +++++-
.../integrations/import/utils/file.utils.ts | 187 ++++++++++
.../import/utils/import-formatter.ts | 254 +++++++++++++
.../integrations/import/utils/import.utils.ts | 66 ++++
.../queue/constants/queue.constants.ts | 4 +
.../src/integrations/queue/queue.module.ts | 8 +
.../storage/drivers/local.driver.ts | 23 +-
.../integrations/storage/drivers/s3.driver.ts | 36 ++
.../interfaces/storage-driver.interface.ts | 6 +
.../integrations/storage/storage.service.ts | 10 +
apps/server/src/main.ts | 2 +-
packages/editor-ext/src/index.ts | 3 +-
.../editor-ext/src/lib/embed-provider.ts | 97 ++---
packages/editor-ext/src/lib/image/image.ts | 2 +-
packages/editor-ext/src/lib/trailing-node.ts | 9 +-
packages/editor-ext/src/lib/video/video.ts | 10 +-
pnpm-lock.yaml | 215 +++++++++--
45 files changed, 2362 insertions(+), 149 deletions(-)
create mode 100644 apps/client/src/components/icons/confluence-icon.tsx
create mode 100644 apps/client/src/features/file-task/services/file-task-service.ts
create mode 100644 apps/client/src/features/file-task/types/file-task.types.ts
create mode 100644 apps/server/src/database/migrations/20250521T154949-file_tasks.ts
create mode 100644 apps/server/src/integrations/import/dto/file-task-dto.ts
create mode 100644 apps/server/src/integrations/import/file-task.controller.ts
create mode 100644 apps/server/src/integrations/import/processors/file-task.processor.ts
create mode 100644 apps/server/src/integrations/import/services/file-task.service.ts
create mode 100644 apps/server/src/integrations/import/services/import-attachment.service.ts
rename apps/server/src/integrations/import/{ => services}/import.service.ts (61%)
create mode 100644 apps/server/src/integrations/import/utils/file.utils.ts
create mode 100644 apps/server/src/integrations/import/utils/import-formatter.ts
create mode 100644 apps/server/src/integrations/import/utils/import.utils.ts
rename apps/client/src/features/editor/components/embed/providers.ts => packages/editor-ext/src/lib/embed-provider.ts (58%)
diff --git a/apps/client/src/components/icons/confluence-icon.tsx b/apps/client/src/components/icons/confluence-icon.tsx
new file mode 100644
index 00000000..499f18da
--- /dev/null
+++ b/apps/client/src/components/icons/confluence-icon.tsx
@@ -0,0 +1,20 @@
+import { rem } from "@mantine/core";
+
+interface Props {
+ size?: number | string;
+}
+
+export function ConfluenceIcon({ size }: Props) {
+ return (
+
+ );
+}
diff --git a/apps/client/src/features/editor/components/embed/embed-view.tsx b/apps/client/src/features/editor/components/embed/embed-view.tsx
index 02ae6edf..77743a07 100644
--- a/apps/client/src/features/editor/components/embed/embed-view.tsx
+++ b/apps/client/src/features/editor/components/embed/embed-view.tsx
@@ -15,13 +15,10 @@ import {
import { IconEdit } from "@tabler/icons-react";
import { z } from "zod";
import { useForm, zodResolver } from "@mantine/form";
-import {
- getEmbedProviderById,
- getEmbedUrlAndProvider,
-} from "@/features/editor/components/embed/providers.ts";
import { notifications } from "@mantine/notifications";
import { useTranslation } from "react-i18next";
import i18n from "i18next";
+import { getEmbedProviderById, getEmbedUrlAndProvider } from '@docmost/editor-ext';
const schema = z.object({
url: z
@@ -101,7 +98,7 @@ export default function EmbedView(props: NodeViewProps) {
{t("Embed {{provider}}", {
- provider: getEmbedProviderById(provider).name,
+ provider: getEmbedProviderById(provider)?.name,
})}
diff --git a/apps/client/src/features/file-task/services/file-task-service.ts b/apps/client/src/features/file-task/services/file-task-service.ts
new file mode 100644
index 00000000..ffccbaae
--- /dev/null
+++ b/apps/client/src/features/file-task/services/file-task-service.ts
@@ -0,0 +1,14 @@
+import api from "@/lib/api-client";
+import { IFileTask } from "@/features/file-task/types/file-task.types.ts";
+
+export async function getFileTaskById(fileTaskId: string): Promise
-
{getChildComments(parentId).map((childComment) => (
Date: Fri, 16 May 2025 17:24:31 +0200
Subject: [PATCH 52/63] fix: copy/move select (#1174)
---
.../src/features/space/components/sidebar/space-select.tsx | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/apps/client/src/features/space/components/sidebar/space-select.tsx b/apps/client/src/features/space/components/sidebar/space-select.tsx
index db540474..a20c7e2d 100644
--- a/apps/client/src/features/space/components/sidebar/space-select.tsx
+++ b/apps/client/src/features/space/components/sidebar/space-select.tsx
@@ -81,7 +81,7 @@ export function SpaceSelect({
nothingFoundMessage={t("No space found")}
limit={50}
checkIconPosition="right"
- comboboxProps={{ width, withinPortal: false }}
+ comboboxProps={{ width, withinPortal: true, position: "bottom" }}
dropdownOpened={opened}
/>
);
From 1c200dbd0f23ac4303aeb3fa5c85e786f5d84e77 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9E=81=E5=9C=B0?=
Date: Fri, 16 May 2025 23:26:05 +0800
Subject: [PATCH 53/63] fix(table-hover): adjust row height to prevent
unexpected scrollbar on hover (#1124)
fix: Hover table style height error causing scrollbar to appear #1108
---
apps/client/src/features/editor/styles/table.css | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/apps/client/src/features/editor/styles/table.css b/apps/client/src/features/editor/styles/table.css
index 19a1029b..7d02ef03 100644
--- a/apps/client/src/features/editor/styles/table.css
+++ b/apps/client/src/features/editor/styles/table.css
@@ -47,7 +47,7 @@
.column-resize-handle {
background-color: #adf;
- bottom: -2px;
+ bottom: -1px;
position: absolute;
right: -2px;
pointer-events: none;
From b0491d5da4772285382436beb084daad6c4b1513 Mon Sep 17 00:00:00 2001
From: fuscodev
Date: Fri, 16 May 2025 20:15:11 +0200
Subject: [PATCH 54/63] feat: create new page from mention (#1153)
* init
* create page in relative parent root
---
.../components/mention/mention-list.tsx | 98 +++++++++++++++++--
1 file changed, 90 insertions(+), 8 deletions(-)
diff --git a/apps/client/src/features/editor/components/mention/mention-list.tsx b/apps/client/src/features/editor/components/mention/mention-list.tsx
index 4a4ae74a..389c2ce5 100644
--- a/apps/client/src/features/editor/components/mention/mention-list.tsx
+++ b/apps/client/src/features/editor/components/mention/mention-list.tsx
@@ -3,6 +3,7 @@ import React, {
useCallback,
useEffect,
useImperativeHandle,
+ useMemo,
useRef,
useState,
} from "react";
@@ -18,7 +19,7 @@ import {
import clsx from "clsx";
import classes from "./mention.module.css";
import { CustomAvatar } from "@/components/ui/custom-avatar.tsx";
-import { IconFileDescription } from "@tabler/icons-react";
+import { IconFileDescription, IconPlus } from "@tabler/icons-react";
import { useSpaceQuery } from "@/features/space/queries/space-query.ts";
import { useParams } from "react-router-dom";
import { v7 as uuid7 } from "uuid";
@@ -28,14 +29,28 @@ import {
MentionListProps,
MentionSuggestionItem,
} from "@/features/editor/components/mention/mention.type.ts";
+import { IPage } from "@/features/page/types/page.types";
+import { useCreatePageMutation, usePageQuery } from "@/features/page/queries/page-query";
+import { treeDataAtom } from "@/features/page/tree/atoms/tree-data-atom";
+import { SimpleTree } from "react-arborist";
+import { SpaceTreeNode } from "@/features/page/tree/types";
+import { useTranslation } from "react-i18next";
+import { useQueryEmit } from "@/features/websocket/use-query-emit";
+import { extractPageSlugId } from "@/lib";
const MentionList = forwardRef((props, ref) => {
const [selectedIndex, setSelectedIndex] = useState(1);
const viewportRef = useRef(null);
- const { spaceSlug } = useParams();
+ const { pageSlug, spaceSlug } = useParams();
+ const { data: page } = usePageQuery({ pageId: extractPageSlugId(pageSlug) });
const { data: space } = useSpaceQuery(spaceSlug);
const [currentUser] = useAtom(currentUserAtom);
const [renderItems, setRenderItems] = useState([]);
+ const { t } = useTranslation();
+ const [data, setData] = useAtom(treeDataAtom);
+ const tree = useMemo(() => new SimpleTree(data), [data]);
+ const createPageMutation = useCreatePageMutation();
+ const emit = useQueryEmit();
const { data: suggestion, isLoading } = useSearchSuggestionsQuery({
query: props.query,
@@ -45,12 +60,23 @@ const MentionList = forwardRef((props, ref) => {
limit: 10,
});
+ const createPageItem = (label: string) : MentionSuggestionItem => {
+ return {
+ id: null,
+ label: label,
+ entityType: "page",
+ entityId: null,
+ slugId: null,
+ icon: null,
+ }
+ }
+
useEffect(() => {
if (suggestion && !isLoading) {
let items: MentionSuggestionItem[] = [];
if (suggestion?.users?.length > 0) {
- items.push({ entityType: "header", label: "Users" });
+ items.push({ entityType: "header", label: t("Users") });
items = items.concat(
suggestion.users.map((user) => ({
@@ -64,7 +90,7 @@ const MentionList = forwardRef((props, ref) => {
}
if (suggestion?.pages?.length > 0) {
- items.push({ entityType: "header", label: "Pages" });
+ items.push({ entityType: "header", label: t("Pages") });
items = items.concat(
suggestion.pages.map((page) => ({
id: uuid7(),
@@ -76,6 +102,7 @@ const MentionList = forwardRef((props, ref) => {
})),
);
}
+ items.push(createPageItem(props.query));
setRenderItems(items);
// update editor storage
@@ -96,7 +123,7 @@ const MentionList = forwardRef((props, ref) => {
creatorId: currentUser?.user.id,
});
}
- if (item.entityType === "page") {
+ if (item.entityType === "page" && item.id!==null) {
props.command({
id: item.id,
label: item.label || "Untitled",
@@ -106,6 +133,9 @@ const MentionList = forwardRef((props, ref) => {
creatorId: currentUser?.user.id,
});
}
+ if (item.entityType === "page" && item.id===null) {
+ createPage(item.label);
+ }
}
},
[renderItems],
@@ -167,6 +197,58 @@ const MentionList = forwardRef((props, ref) => {
},
}));
+ const createPage = async (title: string) => {
+ const payload: { spaceId: string; parentPageId?: string; title: string } = {
+ spaceId: space.id,
+ parentPageId: page.id || null,
+ title: title
+ };
+
+ let createdPage: IPage;
+ try {
+ createdPage = await createPageMutation.mutateAsync(payload);
+ const parentId = page.id || null;
+ const data = {
+ id: createdPage.id,
+ slugId: createdPage.slugId,
+ name: createdPage.title,
+ position: createdPage.position,
+ spaceId: createdPage.spaceId,
+ parentPageId: createdPage.parentPageId,
+ children: [],
+ } as any;
+
+ const lastIndex = tree.data.length;
+
+ tree.create({ parentId, index: lastIndex, data });
+ setData(tree.data);
+
+ props.command({
+ id: uuid7(),
+ label: createdPage.title || "Untitled",
+ entityType: "page",
+ entityId: createdPage.id,
+ slugId: createdPage.slugId,
+ creatorId: currentUser?.user.id,
+ });
+
+ setTimeout(() => {
+ emit({
+ operation: "addTreeNode",
+ spaceId: space.id,
+ payload: {
+ parentId,
+ index: lastIndex,
+ data,
+ },
+ });
+ }, 50);
+
+ } catch (err) {
+ throw new Error("Failed to create page");
+ }
+ }
+
// if no results and enter what to do?
useEffect(() => {
@@ -178,7 +260,7 @@ const MentionList = forwardRef((props, ref) => {
if (renderItems.length === 0) {
return (
- No results
+ { t("No results") }
);
}
@@ -248,14 +330,14 @@ const MentionList = forwardRef((props, ref) => {
color="gray"
size={18}
>
-
- {item.label}
+ { (item.id) ? item.label : t("Create page") + ': ' + item.label }
From e3ba817723faab9bffa87a4d7fea2863f9425d01 Mon Sep 17 00:00:00 2001
From: fuscodev
Date: Fri, 16 May 2025 21:01:27 +0200
Subject: [PATCH 55/63] feat: comment editor emoji picker and ctrl+enter action
(#1121)
* commenteditor-emoji-picker
* capture Mac command key
* remove tooltip
---------
Co-authored-by: Philipinho <16838612+Philipinho@users.noreply.github.com>
---
.../comment/components/comment-actions.tsx | 4 +--
.../comment/components/comment-dialog.tsx | 1 +
.../comment/components/comment-editor.tsx | 31 +++++++++++++++++++
.../comment/components/comment-list-item.tsx | 1 +
.../comment/components/comment-list.tsx | 1 +
.../comment/components/comment.module.css | 4 ++-
.../emoji-menu/render-emoji-items.ts | 2 +-
7 files changed, 40 insertions(+), 4 deletions(-)
diff --git a/apps/client/src/features/comment/components/comment-actions.tsx b/apps/client/src/features/comment/components/comment-actions.tsx
index e5c4f1a2..882c6f74 100644
--- a/apps/client/src/features/comment/components/comment-actions.tsx
+++ b/apps/client/src/features/comment/components/comment-actions.tsx
@@ -1,4 +1,4 @@
-import { Button, Group } from "@mantine/core";
+import { Button, Group, Tooltip } from "@mantine/core";
import { useTranslation } from "react-i18next";
type CommentActionsProps = {
@@ -15,7 +15,7 @@ function CommentActions({
isCommentEditor,
}: CommentActionsProps) {
const { t } = useTranslation();
-
+
return (
{isCommentEditor && (
diff --git a/apps/client/src/features/comment/components/comment-dialog.tsx b/apps/client/src/features/comment/components/comment-dialog.tsx
index 080c731f..7a4b55aa 100644
--- a/apps/client/src/features/comment/components/comment-dialog.tsx
+++ b/apps/client/src/features/comment/components/comment-dialog.tsx
@@ -124,6 +124,7 @@ function CommentDialog({ editor, pageId }: CommentDialogProps) {
{
+ if (
+ [
+ "ArrowUp",
+ "ArrowDown",
+ "ArrowLeft",
+ "ArrowRight",
+ "Enter",
+ ].includes(event.key)
+ ) {
+ const emojiCommand = document.querySelector("#emoji-command");
+ if (emojiCommand) {
+ return true;
+ }
+ }
+
+ if ((event.ctrlKey || event.metaKey) && event.key === "Enter") {
+ event.preventDefault();
+ if (onSave) onSave();
+
+ return true;
+ }
+ },
+ },
+ },
onUpdate({ editor }) {
if (onUpdate) onUpdate(editor.getJSON());
},
diff --git a/apps/client/src/features/comment/components/comment-list-item.tsx b/apps/client/src/features/comment/components/comment-list-item.tsx
index 9e136a1d..cbf2a4e9 100644
--- a/apps/client/src/features/comment/components/comment-list-item.tsx
+++ b/apps/client/src/features/comment/components/comment-list-item.tsx
@@ -140,6 +140,7 @@ function CommentListItem({ comment, pageId }: CommentListItemProps) {
defaultContent={content}
editable={true}
onUpdate={(newContent: any) => setContent(newContent)}
+ onSave={handleUpdateComment}
autofocus={true}
/>
diff --git a/apps/client/src/features/comment/components/comment-list.tsx b/apps/client/src/features/comment/components/comment-list.tsx
index 6f0d877a..1aded495 100644
--- a/apps/client/src/features/comment/components/comment-list.tsx
+++ b/apps/client/src/features/comment/components/comment-list.tsx
@@ -151,6 +151,7 @@ const CommentEditorWithActions = ({ commentId, onSave, isLoading }) => {
+
+
+ );
+}
diff --git a/apps/client/src/features/share/components/share-shell.tsx b/apps/client/src/features/share/components/share-shell.tsx
index 7fa0c941..8550f59f 100644
--- a/apps/client/src/features/share/components/share-shell.tsx
+++ b/apps/client/src/features/share/components/share-shell.tsx
@@ -36,6 +36,7 @@ import {
} from "@/features/search/components/search-control.tsx";
import { ShareSearchSpotlight } from "@/features/search/share-search-spotlight";
import { shareSearchSpotlight } from "@/features/search/constants";
+import ShareBranding from '@/features/share/components/share-branding.tsx';
const MemoizedSharedTree = React.memo(SharedTree);
@@ -163,16 +164,7 @@ export default function ShareShell({
{children}
-
-
-
+ {data && shareId && !data.hasLicenseKey &&
;
+ hasLicenseKey: boolean;
}
diff --git a/apps/client/src/pages/share/shared-page.tsx b/apps/client/src/pages/share/shared-page.tsx
index a574a614..50e5837d 100644
--- a/apps/client/src/pages/share/shared-page.tsx
+++ b/apps/client/src/pages/share/shared-page.tsx
@@ -7,8 +7,9 @@ import React, { useEffect } from "react";
import ReadonlyPageEditor from "@/features/editor/readonly-page-editor.tsx";
import { extractPageSlugId } from "@/lib";
import { Error404 } from "@/components/ui/error-404.tsx";
+import ShareBranding from "@/features/share/components/share-branding.tsx";
-export default function SingleSharedPage() {
+export default function SharedPage() {
const { t } = useTranslation();
const { pageSlug } = useParams();
const { shareId } = useParams();
@@ -53,6 +54,8 @@ export default function SingleSharedPage() {
content={data.page.content}
/>
+
+ {data && !shareId && !data.hasLicenseKey &&
);
}
diff --git a/apps/server/src/core/share/share.controller.ts b/apps/server/src/core/share/share.controller.ts
index 5e8debe0..b9a9fcbf 100644
--- a/apps/server/src/core/share/share.controller.ts
+++ b/apps/server/src/core/share/share.controller.ts
@@ -30,6 +30,7 @@ import { JwtAuthGuard } from '../../common/guards/jwt-auth.guard';
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';
@UseGuards(JwtAuthGuard)
@Controller('shares')
@@ -39,6 +40,7 @@ export class ShareController {
private readonly spaceAbility: SpaceAbilityFactory,
private readonly shareRepo: ShareRepo,
private readonly pageRepo: PageRepo,
+ private readonly environmentService: EnvironmentService,
) {}
@HttpCode(HttpStatus.OK)
@@ -61,7 +63,12 @@ export class ShareController {
throw new BadRequestException();
}
- return this.shareService.getSharedPage(dto, workspace.id);
+ return {
+ ...(await this.shareService.getSharedPage(dto, workspace.id)),
+ hasLicenseKey:
+ Boolean(workspace.licenseKey) ||
+ (this.environmentService.isCloud() && workspace.plan === 'business'),
+ };
}
@Public()
@@ -166,6 +173,11 @@ export class ShareController {
@Body() dto: ShareIdDto,
@AuthWorkspace() workspace: Workspace,
) {
- return this.shareService.getShareTree(dto.shareId, workspace.id);
+ return {
+ ...(await this.shareService.getShareTree(dto.shareId, workspace.id)),
+ hasLicenseKey:
+ Boolean(workspace.licenseKey) ||
+ (this.environmentService.isCloud() && workspace.plan === 'business'),
+ };
}
}
diff --git a/apps/server/src/ee b/apps/server/src/ee
index 12f576ce..77d86e61 160000
--- a/apps/server/src/ee
+++ b/apps/server/src/ee
@@ -1 +1 @@
-Subproject commit 12f576ce721747903a9fadef3d58e0aa4e7ea3da
+Subproject commit 77d86e6119a22981f9fc7658006229dfeb96122b
From 343b2976c2a106c76a770533b450616dff7d4576 Mon Sep 17 00:00:00 2001
From: sanua356 <51795446+sanua356@users.noreply.github.com>
Date: Mon, 19 May 2025 22:05:31 +0300
Subject: [PATCH 58/63] #1186/chore: add support language abap syntax highlight
(#1188)
---
apps/client/package.json | 1 +
apps/client/src/features/editor/extensions/extensions.ts | 3 ++-
pnpm-lock.yaml | 8 ++++++++
3 files changed, 11 insertions(+), 1 deletion(-)
diff --git a/apps/client/package.json b/apps/client/package.json
index 586f50a1..3a658caf 100644
--- a/apps/client/package.json
+++ b/apps/client/package.json
@@ -29,6 +29,7 @@
"clsx": "^2.1.1",
"emoji-mart": "^5.6.0",
"file-saver": "^2.0.5",
+ "highlightjs-sap-abap": "^0.3.0",
"i18next": "^23.14.0",
"i18next-http-backend": "^2.6.1",
"jotai": "^2.12.1",
diff --git a/apps/client/src/features/editor/extensions/extensions.ts b/apps/client/src/features/editor/extensions/extensions.ts
index c131ad70..eb0e62f2 100644
--- a/apps/client/src/features/editor/extensions/extensions.ts
+++ b/apps/client/src/features/editor/extensions/extensions.ts
@@ -58,6 +58,7 @@ import ExcalidrawView from "@/features/editor/components/excalidraw/excalidraw-v
import EmbedView from "@/features/editor/components/embed/embed-view.tsx";
import plaintext from "highlight.js/lib/languages/plaintext";
import powershell from "highlight.js/lib/languages/powershell";
+import abap from "highlightjs-sap-abap";
import elixir from "highlight.js/lib/languages/elixir";
import erlang from "highlight.js/lib/languages/erlang";
import dockerfile from "highlight.js/lib/languages/dockerfile";
@@ -76,7 +77,7 @@ import { CharacterCount } from "@tiptap/extension-character-count";
const lowlight = createLowlight(common);
lowlight.register("mermaid", plaintext);
lowlight.register("powershell", powershell);
-lowlight.register("powershell", powershell);
+lowlight.register("abap", abap);
lowlight.register("erlang", erlang);
lowlight.register("elixir", elixir);
lowlight.register("dockerfile", dockerfile);
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index 2fd73d8b..a57f3fe1 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -257,6 +257,9 @@ importers:
file-saver:
specifier: ^2.0.5
version: 2.0.5
+ highlightjs-sap-abap:
+ specifier: ^0.3.0
+ version: 0.3.0
i18next:
specifier: ^23.14.0
version: 23.14.0
@@ -5872,6 +5875,9 @@ packages:
resolution: {integrity: sha512-SYVnVFswQER+zu1laSya563s+F8VDGt7o35d4utbamowvUNLLMovFqwCLSocpZTz3MgaSRA1IbqRWZv97dtErQ==}
engines: {node: '>=12.0.0'}
+ highlightjs-sap-abap@0.3.0:
+ resolution: {integrity: sha512-nSiUvEOCycjtFA3pHaTowrbAAk5+lciBHyoVkDsd6FTRBtW9sT2dt42o2jAKbXjZVUidtacdk+j0Y2xnd233Mw==}
+
hoist-non-react-statics@3.3.2:
resolution: {integrity: sha512-/gGivxi8JPKWNm/W0jSmzcMPpfpPLc3dY/6GxhX2hQ9iGj3aDfklV4ET7NjKpSinLpJ5vafa9iiGIEZg10SfBw==}
@@ -15436,6 +15442,8 @@ snapshots:
highlight.js@11.10.0: {}
+ highlightjs-sap-abap@0.3.0: {}
+
hoist-non-react-statics@3.3.2:
dependencies:
react-is: 16.13.1
From 858ff9da068ace1aee359d157aac887f3c66c928 Mon Sep 17 00:00:00 2001
From: Philipinho <16838612+Philipinho@users.noreply.github.com>
Date: Tue, 20 May 2025 09:27:30 -0700
Subject: [PATCH 59/63] 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 77d86e61..b312008b 160000
--- a/apps/server/src/ee
+++ b/apps/server/src/ee
@@ -1 +1 @@
-Subproject commit 77d86e6119a22981f9fc7658006229dfeb96122b
+Subproject commit b312008b4b7ed3d5862436b279d91aeddb6048d7
From ce1503af852aa0e0da95d4db790b12cc09926fde Mon Sep 17 00:00:00 2001
From: fuscodev
-
))}
diff --git a/apps/client/src/features/comment/components/comment.module.css b/apps/client/src/features/comment/components/comment.module.css
index b3d0a261..5679c9b2 100644
--- a/apps/client/src/features/comment/components/comment.module.css
+++ b/apps/client/src/features/comment/components/comment.module.css
@@ -11,6 +11,7 @@
border-left: 2px solid var(--mantine-color-gray-6);
padding: 8px;
background: var(--mantine-color-gray-light);
+ cursor: pointer;
}
.commentEditor {
diff --git a/apps/client/src/features/editor/page-editor.tsx b/apps/client/src/features/editor/page-editor.tsx
index 32845c6d..07d9da74 100644
--- a/apps/client/src/features/editor/page-editor.tsx
+++ b/apps/client/src/features/editor/page-editor.tsx
@@ -219,9 +219,12 @@ export default function PageEditor({
setActiveCommentId(commentId);
setAsideState({ tab: "comments", isAsideOpen: true });
- const selector = `div[data-comment-id="${commentId}"]`;
- const commentElement = document.querySelector(selector);
- commentElement?.scrollIntoView();
+ //wait if aside is closed
+ setTimeout(() => {
+ const selector = `div[data-comment-id="${commentId}"]`;
+ const commentElement = document.querySelector(selector);
+ commentElement?.scrollIntoView({ behavior: "smooth", block: "center" });
+ }, 400);
};
useEffect(() => {
diff --git a/apps/client/src/features/editor/styles/core.css b/apps/client/src/features/editor/styles/core.css
index 952e91fb..38acb74b 100644
--- a/apps/client/src/features/editor/styles/core.css
+++ b/apps/client/src/features/editor/styles/core.css
@@ -144,6 +144,19 @@
border-bottom: 2px solid rgb(166, 158, 12);
}
+ .comment-highlight {
+ animation: flash-highlight 3s ease-out;
+ }
+
+ @keyframes flash-highlight {
+ 0% {
+ background-color: #ff4d4d;
+ }
+ 100% {
+ background-color: rgba(255, 215, 0, 0.14);
+ }
+ }
+
.resize-cursor {
cursor: ew-resize;
cursor: col-resize;
diff --git a/apps/client/src/features/websocket/types/types.ts b/apps/client/src/features/websocket/types/types.ts
index a3e32ac2..48e7d819 100644
--- a/apps/client/src/features/websocket/types/types.ts
+++ b/apps/client/src/features/websocket/types/types.ts
@@ -7,6 +7,11 @@ export type InvalidateEvent = {
id?: string;
};
+export type InvalidateCommentsEvent = {
+ operation: "invalidateComment";
+ pageId: string;
+};
+
export type UpdateEvent = {
operation: "updateOne";
spaceId: string;
@@ -52,4 +57,4 @@ export type DeleteTreeNodeEvent = {
}
};
-export type WebSocketEvent = InvalidateEvent | UpdateEvent | DeleteEvent | AddTreeNodeEvent | MoveTreeNodeEvent | DeleteTreeNodeEvent;
+export type WebSocketEvent = InvalidateEvent | InvalidateCommentsEvent | UpdateEvent | DeleteEvent | AddTreeNodeEvent | MoveTreeNodeEvent | DeleteTreeNodeEvent;
diff --git a/apps/client/src/features/websocket/use-query-subscription.ts b/apps/client/src/features/websocket/use-query-subscription.ts
index 576b6777..c9e53aa6 100644
--- a/apps/client/src/features/websocket/use-query-subscription.ts
+++ b/apps/client/src/features/websocket/use-query-subscription.ts
@@ -3,6 +3,7 @@ import { socketAtom } from "@/features/websocket/atoms/socket-atom.ts";
import { useAtom } from "jotai";
import { useQueryClient } from "@tanstack/react-query";
import { WebSocketEvent } from "@/features/websocket/types";
+import { RQ_KEY } from "../comment/queries/comment-query";
export const useQuerySubscription = () => {
const queryClient = useQueryClient();
@@ -21,6 +22,11 @@ export const useQuerySubscription = () => {
queryKey: [...data.entity, data.id].filter(Boolean),
});
break;
+ case "invalidateComment":
+ queryClient.invalidateQueries({
+ queryKey: RQ_KEY(data.pageId),
+ });
+ break;
case "updateOne":
entity = data.entity[0];
if (entity === "pages") {
From fb7e4a79569971436b5c2ed068f096f09d6fd5c2 Mon Sep 17 00:00:00 2001
From: fuscodev
+
+ Import zip file
+
+
+ {t(
+ `Upload zip file containing Markdown and HTML files. Max: {{sizeLimit}}`,
+ {
+ sizeLimit: formatBytes(getFileImportSizeLimit()),
+ },
+ )}
+
+ handleZipUpload(file, "generic")}
+ accept="application/zip"
+ >
+ {(props) => (
+
+ }
+ {...props}
+ >
+ {t("Upload file")}
+
+
+ )}
+
+
+ ', ' '); } @@ -87,8 +89,12 @@ function preserveDetail(turndownService: TurndownService) { } const detailsContent = Array.from(node.childNodes) - .filter(child => child.nodeName !== 'SUMMARY') - .map(child => (child.nodeType === 1 ? turndownService.turndown((child as HTMLElement).outerHTML) : child.textContent)) + .filter((child) => child.nodeName !== 'SUMMARY') + .map((child) => + child.nodeType === 1 + ? turndownService.turndown((child as HTMLElement).outerHTML) + : child.textContent, + ) .join(''); return `\n
\n${detailSummary}\n\n${detailsContent}\n\n
\n`;
@@ -135,3 +141,16 @@ function iframeEmbed(turndownService: TurndownService) {
},
});
}
+
+function video(turndownService: TurndownService) {
+ turndownService.addRule('video', {
+ filter: function (node: HTMLInputElement) {
+ return node.tagName === 'VIDEO';
+ },
+ replacement: function (content: any, node: HTMLInputElement) {
+ const src = node.getAttribute('src') || '';
+ const name = path.basename(src);
+ return '[' + name + '](' + src + ')';
+ },
+ });
+}
diff --git a/apps/server/src/integrations/import/dto/file-task-dto.ts b/apps/server/src/integrations/import/dto/file-task-dto.ts
new file mode 100644
index 00000000..9cdea395
--- /dev/null
+++ b/apps/server/src/integrations/import/dto/file-task-dto.ts
@@ -0,0 +1,18 @@
+import { IsNotEmpty, IsUUID } from 'class-validator';
+
+export class FileTaskIdDto {
+ @IsNotEmpty()
+ @IsUUID()
+ fileTaskId: string;
+}
+
+export type ImportPageNode = {
+ id: string;
+ slugId: string;
+ name: string;
+ content: string;
+ position?: string | null;
+ parentPageId: string | null;
+ fileExtension: string;
+ filePath: string;
+};
\ No newline at end of file
diff --git a/apps/server/src/integrations/import/file-task.controller.ts b/apps/server/src/integrations/import/file-task.controller.ts
new file mode 100644
index 00000000..305779b4
--- /dev/null
+++ b/apps/server/src/integrations/import/file-task.controller.ts
@@ -0,0 +1,79 @@
+import {
+ Body,
+ Controller,
+ ForbiddenException,
+ HttpCode,
+ HttpStatus,
+ NotFoundException,
+ Post,
+ UseGuards,
+} from '@nestjs/common';
+import SpaceAbilityFactory from '../../core/casl/abilities/space-ability.factory';
+import { JwtAuthGuard } from '../../common/guards/jwt-auth.guard';
+import { User } from '@docmost/db/types/entity.types';
+import {
+ SpaceCaslAction,
+ SpaceCaslSubject,
+} from '../../core/casl/interfaces/space-ability.type';
+import { InjectKysely } from 'nestjs-kysely';
+import { KyselyDB } from '@docmost/db/types/kysely.types';
+import { AuthUser } from '../../common/decorators/auth-user.decorator';
+import { FileTaskIdDto } from './dto/file-task-dto';
+import { SpaceMemberRepo } from '@docmost/db/repos/space/space-member.repo';
+
+@Controller('file-tasks')
+export class FileTaskController {
+ constructor(
+ private readonly spaceMemberRepo: SpaceMemberRepo,
+ private readonly spaceAbility: SpaceAbilityFactory,
+ @InjectKysely() private readonly db: KyselyDB,
+ ) {}
+
+ @UseGuards(JwtAuthGuard)
+ @HttpCode(HttpStatus.OK)
+ @Post()
+ async getFileTasks(@AuthUser() user: User) {
+ const userSpaceIds = await this.spaceMemberRepo.getUserSpaceIds(user.id);
+
+ if (!userSpaceIds || userSpaceIds.length === 0) {
+ return [];
+ }
+
+ const fileTasks = await this.db
+ .selectFrom('fileTasks')
+ .selectAll()
+ .where('spaceId', 'in', userSpaceIds)
+ .execute();
+
+ if (!fileTasks) {
+ throw new NotFoundException('File task not found');
+ }
+
+ return fileTasks;
+ }
+
+ @UseGuards(JwtAuthGuard)
+ @HttpCode(HttpStatus.OK)
+ @Post('info')
+ async getFileTask(@Body() dto: FileTaskIdDto, @AuthUser() user: User) {
+ const fileTask = await this.db
+ .selectFrom('fileTasks')
+ .selectAll()
+ .where('id', '=', dto.fileTaskId)
+ .executeTakeFirst();
+
+ if (!fileTask || !fileTask.spaceId) {
+ throw new NotFoundException('File task not found');
+ }
+
+ const ability = await this.spaceAbility.createForUser(
+ user,
+ fileTask.spaceId,
+ );
+ if (ability.cannot(SpaceCaslAction.Read, SpaceCaslSubject.Page)) {
+ throw new ForbiddenException();
+ }
+
+ return fileTask;
+ }
+}
diff --git a/apps/server/src/integrations/import/import.controller.ts b/apps/server/src/integrations/import/import.controller.ts
index 975301af..1adb82eb 100644
--- a/apps/server/src/integrations/import/import.controller.ts
+++ b/apps/server/src/integrations/import/import.controller.ts
@@ -21,8 +21,9 @@ import {
import { FileInterceptor } from '../../common/interceptors/file.interceptor';
import * as bytes from 'bytes';
import * as path from 'path';
-import { ImportService } from './import.service';
+import { ImportService } from './services/import.service';
import { AuthWorkspace } from '../../common/decorators/auth-workspace.decorator';
+import { EnvironmentService } from '../environment/environment.service';
@Controller()
export class ImportController {
@@ -31,6 +32,7 @@ export class ImportController {
constructor(
private readonly importService: ImportService,
private readonly spaceAbility: SpaceAbilityFactory,
+ private readonly environmentService: EnvironmentService,
) {}
@UseInterceptors(FileInterceptor)
@@ -44,18 +46,18 @@ export class ImportController {
) {
const validFileExtensions = ['.md', '.html'];
- const maxFileSize = bytes('100mb');
+ const maxFileSize = bytes('10mb');
let file = null;
try {
file = await req.file({
- limits: { fileSize: maxFileSize, fields: 3, files: 1 },
+ limits: { fileSize: maxFileSize, fields: 4, files: 1 },
});
} catch (err: any) {
this.logger.error(err.message);
if (err?.statusCode === 413) {
throw new BadRequestException(
- `File too large. Exceeds the 100mb import limit`,
+ `File too large. Exceeds the 10mb import limit`,
);
}
}
@@ -73,7 +75,7 @@ export class ImportController {
const spaceId = file.fields?.spaceId?.value;
if (!spaceId) {
- throw new BadRequestException('spaceId or format not found');
+ throw new BadRequestException('spaceId is required');
}
const ability = await this.spaceAbility.createForUser(user, spaceId);
@@ -83,4 +85,69 @@ export class ImportController {
return this.importService.importPage(file, user.id, spaceId, workspace.id);
}
+
+ @UseInterceptors(FileInterceptor)
+ @UseGuards(JwtAuthGuard)
+ @HttpCode(HttpStatus.OK)
+ @Post('pages/import-zip')
+ async importZip(
+ @Req() req: any,
+ @AuthUser() user: User,
+ @AuthWorkspace() workspace: Workspace,
+ ) {
+ const validFileExtensions = ['.zip'];
+
+ const maxFileSize = bytes(this.environmentService.getFileImportSizeLimit());
+
+ let file = null;
+ try {
+ file = await req.file({
+ limits: { fileSize: maxFileSize, fields: 3, files: 1 },
+ });
+ } catch (err: any) {
+ this.logger.error(err.message);
+ if (err?.statusCode === 413) {
+ throw new BadRequestException(
+ `File too large. Exceeds the ${this.environmentService.getFileImportSizeLimit()} import limit`,
+ );
+ }
+ }
+
+ if (!file) {
+ throw new BadRequestException('Failed to upload file');
+ }
+
+ if (
+ !validFileExtensions.includes(path.extname(file.filename).toLowerCase())
+ ) {
+ throw new BadRequestException('Invalid import file extension.');
+ }
+
+ const spaceId = file.fields?.spaceId?.value;
+ const source = file.fields?.source?.value;
+
+ const validZipSources = ['generic', 'notion', 'confluence'];
+ if (!validZipSources.includes(source)) {
+ throw new BadRequestException(
+ 'Invalid import source. Import source must either be generic, notion or confluence.',
+ );
+ }
+
+ if (!spaceId) {
+ throw new BadRequestException('spaceId is required');
+ }
+
+ const ability = await this.spaceAbility.createForUser(user, spaceId);
+ if (ability.cannot(SpaceCaslAction.Edit, SpaceCaslSubject.Page)) {
+ throw new ForbiddenException();
+ }
+
+ return this.importService.importZip(
+ file,
+ source,
+ user.id,
+ spaceId,
+ workspace.id,
+ );
+ }
}
diff --git a/apps/server/src/integrations/import/import.module.ts b/apps/server/src/integrations/import/import.module.ts
index 60498808..40a49023 100644
--- a/apps/server/src/integrations/import/import.module.ts
+++ b/apps/server/src/integrations/import/import.module.ts
@@ -1,9 +1,22 @@
import { Module } from '@nestjs/common';
-import { ImportService } from './import.service';
+import { ImportService } from './services/import.service';
import { ImportController } from './import.controller';
+import { StorageModule } from '../storage/storage.module';
+import { FileTaskService } from './services/file-task.service';
+import { FileTaskProcessor } from './processors/file-task.processor';
+import { ImportAttachmentService } from './services/import-attachment.service';
+import { FileTaskController } from './file-task.controller';
+import { PageModule } from '../../core/page/page.module';
@Module({
- providers: [ImportService],
- controllers: [ImportController],
+ providers: [
+ ImportService,
+ FileTaskService,
+ FileTaskProcessor,
+ ImportAttachmentService,
+ ],
+ exports: [ImportService, ImportAttachmentService],
+ controllers: [ImportController, FileTaskController],
+ imports: [StorageModule, PageModule],
})
export class ImportModule {}
diff --git a/apps/server/src/integrations/import/processors/file-task.processor.ts b/apps/server/src/integrations/import/processors/file-task.processor.ts
new file mode 100644
index 00000000..9431ccec
--- /dev/null
+++ b/apps/server/src/integrations/import/processors/file-task.processor.ts
@@ -0,0 +1,76 @@
+import { Logger, OnModuleDestroy } from '@nestjs/common';
+import { OnWorkerEvent, Processor, WorkerHost } from '@nestjs/bullmq';
+import { Job } from 'bullmq';
+import { QueueJob, QueueName } from 'src/integrations/queue/constants';
+import { FileTaskService } from '../services/file-task.service';
+import { FileTaskStatus } from '../utils/file.utils';
+import { StorageService } from '../../storage/storage.service';
+
+@Processor(QueueName.FILE_TASK_QUEUE)
+export class FileTaskProcessor extends WorkerHost implements OnModuleDestroy {
+ private readonly logger = new Logger(FileTaskProcessor.name);
+
+ constructor(
+ private readonly fileTaskService: FileTaskService,
+ private readonly storageService: StorageService,
+ ) {
+ super();
+ }
+
+ async process(job: Job
+ 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 = $('
')
+ .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
+ 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 = $('