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 1/6] 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 2/6] 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 3/6] 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 4/6] 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", + ); + }} > Date: Tue, 15 Apr 2025 12:46:28 +0100 Subject: [PATCH 5/6] sync ee --- 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 a04fcc22..d3095f2d 160000 --- a/apps/server/src/ee +++ b/apps/server/src/ee @@ -1 +1 @@ -Subproject commit a04fcc224e36514741f064d83a3c39df31766b65 +Subproject commit d3095f2d8bd2870da7f3b534c83c84e8fb3099bc From de57d051998d39780b0cb8e1a755d7c8b256549e Mon Sep 17 00:00:00 2001 From: Philipinho <16838612+Philipinho@users.noreply.github.com> Date: Tue, 15 Apr 2025 12:48:40 +0100 Subject: [PATCH 6/6] 0.10.2 --- 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 c88a2860..5901a920 100644 --- a/apps/client/package.json +++ b/apps/client/package.json @@ -1,7 +1,7 @@ { "name": "client", "private": true, - "version": "0.10.1", + "version": "0.10.2", "scripts": { "dev": "vite", "build": "tsc && vite build", diff --git a/apps/server/package.json b/apps/server/package.json index 54cd1661..0ef03d7c 100644 --- a/apps/server/package.json +++ b/apps/server/package.json @@ -1,6 +1,6 @@ { "name": "server", - "version": "0.10.1", + "version": "0.10.2", "description": "", "author": "", "private": true, diff --git a/package.json b/package.json index d67cc4cd..d84046e5 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "docmost", "homepage": "https://docmost.com", - "version": "0.10.1", + "version": "0.10.2", "private": true, "scripts": { "build": "nx run-many -t build",