katello 4.0.3 → 4.1.0.rc1

data/engines/bastion/vendor/assets/javascripts/bastion/angular-animate/angular-animate.js

@@ -1,6 +1,6 @@
 /**
- * @license AngularJS v1.7.9
- * (c) 2010-2018 Google, Inc. http://angularjs.org
+ * @license AngularJS v1.8.2
+ * (c) 2010-2020 Google LLC. http://angularjs.org
  * License: MIT
  */
 (function(window, angular) {'use strict';
@@ -4252,7 +4252,7 @@ angular.module('ngAnimate', [], function initAngularHelpers() {
   isFunction  = angular.isFunction;
   isElement   = angular.isElement;
 })
-  .info({ angularVersion: '1.7.9' })
+  .info({ angularVersion: '1.8.2' })
   .directive('ngAnimateSwap', ngAnimateSwapDirective)
 
   .directive('ngAnimateChildren', $$AnimateChildrenDirective)

data/engines/bastion/vendor/assets/javascripts/bastion/angular-resource/angular-resource.js

@@ -1,6 +1,6 @@
 /**
- * @license AngularJS v1.7.9
- * (c) 2010-2018 Google, Inc. http://angularjs.org
+ * @license AngularJS v1.8.2
+ * (c) 2010-2020 Google LLC. http://angularjs.org
  * License: MIT
  */
 (function(window, angular) {'use strict';
@@ -497,7 +497,7 @@ function shallowClearAndCopy(src, dst) {
  *
  */
 angular.module('ngResource', ['ng']).
-  info({ angularVersion: '1.7.9' }).
+  info({ angularVersion: '1.8.2' }).
   provider('$resource', function ResourceProvider() {
     var PROTOCOL_AND_IPV6_REGEX = /^https?:\/\/\[[^\]]*][^/]*/;
 

data/engines/bastion/vendor/assets/javascripts/bastion/angular-route/angular-route.js

@@ -1,6 +1,6 @@
 /**
- * @license AngularJS v1.7.9
- * (c) 2010-2018 Google, Inc. http://angularjs.org
+ * @license AngularJS v1.8.2
+ * (c) 2010-2020 Google LLC. http://angularjs.org
  * License: MIT
  */
 (function(window, angular) {'use strict';
@@ -101,7 +101,7 @@ var noop;
 /* global -ngRouteModule */
 var ngRouteModule = angular.
   module('ngRoute', []).
-  info({ angularVersion: '1.7.9' }).
+  info({ angularVersion: '1.8.2' }).
   provider('$route', $RouteProvider).
   // Ensure `$route` will be instantiated in time to capture the initial `$locationChangeSuccess`
   // event (unless explicitly disabled). This is necessary in case `ngView` is included in an

data/engines/bastion/vendor/assets/javascripts/bastion/angular-sanitize/angular-sanitize.js

@@ -1,6 +1,6 @@
 /**
- * @license AngularJS v1.7.9
- * (c) 2010-2018 Google, Inc. http://angularjs.org
+ * @license AngularJS v1.8.2
+ * (c) 2010-2020 Google LLC. http://angularjs.org
  * License: MIT
  */
 (function(window, angular) {'use strict';
@@ -46,12 +46,12 @@ var htmlSanitizeWriter;
  * @description
  *   Sanitizes an html string by stripping all potentially dangerous tokens.
  *
- *   The input is sanitized by parsing the HTML into tokens. All safe tokens (from a whitelist) are
+ *   The input is sanitized by parsing the HTML into tokens. All safe tokens (from a trusted URI list) are
  *   then serialized back to a properly escaped HTML string. This means that no unsafe input can make
  *   it into the returned string.
  *
- *   The whitelist for URL sanitization of attribute values is configured using the functions
- *   `aHrefSanitizationWhitelist` and `imgSrcSanitizationWhitelist` of {@link $compileProvider}.
+ *   The trusted URIs for URL sanitization of attribute values is configured using the functions
+ *   `aHrefSanitizationTrustedUrlList` and `imgSrcSanitizationTrustedUrlList` of {@link $compileProvider}.
  *
  *   The input may also contain SVG markup if this is enabled via {@link $sanitizeProvider}.
  *
@@ -282,8 +282,8 @@ function $SanitizeProvider() {
    * **Note**:
    * The new attributes will not be treated as URI attributes, which means their values will not be
    * sanitized as URIs using `$compileProvider`'s
-   * {@link ng.$compileProvider#aHrefSanitizationWhitelist aHrefSanitizationWhitelist} and
-   * {@link ng.$compileProvider#imgSrcSanitizationWhitelist imgSrcSanitizationWhitelist}.
+   * {@link ng.$compileProvider#aHrefSanitizationTrustedUrlList aHrefSanitizationTrustedUrlList} and
+   * {@link ng.$compileProvider#imgSrcSanitizationTrustedUrlList imgSrcSanitizationTrustedUrlList}.
    *
    * <div class="alert alert-info">
    *   This method must be called during the {@link angular.Module#config config} phase. Once the
@@ -426,50 +426,28 @@ function $SanitizeProvider() {
   }
 
   /**
-   * Create an inert document that contains the dirty HTML that needs sanitizing
-   * Depending upon browser support we use one of three strategies for doing this.
-   * Support: Safari 10.x -> XHR strategy
-   * Support: Firefox -> DomParser strategy
+   * Create an inert document that contains the dirty HTML that needs sanitizing.
+   * We use the DOMParser API by default and fall back to createHTMLDocument if DOMParser is not
+   * available.
    */
   var getInertBodyElement /* function(html: string): HTMLBodyElement */ = (function(window, document) {
-    var inertDocument;
-    if (document && document.implementation) {
-      inertDocument = document.implementation.createHTMLDocument('inert');
-    } else {
-      throw $sanitizeMinErr('noinert', 'Can\'t create an inert html document');
+    if (isDOMParserAvailable()) {
+      return getInertBodyElement_DOMParser;
     }
-    var inertBodyElement = (inertDocument.documentElement || inertDocument.getDocumentElement()).querySelector('body');
 
-    // Check for the Safari 10.1 bug - which allows JS to run inside the SVG G element
-    inertBodyElement.innerHTML = '<svg><g onload="this.parentNode.remove()"></g></svg>';
-    if (!inertBodyElement.querySelector('svg')) {
-      return getInertBodyElement_XHR;
-    } else {
-      // Check for the Firefox bug - which prevents the inner img JS from being sanitized
-      inertBodyElement.innerHTML = '<svg><p><style><img src="</style><img src=x onerror=alert(1)//">';
-      if (inertBodyElement.querySelector('svg img')) {
-        return getInertBodyElement_DOMParser;
-      } else {
-        return getInertBodyElement_InertDocument;
-      }
+    if (!document || !document.implementation) {
+      throw $sanitizeMinErr('noinert', 'Can\'t create an inert html document');
     }
+    var inertDocument = document.implementation.createHTMLDocument('inert');
+    var inertBodyElement = (inertDocument.documentElement || inertDocument.getDocumentElement()).querySelector('body');
+    return getInertBodyElement_InertDocument;
 
-    function getInertBodyElement_XHR(html) {
-      // We add this dummy element to ensure that the rest of the content is parsed as expected
-      // e.g. leading whitespace is maintained and tags like `<meta>` do not get hoisted to the `<head>` tag.
-      html = '<remove></remove>' + html;
+    function isDOMParserAvailable() {
       try {
-        html = encodeURI(html);
+        return !!getInertBodyElement_DOMParser('');
       } catch (e) {
-        return undefined;
+        return false;
       }
-      var xhr = new window.XMLHttpRequest();
-      xhr.responseType = 'document';
-      xhr.open('GET', 'data:text/html;charset=utf-8,' + html, false);
-      xhr.send(null);
-      var body = xhr.response.body;
-      body.firstChild.remove();
-      return body;
     }
 
     function getInertBodyElement_DOMParser(html) {
@@ -711,7 +689,7 @@ function sanitizeText(chars) {
 // define ngSanitize module and register $sanitize service
 angular.module('ngSanitize', [])
   .provider('$sanitize', $SanitizeProvider)
-  .info({ angularVersion: '1.7.9' });
+  .info({ angularVersion: '1.8.2' });
 
 /**
  * @ngdoc filter

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/activation-keys/details/activation-key-repository-sets.controller.js

@@ -6,28 +6,27 @@
  * @requires translate
  * @requires Nutupane
  * @requires ActivationKey
+ * @requires RepositorySet
  * @requires ContentOverrideHelper
  * @requires Notification
- * @requires CurrentOrganization
  *
  * @description
  *   Provides the functionality for the activation-key products action pane.
  */
 angular.module('Bastion.activation-keys').controller('ActivationKeyRepositorySetsController',
-    ['$scope', 'translate', 'Nutupane', 'ActivationKey', 'ContentOverrideHelper', 'Notification', 'CurrentOrganization',
-    function ($scope, translate, Nutupane, ActivationKey, ContentOverrideHelper, Notification, CurrentOrganization) {
+    ['$scope', 'translate', 'Nutupane', 'ActivationKey', 'RepositorySet', 'ContentOverrideHelper', 'Notification',
+    function ($scope, translate, Nutupane, ActivationKey, RepositorySet, ContentOverrideHelper, Notification) {
         var params, saveContentOverride, success, error;
 
         params = {
-            id: $scope.$stateParams.activationKeyId,
-            'organization_id': CurrentOrganization,
-            'content_access_mode_all': $scope.simpleContentAccessEnabled
+            'activation_key_id': $scope.$stateParams.activationKeyId,
+            'content_access_mode_all': $scope.simpleContentAccessEnabled,
+            'sort_order': 'ASC',
+            'paged': true
         };
-
-        $scope.controllerName = 'katello_products';
-        $scope.nutupane = new Nutupane(ActivationKey, params, 'repositorySets');
+        $scope.nutupane = new Nutupane(RepositorySet, params);
+        $scope.nutupane.primaryOnly = true;
         $scope.table = $scope.nutupane.table;
-
         $scope.contentAccessModes = {
             contentAccessModeAll: $scope.simpleContentAccessEnabled,
             contentAccessModeEnv: false

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/activation-keys/details/views/activation-key-repository-sets.html

@@ -10,12 +10,6 @@
 </div>
 
 <div data-extend-template="layouts/partials/table.html">
-  <div data-block="search">
-    <input type="text" class="form-control" stop-event="click"
-           placeholder="{{ 'Filter...' | translate }}"
-           ng-model="repositorySetFilter"/>
-  </div>
-
   <div data-block="filters">
     <label class="checkbox-inline" title="{{ 'Show all Repository Sets in Organization' | translate }}" ng-if="!simpleContentAccessEnabled">
       <input type="checkbox" ng-model="contentAccessModes.contentAccessModeAll" ng-change="toggleFilters()"/>
@@ -27,7 +21,6 @@
     </label>
   </div>
 
-
   <div data-block="list-actions">
     <div class="btn-group" select-action-dropdown>
       <ul class="dropdown-menu-right" uib-dropdown-menu role="menu" aria-labelledby="split-button">
@@ -73,13 +66,13 @@
 
       <tbody>
         <tr class="grey-table-row" bst-table-row ng-repeat-end ng-repeat="productRepoSet in table.rows | filter:repositorySetFilter" row-select="productRepoSet">
-          <td bst-table-cell>{{ productRepoSet.content.name }}</td>
+          <td bst-table-cell>{{ productRepoSet.name }}</td>
           <td bst-table-cell>
             <a ui-sref="product.info({productId: productRepoSet.product.id})">
               {{ productRepoSet.product.name }}
             </a>
           </td>
-          <td bst-table-cell>{{ productRepoSet.content.content_url }}</td>
+          <td bst-table-cell>{{ productRepoSet.contentUrl }}</td>
           <td bst-table-cell>{{ productRepoSet | repositorySetsEnabled }}</td>
         </tr>
       </tbody>

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/bastion-katello-bootstrap.js

@@ -11,7 +11,6 @@ BASTION_MODULES.push(
     'Bastion.ansible-collections',
     'Bastion.ostree-branches',
     'Bastion.hosts',
-    'Bastion.puppet-modules',
     'Bastion.ostree-branches',
     'Bastion.module-streams',
     'Bastion.environments',

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/bastion_katello.js

@@ -67,9 +67,6 @@
 //= require "bastion_katello/package-groups/package-groups.module.js"
 //= require_tree "./package-groups"
 
-//= require "bastion_katello/puppet-modules/puppet-modules.module.js"
-//= require_tree "./puppet-modules"
-
 //= require "bastion_katello/products/details/repositories/repositories.module.js"
 //= require_tree "./products/details/repositories"
 

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/content-hosts/bulk/content-hosts-bulk-errata-modal.controller.js

@@ -57,7 +57,9 @@ angular.module('Bastion.content-hosts').controller('ContentHostsBulkErrataModalC
         $scope.initialLoad = true;
         $scope.remoteExecutionPresent = BastionConfig.remoteExecutionPresent;
         $scope.remoteExecutionByDefault = BastionConfig.remoteExecutionByDefault;
+        $scope.katelloAgentPresent = BastionConfig.katelloAgentPresent;
         $scope.allHostsSelected = hostIds.allResultsSelected;
+        $scope.hostToolingEnabled = BastionConfig.hostToolingEnabled;
 
         $scope.errataActionFormValues = {
             authenticityToken: $window.AUTH_TOKEN.replace(/"/g, '')

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/content-hosts/bulk/content-hosts-bulk-packages-modal.controller.js

@@ -46,6 +46,8 @@ angular.module('Bastion.content-hosts').controller('ContentHostsBulkPackagesModa
 
         $scope.remoteExecutionPresent = BastionConfig.remoteExecutionPresent;
         $scope.remoteExecutionByDefault = BastionConfig.remoteExecutionByDefault;
+        $scope.katelloAgentPresent = BastionConfig.katelloAgentPresent;
+        $scope.hostToolingEnabled = BastionConfig.hostToolingEnabled;
 
         $scope.packageActionFormValues = {
             authenticityToken: $window.AUTH_TOKEN.replace(/"/g, '')

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/content-hosts/bulk/views/content-hosts-bulk-errata-modal.html

@@ -27,7 +27,14 @@
       </div>
     </div>
 
-    <div data-extend-template="common/views/katello-agent-notice.html"></div>
+    <div ng-show="katelloAgentPresent" data-extend-template="common/views/katello-agent-notice.html"></div>
+    <div bst-feature-flag="remote_actions">
+      <p bst-alert="warning" ng-hide="hostToolingEnabled">
+        <span translate>
+          Performing host package actions is disabled because Katello is not configured for Remote Execution or Katello Agent.
+          </span>
+      </p>
+    </div>
 
     <div ng-show="showTable()" data-extend-template="layouts/partials/table.html">
       <div data-block="list-actions">
@@ -39,19 +46,19 @@
 
         <span uib-dropdown class="btn-group">
           <button class="btn btn-primary" type="button"
-                  ng-disabled="table.numSelected === 0 || table.working || table.numSelected === 0"
+                  ng-disabled="table.numSelected === 0 || table.working || table.numSelected === 0 || !hostToolingEnabled"
                   ng-click="showConfirm = true;">
             <span translate>Install Selected</span>
           </button>
           <button uib-dropdown-toggle class="btn btn-primary" type="button"
-                  ng-hide="!remoteExecutionPresent"
+                  ng-show="remoteExecutionPresent"
                   ng-disabled="table.numSelected === 0 || table.working || table.numSelected === 0"
                   type="button" id="use-remote-execution">
             <span class="caret"></span>
           </button>
 
           <ul uib-dropdown-menu class="dropdown-menu-right" role="menu" aria-labelledby="use-remote-execution">
-            <li role="presentation"><a ng-click="installErrataViaKatelloAgent()" role="menuitem" translate>via Katello agent</a></li>
+            <li ng-show="katelloAgentPresent" role="presentation"><a ng-click="installErrataViaKatelloAgent()" role="menuitem" translate>via Katello agent</a></li>
             <li role="presentation"><a ng-click="installErrataViaRemoteExecution(false)" role="menuitem" translate>via remote execution</a></li>
             <li role="presentation"><a ng-click="installErrataViaRemoteExecution(true)" role="menuitem" translate>via remote execution - customize first</a></li>
           </ul>

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/content-hosts/bulk/views/content-hosts-bulk-packages-modal.html

@@ -8,7 +8,14 @@
       </div>
     </div>
 
-    <div data-extend-template="common/views/katello-agent-notice.html"></div>
+    <div ng-show="katelloAgentPresent" data-extend-template="common/views/katello-agent-notice.html"></div>
+    <div bst-feature-flag="remote_actions">
+      <p bst-alert="warning" ng-hide="hostToolingEnabled">
+        <span translate>
+          Performing host package actions is disabled because Katello is not configured for Remote Execution or Katello Agent.
+          </span>
+      </p>
+    </div>
 
     <span uib-dropdown class="input-group-btn">
       <button class="btn btn-default"
@@ -16,17 +23,17 @@
               translate
               ng-hide="denied('edit_hosts')"
               ng-click="confirmContentAction('update all', content)"
-              ng-disabled="(table.numSelected === 0)">
+              ng-disabled="(table.numSelected === 0) || !hostToolingEnabled">
         Update All Packages
       </button>
       <button uib-dropdown-toggle class="btn btn-default"
-              ng-hide="!remoteExecutionPresent"
+              ng-show="remoteExecutionPresent"
               ng-disabled="(table.numSelected === 0) || !packageActionForm.$valid || content.confirm"
               type="button" id="update-all-use-remote-execution">
         <span class="caret"></span>
       </button>
       <ul uib-dropdown-menu role="menu" aria-labelledby="install-use-remote-execution">
-        <li role="presentation"><a ng-click="performViaKatelloAgent('update all', content)" role="menuitem" tabindex="-1" href="#" translate>via Katello Agent</a></li>
+        <li ng-show="katelloAgentPresent" role="presentation"><a ng-click="performViaKatelloAgent('update all', content)" role="menuitem" tabindex="-1" href="#" translate>via Katello Agent</a></li>
         <li role="presentation"><a ng-click="performViaRemoteExecution('update all', false)" role="menuitem" tabindex="-1" href="#" translate>via remote execution</a></li>
         <li role="presentation"><a ng-click="performViaRemoteExecution('update all', true)" role="menuitem" tabindex="-1" href="#" translate>via remote execution - customize first</a></li>
       </ul>
@@ -77,17 +84,17 @@
                 translate
                 ng-hide="denied('edit_hosts')"
                 ng-click="confirmContentAction('install', content)"
-                ng-disabled="(table.numSelected === 0) || !packageActionForm.$valid || content.confirm">
+                ng-disabled="(table.numSelected === 0) || !packageActionForm.$valid || content.confirm || !hostToolingEnabled">
           Install
         </button>
         <button uib-dropdown-toggle class="btn btn-default"
-                ng-hide="!remoteExecutionPresent"
+                ng-show="remoteExecutionPresent"
                 ng-disabled="(table.numSelected === 0) || !packageActionForm.$valid || content.confirm"
                 type="button" id="install-use-remote-execution">
           <span class="caret"></span>
         </button>
         <ul uib-dropdown-menu role="menu" aria-labelledby="install-use-remote-execution">
-          <li role="presentation"><a ng-click="performViaKatelloAgent('install', content)" role="menuitem" tabindex="-1" href="#" translate>via Katello Agent</a></li>
+          <li ng-show="katelloAgentPresent" role="presentation"><a ng-click="performViaKatelloAgent('install', content)" role="menuitem" tabindex="-1" href="#" translate>via Katello Agent</a></li>
           <li role="presentation"><a ng-click="performViaRemoteExecution('install', false)" role="menuitem" tabindex="-1" href="#" translate>via remote execution</a></li>
           <li role="presentation"><a ng-click="performViaRemoteExecution('install', true)" role="menuitem" tabindex="-1" href="#" translate>via remote execution - customize first</a></li>
         </ul>
@@ -98,7 +105,7 @@
                 translate
                 ng-hide="denied('edit_hosts')"
                 ng-click="confirmContentAction('update', content)"
-                ng-disabled="(table.numSelected === 0) || !packageActionForm.$valid || content.confirm"
+                ng-disabled="(table.numSelected === 0) || !packageActionForm.$valid || content.confirm || !hostToolingEnabled"
                 ng-hide="content.contentType == 'errata'">
           Update
         </button>
@@ -109,7 +116,7 @@
           <span class="caret"></span>
         </button>
         <ul uib-dropdown-menu role="menu" aria-labelledby="update-use-remote-execution">
-          <li role="presentation"><a ng-click="performViaKatelloAgent('update', content)" role="menuitem" tabindex="-1" href="#" translate>via Katello Agent</a></li>
+          <li ng-show="katelloAgentPresent" role="presentation"><a ng-click="performViaKatelloAgent('update', content)" role="menuitem" tabindex="-1" href="#" translate>via Katello Agent</a></li>
           <li role="presentation"><a ng-click="performViaRemoteExecution('update', false)" role="menuitem" tabindex="-1" href="#" translate>via remote execution</a></li>
           <li role="presentation"><a ng-click="performViaRemoteExecution('update', true)" role="menuitem" tabindex="-1" href="#" translate>via remote execution - customize first</a></li>
         </ul>
@@ -120,7 +127,7 @@
                 translate
                 ng-hide="content.contentType == 'errata' || denied('edit_hosts')"
                 ng-click="confirmContentAction('remove', content)"
-                ng-disabled="(table.numSelected === 0) || !packageActionForm.$valid || content.confirm">
+                ng-disabled="(table.numSelected === 0) || !packageActionForm.$valid || content.confirm || !hostToolingEnabled">
           Remove
         </button>
         <button uib-dropdown-toggle class="btn btn-default"
@@ -130,7 +137,7 @@
           <span class="caret"></span>
         </button>
         <ul uib-dropdown-menu role="menu" aria-labelledby="remove-use-remote-execution">
-          <li role="presentation"><a ng-click="performViaKatelloAgent('remove', content)" role="menuitem" tabindex="-1" href="#" translate>via Katello Agent</a></li>
+          <li ng-show="katelloAgentPresent" role="presentation"><a ng-click="performViaKatelloAgent('remove', content)" role="menuitem" tabindex="-1" href="#" translate>via Katello Agent</a></li>
           <li role="presentation"><a ng-click="performViaRemoteExecution('remove', false)" role="menuitem" tabindex="-1" href="#" translate>via remote execution</a></li>
           <li role="presentation"><a ng-click="performViaRemoteExecution('remove', true)" role="menuitem" tabindex="-1" href="#" translate>via remote execution - customize first</a></li>
         </ul>

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/content-hosts/bulk/views/content-hosts-bulk-system-purpose-modal.html

@@ -23,7 +23,9 @@
 
         <dd><select type="select"
                     ng-options="item for item in defaultServiceLevels"
-                    ng-model="selectedServiceLevels">
+                    ng-model="selectedServiceLevels"
+                    id="selectedServiceLevels"
+                    >
         </select></dd>
         <br /><br />
 
@@ -31,7 +33,9 @@
 
         <dd><select type="select"
                 ng-options="item for item in defaultUsages"
-                ng-model="selectedRoles">
+                ng-model="selectedUsages"
+                id="selectedUsages"
+                >
         </select></dd>
         <br /><br />
 
@@ -39,7 +43,9 @@
 
         <dd><select type="select"
                 ng-options="item for item in defaultRoles"
-                ng-model="selectedUsages">
+                ng-model="selectedRoles"
+                id="selectedRoles"
+                >
         </select></dd>
         <br /><br />
 
@@ -70,4 +76,4 @@
       Cancel
     </button>
   </div>
-</div>
+</div>

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/content-hosts/content/content-host-errata.controller.js

@@ -43,6 +43,8 @@ angular.module('Bastion.content-hosts').controller('ContentHostErrataController'
 
         $scope.remoteExecutionPresent = BastionConfig.remoteExecutionPresent;
         $scope.remoteExecutionByDefault = BastionConfig.remoteExecutionByDefault;
+        $scope.katelloAgentPresent = BastionConfig.katelloAgentPresent;
+        $scope.hostToolingEnabled = BastionConfig.hostToolingEnabled;
         $scope.errataActionFormValues = {
             authenticityToken: $window.AUTH_TOKEN.replace(/"/g, '')
         };

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/content-hosts/content/content-host-packages-actions.controller.js

@@ -4,13 +4,17 @@
  *
  * @requires $scope
  * @requires $location
+ * @requires BastionConfig
  *
  * @description
  *   Provides the functionality for the content host package actions.
  */
 angular.module('Bastion.content-hosts').controller('ContentHostPackagesActionsController',
-    ['$scope', '$location', function ($scope, $location) {
+    ['$scope', '$location', 'BastionConfig', function ($scope, $location, BastionConfig) {
         var packageName = $location.search().package_name;
+        $scope.katelloAgentPresent = BastionConfig.katelloAgentPresent;
+        $scope.remoteExecutionPresent = BastionConfig.remoteExecutionPresent;
+        $scope.hostToolingEnabled = BastionConfig.hostToolingEnabled;
 
         $scope.packageAction = {actionType: 'packageInstall'}; //default to packageInstall
 

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/content-hosts/content/content-host-packages-applicable.controller.js

@@ -9,15 +9,20 @@
  * @requires HostPackage
  * @requires translate
  * @requires Nutupane
+ * @requires BastionConfig
  *
  * @description
  *   Provides the functionality for the content host packages list and actions.
  */
 angular.module('Bastion.content-hosts').controller('ContentHostPackagesApplicableController',
-    ['$scope', '$timeout', '$window', 'Package', 'HostPackage', 'translate', 'Nutupane',
-    function ($scope, $timeout, $window, Package, HostPackage, translate, Nutupane) {
+    ['$scope', '$timeout', '$window', 'Package', 'HostPackage', 'translate', 'Nutupane', 'BastionConfig',
+    function ($scope, $timeout, $window, Package, HostPackage, translate, Nutupane, BastionConfig) {
         var packagesNutupane, openEventInfo;
 
+        $scope.katelloAgentPresent = BastionConfig.katelloAgentPresent;
+        $scope.remoteExecutionPresent = BastionConfig.remoteExecutionPresent;
+        $scope.hostToolingEnabled = BastionConfig.hostToolingEnabled;
+
         $scope.getSelectedPackages = function () {
             var selected = $scope.table.getSelected();
             selected = _.map(selected, function(pkg) {

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/content-hosts/content/content-host-packages-installed.controller.js

@@ -8,15 +8,20 @@
  * @requires HostPackage
  * @requires translate
  * @requires Nutupane
+ * @requires BastionConfig
  *
  * @description
  *   Provides the functionality for the content host packages list and actions.
  */
 angular.module('Bastion.content-hosts').controller('ContentHostPackagesInstalledController',
-    ['$scope', '$timeout', '$window', 'HostPackage', 'translate', 'Nutupane',
-    function ($scope, $timeout, $window, HostPackage, translate, Nutupane) {
+    ['$scope', '$timeout', '$window', 'HostPackage', 'translate', 'Nutupane', 'BastionConfig',
+    function ($scope, $timeout, $window, HostPackage, translate, Nutupane, BastionConfig) {
         var packagesNutupane;
 
+        $scope.katelloAgentPresent = BastionConfig.katelloAgentPresent;
+        $scope.remoteExecutionPresent = BastionConfig.remoteExecutionPresent;
+        $scope.hostToolingEnabled = BastionConfig.hostToolingEnabled;
+
         $scope.removeSelectedPackages = function () {
             var selected = _.map($scope.table.getSelected(), 'name');
 

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/content-hosts/content/views/content-host-errata.html

@@ -5,7 +5,7 @@
   <h3 translate ng-show="selectedErrataOption === 'current'">Installable Errata</h3>
 </div>
 
-<div data-extend-template="common/views/katello-agent-notice.html"></div>
+<div ng-show="katelloAgentPresent" data-extend-template="common/views/katello-agent-notice.html"></div>
 
 <div ng-hide="host.hasContent()">
   <div data-extend-template="common/views/registration.html"></div>
@@ -24,10 +24,10 @@
   </div>
 
   <div bst-feature-flag="remote_actions">
-    <p bst-alert="info" ng-hide="host.content_facet_attributes.katello_agent_installed">
+    <p bst-alert="warning" ng-hide="hostToolingEnabled">
       <span translate>
-        If you are not using Remote Execution to manage content on this host, ensure that it has the katello-agent package installed.
-      </span>
+        Performing host package actions is disabled because Katello is not configured for Remote Execution or Katello Agent.
+        </span>
     </p>
   </div>
 
@@ -69,7 +69,7 @@
             <button class="btn btn-default" type="button"
                     translate
                     ng-hide="denied('edit_hosts', host)"
-                    ng-disabled="table.getSelected().length == 0"
+                    ng-disabled="table.getSelected().length == 0 || !hostToolingEnabled"
                     ng-click="openModal()">
               Apply Selected
             </button>
@@ -80,7 +80,7 @@
               <span class="caret"></span>
             </button>
             <ul uib-dropdown-menu role="menu" aria-labelledby="use-remote-execution">
-              <li role="presentation"><a ng-click="performViaKatelloAgent()" role="menuitem" tabindex="-1" href="#" translate>via Katello agent</a></li>
+              <li ng-show="katelloAgentPresent" role="presentation"><a ng-click="performViaKatelloAgent()" role="menuitem" tabindex="-1" href="#" translate>via Katello agent</a></li>
               <li role="presentation"><a ng-click="performViaRemoteExecution(false)" role="menuitem" tabindex="-1" href="#" translate>via remote execution</a></li>
               <li role="presentation"><a ng-click="performViaRemoteExecution(true)" role="menuitem" tabindex="-1" href="#" translate>via remote execution - customize first</a></li>
             </ul>

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/content-hosts/content/views/content-host-packages-actions.html

@@ -2,11 +2,11 @@
 
 <section ng-hide="denied('edit_hosts', host)" bst-feature-flag="remote_actions">
   <h4 translate>Package Actions</h4>
-  <div data-extend-template="common/views/katello-agent-notice.html"></div>
-  <p bst-alert="info" ng-hide="host.content_facet_attributes.katello_agent_installed">
+  <div ng-show="katelloAgentPresent" data-extend-template="common/views/katello-agent-notice.html"></div>
+  <p bst-alert="warning" ng-hide="hostToolingEnabled">
     <span translate>
-      If you are not using Remote Execution to manage content on this host, ensure that it has the katello-agent package installed.
-    </span>
+      Performing host package actions is disabled because Katello is not configured for Remote Execution or Katello Agent.
+      </span>
   </p>
   <section>
     <div class="row">
@@ -33,7 +33,7 @@
               <button class="btn btn-primary" type="button"
                       ng-click="performPackageAction(packageAction.actionType, packageAction.term)"
                       ng-hide="denied('edit_hosts', host)"
-                      ng-disabled="working || packageAction.term === undefined || packageAction.term.length === 0"
+                      ng-disabled="working || packageAction.term === undefined || packageAction.term.length === 0 || !hostToolingEnabled"
                       translate>
                 Perform
               </button>
@@ -44,7 +44,7 @@
                 <span class="caret"></span>
               </button>
               <ul uib-dropdown-menu role="menu" aria-labelledby="use-remote-execution">
-                <li role="presentation"><a ng-click="performViaKatelloAgent(packageAction.actionType, packageAction.term)" role="menuitem" tabindex="-1" href="#" translate>via Katello agent</a></li>
+                <li ng-show="katelloAgentPresent" role="presentation"><a ng-click="performViaKatelloAgent(packageAction.actionType, packageAction.term)" role="menuitem" tabindex="-1" href="#" translate>via Katello agent</a></li>
                 <li role="presentation"><a ng-click="performViaRemoteExecution(packageAction.actionType, packageAction.term, false)" role="menuitem" tabindex="-1" href="#" translate>via remote execution</a></li>
                 <li role="presentation"><a ng-click="performViaRemoteExecution(packageAction.actionType, packageAction.term, true)" role="menuitem" tabindex="-1" href="#" translate>via remote execution - customize first</a></li>
               </ul>
@@ -55,7 +55,7 @@
         <div class="form-group">
           <button class="btn btn-default" type="button"
                   translate
-                  ng-disabled="working"
+                  ng-disabled="!katelloAgentPresent || working"
                   ng-click="updateAll()">
             Update All Packages
           </button>