Default installed services (#522)

* use default installed services value of empty array when not set * bump version to 2.18.11
integr8ly · Oct 18, 2019 · 0ae5171 · 0ae5171
1 parent badeea6
commit 0ae5171
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "integreatly-web-app",
-  "version": "2.18.10",
+  "version": "2.18.11",
   "private": true,
   "proxy": "http://localhost:5001/",
   "dependencies": {

diff --git a/server.js b/server.js
@@ -642,6 +642,7 @@ function getConfigData(req) {
   const masterUri = isOpenShift4() ? OPENSHIFT_PROXY_PATH : `https://${process.env.OPENSHIFT_HOST}`;
   const wssMasterUri = isOpenShift4() ? OPENSHIFT_PROXY_PATH : `wss://${process.env.OPENSHIFT_HOST}`;
 
+  const installedServices = process.env.INSTALLED_SERVICES || '{}';
   return `window.OPENSHIFT_CONFIG = {
     clientId: '${process.env.OPENSHIFT_OAUTHCLIENT_ID}',
     accessTokenUri: 'https://${process.env.OPENSHIFT_OAUTH_HOST}/oauth/token',
@@ -658,8 +659,8 @@ function getConfigData(req) {
     clusterType: '${process.env.CLUSTER_TYPE || ''}',
     optionalWatchServices: ${JSON.stringify(arrayFromString(process.env.OPTIONAL_WATCH_SERVICES || '', ','))},
     optionalProvisionServices: ${JSON.stringify(arrayFromString(process.env.OPTIONAL_PROVISION_SERVICES || '', ','))},
-    openshiftVersion: ${openshiftVersion}, 
-    provisionedServices: ${process.env.INSTALLED_SERVICES}
+    openshiftVersion: ${openshiftVersion},
+    provisionedServices: ${installedServices}
   };`;
 }