cleanup

Author: trangdoan982

apps/roam/src/components/AdvancedNodeSearchDialog/AdvancedSearchDialog.tsx

@@ -23,7 +23,7 @@ import { DiscourseNodeSortControl } from "~/components/DiscourseNodeSortControl"
 import getDiscourseNodes, {
   type DiscourseNode,
 } from "~/utils/getDiscourseNodes";
-import { openSearchResultInMain } from "~/utils/advancedSearchNavigation";
+import { openSearchResultInMain } from "~/utils/advancedSearchFooterUtils";
 import { openDgSearchInSidebar } from "~/utils/openDgSearchInSidebar";
 import {
   DEBOUNCE_MS,

apps/roam/src/components/AdvancedNodeSearchDialog/AdvancedSearchSidebarPanel.tsx

@@ -25,8 +25,8 @@ import { SORT_FIELD_LABELS, isNonDefaultSort, type SortConfig } from "./utils";
 import getRoamUrl from "roamjs-components/dom/getRoamUrl";
 import type { DiscourseNode } from "~/utils/getDiscourseNodes";
 import { getNodeTagStyles } from "~/utils/getDiscourseNodeColors";
-import { openSearchResultFromLinkEvent } from "~/utils/advancedSearchNavigation";
 import { splitWithHighlights, stripTypePrefix } from "./utils";
+import { openSearchResultFromLinkEvent } from "~/utils/advancedSearchFooterUtils";
 
 const renderHighlightedText = (
   text: string,

apps/roam/src/utils/advancedSearchFooterUtils.ts

@@ -1,6 +1,8 @@
 import getUids from "roamjs-components/dom/getUids";
 import getTextByBlockUid from "roamjs-components/queries/getTextByBlockUid";
 import updateBlock from "roamjs-components/writes/updateBlock";
+import getPageTitleByPageUid from "roamjs-components/queries/getPageTitleByPageUid";
+import openBlockInSidebar from "roamjs-components/writes/openBlockInSidebar";
 
 export type BlockSelection = {
   selectionStart: number;
@@ -17,6 +19,28 @@ export type InsertTarget = {
 
 const DEFAULT_WINDOW_ID = "main-window";
 
+export const openSearchResultInMain = async (uid: string): Promise<void> => {
+  if (getPageTitleByPageUid(uid)) {
+    await window.roamAlphaAPI.ui.mainWindow.openPage({ page: { uid } });
+    return;
+  }
+  await window.roamAlphaAPI.ui.mainWindow.openBlock({ block: { uid } });
+};
+
+export const openSearchResultFromLinkEvent = async ({
+  shiftKey,
+  uid,
+}: {
+  shiftKey: boolean;
+  uid: string;
+}): Promise<void> => {
+  if (shiftKey) {
+    await openBlockInSidebar(uid);
+    return;
+  }
+  await openSearchResultInMain(uid);
+};
+
 export const getBlockSelection = (uid: string): BlockSelection => {
   const activeElement = document.activeElement;
   const isFocusedTextarea =