align logging of cli and ide

jsajal · jsajal · commit ec0f7d8cc883 · 2024-06-20T21:12:37.000-07:00
diff --git a/packages/flowtest-cli/bin/index.js b/packages/flowtest-cli/bin/index.js
@@ -51,7 +51,7 @@ const argv = yargs(hideBin(process.argv))
         })
         .option('scan', {
           alias: 's',
-          describe: 'generate and upload build scan',
+          describe: 'generate and upload flow scan',
         });
     },
     async (argv) => {
@@ -79,7 +79,7 @@ const argv = yargs(hideBin(process.argv))
             logger,
           );
           console.log(chalk.yellow('Running Flow \n'));
-          if (flowData.nodes.find((n) => n.type === 'complexNode')) {
+          if (flowData.nodes.find((n) => n.type === 'flowNode')) {
             console.log(
               chalk.blue(
                 '[Note] This flow contains nested flows so run it from parent directory of collection. Ignore if already doing that. \n',
diff --git a/packages/flowtest-cli/graph/Graph.js b/packages/flowtest-cli/graph/Graph.js
@@ -133,7 +133,7 @@ class Graph {
 
       if (node.type === 'authNode') {
         console.log('Authentication Node');
-        const aNode = new authNode(node.data, this.envVariables);
+        const aNode = new authNode(node.data, this.envVariables, this.logger);
         this.auth = node.data.type ? aNode.evaluate() : undefined;
         result = {
           status: 'Success',
diff --git a/packages/flowtest-cli/graph/compute/authnode.js b/packages/flowtest-cli/graph/compute/authnode.js
@@ -1,6 +1,7 @@
 const { computeVariables } = require('./utils');
 const Node = require('./node');
 const chalk = require('chalk');
+const { LogLevel } = require('../GraphLogger');
 
 class authNode extends Node {
   constructor(auth, envVariables, logger) {
diff --git a/packages/flowtest-cli/graph/compute/requestnode.js b/packages/flowtest-cli/graph/compute/requestnode.js
@@ -52,7 +52,11 @@ class requestNode extends Node {
       console.log(chalk.red(`   ✕ `) + chalk.dim(`Request failed: ${JSON.stringify(res.error)}`));
       this.logger.add(LogLevel.ERROR, 'HTTP request failed', {
         type: 'requestNode',
-        data: { request: { type: options.method, url: options.url }, response: res.error, preReqVars: evalVariables },
+        data: {
+          request: { type: options.method, url: options.url, data: options.data },
+          response: res.error,
+          preReqVars: evalVariables,
+        },
       });
       return {
         status: 'Failed',
@@ -78,7 +82,11 @@ class requestNode extends Node {
       }
       this.logger.add(LogLevel.INFO, 'HTTP request success', {
         type: 'requestNode',
-        data: { request: { type: options.method, url: options.url }, response: res, preReqVars: evalVariables },
+        data: {
+          request: { type: options.method, url: options.url, data: options.data },
+          response: res,
+          preReqVars: evalVariables,
+        },
       });
       return {
         status: 'Success',
diff --git a/packages/flowtest-electron/src/ipc/collection.js b/packages/flowtest-electron/src/ipc/collection.js
@@ -318,7 +318,9 @@ const registerRendererEventHandlers = (mainWindow, watcher) => {
       } else {
         return {
           error: {
-            message: `An error occurred while running the request : ${error?.message}`,
+            status: '',
+            statusText: '',
+            data: `An error occurred while running the request : ${error?.message}`,
           },
         };
       }
diff --git a/src/components/molecules/flow/graph/Graph.js b/src/components/molecules/flow/graph/Graph.js
@@ -69,8 +69,7 @@ class Graph {
       console.debug('Executing node: ', node);
 
       if (node.type === 'outputNode') {
-        //this.logs.push(`Output: ${JSON.stringify(prevNodeOutputData)}`);
-        this.logger.add(LogLevel.INFO, '', { type: 'outputNode', data: prevNodeOutputData });
+        this.logger.add(LogLevel.INFO, '', { type: 'outputNode', data: { output: prevNodeOutputData } });
         if (this.caller === 'main') {
           useCanvasStore.getState().setOutputNode(node.id, prevNodeOutputData);
         }
@@ -109,15 +108,15 @@ class Graph {
           return new Promise((resolve) => setTimeout(resolve, Math.min(ms, this.timeout)));
         };
         await wait(delay);
-        this.logger.add(LogLevel.INFO, '', { type: 'delayNode', data: delay });
+        this.logger.add(LogLevel.INFO, '', { type: 'delayNode', data: { delay } });
         result = {
           status: 'Success',
           data: prevNodeOutputData,
         };
       }
 
       if (node.type === 'authNode') {
-        const aNode = new authNode(node.data, this.envVariables);
+        const aNode = new authNode(node.data, this.envVariables, this.logger);
         this.auth = node.data.type ? aNode.evaluate() : undefined;
         result = {
           status: 'Success',
@@ -181,7 +180,7 @@ class Graph {
       }
 
       if (this.#checkTimeout()) {
-        throw `Timeout of ${this.timeout} ms exceeded, stopping graph run`;
+        throw Error(`Timeout of ${this.timeout} ms exceeded, stopping graph run`);
       }
     } catch (err) {
       this.logger.add(LogLevel.ERROR, `Flow failed due to ${err}`, node);
diff --git a/src/components/molecules/flow/graph/compute/assertnode.js b/src/components/molecules/flow/graph/compute/assertnode.js
@@ -32,7 +32,7 @@ class assertNode extends Node {
 
     const operator = this.operator;
     if (operator == undefined) {
-      throw 'Operator undefined';
+      throw Error('Operator undefined');
     }
 
     let result;
@@ -50,7 +50,7 @@ class assertNode extends Node {
         result = var1 < var2;
         break;
       default:
-        throw 'Unsupported operator';
+        throw Error('Unsupported operator');
     }
     this.logger.add(LogLevel.INFO, '', { type: 'assertNode', data: { var1, var2, operator, result } });
 
diff --git a/src/components/molecules/flow/graph/compute/authnode.js b/src/components/molecules/flow/graph/compute/authnode.js
@@ -1,20 +1,24 @@
 import { computeVariables } from './utils';
 import Node from './node';
+import { LogLevel } from '../GraphLogger';
 
 class authNode extends Node {
-  constructor(auth, envVariables) {
+  constructor(auth, envVariables, logger) {
     super('authNode');
     (this.auth = auth), (this.envVariables = envVariables);
+    this.logger = logger;
   }
 
   evaluate() {
     console.log('Evaluating an auth node');
     if (this.auth.type === 'basic-auth') {
+      this.logger.add(LogLevel.INFO, '', { type: 'authNode', data: { authType: 'Basic Authentication' } });
       this.auth.username = computeVariables(this.auth.username, this.envVariables);
       this.auth.password = computeVariables(this.auth.password, this.envVariables);
 
       return this.auth;
     } else if (this.auth.type === 'no-auth') {
+      this.logger.add(LogLevel.INFO, '', { type: 'authNode', data: { authType: 'No Authentication' } });
       return this.auth;
     } else {
       throw Error(`auth type: ${this.auth.type} is not valid`);
diff --git a/src/components/molecules/flow/graph/compute/nestedflownode.js b/src/components/molecules/flow/graph/compute/nestedflownode.js
@@ -3,7 +3,7 @@ import Node from './node';
 
 class nestedFlowNode extends Node {
   constructor(nodes, edges, startTime, initialEnvVars, logger, caller) {
-    super('complexNode');
+    super('flowNode');
     this.internalGraph = new Graph1(nodes, edges, startTime, initialEnvVars, logger, caller);
   }
 
diff --git a/src/components/molecules/flow/graph/compute/requestnode.js b/src/components/molecules/flow/graph/compute/requestnode.js
@@ -35,7 +35,11 @@ class requestNode extends Node {
     if (res.error) {
       this.logger.add(LogLevel.ERROR, 'HTTP request failed', {
         type: 'requestNode',
-        data: { request: { type: options.method, url: options.url }, response: res.error, preReqVars: evalVariables },
+        data: {
+          request: { type: options.method, url: options.url, data: options.data },
+          response: res.error,
+          preReqVars: evalVariables,
+        },
       });
       return {
         status: 'Failed',
@@ -60,7 +64,11 @@ class requestNode extends Node {
       }
       this.logger.add(LogLevel.INFO, 'HTTP request success', {
         type: 'requestNode',
-        data: { request: { type: options.method, url: options.url }, response: res, preReqVars: evalVariables },
+        data: {
+          request: { type: options.method, url: options.url, data: options.data },
+          response: res,
+          preReqVars: evalVariables,
+        },
       });
       return {
         status: 'Success',
diff --git a/src/components/molecules/headers/TabPanelHeader.js b/src/components/molecules/headers/TabPanelHeader.js
@@ -44,28 +44,26 @@ const TabPanelHeader = () => {
 
       if (log.node != undefined) {
         const type = log.node.type;
+        const data = log.node.data;
         if (type === 'outputNode') {
           json = {
-            output: log.node.data,
+            output: data.output,
           };
         }
 
         if (type === 'assertNode') {
-          const data = log.node.data;
           message = `Assert : ${data.var1} of type ${typeof data.var1} ${data.operator} ${data.var2} of type ${typeof data.var2} = ${data.result}`;
         }
 
         if (type === 'delayNode') {
-          message = `Waiting for ${log.node.data} ms`;
+          message = `Waiting for ${data.delay} ms`;
         }
 
         if (type === 'setVarNode') {
-          const data = log.node.data;
           message = `Setting Variable:  ${data.name} = ${data.value}`;
         }
 
         if (type === 'requestNode') {
-          const data = log.node.data;
           message = `${data.request.type.toUpperCase()} ${data.request.url}`;
           json = data;
         }
@@ -112,15 +110,14 @@ const TabPanelHeader = () => {
     }
   };
 
-  // this gives forced reflow warning?
   const renderFlowScan = (flowScan) => {
     if (flowScan.upload === 'disabled') {
       return (
         <div className='flex flex-col items-start'>
           <Tippy content={flowScan.message} placement='top'>
             <BarsArrowUpIcon className='h-4 w-4' />
-            {'Activate Flow Scan'}
           </Tippy>
+          {'Activate Flow Scan'}
         </div>
       );
     } else if (flowScan.upload === 'success') {

Original file line number	Diff line number	Diff line change
`@@ -32,7 +32,7 @@ class assertNode extends Node {`
`32`	`32`
`33`	`33`	`const operator = this.operator;`
`34`	`34`	`if (operator == undefined) {`
`35`		`- throw 'Operator undefined';`
	`35`	`+ throw Error('Operator undefined');`
`36`	`36`	`}`
`37`	`37`
`38`	`38`	`let result;`
`@@ -50,7 +50,7 @@ class assertNode extends Node {`
`50`	`50`	`result = var1 < var2;`
`51`	`51`	`break;`
`52`	`52`	`default:`
`53`		`- throw 'Unsupported operator';`
	`53`	`+ throw Error('Unsupported operator');`
`54`	`54`	`}`
`55`	`55`	`this.logger.add(LogLevel.INFO, '', { type: 'assertNode', data: { var1, var2, operator, result } });`
`56`	`56`
Original file line number	Diff line number	Diff line change
`@@ -3,7 +3,7 @@ import Node from './node';`
`3`	`3`
`4`	`4`	`class nestedFlowNode extends Node {`
`5`	`5`	`constructor(nodes, edges, startTime, initialEnvVars, logger, caller) {`
`6`		`- super('complexNode');`
	`6`	`+ super('flowNode');`
`7`	`7`	`this.internalGraph = new Graph1(nodes, edges, startTime, initialEnvVars, logger, caller);`
`8`	`8`	`}`
`9`	`9`