From 3a11c1e2b3271249858456295be7a3dabe5b9fe2 Mon Sep 17 00:00:00 2001 From: Luis Fernando Molina Date: Thu, 21 Jan 2021 20:50:43 +0100 Subject: [PATCH 1/2] Improvemnts in error handling --- Client/WebServer/index.html | 2 +- ...001-ts-process-error-unexpected-error.json | 66 +++++++++++++++++++ ...rs-001-ts-task-error-unexpected-error.json | 17 +++++ .../Indicator-Bot/SingleMarketIndicatorBot.js | 1 + .../TS/Function-Libraries/NodeJSFunctions.js | 4 ++ .../Spaces/Floating-Space/UiObjectMessage.js | 29 ++++++-- 6 files changed, 114 insertions(+), 5 deletions(-) diff --git a/Client/WebServer/index.html b/Client/WebServer/index.html index 68b4975d4..086965ed6 100644 --- a/Client/WebServer/index.html +++ b/Client/WebServer/index.html @@ -155,7 +155,7 @@
- +
diff --git a/Projects/Superalgos/Schemas/Docs-Topics/ts-process-errors-001-ts-process-error-unexpected-error.json b/Projects/Superalgos/Schemas/Docs-Topics/ts-process-errors-001-ts-process-error-unexpected-error.json index 029fa082d..25346ec73 100644 --- a/Projects/Superalgos/Schemas/Docs-Topics/ts-process-errors-001-ts-process-error-unexpected-error.json +++ b/Projects/Superalgos/Schemas/Docs-Topics/ts-process-errors-001-ts-process-error-unexpected-error.json @@ -13,6 +13,72 @@ { "style": "Error", "text": "Unexpected Error" + }, + { + "style": "Title", + "text": "Error Details", + "updated": 1611258020914 + }, + { + "style": "Text", + "text": "In the following section you will find the specific information received when this error occured." + }, + { + "style": "Success", + "text": "You will only see it if you opened this page as a result of the error actually happening.", + "updated": 1611258030660 + }, + { + "style": "Subtitle", + "text": "Error Message" + }, + { + "style": "Text", + "text": "The following is the Error Message of the Exception that occured at the TS:" + }, + { + "style": "Placeholder", + "text": "errorMessage" + }, + { + "style": "Subtitle", + "text": "Error Stack" + }, + { + "style": "Text", + "text": "The following is the Error Stack of the Exception that occured at the TS:" + }, + { + "style": "Placeholder", + "text": "errorStack" + }, + { + "style": "Subtitle", + "text": "Error Code" + }, + { + "style": "Text", + "text": "The follwing is the Error Code of the Exception that occured at the TS:" + }, + { + "style": "Placeholder", + "text": "errorCode" + }, + { + "style": "Subtitle", + "text": "Error Details" + }, + { + "style": "Text", + "text": "The follwing are all the Error details of the Exception that occured at the TS:" + }, + { + "style": "Placeholder", + "text": "errorDetails" + }, + { + "style": "Text", + "text": "" } ] } \ No newline at end of file diff --git a/Projects/Superalgos/Schemas/Docs-Topics/ts-task-errors-001-ts-task-error-unexpected-error.json b/Projects/Superalgos/Schemas/Docs-Topics/ts-task-errors-001-ts-task-error-unexpected-error.json index 31430900c..ddc81c487 100644 --- a/Projects/Superalgos/Schemas/Docs-Topics/ts-task-errors-001-ts-task-error-unexpected-error.json +++ b/Projects/Superalgos/Schemas/Docs-Topics/ts-task-errors-001-ts-task-error-unexpected-error.json @@ -68,6 +68,23 @@ "style": "Placeholder", "text": "errorCode" }, + { + "style": "Subtitle", + "text": "Error Details" + }, + { + "style": "Text", + "text": "The follwing are all the Error details of the Exception that occured at the TS:", + "updated": 1611257840235 + }, + { + "style": "Placeholder", + "text": "errorDetails" + }, + { + "style": "Text", + "text": "" + }, { "style": "Text", "text": "" diff --git a/Projects/Superalgos/TS/Bot-Modules/Indicator-Bot/SingleMarketIndicatorBot.js b/Projects/Superalgos/TS/Bot-Modules/Indicator-Bot/SingleMarketIndicatorBot.js index 383a87778..252bdfd1e 100644 --- a/Projects/Superalgos/TS/Bot-Modules/Indicator-Bot/SingleMarketIndicatorBot.js +++ b/Projects/Superalgos/TS/Bot-Modules/Indicator-Bot/SingleMarketIndicatorBot.js @@ -58,6 +58,7 @@ function run(callBackFunction) { try { + require ('CACA') loop() function loop() { diff --git a/Projects/Superalgos/TS/Function-Libraries/NodeJSFunctions.js b/Projects/Superalgos/TS/Function-Libraries/NodeJSFunctions.js index b74a15a4d..84fdab8c7 100644 --- a/Projects/Superalgos/TS/Function-Libraries/NodeJSFunctions.js +++ b/Projects/Superalgos/TS/Function-Libraries/NodeJSFunctions.js @@ -43,6 +43,10 @@ exports.newSuperalgosFunctionLibrariesNodeJSFunctions = function () { text: TS.projects.superalgos.globals.taskVariables.UNEXPECTED_ERROR.code } } + docs.placeholder.errorDetails = { + style: 'Json', + text: JSON.stringify(TS.projects.superalgos.globals.taskVariables.UNEXPECTED_ERROR, undefined, 4) + } } if (TS.projects.superalgos.globals.taskVariables.FATAL_ERROR_MESSAGE || TS.projects.superalgos.globals.taskVariables.UNEXPECTED_ERROR) { diff --git a/Projects/Superalgos/UI/Spaces/Floating-Space/UiObjectMessage.js b/Projects/Superalgos/UI/Spaces/Floating-Space/UiObjectMessage.js index 7f35302d2..12eb18f01 100644 --- a/Projects/Superalgos/UI/Spaces/Floating-Space/UiObjectMessage.js +++ b/Projects/Superalgos/UI/Spaces/Floating-Space/UiObjectMessage.js @@ -25,6 +25,7 @@ function newUiObjectMessage() { thisObject.container.frame.radius = 0 let selfMouseClickEventSubscriptionId + let hoverAnimationCounter = 0 return thisObject @@ -50,6 +51,7 @@ function newUiObjectMessage() { function getContainer(point) { if (thisObject.text === undefined) { return } if (thisObject.container.frame.isThisPointHere(point, true) === true) { + hoverAnimationCounter = 30 return thisObject.container } else { return undefined @@ -68,6 +70,11 @@ function newUiObjectMessage() { thisObject.container.frame.width = FRAME_WIDTH thisObject.container.frame.height = FRAME_HEIGHT + + hoverAnimationCounter-- + if (hoverAnimationCounter < 0) { + hoverAnimationCounter = 0 + } } function onMouseClick(event) { @@ -120,15 +127,29 @@ function newUiObjectMessage() { } } - function drawMessageBackground(borderColor) { + function drawMessageBackground(color) { if (thisObject.text === undefined) { return } + let backgroundColor + let borderColor + let lineWidth + + if (hoverAnimationCounter > 0 && thisObject.docs !== undefined) { + backgroundColor = UI_COLOR.LIGHT_GREY + borderColor = color + lineWidth = 2 + } else { + backgroundColor = UI.projects.superalgos.spaces.floatingSpace.style.backgroundColor + borderColor = color + lineWidth = 0.5 + } + let params = { - cornerRadius: 5, - lineWidth: 0.5, + cornerRadius: 10, + lineWidth: lineWidth, container: thisObject.container, borderColor: borderColor, - backgroundColor: UI.projects.superalgos.spaces.floatingSpace.style.backgroundColor, + backgroundColor: backgroundColor, castShadow: false, opacity: 0.75 } From 56e961ad018800f0afb3fff1a55584d6ea13a651 Mon Sep 17 00:00:00 2001 From: Luis Fernando Molina Date: Thu, 21 Jan 2021 20:57:45 +0100 Subject: [PATCH 2/2] Improvements in Error Handlng / Error UX --- Client/httpInterface.js | 5 +++-- .../TS/Bot-Modules/Indicator-Bot/SingleMarketIndicatorBot.js | 1 - Projects/Superalgos/UI/Spaces/Docs-Space/CommandInterface.js | 5 ++++- UI/Data-Files/src/FileStorage.js | 3 ++- 4 files changed, 9 insertions(+), 5 deletions(-) diff --git a/Client/httpInterface.js b/Client/httpInterface.js index 8bb2a9f5c..49fcbf6ff 100644 --- a/Client/httpInterface.js +++ b/Client/httpInterface.js @@ -599,7 +599,8 @@ exports.newHttpInterface = function newHttpInterface(WEB_SERVER, DATA_FILE_SERVE /* Unsavping # */ for (let i = 0; i < 10; i++) { - commitMessage = commitMessage.replace('HASHTAG', '#') + commitMessage = commitMessage.replace('_SLASH_', '/') + commitMessage = commitMessage.replace('_HASHTAG_', '#') } contribute() @@ -1352,7 +1353,7 @@ exports.newHttpInterface = function newHttpInterface(WEB_SERVER, DATA_FILE_SERVE let pathToFile = httpRequest.url.substring(9) /* Unsavping # */ for (let i = 0; i < 10; i++) { - pathToFile = pathToFile.replace('HASHTAG', '#') + pathToFile = pathToFile.replace('_HASHTAG_', '#') } respondWithFile(global.env.PATH_TO_DATA_STORAGE + '/' + pathToFile, httpResponse) } diff --git a/Projects/Superalgos/TS/Bot-Modules/Indicator-Bot/SingleMarketIndicatorBot.js b/Projects/Superalgos/TS/Bot-Modules/Indicator-Bot/SingleMarketIndicatorBot.js index 252bdfd1e..383a87778 100644 --- a/Projects/Superalgos/TS/Bot-Modules/Indicator-Bot/SingleMarketIndicatorBot.js +++ b/Projects/Superalgos/TS/Bot-Modules/Indicator-Bot/SingleMarketIndicatorBot.js @@ -58,7 +58,6 @@ function run(callBackFunction) { try { - require ('CACA') loop() function loop() { diff --git a/Projects/Superalgos/UI/Spaces/Docs-Space/CommandInterface.js b/Projects/Superalgos/UI/Spaces/Docs-Space/CommandInterface.js index 410c09784..864371019 100644 --- a/Projects/Superalgos/UI/Spaces/Docs-Space/CommandInterface.js +++ b/Projects/Superalgos/UI/Spaces/Docs-Space/CommandInterface.js @@ -62,10 +62,13 @@ function newSuperalgosDocsCommmandInterface() { return } + message = message.replaceAll('#', '_HASHTAG_') + message = message.replaceAll('/', '_SLASH_') + httpRequest( undefined, 'App/Contribute/' + - message.replaceAll('#', 'HASHTAG') + '/' + + message + '/' + config.username + '/' + config.token + '/' + UI.projects.superalgos.spaces.docsSpace.currentBranch + '/' + diff --git a/UI/Data-Files/src/FileStorage.js b/UI/Data-Files/src/FileStorage.js index e4f7ae9ea..e7421af1e 100644 --- a/UI/Data-Files/src/FileStorage.js +++ b/UI/Data-Files/src/FileStorage.js @@ -46,7 +46,8 @@ function newFileStorage(host, port) { } /* Scaping # since it breaks the URL */ - url = url.replaceAll('#', 'HASHTAG') + url = url.replaceAll('#', '_HASHTAG_') + httpRequest(undefined, url, (response, fileContent) => { if (response.result === GLOBAL.DEFAULT_OK_RESPONSE.result) { callBackFunction(GLOBAL.DEFAULT_OK_RESPONSE, fileContent)