Rename evaluate to assert node

jsajal · jsajal · commit ef4a575325a5 · 2024-04-13T08:41:15.000-07:00
diff --git a/packages/flowtest-electron/src/utils/flowparser/AssertNode.js b/packages/flowtest-electron/src/utils/flowparser/AssertNode.js
@@ -1,14 +1,14 @@
 const { Node } = require('./Node');
 
-class EvaluateNode extends Node {
+class AssertNode extends Node {
   constructor() {
-    super('evaluateNode');
+    super('assertNode');
   }
 
   serialize(id, data, metadata) {
     return {
       id,
-      type: 'evaluateNode',
+      type: 'assertNode',
       data,
       ...metadata,
     };
@@ -30,5 +30,5 @@ class EvaluateNode extends Node {
 }
 
 module.exports = {
-  EvaluateNode,
+  AssertNode,
 };
diff --git a/packages/flowtest-electron/src/utils/flowparser/parser.js b/packages/flowtest-electron/src/utils/flowparser/parser.js
@@ -2,7 +2,7 @@ const { cloneDeep } = require('lodash');
 const { AuthNode } = require('./AuthNode');
 const { ComplexNode } = require('./ComplexNode');
 const { DelayNode } = require('./DelayNode');
-const { EvaluateNode } = require('./EvaluateNode');
+const { AssertNode } = require('./AssertNode');
 const { OutputNode } = require('./OutputNode');
 const { RequestNode } = require('./RequestNode');
 const { StartNode } = require('./StartNode');
@@ -96,16 +96,16 @@ const deserialize = (flowData) => {
           };
         }
 
-        if (node.type === 'evaluateNode') {
-          const eNode = new EvaluateNode();
+        if (node.type === 'assertNode') {
+          const eNode = new AssertNode();
           const result = eNode.deserialize(node);
           textData.graph.data.nodes[result.id] = {
-            type: 'evaluateNode',
+            type: 'assertNode',
             ...result.data,
           };
 
           textData.graph.metadata.nodes[result.id] = {
-            type: 'evaluateNode',
+            type: 'assertNode',
             ...result.metadata,
           };
         }
@@ -196,10 +196,10 @@ const serialize = (textData) => {
           flowData.nodes.push(result);
         }
 
-        if (value.type === 'evaluateNode') {
+        if (value.type === 'assertNode') {
           const data = value;
           const metadata = textDataCopy.graph.metadata.nodes[id];
-          const dNode = new EvaluateNode();
+          const dNode = new AssertNode();
           const result = dNode.serialize(id, data, metadata);
           flowData.nodes.push(result);
         }
diff --git a/packages/flowtest-electron/tests/utils/flowtest-parser.test.js b/packages/flowtest-electron/tests/utils/flowtest-parser.test.js
@@ -124,14 +124,14 @@ describe('FlowTest parser', () => {
         },
         {
           id: '9',
-          type: 'evaluateNode',
+          type: 'assertNode',
           position: {
             x: 1958.6425053074213,
             y: 59.84168648963893,
           },
           data: {
-            description: 'Evaluate conditional expressions.',
-            type: 'evaluateNode',
+            description: 'Assert on conditional expressions.',
+            type: 'assertNode',
             variables: {
               var1: {
                 type: 'String',
diff --git a/src/components/molecules/flow/AddNodes.js b/src/components/molecules/flow/AddNodes.js
@@ -37,9 +37,9 @@ const outputNode = {
   type: 'outputNode',
 };
 
-const evaluateNode = {
-  description: 'Evaluate conditional expressions.',
-  type: 'evaluateNode',
+const assertNode = {
+  description: 'Assert on conditional expressions.',
+  type: 'assertNode',
 };
 
 const delayNode = {
@@ -201,24 +201,24 @@ const AddNodes = ({ collectionId }) => {
                           </>
                         )}
                       </Disclosure>
-                      {/* Evaluate */}
+                      {/* Assert */}
                       <Disclosure as='div'>
                         {({ open }) => (
                           <>
                             <Disclosure.Button className='flex justify-between w-full px-4 py-2 text-lg font-medium text-left border-t border-b bg-gray-50 hover:bg-gray-100 focus:outline-none focus-visible:ring'>
-                              <span>Evaluate</span>
+                              <span>Assert</span>
                               <ChevronUpIcon className={`${open ? 'rotate-180 transform' : ''} h-5 w-5 `} />
                             </Disclosure.Button>
                             <Disclosure.Panel className='px-4 pt-4 pb-2 text-sm border-l border-r'>
                               <div
-                                key='evaluate'
-                                onDragStart={(event) => onDragStart(event, evaluateNode)}
+                                key='assert'
+                                onDragStart={(event) => onDragStart(event, assertNode)}
                                 draggable
                                 cursor='move'
                                 className='py-2 border-b'
                               >
-                                <div className='text-base font-semibold primary-text'>Evaluate</div>
-                                <div className='text-xs secondary-text'>{evaluateNode.description}</div>
+                                <div className='text-base font-semibold primary-text'>Assert</div>
+                                <div className='text-xs secondary-text'>{assertNode.description}</div>
                               </div>
                             </Disclosure.Panel>
                           </>
diff --git a/src/components/molecules/flow/graph/Graph.js b/src/components/molecules/flow/graph/Graph.js
@@ -4,8 +4,8 @@ import { cloneDeep } from 'lodash';
 import { readFlowTestSync } from 'service/collection';
 import useCanvasStore from 'stores/CanvasStore';
 import authNode from './compute/authnode';
-import complexNode from './compute/complexNode';
-import evaluateNode from './compute/evaluateNode';
+import complexNode from './compute/complexnode';
+import assertNode from './compute/assertnode';
 import requestNode from './compute/requestNode';
 
 class Graph {
@@ -27,7 +27,7 @@ class Graph {
   #computeConnectingEdge(node, result) {
     let connectingEdge = undefined;
 
-    if (node.type === 'evaluateNode') {
+    if (node.type === 'assertNode') {
       if (result.output === true) {
         connectingEdge = this.edges.find((edge) => edge.sourceHandle == 'true' && edge.source === node.id);
       } else {
@@ -73,8 +73,8 @@ class Graph {
         };
       }
 
-      if (node.type === 'evaluateNode') {
-        const eNode = new evaluateNode(node.data.operator, node.data.variables, prevNodeOutputData, this.logs);
+      if (node.type === 'assertNode') {
+        const eNode = new assertNode(node.data.operator, node.data.variables, prevNodeOutputData, this.logs);
         if (eNode.evaluate()) {
           this.logs.push('Result: true');
           result = {
@@ -162,7 +162,7 @@ class Graph {
       if (connectingEdge != undefined) {
         const nextNode = this.nodes.find(
           (node) =>
-            ['requestNode', 'outputNode', 'evaluateNode', 'delayNode', 'authNode', 'complexNode'].includes(node.type) &&
+            ['requestNode', 'outputNode', 'assertNode', 'delayNode', 'authNode', 'complexNode'].includes(node.type) &&
             node.id === connectingEdge.target,
         );
         this.graphRunNodeOutput[node.id] = result.data ? result.data : {};
diff --git a/src/components/molecules/flow/graph/compute/assertnode.js b/src/components/molecules/flow/graph/compute/assertnode.js
@@ -1,18 +1,18 @@
 import Operators from '../../constants/operators';
-import { computeNodeVariables } from '../compute/utils';
+import { computeNodeVariables } from './utils';
 import Node from './node';
 
-class evaluateNode extends Node {
+class assertNode extends Node {
   constructor(operator, variables, prevNodeOutputData, logs) {
-    super('evaluateNode');
+    super('assertNode');
     this.operator = operator;
     this.variables = variables;
     this.prevNodeOutputData = prevNodeOutputData;
     this.logs = logs;
   }
 
   evaluate() {
-    console.log('Evaluating an evaluate node');
+    console.log('Evaluating an assert node');
     const evalVariables = computeNodeVariables(this.variables, this.prevNodeOutputData);
     const var1 = evalVariables.var1;
     const var2 = evalVariables.var2;
@@ -22,7 +22,7 @@ class evaluateNode extends Node {
       throw 'Operator undefined';
     }
     this.logs.push(
-      `Evaluate var1: ${JSON.stringify(var1)} of type: ${typeof var1}, var2: ${JSON.stringify(var2)} of type: ${typeof var2} with operator: ${operator}`,
+      `Assert var1: ${JSON.stringify(var1)} of type: ${typeof var1}, var2: ${JSON.stringify(var2)} of type: ${typeof var2} with operator: ${operator}`,
     );
     if (operator == Operators.isEqualTo) {
       return var1 === var2;
@@ -36,4 +36,4 @@ class evaluateNode extends Node {
   }
 }
 
-export default evaluateNode;
+export default assertNode;
diff --git a/src/components/molecules/flow/index.js b/src/components/molecules/flow/index.js
@@ -14,7 +14,7 @@ import CustomEdge from './edges/ButtonEdge';
 import AddNodes from './AddNodes';
 import RequestNode from './nodes/RequestNode';
 import OutputNode from './nodes/OutputNode';
-import EvaluateNode from './nodes/EvaluateNode';
+import AssertNode from './nodes/AssertNode';
 import DelayNode from './nodes/DelayNode';
 import AuthNode from './nodes/AuthNode';
 import FlowNode from 'components/atoms/flow/FlowNode';
@@ -88,7 +88,7 @@ const Flow = ({ collectionId }) => {
       startNode: StartNode,
       requestNode: RequestNode,
       outputNode: OutputNode,
-      evaluateNode: EvaluateNode,
+      assertNode: AssertNode,
       delayNode: DelayNode,
       authNode: AuthNode,
       complexNode: ComplexNode,
diff --git a/src/components/molecules/flow/nodes/AssertNode.js b/src/components/molecules/flow/nodes/AssertNode.js
@@ -8,13 +8,13 @@ import { CHOOSE_OPERATOR_DEFAULT_VALUE_OBJ } from 'constants/Common';
 import useCanvasStore from 'stores/CanvasStore';
 
 const operatorMenu = (id, data) => {
-  const setEvaluateNodeOperator = useCanvasStore((state) => state.setEvaluateNodeOperator);
+  const setAssertNodeOperator = useCanvasStore((state) => state.setAssertNodeOperator);
 
   const handleOperatorSelection = (event) => {
     const selectedValue = event.target?.value;
     // ToDO: verify the behavior when use selects the default item
     if (selectedValue !== CHOOSE_OPERATOR_DEFAULT_VALUE_OBJ.value) {
-      setEvaluateNodeOperator(id, selectedValue);
+      setAssertNodeOperator(id, selectedValue);
     }
   };
 
@@ -24,7 +24,7 @@ const operatorMenu = (id, data) => {
         onChange={handleOperatorSelection}
         name='operator-type'
         value={data.operator ? data.operator : CHOOSE_OPERATOR_DEFAULT_VALUE_OBJ.value}
-        className='h-12 w-full rounded-md border border-neutral-500 px-1 py-2 text-neutral-500 outline-0 focus:ring-0'
+        className='w-full h-12 px-1 py-2 border rounded-md border-neutral-500 text-neutral-500 outline-0 focus:ring-0'
       >
         <option value={CHOOSE_OPERATOR_DEFAULT_VALUE_OBJ.value}>
           {CHOOSE_OPERATOR_DEFAULT_VALUE_OBJ.displayValue}
@@ -40,32 +40,32 @@ const operatorMenu = (id, data) => {
 
 // ToDo: refactor component parameters, make it more readable. vname and data are not suited
 const variableElem = (id, data, varName) => {
-  const setEvaluateNodeVariable = useCanvasStore((state) => state.setEvaluateNodeVariable);
+  const setAssertNodeVariable = useCanvasStore((state) => state.setAssertNodeVariable);
 
   const handleInputTypeSelection = (event) => {
     const selectedValue = event.target?.value;
     switch (selectedValue) {
       case 'String':
-        setEvaluateNodeVariable(id, varName, selectedValue, '');
+        setAssertNodeVariable(id, varName, selectedValue, '');
         break;
       case 'Select':
-        setEvaluateNodeVariable(id, varName, selectedValue, '');
+        setAssertNodeVariable(id, varName, selectedValue, '');
         break;
       case 'Number':
-        setEvaluateNodeVariable(id, varName, selectedValue, 0);
+        setAssertNodeVariable(id, varName, selectedValue, 0);
         break;
       case 'Boolean':
-        setEvaluateNodeVariable(id, varName, selectedValue, false);
+        setAssertNodeVariable(id, varName, selectedValue, false);
         break;
     }
   };
 
   const handleBooleanValueSelection = (event) => {
-    setEvaluateNodeVariable(id, varName, 'Boolean', event.target?.value);
+    setAssertNodeVariable(id, varName, 'Boolean', event.target?.value);
   };
 
   return (
-    <div className='mb-4 flex items-center justify-center rounded-md border border-neutral-500 text-sm text-neutral-500 outline-0 focus:ring-0'>
+    <div className='flex items-center justify-center mb-4 text-sm border rounded-md border-neutral-500 text-neutral-500 outline-0 focus:ring-0'>
       {data.variables && data.variables[varName] ? (
         data.variables[varName].type === 'Boolean' ? (
           <select
@@ -91,17 +91,17 @@ const variableElem = (id, data, varName) => {
                 case 'String':
                   // data.variables[varName].value = updatedValue.toString();
                   // setVariableValue(updatedValue.toString());
-                  setEvaluateNodeVariable(id, varName, 'String', updatedValue.toString());
+                  setAssertNodeVariable(id, varName, 'String', updatedValue.toString());
                   break;
                 case 'Select':
                   // data.variables[varName].value = updatedValue.toString();
                   // setVariableValue(updatedValue.toString());
-                  setEvaluateNodeVariable(id, varName, 'Select', updatedValue.toString());
+                  setAssertNodeVariable(id, varName, 'Select', updatedValue.toString());
                   break;
                 case 'Number':
                   // data.variables[varName].value = parseInt(updatedValue);
                   // setVariableValue(parseInt(updatedValue));
-                  setEvaluateNodeVariable(id, varName, 'Number', parseInt(updatedValue));
+                  setAssertNodeVariable(id, varName, 'Number', parseInt(updatedValue));
                   break;
               }
             }}
@@ -118,15 +118,15 @@ const variableElem = (id, data, varName) => {
           onChange={(event) => {
             // default type is string, as soon as we select another type, it goes to above flow
             const updatedValue = event.target.value;
-            setEvaluateNodeVariable(id, varName, 'String', updatedValue.toString());
+            setAssertNodeVariable(id, varName, 'String', updatedValue.toString());
           }}
         />
       )}
 
       <select
         onChange={handleInputTypeSelection}
         name='var-input-type'
-        className='nodrag h-8 w-full rounded-br-md rounded-tr-md border-l border-l-neutral-500 p-0 px-1'
+        className='w-full h-8 p-0 px-1 border-l nodrag rounded-br-md rounded-tr-md border-l-neutral-500'
         value={data.variables && data.variables[varName] ? data.variables[varName].type : 'String'}
       >
         <option value='Select'>Select</option>
@@ -138,10 +138,10 @@ const variableElem = (id, data, varName) => {
   );
 };
 
-const EvaluateNode = ({ id, data }) => {
+const AssertNode = ({ id, data }) => {
   return (
     <FlowNode
-      title='Evaluate'
+      title='Assert'
       handleLeft={true}
       handleLeftData={{ type: 'target' }}
       handleRight={true}
@@ -163,8 +163,8 @@ const EvaluateNode = ({ id, data }) => {
   );
 };
 
-EvaluateNode.propTypes = {
+AssertNode.propTypes = {
   data: PropTypes.object.isRequired,
 };
 
-export default EvaluateNode;
+export default AssertNode;
diff --git a/src/components/molecules/flow/nodes/OutputNode.js b/src/components/molecules/flow/nodes/OutputNode.js
@@ -3,6 +3,9 @@ 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'
diff --git a/src/constants/Flow.js b/src/constants/Flow.js
diff --git a/src/constants/forTesting/socketResponses.js b/src/constants/forTesting/socketResponses.js
diff --git a/src/stores/CanvasStore.js b/src/stores/CanvasStore.js
