From e91125801de3b59fdf9b4329cd4da773a929234d Mon Sep 17 00:00:00 2001
From: Luis Fernando Molina <Luis-Fernando-Molina@users.noreply.github.com>
Date: Sun, 10 May 2020 09:00:58 +0200
Subject: [PATCH] Improvement on conditions editor

---
 AppSchema.json                               | 15 +++++++++++++--
 CanvasApp/DesignSpace/Workspace/Workspace.js | 10 ++++++++++
 CanvasApp/FloatingSpace/ConditionEditor.js   |  7 -------
 3 files changed, 23 insertions(+), 9 deletions(-)

diff --git a/AppSchema.json b/AppSchema.json
index eeece2dd3..017fbbf7e 100644
--- a/AppSchema.json
+++ b/AppSchema.json
@@ -858,8 +858,7 @@
                 "action": "Edit Condition",
                 "actionFunction": "uiObject.conditionEditor.activate",
                 "label": "Edit Condition",
-                "iconPathOn": "html",
-                "iconPathOff": "html"
+                "relatedUiObject": "Condition"
             },
             {
                 "action": "Add UI Object",
@@ -869,6 +868,18 @@
                 "relatedUiObject": "Javascript Code",
                 "actionFunction": "payload.onMenuItemClick"
             },
+            {
+                "action": "Fetch Code to Javascript Code",
+                "label": "Fetch from Javascript Code",
+                "relatedUiObject": "Javascript Code",
+                "actionFunction": "payload.onMenuItemClick"
+            },
+            {
+                "action": "Push Code to Javascript Code",
+                "label": "Push to Javascript Code",
+                "relatedUiObject": "Javascript Code",
+                "actionFunction": "payload.onMenuItemClick"
+            },
             {
                 "action": "Delete UI Object",
                 "askConfirmation": true,
diff --git a/CanvasApp/DesignSpace/Workspace/Workspace.js b/CanvasApp/DesignSpace/Workspace/Workspace.js
index 3b1a4891e..cb72e1245 100644
--- a/CanvasApp/DesignSpace/Workspace/Workspace.js
+++ b/CanvasApp/DesignSpace/Workspace/Workspace.js
@@ -508,6 +508,16 @@ function newWorkspace () {
           referenceDetachNode(payload.node)
         }
         break
+      case 'Push Code to Javascript Code':
+        {
+          payload.node.javascriptCode.code = payload.node.code
+        }
+        break
+      case 'Fetch Code to Javascript Code':
+        {
+          payload.node.code = payload.node.javascriptCode.code
+        }
+        break
       case 'Open Documentation':
         {
           let definition = APP_SCHEMA_MAP.get(payload.node.type)
diff --git a/CanvasApp/FloatingSpace/ConditionEditor.js b/CanvasApp/FloatingSpace/ConditionEditor.js
index cb6c2662f..5b22ff07e 100644
--- a/CanvasApp/FloatingSpace/ConditionEditor.js
+++ b/CanvasApp/FloatingSpace/ConditionEditor.js
@@ -105,9 +105,6 @@ function newConditionEditor () {
   }
 
   function loadFromCode () {
-    if (thisObject.payload.node.javascriptCode !== undefined) {
-      thisObject.payload.node.code = thisObject.payload.node.javascriptCode.code
-    }
     if (thisObject.payload.node.code === undefined) { thisObject.payload.node.code = '' }
     conditionStructure.code = thisObject.payload.node.code.replace(/ /g, '')
 
@@ -621,10 +618,6 @@ function newConditionEditor () {
 
     thisObject.payload.node.code = code
 
-    if (thisObject.payload.node.javascriptCode !== undefined) {
-      thisObject.payload.node.javascriptCode.code = thisObject.payload.node.code
-    }
-
     function logicOperandToCode (logicOperand) {
       algebraOperandToCode(logicOperand.comparison.operandA.algebra.operandA)
       if (logicOperand.comparison.operandA.algebra.picker.getSelected() !== '...') {