Don't link to secret if binding isn't ready

The secret doesn't exist until the binding is ready.
openshift · Sep 21, 2017 · 6c04b3c · 6c04b3c
1 parent 4be2b16
commit 6c04b3c
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 6 deletions.
diff --git a/app/views/directives/_service-binding.html b/app/views/directives/_service-binding.html
@@ -35,7 +35,7 @@ <h3 ng-if="$ctrl.serviceClass">
       project-name="{{$ctrl.binding.metadata.namespace}}"
       stay-on-current-page="true">
     </delete-link>
-    <a ng-if="('secrets' | canI : 'get')" ng-href="{{$ctrl.binding.spec.secretName | navigateResourceURL : 'Secret' : $ctrl.namespace}}">
+    <a ng-if="('secrets' | canI : 'get') && ($ctrl.binding | isBindingReady)" ng-href="{{$ctrl.binding.spec.secretName | navigateResourceURL : 'Secret' : $ctrl.namespace}}">
       View Secret
     </a>
   </div>

diff --git a/app/views/overview/_service-instance-row.html b/app/views/overview/_service-instance-row.html
@@ -142,11 +142,11 @@ <h3>
                   <div class="component-label">
                     Secret
                   </div>
-                  <a ng-if="('secrets' | canI : 'get')"
+                  <a ng-if="('secrets' | canI : 'get') && (binding | isBindingReady)"
                      ng-href="{{binding.spec.secretName | navigateResourceURL : 'Secret' : row.apiObject.metadata.namespace}}">
                     {{binding.spec.secretName}}
                   </a>
-                  <span ng-if="!('secrets' | canI : 'get')">
+                  <span ng-if="!('secrets' | canI : 'get') || !(binding | isBindingReady)">
                     {{binding.spec.secretName}}
                   </span>
                 </h3>

diff --git a/dist/scripts/templates.js b/dist/scripts/templates.js
@@ -5625,7 +5625,7 @@ angular.module('openshiftConsoleTemplates', []).run(['$templateCache', function(
     "<div class=\"service-binding-actions\" ng-if=\"!ctrl.binding.metadata.deletionTimestamp\">\n" +
     "<delete-link ng-if=\"({resource: 'serviceinstancecredentials', group: 'servicecatalog.k8s.io'} | canI : 'delete')\" label=\"Delete Binding\" kind=\"binding\" group=\"servicecatalog.k8s.io\" resource-name=\"{{$ctrl.binding.metadata.name}}\" project-name=\"{{$ctrl.binding.metadata.namespace}}\" stay-on-current-page=\"true\">\n" +
     "</delete-link>\n" +
-    "<a ng-if=\"('secrets' | canI : 'get')\" ng-href=\"{{$ctrl.binding.spec.secretName | navigateResourceURL : 'Secret' : $ctrl.namespace}}\">\n" +
+    "<a ng-if=\"('secrets' | canI : 'get') && ($ctrl.binding | isBindingReady)\" ng-href=\"{{$ctrl.binding.spec.secretName | navigateResourceURL : 'Secret' : $ctrl.namespace}}\">\n" +
     "View Secret\n" +
     "</a>\n" +
     "</div>\n" +
@@ -12409,10 +12409,10 @@ angular.module('openshiftConsoleTemplates', []).run(['$templateCache', function(
     "<div class=\"component-label\">\n" +
     "Secret\n" +
     "</div>\n" +
-    "<a ng-if=\"('secrets' | canI : 'get')\" ng-href=\"{{binding.spec.secretName | navigateResourceURL : 'Secret' : row.apiObject.metadata.namespace}}\">\n" +
+    "<a ng-if=\"('secrets' | canI : 'get') && (binding | isBindingReady)\" ng-href=\"{{binding.spec.secretName | navigateResourceURL : 'Secret' : row.apiObject.metadata.namespace}}\">\n" +
     "{{binding.spec.secretName}}\n" +
     "</a>\n" +
-    "<span ng-if=\"!('secrets' | canI : 'get')\">\n" +
+    "<span ng-if=\"!('secrets' | canI : 'get') || !(binding | isBindingReady)\">\n" +
     "{{binding.spec.secretName}}\n" +
     "</span>\n" +
     "</h3>\n" +