From 357e9a04bc1319b543f46a7d03f6d62fec150cf1 Mon Sep 17 00:00:00 2001 From: Brenden Harrell Date: Sun, 26 Sep 2021 21:04:42 -0500 Subject: [PATCH 01/20] Run Node Setup on Branch Switch Initial --- .../UI/Spaces/Docs-Space/DocsSpace.js | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/Projects/Education/UI/Spaces/Docs-Space/DocsSpace.js b/Projects/Education/UI/Spaces/Docs-Space/DocsSpace.js index bc35e0c59..114c16193 100644 --- a/Projects/Education/UI/Spaces/Docs-Space/DocsSpace.js +++ b/Projects/Education/UI/Spaces/Docs-Space/DocsSpace.js @@ -254,6 +254,24 @@ function newEducationDocSpace() { if (doNotNavigate === true) { return } UI.projects.education.spaces.docsSpace.navigateTo('Foundations', 'Topic', 'Switching Branches - Current Branch Changed') + // Run Node Setup to Update dependencies upon branch switch + let dir = path.join( process.cwd(), "..", "..", "..", "..", ".." ) + let command = "node setup"; + exec( command, + { + cwd: dir + }, + function ( error, stdout ){ + if (error) { + console.log(''); + console.log("There was an error updating dependencies for this branch: "); + console.log(''); + console.log( error ); + return; + } + console.log(''); + console.log( stdout ); + }); } else { UI.projects.education.spaces.docsSpace.navigateTo( data.docs.project, From 563e648079bef140c9eb7d0a2304bba959b57f95 Mon Sep 17 00:00:00 2001 From: Brenden Harrell Date: Sun, 26 Sep 2021 21:15:30 -0500 Subject: [PATCH 02/20] display branch changed page after node setup is run --- Projects/Education/UI/Spaces/Docs-Space/DocsSpace.js | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/Projects/Education/UI/Spaces/Docs-Space/DocsSpace.js b/Projects/Education/UI/Spaces/Docs-Space/DocsSpace.js index 114c16193..09201fbc8 100644 --- a/Projects/Education/UI/Spaces/Docs-Space/DocsSpace.js +++ b/Projects/Education/UI/Spaces/Docs-Space/DocsSpace.js @@ -253,7 +253,7 @@ function newEducationDocSpace() { UI.projects.foundations.utilities.nodeConfig.saveConfigProperty(workspace.payload, 'currentBranch', branch) if (doNotNavigate === true) { return } - UI.projects.education.spaces.docsSpace.navigateTo('Foundations', 'Topic', 'Switching Branches - Current Branch Changed') + // Run Node Setup to Update dependencies upon branch switch let dir = path.join( process.cwd(), "..", "..", "..", "..", ".." ) let command = "node setup"; @@ -268,7 +268,8 @@ function newEducationDocSpace() { console.log(''); console.log( error ); return; - } + } + UI.projects.education.spaces.docsSpace.navigateTo('Foundations', 'Topic', 'Switching Branches - Current Branch Changed') console.log(''); console.log( stdout ); }); From 5a0136a1c059bdcc26ac9d66069d91b4188685af Mon Sep 17 00:00:00 2001 From: Brenden Harrell Date: Sun, 26 Sep 2021 21:29:47 -0500 Subject: [PATCH 03/20] add needed node modules --- Projects/Education/UI/Spaces/Docs-Space/DocsSpace.js | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/Projects/Education/UI/Spaces/Docs-Space/DocsSpace.js b/Projects/Education/UI/Spaces/Docs-Space/DocsSpace.js index 09201fbc8..d86e316fc 100644 --- a/Projects/Education/UI/Spaces/Docs-Space/DocsSpace.js +++ b/Projects/Education/UI/Spaces/Docs-Space/DocsSpace.js @@ -255,6 +255,10 @@ function newEducationDocSpace() { if (doNotNavigate === true) { return } // Run Node Setup to Update dependencies upon branch switch + const path = require("path"); + const process = require("process"); + const { exec } = require("child_process"); + let dir = path.join( process.cwd(), "..", "..", "..", "..", ".." ) let command = "node setup"; exec( command, From 7bc3b0ec285ea040afee980d35b2afa9ae3bfa3a Mon Sep 17 00:00:00 2001 From: Brenden Harrell Date: Sun, 26 Sep 2021 21:43:42 -0500 Subject: [PATCH 04/20] move required node modules --- Projects/Education/UI/Spaces/Docs-Space/DocsSpace.js | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/Projects/Education/UI/Spaces/Docs-Space/DocsSpace.js b/Projects/Education/UI/Spaces/Docs-Space/DocsSpace.js index d86e316fc..f949a2798 100644 --- a/Projects/Education/UI/Spaces/Docs-Space/DocsSpace.js +++ b/Projects/Education/UI/Spaces/Docs-Space/DocsSpace.js @@ -239,11 +239,14 @@ function newEducationDocSpace() { } function changeCurrentBranch(branch, doNotNavigate) { - httpRequest(undefined, 'App/Checkout/' + branch, onResponse) + httpRequest(undefined, 'App/Checkout/' + branch, onResponse()) if (doNotNavigate !== true) { UI.projects.education.spaces.docsSpace.navigateTo('Foundations', 'Topic', 'Switching Branches - Changing Current Branch') } + const path = require("path"); + const process = require("process"); + const { exec } = require("child_process"); function onResponse(err, data) { /* Lets check the result of the call through the http interface */ data = JSON.parse(data) @@ -255,10 +258,6 @@ function newEducationDocSpace() { if (doNotNavigate === true) { return } // Run Node Setup to Update dependencies upon branch switch - const path = require("path"); - const process = require("process"); - const { exec } = require("child_process"); - let dir = path.join( process.cwd(), "..", "..", "..", "..", ".." ) let command = "node setup"; exec( command, From 00ce521972f601da4a8878ccae1e70b1f64e290e Mon Sep 17 00:00:00 2001 From: Brenden Harrell Date: Sun, 26 Sep 2021 21:46:12 -0500 Subject: [PATCH 05/20] Callback adjustment --- Projects/Education/UI/Spaces/Docs-Space/DocsSpace.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Projects/Education/UI/Spaces/Docs-Space/DocsSpace.js b/Projects/Education/UI/Spaces/Docs-Space/DocsSpace.js index f949a2798..a43d55e62 100644 --- a/Projects/Education/UI/Spaces/Docs-Space/DocsSpace.js +++ b/Projects/Education/UI/Spaces/Docs-Space/DocsSpace.js @@ -239,7 +239,7 @@ function newEducationDocSpace() { } function changeCurrentBranch(branch, doNotNavigate) { - httpRequest(undefined, 'App/Checkout/' + branch, onResponse()) + httpRequest(undefined, 'App/Checkout/' + branch, onResponse) if (doNotNavigate !== true) { UI.projects.education.spaces.docsSpace.navigateTo('Foundations', 'Topic', 'Switching Branches - Changing Current Branch') } From f3bc0cdda8f873af00eb21e9e03e0eccf22f2bfc Mon Sep 17 00:00:00 2001 From: Brenden Harrell Date: Fri, 1 Oct 2021 07:00:48 -0500 Subject: [PATCH 06/20] start implementing shell command utility --- .../UI/Function-Libraries/ActionSwitch.js | 8 +++-- .../Function-Libraries/LaunchShellCommand.js | 34 +++++++++++++++++++ .../UI/Spaces/Docs-Space/DocsSpace.js | 22 ++---------- 3 files changed, 41 insertions(+), 23 deletions(-) create mode 100644 Projects/Education/UI/Function-Libraries/LaunchShellCommand.js diff --git a/Projects/Education/UI/Function-Libraries/ActionSwitch.js b/Projects/Education/UI/Function-Libraries/ActionSwitch.js index 03bf636ca..ff5c8bc37 100644 --- a/Projects/Education/UI/Function-Libraries/ActionSwitch.js +++ b/Projects/Education/UI/Function-Libraries/ActionSwitch.js @@ -18,9 +18,11 @@ function newEducationActionSwitch() { async function executeAction(action) { switch (action.name) { - case 'Action Name': { - // Example: return UI.projects.foundations.functionLibraries.onFocus.getNodeThatIsOnFocus(action.node) - } + case 'Launch Shell Command': + { + UI.projects.education.functionLibraries.launchshellcommand.launchshellcommand(action.node) + } + break } } } diff --git a/Projects/Education/UI/Function-Libraries/LaunchShellCommand.js b/Projects/Education/UI/Function-Libraries/LaunchShellCommand.js new file mode 100644 index 000000000..fe9e06b7b --- /dev/null +++ b/Projects/Education/UI/Function-Libraries/LaunchShellCommand.js @@ -0,0 +1,34 @@ +const path = require("path"); +const process = require("process"); +const { exec } = require("child_process"); + +function newEducationFunctionLibraryLaunchShellCommand() { + let thisObject = { + launchShellCommand: launchShellCommand + } + + return thisObject + + function launchShellCommand() { + + + let dir = path.join( process.cwd(), "..", "..", "..", "..", ".." ) + let command = "node setup"; + exec( command, + { + cwd: dir + }, + function ( error, stdout ){ + if (error) { + console.log(''); + console.log("There was an error updating dependencies for this branch: "); + console.log(''); + console.log( error ); + return; + } + + console.log(''); + console.log( stdout ); + }); + } +} \ No newline at end of file diff --git a/Projects/Education/UI/Spaces/Docs-Space/DocsSpace.js b/Projects/Education/UI/Spaces/Docs-Space/DocsSpace.js index a43d55e62..1e5951e80 100644 --- a/Projects/Education/UI/Spaces/Docs-Space/DocsSpace.js +++ b/Projects/Education/UI/Spaces/Docs-Space/DocsSpace.js @@ -244,9 +244,6 @@ function newEducationDocSpace() { UI.projects.education.spaces.docsSpace.navigateTo('Foundations', 'Topic', 'Switching Branches - Changing Current Branch') } - const path = require("path"); - const process = require("process"); - const { exec } = require("child_process"); function onResponse(err, data) { /* Lets check the result of the call through the http interface */ data = JSON.parse(data) @@ -258,24 +255,9 @@ function newEducationDocSpace() { if (doNotNavigate === true) { return } // Run Node Setup to Update dependencies upon branch switch - let dir = path.join( process.cwd(), "..", "..", "..", "..", ".." ) - let command = "node setup"; - exec( command, - { - cwd: dir - }, - function ( error, stdout ){ - if (error) { - console.log(''); - console.log("There was an error updating dependencies for this branch: "); - console.log(''); - console.log( error ); - return; - } + UI.projects.education.spaces.docsSpace.navigateTo('Foundations', 'Topic', 'Switching Branches - Current Branch Changed') - console.log(''); - console.log( stdout ); - }); + } else { UI.projects.education.spaces.docsSpace.navigateTo( data.docs.project, From 978c6be82c342f0daf44bdffb53d9bca082b98d1 Mon Sep 17 00:00:00 2001 From: Brenden Harrell Date: Fri, 1 Oct 2021 08:27:54 -0500 Subject: [PATCH 07/20] move running node setup to httpinterface --- Platform/Client/httpInterface.js | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/Platform/Client/httpInterface.js b/Platform/Client/httpInterface.js index cbe0d20aa..817e9e481 100644 --- a/Platform/Client/httpInterface.js +++ b/Platform/Client/httpInterface.js @@ -864,6 +864,8 @@ exports.newHttpInterface = function newHttpInterface() { await doGit() if (error === undefined) { + // Run node setup to prepare instance for branch change + await runNodeSetup() SA.projects.foundations.utilities.httpResponses.respondWithContent(JSON.stringify(global.DEFAULT_OK_RESPONSE), httpResponse) } else { let docs = { @@ -896,6 +898,10 @@ exports.newHttpInterface = function newHttpInterface() { } } + async function runNodeSetup () { + console.log( "lets run node setup" ) + } + } catch (err) { console.log('[ERROR] httpInterface -> App -> Update -> Method call produced an error.') console.log('[ERROR] httpInterface -> App -> Update -> err.stack = ' + err.stack) From 90377568acfe93afc78711277b2d3573cc0def63 Mon Sep 17 00:00:00 2001 From: Brenden Harrell Date: Fri, 1 Oct 2021 08:39:30 -0500 Subject: [PATCH 08/20] initial implementation of running node setup on branch switch in httpinterface --- Platform/Client/httpInterface.js | 22 ++++++++++++ .../UI/Function-Libraries/ActionSwitch.js | 7 ++-- .../Function-Libraries/LaunchShellCommand.js | 34 ------------------- .../UI/Spaces/Docs-Space/DocsSpace.js | 2 -- 4 files changed, 25 insertions(+), 40 deletions(-) delete mode 100644 Projects/Education/UI/Function-Libraries/LaunchShellCommand.js diff --git a/Platform/Client/httpInterface.js b/Platform/Client/httpInterface.js index 817e9e481..a6933f2a6 100644 --- a/Platform/Client/httpInterface.js +++ b/Platform/Client/httpInterface.js @@ -900,6 +900,28 @@ exports.newHttpInterface = function newHttpInterface() { async function runNodeSetup () { console.log( "lets run node setup" ) + const path = require("path"); + const process = require("process"); + const { exec } = require("child_process"); + + let dir = path.join( process.cwd(), "..", ".." ) + let command = "node setup"; + exec( command, + { + cwd: dir + }, + function ( error, stdout ){ + if (error) { + console.log(''); + console.log("There was an error updating dependencies for this branch: "); + console.log(''); + console.log( error ); + return; + } + + console.log(''); + console.log( stdout ); + }); } } catch (err) { diff --git a/Projects/Education/UI/Function-Libraries/ActionSwitch.js b/Projects/Education/UI/Function-Libraries/ActionSwitch.js index ff5c8bc37..6770f633c 100644 --- a/Projects/Education/UI/Function-Libraries/ActionSwitch.js +++ b/Projects/Education/UI/Function-Libraries/ActionSwitch.js @@ -18,10 +18,9 @@ function newEducationActionSwitch() { async function executeAction(action) { switch (action.name) { - case 'Launch Shell Command': - { - UI.projects.education.functionLibraries.launchshellcommand.launchshellcommand(action.node) - } + case 'Action Name': { + // Example: return UI.projects.foundations.functionLibraries.onFocus.getNodeThatIsOnFocus(action.node) + } break } } diff --git a/Projects/Education/UI/Function-Libraries/LaunchShellCommand.js b/Projects/Education/UI/Function-Libraries/LaunchShellCommand.js deleted file mode 100644 index fe9e06b7b..000000000 --- a/Projects/Education/UI/Function-Libraries/LaunchShellCommand.js +++ /dev/null @@ -1,34 +0,0 @@ -const path = require("path"); -const process = require("process"); -const { exec } = require("child_process"); - -function newEducationFunctionLibraryLaunchShellCommand() { - let thisObject = { - launchShellCommand: launchShellCommand - } - - return thisObject - - function launchShellCommand() { - - - let dir = path.join( process.cwd(), "..", "..", "..", "..", ".." ) - let command = "node setup"; - exec( command, - { - cwd: dir - }, - function ( error, stdout ){ - if (error) { - console.log(''); - console.log("There was an error updating dependencies for this branch: "); - console.log(''); - console.log( error ); - return; - } - - console.log(''); - console.log( stdout ); - }); - } -} \ No newline at end of file diff --git a/Projects/Education/UI/Spaces/Docs-Space/DocsSpace.js b/Projects/Education/UI/Spaces/Docs-Space/DocsSpace.js index 1e5951e80..defb3df07 100644 --- a/Projects/Education/UI/Spaces/Docs-Space/DocsSpace.js +++ b/Projects/Education/UI/Spaces/Docs-Space/DocsSpace.js @@ -254,8 +254,6 @@ function newEducationDocSpace() { if (doNotNavigate === true) { return } - // Run Node Setup to Update dependencies upon branch switch - UI.projects.education.spaces.docsSpace.navigateTo('Foundations', 'Topic', 'Switching Branches - Current Branch Changed') } else { From e34f44a62034ef7a00b09395ec4128f1dc94fa5e Mon Sep 17 00:00:00 2001 From: Brenden Harrell Date: Fri, 1 Oct 2021 08:55:48 -0500 Subject: [PATCH 09/20] troubleshooting --- Platform/Client/httpInterface.js | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/Platform/Client/httpInterface.js b/Platform/Client/httpInterface.js index a6933f2a6..061a90ca7 100644 --- a/Platform/Client/httpInterface.js +++ b/Platform/Client/httpInterface.js @@ -899,12 +899,13 @@ exports.newHttpInterface = function newHttpInterface() { } async function runNodeSetup () { - console.log( "lets run node setup" ) + console.log( "Running Node setup to adjust for new Branch" ) const path = require("path"); const process = require("process"); const { exec } = require("child_process"); let dir = path.join( process.cwd(), "..", ".." ) + console.log("this is where we are running the command", dir) let command = "node setup"; exec( command, { From db0e91ac025fef169b5c9b28a434fe7fd255a73c Mon Sep 17 00:00:00 2001 From: Brenden Harrell Date: Fri, 1 Oct 2021 08:58:21 -0500 Subject: [PATCH 10/20] more troubleshooting --- Platform/Client/httpInterface.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Platform/Client/httpInterface.js b/Platform/Client/httpInterface.js index 061a90ca7..f2cbcdabc 100644 --- a/Platform/Client/httpInterface.js +++ b/Platform/Client/httpInterface.js @@ -904,7 +904,7 @@ exports.newHttpInterface = function newHttpInterface() { const process = require("process"); const { exec } = require("child_process"); - let dir = path.join( process.cwd(), "..", ".." ) + let dir = path.join( process.cwd() ) console.log("this is where we are running the command", dir) let command = "node setup"; exec( command, From d12ab41b47bf364a32d5dfb42e5703a4ce106a48 Mon Sep 17 00:00:00 2001 From: Brenden Harrell Date: Fri, 1 Oct 2021 09:05:06 -0500 Subject: [PATCH 11/20] adjust order of response --- Platform/Client/httpInterface.js | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/Platform/Client/httpInterface.js b/Platform/Client/httpInterface.js index f2cbcdabc..3c2d6342c 100644 --- a/Platform/Client/httpInterface.js +++ b/Platform/Client/httpInterface.js @@ -865,8 +865,7 @@ exports.newHttpInterface = function newHttpInterface() { if (error === undefined) { // Run node setup to prepare instance for branch change - await runNodeSetup() - SA.projects.foundations.utilities.httpResponses.respondWithContent(JSON.stringify(global.DEFAULT_OK_RESPONSE), httpResponse) + runNodeSetup().then( SA.projects.foundations.utilities.httpResponses.respondWithContent(JSON.stringify(global.DEFAULT_OK_RESPONSE), httpResponse) ) } else { let docs = { project: 'Foundations', @@ -904,8 +903,7 @@ exports.newHttpInterface = function newHttpInterface() { const process = require("process"); const { exec } = require("child_process"); - let dir = path.join( process.cwd() ) - console.log("this is where we are running the command", dir) + let dir = process.cwd() let command = "node setup"; exec( command, { From 046a369ce43c7a71cacf4e96a663260081e40fa9 Mon Sep 17 00:00:00 2001 From: Brenden Harrell Date: Fri, 1 Oct 2021 09:12:21 -0500 Subject: [PATCH 12/20] Another go at proper async ordering --- Platform/Client/httpInterface.js | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/Platform/Client/httpInterface.js b/Platform/Client/httpInterface.js index 3c2d6342c..0411074a2 100644 --- a/Platform/Client/httpInterface.js +++ b/Platform/Client/httpInterface.js @@ -899,13 +899,12 @@ exports.newHttpInterface = function newHttpInterface() { async function runNodeSetup () { console.log( "Running Node setup to adjust for new Branch" ) - const path = require("path"); const process = require("process"); - const { exec } = require("child_process"); + const { execSync } = require("child_process"); let dir = process.cwd() let command = "node setup"; - exec( command, + execSync( command, { cwd: dir }, From bb903b8eb433dc5b8f05afca7a8f200fe95b6997 Mon Sep 17 00:00:00 2001 From: Brenden Harrell Date: Fri, 1 Oct 2021 09:26:53 -0500 Subject: [PATCH 13/20] one more go --- Platform/Client/httpInterface.js | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/Platform/Client/httpInterface.js b/Platform/Client/httpInterface.js index 0411074a2..5247da389 100644 --- a/Platform/Client/httpInterface.js +++ b/Platform/Client/httpInterface.js @@ -865,7 +865,7 @@ exports.newHttpInterface = function newHttpInterface() { if (error === undefined) { // Run node setup to prepare instance for branch change - runNodeSetup().then( SA.projects.foundations.utilities.httpResponses.respondWithContent(JSON.stringify(global.DEFAULT_OK_RESPONSE), httpResponse) ) + runNodeSetup() } else { let docs = { project: 'Foundations', @@ -915,10 +915,13 @@ exports.newHttpInterface = function newHttpInterface() { console.log(''); console.log( error ); return; - } - + } + console.log(''); - console.log( stdout ); + console.log( stdout ); + // Return to UI that Branch is suggessfully changed + SA.projects.foundations.utilities.httpResponses.respondWithContent(JSON.stringify(global.DEFAULT_OK_RESPONSE), httpResponse) + }); } From 0595f1b06fe91fc8a939851155e9ae6797fe335d Mon Sep 17 00:00:00 2001 From: Brenden Harrell Date: Fri, 1 Oct 2021 09:33:58 -0500 Subject: [PATCH 14/20] add missing await --- Platform/Client/httpInterface.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Platform/Client/httpInterface.js b/Platform/Client/httpInterface.js index 5247da389..af5ad6e5c 100644 --- a/Platform/Client/httpInterface.js +++ b/Platform/Client/httpInterface.js @@ -865,7 +865,7 @@ exports.newHttpInterface = function newHttpInterface() { if (error === undefined) { // Run node setup to prepare instance for branch change - runNodeSetup() + await runNodeSetup() } else { let docs = { project: 'Foundations', From 81b23b3495df7e1f9c5e693ec146033252b7a7cd Mon Sep 17 00:00:00 2001 From: Brenden Harrell Date: Fri, 1 Oct 2021 09:38:21 -0500 Subject: [PATCH 15/20] move response out of exec callback --- Platform/Client/httpInterface.js | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/Platform/Client/httpInterface.js b/Platform/Client/httpInterface.js index af5ad6e5c..0fc944d55 100644 --- a/Platform/Client/httpInterface.js +++ b/Platform/Client/httpInterface.js @@ -916,13 +916,12 @@ exports.newHttpInterface = function newHttpInterface() { console.log( error ); return; } - console.log(''); - console.log( stdout ); - // Return to UI that Branch is suggessfully changed - SA.projects.foundations.utilities.httpResponses.respondWithContent(JSON.stringify(global.DEFAULT_OK_RESPONSE), httpResponse) - + console.log( stdout ); }); + // Return to UI that Branch is suggessfully changed + SA.projects.foundations.utilities.httpResponses.respondWithContent(JSON.stringify(global.DEFAULT_OK_RESPONSE), httpResponse) + } } catch (err) { From fb7f26ba6adcba836f12c99ff7b27ba6c3449237 Mon Sep 17 00:00:00 2001 From: harrellbm Date: Thu, 7 Oct 2021 08:03:24 -0500 Subject: [PATCH 16/20] Add Dutch Language Footer --- Projects/Education/UI/Spaces/Docs-Space/Footer.js | 6 ++++++ Projects/Education/UI/Utilities/Languages.js | 4 ++++ 2 files changed, 10 insertions(+) diff --git a/Projects/Education/UI/Spaces/Docs-Space/Footer.js b/Projects/Education/UI/Spaces/Docs-Space/Footer.js index 87812476c..61633399a 100644 --- a/Projects/Education/UI/Spaces/Docs-Space/Footer.js +++ b/Projects/Education/UI/Spaces/Docs-Space/Footer.js @@ -129,6 +129,12 @@ function newFoundationsDocsFooter() { } HTML = HTML + '">' + HTML = HTML + '' + HTML = HTML + '' HTML = HTML + '
' diff --git a/Projects/Education/UI/Utilities/Languages.js b/Projects/Education/UI/Utilities/Languages.js index ae8af7ced..d87612c71 100644 --- a/Projects/Education/UI/Utilities/Languages.js +++ b/Projects/Education/UI/Utilities/Languages.js @@ -44,6 +44,10 @@ function newEducationUtilitiesLanguages() { languageLabel = 'Turkish' break } + case 'NL': { + languageLabel = 'Dutch' + break + } } return languageLabel } From 1e5df05b2cb0c3a321248819a6fcf2e36eb28f54 Mon Sep 17 00:00:00 2001 From: Brenden Harrell Date: Fri, 8 Oct 2021 07:51:32 -0500 Subject: [PATCH 17/20] adjust error code response --- Platform/Client/httpInterface.js | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/Platform/Client/httpInterface.js b/Platform/Client/httpInterface.js index 0fc944d55..806928ff7 100644 --- a/Platform/Client/httpInterface.js +++ b/Platform/Client/httpInterface.js @@ -866,6 +866,8 @@ exports.newHttpInterface = function newHttpInterface() { if (error === undefined) { // Run node setup to prepare instance for branch change await runNodeSetup() + // Return to UI that Branch is suggessfully changed + SA.projects.foundations.utilities.httpResponses.respondWithContent(JSON.stringify(global.DEFAULT_OK_RESPONSE), httpResponse) } else { let docs = { project: 'Foundations', @@ -904,6 +906,7 @@ exports.newHttpInterface = function newHttpInterface() { let dir = process.cwd() let command = "node setup"; + let test execSync( command, { cwd: dir @@ -916,11 +919,13 @@ exports.newHttpInterface = function newHttpInterface() { console.log( error ); return; } + console.log('this is error code', error.code) console.log(''); - console.log( stdout ); + console.log( stdout ); + test = "success" + return test }); - // Return to UI that Branch is suggessfully changed - SA.projects.foundations.utilities.httpResponses.respondWithContent(JSON.stringify(global.DEFAULT_OK_RESPONSE), httpResponse) + console.log("we finished!", test) } From 424df55bcd25cef8b15eb63767c0ac5113689dae Mon Sep 17 00:00:00 2001 From: Brenden Harrell Date: Fri, 8 Oct 2021 08:00:54 -0500 Subject: [PATCH 18/20] more adjustments --- Platform/Client/httpInterface.js | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/Platform/Client/httpInterface.js b/Platform/Client/httpInterface.js index 806928ff7..4f3f2f2a1 100644 --- a/Platform/Client/httpInterface.js +++ b/Platform/Client/httpInterface.js @@ -906,8 +906,7 @@ exports.newHttpInterface = function newHttpInterface() { let dir = process.cwd() let command = "node setup"; - let test - execSync( command, + let test1 = execSync( command, { cwd: dir }, @@ -922,10 +921,10 @@ exports.newHttpInterface = function newHttpInterface() { console.log('this is error code', error.code) console.log(''); console.log( stdout ); - test = "success" - return test + let test = "success" + return test }); - console.log("we finished!", test) + console.log("we finished!", test1) } From f725a977deabec9314394914283a983a67e5fc22 Mon Sep 17 00:00:00 2001 From: Brenden Harrell Date: Fri, 8 Oct 2021 08:05:42 -0500 Subject: [PATCH 19/20] convert returned buffer to string --- Platform/Client/httpInterface.js | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/Platform/Client/httpInterface.js b/Platform/Client/httpInterface.js index 4f3f2f2a1..7009e5267 100644 --- a/Platform/Client/httpInterface.js +++ b/Platform/Client/httpInterface.js @@ -924,7 +924,8 @@ exports.newHttpInterface = function newHttpInterface() { let test = "success" return test }); - console.log("we finished!", test1) + let text = test1.toString() + console.log("we finished!", text) } From 73823b4152304e2a455c12209e0e739878a98a27 Mon Sep 17 00:00:00 2001 From: Brenden Harrell Date: Fri, 8 Oct 2021 08:17:00 -0500 Subject: [PATCH 20/20] final adjustments --- Platform/Client/httpInterface.js | 22 ++++------------------ 1 file changed, 4 insertions(+), 18 deletions(-) diff --git a/Platform/Client/httpInterface.js b/Platform/Client/httpInterface.js index 7009e5267..6abef1e3f 100644 --- a/Platform/Client/httpInterface.js +++ b/Platform/Client/httpInterface.js @@ -906,26 +906,12 @@ exports.newHttpInterface = function newHttpInterface() { let dir = process.cwd() let command = "node setup"; - let test1 = execSync( command, + let stdout = execSync( command, { cwd: dir - }, - function ( error, stdout ){ - if (error) { - console.log(''); - console.log("There was an error updating dependencies for this branch: "); - console.log(''); - console.log( error ); - return; - } - console.log('this is error code', error.code) - console.log(''); - console.log( stdout ); - let test = "success" - return test - }); - let text = test1.toString() - console.log("we finished!", text) + }).toString(); + + console.log("Node Setup has completed with the following result:", stdout) }