Merge pull request #642 from spadgett/check-tsb-enabled

Check service classes to determine if template service broker is enabled

Author: spadgett

dist/origin-web-catalogs.js

@@ -695,8 +695,24 @@ webpackJsonp([ 0, 1 ], [ function(e, t) {
             this.logger = a;
         }
         return e.prototype.getCatalogItems = function(e) {
-            var t = this, r = this.$q.defer(), n = {}, a = 0, s = 0, o = [], c = this.apiService.getPreferredVersion("clusterserviceclasses");
-            this.apiService.apiInfo(c) && (++a, this.dataService.list(c, {}).then(function(e) {
+            var t = this, r = this.$q.defer(), n = {}, a = 0, s = 0, o = [], c = function() {
+                if (e) {
+                    ++a;
+                    var i = t.apiService.getPreferredVersion("templates");
+                    t.dataService.list(i, {
+                        namespace: "openshift"
+                    }, null, {
+                        partialObjectMetadataList: !0
+                    }).then(function(e) {
+                        n.templates = e.by("metadata.name");
+                    }, function() {
+                        o.push("templates");
+                    }).finally(function() {
+                        t.returnCatalogItems(r, n, ++s, a, o);
+                    });
+                }
+            }, l = this.apiService.getPreferredVersion("clusterserviceclasses");
+            this.apiService.apiInfo(l) ? (++a, this.dataService.list(l, {}).then(function(e) {
                 n.serviceClasses = i.reject(e.by("metadata.name"), {
                     status: {
                         removedFromBrokerCatalog: !0
@@ -705,33 +721,22 @@ webpackJsonp([ 0, 1 ], [ function(e, t) {
             }, function() {
                 o.push("service classes");
             }).finally(function() {
-                t.returnCatalogItems(r, n, ++s, a, o);
-            })), ++a;
-            var l = this.apiService.getPreferredVersion("imagestreams");
-            if (this.dataService.list(l, {
+                i.some(n.serviceClasses, {
+                    spec: {
+                        clusterServiceBrokerName: "template-service-broker"
+                    }
+                }) || c(), t.returnCatalogItems(r, n, ++s, a, o);
+            })) : c(), ++a;
+            var d = this.apiService.getPreferredVersion("imagestreams");
+            return this.dataService.list(d, {
                 namespace: "openshift"
             }).then(function(e) {
                 n.imageStreams = e.by("metadata.name");
             }, function() {
                 o.push("builder images");
             }).finally(function() {
                 t.returnCatalogItems(r, n, ++s, a, o);
-            }), e) {
-                ++a;
-                var d = this.apiService.getPreferredVersion("templates");
-                this.dataService.list(d, {
-                    namespace: "openshift"
-                }, null, {
-                    partialObjectMetadataList: !0
-                }).then(function(e) {
-                    n.templates = e.by("metadata.name");
-                }, function() {
-                    o.push("templates");
-                }).finally(function() {
-                    t.returnCatalogItems(r, n, ++s, a, o);
-                });
-            }
-            return r.promise;
+            }), r.promise;
         }, e.prototype.getServicePlansForServiceClass = function(e) {
             var t = this.apiService.getPreferredVersion("clusterserviceplans"), r = i.isString(e) ? e : i.get(e, "metadata.name");
             if (r && this.apiService.apiInfo(t)) {

src/services/catalog.service.ts

@@ -27,6 +27,22 @@ export class CatalogService {
     let numPromisesExecuted: number = 0;
     let errorMsg: any = [];
 
+    let requestTemplates = () => {
+      if (!includeTemplates) {
+        return;
+      }
+
+      ++totalNumPromises;
+      let templateVersion = this.apiService.getPreferredVersion('templates');
+      this.dataService.list(templateVersion, {namespace: "openshift"}, null, {partialObjectMetadataList: true}).then((resources: any) => {
+        catalogItems.templates = resources.by("metadata.name");
+      }, () => {
+        errorMsg.push('templates');
+      }).finally(() => {
+        this.returnCatalogItems(deferred, catalogItems, ++numPromisesExecuted, totalNumPromises, errorMsg);
+      });
+    };
+
     // Only request service classes if the kind is available.
     let serviceClassesVersion = this.apiService.getPreferredVersion('clusterserviceclasses');
     if (this.apiService.apiInfo(serviceClassesVersion)) {
@@ -40,8 +56,17 @@ export class CatalogService {
       }, () => {
         errorMsg.push('service classes');
       }).finally(() => {
+        // Request templates only if the template service broker is not enabled to avoid showing duplicates in the catalog.
+        // Still support the `includeTemplates` parameter, however, for anyone including the catalog outside of the console.
+        var tsbEnabled = _.some(catalogItems.serviceClasses, { spec: { clusterServiceBrokerName: 'template-service-broker' } });
+        if (!tsbEnabled) {
+          requestTemplates();
+        }
         this.returnCatalogItems(deferred, catalogItems, ++numPromisesExecuted, totalNumPromises, errorMsg);
       });
+    } else {
+      // Request templates if service catalog is not enabled.
+      requestTemplates();
     }
 
     ++totalNumPromises;
@@ -54,18 +79,6 @@ export class CatalogService {
       this.returnCatalogItems(deferred, catalogItems, ++numPromisesExecuted, totalNumPromises, errorMsg);
     });
 
-    if (includeTemplates) {
-      ++totalNumPromises;
-      let templateVersion = this.apiService.getPreferredVersion('templates');
-      this.dataService.list(templateVersion, {namespace: "openshift"}, null, {partialObjectMetadataList: true}).then((resources: any) => {
-        catalogItems.templates = resources.by("metadata.name");
-      }, () => {
-        errorMsg.push('templates');
-      }).finally(() => {
-        this.returnCatalogItems(deferred, catalogItems, ++numPromisesExecuted, totalNumPromises, errorMsg);
-      });
-    }
-
     return deferred.promise;
   }