Upgrade versions of catalog (0.0.27) and common (0.0.39)

Added project display name to common bind service form component.
openshift · Jun 28, 2017 · f07da83 · f07da83
1 parent 2fb6223
commit f07da83
Show file tree

Hide file tree

Showing 9 changed files with 73 additions and 56 deletions.
diff --git a/app/scripts/directives/bindService.js b/app/scripts/directives/bindService.js
@@ -12,6 +12,7 @@
     controllerAs: 'ctrl',
     bindings: {
       target: '<',
+      project: '<',
       onClose: '<'
     },
     templateUrl: 'views/directives/bind-service.html'
@@ -145,12 +146,12 @@
 
     ctrl.$onInit = function() {
       ctrl.serviceSelection = {};
-      var formStepLabel = (ctrl.target.kind === 'Instance') ? 'Applications' : 'Services';
+      ctrl.projectDisplayName = $filter('displayName')(ctrl.project);
 
       ctrl.steps = [
         {
           id: 'bindForm',
-          label: formStepLabel,
+          label: "Binding",
           view: 'views/directives/bind-service/bind-service-form.html',
           valid: true,
           onShow: showBind
@@ -190,6 +191,12 @@
       }
     };
 
+    ctrl.$onChanges = function(onChangesObj) {
+      if (onChangesObj.project && !onChangesObj.project.isFirstChange()) {
+        ctrl.projectDisplayName = $filter('displayName')(ctrl.project);
+      }
+    };
+
     ctrl.$onDestroy = function() {
       if (validityWatcher) {
         validityWatcher();

diff --git a/app/views/directives/bind-service/bind-service-form.html b/app/views/directives/bind-service/bind-service-form.html
@@ -12,6 +12,7 @@
                      service-class-name="ctrl.serviceClassName"
                      form-name="ctrl.selectionForm"
                      applications="ctrl.applications"
+                     project-name="ctrl.projectDisplayName"
                      bind-type="ctrl.bindType"
                      app-to-bind="ctrl.appToBind">
   </bind-service-form>

diff --git a/app/views/overview/_list-row.html b/app/views/overview/_list-row.html
@@ -16,6 +16,7 @@
 <overlay-panel single-column="true" show-panel="row.overlay.panelVisible" show-close="true" handle-close="row.closeOverlayPanel">
   <div ng-if="row.overlay.panelName === 'bindService'">
     <bind-service target="row.overlay.state.target"
+                  project="row.state.project"
                   on-close="row.closeOverlayPanel"></bind-service>
   </div>
   <div ng-if="row.overlay.panelName === 'unbindService'">

diff --git a/app/views/overview/_service-instance-row.html b/app/views/overview/_service-instance-row.html
@@ -159,6 +159,7 @@ <h3>
 <overlay-panel single-column="true" show-panel="row.overlay.panelVisible" show-close="true" handle-close="row.closeOverlayPanel">
   <div ng-if="row.overlay.panelName === 'bindService'">
     <bind-service target="row.overlay.state.target"
+                  project="row.state.project"
                   on-close="row.closeOverlayPanel"></bind-service>
   </div>
   <div ng-if="row.overlay.panelName === 'unbindService'">

diff --git a/bower.json b/bower.json
@@ -46,8 +46,8 @@
     "angular-moment": "1.0.0",
     "angular-utf8-base64": "0.0.5",
     "file-saver": "1.3.3",
-    "origin-web-common": "0.0.38",
-    "origin-web-catalog": "0.0.26"
+    "origin-web-common": "0.0.39",
+    "origin-web-catalog": "0.0.27"
   },
   "devDependencies": {
     "angular-mocks": "1.5.11",

diff --git a/dist/scripts/scripts.js b/dist/scripts/scripts.js
@@ -12319,11 +12319,9 @@ l.serviceInstances = a.by("metadata.name"), l.serviceToBind || n(), o();
 });
 };
 l.$onInit = function() {
-l.serviceSelection = {};
-var a = "Instance" === l.target.kind ? "Applications" :"Services";
-l.steps = [ {
+l.serviceSelection = {}, l.projectDisplayName = b("displayName")(l.project), l.steps = [ {
 id:"bindForm",
-label:a,
+label:"Binding",
 view:"views/directives/bind-service/bind-service-form.html",
 valid:!0,
 onShow:q
@@ -12339,6 +12337,8 @@ resource:"serviceclasses"
 }, {}).then(function(a) {
 l.serviceClasses = a.by("metadata.name"), "Instance" === l.target.kind && (l.serviceClass = l.serviceClasses[l.target.spec.serviceClassName], l.serviceClassName = l.target.spec.serviceClassName), o();
 }), "Instance" === l.target.kind ? (l.bindType = "secret-only", l.appToBind = null, l.serviceToBind = l.target.metadata.name, s()) :(l.bindType = "application", l.appToBind = l.target, t());
+}, l.$onChanges = function(a) {
+a.project && !a.project.isFirstChange() && (l.projectDisplayName = b("displayName")(l.project));
 }, l.$onDestroy = function() {
 e && (e(), e = void 0), f && c.unwatch(f);
 }, l.bindService = function() {
@@ -12361,6 +12361,7 @@ controller:[ "$scope", "$filter", "DataService", "BindingService", a ],
 controllerAs:"ctrl",
 bindings:{
 target:"<",
+project:"<",
 onClose:"<"
 },
 templateUrl:"views/directives/bind-service.html"

diff --git a/dist/scripts/templates.js b/dist/scripts/templates.js
@@ -5812,7 +5812,7 @@ angular.module('openshiftConsoleTemplates', []).run(['$templateCache', function(
     "</bind-application-form>\n" +
     "</div>\n" +
     "<div ng-if=\"ctrl.target.kind === 'Instance'\">\n" +
-    "<bind-service-form selected-project=\"ctrl.project\" service-class=\"ctrl.serviceClass\" service-class-name=\"ctrl.serviceClassName\" form-name=\"ctrl.selectionForm\" applications=\"ctrl.applications\" bind-type=\"ctrl.bindType\" app-to-bind=\"ctrl.appToBind\">\n" +
+    "<bind-service-form selected-project=\"ctrl.project\" service-class=\"ctrl.serviceClass\" service-class-name=\"ctrl.serviceClassName\" form-name=\"ctrl.selectionForm\" applications=\"ctrl.applications\" project-name=\"ctrl.projectDisplayName\" bind-type=\"ctrl.bindType\" app-to-bind=\"ctrl.appToBind\">\n" +
     "</bind-service-form>\n" +
     "</div>"
   );
@@ -12021,7 +12021,7 @@ angular.module('openshiftConsoleTemplates', []).run(['$templateCache', function(
     "</div>\n" +
     "<overlay-panel single-column=\"true\" show-panel=\"row.overlay.panelVisible\" show-close=\"true\" handle-close=\"row.closeOverlayPanel\">\n" +
     "<div ng-if=\"row.overlay.panelName === 'bindService'\">\n" +
-    "<bind-service target=\"row.overlay.state.target\" on-close=\"row.closeOverlayPanel\"></bind-service>\n" +
+    "<bind-service target=\"row.overlay.state.target\" project=\"row.state.project\" on-close=\"row.closeOverlayPanel\"></bind-service>\n" +
     "</div>\n" +
     "<div ng-if=\"row.overlay.panelName === 'unbindService'\">\n" +
     "<unbind-service target=\"row.overlay.state.target\" bindings=\"row.state.deleteableBindingsByApplicationUID[row.overlay.state.target.metadata.uid]\" on-close=\"row.closeOverlayPanel\"></unbind-service>\n" +
@@ -12355,7 +12355,7 @@ angular.module('openshiftConsoleTemplates', []).run(['$templateCache', function(
     "</div>\n" +
     "<overlay-panel single-column=\"true\" show-panel=\"row.overlay.panelVisible\" show-close=\"true\" handle-close=\"row.closeOverlayPanel\">\n" +
     "<div ng-if=\"row.overlay.panelName === 'bindService'\">\n" +
-    "<bind-service target=\"row.overlay.state.target\" on-close=\"row.closeOverlayPanel\"></bind-service>\n" +
+    "<bind-service target=\"row.overlay.state.target\" project=\"row.state.project\" on-close=\"row.closeOverlayPanel\"></bind-service>\n" +
     "</div>\n" +
     "<div ng-if=\"row.overlay.panelName === 'unbindService'\">\n" +
     "<unbind-service target=\"row.overlay.state.target\" bindings=\"row.deleteableBindings\" applications-by-binding=\"row.state.applicationsByBinding\" on-close=\"row.closeOverlayPanel\"></unbind-service>\n" +