run pre flow, then main graph and then run post flow

Author: jsajal

src/components/molecules/flow/flowtestai.js

@@ -14,9 +14,9 @@ const translateGeneratedNodesToOpenApiNodes = (generatedNodes, openApiNodes) =>
         outputNode['requestBody']['body'] = JSON.stringify(node_arguments.requestBody);
       }
       if (node_arguments.parameters) {
-        outputNode.variables = {};
+        outputNode.preReqVars = {};
         Object.entries(node_arguments.parameters).forEach(([paramName, paramValue], _) => {
-          outputNode.variables[paramName] = {
+          outputNode.preReqVars[paramName] = {
             type: typeof paramValue,
             value: paramValue,
           };

src/components/molecules/flow/graph/Graph.js

@@ -187,7 +187,6 @@ class Graph {
         console.debug('Flow failed at: ', result.node);
       }
       this.logs.push('End Flowtest');
-      this.logs.push(`Total time: ${Date.now() - this.startTime} ms`);
       return {
         status: result.status,
         logs: this.logs,

src/components/molecules/flow/index.js

@@ -259,7 +259,7 @@ const Flow = ({ collectionId }) => {
                 }
 
                 // ============= pre flow ================
-                const preFlowData = readFlowTestSync(preFlow);
+                const preFlowData = await readFlowTestSync(preFlow);
                 if (preFlowData) {
                   g = new Graph(
                     cloneDeep(preFlowData.nodes),
@@ -271,7 +271,7 @@ const Flow = ({ collectionId }) => {
                   result = await g.run();
                 }
 
-                console.log('pre flow: ', result);
+                //console.log('pre flow: ', result);
 
                 if (result?.status === 'Failed') {
                   onGraphComplete(result.status, result.logs);
@@ -288,16 +288,16 @@ const Flow = ({ collectionId }) => {
                 );
                 result = await g.run();
 
-                console.log('flow: ', result);
-                console.log('after flow vars: ', result.envVars);
+                //console.log('flow: ', result);
+                //console.log('after flow vars: ', result.envVars);
 
                 if (result.status === 'Failed') {
                   onGraphComplete(result.status, result.logs);
                   return;
                 }
 
                 // ============= post flow ================
-                const postFlowData = readFlowTestSync(postFlow);
+                const postFlowData = await readFlowTestSync(postFlow);
                 if (postFlowData) {
                   g = new Graph(
                     cloneDeep(postFlowData.nodes),
@@ -309,8 +309,9 @@ const Flow = ({ collectionId }) => {
                   result = await g.run();
                 }
 
-                console.log('post flow: ', result);
+                //console.log('post flow: ', result);
 
+                result.logs.push(`Total time: ${Date.now() - startTime} ms`);
                 onGraphComplete(result.status, result.logs);
               } catch (error) {
                 toast.error(`Error running graph: ${error}`);

src/service/collection.js

@@ -298,10 +298,13 @@ export const readFlowTestSync = (pathname) => {
     if (pathname.trim() != '') {
       const { ipcRenderer } = window;
 
-      return ipcRenderer.invoke('renderer:read-flowtest-sync', pathname);
+      return new Promise((resolve, reject) => {
+        return ipcRenderer.invoke('renderer:read-flowtest-sync', pathname).then(resolve).catch(reject);
+      });
     }
   } catch (error) {
     console.log(`Error reading flowtest: ${error}`);
+    return Promise.reject(new Error('Error reading flowtest'));
   }
 };