Merge pull request #1410 from benjaminapetersen/binding-update

Merged by openshift-bot

Author: OpenShift Bot

app/scripts/controllers/newOverview.js

@@ -94,6 +94,7 @@ function OverviewController($scope,
     routesByService: {},
     servicesByObjectUID: {},
     serviceInstances: {},
+    bindingsByInstanceRef: {},
     // Set to true below when metrics are available.
     showMetrics: false
   };
@@ -1072,7 +1073,7 @@ function OverviewController($scope,
   }, 300);
 
   // TODO: code duplicated from directives/bindService.js
-  // extract & share 
+  // extract & share
   var sortServiceInstances = function() {
     if(!state.serviceInstances && !state.serviceClasses) {
       return;
@@ -1252,6 +1253,10 @@ function OverviewController($scope,
         resource: 'instances'
       }, context, function(serviceInstances) {
         state.serviceInstances = serviceInstances.by('metadata.name');
+        _.each(state.serviceInstances, function(instance) {
+          var notifications = ResourceAlertsService.getServiceInstanceAlerts(instance);
+          setNotifications(instance, notifications);  
+        });
         sortServiceInstances();
         updateFilter();
       }, {poll: limitWatches, pollInterval: DEFAULT_POLL_INTERVAL}));
@@ -1263,6 +1268,7 @@ function OverviewController($scope,
         resource: 'bindings'
       }, context, function(bindings) {
         state.bindings = bindings.by('metadata.name');
+        overview.bindingsByInstanceRef = _.groupBy(state.bindings, 'spec.instanceRef.name');
         refreshSecrets(context);
         updateFilter();
       }, {poll: limitWatches, pollInterval: DEFAULT_POLL_INTERVAL}));

app/scripts/directives/overview/serviceInstanceRow.js

@@ -11,7 +11,8 @@ angular.module('openshiftConsole').component('serviceInstanceRow', {
   controllerAs: 'row',
   bindings: {
     apiObject: '<',
-    state: '<'
+    state: '<',
+    bindings: '<'
   },
   templateUrl: 'views/overview/_service-instance-row.html'
 });
@@ -21,7 +22,7 @@ function ServiceInstanceRow($filter, DataService, rowMethods, $uibModal) {
   _.extend(row, rowMethods.ui);
 
   var getErrorDetails = $filter('getErrorDetails');
-
+  
   var getDisplayName = function() {
     var serviceClassName = row.apiObject.spec.serviceClassName;
     var instanceName = row.apiObject.metadata.name;
@@ -34,17 +35,10 @@ function ServiceInstanceRow($filter, DataService, rowMethods, $uibModal) {
     return _.get(row, ['state','serviceClasses', serviceClassName, 'description']);
   };
 
-  var getBindings = function() {
-    return _.filter(row.state.bindings, function(binding) {
-      return binding.spec.instanceRef.name === row.apiObject.metadata.name;
-    });
-  };
-
   row.$onChanges = function() {
     row.notifications = rowMethods.getNotifications(row.apiObject, row.state);
     row.displayName = getDisplayName();
     row.description = getDescription();
-    row.instanceBindings = getBindings();
   };
 
   row.getSecretForBinding = function(binding) {

app/scripts/filters/resources.js

@@ -1084,6 +1084,8 @@ angular.module('openshiftConsole')
       return lastFinishTime;
     };
   })
+  // gets the status condition that matches provided type
+  // statusCondition(object, 'Ready')
   .filter('statusCondition', function() {
     return function(apiObject, type) {
       if (!apiObject) {
@@ -1093,6 +1095,14 @@ angular.module('openshiftConsole')
       return _.find(_.get(apiObject, 'status.conditions'), {type: type});
     };
   })
+  .filter('isServiceInstanceReady', function(statusConditionFilter) {
+    return function(apiObject) {
+      return _.get(statusConditionFilter(apiObject, 'Ready'), 'status') === 'True';
+    };
+  })
+  .filter('isBindingReady', function(isServiceInstanceReadyFilter) {
+    return isServiceInstanceReadyFilter;
+  })
   .filter('routeIngressCondition', function() {
     return function(ingress, type) {
       if (!ingress) {

app/scripts/services/resourceAlerts.js

@@ -147,10 +147,39 @@ angular.module("openshiftConsole")
       return alerts;
     };
 
+    var makeConditionAlert = function(alerts, uid, condition, type) {
+      alerts[uid+'-'+condition.reason] = {
+        type: type,
+        message: condition.message
+      };
+    };
+
+    var getServiceInstanceAlerts = function(instance) {
+      var alerts = {};
+      if(!instance) {
+        return alerts;
+      }
+      var uid = instance.metadata.uid;
+      var namespaceError = _.find(instance.status.conditions, {reason: 'ErrorFindingNamespaceForInstance'});
+      var provisionFail = _.find(instance.status.conditions, {reason: 'ProvisionFailed'});
+      var deprovisionFail = _.find(instance.status.conditions, {reason: 'DeprovisioningFailed'});
+
+      if(namespaceError) {
+        makeConditionAlert(alerts, uid, namespaceError, 'warning');
+      }
+      if(provisionFail) {
+        makeConditionAlert(alerts, uid, provisionFail, 'error');
+      }
+      if(deprovisionFail) {
+        makeConditionAlert(alerts, uid, deprovisionFail, 'error');
+      }
+      return alerts;
+    };
+
     return {
       getPodAlerts: getPodAlerts,
       setGenericQuotaWarning: setGenericQuotaWarning,
-      getDeploymentStatusAlerts: getDeploymentStatusAlerts
+      getDeploymentStatusAlerts: getDeploymentStatusAlerts,
+      getServiceInstanceAlerts: getServiceInstanceAlerts
     };
   });
-

app/views/directives/bind-service/results.html

@@ -1,13 +1,13 @@
 <div>
   <div ng-if="!ctrl.error">
-    <div ng-if="(ctrl.binding | statusCondition : 'Ready').status !== 'True'">
+    <div ng-if="!(ctrl.binding | isBindingReady)">
       <h3 class="mar-top-none center">
         <span class="fa fa-spinner fa-pulse fa-3x fa-fw" aria-hidden="true"></span>
         <span class="sr-only">Pending</span>
         <div class="mar-top-lg">The binding was created but is not ready yet.</div>
       </h3>
     </div>
-    <div ng-if="(ctrl.binding | statusCondition : 'Ready').status === 'True'">
+    <div ng-if="(ctrl.binding | isBindingReady)">
       <h3 class="mar-top-none">
         <strong>{{ctrl.serviceToBind}}</strong> has been bound to <strong>{{ctrl.target.metadata.name}}</strong> successfully
       </h3>

app/views/directives/bind-service/select-service.html

@@ -8,7 +8,7 @@ <h3 class="mar-top-none">Select a service to bind to <strong>{{ctrl.target.metad
       <label>
         <input type="radio" ng-model="ctrl.serviceToBind" value="{{serviceInstance.metadata.name}}">
         {{ctrl.serviceClasses[serviceInstance.spec.serviceClassName].osbMetadata.displayName || serviceInstance.spec.serviceClassName}}
-        <span ng-if="(serviceInstance | statusCondition : 'Ready').status !== 'True'" class="mar-left-sm">
+        <span ng-if="!(serviceInstance | isServiceInstanceReady)" class="mar-left-sm">
           <span class="pficon pficon-info" data-content="This service is not yet ready. If you bind to it, then the binding will be pending until the service is ready." data-toggle="popover" data-trigger="hover"></span>
         </span>
         <div class="help-block mar-top-none">

app/views/new-overview.html

@@ -365,6 +365,7 @@ <h2 ng-if="overview.state.serviceInstances">
                   <service-instance-row
                     ng-repeat="serviceInstance in overview.state.orderedServiceInstances"
                     api-object="serviceInstance"
+                    bindings="overview.bindingsByInstanceRef[serviceInstance.metadata.name]"
                     state="overview.state"></service-instance-row>
                 </div>
               </div>

app/views/overview/_service-instance-row.html

@@ -19,8 +19,7 @@ <h3>
       </div>
     </div>
 
-    <div
-      class="list-pf-content hidden-xs hidden-sm">
+    <div class="list-pf-content hidden-xs hidden-sm">
       <div class="list-pf-content-right">
         <div>
           <strong ng-if="!row.instanceBindings.length">No Bindings</strong>
@@ -68,62 +67,68 @@ <h3>
     ng-class="{ in: row.expanded }">
 
     <div class="list-pf-container">
-
-      <!--
-        TODO: follow-on PR
       <div class="expanded-section">
-        <div class="section-title">
-          Configuration Details
-        </div>
-        <div class="row" ng-repeat="item in [{
-          name: 'password',
-          value: '*****'
-        }, {
-          name: 'lorem ipsum',
-          value: 'dolor sit amet'
-        }]">
-          <div class="col-sm-5">{{item.name}}</div>
-          <div class="col-sm-7">{{item.value}}</div>
+        <alerts alerts="row.notifications"></alerts>
+        <!--
+          TODO: follow-on PR
+        <div class="expanded-section">
+          <div class="section-title">
+            Configuration Details
+          </div>
+          <div class="row" ng-repeat="item in [{
+            name: 'password',
+            value: '*****'
+          }, {
+            name: 'lorem ipsum',
+            value: 'dolor sit amet'
+          }]">
+            <div class="col-sm-5">{{item.name}}</div>
+            <div class="col-sm-7">{{item.value}}</div>
+          </div>
         </div>
-      </div>
-      -->
+        -->
 
-      <div class="row">
-        <div class="col-sm-12" ng-if="row.description">
-          <p class="pre-wrap" ng-bind-html="row.description | linky"></p>
+        <div class="row">
+          <div class="col-sm-12" ng-if="row.description">
+            <p class="pre-wrap" ng-bind-html="row.description | linky"></p>
+          </div>
         </div>
-      </div>
-      <div class="section-title">
-        Bindings
-      </div>
-      <span ng-if="!row.instanceBindings.length">There are no bindings.</span>
-      <div
-        ng-if="row.instanceBindings.length"
-        class="row"
-        ng-repeat="binding in row.instanceBindings">
-        <div class="col-sm-4">
-          <span>{{binding.metadata.name}}</span>
+        <div class="section-title">
+          Bindings
         </div>
-        <div class="col-sm-8">
-          <!-- TODO: follow-on PR
-          <a ng-href="{{binding | navigateResourceURL}}">View configuration details</a>
-          -->
-          <a href="{{row.getSecretForBinding(binding) | navigateResourceURL}}">
-            View secret
-          </a>
+        <span ng-if="!row.bindings">There are no bindings.</span>
+        <div
+          ng-if="row.bindings"
+          class="row"
+          ng-repeat="(name, binding) in row.bindings">
+          <div class="col-sm-5">
+            <span>{{binding.metadata.name}}</span>
+          </div>
+          <div class="col-sm-7">
+            <!-- TODO: follow-on PR
+            <a ng-href="{{binding | navigateResourceURL}}">View configuration details</a>
+            -->
+            <span ng-if="!(binding | isBindingReady)">
+              <status-icon status="'Pending'"></status-icon> Pending
+            </span>
+            <a
+              ng-if="(binding | isBindingReady) && ('secrets' | canI : 'get')"
+              href="{{row.getSecretForBinding(binding) | navigateResourceURL}}">
+              View secret
+            </a>
+          </div>
         </div>
-      </div>
-      <!-- TODO: follow-on PR
-      <div class="row">
-        <div class="col-sm-12">
-          <a href="#">
-            <i class="fa fa-plus-circle"></i> Create binding
-          </a>
+        <!-- TODO: follow-on PR
+        <div class="row">
+          <div class="col-sm-12">
+            <a href="#">
+              <i class="fa fa-plus-circle"></i> Create binding
+            </a>
+          </div>
         </div>
+        -->
       </div>
-      -->
     </div>
-
   </div>
 
 </div>

dist/scripts/scripts.js

@@ -19,6 +19,7 @@ recentPipelinesByDeploymentConfig:{},
 routesByService:{},
 servicesByObjectUID:{},
 serviceInstances:{},
+bindingsByInstanceRef:{},
 showMetrics:!1
 };
 d.getAlerts().forEach(function(a) {
@@ -453,15 +454,18 @@ pollInterval:x
 group:"servicecatalog.k8s.io",
 resource:"instances"
 }, c, function(a) {
-L.serviceInstances = a.by("metadata.name"), Wa(), da();
+L.serviceInstances = a.by("metadata.name"), _.each(L.serviceInstances, function(a) {
+var b = t.getServiceInstanceAlerts(a);
+ha(a, b);
+}), Wa(), da();
 }, {
 poll:w,
 pollInterval:x
 })), g.ENABLE_TECH_PREVIEW_FEATURE.service_catalog_landing_page && Xa.push(h.watch({
 group:"servicecatalog.k8s.io",
 resource:"bindings"
 }, c, function(a) {
-L.bindings = a.by("metadata.name"), Va(c), da();
+L.bindings = a.by("metadata.name"), v.bindingsByInstanceRef = _.groupBy(L.bindings, "spec.instanceRef.name"), Va(c), da();
 }, {
 poll:w,
 pollInterval:x
@@ -955,13 +959,9 @@ return c || a || b;
 }, h = function() {
 var a = e.apiObject.spec.serviceClassName;
 return _.get(e, [ "state", "serviceClasses", a, "description" ]);
-}, i = function() {
-return _.filter(e.state.bindings, function(a) {
-return a.spec.instanceRef.name === e.apiObject.metadata.name;
-});
 };
 e.$onChanges = function() {
-e.notifications = c.getNotifications(e.apiObject, e.state), e.displayName = g(), e.description = h(), e.instanceBindings = i();
+e.notifications = c.getNotifications(e.apiObject, e.state), e.displayName = g(), e.description = h();
 }, e.getSecretForBinding = function(a) {
 return a && _.get(e, [ "state", "secrets", a.spec.secretName ]);
 }, e.closeOverlayPanel = function() {
@@ -4426,11 +4426,28 @@ label:"View Events"
 };
 }
 return g;
+}, k = function(a, b, c, d) {
+a[b + "-" + c.reason] = {
+type:d,
+message:c.message
+};
+}, l = function(a) {
+var b = {};
+if (!a) return b;
+var c = a.metadata.uid, d = _.find(a.status.conditions, {
+reason:"ErrorFindingNamespaceForInstance"
+}), e = _.find(a.status.conditions, {
+reason:"ProvisionFailed"
+}), f = _.find(a.status.conditions, {
+reason:"DeprovisioningFailed"
+});
+return d && k(b, c, d, "warning"), e && k(b, c, e, "error"), f && k(b, c, f, "error"), b;
 };
 return {
 getPodAlerts:h,
 setGenericQuotaWarning:i,
-getDeploymentStatusAlerts:j
+getDeploymentStatusAlerts:j,
+getServiceInstanceAlerts:l
 };
 } ]), angular.module("openshiftConsole").factory("ListRowUtils", function() {
 var a = function(a) {
@@ -13808,7 +13825,8 @@ controller:[ "$filter", "DataService", "ListRowUtils", "$uibModal", ServiceInsta
 controllerAs:"row",
 bindings:{
 apiObject:"<",
-state:"<"
+state:"<",
+bindings:"<"
 },
 templateUrl:"views/overview/_service-instance-row.html"
 }), angular.module("openshiftConsole").component("overviewNetworking", {
@@ -14855,7 +14873,13 @@ return a ? _.find(_.get(a, "status.conditions"), {
 type:b
 }) :null;
 };
-}).filter("routeIngressCondition", function() {
+}).filter("isServiceInstanceReady", [ "statusConditionFilter", function(a) {
+return function(b) {
+return "True" === _.get(a(b, "Ready"), "status");
+};
+} ]).filter("isBindingReady", [ "isServiceInstanceReadyFilter", function(a) {
+return a;
+} ]).filter("routeIngressCondition", function() {
 return function(a, b) {
 return a ? _.find(a.conditions, {
 type:b