From f09dc1eec57a0b7c61659a3340a35669867abd88 Mon Sep 17 00:00:00 2001 From: Luis Fernando Molina Date: Sat, 7 Dec 2019 11:21:47 +0100 Subject: [PATCH] Cleaning Old Code --- Scripts/AppLoader.js | 165 ++----------------------------------------- index.html | 1 - 2 files changed, 4 insertions(+), 162 deletions(-) diff --git a/Scripts/AppLoader.js b/Scripts/AppLoader.js index 6d9fb3114..f1b8dcc17 100644 --- a/Scripts/AppLoader.js +++ b/Scripts/AppLoader.js @@ -21,23 +21,10 @@ function newAppLoader() { let plotters let modulesArray = [] - - if (window.canvasApp.executingAt !== 'Local') { - let ecosystem = await loadEcosystem() - if (ecosystem) { - window.localStorage.setItem('ecosystem', JSON.stringify(ecosystem)) - plotters = getPlotters(ecosystem) - } else { - plotters = defaultPlotters() - modulesArray = ['UserEcosystem.js'] - } - } else { - plotters = defaultPlotters() - modulesArray = ['UserEcosystem.js'] - } - - - + + plotters = defaultPlotters() + modulesArray = ['UserEcosystem.js'] + modulesArray = modulesArray.concat([ 'ChartsSpace/ViewPort.js', @@ -183,150 +170,6 @@ function newAppLoader() { } } - async function loadEcosystem() { - if (INFO_LOG === true) { logger.write('[INFO] loadEcosystem -> Entering function.') } - - let accessToken = window.localStorage.getItem('access_token') - if (accessToken !== null) { - let response = await axios({ - url: window.canvasApp.graphQL.masterAppApiUrl, - method: 'post', - data: { - query: ` - query { - web_GetEcosystem { - id - devTeams { - codeName - displayName - host { - url - storage - container - accessKey - } - bots { - codeName - displayName - type - profilePicture - repo - configFile - cloneId - products{ - codeName - displayName - description - dataSets{ - codeName - type - validPeriods - filePath - fileName - dataRange{ - filePath - fileName - } - } - exchangeList{ - name - } - plotter{ - devTeam - codeName - moduleName - repo - } - } - } - plotters { - codeName - displayName - modules{ - codeName - moduleName - description - profilePicture - panels{ - codeName - moduleName - event - } - } - repo - configFile - } - } - hosts { - codeName - displayName - host { - url - storage - container - accessKey - } - competitions { - codeName - displayName - description - startDatetime - finishDatetime - formula - plotter{ - devTeam - codeName - host{ - url - storage - container - accessKey - } - moduleName - repo - } - rules - prizes - participants - repo - configFile - } - plotters { - codeName - displayName - modules{ - codeName - moduleName - description - profilePicture - panels{ - codeName - moduleName - event - } - } - repo - configFile - } - } - } - } - ` - }, - headers: { - authorization: 'Bearer ' + accessToken - } - }) - - if (response.data.errors) { - if (ERROR_LOG === true) { console.log(spacePad(MODULE_NAME, 50) + ' : ' + '[ERROR] AppPreLoader -> loadEcosystem -> response.text = ' + JSON.stringify(response.data.errors)) } - throw error - } - - return response.data.data.web_GetEcosystem - } - } - function defaultPlotters() { return [ // TODO This should be at te ecosystem file. 'Plotters/AAMasters/Plotters-Candles-Volumes/Candles.js', diff --git a/index.html b/index.html index 823cb41dd..bbaffdf5f 100644 --- a/index.html +++ b/index.html @@ -26,7 +26,6 @@ window.canvasApp = { version: '', // This is used to avoid catching problems at the browser level. sessionToken: '', - executingAt: 'Local', visible: true, topMargin: 60, urlPrefix: 'http://localhost:VIRTUAL_PORT/',