Merge pull request #208 from Superalgos/develop

Beta SP2

.env

@@ -17,10 +17,10 @@ DATA_MINES_PATH=./Data-Mines
 TRADING_SYSTEMS_PATH=./Trading-Systems
 SUPER_SCRIPTS_PATH=./Super-Scripts
 
-USE_KEYVAULT=false
 WRITE_LOGS_TO_FILES=true
 BOTS_PATH=./Legacy-Code
 LOG_PATH=./Log-Files
+WEB_SERVER_URL=localhost
 
 # WEB SERVER VARIABLES:
 
@@ -29,16 +29,9 @@ CONSOLE_LOG=false
 CONSOLE_ERROR_LOG=true
 LOG_FILE_CONTENT=false
 
-# Server commands
-REINITIALIZE_COMMAND=sdnacGYGdw756dnxasxbGGGjsdbd5576576gfdsxgvbnFFF
-
 PATH_TO_CANVAS_APP=./CanvasApp
 PATH_TO_FILES_COMPONENT=./Files-Component/src
-PATH_TO_WEB_SERVER=./WebServer/
+PATH_TO_WEB_SERVER=./BackendServers/
 
 APP_SCHEMA_PATH=./
 WORKSPACE_PATH=./
-
-GATEWAY_ENDPOINT=https://demo-api-dev.superalgos.org/graphql
-
-

AppSchema.json

@@ -683,6 +683,9 @@
         "chainAttachesTo": {
             "compatibleTypes": "->Polygon->"
         },
+        "title": [
+            "Use Reference Parent"
+        ],
         "menuItems": [
             {
                 "action": "Delete UI Object",
@@ -785,7 +788,7 @@
         "addLeftIcons": true,
         "level": 0,
         "chainAttachesTo": {
-            "compatibleTypes": "->Take Position Event->Trigger On Event->Trigger Off Event->Next Phase Event->"
+            "compatibleTypes": "->Take Position Event->Trigger On Event->Trigger Off Event->Next Phase Event->Move to Phase Event->"
         },
         "icon": "pyramid",
         "properties": [
@@ -1188,6 +1191,14 @@
         "type": "Network Node",
         "docURL": "https://docs.superalgos.org/suite-hierarchy-network.html#network-node",
         "menuItems": [
+            {
+                "action": "Configure Network Node",
+                "label": "Configure Network Node",
+                "iconPathOn": "html",
+                "iconPathOff": "html",
+                "dontShowAtFullscreen": true,
+                "actionFunction": "uiObject.configEditor.activate"
+            },
             {
                 "action": "Add UI Object",
                 "disableIfPropertyIsDefined": true,
@@ -1230,6 +1241,12 @@
                 "actionFunction": "payload.onMenuItemClick"
             }
         ],
+        "editors": {
+            "config": true
+        },
+        "initialValues": {
+            "code": "{ \n\"ipAddress\": \"\", \n\"webPort\": \"\", \n\"webSocketsPort\": \"\"\n}"
+        },
         "isTitleAllwaysVisible": true,
         "addLeftIcons": true,
         "level": 1,
@@ -1477,6 +1494,7 @@
         ],
         "isTitleAllwaysVisible": true,
         "title": [
+            "Use Reference Parent Parent",
             "Use Reference Parent"
         ],
         "addLeftIcons": true,
@@ -1522,6 +1540,7 @@
         ],
         "isTitleAllwaysVisible": true,
         "title": [
+            "Use Reference Parent Parent",
             "Use Reference Parent"
         ],
         "addLeftIcons": true,
@@ -1599,6 +1618,7 @@
         ],
         "isTitleAllwaysVisible": true,
         "title": [
+            "Use Reference Parent Parent",
             "Use Reference Parent"
         ],
         "addLeftIcons": true,
@@ -2622,7 +2642,7 @@
             "config": true
         },
         "initialValues": {
-            "code": "{ \n\"repo\": \"If this is a legacy bot, write here the repository name in order to locate its code.\"\n}"
+            "code": "{ \n\"codeName\": \"\"\n}"
         },
         "level": 0,
         "chainAttachesTo": {
@@ -2678,6 +2698,9 @@
         "editors": {
             "config": true
         },
+        "initialValues": {
+            "code": "{ \n\"codeName\": \"\"\n}"
+        },
         "level": 1,
         "chainAttachesTo": {
             "compatibleTypes": "->Sensor Bot->Indicator Bot->Trading Bot->"
@@ -2966,6 +2989,9 @@
         "editors": {
             "config": true
         },
+        "initialValues": {
+            "code": "{ \n\"codeName\": \"\"\n}"
+        },
         "level": 3,
         "referenceAttachesTo": {
             "compatibleTypes": "->Plotter Module->"
@@ -3027,6 +3053,9 @@
         "editors": {
             "config": true
         },
+        "initialValues": {
+            "code": "{ \n\"codeName\": \"\"\n}"
+        },
         "level": 2,
         "chainAttachesTo": {
             "compatibleTypes": "->Product Definition->"
@@ -3073,6 +3102,9 @@
         "editors": {
             "config": true
         },
+        "initialValues": {
+            "code": "{ \n\"codeName\": \"\"\n}"
+        },
         "level": 3,
         "chainAttachesTo": {
             "compatibleTypes": "->Data Mine->"
@@ -3496,6 +3528,9 @@
         "editors": {
             "config": true
         },
+        "initialValues": {
+            "code": "{ \n\"codeName\": \"\"\n}"
+        },
         "level": 3,
         "chainAttachesTo": {
             "compatibleTypes": "->Data Mine->"
@@ -3550,6 +3585,9 @@
         "editors": {
             "config": true
         },
+        "initialValues": {
+            "code": "{ \n\"codeName\": \"\"\n}"
+        },
         "level": 2,
         "icon": "plotter",
         "chainAttachesTo": {
@@ -4076,6 +4114,12 @@
                 "relatedUiObject": "Next Phase Event",
                 "actionFunction": "payload.onMenuItemClick"
             },
+            {
+                "action": "Add UI Object",
+                "label": "Add Move to Phase Event",
+                "relatedUiObject": "Move to Phase Event",
+                "actionFunction": "payload.onMenuItemClick"
+            },
             {
                 "action": "Add UI Object",
                 "label": "Add Announcement",
@@ -4111,6 +4155,11 @@
                 "type": "node",
                 "childType": "Next Phase Event"
             },
+            {
+                "name": "moveToPhaseEvents",
+                "type": "array",
+                "childType": "Move to Phase Event"
+            },
             {
                 "name": "announcements",
                 "type": "array",
@@ -4166,6 +4215,56 @@
         ],
         "propertyNameAtParent": "nextPhaseEvent"
     },
+    {
+        "type": "Move to Phase Event",
+        "docURL": "",
+        "menuItems": [
+            {
+                "action": "Add UI Object",
+                "label": "Add Situation",
+                "relatedUiObject": "Situation",
+                "actionFunction": "payload.onMenuItemClick"
+            },
+            {
+                "action": "Add UI Object",
+                "label": "Add Announcement",
+                "relatedUiObject": "Announcement",
+                "actionFunction": "payload.onMenuItemClick"
+            },
+            {
+                "action": "Delete UI Object",
+                "askConfirmation": true,
+                "confirmationLabel": "Confirm to Delete",
+                "label": "Delete This Event",
+                "iconPathOn": "delete",
+                "iconPathOff": "delete",
+                "actionFunction": "payload.onMenuItemClick"
+            }
+        ],
+        "addLeftIcons": true,
+        "level": 3,
+        "chainAttachesTo": {
+            "compatibleTypes": "->Phase->"
+        },
+        "referenceAttachesTo": {
+            "compatibleTypes": "->Phase->"
+        },
+        "icon": "move-to-phase-event",
+        "properties": [
+            {
+                "name": "situations",
+                "type": "array",
+                "childType": "Situation",
+                "autoAdd": true
+            },
+            {
+                "name": "announcements",
+                "type": "array",
+                "childType": "Announcement"
+            }
+        ],
+        "propertyNameAtParent": "moveToPhaseEvents"
+    },
     {
         "type": "Take Profit",
         "docURL": "https://docs.superalgos.org/suite-hierarchy-trading-system.html#take-profit",
@@ -4566,7 +4665,7 @@
         "addLeftIcons": true,
         "level": 4,
         "chainAttachesTo": {
-            "compatibleTypes": "->Trigger On Event->Trigger Off Event->Take Position Event->Next Phase Event->Phase->Trigger Stage->Open Stage->Manage Stage->Close Stage->"
+            "compatibleTypes": "->Trigger On Event->Trigger Off Event->Take Position Event->Next Phase Event->Move to Phase Event->Phase->Trigger Stage->Open Stage->Manage Stage->Close Stage->"
         },
         "properties": [
             {
@@ -4589,6 +4688,12 @@
                 "relatedUiObject": "Crypto Exchanges",
                 "actionFunction": "payload.onMenuItemClick"
             },
+            {
+                "action": "Add UI Object",
+                "label": "Add Signals Providers",
+                "relatedUiObject": "Signals Providers",
+                "actionFunction": "payload.onMenuItemClick"
+            },
             {
                 "action": "Add UI Object",
                 "disableIfPropertyIsDefined": true,
@@ -4608,6 +4713,11 @@
                 "type": "array",
                 "childType": "Crypto Exchanges"
             },
+            {
+                "name": "signalsProviders",
+                "type": "array",
+                "childType": "Signals Providers"
+            },
             {
                 "name": "superActions",
                 "type": "node",
@@ -4651,6 +4761,86 @@
             }
         ]
     },
+    {
+        "type": "Signals Providers",
+        "menuItems": [
+            {
+                "action": "Add UI Object",
+                "label": "Add Signals Provider",
+                "relatedUiObject": "Signals Provider",
+                "actionFunction": "payload.onMenuItemClick"
+            },
+            {
+                "action": "Delete UI Object",
+                "askConfirmation": true,
+                "confirmationLabel": "Confirm to Delete",
+                "label": "Delete Signals Providers",
+                "iconPathOn": "delete",
+                "iconPathOff": "delete",
+                "actionFunction": "payload.onMenuItemClick"
+            }
+        ],
+        "addLeftIcons": true,
+        "level": 1,
+        "icon": "targeting",
+        "chainAttachesTo": {
+            "compatibleTypes": "->Crypto Ecosystem->"
+        },
+        "propertyNameAtParent": "signalsProviders",
+        "properties": [
+            {
+                "name": "signalsProviders",
+                "type": "array",
+                "childType": "Signals Provider",
+                "autoAdd": true
+            }
+        ]
+    },
+    {
+        "type": "Signals Provider",
+        "menuItems": [
+            {
+                "action": "Config Signals Provider",
+                "actionFunction": "uiObject.configEditor.activate",
+                "label": "Config Signals Provider",
+                "iconPathOn": "html",
+                "iconPathOff": "html"
+            },
+            {
+                "action": "Send Webhook Test Message",
+                "label": "Send Test Message",
+                "workingLabel": "Seinding Message",
+                "workDoneLabel": "Message Sent",
+                "workFailedLabel": "Message not Delived",
+                "iconPathOn": "paper-plane",
+                "iconPathOff": "paper-plane",
+                "actionFunction": "payload.onMenuItemClick"
+            },
+            {
+                "action": "Delete UI Object",
+                "askConfirmation": true,
+                "confirmationLabel": "Confirm to Delete",
+                "label": "Delete Signals Provider",
+                "iconPathOn": "delete",
+                "iconPathOff": "delete",
+                "actionFunction": "payload.onMenuItemClick"
+            }
+        ],
+        "addLeftIcons": true,
+        "level": 2,
+        "icon": "template-target",
+        "chainAttachesTo": {
+            "compatibleTypes": "->Signals Providers->"
+        },
+        "editors": {
+            "config": true
+        },
+        "initialValues": {
+            "code": "{ \n\"webhookURL\": \"Webhook/New-Message/Trading-View/Binance/BTC-USDT\",\n\"testMessage\": \"\" \n}"
+        },
+        "propertyNameAtParent": "signalsProviders",
+        "properties": []
+    },
     {
         "type": "Crypto Exchanges",
         "docURL": "https://docs.superalgos.org/suite-hierarchy-crypto-ecosystem.html#crypto-exchanges",
@@ -5905,7 +6095,7 @@
             "compatibleTypes": "->Crypto Exchange->"
         },
         "chainAttachesTo": {
-            "compatibleTypes": "->Data Mining->Testing Environmnet->Production Environmnet->Template Structure->"
+            "compatibleTypes": "->Data Mining->Testing Environmnet->Production Environment->Template Structure->"
         },
         "alternativeIcons": "Use Reference Parent",
         "title": [
@@ -6185,6 +6375,12 @@
     {
         "type": "Exchange Sessions",
         "menuItems": [
+            {
+                "action": "Add UI Object",
+                "label": "Add Session Reference",
+                "relatedUiObject": "Session Reference",
+                "actionFunction": "payload.onMenuItemClick"
+            },
             {
                 "action": "Delete UI Object",
                 "askConfirmation": true,

BackendServers/.env

@@ -9,4 +9,5 @@ BOTS_PATH=../Legacy-Code
 LOG_PATH=../Log-Files
 
 WEB_SOCKETS_SERVER_PORT=8080
-
+WEB_SERVER_PORT=34247
+WEB_SERVER_URL=localhost

BackendServers/WebServer/AppLoader.js

@@ -51,6 +51,8 @@ function newAppLoader() {
                 'DesignSpace/Workspace/FunctionLibraries/OnFocus.js',
                 'DesignSpace/Workspace/FunctionLibraries/SuperScripts.js',
                 'DesignSpace/Workspace/FunctionLibraries/CCXTFunctions.js',
+                'DesignSpace/Workspace/FunctionLibraries/WebhookFunctions.js', 
+                'DesignSpace/Workspace/FunctionLibraries/DependenciesFilter.js',
                                
                 'Utilities/RoundedCornersBackground.js',
 
@@ -176,8 +178,6 @@ function newAppLoader() {
             'Plotters/Masters/Plotters-Candles-Volumes/CandlePanel.js',
             'Plotters/Masters/Plotters-Candles-Volumes/Volumes.js',
             'Plotters/Masters/Plotters-Candles-Volumes/VolumePanel.js',
-            'Plotters/Masters/Plotters-Stairs-Patterns/CandleStairs.js',
-            'Plotters/Masters/Plotters-Stairs-Patterns/VolumeStairs.js',
             'Plotters/Masters/Plotters-Bollinger-Bands/BollingerBands.js',
             'Plotters/Masters/Plotters-Bollinger-Bands/BollingerBandsPanel.js',
             'Plotters/Masters/Plotters-Bollinger-Bands/PercentageBandwidth.js',

BackendServers/WebServer/AppPreLoader.js

@@ -127,7 +127,7 @@ function loadSuperalgos() {
 
             if (INFO_LOG === true) { console.log(spacePad(MODULE_NAME, 50) + " : " + "[INFO] loadModules -> Entering function."); }
 
-            let path = window.canvasApp.urlPrefix + "Scripts/AppLoader.js";
+            let path = window.canvasApp.urlPrefix + "WebServer/AppLoader.js";
 
             REQUIREJS([path], onRequired);