Fix an issue where the payload would not be set correctly in subseque…

…nt runs
parsecph · Aug 27, 2022 · f966ba6 · f966ba6
1 parent 6196490
commit f966ba6
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 18 deletions.
diff --git a/packages/ui/src/results/useResultRunner.ts b/packages/ui/src/results/useResultRunner.ts
@@ -143,7 +143,7 @@ export const useResultRunner = ({
                 headerNodeScriptData?.text
               );
 
-              if (!isSuccess) {
+              if (!isSuccess || !result) {
                 throw new Error('Node script failed.');
               }
 

diff --git a/packages/ui/src/search/SearchSettings/HeaderSettings/HeaderNodeMode.tsx b/packages/ui/src/search/SearchSettings/HeaderSettings/HeaderNodeMode.tsx
@@ -41,7 +41,14 @@ export const HeaderNodeMode = () => {
 
     if (electronAPI) {
       const { result } = await electronAPI.runNodeCmd(cmd);
-      setLastNodeOutput(result);
+
+      if (!result) {
+        setLastNodeOutput(
+          'Script run produced no output. Remember to return a value at the end of the script.'
+        );
+      } else {
+        setLastNodeOutput(result);
+      }
     }
   };
 

diff --git a/packages/ui/src/state/useSearchState.ts b/packages/ui/src/state/useSearchState.ts
@@ -181,21 +181,13 @@ export const useSearchState = ({ initialState }: { [key: string]: any }) => {
   };
 
   const setSettings = (item: ClobbrUIResultListItem) => {
-    const getPayloadJson = (data: { [key: string]: any }) => {
-      try {
-        return {
-          json: data,
-          text: JSON.stringify(initialState.search.data, null, 2),
-          valid: true
-        };
-      } catch {
-        return {
-          json: {},
-          text: '{}',
-          valid: true
-        };
-      }
-    };
+    const payloadData = item.data
+      ? {
+          json: item.data,
+          text: JSON.stringify(item.data, null, 2),
+          valid: true // TODO validate again?
+        }
+      : null;
 
     setUrl({
       displayText: item.url.replace(/^https?:\/\//, ''),
@@ -205,7 +197,7 @@ export const useSearchState = ({ initialState }: { [key: string]: any }) => {
     setSsl(item.ssl);
     setIterations(item.iterations);
     setVerb(item.verb);
-    setPayloadData(getPayloadJson(item.data));
+    setPayloadData(payloadData);
     setHeaderInputMode(item.headerInputMode);
     setHeaderItems(item.headers);
     setHeaderShellCmd(item.headerShellCmd);