katello 3.3.2 → 3.4.0.rc1

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/errata/details/views/erratum.html

@@ -0,0 +1,37 @@
+<span page-title ng-model="errata">{{ 'Errata: ' | translate }} {{ errata.title }}</span>
+
+<div data-extend-template="layouts/details-page-with-breadcrumbs.html">
+  <header data-block="header">
+    {{ errata.title }}
+  </header>
+
+  <nav data-block="navigation">
+    <ul class="nav nav-tabs">
+      <li ng-class="{active: isState('erratum.info')}">
+        <a ui-sref="erratum.info">
+          <span translate>
+            Details
+          </span>
+        </a>
+      </li>
+      <li ng-class="{active: isState('erratum.content-hosts') || isState('erratum.apply')}">
+        <a ui-sref="erratum.content-hosts">
+          <span translate>
+            Content Hosts
+          </span>
+        </a>
+      </li>
+      <li ng-class="{active: isState('erratum.repositories')}">
+        <a ui-sref="erratum.repositories">
+          <span translate>
+            Repositories
+          </span>
+        </a>
+      </li>
+    </ul>
+  </nav>
+
+  <div data-block="content">
+    <section ui-view></section>
+  </div>
+</div>

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

@@ -3,10 +3,12 @@
  * @name  Bastion.errata.controller:ErrataController
  *
  * @requires $scope
+ * @requires $state
  * @requires $location
  * @requires translate
  * @requires Nutupane
  * @requires Erratum
+ * @requires IncrementalUpdate
  * @requires Repository
  * @requires CurrentOrganization
  *
@@ -16,8 +18,8 @@
  *   within the table.
  */
 angular.module('Bastion.errata').controller('ErrataController',
-    ['$scope', '$location', 'translate', 'Nutupane', 'Erratum', 'Task', 'Repository', 'CurrentOrganization',
-    function ($scope, $location, translate, Nutupane, Erratum, Task, Repository, CurrentOrganization) {
+    ['$scope', '$state', '$location', 'translate', 'Nutupane', 'Erratum', 'IncrementalUpdate', 'Repository', 'CurrentOrganization',
+    function ($scope, $state, $location, translate, Nutupane, Erratum, IncrementalUpdate, Repository, CurrentOrganization) {
         var nutupane, params = {
             'organization_id': CurrentOrganization,
             'search': $location.search().search || "",
@@ -28,40 +30,16 @@ angular.module('Bastion.errata').controller('ErrataController',
         };
 
         nutupane = $scope.nutupane = new Nutupane(Erratum, params);
+        $scope.controllerName = 'katello_errata';
         $scope.table = nutupane.table;
         $scope.removeRow = nutupane.removeRow;
-        $scope.controllerName = 'katello_errata';
 
         Erratum.queryPaged({'organization_id': CurrentOrganization}, function (result) {
             $scope.errataCount = result.total;
         });
 
-        $scope.table.closeItem = function () {
-            $scope.transitionTo('errata.index');
-        };
-
         $scope.repository = {name: translate('All Repositories'), id: 'all'};
 
-        $scope.checkIfIncrementalUpdateRunning = function () {
-            var searchId, taskSearchParams, taskSearchComplete;
-
-            taskSearchParams = {
-                'type': 'all',
-                "resource_type": "Organization",
-                "resource_id": CurrentOrganization,
-                "action_types": "Actions::Katello::ContentView::IncrementalUpdates",
-                "active_only": true
-            };
-
-            taskSearchComplete = function (results) {
-                $scope.incrementalUpdates = results;
-                $scope.incrementalUpdateInProgress = results.length > 0;
-                Task.unregisterSearch(searchId);
-            };
-
-            searchId = Task.registerSearch(taskSearchParams, taskSearchComplete);
-        };
-
         Repository.queryUnpaged({'organization_id': CurrentOrganization, 'content_type': 'yum'}, function (response) {
             $scope.repositories = [$scope.repository];
             $scope.repositories = $scope.repositories.concat(response.results);
@@ -104,10 +82,10 @@ angular.module('Bastion.errata').controller('ErrataController',
         });
 
         $scope.goToNextStep = function () {
-            $scope.selectedErrata = nutupane.getAllSelectedResults();
-            $scope.transitionTo('errata.apply.select-content-hosts');
+            IncrementalUpdate.setBulkErrata(nutupane.getAllSelectedResults());
+            $state.transitionTo('apply-errata.select-content-hosts');
         };
 
-        $scope.checkIfIncrementalUpdateRunning();
+        $scope.incrementalUpdates = IncrementalUpdate.getIncrementalUpdates();
     }]
 );

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

@@ -11,5 +11,6 @@ angular.module('Bastion.errata', [
     'Bastion',
     'Bastion.common',
     'Bastion.i18n',
-    'Bastion.components.formatters'
+    'Bastion.components.formatters',
+    'Bastion.tasks'
 ]);

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

@@ -9,123 +9,130 @@
  */
 angular.module('Bastion.errata').config(['$stateProvider', function ($stateProvider) {
     $stateProvider.state('errata', {
-        url: '/errata',
+        url: '/errata?repositoryId',
+        permission: ['view_products', 'view_content_views'],
+        views: {
+          '@': {
+              controller: 'ErrataController',
+              templateUrl: 'errata/views/errata.html'
+          }
+        },
+        ncyBreadcrumb: {
+            label: "{{ 'Errata' | translate }}"
+        }
+    });
+
+    $stateProvider.state('errata.tasks', {
+        url: '/tasks',
         abstract: true,
-        controller: 'ErrataController',
-        templateUrl: 'errata/views/errata.html'
-    })
-    .state('errata.index', {
-        url: '?repositoryId',
         permission: ['view_products', 'view_content_views'],
         views: {
-            'table': {
-                templateUrl: 'errata/views/errata-table-full.html'
+            '@': {
+                templateUrl: 'errata/views/errata-tasks.html'
             }
         }
     })
+    .state('errata.tasks.list', {
+        url: '',
+        permission: ['view_products', 'view_content_views'],
+        templateUrl: 'errata/views/errata-tasks-list.html',
+        ncyBreadcrumb: {
+            label: "{{ 'Tasks' | translate }}",
+            parent: 'errata'
 
-    .state('errata.apply', {
+        }
+    })
+    .state('errata.tasks.task', {
+        url: '/:taskId',
+        permission: ['view_products', 'view_content_views'],
+        controller: 'TaskDetailsController',
+        templateUrl: 'errata/views/errata-task-details.html',
+        ncyBreadcrumb: {
+            label: '{{ task.id }}',
+            parent: 'errata.tasks.list'
+        }
+    });
+
+    $stateProvider.state('apply-errata', {
         url: '/errata/apply',
         abstract: true,
-        collapsed: true,
-        views: {
-            'table': {
-                templateUrl: 'errata/views/errata-table-collapsed.html'
-            },
-            'action-panel': {
-                templateUrl: 'errata/views/apply-errata.html'
-            }
-        }
+        templateUrl: 'errata/views/apply-errata.html'
     })
-    .state('errata.apply.select-content-hosts', {
+    .state('apply-errata.select-content-hosts', {
         url: '/select-content-hosts',
-        collapsed: true,
         permission: 'edit_hosts',
-        controller: 'ErrataContentHostsController',
-        templateUrl: 'errata/views/apply-errata-select-content-hosts.html'
+        controller: 'ErratumContentHostsController',
+        templateUrl: 'errata/views/apply-errata-select-content-hosts.html',
+        ncyBreadcrumb: {
+            label: '{{ "Select Content Host(s)" | translate }}',
+            parent: 'errata'
+        }
     })
-    .state('errata.apply.confirm', {
+    .state('apply-errata.confirm', {
         url: '/confirm',
-        collapsed: true,
         permission: 'edit_hosts',
         controller: 'ApplyErrataController',
-        templateUrl: 'errata/views/apply-errata-confirm.html'
-    })
+        templateUrl: 'errata/views/apply-errata-confirm.html',
+        ncyBreadcrumb: {
+            label: '{{ "Confirm" | translate }}',
+            parent: 'apply-errata.select-content-hosts'
+        }
+    });
 
-    .state('errata.details', {
+    $stateProvider.state('erratum', {
         abstract: true,
-        url: '/:errataId',
+        url: '/errata/:errataId',
         permission: ['view_products', 'view_content_views'],
-        collapsed: true,
-        views: {
-            'table': {
-                templateUrl: 'errata/views/errata-table-collapsed.html'
-            },
-            'action-panel': {
-                controller: 'ErrataDetailsController',
-                templateUrl: 'errata/details/views/errata-details.html'
-            }
+        controller: 'ErratumController',
+        templateUrl: 'errata/details/views/erratum.html'
+    })
+    .state('erratum.info', {
+        url: '',
+        permission: ['view_products', 'view_content_views'],
+        templateUrl: 'errata/details/views/erratum-info.html',
+        ncyBreadcrumb: {
+            label: "{{ errata.title }}",
+            parent: 'errata'
         }
     })
-    .state('errata.details.apply', {
+    .state('erratum.apply', {
         url: '/apply',
-        collapsed: true,
         permission: 'edit_hosts',
         controller: 'ApplyErrataController',
-        templateUrl: 'errata/views/apply-errata-confirm.html'
-    })
-    .state('errata.details.info', {
-        url: '/info',
-        collapsed: true,
-        permission: ['view_products', 'view_content_views'],
-        templateUrl: 'errata/details/views/errata-details-info.html'
+        templateUrl: 'errata/views/apply-errata-confirm.html',
+        ncyBreadcrumb: {
+            label: "{{ 'Apply' | translate }}",
+            parent: 'erratum.info'
+        }
     })
-    .state('errata.details.content-hosts', {
+    .state('erratum.content-hosts', {
         url: '/content-hosts',
-        collapsed: true,
         permission: ['view_products', 'view_content_views'],
-        controller: 'ErrataContentHostsController',
-        templateUrl: 'errata/details/views/errata-details-content-hosts.html'
+        controller: 'ErratumContentHostsController',
+        templateUrl: 'errata/details/views/erratum-content-hosts.html',
+        ncyBreadcrumb: {
+            label: "{{ 'Content Hosts' | translate }}",
+            parent: 'erratum.info'
+        }
     })
-    .state('errata.details.repositories', {
+    .state('erratum.repositories', {
         url: '/repositories',
-        collapsed: true,
-        permission: ['view_products', 'view_content_views'],
-        controller: 'ErrataDetailsRepositoriesController',
-        templateUrl: 'errata/details/views/errata-details-repositories.html'
-    })
-    .state('errata.details.task-details', {
-        url: '/tasks/:taskId',
-        collapsed: true,
         permission: ['view_products', 'view_content_views'],
-        controller: 'TaskDetailsController',
-        templateUrl: 'errata/views/errata-task-details.html'
-    })
-
-    .state('errata.tasks', {
-        abstract: true,
-        collapsed: true,
-        permission: ['view_products', 'view_content_views'],
-        views: {
-            'table': {
-                templateUrl: 'errata/views/errata-table-collapsed.html'
-            },
-            'action-panel': {
-                templateUrl: 'errata/views/errata-tasks.html'
-            }
+        controller: 'ErratumRepositoriesController',
+        templateUrl: 'errata/details/views/erratum-repositories.html',
+        ncyBreadcrumb: {
+            label: "{{ 'Repositories' | translate }}",
+            parent: 'erratum.info'
         }
     })
-    .state('errata.tasks.index', {
-        url: '/tasks',
-        collapsed: true,
-        permission: ['view_products', 'view_content_views'],
-        templateUrl: 'errata/views/errata-tasks-list.html'
-    })
-    .state('errata.tasks.details', {
+    .state('erratum.task', {
         url: '/tasks/:taskId',
-        collapsed: true,
         permission: ['view_products', 'view_content_views'],
         controller: 'TaskDetailsController',
-        templateUrl: 'errata/views/errata-task-details.html'
+        templateUrl: 'errata/views/errata-task-details.html',
+        ncyBreadcrumb: {
+            label: "{{ task.id }}",
+            parent: 'erratum.info'
+        }
     });
 }]);

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/errata/incremental-update.service.js

@@ -0,0 +1,149 @@
+(function () {
+
+    /**
+     * @ngdoc service
+     * @name Bastion.errata.service:IncrementalUpdate
+     *
+     * @description
+     *   Provides a helper service for Incremental Updates.
+     *
+     */
+    function IncrementalUpdate($q, Task, CurrentOrganization) {
+        var getIdsFromBulk;
+
+        getIdsFromBulk = function (bulkResource) {
+            var ids = [];
+
+            if (bulkResource && bulkResource.included && bulkResource.included.ids) {
+                ids = bulkResource.included.ids;
+            }
+
+            return ids;
+        };
+
+        this.errataIds = [];
+        this.contentHostIds = [];
+        this.bulkErrata = {};
+        this.bulkContentHosts = {};
+
+        /**
+         * Allows setting the Errata Ids.
+         *
+         * @param {Array} errataIds the errata Ids to store for update
+         **/
+        this.setErrataIds = function (errataIds) {
+            this.errataIds = errataIds;
+        };
+
+        /**
+         * Return the list of Errata Ids.
+         *
+         * @returns {Array} array of Errata Ids
+         */
+        this.getErrataIds = function () {
+            return this.errataIds;
+        };
+
+        /**
+         * Allows setting the Content Host Ids.
+         *
+         * @param {Array} contentHostIds the Content Host Ids to store for update
+         **/
+        this.setContentHostIds = function (contentHostIds) {
+            this.contentHostIds = contentHostIds;
+        };
+
+        /**
+         * Return the list of Content Host Ids.
+         *
+         * @returns {Array} array of Content Host Ids
+         */
+        this.getContentHostIds = function () {
+            return this.contentHostIds;
+        };
+
+        /**
+         * Allows setting the Bulk Content Hosts.
+         *
+         * @param {Object} bulkContentHosts the bulk selection of the content hosts.
+         *
+         * @returns {Boolean}
+         */
+        this.setBulkContentHosts = function (bulkContentHosts) {
+            this.bulkContentHosts = bulkContentHosts;
+            this.contentHostIds = getIdsFromBulk(bulkContentHosts);
+        };
+
+        /**
+         * Return the Bulk Content Hosts.
+         *
+         * @returns {Object} the bulk selection of the content hosts
+         */
+        this.getBulkContentHosts = function () {
+            return this.bulkContentHosts;
+        };
+
+        /**
+         * Allows setting the Bulk Errata.
+         *
+         * @param {Object} bulkErratas the bulk selection of the content hosts.
+         *
+         * @returns {Boolean}
+         */
+        this.setBulkErrata = function (bulkErratas) {
+            this.bulkErrata = bulkErratas;
+            this.errataIds = getIdsFromBulk(bulkErratas);
+        };
+
+        /**
+         * Return the Bulk Errata.
+         *
+         * @returns {Object} the bulk selection of the content hosts
+         */
+        this.getBulkErrata = function () {
+            return this.bulkErrata;
+        };
+
+        /**
+         * Return the incremental updates that are currently running.
+         *
+         * @returns $promise that resolves to a list of incremental updates.
+         */
+        this.getIncrementalUpdates = function () {
+            var searchId, taskSearchParams, taskSearchComplete,
+                deferred = $q.defer();
+
+            taskSearchParams = {
+                'type': 'all',
+                "resource_type": "Organization",
+                "resource_id": CurrentOrganization,
+                "action_types": "Actions::Katello::ContentView::IncrementalUpdates",
+                "active_only": true
+            };
+
+            taskSearchComplete = function (results) {
+                Task.unregisterSearch(searchId);
+                deferred.resolve(results);
+            };
+
+            searchId = Task.registerSearch(taskSearchParams, taskSearchComplete);
+            return deferred.promise;
+        };
+
+        /**
+         * Determines whether or not errata can be applied.
+         *
+         * For now, simply checks if the parameters exist.
+         *
+         * @returns boolean
+         */
+        this.canApply = function () {
+            return this.errataIds.length > 0 && this.contentHostIds.length > 0;
+        };
+    }
+
+    angular.module('Bastion.errata').service('IncrementalUpdate', IncrementalUpdate);
+
+    IncrementalUpdate.$inject = ['$q', 'Task', 'CurrentOrganization'];
+
+})();