fix: edgeless notes indexing

toeverything · Nov 29, 2024 · a180a76 · a180a76
1 parent 157723b
commit a180a76
Show file tree

Hide file tree

Showing 5 changed files with 139 additions and 61 deletions.
diff --git a/.../frontend/core/src/components/blocksuite/block-suite-editor/bi-directional-link-panel.tsx b/.../frontend/core/src/components/blocksuite/block-suite-editor/bi-directional-link-panel.tsx
@@ -30,19 +30,23 @@ const BlocksuiteTextRenderer = createReactComponentFromLit({
 const CollapsibleSection = ({
   title,
   children,
+  length,
 }: {
   title: ReactNode;
   children: ReactNode;
+  length?: number;
 }) => {
   const [open, setOpen] = useState(false);
   return (
     <Collapsible.Root open={open} onOpenChange={setOpen}>
       <Collapsible.Trigger className={styles.link}>
         {title}
-        <ToggleExpandIcon
-          className={styles.collapsedIcon}
-          data-collapsed={!open}
-        />
+        {length ? (
+          <ToggleExpandIcon
+            className={styles.collapsedIcon}
+            data-collapsed={!open}
+          />
+        ) : null}
       </Collapsible.Trigger>
       <Collapsible.Content>{children}</Collapsible.Content>
     </Collapsible.Root>
@@ -152,15 +156,28 @@ export const BiDirectionalLinkPanel = () => {
               <CollapsibleSection
                 key={linkGroup.docId}
                 title={<AffinePageReference pageId={linkGroup.docId} />}
+                length={linkGroup.links.length}
               >
                 <div className={styles.linkPreviewContainer}>
                   {linkGroup.links.map(link => {
                     if (!link.markdownPreview) {
                       return null;
                     }
+                    const searchParams = new URLSearchParams();
+                    searchParams.set('mode', link.displayMode || 'page');
+
+                    // if note has displayMode === 'edgeless' && has noteBlockId,
+                    // set noteBlockId as blockId
+                    searchParams.set(
+                      'blockIds',
+                      link.displayMode === 'edgeless' && link.noteBlockId
+                        ? link.noteBlockId
+                        : link.blockId
+                    );
+
                     const to = {
                       pathname: '/' + linkGroup.docId,
-                      search: `?blockIds=${link.blockId}`,
+                      search: '?' + searchParams.toString(),
                       hash: '',
                     };
                     return (

diff --git a/packages/frontend/core/src/modules/doc-link/entities/doc-backlinks.ts b/packages/frontend/core/src/modules/doc-link/entities/doc-backlinks.ts
@@ -7,6 +7,8 @@ export interface Backlink {
   docId: string;
   blockId: string;
   title: string;
+  noteBlockId?: string;
+  displayMode?: string;
   markdownPreview?: string;
 }
 

diff --git a/packages/frontend/core/src/modules/docs-search/schema.ts b/packages/frontend/core/src/modules/docs-search/schema.ts
@@ -12,6 +12,8 @@ export type DocIndexSchema = typeof docIndexSchema;
 export const blockIndexSchema = defineSchema({
   docId: 'String',
   blockId: 'String',
+  // note id of the block. used for focusing the note in edgeless mode
+  noteBlockId: 'String',
   content: 'FullText',
   flavour: 'String',
   blob: 'String',
@@ -29,6 +31,8 @@ export const blockIndexSchema = defineSchema({
   // { "databaseName": "xxx" }
   additional: { type: 'String', index: false },
   markdownPreview: { type: 'String', index: false },
+  // display mode of the block, value could be 'page' or 'edgeless' or 'both'
+  displayMode: 'String',
 });
 
 export type BlockIndexSchema = typeof blockIndexSchema;
diff --git a/packages/frontend/core/src/modules/docs-search/services/docs-search.ts b/packages/frontend/core/src/modules/docs-search/services/docs-search.ts
@@ -478,7 +478,13 @@ export class DocsSearchService extends Service {
         'docId',
         {
           hits: {
-            fields: ['docId', 'blockId', 'markdownPreview'],
+            fields: [
+              'docId',
+              'blockId',
+              'noteBlockId',
+              'markdownPreview',
+              'displayMode',
+            ],
             pagination: {
               limit: 5, // the max number of backlinks to show for each doc
             },
@@ -502,6 +508,9 @@ export class DocsSearchService extends Service {
               return bucket.hits.nodes.map(node => {
                 const blockId = node.fields.blockId ?? '';
                 const markdownPreview = node.fields.markdownPreview ?? '';
+                const displayMode = node.fields.displayMode ?? '';
+                const noteBlockId = node.fields.noteBlockId ?? '';
+
                 return {
                   docId: bucket.key,
                   blockId: typeof blockId === 'string' ? blockId : blockId[0],
@@ -510,6 +519,14 @@ export class DocsSearchService extends Service {
                     typeof markdownPreview === 'string'
                       ? markdownPreview
                       : markdownPreview[0],
+                  displayMode:
+                    typeof displayMode === 'string'
+                      ? displayMode
+                      : displayMode[0],
+                  noteBlockId:
+                    typeof noteBlockId === 'string'
+                      ? noteBlockId
+                      : noteBlockId[0],
                 };
               });
             });