devin review

Author: sid597

apps/roam/src/components/QueryBuilder.tsx

@@ -33,6 +33,7 @@ type QueryPageComponent = (props: {
   showAlias?: boolean;
   discourseNodeType?: string;
   settingKey?: "index" | "specification";
+  returnNode?: string;
 }) => JSX.Element;
 
 type Props = Parameters<QueryPageComponent>[0];
@@ -43,6 +44,7 @@ const QueryBuilder = ({
   showAlias,
   discourseNodeType,
   settingKey,
+  returnNode,
 }: Props) => {
   const extensionAPI = useExtensionAPI();
   const hideMetadata = useMemo(
@@ -168,6 +170,7 @@ const QueryBuilder = ({
               parentUid={pageUid}
               discourseNodeType={discourseNodeType}
               settingKey={settingKey}
+              returnNode={returnNode}
               onQuery={() => {
                 setHasResults(true);
                 setIsEdit(false);

apps/roam/src/components/QueryEditor.tsx

@@ -438,6 +438,7 @@ type QueryEditorComponent = (props: {
   showAlias?: boolean;
   discourseNodeType?: string;
   settingKey?: "index" | "specification";
+  returnNode?: string;
 }) => JSX.Element;
 
 const QueryEditor: QueryEditorComponent = ({
@@ -448,6 +449,7 @@ const QueryEditor: QueryEditorComponent = ({
   showAlias,
   discourseNodeType,
   settingKey,
+  returnNode,
 }) => {
   useEffect(() => {
     const previewQuery = ((e: CustomEvent) => {
@@ -493,7 +495,7 @@ const QueryEditor: QueryEditorComponent = ({
 
     const stripped: unknown = JSON.parse(
       JSON.stringify(
-        { conditions, selections, custom },
+        { conditions, selections, custom, returnNode },
         (key, value: unknown) => (key === "uid" ? undefined : value),
       ),
     );
@@ -507,7 +509,8 @@ const QueryEditor: QueryEditorComponent = ({
       return;
     }
 
-    const path = settingKey === "index" ? ["index"] : ["specification", "query"];
+    const path =
+      settingKey === "index" ? ["index"] : ["specification", "query"];
 
     window.clearTimeout(blockPropSyncTimeoutRef.current);
     blockPropSyncTimeoutRef.current = window.setTimeout(() => {
@@ -516,7 +519,14 @@ const QueryEditor: QueryEditorComponent = ({
     }, 250);
 
     return () => window.clearTimeout(blockPropSyncTimeoutRef.current);
-  }, [conditions, selections, custom, discourseNodeType, settingKey]);
+  }, [
+    conditions,
+    selections,
+    custom,
+    discourseNodeType,
+    settingKey,
+    returnNode,
+  ]);
 
   const customNodeOnChange = (value: string) => {
     window.clearTimeout(debounceRef.current);

apps/roam/src/components/settings/DiscourseNodeIndex.tsx

@@ -71,7 +71,12 @@ const NodeIndex = ({
   return (
     <ExtensionApiContextProvider {...onloadArgs}>
       {showQuery ? (
-        <QueryBuilder pageUid={parentUid} discourseNodeType={node.type} settingKey="index" />
+        <QueryBuilder
+          pageUid={parentUid}
+          discourseNodeType={node.type}
+          settingKey="index"
+          returnNode={DEFAULT_RETURN_NODE}
+        />
       ) : (
         <Spinner />
       )}

apps/roam/src/components/settings/DiscourseNodeSpecification.tsx

@@ -143,6 +143,7 @@ const NodeSpecification = ({
           hideCustomSwitch
           discourseNodeType={node.type}
           settingKey="specification"
+          returnNode={node.text}
         />
       </div>
     </div>

apps/roam/src/components/settings/utils/zodSchema.ts

@@ -53,7 +53,7 @@ export const IndexSchema = z.object({
   conditions: z.array(ConditionSchema).default([]),
   selections: z.array(SelectionSchema).default([]),
   custom: z.string().default(""),
-  returnNode: z.string().default(""),
+  returnNode: z.string().default("node"),
 });
 
 type RoamNode = {