katello 3.3.2 → 3.4.0.rc1

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

@@ -0,0 +1,124 @@
+/**
+ * @ngdoc object
+ * @name  Bastion.content-hosts.controller:ContentHostsBulkErrataModalController
+ *
+ * @requires $scope
+ * @requires $http
+ * @requires $location
+ * @requires $window
+ * @requires $uibModalInstance
+ * @requires HostBulkAction
+ * @requires HostCollection
+ * @requires Nutupane
+ * @requires CurrentOrganization
+ * @requires Erratum
+ * @requires GlobalNotification
+ * @requires BastionConfig
+ * @requires hostIds
+ *
+ * @description
+ *   A controller for providing bulk action functionality to the content hosts page.
+ */
+angular.module('Bastion.content-hosts').controller('ContentHostsBulkErrataModalController',
+    ['$scope', '$http', '$location', '$window', '$uibModalInstance', 'HostBulkAction', 'HostCollection', 'Nutupane', 'CurrentOrganization', 'Erratum', 'GlobalNotification', 'BastionConfig', 'hostIds',
+    function ($scope, $http, $location, $window, $uibModalInstance, HostBulkAction, HostCollection, Nutupane, CurrentOrganization, Erratum, GlobalNotification, BastionConfig, hostIds) {
+        var nutupane;
+
+        function installParams() {
+            var params = hostIds;
+            params['content_type'] = 'errata';
+            params.content = _.map($scope.table.getSelected(), 'errata_id');
+            params['organization_id'] = CurrentOrganization;
+            return params;
+        }
+
+        function fetchErratum(errataId) {
+            $scope.erratum = Erratum.get({id: errataId, 'organization_id': CurrentOrganization});
+        }
+
+        nutupane = new Nutupane(HostBulkAction, {}, 'installableErrata');
+        $scope.controllerName = 'katello_errata';
+        nutupane.masterOnly = true;
+
+        $scope.table = nutupane.table;
+        $scope.table.errataFilterTerm = "";
+        $scope.table.initialLoad = false;
+        $scope.initialLoad = true;
+        $scope.remoteExecutionPresent = BastionConfig.remoteExecutionPresent;
+        $scope.remoteExecutionByDefault = BastionConfig.remoteExecutionByDefault;
+
+        $scope.fetchErrata = function () {
+            var params = hostIds;
+            params['organization_id'] = CurrentOrganization;
+            nutupane.setParams(params);
+            $scope.table.working = true;
+            if ($scope.table.numSelected > 0) {
+                nutupane.refresh().then(function () {
+                    $scope.table.working = false;
+                });
+            } else {
+                $scope.table.working = false;
+            }
+        };
+
+        $scope.transitionToErrata = function (erratum) {
+            fetchErratum(erratum['errata_id']);
+            $scope.transitionTo('content-hosts.bulk-actions.errata.details', {errataId: erratum['errata_id']});
+        };
+
+        $scope.transitionToErrataContentHosts = function (erratum) {
+            $scope.erratum = erratum;
+            $scope.transitionTo('content-hosts.bulk-actions.errata.content-hosts', {errataId: erratum['errata_id']});
+        };
+
+        $scope.installErrata = function () {
+            if ($scope.remoteExecutionByDefault) {
+                $scope.installErrataViaRemoteExecution();
+            } else {
+                $scope.installErrataViaKatelloAgent(false);
+            }
+        };
+
+        $scope.installErrataViaKatelloAgent = function () {
+            var params = installParams();
+            HostBulkAction.installContent(params,
+                function (data) {
+                    nutupane.invalidate();
+                    $scope.ok();
+                    $scope.transitionTo('content-hosts.bulk-task', {taskId: data.id});
+                },
+                function (response) {
+                    angular.forEach(response.data.errors, function (error) {
+                        GlobalNotification.setErrorMessage(error);
+                    });
+                });
+        };
+
+        $scope.installErrataViaRemoteExecution = function(customize) {
+            var formData = {},
+                errataIds = _.map($scope.table.getSelected(), 'errata_id'),
+                selectedHosts = hostIds;
+
+            formData.authenticityToken = $window.AUTH_TOKEN.replace(/"/g, '');
+            formData.remoteAction = 'errata_install';
+            formData.errata = errataIds.join(',');
+            formData.hostIds = selectedHosts.included.ids.join(',');
+            formData.search = selectedHosts.included.search;
+            formData.customize = customize;
+
+            $http.post('/katello/remote_execution', formData, {
+                headers: {'Content-Type': 'application/x-www-form-urlencoded'
+            }});
+        };
+
+        $scope.ok = function () {
+            $uibModalInstance.close();
+        };
+
+        $scope.cancel = function () {
+            $uibModalInstance.dismiss('cancel');
+        };
+
+        $scope.fetchErrata();
+    }]
+);

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

@@ -0,0 +1,86 @@
+/**
+ * @ngdoc object
+ * @name  Bastion.content-hosts.controller:ContentHostsBulkHostCollectionsModalController
+ *
+ * @requires $scope
+ * @requires $location
+ * @requires $uibModalInstance
+ * @requires translate
+ * @requires Nutupane
+ * @requires HostBulkAction
+ * @requires HostCollection
+ * @requires CurrentOrganization
+ * @requires GlobalNotification
+ * @requires hostIds
+ *
+ * @description
+ *   A controller for providing bulk action functionality to the content hosts page.
+ */
+angular.module('Bastion.content-hosts').controller('ContentHostsBulkHostCollectionsModalController',
+    ['$scope', '$location', '$uibModalInstance', 'translate', 'Nutupane', 'HostBulkAction', 'HostCollection', 'CurrentOrganization', 'GlobalNotification', 'hostIds',
+    function ($scope, $location, $uibModalInstance, translate, Nutupane, HostBulkAction, HostCollection, CurrentOrganization, GlobalNotification, hostIds) {
+        var nutupane, nutupaneParams;
+
+        $scope.hostCollections = {
+            action: null
+        };
+
+        nutupaneParams = {
+            'organization_id': CurrentOrganization,
+            'offset': 0,
+            'sort_by': 'name',
+            'sort_order': 'ASC',
+            'paged': true
+        };
+
+        nutupane = new Nutupane(HostCollection, nutupaneParams, 'queryPaged');
+        $scope.controllerName = 'katello_host_collections';
+        nutupane.masterOnly = true;
+
+        $scope.table = nutupane.table;
+
+        $scope.confirmHostCollectionAction = function (action) {
+            $scope.hostCollections.confirm = true;
+            $scope.hostCollections.action = action;
+        };
+
+        $scope.performHostCollectionAction = function () {
+            var params, action, success, error;
+
+            action = $scope.hostCollections.action;
+            params = hostIds;
+            params['organization_id'] = CurrentOrganization;
+            params['host_collection_ids'] = nutupane.getAllSelectedResults('id').included.ids;
+
+            $scope.hostCollections.action = null;
+
+            success = function (data) {
+                angular.forEach(data.displayMessages, function (message) {
+                    GlobalNotification.setSuccessMessage(message);
+                });
+                nutupane.invalidate();
+            };
+
+            error = function (response) {
+                angular.forEach(response.data.errors, function (responseError) {
+                    GlobalNotification.setErrorMessage(responseError);
+                });
+                $scope.editMode = true;
+            };
+
+            if (action === 'add') {
+                HostBulkAction.addHostCollections(params, success, error);
+            } else if (action === 'remove') {
+                HostBulkAction.removeHostCollections(params, success, error);
+            }
+        };
+
+        $scope.ok = function () {
+            $uibModalInstance.close();
+        };
+
+        $scope.cancel = function () {
+            $uibModalInstance.dismiss('cancel');
+        };
+    }]
+);

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

@@ -1,23 +1,25 @@
 /**
  * @ngdoc object
- * @name  Bastion.content-hosts.controller:ContentHostsBulkActionController
+ * @name  Bastion.content-hosts.controller:ContentHostsBulkPackagesModalController
  *
  * @requires $scope
- * @requires $q
  * @resource $location
  * @resource $timeout
  * @resource $window
+ * @requires $uibModalInstance
  * @requires HostBulkAction
  * @requires CurrentOrganization
  * @requires translate
+ * @requires GlobalNotification
  * @requires BastionConfig
+ * @requires hostIds
  *
  * @description
  *   A controller for providing bulk action functionality to the content hosts page.
  */
-angular.module('Bastion.content-hosts').controller('ContentHostsBulkActionPackagesController',
-    ['$scope', '$q', '$location', '$timeout', '$window', 'HostBulkAction', 'CurrentOrganization', 'translate', 'BastionConfig',
-    function ($scope, $q, $location, $timeout, $window, HostBulkAction, CurrentOrganization, translate, BastionConfig) {
+angular.module('Bastion.content-hosts').controller('ContentHostsBulkPackagesModalController',
+    ['$scope', '$location', '$timeout', '$window', '$uibModalInstance', 'HostBulkAction', 'CurrentOrganization', 'translate', 'GlobalNotification', 'BastionConfig', 'hostIds',
+    function ($scope, $location, $timeout, $window, $uibModalInstance, HostBulkAction, CurrentOrganization, translate, GlobalNotification, BastionConfig, hostIds) {
 
         function successMessage(type) {
             var messages = {
@@ -30,7 +32,7 @@ angular.module('Bastion.content-hosts').controller('ContentHostsBulkActionPackag
         }
 
         function installParams() {
-            var params = $scope.nutupane.getAllSelectedResults();
+            var params = hostIds;
             params['content_type'] = $scope.content.contentType;
             if ($scope.content.action === "update all") {
                 params['update_all'] = true;
@@ -44,7 +46,7 @@ angular.module('Bastion.content-hosts').controller('ContentHostsBulkActionPackag
 
         $scope.remoteExecutionPresent = BastionConfig.remoteExecutionPresent;
         $scope.remoteExecutionByDefault = BastionConfig.remoteExecutionByDefault;
-        $scope.setState(false, [], []);
+
         $scope.packageActionFormValues = {
             authenticityToken: $window.AUTH_TOKEN.replace(/"/g, '')
         };
@@ -78,7 +80,7 @@ angular.module('Bastion.content-hosts').controller('ContentHostsBulkActionPackag
         };
 
         $scope.performViaKatelloAgent = function (action, actionInput) {
-            var success, error, params, deferred = $q.defer();
+            var success, error, params;
 
             if (action) {
                 $scope.content.action = action;
@@ -89,16 +91,15 @@ angular.module('Bastion.content-hosts').controller('ContentHostsBulkActionPackag
             }
 
             $scope.content.confirm = false;
-            $scope.setState(true, [], []);
 
-            success = function (data) {
-                deferred.resolve(data);
-                $scope.setState(false, [successMessage($scope.content.action)], []);
+            success = function () {
+                GlobalNotification.setSuccessMessage(successMessage($scope.content.action));
             };
 
             error = function (response) {
-                $scope.setState(false, [], response.data.errors);
-                deferred.reject(response.data.errors);
+                angular.forEach(response.data.errors, function (responseError) {
+                    GlobalNotification.setErrorMessage(responseError);
+                });
             };
 
             params = installParams();
@@ -111,12 +112,10 @@ angular.module('Bastion.content-hosts').controller('ContentHostsBulkActionPackag
             } else if ($scope.content.action === "update all") {
                 HostBulkAction.updateContent(params, success, error);
             }
-
-            return deferred.promise;
         };
 
         $scope.performViaRemoteExecution = function(action, customize) {
-            var selectedHosts = $scope.nutupane.getAllSelectedResults();
+            var selectedHosts = hostIds;
 
             $scope.content.confirm = false;
             $scope.packageActionFormValues.customize = customize;
@@ -142,5 +141,13 @@ angular.module('Bastion.content-hosts').controller('ContentHostsBulkActionPackag
                 angular.element('#packageActionForm').submit();
             }, 0);
         };
+
+        $scope.ok = function () {
+            $uibModalInstance.close();
+        };
+
+        $scope.cancel = function () {
+            $uibModalInstance.dismiss('cancel');
+        };
     }]
 );

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

@@ -1,21 +1,24 @@
 /**
  * @ngdoc object
- * @name  Bastion.content-hosts.controller:ContentHostsBulkActionController
+ * @name  Bastion.content-hosts.controller:ContentHostsBulkSubscriptionsModalController
  *
  * @requires $scope
  * @requires $location
+ * @requires $uibModalInstance
  * @requires CurrentOrganization
  * @requires HostBulkAction
  * @requires Subscription
  * @requires ContentHost
  * @requires SubscriptionsHelper
+ * @requires GlobalNotification
+ * @requires hostIds
  *
  * @description
  *   A controller for providing bulk action functionality to the content hosts page.
  */
-angular.module('Bastion.content-hosts').controller('ContentHostsBulkActionSubscriptionsController',
-    ['$scope', '$location', 'Nutupane', 'CurrentOrganization', 'HostBulkAction', 'Subscription', 'SubscriptionsHelper',
-        function ($scope, $location, Nutupane, CurrentOrganization, HostBulkAction, Subscription, SubscriptionsHelper) {
+angular.module('Bastion.content-hosts').controller('ContentHostsBulkSubscriptionsModalController',
+    ['$scope', '$location', '$uibModalInstance', 'Nutupane', 'CurrentOrganization', 'HostBulkAction', 'Subscription', 'SubscriptionsHelper', 'GlobalNotification', 'hostIds',
+        function ($scope, $location, $uibModalInstance, Nutupane, CurrentOrganization, HostBulkAction, Subscription, SubscriptionsHelper, GlobalNotification, hostIds) {
             var success, error, params = {
                 'organization_id': CurrentOrganization,
                 'search': $location.search().search || "",
@@ -25,28 +28,31 @@ angular.module('Bastion.content-hosts').controller('ContentHostsBulkActionSubscr
             };
 
             function getBulkSubscriptionParams() {
-                var bulkParams = $scope.nutupane.getAllSelectedResults();
-                bulkParams.subscriptions = SubscriptionsHelper.getSelectedSubscriptionAmounts($scope.detailsTable);
+                var bulkParams = hostIds;
+                bulkParams.subscriptions = SubscriptionsHelper.getSelectedSubscriptionAmounts($scope.table);
                 return bulkParams;
             }
 
             success = function (response) {
-                $scope.setState(false, [], []);
-                $scope.transitionTo('content-hosts.bulk-actions.task-details', {taskId: response.id});
+                $scope.contentNutupane.invalidate();
+                $scope.ok();
+                $scope.transitionTo('content-hosts.bulk-task', {taskId: response.id});
             };
 
             error = function (response) {
-                $scope.setState(false, [], response.errors);
+                angular.forEach(response.data.errors, function (responseError) {
+                    GlobalNotification.setErrorMessage(responseError);
+                });
             };
 
             $scope.contentNutupane = new Nutupane(Subscription, params);
-            $scope.detailsTable = $scope.contentNutupane.table;
+            $scope.controllerName = 'katello_subscriptions';
+            $scope.table = $scope.contentNutupane.table;
             $scope.contentNutupane.setSearchKey('subscriptionSearch');
             $scope.contentNutupane.masterOnly = true;
             $scope.groupedSubscriptions = {};
-            $scope.setState(false, [], []);
 
-            $scope.$watch('detailsTable.rows', function (rows) {
+            $scope.$watch('table.rows', function (rows) {
                 $scope.groupedSubscriptions = SubscriptionsHelper.groupByProductName(rows);
             });
 
@@ -61,5 +67,18 @@ angular.module('Bastion.content-hosts').controller('ContentHostsBulkActionSubscr
                 var bulkParams = getBulkSubscriptionParams();
                 HostBulkAction.removeSubscriptions(bulkParams, success, error);
             };
+
+            $scope.autoAttach = function () {
+                var bulkParams = getBulkSubscriptionParams();
+                HostBulkAction.autoAttach(bulkParams, success, error);
+            };
+
+            $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-destroy-modal.html

@@ -0,0 +1,4 @@
+<div data-extend-template="components/views/bst-modal.html">
+  <h4 data-block="modal-header" translate>Remove {{ table.numSelected  }} Hosts?</h4>
+  <div data-block="modal-body" translate>Are you sure you want to remove the {{ table.numSelected }} host(s) selected?</div>
+</div>

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/content-hosts/bulk/views/{bulk-actions-environment.html → content-hosts-bulk-environment-modal.html}

@@ -1,15 +1,23 @@
-<span page-title>{{ 'Content Host Bulk Content' | translate }}</span>
+<div data-extend-template="components/views/bst-modal.html">
+  <h4 data-block="modal-header" translate>Content Host Bulk Content</h4>
 
-<div class="details">
-  <section>
+  <div data-block="modal-body">
     <h4 translate>Assign Environment and Content View</h4>
 
+    <div class="row">
+      <div class="col-sm-12">
+        <div bst-global-notification></div>
+      </div>
+    </div>
+
     <div bst-alert="info" ng-show="showConfirm">
-      <p translate>
+      <span translate>
         Are you sure you want to assign the {{ table.numSelected }} content host(s) selected to {{ selected.contentView.name }} in {{ selected.environment.name }}?
-      </p>
-      <button class="btn btn-default" ng-click="hideConfirmDialog();" translate>No</button>
-      <button class="btn btn-default" ng-click="hideConfirmDialog(); performAction()" translate>Yes</button>
+      </span>
+      <div>
+        <button type="button" class="btn btn-default" ng-click="showConfirm = false; performAction()" translate>Yes</button>
+        <button type="button" class="btn btn-default" ng-click="showConfirm = false;" translate>No</button>
+      </div>
     </div>
 
     <div path-selector="environments"
@@ -39,14 +47,20 @@
         </p>
       </div>
 
-      <button class="btn btn-default fr"
-              translate
+      <button class="btn btn-default"
+              type="button"
               ng-hide="denied('edit_hosts')"
-              ng-click="showConfirmDialog();"
+              ng-click="showConfirm = true;"
               ng-disabled="disableAssignButton(confirm)">
-        Assign
+        <span translate>Assign</span>
       </button>
 
     </form>
-  </section>
-</div>
+  </div>
+
+  <div data-block="modal-footer">
+    <button type="button" class="btn btn-primary" ng-click="ok()" translate>
+      Done
+    </button>
+  </div>
+</div>