Merge remote-tracking branch 'upstream/main'

Author: wzul

apps/client/package.json

@@ -1,7 +1,7 @@
 {
   "name": "client",
   "private": true,
-  "version": "0.71.0",
+  "version": "0.71.1",
   "scripts": {
     "dev": "vite",
     "build": "tsc && vite build",

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

@@ -65,6 +65,11 @@ export function useCreateCommentMutation() {
       ) as InfiniteData<IPagination<IComment>> | undefined;
 
       if (cache && cache.pages.length > 0) {
+        const alreadyExists = cache.pages.some((page) =>
+          page.items.some((c) => c.id === newComment.id),
+        );
+        if (alreadyExists) return;
+
         const lastIdx = cache.pages.length - 1;
         queryClient.setQueryData(RQ_KEY(newComment.pageId), {
           ...cache,

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

@@ -142,6 +142,25 @@ export const mainExtensions = [
         }),
       ];
     },
+    addKeyboardShortcuts() {
+      return {
+        Enter: ({ editor }) => {
+          const { from, to } = editor.state.selection;
+          if (from !== to) return false;
+          if (!editor.isActive("code")) return false;
+
+          const $from = editor.state.doc.resolve(from);
+          const codeType = editor.state.schema.marks.code;
+          const nodeAfter = $from.nodeAfter;
+
+          if (nodeAfter && codeType.isInSet(nodeAfter.marks)) {
+            return false;
+          }
+
+          return editor.chain().unsetCode().splitBlock().run();
+        },
+      };
+    },
   }),
   SharedStorage,
   Heading,

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

@@ -1,6 +1,6 @@
 {
   "name": "server",
-  "version": "0.71.0",
+  "version": "0.71.1",
   "description": "",
   "author": "",
   "private": true,

apps/server/package.json

@@ -11,6 +11,7 @@ import {
 import {
   extractMentions,
   extractPageMentions,
+  extractInternalLinkSlugIds,
 } from '../../common/helpers/prosemirror/utils';
 import { PageHistoryRepo } from '@docmost/db/repos/page/page-history.repo';
 import { PageRepo } from '@docmost/db/repos/page/page.repo';
@@ -77,12 +78,14 @@ export class HistoryProcessor extends WorkerHost implements OnModuleDestroy {
 
         const mentions = extractMentions(page.content);
         const pageMentions = extractPageMentions(mentions);
+        const internalLinkSlugIds = extractInternalLinkSlugIds(page.content);
 
         await this.generalQueue
           .add(QueueJob.PAGE_BACKLINKS, {
             pageId,
             workspaceId: page.workspaceId,
             mentions: pageMentions,
+            internalLinkSlugIds,
           } as IPageBacklinkJob)
           .catch((err) => {
             this.logger.error(

apps/server/src/collaboration/processors/history.processor.ts

@@ -7,6 +7,10 @@ import { validate as isValidUUID } from 'uuid';
 import { Transform } from '@tiptap/pm/transform';
 import { TiptapTransformer } from '@hocuspocus/transformer';
 import * as Y from 'yjs';
+import {
+  INTERNAL_LINK_REGEX,
+  extractPageSlugId,
+} from '../../../integrations/export/utils';
 
 export interface MentionNode {
   id: string;
@@ -64,6 +68,27 @@ export function extractPageMentions(mentionList: MentionNode[]): MentionNode[] {
   return pageMentionList as MentionNode[];
 }
 
+export function extractInternalLinkSlugIds(prosemirrorJson: any): string[] {
+  const slugIds: string[] = [];
+  const doc = jsonToNode(prosemirrorJson);
+
+  doc.descendants((node: Node) => {
+    for (const mark of node.marks) {
+      if (mark.type.name === 'link' && mark.attrs.internal && mark.attrs.href) {
+        const match = mark.attrs.href.match(INTERNAL_LINK_REGEX);
+        if (match) {
+          const slugId = extractPageSlugId(match[5]);
+          if (slugId && !slugIds.includes(slugId)) {
+            slugIds.push(slugId);
+          }
+        }
+      }
+    }
+  });
+
+  return slugIds;
+}
+
 export function extractUserMentionIdsFromJson(json: any): string[] {
   const userIds: string[] = [];
 

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

@@ -47,6 +47,10 @@ import { QueueJob, QueueName } from '../../../integrations/queue/constants';
 import { EventName } from '../../../common/events/event.contants';
 import { EventEmitter2 } from '@nestjs/event-emitter';
 import { CollaborationGateway } from '../../../collaboration/collaboration.gateway';
+import {
+  INTERNAL_LINK_REGEX,
+  extractPageSlugId,
+} from '../../../integrations/export/utils';
 import { markdownToHtml } from '@docmost/editor-ext';
 import { WatcherService } from '../../watcher/watcher.service';
 import { sql } from 'kysely';
@@ -510,6 +514,11 @@ export class PageService {
       });
     });
 
+    const slugIdMap = new Map<string, CopyPageMapEntry>();
+    for (const [, entry] of pageMap) {
+      slugIdMap.set(entry.oldSlugId, entry);
+    }
+
     const attachmentMap = new Map<string, ICopyPageAttachment>();
 
     const insertablePages: InsertablePage[] = await Promise.all(
@@ -576,6 +585,28 @@ export class PageService {
               node.attrs.slugId = mappedPage.newSlugId;
             }
           }
+
+          // Update internal page links in link marks
+          for (const mark of node.marks) {
+            if (
+              mark.type.name === 'link' &&
+              mark.attrs.internal &&
+              mark.attrs.href
+            ) {
+              const match = mark.attrs.href.match(INTERNAL_LINK_REGEX);
+              if (match) {
+                const slugId = extractPageSlugId(match[5]);
+                if (slugId && slugIdMap.has(slugId)) {
+                  const mappedPage = slugIdMap.get(slugId);
+                  //@ts-ignore
+                  mark.attrs.href = mark.attrs.href.replace(
+                    slugId,
+                    mappedPage.newSlugId,
+                  );
+                }
+              }
+            }
+          }
         });
 
         const prosemirrorJson = prosemirrorDoc.toJSON();

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

@@ -4,6 +4,7 @@ export interface IPageBacklinkJob {
   pageId: string;
   workspaceId: string;
   mentions: MentionNode[];
+  internalLinkSlugIds?: string[];
 }
 
 export interface IAddPageWatchersJob {

apps/server/src/integrations/queue/constants/queue.interface.ts

@@ -11,7 +11,7 @@ export async function processBacklinks(
   backlinkRepo: BacklinkRepo,
   data: IPageBacklinkJob,
 ): Promise<void> {
-  const { pageId, mentions, workspaceId } = data;
+  const { pageId, mentions, workspaceId, internalLinkSlugIds = [] } = data;
 
   await executeTx(db, async (trx) => {
     const existingBacklinks = await trx
@@ -20,24 +20,41 @@ export async function processBacklinks(
       .where('sourcePageId', '=', pageId)
       .execute();
 
-    if (existingBacklinks.length === 0 && mentions.length === 0) {
+    const mentionTargetPageIds = mentions
+      .filter((mention) => mention.entityId !== pageId)
+      .map((mention) => mention.entityId);
+
+    let resolvedLinkPageIds: string[] = [];
+    if (internalLinkSlugIds.length > 0) {
+      const resolvedPages = await trx
+        .selectFrom('pages')
+        .select('id')
+        .where('slugId', 'in', internalLinkSlugIds)
+        .where('workspaceId', '=', workspaceId)
+        .execute();
+      resolvedLinkPageIds = resolvedPages
+        .map((p) => p.id)
+        .filter((id) => id !== pageId);
+    }
+
+    const allTargetPageIds = [
+      ...new Set([...mentionTargetPageIds, ...resolvedLinkPageIds]),
+    ];
+
+    if (existingBacklinks.length === 0 && allTargetPageIds.length === 0) {
       return;
     }
 
     const existingTargetPageIds = existingBacklinks.map(
       (backlink) => backlink.targetPageId,
     );
 
-    const targetPageIds = mentions
-      .filter((mention) => mention.entityId !== pageId)
-      .map((mention) => mention.entityId);
-
     let validTargetPages = [];
-    if (targetPageIds.length > 0) {
+    if (allTargetPageIds.length > 0) {
       validTargetPages = await trx
         .selectFrom('pages')
         .select('id')
-        .where('id', 'in', targetPageIds)
+        .where('id', 'in', allTargetPageIds)
         .where('workspaceId', '=', workspaceId)
         .execute();
     }