From eefe9507f9456e3f76442bd1202f864c1e1e5ade Mon Sep 17 00:00:00 2001 From: Matias Date: Thu, 27 Jun 2019 23:04:54 -0300 Subject: [PATCH 1/4] Fixing issue for user names different than team slug --- StrategySpace/StrategizerGateway.js | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/StrategySpace/StrategizerGateway.js b/StrategySpace/StrategizerGateway.js index 39af6c833..1743521cc 100644 --- a/StrategySpace/StrategizerGateway.js +++ b/StrategySpace/StrategizerGateway.js @@ -47,7 +47,7 @@ function newStrategizerGateway () { } user = JSON.parse(user) - let fbSlug = 'simulator' + '-' + 'bot' + '-' + user.alias + let fbSlug = 'simulator' + '-' + 'bot' + '-' + user.alias.replace('.','') /* See if we need to update or create a new record at the strategizer */ @@ -86,8 +86,8 @@ function newStrategizerGateway () { throw 'Error getting events: ' + JSON.stringify(response.data.errors) } else { canvas.strategySpace.workspace.idAtStrategizer = response.data.data.strategizer_CreateTradingSystem.id - } - } else { + } + } else { const graphQLServer = await axios({ url: window.canvasApp.graphQL.masterAppApiUrl, method: 'post', @@ -112,7 +112,7 @@ function newStrategizerGateway () { headers: { authorization: 'Bearer ' + accessToken } - }) + }) } return true @@ -132,7 +132,7 @@ function newStrategizerGateway () { } user = JSON.parse(user) - let fbSlug = 'simulator' + '-' + 'bot' + '-' + user.alias + let fbSlug = 'simulator' + '-' + 'bot' + '-' + user.alias.replace('.','') let response = await axios({ url: window.canvasApp.graphQL.masterAppApiUrl, @@ -147,7 +147,8 @@ function newStrategizerGateway () { data } } - `, + `, + variables: { fbSlug: fbSlug } @@ -163,13 +164,13 @@ function newStrategizerGateway () { } else { logger.write('[ERROR] Error while getting Trading System from Strategizer: ' + JSON.stringify(response.data.errors)) return false - } + } } else { window.localStorage.setItem('userStrategies', JSON.stringify(response.data.data.strategizer_TradingSystemByFb.data)) thisObject.strategizerData = JSON.parse(JSON.stringify(response.data.data.strategizer_TradingSystemByFb.data)) canvas.strategySpace.workspace.idAtStrategizer = response.data.data.strategizer_TradingSystemByFb.id return true - } + } } catch (err) { if (ERROR_LOG === true) { logger.write('[ERROR] loadFromStrategyzer -> err = ' + err.stack) } } From 369ecd47b6e8c3bcf38857c0402b95e883caa47e Mon Sep 17 00:00:00 2001 From: Matias Date: Thu, 27 Jun 2019 23:05:12 -0300 Subject: [PATCH 2/4] Unused variable --- TopSpace/Login.js | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/TopSpace/Login.js b/TopSpace/Login.js index 099176916..b3964fbeb 100644 --- a/TopSpace/Login.js +++ b/TopSpace/Login.js @@ -33,7 +33,7 @@ function newLogin() { if (accessToken) { await getEvents(accessToken, sharedStatus) - await getClones(accessToken) + // await getClones(accessToken) } thisObject.container.eventHandler.listenToEvent('onMouseClick', onClick) @@ -120,7 +120,6 @@ function newLogin() { stateDatetime createDatetime lastLogs - runAsTeam summaryDate buyAverage sellAverage From 66f2bbc4dc0d905cb52b7207b353186fb6062788 Mon Sep 17 00:00:00 2001 From: Matias Date: Thu, 27 Jun 2019 23:05:25 -0300 Subject: [PATCH 3/4] Unused variable --- Dashboard.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dashboard.js b/Dashboard.js index 46d5dd536..94896fc5c 100644 --- a/Dashboard.js +++ b/Dashboard.js @@ -153,7 +153,7 @@ function newDashboard () { }) .then(response => { teams = response.data.teams_Teams - window.localStorage.setItem('Teams', JSON.stringify(response.data.teams_Teams)) + //window.localStorage.setItem('Teams', JSON.stringify(response.data.teams_Teams)) resolve({ teams: response.data.teams_Teams }) }) .catch(err => { From 958589a30ef649c561257c3b8fb59e8fda3af720 Mon Sep 17 00:00:00 2001 From: Matias Date: Thu, 27 Jun 2019 23:05:44 -0300 Subject: [PATCH 4/4] Fixing error on log entry --- CockpitSpace/GraphQLRestartSimulation.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CockpitSpace/GraphQLRestartSimulation.js b/CockpitSpace/GraphQLRestartSimulation.js index 53c5d2e37..fc42a3a66 100644 --- a/CockpitSpace/GraphQLRestartSimulation.js +++ b/CockpitSpace/GraphQLRestartSimulation.js @@ -28,7 +28,7 @@ async function graphQlRestartSimulation (simulationParams) { }) if (graphQLServer.data.errors) { - console.log(err.stack) + console.log(graphQLServer.data.errors) throw new Error(graphQLServer.data.errors[0].message) } } catch (err) {