katello 3.15.1 → 3.16.0.rc2.1

data/engines/bastion/vendor/assets/javascripts/bastion/ngUpload/ng-upload.js

@@ -214,10 +214,10 @@ angular.module('ngUpload', [])
                 if ( errorCatcher ){
                    if (!scope.$$phase) {
                       scope.$apply(function () {
-                          errorCatcher(scope, { error: error, content: content});
+                          errorCatcher(scope, { error: error});
                       });
                    } else {
-                     errorCatcher(scope, { error: error, content: content});
+                     errorCatcher(scope, { error: error});
                    }
                 }
 

data/engines/bastion_katello/README.md

@@ -7,6 +7,7 @@ The only real difference, as far as the user is concerned, is that the applicati
 # Running tests:
 
 ```
+sudo yum -y install npm chromium-headless chromium
 cd ./engines/bastion_katello
 sudo npm install -g grunt-cli
 npm install

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/activation-keys/activation-key.factory.js

@@ -8,9 +8,9 @@
  *   Provides a BastionResource for activation keys.
  */
 angular.module('Bastion.activation-keys').factory('ActivationKey',
-    ['BastionResource', function (BastionResource) {
+    ['BastionResource', 'CurrentOrganization', function (BastionResource, CurrentOrganization) {
 
-        return BastionResource('katello/api/v2/activation_keys/:id/:action/:action2', {id: '@id'}, {
+        return BastionResource('katello/api/v2/activation_keys/:id/:action/:action2', {id: '@id', 'organization_id': CurrentOrganization}, {
             get: {method: 'GET', params: {fields: 'full'}},
             update: {method: 'PUT'},
             copy: {method: 'POST', params: {action: 'copy'}},

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/activation-keys/activation-keys.routes.js

@@ -2,7 +2,6 @@ angular.module('Bastion.activation-keys').config(['$stateProvider', function ($s
     $stateProvider.state('activation-keys', {
         url: '/activation_keys',
         permission: 'view_activation_keys',
-        template: '<div ui-view></div>',
         views: {
             '@': {
                 controller: 'ActivationKeysController',

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/ansible-collections/ansible-collections.factory.js

@@ -8,10 +8,10 @@
      * @description
      *   Provides a BastionResource for interacting with Ansible Collections
      */
-    function AnsibleCollection(BastionResource) {
+    function AnsibleCollection(BastionResource, CurrentOrganization) {
 
         return BastionResource('katello/api/v2/ansible_collections/:id',
-            {'id': '@id'},
+            {'id': '@id', 'organization_id': CurrentOrganization},
             {
                 autocomplete: {method: 'GET', isArray: true, params: {id: 'auto_complete_search'}}
             }
@@ -23,6 +23,6 @@
         .module('Bastion.ansible-collections')
         .factory('AnsibleCollection', AnsibleCollection);
 
-    AnsibleCollection.$inject = ['BastionResource'];
+    AnsibleCollection.$inject = ['BastionResource', 'CurrentOrganization'];
 
 })();

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/common/api-error-handler.service.js

@@ -14,6 +14,8 @@
                 angular.forEach(response.data.errors, function (error) {
                     Notification.setErrorMessage(error);
                 });
+            } else if (response.hasOwnProperty('data') && response.data.hasOwnProperty('error') && response.data.error.hasOwnProperty('message')) {
+                Notification.setErrorMessage(response.data.error.message);
             } else {
                 Notification.setErrorMessage(defaultErrorMessage);
             }

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/content-credentials/content-credentials.routes.js

@@ -11,7 +11,6 @@ angular.module('Bastion.content-credentials').config(['$stateProvider', function
     $stateProvider.state('content-credentials', {
         url: '/content_credentials',
         permission: 'view_content_credentials',
-        template: '<div ui-view></div>',
         views: {
             '@': {
                 controller: 'ContentCredentialsController',

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/content-credentials/details/views/content-credential-info.html

@@ -54,9 +54,9 @@
       <dd>
         <a ui-sref="content-credential.repositories">
           {{ contentCredential.gpg_key_repos.length +
-             contentCredential.ssl_ca_repos.length +
-             contentCredential.ssl_client_repos.length +
-             contentCredential.ssl_key_repos.length }}
+             contentCredential.ssl_ca_root_repos.length +
+             contentCredential.ssl_client_root_repos.length +
+             contentCredential.ssl_key_root_repos.length }}
         </a>
       </dd>
     </dl>

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/content-credentials/views/content-credentials.html

@@ -43,9 +43,9 @@
             contentCredential.ssl_client_products.length +
             contentCredential.ssl_key_products.length || 0 }}</td>
         <td bst-table-cell class="number-cell">{{ contentCredential.gpg_key_repos.length +
-            contentCredential.ssl_ca_repos.length +
-            contentCredential.ssl_client_repos.length +
-            contentCredential.ssl_key_repos.length || 0 }}
+            contentCredential.ssl_ca_root_repos.length +
+            contentCredential.ssl_client_root_repos.length +
+            contentCredential.ssl_key_root_repos.length || 0 }}
         </td>
       </tr>
       </tbody>

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

@@ -0,0 +1,65 @@
+/**
+ * @ngdoc object
+ * @name  Bastion.content-hosts.controller:ContentHostsBulkTracesController
+ *
+ * @requires $scope
+ * @requires $uibModalInstance
+ * @requires HostBulkAction
+ * @requires Notification
+ * @requires Nutupane
+ * @requires BastionConfig
+ * @requires hostIds
+ * @requires HostTracesResolve
+ * @required ContentHostsHelper
+ * @requires translate
+ *
+ * @description
+ *   Provides the functionality to support resolving traces on multiple hosts.
+ */
+/*jshint camelcase:false*/
+angular.module('Bastion.content-hosts').controller('ContentHostsBulkTracesController',
+    ['$scope', '$uibModalInstance', 'HostBulkAction', 'Notification', 'Nutupane', 'BastionConfig', 'hostIds', 'HostTracesResolve', 'ContentHostsHelper', 'translate',
+    function ($scope, $uibModalInstance, HostBulkAction, Notification, Nutupane, BastionConfig, hostIds, HostTracesResolve, ContentHostsHelper, translate) {
+
+        var tracesNutupane = new Nutupane(HostBulkAction, hostIds, 'traces');
+        tracesNutupane.enableSelectAllResults();
+        tracesNutupane.masterOnly = true;
+        $scope.table = tracesNutupane.table;
+        $scope.remoteExecutionPresent = BastionConfig.remoteExecutionPresent;
+
+        $scope.performViaRemoteExecution = function() {
+            var traceids = _.map($scope.table.getSelected(), 'id');
+
+            var onSuccess = function () {
+                var message = translate('Successfully initiated restart of services.');
+                Notification.setSuccessMessage(message, {
+                    link: {
+                        children: translate("View job invocations."),
+                        href: translate("/job_invocations")
+                    }});
+                $scope.ok();
+            };
+
+            var onFailure = function (response) {
+                angular.forEach(response.data.errors, function (responseError) {
+                    Notification.setErrorMessage(responseError);
+                });
+            };
+            /* eslint-disable camelcase */
+            HostTracesResolve.resolve({trace_ids: traceids}, onSuccess, onFailure);
+            /* eslint-enable camelcase */
+        };
+
+        $scope.rebootRequired = function() {
+            return ContentHostsHelper.rebootRequired($scope.table.getSelected());
+        };
+
+        $scope.ok = function () {
+            $uibModalInstance.close();
+        };
+
+        $scope.cancel = function () {
+            $uibModalInstance.dismiss('cancel');
+        };
+    }
+]);

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

@@ -0,0 +1,79 @@
+<div data-extend-template="components/views/bst-modal.html">
+  <h4 data-block="modal-header">Content Host Traces Management</h4>
+
+  <div data-block="modal-body">
+
+    <div class="row">
+      <div class="col-sm-12">
+        <div bst-global-notification></div>
+      </div>
+    </div>
+
+    <div bst-alert="info" ng-hide="remoteExecutionPresent">
+      <span translate>
+        The Remote Execution plugin needs to be installed in order to resolve Traces.
+      </span>
+    </div>
+    
+    <div data-extend-template="layouts/partials/table.html">
+      <div data-block="search" ng-show="false"></div>
+      <span data-block="list-actions">
+        <div bst-modal="performViaRemoteExecution()" model="rebootRequired">
+          <div data-block="modal-header" translate>Confirm services restart</div>
+          <div data-block="modal-body">
+            <span translate>Are you sure you want to restart the services on the selected content hosts?</span>
+            <span ng-show="rebootRequired()">
+              <strong translate>Resolving the selected Traces will reboot this host.</strong>
+            </span>
+          </div>
+          <span data-block="modal-confirm-button">
+            <button class="btn btn-danger" ng-click="ok()">
+              <span translate>Restart</span>
+            </button>
+          </span>
+        </div>
+  
+          <span class="btn-group">
+            <button class="btn btn-danger" type="button"
+                    translate
+                    ng-hide="denied('edit_hosts', host)"
+                    ng-disabled="table.getSelected().length == 0 || !remoteExecutionPresent"
+                    ng-click="openModal()">
+              Restart Selected
+            </button>
+          </span>
+      </span>
+  
+      <span data-block="no-rows-message" translate>
+        There are no Traces to display.
+      </span>
+  
+      <div data-block="table">
+        <div data-extend-template="layouts/select-all-results.html"></div>
+        <table bst-table="table" class="table table-striped table-bordered" ng-class="{'table-mask': table.working}">
+          <thead>
+            <tr bst-table-head row-select>
+              <th bst-table-column="application" translate>Application</th>
+              <th bst-table-column="app_type" translate>Type</th>
+              <th bst-table-column="helper" translate>Helper</th>
+              <th bst-table-column="affected_hosts" translate>Hostname</th>
+            </tr>
+          </thead>
+          <tbody>
+            <tr bst-table-row ng-repeat="trace in table.rows" row-select="trace">
+              <td bst-table-cell >{{ trace.application }}</td>
+              <td bst-table-cell >{{ trace.app_type }}</td>
+              <td bst-table-cell >{{ trace.helper }}</td>
+              <td bst-table-cell >{{ trace.host }}</td>
+            </tr>
+          </tbody>
+        </table>
+      </div>
+    </div>
+  </div>
+  <div data-block="modal-footer">
+    <button type="button" class="btn btn-primary" ng-click="cancel()" translate>
+      Cancel
+    </button>
+  </div>
+</div>

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/content-hosts/content-host-modal-helper.service.js

@@ -69,6 +69,17 @@ angular.module('Bastion.content-hosts').service('ContentHostsModalHelper', ['$ui
             });
         };
 
+        this.openTracesModal = function() {
+            $uibModal.open({
+                templateUrl: 'content-hosts/bulk/views/content-hosts-bulk-traces-modal.html',
+                controller: 'ContentHostsBulkTracesController',
+                size: 'lg',
+                resolve: {
+                    hostIds: this.resolveFunc()
+                }
+            });
+        };
+
         this.openSubscriptionsModal = function() {
             $uibModal.open({
                 templateUrl: 'content-hosts/bulk/views/content-hosts-bulk-subscriptions-modal.html',

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/content-hosts/content-hosts-helper.service.js

@@ -47,5 +47,11 @@ angular.module('Bastion.content-hosts').service('ContentHostsHelper',
                 return 'pficon pficon-warning-triangle-o';
             }
         };
+
+        this.rebootRequired = function(traces) {
+            return traces.some(function(trace) {
+                return trace.reboot_required;
+            });
+        };
     }
 );

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

@@ -157,5 +157,10 @@ angular.module('Bastion.content-hosts').controller('ContentHostsController',
             nutupane.invalidate();
             ContentHostsModalHelper.openModuleStreamsModal();
         };
+
+        $scope.openTracesModal = function () {
+            nutupane.invalidate();
+            ContentHostsModalHelper.openTracesModal();
+        };
     }]
 );

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

@@ -3,12 +3,19 @@
  * @name  Bastion.content-hosts.controller:ContentHostPackagesActionsController
  *
  * @requires $scope
+ * @requires $location
  *
  * @description
  *   Provides the functionality for the content host package actions.
  */
 angular.module('Bastion.content-hosts').controller('ContentHostPackagesActionsController',
-    ['$scope', function ($scope) {
+    ['$scope', '$location', function ($scope, $location) {
+        var packageName = $location.search().package_name;
+
         $scope.packageAction = {actionType: 'packageInstall'}; //default to packageInstall
+
+        if (packageName) {
+            $scope.packageAction.term = packageName;
+        }
     }
 ]);

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

@@ -8,19 +8,20 @@
  * @requires HostTraces
  * @requires Nutupane
  * @requires BastionConfig
+ * @required ContentHostsHelper
  *
  * @description
  *   Provides the functionality for the content host package list and actions.
  */
 /*jshint camelcase:false*/
 angular.module('Bastion.content-hosts').controller('ContentHostTracesController',
-    ['$scope', '$timeout', '$window', 'translate', 'HostTraces', 'Nutupane', 'BastionConfig',
-    function ($scope, $timeout, $window, translate, HostTraces, Nutupane, BastionConfig) {
+    ['$scope', '$timeout', '$window', 'translate', 'HostTraces', 'Nutupane', 'BastionConfig', 'ContentHostsHelper',
+    function ($scope, $timeout, $window, translate, HostTraces, Nutupane, BastionConfig, ContentHostsHelper) {
         var tracesNutupane, params = {
             'paged': true
         };
 
-        tracesNutupane = new Nutupane(HostTraces, params, 'get');
+        tracesNutupane = new Nutupane(HostTraces, params, 'get', {'disableAutoLoad': true});
         tracesNutupane.masterOnly = true;
         $scope.table = tracesNutupane.table;
         $scope.table.tracesFilterTerm = "";
@@ -33,22 +34,23 @@ angular.module('Bastion.content-hosts').controller('ContentHostTracesController'
 
         $scope.remoteExecutionPresent = BastionConfig.remoteExecutionPresent;
 
+        $scope.rebootRequired = function() {
+            return ContentHostsHelper.rebootRequired($scope.table.getSelected());
+        };
+
         $scope.host.$promise.then(function() {
             if ($scope.host.id) {
                 tracesNutupane.setParams({id: $scope.host.id});
                 tracesNutupane.load();
             }
+            $scope.host.rebootRequired = $scope.rebootRequired;
         });
 
         $scope.selectedTraceHelpers = function() {
             var traceHelpers = [],
                 selected = $scope.table.getSelected();
 
-            var reboot = selected.some(function(value) {
-                return value.app_type === "static";
-            });
-
-            if (reboot) {
+            if ($scope.rebootRequired()) {
                 return ["reboot"];
             }
 
@@ -76,6 +78,5 @@ angular.module('Bastion.content-hosts').controller('ContentHostTracesController'
                 angular.element('#traceActionForm').submit();
             }, 0);
         };
-
     }
 ]);

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

@@ -37,6 +37,7 @@
     <input type="hidden" name="host_ids" ng-value="errataActionFormValues.hostIds"/>
     <input type="hidden" name="customize" ng-value="errataActionFormValues.customize"/>
     <input type="hidden" name="authenticity_token" ng-value="errataActionFormValues.authenticityToken"/>
+    <input type="hidden" name="install_all" ng-value="table.allResultsSelected" />
   </form>
 
   <div data-extend-template="layouts/partials/table.html">

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

@@ -26,13 +26,26 @@
 
   <div bst-feature-flag="remote_actions">
     <h3 translate>Traces</h3>
+    <h4 translate>Tracer helps administrators identify applications that need to be restarted after a system is patched.</h4>
+    <button
+      class="btn btn-default"
+      type="button"
+      ng-hide="denied('edit_hosts', host) || host.content_facet_attributes.katello_tracer_installed"
+      ng-click="installTracerPackage(host)">
+      <span translate>Enable Traces</span>
+    </button>
   </div>
 
   <div data-extend-template="layouts/partials/table.html">
     <span data-block="list-actions" ng-hide="contentHost.readonly">
       <div bst-modal="performViaRemoteExecution(false)" model="host">
         <div data-block="modal-header" translate>Restart Services on Content Host "{{host.name}}"?</div>
-        <div data-block="modal-body" translate>Are you sure you want to restart services on content host "{{ host.name }}"?</div>
+        <div data-block="modal-body">
+          <span translate>Are you sure you want to restart services on content host "{{ host.name }}"?</span>
+          <span ng-show="host.rebootRequired()">
+            <strong translate>Resolving the selected Traces will reboot this host.</strong>
+          </span>
+        </div>
         <span data-block="modal-confirm-button">
           <button class="btn btn-primary" ng-click="ok()">
             <span translate>Restart</span>

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

@@ -5,6 +5,7 @@
  * @requires $scope
  * @requires $state
  * @requires $q
+ * @requires $location
  * @requires translate
  * @requires Organization
  * @requires CurrentOrganization
@@ -17,8 +18,8 @@
  *   Provides the functionality for the content host details action pane.
  */
 angular.module('Bastion.content-hosts').controller('ContentHostDetailsController',
-    ['$scope', '$state', '$q', 'translate', 'Host', 'HostSubscription', 'Organization', 'CurrentOrganization', 'Notification', 'MenuExpander', 'ApiErrorHandler', 'deleteHostOnUnregister', 'ContentHostsHelper',
-    function ($scope, $state, $q, translate, Host, HostSubscription, Organization, CurrentOrganization, Notification, MenuExpander, ApiErrorHandler, deleteHostOnUnregister, ContentHostsHelper) {
+    ['$scope', '$state', '$q', '$location', 'translate', 'Host', 'HostSubscription', 'Organization', 'CurrentOrganization', 'Notification', 'MenuExpander', 'ApiErrorHandler', 'deleteHostOnUnregister', 'ContentHostsHelper',
+    function ($scope, $state, $q, $location, translate, Host, HostSubscription, Organization, CurrentOrganization, Notification, MenuExpander, ApiErrorHandler, deleteHostOnUnregister, ContentHostsHelper) {
         $scope.menuExpander = MenuExpander;
 
         $scope.getHostStatusIcon = ContentHostsHelper.getHostStatusIcon;
@@ -39,16 +40,24 @@ angular.module('Bastion.content-hosts').controller('ContentHostDetailsController
             loading: true
         };
 
-        $scope.host = Host.get({id: $scope.$stateParams.hostId}, function (host) {
-            host.unregisterDelete = !host.hasSubscription() || deleteHostOnUnregister;
-            host.deleteHostOnUnregister = deleteHostOnUnregister;
-            $scope.panel.loading = false;
-            $scope.purposeAddonsCount += host.subscription_facet_attributes.purpose_addons.length;
-        }, function (response) {
-            $scope.panel.loading = false;
-            ApiErrorHandler.handleGETRequestErrors(response, $scope);
+        function loadHost() {
+            return Host.get({id: $scope.$stateParams.hostId}, function (host) {
+                host.unregisterDelete = !host.hasSubscription() || deleteHostOnUnregister;
+                host.deleteHostOnUnregister = deleteHostOnUnregister;
+                $scope.panel.loading = false;
+                $scope.purposeAddonsCount += host.subscription_facet_attributes.purpose_addons.length;
+            }, function (response) {
+                $scope.panel.loading = false;
+                ApiErrorHandler.handleGETRequestErrors(response, $scope);
+            });
+        }
+
+        $scope.$on('TaskFinished', function() {
+            $scope.host = loadHost();
         });
 
+        $scope.host = loadHost();
+
         // @TODO begin hack for content and subscript facets
         // see http://projects.theforeman.org/issues/13763
         $scope.saveContentFacet = function (host) {
@@ -226,5 +235,9 @@ angular.module('Bastion.content-hosts').controller('ContentHostDetailsController
                 }, errorHandler);
             }
         };
+
+        $scope.installTracerPackage = function(host) {
+            $location.url("/content_hosts/" + host.id + "/packages/actions?package_name=katello-host-tools-tracer");
+        };
     }]
 );