Merge pull request #493 from aidenkeating/INTLY-2663-user-sso

INTLY-2663 add user sso provision to startup loading task

Author: aidenkeating

package.json

@@ -1,6 +1,6 @@
 {
   "name": "integreatly-web-app",
-  "version": "2.13.1",
+  "version": "2.14.0",
   "private": true,
   "proxy": "http://localhost:5001/",
   "dependencies": {

server.js

@@ -574,6 +574,15 @@ function getMockConfigData() {
             dashboardURL:'${process.env.OPENSHIFT_URL}',
             conditions: [{ status: 'True' }]
           }
+        },
+        {
+          spec: {
+            clusterServiceClassExternalName: 'user-rhsso'
+          },
+          status: {
+            dashboardURL: '${process.env.OPENSHIFT_URL}',
+            conditions: [{ status: 'True' }]
+          }
         }
       ]
     }

src/common/docsHelpers.js

@@ -59,6 +59,7 @@ const getMiddlewareServiceAttrs = middlewareServices => {
     'api-management-url': getUrlFromMiddlewareServices(middlewareServices, DEFAULT_SERVICES.THREESCALE),
     'enmasse-url': getUrlFromMiddlewareServices(middlewareServices, DEFAULT_SERVICES.ENMASSE),
     'amq-url': getUrlFromMiddlewareServices(middlewareServices, DEFAULT_SERVICES.AMQ),
+    'user-sso-url': getUrlFromMiddlewareServices(middlewareServices, DEFAULT_SERVICES.USER_RHSSO),
     'enmasse-broker-url': middlewareServices.enmasseCredentials.url,
     'enmasse-credentials-username': middlewareServices.enmasseCredentials.username,
     'enmasse-credentials-password': middlewareServices.enmasseCredentials.password,

src/common/serviceInstanceHelpers.js

@@ -60,7 +60,8 @@ const DEFAULT_SERVICES = {
   THREESCALE: '3scale',
   APICURIO: 'apicurio',
   FUSE_MANAGED: 'fuse-managed',
-  RHSSO: 'rhsso'
+  RHSSO: 'rhsso',
+  USER_RHSSO: 'user-rhsso'
 };
 
 const DEFAULT_TRANSFORMS = [

src/components/installedAppsView/InstalledAppsView.js

@@ -185,6 +185,9 @@ class InstalledAppsView extends React.Component {
   static createMasterList(displayServices, apps, customApps, enableLaunch, launchHandler) {
     const completeSvcNames = apps
       .map(svc => {
+        if (svc.type === SERVICE_TYPES.PROVISIONED_SERVICE) {
+          return svc.name;
+        }
         if (!svc.spec || !svc.spec.clusterServiceClassExternalName) {
           return null;
         }
@@ -234,7 +237,9 @@ class InstalledAppsView extends React.Component {
         return hidden ? null : (
           <DataList
             aria-label="Cluster service datalist"
-            key={`${app.spec.clusterServiceClassExternalName}`}
+            key={`${
+              app.type === SERVICE_TYPES.PROVISIONED_SERVICE ? app.name : app.spec.clusterServiceClassExternalName
+            }`}
             id={`cluster-service-datalist-item-${index}`}
           >
             <DataListItem

src/product-info.js

@@ -32,6 +32,10 @@ export default {
     gaStatus: 'GA'
   },
   rhsso: {
+    prettyName: 'Red Hat Single Sign-On (Cluster)',
+    gaStatus: 'GA'
+  },
+  'user-rhsso': {
     prettyName: 'Red Hat Single Sign-On',
     gaStatus: 'GA'
   }

src/services/middlewareServices.js

@@ -34,7 +34,8 @@ const WATCH_SERVICES = [
   DEFAULT_SERVICES.FUSE_MANAGED,
   DEFAULT_SERVICES.FUSE,
   DEFAULT_SERVICES.ENMASSE,
-  DEFAULT_SERVICES.RHSSO
+  DEFAULT_SERVICES.RHSSO,
+  DEFAULT_SERVICES.USER_RHSSO
 ];
 
 // The default services to show in any user-facing manner, even if they aren't
@@ -48,7 +49,8 @@ const PROVISION_SERVICES = [
   DEFAULT_SERVICES.APICURIO,
   DEFAULT_SERVICES.THREESCALE,
   DEFAULT_SERVICES.FUSE_MANAGED,
-  DEFAULT_SERVICES.RHSSO
+  DEFAULT_SERVICES.RHSSO,
+  DEFAULT_SERVICES.USER_RHSSO
 ];
 
 /**