katello 3.1.0.1 → 3.2.0.rc1

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/activation-keys/views/activation-keys.html

@@ -16,4 +16,8 @@
   <span data-block="no-rows-message" translate>
     You currently don't have any Activation Keys, you can add Activation Keys using the button on the right.
   </span>
+
+   <span data-block="no-search-results-message">
+     Your search returned zero Activation Keys.
+   </span>
 </div>

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

@@ -5,6 +5,7 @@ BASTION_MODULES.push(
     'Bastion.content-views',
     'Bastion.content-views.versions',
     'Bastion.docker-tags',
+    'Bastion.ostree-branches',
     'Bastion.hosts',
     'Bastion.puppet-modules',
     'Bastion.ostree-branches',

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/capsule-content/capsule-content.module.js

@@ -8,5 +8,7 @@
 angular.module('Bastion.capsule-content', [
     'ngResource',
     'ui.router',
-    'Bastion'
+    'Bastion',
+    'Bastion.i18n',
+    'Bastion.components'
 ]);

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

@@ -7,5 +7,8 @@
  */
 angular.module('Bastion.capsules', [
     'ngResource',
-    'Bastion'
+    'ui.router',
+    'Bastion',
+    'Bastion.i18n',
+    'Bastion.components'
 ]);

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

@@ -6,6 +6,8 @@
  *   Module for common functionality.
  */
 angular.module('Bastion.common', [
+    'ui.router',
     'Bastion',
+    'Bastion.i18n',
     'Bastion.components'
 ]);

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/common/views/registration.html

@@ -1,3 +1,4 @@
 <span translate>
+  <i class="fa fa-warning inline-icon"></i>
   This Host is not currently registered with subscription-manager.  Click <a ui-sref="content-hosts.register">here</a> for registration information.
 </span>

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

@@ -3,89 +3,63 @@
  * @name  Bastion.content-hosts.controller:ContentHostsBulkActionController
  *
  * @requires $scope
- * @requires $q
  * @requires $location
- * @requires HostCollection
  * @requires CurrentOrganization
- * @requires translate
- * @requires Organization
- * @requires Task
+ * @requires HostBulkAction
+ * @requires Subscription
+ * @requires ContentHost
+ * @requires SubscriptionsHelper
  *
  * @description
  *   A controller for providing bulk action functionality to the content hosts page.
  */
 angular.module('Bastion.content-hosts').controller('ContentHostsBulkActionSubscriptionsController',
-    ['$scope', '$q', '$location', 'HostCollection', 'CurrentOrganization', 'translate',
-     'Organization', 'Task', 'GlobalNotification',
-    function ($scope, $q, $location, HostCollection, CurrentOrganization, translate,
-        Organization, Task, GlobalNotification) {
+    ['$scope', '$location', 'Nutupane', 'CurrentOrganization', 'HostBulkAction', 'Subscription', 'SubscriptionsHelper',
+        function ($scope, $location, Nutupane, CurrentOrganization, HostBulkAction, Subscription, SubscriptionsHelper) {
+            var success, error, params = {
+                'organization_id': CurrentOrganization,
+                'search': $location.search().search || "",
+                'sort_order': 'ASC',
+                'available_for': 'host',
+                'host_id': $scope.$stateParams.hostId
+            };
 
-        function watchRunningTasks() {
-            var searchParams = { 'type': 'resource',
-                                 'active_only': true,
-                                 'action_types': ['Actions::Katello::Organization::AutoAttachSubscriptions'],
-                                 'resource_type': 'Organization',
-                                 'resource_id': CurrentOrganization };
-            return Task.registerSearch(searchParams, function (tasks) {
-                if (tasks.length > 0) {
-                    $scope.subscription.monitorTask(tasks[0]);
-                } else {
-                    $scope.subscription.taskRunnable = true;
-                }
-            });
-        }
+            function getBulkSubscriptionParams() {
+                var bulkParams = $scope.nutupane.getAllSelectedResults();
+                bulkParams.subscriptions = SubscriptionsHelper.getSelectedSubscriptionAmounts($scope.detailsTable);
+                return bulkParams;
+            }
 
-        $scope.actionParams = {
-            ids: []
-        };
+            success = function (response) {
+                $scope.setState(false, [], []);
+                $scope.transitionTo('content-hosts.bulk-actions.task-details', {taskId: response.id});
+            };
 
-        $scope.subscription = {
-            confirm: false,
-            runningTask: null,
-            taskRunnable: false,
-            monitorTask: function (task) {
-                var promise;
-                $scope.subscription.runningTask = Task.monitorTask(task);
-                promise = $scope.subscription.runningTask.promise;
-                promise.then(function () {
-                    GlobalNotification.setSuccessMessage(translate('Successfully Scheduled Auto-attach.'));
-                });
-                promise.catch(function (errors) {
-                    GlobalNotification.setErrorMessage(translate("An error occurred applying Subscriptions: ") + errors.join('; '));
-                });
-                promise.finally(function () {
-                    if ($scope.subscription.runningTask.state === 'stopped') {
-                        $scope.subscription.runningTask = null;
-                    }
-                });
-            }
-        };
+            error = function (response) {
+                $scope.setState(false, [], response.errors);
+            };
 
-        $scope.$watch('subscription.runningTask', function (value) {
-            if (value) {
-                $scope.subscription.taskRunnable = false;
-            }
-            if (value && $scope.subscription.runningTasksSearchId) {
-                Task.unregisterSearch($scope.subscription.runningTasksSearchId);
-                $scope.subscription.runningTasksSearchId = null;
-            } else if (!value && !$scope.subscription.runningTasksSearchId) {
-                $scope.subscription.runningTasksSearchId = watchRunningTasks();
-            }
-        });
+            $scope.contentNutupane = new Nutupane(Subscription, params);
+            $scope.detailsTable = $scope.contentNutupane.table;
+            $scope.contentNutupane.setSearchKey('subscriptionSearch');
+            $scope.contentNutupane.masterOnly = true;
+            $scope.groupedSubscriptions = {};
+            $scope.setState(false, [], []);
 
-        $scope.$on('$destroy', function () {
-            if ($scope.subscription.runningTask) {
-                $scope.subscription.runningTask.stopMonitoring();
-                $scope.subscription.runningTask = null;
-            }
-            if ($scope.subscription.runningTasksSearchId) {
-                Task.unregisterSearch($scope.subscription.runningTasksSearchId);
-            }
-        });
+            $scope.$watch('detailsTable.rows', function (rows) {
+                $scope.groupedSubscriptions = SubscriptionsHelper.groupByProductName(rows);
+            });
+
+            $scope.getAmountSelectorValues = SubscriptionsHelper.getAmountSelectorValues;
+
+            $scope.addSelected = function () {
+                var bulkParams = getBulkSubscriptionParams();
+                HostBulkAction.addSubscriptions(bulkParams, success, error);
+            };
 
-        $scope.performAutoAttachSubscriptions = function () {
-            $scope.subscription.confirm = false;
-            $scope.subscription.monitorTask(Organization.autoAttachSubscriptions({id: CurrentOrganization}));
-        };
-    }]
+            $scope.removeSelected = function () {
+                var bulkParams = getBulkSubscriptionParams();
+                HostBulkAction.removeSubscriptions(bulkParams, success, error);
+            };
+        }]
 );

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

@@ -49,8 +49,7 @@ angular.module('Bastion.content-hosts').controller('ContentHostsBulkActionContro
         };
 
         $scope.showNoSelectionWarning = function () {
-            return $scope.nutupane.table.numSelected === 0 && !$scope.isState('content-hosts.bulk-actions.subscriptions') &&
-                !$scope.isState('content-hosts.bulk-actions.task-details');
+            return $scope.nutupane.table.numSelected === 0 && !$scope.isState('content-hosts.bulk-actions.task-details');
         };
 
         $scope.performDestroyHosts = function () {

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

@@ -64,6 +64,11 @@
     <span data-block="no-rows-message" translate>
       There are no Errata associated with this Content Host to display.
     </span>
+      
+    <span data-block="no-search-results-message">
+      Your search returned zero Errata.
+    </span>
+
 
     <div data-block="table">
       <table class="table table-striped"

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

@@ -45,6 +45,11 @@
       There are no Host Collections available. You can create new Host Collections after selecting 'Host Collections' under 'Hosts' in main menu.
     </span>
 
+    <span data-block="no-search-results-message">
+      Your search returned zero Host Collections.
+    </span>
+
+
     <div data-block="table">
       <table data-block="table"  class="table table-striped" ng-class="{'table-mask': state.working}">
         <thead>

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/content-hosts/bulk/views/bulk-actions-subscriptions.html

@@ -1,40 +1,86 @@
 <span page-title>{{ 'Content Host Bulk Subscriptions' | translate }}</span>
 
-<div class="details">
-  <section>
-    <h4 translate>Content Host Subscriptions</h4>
+<div bst-alert="info">
+  <p translate>
+    This action will affect only those Content Hosts that require a change.
+    If the Content Host does not have the selected Subscription no action will take place.
+  </p>
+</div>
+
+<div data-extend-template="layouts/details-nutupane.html" ng-if="table.numSelected > 0">
+  <div data-block="actions">
+    <button class="btn btn-primary"
+            translate
+            ng-hide="denied('edit_hosts', host)"
+            ng-disabled="detailsTable.numSelected === 0 || isWorking"
+            ng-click="addSelected()">
+      Add Selected
+    </button>
+
     <button class="btn btn-primary"
             translate
-            ng-hide="denied('edit_hosts')"
-            ng-click="subscription.confirm = true"
-            ng-disabled="! subscription.taskRunnable">
-      Auto-attach available subscriptions to all content hosts
+            ng-hide="denied('edit_hosts', host)"
+            ng-disabled="detailsTable.numSelected === 0 || isWorking"
+            ng-click="removeSelected()">
+      Remove Selected
     </button>
+  </div>
+
+  <span data-block="no-rows-message" translate>
+      You currently don't have any Products to subscribe to, you can add Products after selecting 'Products' under 'Content' in the main menu
+  </span>
+
+  <span data-block="no-search-results-message">
+    Your search returned zero Subscriptions.
+  </span>
+
+  <div data-block="table">
+    <table ng-class="{'table-mask': detailsTable.working}"
+           class="table table-full">
+      <thead>
+      <tr bst-table-head row-select>
+        <th bst-table-column="quantity" sortable class="align-center"><span translate>Quantity</span></th>
+        <th bst-table-column="attached" sortable><span translate>Attached</span></th>
+        <th bst-table-column="type"><span translate>Type</span></th>
+        <th bst-table-column="startDate" sortable><span translate>Starts</span></th>
+        <th bst-table-column="endDate" sortable><span translate>Expires</span></th>
+        <th bst-table-column="supportLevel"><span translate>Support Level</span></th>
+        <th bst-table-column="contractNumber" sortable><span translate>Contract</span></th>
+        <th bst-table-column="accountNumber" sortable><span translate>Account</span></th>
+      </tr>
+      </thead>
+
+      <tbody>
+      <tr bst-table-row ng-repeat-start="(name, subscriptions) in groupedSubscriptions">
+        <td class="row-select">
+          <a href='/subscriptions/{{ subscription.id }}/info' class="confined-text">
+            {{ name }}
+          </a>
+        </td>
+        <td bst-table-cell colspan="8"></td>
+      </tr>
+      <tr class="grey-table-row" bst-table-row ng-repeat-end ng-repeat="subscription in subscriptions" row-select="subscription">
+        <td bst-table-cell>
+             <span ng-hide="subscription.multi_entitlement">
+               1
+             </span>
+          <select ng-hide="!subscription.multi_entitlement"
+                  ng-model="subscription.amount"
+                  ng-options="amount for amount in getAmountSelectorValues(subscription)"
+              >
+            <option value="">{{ "Automatic" | translate }}</option>
+          </select>
+        </td>
+        <td bst-table-cell>{{ subscription | subscriptionConsumedFilter }}</td>
+        <td bst-table-cell><div subscription-type="subscription"></div></td>
+        <td bst-table-cell>{{ subscription.start_date | date:"shortDate" }}</td>
+        <td bst-table-cell>{{ subscription.end_date | date:"shortDate" }}</td>
+        <td bst-table-cell>{{ subscription.support_level }}</td>
+        <td bst-table-cell>{{ subscription.contract_number }}</td>
+        <td bst-table-cell>{{ subscription.account_number }}</td>
+      </tr>
+      </tbody>
 
-    <span ng-show="subscription.runningTask">
-      <span ng-show="subscription.runningTask.state === 'starting'">
-        <i class="fa fa-spinner inline-icon fa-spin"></i>
-        <span translate>Starting</span>
-      </span>
-      <span ng-show="subscription.runningTask.state === 'running'">
-        <i class="fa fa-spinner inline-icon fa-spin"></i>
-        <span translate>Working</span>
-      </span>
-      <span ng-show="subscription.runningTask.state === 'paused'">
-        <i class="fa fa-warning inline-icon"></i>
-        <span translate>Paused</span>
-      </span>
-      <span translate ng-show="subscription.runningTask.state != 'starting'">
-        (<a href="/foreman_tasks/tasks/{{ subscription.runningTask.task.id }}">{{ "task details" | translate }}</a>)
-      </span>
-    </span>
-`
-    <div class="inline-confirmation" ng-show="subscription.confirm">
-      <div class="confirmation_text" translate>
-        Are you sure you want to auto-attach available subscriptions to all {{ contentHostTable.resource.total }} content hosts?
-      </div>
-      <button class="btn btn-default" ng-click="performAutoAttachSubscriptions()" translate>Yes</button>
-      <button class="btn btn-default" ng-click="subscription.confirm = false" translate>No</button>
-    </div>
-  </section>
+    </table>
+  </div>
 </div>

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

@@ -9,6 +9,7 @@ angular.module('Bastion.content-hosts', [
     'ngResource',
     'ui.router',
     'Bastion',
+    'Bastion.i18n',
     'Bastion.common',
     'Bastion.components',
     'Bastion.components.formatters',

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

@@ -84,6 +84,16 @@ angular.module('Bastion.content-hosts').controller('ContentHostErrataController'
             }
         });
 
+        $scope.calculateApplicability = function () {
+            $scope.calculatingApplicability = true;
+            HostErratum.regenerateApplicability({id: $scope.host.id},
+                function (task) {
+                    $scope.transitionTo('content-hosts.details.tasks.details', {taskId: task.id});
+                }, function() {
+                    $scope.calculatingApplicability = false;
+                });
+        };
+
         $scope.refreshErrata = function (selected) {
             var option, errataParams;
             errataParams = {'id': $scope.host.id};

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

@@ -48,15 +48,22 @@
       </form>
     </span>
 
-    <span data-block="actions" bst-feature-flag="remote_actions">
+    <form id="errataActionForm" method="post" action="/katello/remote_execution">
+      <input type="hidden" name="remote_action" value="errata_install"/>
+      <input type="hidden" name="name" ng-value="errataActionFormValues.errata"/>
+      <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"/>
+    </form>
 
-        <div bst-modal="applySelected()" model="host">
-          <div data-block="modal-header" translate>Apply Errata to Content Host "{{host.name}}"?</div>
-          <div data-block="modal-body" translate>Are you sure you want to apply Errata to content host "{{ host.name }}"?</div>
-          <div data-block="modal-confirm-button" translate>Apply</div>
-        </div>
+    <span data-block="actions" ng-hide="contentHost.readonly">
+      <div bst-modal="applySelected()" model="host">
+        <div data-block="modal-header" translate>Apply Errata to Content Host "{{host.name}}"?</div>
+        <div data-block="modal-body" translate>Are you sure you want to apply Errata to content host "{{ host.name }}"?</div>
+        <div data-block="modal-confirm-button" translate>Apply</div>
+      </div>
 
-        <div ng-hide="contentHost.readonly" class="fr">
+        <span bst-feature-flag="remote_actions">
           <span class="input-group-btn">
             <button class="btn btn-primary"
                     translate
@@ -76,21 +83,26 @@
               <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>
-            <form id="errataActionForm" method="post" action="/katello/remote_execution">
-              <input type="hidden" name="remote_action" value="errata_install"/>
-              <input type="hidden" name="name" ng-value="errataActionFormValues.errata"/>
-              <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"/>
-            </form>
           </span>
-        </div>
+        </span>
+        <button class="btn btn-primary"
+                translate
+                ng-hide="denied('edit_hosts', host)"
+                ng-disabled="calculatingApplicability"
+                ng-click="calculateApplicability()">
+          Recalculate
+          <i class="fa fa-spinner fa-spin" ng-show="calculatingApplicability"></i>
+        </button>
     </span>
 
     <span data-block="no-rows-message" translate>
       There are no Errata to display.
     </span>
 
+    <span data-block="no-search-results-message">
+      Your search returned zero Errata.
+    </span>
+
     <div data-block="table">
       <table class="table table-striped table-bordered" ng-class="{'table-mask': detailsTable.working}">
         <thead>

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

@@ -12,7 +12,7 @@
   </p>
   <section>
 
-    <form role="form" class="row" id="packageActionForm" method="post" action="/katello/remote_execution">
+    <form role="form" id="packageActionForm" method="post" action="/katello/remote_execution">
       <input type="hidden" name="name" ng-value="packageActionFormValues.package"/>
       <input type="hidden" name="remote_action" ng-value="packageActionFormValues.remoteAction"/>
       <input type="hidden" name="host_ids" ng-value="packageActionFormValues.hostIds"/>
@@ -20,44 +20,57 @@
       <input type="hidden" name="authenticity_token" ng-value="packageActionFormValues.authenticityToken"/>
     </form>
 
-    <form ng-submit="performPackageAction()" role="form" class="row">
-
-      <div class="col-sm-2">
-        <select class="form-control" ng-model="packageAction.actionType" name="remote_action" required>
-          <option value="packageInstall" translate>Package Install</option>
-          <option value="packageUpdate" translate>Package Update</option>
-          <option value="packageRemove" translate>Package Remove</option>
-          <option value="groupInstall" translate>Group Install</option>
-          <option value="groupRemove" translate>Group Remove</option>
-        </select>
-      </div>
-
-      <div class="input-group col-sm-5">
-        <input class="form-control"
-               type="text"
-               placeholder="{{ 'Package/Group Name' | translate}}"
-               ng-model="packageAction.term"/>
-
-        <span class="input-group-btn">
-          <button class="btn btn-default"
-                  ng-hide="denied('edit_hosts', host)"
-                  ng-disabled="working || packageAction.term === undefined || packageAction.term.length === 0"
-                  translate>
-            Perform</button>
-            <button class="btn btn-default dropdown-toggle"
-                    ng-hide="!remoteExecutionPresent || denied('edit_content_hosts', contentHost)"
-                    ng-disabled="working || packageAction.term === undefined || packageAction.term.length === 0"
-                    type="button" id="use-remote-execution" data-toggle="dropdown">
-              <span class="caret"></span>
-            </button>
-            <ul class="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 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>
-        </span>
-      </div>
-    </form>
+    <div class="nutupane-details-bar row">
+      <form ng-submit="performPackageAction()" role="form">
+
+        <div class="form-group col-sm-2">
+          <select class="form-control" ng-model="packageAction.actionType" name="remote_action" required>
+            <option value="packageInstall" translate>Package Install</option>
+            <option value="packageUpdate" translate>Package Update</option>
+            <option value="packageRemove" translate>Package Remove</option>
+            <option value="groupInstall" translate>Group Install</option>
+            <option value="groupRemove" translate>Group Remove</option>
+          </select>
+        </div>
+
+        <div class="form-group col-sm-5">
+          <div class="input-group">
+            <input class="form-control"
+                   type="text"
+                   placeholder="{{ 'Package/Group Name' | translate}}"
+                   ng-model="packageAction.term"/>
+
+            <span class="input-group-btn">
+              <button class="btn btn-default"
+                      ng-hide="denied('edit_hosts', host)"
+                      ng-disabled="working || packageAction.term === undefined || packageAction.term.length === 0"
+                      translate>
+                Perform</button>
+                <button class="btn btn-default dropdown-toggle"
+                        ng-hide="!remoteExecutionPresent || denied('edit_content_hosts', contentHost)"
+                        ng-disabled="working || packageAction.term === undefined || packageAction.term.length === 0"
+                        type="button" id="use-remote-execution" data-toggle="dropdown">
+                  <span class="caret"></span>
+                </button>
+                <ul class="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 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>
+            </span>
+          </div>
+        </div>
+
+        <div class="form-group fr">
+          <button class="btn btn-primary"
+                  translate
+                  ng-disabled="working"
+                  ng-click="updateAll()">
+            Update All Packages
+          </button>
+        </div>
+      </form>
+    </div>
   </section>
 </section>
 
@@ -68,6 +81,11 @@
     The host has not reported any installed packages, registering with subscription-manager should cause these to be reported.
   </span>
 
+  <span data-block="no-search-results-message">
+    Your search returned zero Packages.
+  </span>
+
+
   <div data-block="actions" bst-feature-flag="remote_actions">
     <div ng-hide="denied('edit_hosts', host)" class="nutupane-actions fr">
       <button class="btn btn-primary"
@@ -76,12 +94,6 @@
               ng-click="removeSelectedPackages()">
         {{ 'Remove Selected' | translate }}
       </button>
-      <button class="btn btn-primary"
-              translate
-              ng-disabled="working || detailsTable.numSelected === 0"
-              ng-click="updateAll()">
-        Update All
-      </button>
     </div>
   </div>