From 3653c3396db20c9b0295cb995a04d326331f2c16 Mon Sep 17 00:00:00 2001
From: Michael Gartner <mclicks@gmail.com>
Date: Sat, 18 Oct 2025 23:06:38 -0600
Subject: [PATCH 1/2] feat: Add DiscourseContextOverlay support in ResultsTable

- Integrated DiscourseContextOverlay to display context suggestions in ResultRow.
- Updated uid handling for actions to ensure proper functionality.
- Introduced CONTEXT_OVERLAY_SUGGESTION constant for better maintainability in predefined selections.
---
 .../components/results-view/ResultsTable.tsx    | 17 +++++++++++++++--
 apps/roam/src/utils/predefinedSelections.ts     |  3 +++
 2 files changed, 18 insertions(+), 2 deletions(-)

diff --git a/apps/roam/src/components/results-view/ResultsTable.tsx b/apps/roam/src/components/results-view/ResultsTable.tsx
index fe3237b2b..2427908ba 100644
--- a/apps/roam/src/components/results-view/ResultsTable.tsx
+++ b/apps/roam/src/components/results-view/ResultsTable.tsx
@@ -24,6 +24,9 @@ import openBlockInSidebar from "roamjs-components/writes/openBlockInSidebar";
 import setInputSettings from "roamjs-components/util/setInputSettings";
 import toCellValue from "~/utils/toCellValue";
 import { ContextContent } from "~/components/DiscourseContext";
+import DiscourseContextOverlay from "~/components/DiscourseContextOverlay";
+import nanoid from "nanoid";
+import { CONTEXT_OVERLAY_SUGGESTION } from "~/utils/predefinedSelections";
 
 const EXTRA_ROW_TYPES = ["context", "discourse"] as const;
 type ExtraRowType = (typeof EXTRA_ROW_TYPES)[number] | null;
@@ -211,7 +214,7 @@ const ResultRow = ({
   const cell = (key: string) => {
     const value = toCellValue({
       value: r[`${key}-display`] || r[key] || "",
-      uid: (r[`${key}-uid`] as string) || "",
+      uid: r[`${key}-uid`] || "",
     });
     const action = r[`${key}-action`];
     if (typeof action === "string") {
@@ -219,6 +222,16 @@ const ResultRow = ({
         value.toUpperCase().replace(/\s/g, "_") in IconNames
           ? { icon: value as IconName, minimal: true }
           : { text: value };
+      const actionUid = r[`${key}-uid`];
+
+      if (action === "discourse" && value === CONTEXT_OVERLAY_SUGGESTION) {
+        return (
+          <DiscourseContextOverlay
+            uid={actionUid}
+            id={`discourse-overlay-${actionUid}-${nanoid()}`}
+          />
+        );
+      }
       return (
         <Button
           {...buttonProps}
@@ -227,7 +240,7 @@ const ResultRow = ({
               new CustomEvent("roamjs:query-builder:action", {
                 detail: {
                   action,
-                  uid: r[`${key}-uid`],
+                  uid: actionUid,
                   val: r["text"],
                   onRefresh,
                   queryUid: parentUid,
diff --git a/apps/roam/src/utils/predefinedSelections.ts b/apps/roam/src/utils/predefinedSelections.ts
index f16a59ee5..89a2209ff 100644
--- a/apps/roam/src/utils/predefinedSelections.ts
+++ b/apps/roam/src/utils/predefinedSelections.ts
@@ -242,6 +242,8 @@ const LEAF_SUGGESTIONS: SelectionSuggestion[] = CREATE_DATE_SUGGESTIONS.concat(
   .concat(EDIT_BY_SUGGESTIONS);
 // .concat(ATTR_SUGGESTIONS);
 
+export const CONTEXT_OVERLAY_SUGGESTION = "overlay";
+
 const predefinedSelections: PredefinedSelection[] = [
   {
     test: CREATE_DATE_TEST,
@@ -522,6 +524,7 @@ const predefinedSelections: PredefinedSelection[] = [
               { text: "flows" },
               { text: "graph" },
               { text: "layout" }, // replace with { text: "search-around" }, not supported yet
+              { text: CONTEXT_OVERLAY_SUGGESTION },
             ],
           },
         ],

From 09974a39d5305591ba354a64b5cabe7c54bb7493 Mon Sep 17 00:00:00 2001
From: Michael Gartner <mclicks@gmail.com>
Date: Sat, 18 Oct 2025 23:18:38 -0600
Subject: [PATCH 2/2] refactor: Clean up imports and enhance uid handling in
 ResultsTable

- Removed unnecessary imports for improved code clarity.
- Simplified uid generation for DiscourseContextOverlay to ensure consistent behavior.
- Updated conditional logic for better readability and maintainability.
---
 .../src/components/results-view/ResultsTable.tsx | 16 +++++++---------
 1 file changed, 7 insertions(+), 9 deletions(-)

diff --git a/apps/roam/src/components/results-view/ResultsTable.tsx b/apps/roam/src/components/results-view/ResultsTable.tsx
index 2427908ba..5c291c9fe 100644
--- a/apps/roam/src/components/results-view/ResultsTable.tsx
+++ b/apps/roam/src/components/results-view/ResultsTable.tsx
@@ -5,12 +5,7 @@ import React, {
   useState,
   useCallback,
 } from "react";
-import {
-  Button,
-  HTMLTable,
-  Icon,
-  IconName,
-} from "@blueprintjs/core";
+import { Button, HTMLTable, Icon, IconName } from "@blueprintjs/core";
 import { IconNames } from "@blueprintjs/icons";
 import { Column, Result } from "~/utils/types";
 import type { FilterData, Sorts, Views } from "~/utils/parseResultSettings";
@@ -25,7 +20,6 @@ import setInputSettings from "roamjs-components/util/setInputSettings";
 import toCellValue from "~/utils/toCellValue";
 import { ContextContent } from "~/components/DiscourseContext";
 import DiscourseContextOverlay from "~/components/DiscourseContextOverlay";
-import nanoid from "nanoid";
 import { CONTEXT_OVERLAY_SUGGESTION } from "~/utils/predefinedSelections";
 
 const EXTRA_ROW_TYPES = ["context", "discourse"] as const;
@@ -224,11 +218,15 @@ const ResultRow = ({
           : { text: value };
       const actionUid = r[`${key}-uid`];
 
-      if (action === "discourse" && value === CONTEXT_OVERLAY_SUGGESTION) {
+      if (
+        action === "discourse" &&
+        value === CONTEXT_OVERLAY_SUGGESTION &&
+        actionUid
+      ) {
         return (
           <DiscourseContextOverlay
             uid={actionUid}
-            id={`discourse-overlay-${actionUid}-${nanoid()}`}
+            id={`discourse-overlay-${parentUid}-${actionUid}`}
           />
         );
       }