Merge pull request #2827 from benjaminapetersen/trello/api-groups/component/list-row-actions

Automatic merge from submit-queue.

Update list-row-actions include to use getPreferredVersion for canI checks

Author: openshift-merge-robot

app/scripts/directives/overview/listRow.js

@@ -45,6 +45,11 @@
     var enableTechPreviewFeature = $filter('enableTechPreviewFeature');
 
     row.serviceBindingsVersion = APIService.getPreferredVersion('servicebindings');
+    row.deploymentConfigsVersion = APIService.getPreferredVersion('deploymentconfigs');
+    row.deploymentConfigsInstantiateVersion = APIService.getPreferredVersion('deploymentconfigs/instantiate');
+    row.deploymentConfigsLogVersion = APIService.getPreferredVersion('deploymentconfigs/log');
+    row.podsVersion = APIService.getPreferredVersion('pods');
+    row.podsLogVersion = APIService.getPreferredVersion('pods/log');
 
     var updateTriggers = function(apiObject) {
       var triggers = _.get(apiObject, 'spec.triggers');

app/views/overview/_list-row-actions.html

@@ -14,13 +14,13 @@
             <li ng-if="row.showStartBuildAction()" role="menuitem">
               <a href="" ng-click="row.startBuild(row.buildConfigs[0])">Start Build</a>
             </li>
-            <li ng-if="'deploymentconfigs/instantiate' | canI : 'create'" role="menuitem">
+            <li ng-if="row.deploymentConfigsInstantiateVersion | canI : 'create'" role="menuitem">
               <a href="" ng-if="row.canDeploy()" ng-click="row.startDeployment()">Deploy</a>
               <a href="" ng-if="!(row.canDeploy())" class="disabled-link" aria-disabled="true">
                 Deploy <span ng-if="row.isPaused()">(Paused)</span>
               </a>
             </li>
-            <li ng-if="'deploymentconfigs' | canI : 'update'" role="menuitem">
+            <li ng-if="row.deploymentConfigsVersion | canI : 'update'" role="menuitem">
               <a ng-href="{{row.apiObject | editResourceURL}}">Edit</a>
             </li>
             <li ng-if="('pod_presets' | enableTechPreviewFeature)
@@ -33,7 +33,7 @@
                       && (row.serviceBindingsVersion | canI : 'delete')" role="menuitem">
               <a href="" ng-click="row.showOverlayPanel('unbindService', {target: row.apiObject})">Delete Binding</a>
             </li>
-            <li ng-if="row.current && ('deploymentconfigs/log' | canI : 'get')" role="menuitem">
+            <li ng-if="row.current && (row.deploymentConfigsLogVersion | canI : 'get')" role="menuitem">
               <a ng-href="{{row.current | navigateResourceURL}}?tab=logs">View Logs</a>
             </li>
           </ul>
@@ -45,10 +45,10 @@
             <i class="fa fa-ellipsis-v" aria-hidden="true"></i><span class="sr-only">Actions</span>
           </button>
           <ul class="dropdown-menu dropdown-menu-right" uib-dropdown-menu role="menu">
-            <li role="menuitem" ng-if="'pods' | canI : 'update'">
+            <li role="menuitem" ng-if="row.podsVersion | canI : 'update'">
               <a ng-href="{{row.apiObject | editYamlURL}}">Edit YAML</a>
             </li>
-            <li role="menuitem" ng-if="('pods/log' | canI : 'get')">
+            <li role="menuitem" ng-if="(row.podsLogVersion | canI : 'get')">
               <a ng-href="{{row.apiObject | navigateResourceURL}}?tab=logs">View Logs</a>
             </li>
           </ul>
@@ -73,7 +73,7 @@
                       && (row.serviceBindingsVersion | canI : 'delete')" role="menuitem">
               <a href="" ng-click="row.showOverlayPanel('unbindService', {target: row.apiObject})">Delete Binding</a>
             </li>
-            <li ng-if="(pod = row.firstPod(row.current)) && ('pods/log' | canI : 'get')" role="menuitem">
+            <li ng-if="(pod = row.firstPod(row.current)) && (row.podsLogVersion | canI : 'get')" role="menuitem">
               <a ng-href="{{pod | navigateResourceURL}}?tab=logs">View Logs</a>
             </li>
           </ul>

dist/scripts/scripts.js

@@ -14039,7 +14039,7 @@ controller: [ "$filter", "$uibModal", "APIService", "BuildsService", "CatalogSer
 var l = this;
 _.extend(l, i.ui);
 var u = e("canI"), d = e("deploymentIsInProgress"), m = e("isBinaryBuild"), p = e("enableTechPreviewFeature");
-l.serviceBindingsVersion = n.getPreferredVersion("servicebindings");
+l.serviceBindingsVersion = n.getPreferredVersion("servicebindings"), l.deploymentConfigsVersion = n.getPreferredVersion("deploymentconfigs"), l.deploymentConfigsInstantiateVersion = n.getPreferredVersion("deploymentconfigs/instantiate"), l.deploymentConfigsLogVersion = n.getPreferredVersion("deploymentconfigs/log"), l.podsVersion = n.getPreferredVersion("pods"), l.podsLogVersion = n.getPreferredVersion("pods/log");
 var f = function(e) {
 var t = _.get(e, "spec.triggers");
 _.isEmpty(t) || (l.imageChangeTriggers = _.filter(t, function(e) {

dist/scripts/templates.js

@@ -12180,13 +12180,13 @@ angular.module('openshiftConsoleTemplates', []).run(['$templateCache', function(
     "<li ng-if=\"row.showStartBuildAction()\" role=\"menuitem\">\n" +
     "<a href=\"\" ng-click=\"row.startBuild(row.buildConfigs[0])\">Start Build</a>\n" +
     "</li>\n" +
-    "<li ng-if=\"'deploymentconfigs/instantiate' | canI : 'create'\" role=\"menuitem\">\n" +
+    "<li ng-if=\"row.deploymentConfigsInstantiateVersion | canI : 'create'\" role=\"menuitem\">\n" +
     "<a href=\"\" ng-if=\"row.canDeploy()\" ng-click=\"row.startDeployment()\">Deploy</a>\n" +
     "<a href=\"\" ng-if=\"!(row.canDeploy())\" class=\"disabled-link\" aria-disabled=\"true\">\n" +
     "Deploy <span ng-if=\"row.isPaused()\">(Paused)</span>\n" +
     "</a>\n" +
     "</li>\n" +
-    "<li ng-if=\"'deploymentconfigs' | canI : 'update'\" role=\"menuitem\">\n" +
+    "<li ng-if=\"row.deploymentConfigsVersion | canI : 'update'\" role=\"menuitem\">\n" +
     "<a ng-href=\"{{row.apiObject | editResourceURL}}\">Edit</a>\n" +
     "</li>\n" +
     "<li ng-if=\"('pod_presets' | enableTechPreviewFeature)\n" +
@@ -12199,7 +12199,7 @@ angular.module('openshiftConsoleTemplates', []).run(['$templateCache', function(
     "                      && (row.serviceBindingsVersion | canI : 'delete')\" role=\"menuitem\">\n" +
     "<a href=\"\" ng-click=\"row.showOverlayPanel('unbindService', {target: row.apiObject})\">Delete Binding</a>\n" +
     "</li>\n" +
-    "<li ng-if=\"row.current && ('deploymentconfigs/log' | canI : 'get')\" role=\"menuitem\">\n" +
+    "<li ng-if=\"row.current && (row.deploymentConfigsLogVersion | canI : 'get')\" role=\"menuitem\">\n" +
     "<a ng-href=\"{{row.current | navigateResourceURL}}?tab=logs\">View Logs</a>\n" +
     "</li>\n" +
     "</ul>\n" +
@@ -12211,10 +12211,10 @@ angular.module('openshiftConsoleTemplates', []).run(['$templateCache', function(
     "<i class=\"fa fa-ellipsis-v\" aria-hidden=\"true\"></i><span class=\"sr-only\">Actions</span>\n" +
     "</button>\n" +
     "<ul class=\"dropdown-menu dropdown-menu-right\" uib-dropdown-menu role=\"menu\">\n" +
-    "<li role=\"menuitem\" ng-if=\"'pods' | canI : 'update'\">\n" +
+    "<li role=\"menuitem\" ng-if=\"row.podsVersion | canI : 'update'\">\n" +
     "<a ng-href=\"{{row.apiObject | editYamlURL}}\">Edit YAML</a>\n" +
     "</li>\n" +
-    "<li role=\"menuitem\" ng-if=\"('pods/log' | canI : 'get')\">\n" +
+    "<li role=\"menuitem\" ng-if=\"(row.podsLogVersion | canI : 'get')\">\n" +
     "<a ng-href=\"{{row.apiObject | navigateResourceURL}}?tab=logs\">View Logs</a>\n" +
     "</li>\n" +
     "</ul>\n" +
@@ -12239,7 +12239,7 @@ angular.module('openshiftConsoleTemplates', []).run(['$templateCache', function(
     "                      && (row.serviceBindingsVersion | canI : 'delete')\" role=\"menuitem\">\n" +
     "<a href=\"\" ng-click=\"row.showOverlayPanel('unbindService', {target: row.apiObject})\">Delete Binding</a>\n" +
     "</li>\n" +
-    "<li ng-if=\"(pod = row.firstPod(row.current)) && ('pods/log' | canI : 'get')\" role=\"menuitem\">\n" +
+    "<li ng-if=\"(pod = row.firstPod(row.current)) && (row.podsLogVersion | canI : 'get')\" role=\"menuitem\">\n" +
     "<a ng-href=\"{{pod | navigateResourceURL}}?tab=logs\">View Logs</a>\n" +
     "</li>\n" +
     "</ul>\n" +