Merge pull request #75 from FlowTestAI/minor-improvements-1

Minor improvements

Author: jsajal

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

@@ -70,21 +70,30 @@ class Graph {
         useCanvasStore.getState().setOutputNode(node.id, prevNodeOutputData);
         result = {
           status: 'Success',
+          data: prevNodeOutputData,
         };
       }
 
       if (node.type === 'assertNode') {
-        const eNode = new assertNode(node.data.operator, node.data.variables, prevNodeOutputData, this.logs);
+        const eNode = new assertNode(
+          node.data.operator,
+          node.data.variables,
+          prevNodeOutputData,
+          this.envVariables,
+          this.logs,
+        );
         if (eNode.evaluate()) {
           this.logs.push('Result: true');
           result = {
             status: 'Success',
+            data: prevNodeOutputData,
             output: true,
           };
         } else {
           this.logs.push('Result: false');
           result = {
             status: 'Success',
+            data: prevNodeOutputData,
             output: false,
           };
         }

src/components/molecules/flow/graph/compute/assertnode.js

@@ -1,21 +1,34 @@
 import Operators from '../../constants/operators';
-import { computeNodeVariables } from './utils';
+import { computeNodeVariable } from './utils';
 import Node from './node';
 
 class assertNode extends Node {
-  constructor(operator, variables, prevNodeOutputData, logs) {
+  constructor(operator, variables, prevNodeOutputData, envVariables, logs) {
     super('assertNode');
     this.operator = operator;
     this.variables = variables;
     this.prevNodeOutputData = prevNodeOutputData;
     this.logs = logs;
+    this.envVariables = envVariables;
+  }
+
+  getVariableValue(variable) {
+    if (variable.type.toLowerCase() === 'variable') {
+      const varValue = this.envVariables[variable.value];
+      if (varValue) {
+        return varValue;
+      } else {
+        throw Error(`Cannot find value of variable ${variable.value}`);
+      }
+    } else {
+      return computeNodeVariable(variable, this.prevNodeOutputData);
+    }
   }
 
   evaluate() {
     console.log('Evaluating an assert node');
-    const evalVariables = computeNodeVariables(this.variables, this.prevNodeOutputData);
-    const var1 = evalVariables.var1;
-    const var2 = evalVariables.var2;
+    const var1 = this.getVariableValue(this.variables.var1);
+    const var2 = this.getVariableValue(this.variables.var2);
 
     const operator = this.operator;
     if (operator == undefined) {

src/components/molecules/flow/graph/compute/utils.js

@@ -1,4 +1,4 @@
-const computeNodeVariable = (variable, prevNodeOutputData) => {
+export const computeNodeVariable = (variable, prevNodeOutputData) => {
   if (variable.type.toLowerCase() === 'string') {
     return variable.value;
   }

src/components/molecules/flow/nodes/AssertNode.js

@@ -51,6 +51,9 @@ const variableElem = (id, data, varName) => {
       case 'Select':
         setAssertNodeVariable(id, varName, selectedValue, '');
         break;
+      case 'Variable':
+        setAssertNodeVariable(id, varName, selectedValue, '');
+        break;
       case 'Number':
         setAssertNodeVariable(id, varName, selectedValue, 0);
         break;
@@ -98,6 +101,11 @@ const variableElem = (id, data, varName) => {
                   // setVariableValue(updatedValue.toString());
                   setAssertNodeVariable(id, varName, 'Select', updatedValue.toString());
                   break;
+                case 'Variable':
+                  // data.variables[varName].value = updatedValue.toString();
+                  // setVariableValue(updatedValue.toString());
+                  setAssertNodeVariable(id, varName, 'Variable', updatedValue.toString());
+                  break;
                 case 'Number':
                   // data.variables[varName].value = parseInt(updatedValue);
                   // setVariableValue(parseInt(updatedValue));
@@ -131,6 +139,7 @@ const variableElem = (id, data, varName) => {
       >
         <option value='Select'>Select</option>
         <option value='String'>String</option>
+        <option value='Variable'>Variable</option>
         <option value='Number'>Number</option>
         <option value='Boolean'>Boolean</option>
       </select>

src/components/molecules/flow/nodes/OutputNode.js

@@ -3,9 +3,6 @@ import { PropTypes } from 'prop-types';
 import FlowNode from 'components/atoms/flow/FlowNode';
 
 const OutputNode = ({ id, data }) => {
-  console.log('output node id: ', id);
-  console.log('output node data: ', data);
-
   return (
     <FlowNode
       title='Output'

src/components/molecules/flow/utils.js

@@ -100,7 +100,6 @@ export const initFlowData = {
         x: 400,
         y: 150,
       },
-      deletable: false,
       width: 147,
       height: 107,
     },

src/stores/CanvasStore.js

@@ -74,6 +74,7 @@ const useCanvasStore = create((set, get) => ({
         return node;
       }),
     });
+    useTabStore.getState().updateFlowTestNodes(get().nodes);
   },
   setRequestNodeUrl: (nodeId, url) => {
     set({
@@ -89,6 +90,7 @@ const useCanvasStore = create((set, get) => ({
         return node;
       }),
     });
+    useTabStore.getState().updateFlowTestNodes(get().nodes);
   },
   requestNodeAddPreRequestVar: (nodeId, name, type) => {
     set({
@@ -152,6 +154,7 @@ const useCanvasStore = create((set, get) => ({
         return node;
       }),
     });
+    useTabStore.getState().updateFlowTestNodes(get().nodes);
   },
   requestNodeAddPostResponseVar: (nodeId, name, type) => {
     set({
@@ -215,6 +218,7 @@ const useCanvasStore = create((set, get) => ({
         return node;
       }),
     });
+    useTabStore.getState().updateFlowTestNodes(get().nodes);
   },
   setRequestNodeBody: (nodeId, type, data) => {
     set({
@@ -253,6 +257,7 @@ const useCanvasStore = create((set, get) => ({
         return node;
       }),
     });
+    useTabStore.getState().updateFlowTestNodes(get().nodes);
   },
   setAssertNodeVariable: (nodeId, name, type, value) => {
     set({
@@ -274,6 +279,7 @@ const useCanvasStore = create((set, get) => ({
         return node;
       }),
     });
+    useTabStore.getState().updateFlowTestNodes(get().nodes);
   },
   setAssertNodeOperator: (nodeId, operator) => {
     set({
@@ -304,6 +310,7 @@ const useCanvasStore = create((set, get) => ({
         return node;
       }),
     });
+    useTabStore.getState().updateFlowTestNodes(get().nodes);
   },
   setOutputNode: (nodeId, output) => {
     set({