Improvement on conditions editor

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,

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)

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() !== '...') {