rename complex node to flow node for creating nested flows

jsajal · jsajal · commit 7c237a766597 · 2024-06-01T23:27:21.000-07:00
diff --git a/packages/flowtest-electron/src/utils/flowparser/AssertNode.js b/packages/flowtest-electron/src/utils/flowparser/AssertNode.js
@@ -8,7 +8,7 @@ class AssertNode extends Node {
   serialize(id, data, metadata) {
     return {
       id,
-      type: 'assertNode',
+      type: this.type,
       data,
       ...metadata,
     };
diff --git a/packages/flowtest-electron/src/utils/flowparser/AuthNode.js b/packages/flowtest-electron/src/utils/flowparser/AuthNode.js
@@ -8,7 +8,7 @@ class AuthNode extends Node {
   serialize(id, data, metadata) {
     return {
       id,
-      type: 'authNode',
+      type: this.type,
       data,
       ...metadata,
     };
diff --git a/packages/flowtest-electron/src/utils/flowparser/DelayNode.js b/packages/flowtest-electron/src/utils/flowparser/DelayNode.js
@@ -8,7 +8,7 @@ class DelayNode extends Node {
   serialize(id, data, metadata) {
     return {
       id,
-      type: 'delayNode',
+      type: this.type,
       data,
       ...metadata,
     };
diff --git a/packages/flowtest-electron/src/utils/flowparser/NestedFlowNode.js b/packages/flowtest-electron/src/utils/flowparser/NestedFlowNode.js
@@ -1,14 +1,14 @@
 const { Node } = require('./Node');
 
-class ComplexNode extends Node {
+class NestedFlowNode extends Node {
   constructor() {
-    super('complexNode');
+    super('flowNode');
   }
 
   serialize(id, data, metadata) {
     return {
       id,
-      type: 'complexNode',
+      type: this.type,
       data,
       ...metadata,
     };
@@ -30,5 +30,5 @@ class ComplexNode extends Node {
 }
 
 module.exports = {
-  ComplexNode,
+  NestedFlowNode,
 };
diff --git a/packages/flowtest-electron/src/utils/flowparser/OutputNode.js b/packages/flowtest-electron/src/utils/flowparser/OutputNode.js
@@ -8,7 +8,7 @@ class OutputNode extends Node {
   serialize(id, data, metadata) {
     return {
       id,
-      type: 'outputNode',
+      type: this.type,
       data,
       ...metadata,
     };
diff --git a/packages/flowtest-electron/src/utils/flowparser/RequestNode.js b/packages/flowtest-electron/src/utils/flowparser/RequestNode.js
@@ -8,7 +8,7 @@ class RequestNode extends Node {
   serialize(id, data, metadata) {
     return {
       id,
-      type: 'requestNode',
+      type: this.type,
       data,
       ...metadata,
     };
diff --git a/packages/flowtest-electron/src/utils/flowparser/SetVarNode.js b/packages/flowtest-electron/src/utils/flowparser/SetVarNode.js
@@ -8,7 +8,7 @@ class SetVarNode extends Node {
   serialize(id, data, metadata) {
     return {
       id,
-      type: 'setVarNode',
+      type: this.type,
       data,
       ...metadata,
     };
diff --git a/packages/flowtest-electron/src/utils/flowparser/parser.js b/packages/flowtest-electron/src/utils/flowparser/parser.js
@@ -1,6 +1,6 @@
 const { cloneDeep } = require('lodash');
 const { AuthNode } = require('./AuthNode');
-const { ComplexNode } = require('./ComplexNode');
+const { NestedFlowNode } = require('./NestedFlowNode');
 const { DelayNode } = require('./DelayNode');
 const { AssertNode } = require('./AssertNode');
 const { OutputNode } = require('./OutputNode');
@@ -111,16 +111,16 @@ const deserialize = (flowData) => {
           };
         }
 
-        if (node.type === 'complexNode') {
-          const cNode = new ComplexNode();
-          const result = cNode.deserialize(node);
+        if (node.type === 'flowNode') {
+          const fNode = new NestedFlowNode();
+          const result = fNode.deserialize(node);
           textData.graph.data.nodes[result.id] = {
-            type: 'complexNode',
+            type: 'flowNode',
             ...result.data,
           };
 
           textData.graph.metadata.nodes[result.id] = {
-            type: 'complexNode',
+            type: 'flowNode',
             ...result.metadata,
           };
         }
@@ -224,11 +224,11 @@ const serialize = (textData) => {
           flowData.nodes.push(result);
         }
 
-        if (value.type === 'complexNode') {
+        if (value.type === 'flowNode') {
           const data = value;
           const metadata = textDataCopy.graph.metadata.nodes[id];
-          const cNode = new ComplexNode();
-          const result = cNode.serialize(id, data, metadata);
+          const fNode = new NestedFlowNode();
+          const result = fNode.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
@@ -155,14 +155,14 @@ describe('FlowTest parser', () => {
         },
         {
           id: '10',
-          type: 'complexNode',
+          type: 'flowNode',
           position: {
             x: 2427.6600136878287,
             y: 94.18397266812065,
           },
           data: {
             description: 'Helps to create nested flows',
-            type: 'complexNode',
+            type: 'flowNode',
             relativePath: 'sample.flow',
           },
           width: 164,
diff --git a/src/components/molecules/flow/AddNodes.js b/src/components/molecules/flow/AddNodes.js
@@ -30,9 +30,9 @@ const authNode = {
   type: 'authNode',
 };
 
-const complexNode = {
+const flowNode = {
   description: 'Helps to create nested flows',
-  type: 'complexNode',
+  type: 'flowNode',
 };
 
 const setVarNode = {
@@ -266,19 +266,19 @@ const AddNodes = ({ collectionId }) => {
                         {({ 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>Complex</span>
+                              <span>Flow</span>
                               <ChevronDownIcon 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='complex'
-                                onDragStart={(event) => onDragStart(event, complexNode)}
+                                onDragStart={(event) => onDragStart(event, flowNode)}
                                 draggable
                                 cursor='move'
                                 className='py-2 border-b'
                               >
-                                <div className='text-base font-semibold primary-text'>Complex</div>
-                                <div className='text-xs secondary-text'>{complexNode.description}</div>
+                                <div className='text-base font-semibold primary-text'>Nested Flow</div>
+                                <div className='text-xs secondary-text'>{flowNode.description}</div>
                               </div>
                             </Disclosure.Panel>
                           </>
diff --git a/src/components/molecules/flow/graph/Graph.js b/src/components/molecules/flow/graph/Graph.js
@@ -4,7 +4,7 @@ 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 nestedFlowNode from './compute/nestedflownode';
 import assertNode from './compute/assertnode';
 import requestNode from './compute/requestnode';
 import setVarNode from './compute/setvarnode';
@@ -135,10 +135,10 @@ class Graph {
         }
       }
 
-      if (node.type === 'complexNode') {
+      if (node.type === 'flowNode') {
         const flowData = await readFlowTestSync(node.data.relativePath);
         if (flowData) {
-          const cNode = new complexNode(
+          const cNode = new nestedFlowNode(
             cloneDeep(flowData.nodes),
             cloneDeep(flowData.edges),
             this.startTime,
diff --git a/src/components/molecules/flow/graph/compute/nestedflownode.js b/src/components/molecules/flow/graph/compute/nestedflownode.js
@@ -1,7 +1,7 @@
 import Graph1 from '../Graph';
 import Node from './node';
 
-class complexNode extends Node {
+class nestedFlowNode extends Node {
   constructor(nodes, edges, startTime, initialEnvVars, logger, caller) {
     super('complexNode');
     this.internalGraph = new Graph1(nodes, edges, startTime, initialEnvVars, logger, caller);
@@ -13,4 +13,4 @@ class complexNode extends Node {
   }
 }
 
-export default complexNode;
+export default nestedFlowNode;
diff --git a/src/components/molecules/flow/index.js b/src/components/molecules/flow/index.js
@@ -19,7 +19,7 @@ import useCanvasStore from 'stores/CanvasStore';
 import useCollectionStore from 'stores/CollectionStore';
 import { useTabStore } from 'stores/TabStore';
 import Graph from './graph/Graph';
-import ComplexNode from './nodes/ComplexNode';
+import NestedFlowNode from './nodes/NestedFlowNode';
 import { initFlowData } from './utils';
 import SetVarNode from './nodes/SetVarNode';
 import { saveHandle } from '../modals/SaveFlowModal';
@@ -96,7 +96,7 @@ const Flow = ({ tab, collectionId }) => {
       assertNode: AssertNode,
       delayNode: DelayNode,
       authNode: AuthNode,
-      complexNode: ComplexNode,
+      flowNode: NestedFlowNode,
       setVarNode: SetVarNode,
     }),
     [],
diff --git a/src/components/molecules/flow/nodes/NestedFlowNode.js b/src/components/molecules/flow/nodes/NestedFlowNode.js
@@ -11,7 +11,7 @@ import { readFlowTest } from 'service/collection';
 import { toast } from 'react-toastify';
 
 // ToDo: Change standard select element(s) with headless list element
-const ComplexNode = ({ id, data }) => {
+const NestedFlowNode = ({ id, data }) => {
   const { ipcRenderer } = window;
 
   const setFlowForComplexNode = useCanvasStore((state) => state.setFlowForComplexNode);
@@ -88,8 +88,8 @@ const ComplexNode = ({ id, data }) => {
   );
 };
 
-ComplexNode.propTypes = {
+NestedFlowNode.propTypes = {
   data: PropTypes.object.isRequired,
 };
 
-export default ComplexNode;
+export default NestedFlowNode;
