Merge pull request #1474 from spadgett/bump-origin-web-catalog-0.0.12

Merged by openshift-bot

Author: OpenShift Bot

app/scripts/controllers/landingPage.js

@@ -4,8 +4,8 @@ angular.module('openshiftConsole')
   .controller('LandingPageController',
               function($scope,
                        AuthService,
+                       Catalog,
                        Constants,
-                       DataService,
                        Navigate,
                        NotificationsService) {
     $scope.saasOfferings = Constants.SAAS_OFFERINGS;
@@ -19,15 +19,8 @@ angular.module('openshiftConsole')
     NotificationsService.clearNotifications();
 
     AuthService.withUser().then(function() {
-      DataService.list({
-        group: 'servicecatalog.k8s.io',
-        resource: 'serviceclasses'
-      }, $scope).then(function(resp) {
-        $scope.serviceClasses = resp.by('metadata.name');
-      });
-
-      DataService.list('imagestreams', { namespace: 'openshift' }).then(function(resp) {
-        $scope.imageStreams = resp.by('metadata.name');
+      Catalog.getCatalogItems().then(function(items) {
+        $scope.catalogItems = items;
       });
     });
   });

app/views/landing-page.html

@@ -10,30 +10,18 @@
         <div class="middle-content">
           <landing-page>
             <landingsearch>
-              <catalog-search
-                  service-classes="serviceClasses"
-                  image-streams="imageStreams"
-                  base-project-url="project">
-              </catalog-search>
+              <catalog-search catalog-items="catalogItems" base-project-url="project"></catalog-search>
             </landingsearch>
             <landingheader>
               <div class="build-applications-view">
                 <saas-list saas-offerings="saasOfferings"></saas-list>
               </div>
             </landingheader>
             <landingbody>
-              <services-view
-                  base-project-url="project"
-                  service-classes="serviceClasses"
-                  image-streams="imageStreams">
-              </services-view>
+              <services-view catalog-items="catalogItems" base-project-url="project"></services-view>
             </landingbody>
             <landingside>
-              <projects-summary
-                  base-project-url="project"
-                  projects-url="projects"
-                  view-edit-membership="viewMembership">
-              </projects-summary>
+              <projects-summary base-project-url="project" projects-url="projects" view-edit-membership="viewMembership"></projects-summary>
             </landingside>
           </landing-page>
         </div><!-- /middle-content -->

bower.json

@@ -47,8 +47,8 @@
     "angular-utf8-base64": "0.0.5",
     "file-saver": "1.3.3",
     "bootstrap-switch": "3.3.3",
-    "origin-web-common": "0.0.15",
-    "origin-web-catalog": "0.0.11"
+    "origin-web-common": "0.0.16",
+    "origin-web-catalog": "0.0.12"
   },
   "devDependencies": {
     "angular-mocks": "1.5.11",

dist/scripts/scripts.js

@@ -4667,19 +4667,12 @@ _.set(this, "selectedTab.networking", !0), b(this);
 }
 }
 };
-}), angular.module("openshiftConsole").controller("LandingPageController", [ "$scope", "AuthService", "Constants", "DataService", "Navigate", "NotificationsService", function(a, b, c, d, e, f) {
-a.saasOfferings = c.SAAS_OFFERINGS, a.viewMembership = function(a) {
+}), angular.module("openshiftConsole").controller("LandingPageController", [ "$scope", "AuthService", "Catalog", "Constants", "Navigate", "NotificationsService", function(a, b, c, d, e, f) {
+a.saasOfferings = d.SAAS_OFFERINGS, a.viewMembership = function(a) {
 e.toProjectMembership(a.metadata.name);
 }, f.clearNotifications(), b.withUser().then(function() {
-d.list({
-group:"servicecatalog.k8s.io",
-resource:"serviceclasses"
-}, a).then(function(b) {
-a.serviceClasses = b.by("metadata.name");
-}), d.list("imagestreams", {
-namespace:"openshift"
-}).then(function(b) {
-a.imageStreams = b.by("metadata.name");
+c.getCatalogItems().then(function(b) {
+a.catalogItems = b;
 });
 });
 } ]), angular.module("openshiftConsole").controller("ProjectsController", [ "$scope", "$filter", "$location", "$route", "$timeout", "AlertMessageService", "AuthService", "DataService", "KeywordService", "Logger", "ProjectsService", function(a, b, c, d, e, f, g, h, i, j, k) {

dist/scripts/templates.js

@@ -10357,21 +10357,18 @@ angular.module('openshiftConsoleTemplates', []).run(['$templateCache', function(
     "<div class=\"middle-content\">\n" +
     "<landing-page>\n" +
     "<landingsearch>\n" +
-    "<catalog-search service-classes=\"serviceClasses\" image-streams=\"imageStreams\" base-project-url=\"project\">\n" +
-    "</catalog-search>\n" +
+    "<catalog-search catalog-items=\"catalogItems\" base-project-url=\"project\"></catalog-search>\n" +
     "</landingsearch>\n" +
     "<landingheader>\n" +
     "<div class=\"build-applications-view\">\n" +
     "<saas-list saas-offerings=\"saasOfferings\"></saas-list>\n" +
     "</div>\n" +
     "</landingheader>\n" +
     "<landingbody>\n" +
-    "<services-view base-project-url=\"project\" service-classes=\"serviceClasses\" image-streams=\"imageStreams\">\n" +
-    "</services-view>\n" +
+    "<services-view catalog-items=\"catalogItems\" base-project-url=\"project\"></services-view>\n" +
     "</landingbody>\n" +
     "<landingside>\n" +
-    "<projects-summary base-project-url=\"project\" projects-url=\"projects\" view-edit-membership=\"viewMembership\">\n" +
-    "</projects-summary>\n" +
+    "<projects-summary base-project-url=\"project\" projects-url=\"projects\" view-edit-membership=\"viewMembership\"></projects-summary>\n" +
     "</landingside>\n" +
     "</landing-page>\n" +
     "</div>\n" +