chore(blocks): improve ParseDocUrlService type (#8334)

toeverything · Sep 13, 2024 · 5032321 · 5032321
1 parent 7a7929c
commit 5032321
Show file tree

Hide file tree

Showing 6 changed files with 21 additions and 20 deletions.
diff --git a/packages/affine/shared/src/services/parse-url-service.ts b/packages/affine/shared/src/services/parse-url-service.ts
@@ -1,17 +1,12 @@
-import type { DocMode } from '@blocksuite/affine-model';
+import type { ReferenceParams } from '@blocksuite/affine-model';
 import type { ExtensionType } from '@blocksuite/block-std';
 
 import { createIdentifier } from '@blocksuite/global/di';
 
 export interface ParseDocUrlService {
-  parseDocUrl: (url: string) =>
-    | {
-        docId: string;
-        blockIds?: string[];
-        elementIds?: string[];
-        mode?: DocMode;
-      }
-    | undefined;
+  parseDocUrl: (
+    url: string
+  ) => ({ docId: string } & ReferenceParams) | undefined;
 }
 
 export const ParseDocUrlProvider =

diff --git a/packages/blocks/src/embed-linked-doc-block/commands/insert-link-by-quick-search.ts b/packages/blocks/src/embed-linked-doc-block/commands/insert-link-by-quick-search.ts
@@ -14,8 +14,10 @@ export const insertLinkByQuickSearchCommand: Command<
   }
 
   const insertedLinkType = quickSearchService.openQuickSearch().then(result => {
+    if (!result) return null;
+
     // add linked doc
-    if (result && 'docId' in result) {
+    if ('docId' in result) {
       std.command.exec('insertEmbedLinkedDoc', {
         docId: result.docId,
         params: result.params,
@@ -26,7 +28,7 @@ export const insertLinkByQuickSearchCommand: Command<
     }
 
     // add normal link;
-    if (result && 'userInput' in result) {
+    if ('userInput' in result) {
       std.command.exec('insertBookmark', { url: result.externalUrl });
       return {
         flavour: 'affine:bookmark',

diff --git a/packages/blocks/src/root-block/edgeless/components/toolbar/link/link-dense-menu.ts b/packages/blocks/src/root-block/edgeless/components/toolbar/link/link-dense-menu.ts
@@ -14,15 +14,16 @@ export const buildLinkDenseMenu: DenseMenuBuilder = edgeless => ({
 
     insertedLinkType
       ?.then(type => {
-        if (!type) return;
+        const flavour = type?.flavour;
+        if (!flavour) return;
 
         edgeless.std
           .getOptional(TelemetryProvider)
           ?.track('CanvasElementAdded', {
             control: 'toolbar:general',
             page: 'whiteboard editor',
             module: 'toolbar',
-            type: type.flavour?.split(':')[1],
+            type: flavour.split(':')[1],
           });
       })
       .catch(console.error);

diff --git a/packages/blocks/src/root-block/edgeless/components/toolbar/link/link-tool-button.ts b/packages/blocks/src/root-block/edgeless/components/toolbar/link/link-tool-button.ts
@@ -22,7 +22,8 @@ export class EdgelessLinkToolButton extends QuickToolMixin(LitElement) {
     );
     insertedLinkType
       ?.then(type => {
-        if (!type) return;
+        const flavour = type?.flavour;
+        if (!flavour) return;
 
         this.edgeless.std
           .getOptional(TelemetryProvider)
@@ -31,7 +32,7 @@ export class EdgelessLinkToolButton extends QuickToolMixin(LitElement) {
             page: 'whiteboard editor',
             module: 'toolbar',
             segment: 'toolbar',
-            type: type.flavour?.split(':')[1],
+            type: flavour.split(':')[1],
           });
 
         this.edgeless.std
@@ -41,7 +42,7 @@ export class EdgelessLinkToolButton extends QuickToolMixin(LitElement) {
             page: 'whiteboard editor',
             module: 'edgeless toolbar',
             segment: 'whiteboard',
-            type: type.flavour?.split(':')[1],
+            type: flavour.split(':')[1],
             other: 'existing doc',
           });
       })

diff --git a/packages/blocks/src/root-block/edgeless/components/toolbar/note/note-menu.ts b/packages/blocks/src/root-block/edgeless/components/toolbar/note/note-menu.ts
@@ -69,15 +69,16 @@ export class EdgelessNoteMenu extends EdgelessToolbarToolMixin(LitElement) {
 
     insertedLinkType
       ?.then(type => {
-        if (!type) return;
+        const flavour = type?.flavour;
+        if (!flavour) return;
 
         this.edgeless.std
           .getOptional(TelemetryProvider)
           ?.track('CanvasElementAdded', {
             control: 'toolbar:general',
             page: 'whiteboard editor',
             module: 'toolbar',
-            type: type.flavour?.split(':')[1],
+            type: flavour.split(':')[1],
           });
       })
       .catch(console.error);

diff --git a/packages/blocks/src/root-block/edgeless/edgeless-keyboard.ts b/packages/blocks/src/root-block/edgeless/edgeless-keyboard.ts
@@ -189,7 +189,8 @@ export class EdgelessPageKeyboardManager extends PageKeyboardManager {
 
           insertedLinkType
             ?.then(type => {
-              if (!type) return;
+              const flavour = type?.flavour;
+              if (!flavour) return;
 
               rootComponent.std
                 .getOptional(TelemetryProvider)
@@ -198,7 +199,7 @@ export class EdgelessPageKeyboardManager extends PageKeyboardManager {
                   page: 'whiteboard editor',
                   module: 'toolbar',
                   segment: 'toolbar',
-                  type: type.flavour?.split(':')[1],
+                  type: flavour.split(':')[1],
                 });
             })
             .catch(console.error);