Merge remote-tracking branch 'origin/develop'

Scripts/AppLoader.js

@@ -27,7 +27,9 @@
 
                 /* PlotterPanels */
 
+
                 "Globals.js",
+                "Ecosystem.js",
 
                 "BottomSpace/DeleteTradingHistory.js",
                 "BottomSpace/ChartAspectRatio.js",
@@ -81,7 +83,6 @@
                 "ProductStorage.js",
                 "CompetitionStorage.js",
                 "ProductCard.js",
-                "Ecosystem.js",
 
                 "SplashScreen.js",
                 "Canvas.js",
@@ -107,10 +108,15 @@
             ];
 
             let downloadedCounter = 0;
+            let versionParam = window.canvasApp.version;
+            if (versionParam === undefined) { versionParam = ''; }
+            else {
+                versionParam = '?' + versionParam;
+            }
 
             for (let i = 0; i < modulesArray.length; i++) {
 
-                let path = window.canvasApp.urlPrefix + modulesArray[i];
+                let path = window.canvasApp.urlPrefix + modulesArray[i] + versionParam;
 
                 REQUIREJS([path], onRequired);
 

index.html

@@ -15,11 +15,15 @@
 <body id="body" style="margin: 0px; padding: 0px; border: 0px; overflow:hidden;" onresize="window.canvasApp.eventHandler.raiseEvent('Browser Resized');" onload="
 
     window.canvasApp = {
+        version: '1.0.0',  // This is used to avoid catching problems at the browser level.
         sessionToken: '',
         executingAt: 'Master App',
         visible: true,
         topMargin: 85,
         urlPrefix: 'http://localhost:1337/',
+        graphQL: {
+            masterAppApiUrl: 'http://localhost:4100/graphql',
+        },
         context: {}
     };
 

server.js

@@ -183,7 +183,6 @@ function onBrowserRequest(request, response) {
     let htmlResponse;
     let requestParameters = request.url.split("/");
 
-
     if (requestParameters[1].indexOf("index.html") >= 0) {
 
         /*
@@ -201,7 +200,8 @@ function onBrowserRequest(request, response) {
         return;
     }
 
-
+    requestParameters = request.url.split("?"); // Remove version information
+    requestParameters = requestParameters[0].split("/"); 
 
     switch (requestParameters[1]) {