Refactoring to Task Manager
This commit is contained in:
1 parent
e7fb4dc54b
commit
c35e587d18
11 files changed
+100
-100
No files matched your search
@@ -262,7 +262,7 @@ function newStrategyPart () {
|
||||
compatibleType = '->' + 'Task'
|
||||
compatibleSubType = undefined
|
||||
break
|
||||
case 'Bot Process':
|
||||
case 'Process':
|
||||
compatibleType = '->' + 'Sensor' + '->' + 'Indicator' + '->' + 'Trading Engine'
|
||||
compatibleSubType = undefined
|
||||
break
|
||||
@@ -369,7 +369,7 @@ function newStrategyPart () {
|
||||
if (thisObject.payload.node.type === 'Sensor' && nearbyNode.bot !== undefined) { continue }
|
||||
if (thisObject.payload.node.type === 'Indicator' && nearbyNode.bot !== undefined) { continue }
|
||||
if (thisObject.payload.node.type === 'Trading Engine' && nearbyNode.bot !== undefined) { continue }
|
||||
if (thisObject.payload.node.type === 'Bot Process' && nearbyNode.botProcess !== undefined) { continue }
|
||||
if (thisObject.payload.node.type === 'Process' && nearbyNode.process !== undefined) { continue }
|
||||
if (thisObject.payload.node.type === 'Trading System' && nearbyNode.tradingSystem !== undefined) { continue }
|
||||
if (thisObject.payload.node.type === 'Personal Data' && nearbyNode.personalData !== undefined) { continue }
|
||||
if (thisObject.payload.node.type === 'Parameters' && nearbyNode.parameters !== undefined) { continue }
|
||||
|
||||
@@ -469,11 +469,11 @@ function newStrategyPartConstructor () {
|
||||
addLeftIcons(menuItemsInitialValues, floatingObject)
|
||||
menuItemsInitialValues.push(
|
||||
{
|
||||
action: 'Add Bot Process',
|
||||
action: 'Add Process',
|
||||
actionFunction: payload.onMenuItemClick,
|
||||
label: 'Add Bot Process',
|
||||
label: 'Add Process',
|
||||
visible: false,
|
||||
relatedStrategyPart: 'Bot Process',
|
||||
relatedStrategyPart: 'Process',
|
||||
rawRadius: 8,
|
||||
targetRadius: 0,
|
||||
currentRadius: 0,
|
||||
@@ -516,11 +516,11 @@ function newStrategyPartConstructor () {
|
||||
addLeftIcons(menuItemsInitialValues, floatingObject)
|
||||
menuItemsInitialValues.push(
|
||||
{
|
||||
action: 'Add Bot Process',
|
||||
action: 'Add Process',
|
||||
actionFunction: payload.onMenuItemClick,
|
||||
label: 'Add Bot Process',
|
||||
label: 'Add Process',
|
||||
visible: false,
|
||||
relatedStrategyPart: 'Bot Process',
|
||||
relatedStrategyPart: 'Process',
|
||||
rawRadius: 8,
|
||||
targetRadius: 0,
|
||||
currentRadius: 0,
|
||||
@@ -563,11 +563,11 @@ function newStrategyPartConstructor () {
|
||||
addLeftIcons(menuItemsInitialValues, floatingObject)
|
||||
menuItemsInitialValues.push(
|
||||
{
|
||||
action: 'Add Bot Process',
|
||||
action: 'Add Process',
|
||||
actionFunction: payload.onMenuItemClick,
|
||||
label: 'Add Bot Process',
|
||||
label: 'Add Process',
|
||||
visible: false,
|
||||
relatedStrategyPart: 'Bot Process',
|
||||
relatedStrategyPart: 'Process',
|
||||
rawRadius: 8,
|
||||
targetRadius: 0,
|
||||
currentRadius: 0,
|
||||
@@ -606,7 +606,7 @@ function newStrategyPartConstructor () {
|
||||
)
|
||||
break
|
||||
}
|
||||
case 'Bot Process': {
|
||||
case 'Process': {
|
||||
strategyPart.codeEditor = newCodeEditor()
|
||||
strategyPart.codeEditor.isVisibleFunction = strategyPart.isVisibleFunction
|
||||
strategyPart.codeEditor.initialize()
|
||||
@@ -615,9 +615,9 @@ function newStrategyPartConstructor () {
|
||||
addLeftIcons(menuItemsInitialValues, floatingObject)
|
||||
menuItemsInitialValues.push(
|
||||
{
|
||||
action: 'Edit Bot Process',
|
||||
action: 'Edit Process',
|
||||
actionFunction: strategyPart.codeEditor.activate,
|
||||
label: 'Edit Bot Process',
|
||||
label: 'Edit Process',
|
||||
visible: false,
|
||||
iconPathOn: 'html',
|
||||
iconPathOff: 'html',
|
||||
@@ -630,11 +630,11 @@ function newStrategyPartConstructor () {
|
||||
)
|
||||
menuItemsInitialValues.push(
|
||||
{
|
||||
action: 'Delete Bot Process',
|
||||
action: 'Delete Process',
|
||||
askConfirmation: true,
|
||||
confirmationLabel: 'Confirm to Delete',
|
||||
actionFunction: payload.onMenuItemClick,
|
||||
label: 'Delete Bot Process',
|
||||
label: 'Delete Process',
|
||||
visible: false,
|
||||
iconPathOn: 'delete',
|
||||
iconPathOff: 'delete',
|
||||
@@ -2160,7 +2160,7 @@ function newStrategyPartConstructor () {
|
||||
level_3()
|
||||
break
|
||||
}
|
||||
case 'Bot Process': {
|
||||
case 'Process': {
|
||||
level_4()
|
||||
break
|
||||
}
|
||||
|
||||
@@ -67,7 +67,7 @@ function newStrategyPartTitle () {
|
||||
case 'Trading Engine': {
|
||||
break
|
||||
}
|
||||
case 'Bot Process': {
|
||||
case 'Process': {
|
||||
break
|
||||
}
|
||||
case 'Personal Data': {
|
||||
|
||||
@@ -45,7 +45,7 @@ function newStrategySpace () {
|
||||
['Sensor', 'pipette'],
|
||||
['Indicator', 'vector'],
|
||||
['Trading Engine', 'brainstorming'],
|
||||
['Bot Process', 'grid'],
|
||||
['Process', 'grid'],
|
||||
['Personal Data', 'security'],
|
||||
['Exchange Account', 'approve'],
|
||||
['Exchange Account Asset', 'paper-plane'],
|
||||
|
||||
@@ -74,8 +74,8 @@ function newAttachDetach () {
|
||||
completeDetachment(node, rootNodes)
|
||||
return
|
||||
}
|
||||
case 'Bot Process': {
|
||||
node.payload.parentNode.botProcess = undefined
|
||||
case 'Process': {
|
||||
node.payload.parentNode.process = undefined
|
||||
completeDetachment(node, rootNodes)
|
||||
return
|
||||
}
|
||||
@@ -283,10 +283,10 @@ function newAttachDetach () {
|
||||
completeAttachment(node, rootNodes)
|
||||
}
|
||||
break
|
||||
case 'Bot Process': {
|
||||
case 'Process': {
|
||||
node.payload.parentNode = attachToNode
|
||||
node.payload.chainParent = attachToNode
|
||||
node.payload.parentNode.botProcesses.push(node)
|
||||
node.payload.parentNode.processes.push(node)
|
||||
completeAttachment(node, rootNodes)
|
||||
}
|
||||
break
|
||||
|
||||
@@ -26,8 +26,8 @@ function newNodeChildren () {
|
||||
case 'Trading Engine': {
|
||||
return countChildrenTradingEngine(parentNode, childNode)
|
||||
}
|
||||
case 'Bot Process': {
|
||||
return countChildrenBotProcess(parentNode, childNode)
|
||||
case 'Process': {
|
||||
return countChildrenProcess(parentNode, childNode)
|
||||
}
|
||||
case 'Personal Data': {
|
||||
return countChildrenPersonalData(parentNode, childNode)
|
||||
@@ -190,8 +190,8 @@ function newNodeChildren () {
|
||||
childIndex: undefined
|
||||
}
|
||||
|
||||
for (let i = 0; i < parentNode.botProcesses.length; i++) {
|
||||
let child = parentNode.botProcesses[i]
|
||||
for (let i = 0; i < parentNode.processes.length; i++) {
|
||||
let child = parentNode.processes[i]
|
||||
response.childrenCount++
|
||||
if (child.id === childNode.id) {
|
||||
response.childIndex = response.childrenCount
|
||||
@@ -206,8 +206,8 @@ function newNodeChildren () {
|
||||
childIndex: undefined
|
||||
}
|
||||
|
||||
for (let i = 0; i < parentNode.botProcesses.length; i++) {
|
||||
let child = parentNode.botProcesses[i]
|
||||
for (let i = 0; i < parentNode.processes.length; i++) {
|
||||
let child = parentNode.processes[i]
|
||||
response.childrenCount++
|
||||
if (child.id === childNode.id) {
|
||||
response.childIndex = response.childrenCount
|
||||
@@ -222,8 +222,8 @@ function newNodeChildren () {
|
||||
childIndex: undefined
|
||||
}
|
||||
|
||||
for (let i = 0; i < parentNode.botProcesses.length; i++) {
|
||||
let child = parentNode.botProcesses[i]
|
||||
for (let i = 0; i < parentNode.processes.length; i++) {
|
||||
let child = parentNode.processes[i]
|
||||
response.childrenCount++
|
||||
if (child.id === childNode.id) {
|
||||
response.childIndex = response.childrenCount
|
||||
@@ -232,7 +232,7 @@ function newNodeChildren () {
|
||||
return response
|
||||
}
|
||||
|
||||
function countChildrenBotProcess (parentNode, childNode) {
|
||||
function countChildrenProcess (parentNode, childNode) {
|
||||
let response = {
|
||||
childrenCount: 0,
|
||||
childIndex: undefined
|
||||
|
||||
@@ -6,7 +6,7 @@ function newNodeDeleter () {
|
||||
deleteSensor: deleteBot,
|
||||
deleteIndicator: deleteBot,
|
||||
deleteTradingEngine: deleteBot,
|
||||
deleteBotProcess: deleteBotProcess,
|
||||
deleteProcess: deleteProcess,
|
||||
deletePersonalData: deletePersonalData,
|
||||
deleteExchangeAccount: deleteExchangeAccount,
|
||||
deleteExchangeAccountAsset: deleteExchangeAccountAsset,
|
||||
@@ -72,8 +72,8 @@ function newNodeDeleter () {
|
||||
deleteBot(rootNode, rootNodes)
|
||||
break
|
||||
}
|
||||
case 'Bot Process': {
|
||||
deleteBotProcess(rootNode, rootNodes)
|
||||
case 'Process': {
|
||||
deleteProcess(rootNode, rootNodes)
|
||||
break
|
||||
}
|
||||
case 'Personal Data': {
|
||||
@@ -265,21 +265,21 @@ function newNodeDeleter () {
|
||||
if (payload.parentNode !== undefined) {
|
||||
payload.parentNode.bot = undefined
|
||||
}
|
||||
while (node.botProcesses.length > 0) {
|
||||
deleteBotProcess(node.botProcesses[0], rootNodes)
|
||||
while (node.processes.length > 0) {
|
||||
deleteProcess(node.processes[0], rootNodes)
|
||||
}
|
||||
completeDeletion(node, rootNodes)
|
||||
destroyPart(node)
|
||||
cleanNode(node)
|
||||
}
|
||||
|
||||
function deleteBotProcess (node, rootNodes) {
|
||||
function deleteProcess (node, rootNodes) {
|
||||
let payload = node.payload
|
||||
if (payload.parentNode !== undefined) {
|
||||
for (let j = 0; j < payload.parentNode.botProcesses.length; j++) {
|
||||
let task = payload.parentNode.botProcesses[j]
|
||||
for (let j = 0; j < payload.parentNode.processes.length; j++) {
|
||||
let task = payload.parentNode.processes[j]
|
||||
if (task.id === node.id) {
|
||||
payload.parentNode.botProcesses.splice(j, 1)
|
||||
payload.parentNode.processes.splice(j, 1)
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -6,7 +6,7 @@ function newPartsFromNodes () {
|
||||
addSensor: addSensor,
|
||||
addIndicator: addIndicator,
|
||||
addTradingEngine: addTradingEngine,
|
||||
addBotProcess: addBotProcess,
|
||||
addProcess: addProcess,
|
||||
addTradingSystem: addTradingSystem,
|
||||
addPersonalData: addPersonalData,
|
||||
addExchangeAccount: addExchangeAccount,
|
||||
@@ -355,30 +355,30 @@ function newPartsFromNodes () {
|
||||
}
|
||||
case 'Sensor': {
|
||||
createPart('Sensor', node.name, node, parentNode, chainParent, 'Sensor')
|
||||
for (let m = 0; m < node.botProcesses.length; m++) {
|
||||
let botProcess = node.botProcesses[m]
|
||||
createPartFromNode(botProcess, node, node)
|
||||
for (let m = 0; m < node.processes.length; m++) {
|
||||
let process = node.processes[m]
|
||||
createPartFromNode(process, node, node)
|
||||
}
|
||||
return
|
||||
}
|
||||
case 'Indicator': {
|
||||
createPart('Indicator', node.name, node, parentNode, chainParent, 'Indicator')
|
||||
for (let m = 0; m < node.botProcesses.length; m++) {
|
||||
let botProcess = node.botProcesses[m]
|
||||
createPartFromNode(botProcess, node, node)
|
||||
for (let m = 0; m < node.processes.length; m++) {
|
||||
let process = node.processes[m]
|
||||
createPartFromNode(process, node, node)
|
||||
}
|
||||
return
|
||||
}
|
||||
case 'Trading Engine': {
|
||||
createPart('Trading Engine', node.name, node, parentNode, chainParent, 'Trading Engine')
|
||||
for (let m = 0; m < node.botProcesses.length; m++) {
|
||||
let botProcess = node.botProcesses[m]
|
||||
createPartFromNode(botProcess, node, node)
|
||||
for (let m = 0; m < node.processes.length; m++) {
|
||||
let process = node.processes[m]
|
||||
createPartFromNode(process, node, node)
|
||||
}
|
||||
return
|
||||
}
|
||||
case 'Bot Process': {
|
||||
createPart('Bot Process', node.name, node, parentNode, chainParent, 'Bot Process')
|
||||
case 'Process': {
|
||||
createPart('Process', node.name, node, parentNode, chainParent, 'Process')
|
||||
return
|
||||
}
|
||||
}
|
||||
@@ -408,7 +408,7 @@ function newPartsFromNodes () {
|
||||
function addSensor (node) {
|
||||
if (node.bot === undefined) {
|
||||
node.bot = {
|
||||
botProcesses: []
|
||||
processes: []
|
||||
}
|
||||
createPart('Sensor', '', node.bot, node, node)
|
||||
}
|
||||
@@ -418,7 +418,7 @@ function newPartsFromNodes () {
|
||||
function addIndicator (node) {
|
||||
if (node.bot === undefined) {
|
||||
node.bot = {
|
||||
botProcesses: []
|
||||
processes: []
|
||||
}
|
||||
createPart('Indicator', '', node.bot, node, node)
|
||||
}
|
||||
@@ -428,22 +428,22 @@ function newPartsFromNodes () {
|
||||
function addTradingEngine (node) {
|
||||
if (node.bot === undefined) {
|
||||
node.bot = {
|
||||
botProcesses: []
|
||||
processes: []
|
||||
}
|
||||
createPart('Trading Engine', '', node.bot, node, node)
|
||||
}
|
||||
return node.bot
|
||||
}
|
||||
|
||||
function addBotProcess (node) {
|
||||
let botProcess = {
|
||||
name: 'New Bot Process',
|
||||
function addProcess (node) {
|
||||
let process = {
|
||||
name: 'New Process',
|
||||
code: '// Write the configuration here.'
|
||||
}
|
||||
node.botProcesses.push(botProcess)
|
||||
createPart('Bot Process', botProcess.name, botProcess, node, node, 'Bot Process')
|
||||
node.processes.push(process)
|
||||
createPart('Process', process.name, process, node, node, 'Process')
|
||||
|
||||
return botProcess
|
||||
return process
|
||||
}
|
||||
|
||||
function addTradingSystem (node) {
|
||||
|
||||
@@ -388,12 +388,12 @@ function newProtocolNode () {
|
||||
type: node.type,
|
||||
subType: node.subType,
|
||||
name: node.name,
|
||||
botProcesses: []
|
||||
processes: []
|
||||
}
|
||||
|
||||
for (let m = 0; m < node.botProcesses.length; m++) {
|
||||
let botProcess = getProtocolNode(node.botProcesses[m], removePersonalData, parseJSONStrings)
|
||||
bot.botProcesses.push(botProcess)
|
||||
for (let m = 0; m < node.processes.length; m++) {
|
||||
let process = getProtocolNode(node.processes[m], removePersonalData, parseJSONStrings)
|
||||
bot.processes.push(process)
|
||||
}
|
||||
return bot
|
||||
}
|
||||
@@ -402,12 +402,12 @@ function newProtocolNode () {
|
||||
type: node.type,
|
||||
subType: node.subType,
|
||||
name: node.name,
|
||||
botProcesses: []
|
||||
processes: []
|
||||
}
|
||||
|
||||
for (let m = 0; m < node.botProcesses.length; m++) {
|
||||
let botProcess = getProtocolNode(node.botProcesses[m], removePersonalData, parseJSONStrings)
|
||||
bot.botProcesses.push(botProcess)
|
||||
for (let m = 0; m < node.processes.length; m++) {
|
||||
let process = getProtocolNode(node.processes[m], removePersonalData, parseJSONStrings)
|
||||
bot.processes.push(process)
|
||||
}
|
||||
return bot
|
||||
}
|
||||
@@ -416,16 +416,16 @@ function newProtocolNode () {
|
||||
type: node.type,
|
||||
subType: node.subType,
|
||||
name: node.name,
|
||||
botProcesses: []
|
||||
processes: []
|
||||
}
|
||||
|
||||
for (let m = 0; m < node.botProcesses.length; m++) {
|
||||
let botProcess = getProtocolNode(node.botProcesses[m], removePersonalData, parseJSONStrings)
|
||||
bot.botProcesses.push(botProcess)
|
||||
for (let m = 0; m < node.processes.length; m++) {
|
||||
let process = getProtocolNode(node.processes[m], removePersonalData, parseJSONStrings)
|
||||
bot.processes.push(process)
|
||||
}
|
||||
return bot
|
||||
}
|
||||
case 'Bot Process': {
|
||||
case 'Process': {
|
||||
let object = {
|
||||
type: node.type,
|
||||
subType: node.subType,
|
||||
|
||||
@@ -459,13 +459,13 @@ function newStringifyNode () {
|
||||
type: node.type,
|
||||
subType: node.subType,
|
||||
name: node.name,
|
||||
botProcesses: [],
|
||||
processes: [],
|
||||
savedPayload: getSavedPayload(node)
|
||||
}
|
||||
|
||||
for (let m = 0; m < node.botProcesses.length; m++) {
|
||||
let botProcess = prepareForStringify(node.botProcesses[m], removePersonalData)
|
||||
bot.botProcesses.push(botProcess)
|
||||
for (let m = 0; m < node.processes.length; m++) {
|
||||
let process = prepareForStringify(node.processes[m], removePersonalData)
|
||||
bot.processes.push(process)
|
||||
}
|
||||
|
||||
return bot
|
||||
@@ -476,13 +476,13 @@ function newStringifyNode () {
|
||||
type: node.type,
|
||||
subType: node.subType,
|
||||
name: node.name,
|
||||
botProcesses: [],
|
||||
processes: [],
|
||||
savedPayload: getSavedPayload(node)
|
||||
}
|
||||
|
||||
for (let m = 0; m < node.botProcesses.length; m++) {
|
||||
let botProcess = prepareForStringify(node.botProcesses[m], removePersonalData)
|
||||
bot.botProcesses.push(botProcess)
|
||||
for (let m = 0; m < node.processes.length; m++) {
|
||||
let process = prepareForStringify(node.processes[m], removePersonalData)
|
||||
bot.processes.push(process)
|
||||
}
|
||||
|
||||
return bot
|
||||
@@ -493,18 +493,18 @@ function newStringifyNode () {
|
||||
type: node.type,
|
||||
subType: node.subType,
|
||||
name: node.name,
|
||||
botProcesses: [],
|
||||
processes: [],
|
||||
savedPayload: getSavedPayload(node)
|
||||
}
|
||||
|
||||
for (let m = 0; m < node.botProcesses.length; m++) {
|
||||
let botProcess = prepareForStringify(node.botProcesses[m], removePersonalData)
|
||||
bot.botProcesses.push(botProcess)
|
||||
for (let m = 0; m < node.processes.length; m++) {
|
||||
let process = prepareForStringify(node.processes[m], removePersonalData)
|
||||
bot.processes.push(process)
|
||||
}
|
||||
|
||||
return bot
|
||||
}
|
||||
case 'Bot Process': {
|
||||
case 'Process': {
|
||||
let object = {
|
||||
id: node.id,
|
||||
type: node.type,
|
||||
|
||||
@@ -213,11 +213,11 @@ function newWorkspace () {
|
||||
{
|
||||
/* Check if it is possible to Run or not */
|
||||
if (payload.node.bot === undefined) { return }
|
||||
if (payload.node.bot.botProcesses.length === 0) { return }
|
||||
if (payload.node.bot.processes.length === 0) { return }
|
||||
|
||||
for (let i = 0; i < payload.node.bot.botProcesses.length; i++) {
|
||||
let botProcess = payload.node.bot.botProcesses[i]
|
||||
botProcess.payload.uiObject.play()
|
||||
for (let i = 0; i < payload.node.bot.processes.length; i++) {
|
||||
let process = payload.node.bot.processes[i]
|
||||
process.payload.uiObject.play()
|
||||
}
|
||||
|
||||
payload.uiObject.play()
|
||||
@@ -239,11 +239,11 @@ function newWorkspace () {
|
||||
payload.uiObject.stop()
|
||||
|
||||
if (payload.node.bot === undefined) { return }
|
||||
if (payload.node.bot.botProcesses.length === 0) { return }
|
||||
if (payload.node.bot.processes.length === 0) { return }
|
||||
|
||||
for (let i = 0; i < payload.node.bot.botProcesses.length; i++) {
|
||||
let botProcess = payload.node.bot.botProcesses[i]
|
||||
botProcess.payload.uiObject.stop()
|
||||
for (let i = 0; i < payload.node.bot.processes.length; i++) {
|
||||
let process = payload.node.bot.processes[i]
|
||||
process.payload.uiObject.stop()
|
||||
}
|
||||
}
|
||||
break
|
||||
@@ -272,9 +272,9 @@ function newWorkspace () {
|
||||
functionLibraryPartsFromNodes.addTradingEngine(payload.node)
|
||||
}
|
||||
break
|
||||
case 'Add Bot Process':
|
||||
case 'Add Process':
|
||||
{
|
||||
functionLibraryPartsFromNodes.addBotProcess(payload.node)
|
||||
functionLibraryPartsFromNodes.addProcess(payload.node)
|
||||
}
|
||||
break
|
||||
case 'Add Strategy':
|
||||
@@ -397,8 +397,8 @@ function newWorkspace () {
|
||||
functionLibraryNodeDeleter.deleteTradingEngine(payload.node, workspaceNode.rootNodes)
|
||||
break
|
||||
}
|
||||
case 'Delete Bot Process': {
|
||||
functionLibraryNodeDeleter.deleteBotProcess(payload.node, workspaceNode.rootNodes)
|
||||
case 'Delete Process': {
|
||||
functionLibraryNodeDeleter.deleteProcess(payload.node, workspaceNode.rootNodes)
|
||||
break
|
||||
}
|
||||
case 'Delete Trading System': {
|
||||
|
||||
Reference in new issue
Block a user