diff --git a/Projects/Ethereum/Schemas/AppSchema.json b/Projects/Ethereum/Schemas/AppSchema.json index ad90b8aee..f71bce7c7 100644 --- a/Projects/Ethereum/Schemas/AppSchema.json +++ b/Projects/Ethereum/Schemas/AppSchema.json @@ -2,29 +2,21 @@ { "type": "Ethereum", "menuItems": [ - { - "action": "Pin / Unpin", - "currentStatus": true, - "iconPathOn": "unpinned", - "iconPathOff": "pinned", - "actionFunction": "payload.executeAction", - "ring": 1 - }, { "action": "Add UI Object", - "label": "Add Network", - "relatedUiObject": "Network", + "label": "Add Ethereum Network", + "relatedUiObject": "Ethereum Network", "actionFunction": "payload.executeAction" } ], "isHProjectHead": true, "isTitleAllwaysVisible": true, - "addLeftIcons": false, + "addLeftIcons": true, "isPinned": true, "positionLocked": true }, { - "type": "Network", + "type": "Ethereum Network", "menuItems": [ { "action": "Add UI Object", @@ -51,7 +43,8 @@ "type": "array", "childType": "Network Node" } - ] + ], + "icon": "ethereum" }, { "type": "Network Node", @@ -80,13 +73,13 @@ "initialValues": { "config": "{ \n\"host\": \"localhost\", \n\"webPort\": \"34248\", \n\"webSocketsPort\": \"8081\"\n}" }, - "isTitleAllwaysVisible": true, "addLeftIcons": true, "level": 1, "chainAttachesTo": { - "compatibleTypes": "->Network->" + "compatibleTypes": "->Ethereum Network->" }, - "propertyNameAtParent": "networkNodes" + "propertyNameAtParent": "networkNodes", + "icon": "ethereum" }, { "type": "Ethereum Project", @@ -116,6 +109,7 @@ "type": "array", "childType": "Network Node" } - ] + ], + "icon": "ethereum" } ] \ No newline at end of file diff --git a/Projects/Superalgos/Function-Libraries/ActionSwitch.js b/Projects/Superalgos/Function-Libraries/ActionSwitch.js index e3aa5e03c..d6b1d3000 100644 --- a/Projects/Superalgos/Function-Libraries/ActionSwitch.js +++ b/Projects/Superalgos/Function-Libraries/ActionSwitch.js @@ -113,7 +113,7 @@ function newSuperalgosActionSwitch() { break case 'Add UI Object': { - functionLibraryUiObjectsFromNodes.addUIObject(action.node, action.relatedNodeType) + functionLibraryUiObjectsFromNodes.addUIObject(action.node, action.relatedNodeType, action.rootNodes) } break case 'Add Missing Children': @@ -126,24 +126,6 @@ function newSuperalgosActionSwitch() { functionLibraryNodeDeleter.deleteUIObject(action.node, action.rootNodes) } break - case 'Share Workspace': - { - let text = stringifyWorkspace(true) - let fileName = 'Share - ' + action.node.type + ' - ' + action.node.name + '.json' - if (text !== undefined) { - downloadText(fileName, text) - } - } - break - case 'Backup Workspace': - { - let text = stringifyWorkspace(false) - let fileName = 'Backup - ' + action.node.type + ' - ' + action.node.name + '.json' - if (text !== undefined) { - downloadText(fileName, text) - } - } - break case 'Edit Code': break diff --git a/Projects/Superalgos/Function-Libraries/UiObjectsFromNodes.js b/Projects/Superalgos/Function-Libraries/UiObjectsFromNodes.js index a9d3027dd..a47963a19 100644 --- a/Projects/Superalgos/Function-Libraries/UiObjectsFromNodes.js +++ b/Projects/Superalgos/Function-Libraries/UiObjectsFromNodes.js @@ -320,7 +320,7 @@ function newUiObjectsFromNodes() { } } - function addUIObject(parentNode, type) { + function addUIObject(parentNode, type, rootNodes) { let object = { name: 'New ' + type, type: type, @@ -351,7 +351,7 @@ function newUiObjectsFromNodes() { } if (nodeDefinition.isHierarchyHead === true) { - parentNode.rootNodes.push(object) + rootNodes.push(object) createUiObject(true, object.type, object.name, object, parentNode, undefined) return object } diff --git a/Projects/Superalgos/Schemas/AppSchema.json b/Projects/Superalgos/Schemas/AppSchema.json index 836bcae28..0654ab54a 100644 --- a/Projects/Superalgos/Schemas/AppSchema.json +++ b/Projects/Superalgos/Schemas/AppSchema.json @@ -1392,17 +1392,15 @@ "ring": 1 }, { - "action": "Share Workspace", "iconPathOn": "share", "iconPathOff": "share", - "actionFunction": "payload.executeAction", + "actionFunction": "canvas.designSpace.workspace.share", "ring": 1 }, { - "action": "Backup Workspace", "iconPathOn": "backup", "iconPathOff": "backup", - "actionFunction": "payload.executeAction", + "actionFunction": "canvas.designSpace.workspace.backup", "ring": 1 }, {