Merge pull request #510 from DrDroidLab/bug/global_variable_objects_ui

adds global variable as objects in the UI

Author: jayeshsadhwani99

web/src/utils/parser/playbook/executionToState.ts

@@ -75,9 +75,22 @@ function executionToState(playbook_execution: any): Playbook {
       ? playbook.global_variable_set
       : playbook_execution?.execution_global_variable_set;
 
+  const globalVariables = Object.entries(variables ?? {}).reduce(
+    (acc, [key, value]) => {
+      if (typeof value === "string") {
+        acc[key] = value;
+      } else {
+        acc[key] = JSON.stringify(value);
+      }
+
+      return acc;
+    },
+    {},
+  );
+
   return {
     ...(currentPlaybook ?? playbook),
-    global_variable_set: variables ?? {},
+    global_variable_set: globalVariables ?? {},
     steps: playbookSteps,
     step_relations: playbookRelations,
     ui_requirement: {

web/src/utils/parser/playbook/playbookToState.ts

@@ -17,6 +17,19 @@ function playbookToState(playbook: Playbook): Playbook {
       showError: false,
     },
   }));
+
+  const globalVariables = Object.entries(
+    playbook.global_variable_set ?? {},
+  ).reduce((acc, [key, value]) => {
+    if (typeof value === "string") {
+      acc[key] = value;
+    } else {
+      acc[key] = JSON.stringify(value);
+    }
+
+    return acc;
+  }, {});
+
   steps.forEach((step: Step) => {
     const stepTasks: Task[] = (step.tasks as Task[])
       .map((e) => {
@@ -64,6 +77,7 @@ function playbookToState(playbook: Playbook): Playbook {
   relationToState(playbook, tasks, steps);
   return {
     ...playbook,
+    global_variable_set: globalVariables,
     steps,
     ui_requirement: {
       tasks,

web/src/utils/parser/playbook/stateToPlaybook.ts

@@ -5,6 +5,7 @@ import { Playbook, Step, Task } from "../../../types/index.ts";
 import checkId from "../../common/checkId.ts";
 import { extractTimeFromHours } from "../../../components/Playbooks/task/taskConfiguration/comparison/utils/extractTimeFromHours.ts";
 import { handleMultipleRuleSets } from "./handleMultipleRuleSets.ts";
+import isJSONString from "../../../components/common/CodeAccordion/utils/isJSONString.ts";
 
 function stateToPlaybook(): Playbook | null {
   handleMultipleRuleSets();
@@ -18,6 +19,17 @@ function stateToPlaybook(): Playbook | null {
     "ui_requirement",
   );
 
+  playbook.global_variable_set = Object.entries(
+    playbook.global_variable_set ?? {},
+  )?.reduce((gvs, [key, value]) => {
+    if (isJSONString(value)) {
+      gvs[key] = JSON.parse(value);
+    } else {
+      gvs[key] = value;
+    }
+    return gvs;
+  }, {});
+
   playbook.steps = playbook?.steps?.map((step: Step) => ({
     ...step,
     id: checkId(step.id),