fez5587/Superalgos
1
0 Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix Workspaces

Browse Source
This commit is contained in:
Luis Fernando Molina committed 2020-10-29 17:21:18 +01:00
1 parent 221cd70d53
commit c94f7fc747
5 files changed
+23 -17
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

BackendServers/webServer.js
+7 -2
View File
@@ -545,7 +545,7 @@ exports.newWebServer = function newWebServer(EVENTS_SERVER) {
let updatedFileList = []
for (let i = 0; i < fileList.length; i++) {
let name = 'Plugin \u2192 ' + fileList[i]
updatedFileList.push(name)
updatedFileList.push([project, name])
}
allWorkspaces = allWorkspaces.concat(updatedFileList)
projectsCount++
@@ -575,7 +575,12 @@ exports.newWebServer = function newWebServer(EVENTS_SERVER) {
respondWithContent(JSON.stringify(global.DEFAULT_FAIL_RESPONSE), response)
return
} else {
allWorkspaces = allWorkspaces.concat(fileList)
let updatedFileList = []
for (let i = 0; i < fileList.length; i++) {
let name = fileList[i]
updatedFileList.push(['', name])
}
allWorkspaces = allWorkspaces.concat(updatedFileList)
respondWithContent(JSON.stringify(allWorkspaces), response)
return
}
Integrations/Projects/Superalgos/Plugins/Workspaces/Exchange-Keys-Tests.json
+1 -1
View File
@@ -1 +1 @@
[object Promise]
{"type":"Workspace","name":"Exchange Keys Tests","rootNodes":[{"type":"Network","name":"My Network","project":"Superalgos","networkNodes":[{"type":"Network Node","name":"My Computer","config":"{ \n\"host\": \"localhost\", \n\"webPort\": \"34248\", \n\"webSocketsPort\": \"18041\"\n}","project":"Superalgos","dataMining":{"type":"Data Mining","name":"New Data Mining","project":"Superalgos","exchangeDataTasks":[{"type":"Exchange Data Tasks","name":"Binance","project":"Superalgos","marketDataTasks":[{"type":"Market Data Tasks","name":"Binance BTC/USDT","project":"Superalgos","dataMineTasks":[{"type":"Data Mine Tasks","name":"Masters","project":"Superalgos","taskManagers":[{"type":"Task Manager","name":"Masters","project":"Superalgos","tasks":[{"type":"Task","name":"Exchange Raw Data","project":"Superalgos","bot":{"type":"Sensor Bot Instance","name":"Exchange Raw Data","config":"{ \n\"startDate\": \"2017-01-01\"\n}","project":"Superalgos","processes":[{"type":"Sensor Process Instance","name":"Exchange Raw Data Historic-OHLCVs","project":"Superalgos","id":"f17f9567-af83-4292-a0dc-7c1c9dbf53b8","savedPayload":{"position":{"x":23993.925629940142,"y":29195.742554406977},"targetPosition":{"x":24261.227587196652,"y":29331.93970432884},"floatingObject":{"isPinned":false,"isFrozen":false,"isCollapsed":false,"angleToParent":3,"distanceToParent":3,"arrangementStyle":0},"uiObject":{"isRunning":false},"referenceParent":{"type":"Process Definition","name":"Historic-OHLCVs","id":"5eb11d6a-022e-4f60-97c4-d6cf90b249dc"}}}],"id":"9eaa4440-c8bc-4daa-b858-efa1845087de","savedPayload":{"position":{"x":24261.227587196652,"y":29331.93970432884},"targetPosition":{"x":24528.529544453162,"y":29468.136854250704},"floatingObject":{"isPinned":false,"isFrozen":false,"isCollapsed":false,"angleToParent":2,"distanceToParent":3,"arrangementStyle":0},"uiObject":{"isRunning":false}}},"id":"97e5a05e-9463-41a4-8255-a9487df56496","savedPayload":{"position":{"x":24528.529544453162,"y":29468.136854250704},"targetPosition":{"x":24795.831501709672,"y":29604.334004172568},"floatingObject":{"isPinned":false,"isFrozen":false,"isCollapsed":false,"angleToParent":2,"distanceToParent":3,"arrangementStyle":0},"uiObject":{"isRunning":false}}},{"type":"Task","name":"Candles Volumes","project":"Superalgos","bot":{"type":"Indicator Bot Instance","name":"Candles Volumes","config":"{}","project":"Superalgos","processes":[{"type":"Indicator Process Instance","name":"Candles Volumes Multi-Period-Market","project":"Superalgos","id":"1ef6762d-a20c-46e0-8183-6aac6dd9073a","savedPayload":{"position":{"x":24447.0295945802,"y":28782.09892401185},"targetPosition":{"x":24610.421305084707,"y":29033.700094395477},"floatingObject":{"isPinned":false,"isFrozen":false,"isCollapsed":false,"angleToParent":3,"distanceToParent":3,"arrangementStyle":0},"uiObject":{"isRunning":false},"referenceParent":{"type":"Process Definition","name":"Multi-Period-Market","id":"9f683143-a33f-42c1-9fa8-c601f01ee4e1"}}},{"type":"Indicator Process Instance","name":"Candles Volumes Multi-Period-Daily","project":"Superalgos","id":"7b44275e-9446-4807-b9c2-4ba1107a5295","savedPayload":{"position":{"x":24594.720518211823,"y":28734.111233969106},"targetPosition":{"x":24610.421305084707,"y":29033.700094395477},"floatingObject":{"isPinned":false,"isFrozen":false,"isCollapsed":false,"angleToParent":3,"distanceToParent":3,"arrangementStyle":0},"uiObject":{"isRunning":false},"referenceParent":{"type":"Process Definition","name":"Multi-Period-Daily","id":"980ceb1d-7be6-454f-90d9-01ba1fd4a65d"}}}],"id":"78c835ef-be5b-4e74-8b0c-610afbbef304","savedPayload":{"position":{"x":24610.421305084707,"y":29033.700094395477},"targetPosition":{"x":24703.12640339719,"y":29319.017049284023},"floatingObject":{"isPinned":false,"isFrozen":false,"isCollapsed":false,"angleToParent":2,"distanceToParent":3,"arrangementStyle":0},"uiObject":{"isRunning":false}}},"id":"b4da2db7-fcae-4918-b38a-5e6966a9994b","savedPayload":{"position":{"x":24703.12640339719,"y":29319.017049284023},"targetPosition":{"x":24795.831501709672,"y":29604.334004172568},"floatingObject":{"isPinned":false,"isFrozen":false,"isCollapsed":false,"angleToParent":2,"distanceToParent":3,"arrangementStyle":0},"uiObject":{"isRunning":false}}},{"type":"Task","name":"Bollinger Bands","project":"Superalgos","bot":{"type":"Indicator Bot Instance","name":"Bollinger Bands","config":"{}","project":"Superalgos","processes":[{"type":"Indicator Process Instance","name":"Bollinger Bands Multi-Period-Market","project":"Superalgos","id":"22a8694f-078e-4f1f-8470-7a7b25237397","savedPayload":{"position":{"x":25130.599308798726,"y":28776.285809439407},"targetPosition":{"x":25068.2258015534,"y":29069.730089659548},"floatingObject":{"isPinned":false,"isFrozen":false,"isCollapsed":false,"angleToParent":3,"distanceToParent":3,"arrangementStyle":0},"uiObject":{"isRunning":false},"referenceParent":{"type":"Process Definition","name":"Multi-Period-Market","id":"941a0543-0cc0-4a5d-a782-728d2835c100"}}}Line truncated
Integrations/Projects/Superalgos/Spaces/Design-Space/Workspace.js
+10 -10
View File
@@ -15,7 +15,7 @@ function newWorkspace() {
save: saveWorkspace,
backup: backupWorkspace,
share: shareWorkspace,
getProjectsHeads: getProjectsHeads,
getProjectsHeads: getProjectsHeads,
getHierarchyHeads: getHierarchyHeads,
getHierarchyHeadsById: getHierarchyHeadsById,
getHierarchyHeadsByType: getHierarchyHeadsByType,
@@ -187,16 +187,16 @@ function newWorkspace() {
}
}
function backupWorkspace(action) {
let text = stringifyWorkspace(false)
async function backupWorkspace(action) {
let text = await stringifyWorkspace(false)
let fileName = 'Backup - ' + action.node.type + ' - ' + action.node.name + '.json'
if (text !== undefined) {
UI.projects.superalgos.utilities.download.downloadText(fileName, text)
}
}
function shareWorkspace(action) {
let text = stringifyWorkspace(true)
async function shareWorkspace(action) {
let text = await stringifyWorkspace(true)
let fileName = 'Share - ' + action.node.type + ' - ' + action.node.name + '.json'
if (text !== undefined) {
UI.projects.superalgos.utilities.download.downloadText(fileName, text)
@@ -398,12 +398,12 @@ function newWorkspace() {
}
}
function replaceWorkspaceByLoadingOne(name) {
function replaceWorkspaceByLoadingOne(project, name) {
let webCommand
if (name.indexOf('Plugin \u2192 ') >= 0) {
if (project !== "") {
name = name.replace('Plugin \u2192 ', '')
webCommand = 'LoadPlugin' + '/' + 'Superalgos' + '/' + 'Workspaces' + '/' + name + '.json'
webCommand = 'LoadPlugin' + '/' + project + '/' + 'Workspaces' + '/' + name + '.json'
} else {
webCommand = 'LoadMyWorkspace' + '/' + name
}
@@ -449,11 +449,11 @@ function newWorkspace() {
workingAtTask = 1
return
}
/* It does not exist, so we recreeate it respecting the inner state of each object. */
let positionOffset = {
x: spawnPosition.x,
y: spawnPosition.y
y: spawnPosition.y
}
if (droppedNode.savedPayload !== undefined) {
Integrations/Projects/Superalgos/Spaces/Side-Space/ListItem.js
+2 -2
View File
@@ -69,7 +69,7 @@ function newListItem() {
}
function onMouseClick(event) {
UI.projects.superalgos.spaces.designSpace.workspace.replaceWorkspaceByLoadingOne(name)
UI.projects.superalgos.spaces.designSpace.workspace.replaceWorkspaceByLoadingOne(project, name)
}
function physics() {
@@ -77,7 +77,7 @@ function newListItem() {
}
function draw() {
let icon = UI.projects.superalgos.spaces.designSpace.getIconByProjectAndType(project, type)
let icon = UI.projects.superalgos.spaces.designSpace.getIconByProjectAndType('Superalgos', type)
let backgroundColor = UI_COLOR.BLACK
let labelColor
Integrations/Projects/Superalgos/Spaces/Side-Space/ListView.js
+3 -2
View File
@@ -101,9 +101,10 @@ function newListView() {
let workspacelist = JSON.parse(text)
thisObject.listItems = []
for (let i = 0; i < workspacelist.length; i++) {
let workspace = workspacelist[i].replace('.json', '')
let project = workspacelist[i][0]
let workspace = workspacelist[i][1].replace('.json', '')
let listItem = newListItem()
listItem.initialize(workspace, 'Superalgos', 'Workspace')
listItem.initialize(workspace, project, 'Workspace')
listItem.container.connectToParent(thisObject.container, false, false)
thisObject.listItems.push(listItem)