katello 3.3.2 → 3.4.0.rc1

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/environments/views/environments.html

@@ -8,24 +8,22 @@
         Lifecycle Environment Paths
       </span>
 
-      <a class="fr btn btn-default"
+      <a class="fr btn btn-primary"
           ui-sref="environments.new({priorId: library.id})"
           ng-hide="denied('create_lifecycle_environments', library)">
-        <i class="fa fa-plus"></i>
-        {{ "New Environment Path" | translate }}
+        <i class="pficon pficon-add-circle-o"></i>
+        {{ "Create Environment Path" | translate }}
       </a>
     </h2>
   </div>
 
-  <section class="row nutupane-sub-section">
-
+  <section class="row">
     <div class="col-sm-12">
-
-      <div class="col-sm-12">
+      <div ng-hide="denied('view_lifecycle_environments', library)">
         <table class="table table-bordered info-blocks">
           <tbody>
             <tr>
-              <td class="info-block-head"><a ui-sref="environments.environment.details({environmentId: library.id})" translate>Library</a></td>
+              <td class="info-block-head"><a ui-sref="environment.details({environmentId: library.id})" translate>Library</a></td>
               <td class="info-block" translate>Content Views <div>{{ library.counts.content_views || 0 }}</div></td>
               <td class="info-block" translate>Products <div>{{ library.counts.products || 0 }}</div></td>
               <td class="info-block" translate>Yum Repositories <div>{{ library.counts.yum_repositories || 0 }}</div></td>
@@ -39,7 +37,7 @@
         </table>
       </div>
 
-      <div class="col-sm-12 environment" ng-repeat="path in paths">
+      <div class="environment" ng-repeat="path in paths">
         <div class="row">
           <div class="col-sm-12">
             <a ng-hide="denied('create_lifecycle_environments', path['environments'][0])" ui-sref="environments.new({priorId: lastEnvironment(path).id})" class="btn btn-default fr">
@@ -54,7 +52,7 @@
             <tr>
               <th></th>
               <th ng-repeat="environment in path.environments">
-                <a ui-sref="environments.environment.details({environmentId: environment.id})">
+                <a ui-sref="environment.details({environmentId: environment.id})">
                   {{ environment.name }}
                 </a>
               </th>
@@ -73,8 +71,6 @@
           </tbody>
         </table>
       </div>
-
     </div>
   </section>
-
 </section>

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/environments/views/new-environment.html

@@ -4,7 +4,7 @@
 
   <ol class="breadcrumb">
     <li>
-      <a ui-sref="environments.index" translate>Environments List</a>
+      <a ui-sref="environments" translate>Environments List</a>
     </li>
 
     <li class="active">
@@ -57,7 +57,7 @@
       </div>
 
       <div bst-form-buttons
-           on-cancel="transitionTo('environments.index')"
+           on-cancel="transitionTo('environments')"
            on-save="save(environment)"
            working="working">
       </div>

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

@@ -1,9 +1,10 @@
 /**
  * @ngdoc object
- * @name  Bastion.errata.controller:ApplyErrataController
+ * @name  Bastion.errata.controller:IncrementalUpdateController
  *
  * @requires $scope
  * @requires translate
+ * @requires IncrementalUpdate
  * @requires ContentHostBulkAction
  * @requires ContentViewVersion
  * @requires CurrentOrganization
@@ -12,16 +13,16 @@
  *   Display confirmation screen and apply Errata.
  */
 angular.module('Bastion.errata').controller('ApplyErrataController',
-    ['$scope', 'translate', 'HostBulkAction', 'ContentViewVersion', 'CurrentOrganization',
-        function ($scope, translate, HostBulkAction, ContentViewVersion, CurrentOrganization) {
+    ['$scope', 'translate', 'IncrementalUpdate', 'HostBulkAction', 'ContentViewVersion', 'CurrentOrganization',
+        function ($scope, translate, IncrementalUpdate, HostBulkAction, ContentViewVersion, CurrentOrganization) {
             var applyErrata, incrementalUpdate;
 
             function transitionToTask(task) {
                 if ($scope.$stateParams.hasOwnProperty('errataId')) {
-                    $scope.transitionTo('errata.details.task-details', {errataId: $scope.$stateParams.errataId,
+                    $scope.transitionTo('erratum.task', {errataId: $scope.$stateParams.errataId,
                         taskId: task.id});
                 } else {
-                    $scope.transitionTo('errata.tasks.details', {taskId: task.id});
+                    $scope.transitionTo('errata.tasks.task', {taskId: task.id});
                 }
                 $scope.applyingErrata = false;
             }
@@ -50,7 +51,7 @@ angular.module('Bastion.errata').controller('ApplyErrataController',
                 $scope.applyingErrata = true;
 
                 params['add_content'] = {
-                    'errata_ids': $scope.errataIds
+                    'errata_ids': IncrementalUpdate.getErrataIds()
                 };
 
                 params['content_view_version_environments'] = [];
@@ -81,7 +82,7 @@ angular.module('Bastion.errata').controller('ApplyErrataController',
                 });
 
                 if ($scope.applyErrata) {
-                    params['update_hosts'] = $scope.selectedContentHosts;
+                    params['update_hosts'] = IncrementalUpdate.getBulkContentHosts();
                 }
 
                 error = function (response) {
@@ -93,12 +94,12 @@ angular.module('Bastion.errata').controller('ApplyErrataController',
             };
 
             applyErrata = function () {
-                var params = $scope.selectedContentHosts, error;
+                var params = IncrementalUpdate.getBulkContentHosts(), error;
 
                 $scope.applyingErrata = true;
 
                 params['content_type'] = 'errata';
-                params.content = $scope.errataIds;
+                params.content = IncrementalUpdate.getErrataIds();
                 params['organization_id'] = CurrentOrganization;
 
                 error = function (response) {
@@ -109,16 +110,9 @@ angular.module('Bastion.errata').controller('ApplyErrataController',
                 HostBulkAction.installContent(params, transitionToTask, error);
             };
 
-            if ($scope.$stateParams.hasOwnProperty('errataId')) {
-                $scope.errataIds = [$scope.$stateParams.errataId];
-            } else {
-                if ($scope.selectedErrata) {
-                    $scope.errataIds = $scope.selectedErrata.included.ids;
-                }
-            }
-
-            if ($scope.selectedContentHosts && $scope.errataIds) {
-                $scope.selectedContentHosts['errata_ids'] = $scope.errataIds;
+            if (IncrementalUpdate.canApply()) {
+                $scope.selectedContentHosts = IncrementalUpdate.getBulkContentHosts();
+                $scope.selectedContentHosts['errata_ids'] = IncrementalUpdate.getErrataIds();
                 $scope.selectedContentHosts['organization_id'] = CurrentOrganization;
                 HostBulkAction.availableIncrementalUpdates($scope.selectedContentHosts, function (updates) {
                     $scope.updates = updates;
@@ -133,7 +127,9 @@ angular.module('Bastion.errata').controller('ApplyErrataController',
                 }
             };
 
-            $scope.checkIfIncrementalUpdateRunning();
-
+            $scope.incrementalUpdates = IncrementalUpdate.getIncrementalUpdates();
+            $scope.selectedContentHosts = IncrementalUpdate.getBulkContentHosts();
+            $scope.contentHostIds = IncrementalUpdate.getContentHostIds();
+            $scope.errataIds = IncrementalUpdate.getErrataIds();
         }
     ]);

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/errata/details/{errata-content-hosts.controller.js → erratum-content-hosts.controller.js}

@@ -1,19 +1,20 @@
 /**
  * @ngdoc object
- * @name  Bastion.errata.controller:ErrataContentHostsController
+ * @name  Bastion.errata.controller:ErratumContentHostsController
  *
  * @requires $scope
  * @requires Nutupane
- * @requires ContentHost
+ * @requires Host
+ * @requires IncrementalUpdate
  * @requires Environment
  * @requires CurrentOrganization
  *
  * @description
  *   Provides the functionality for the available host collection details action pane.
  */
-angular.module('Bastion.errata').controller('ErrataContentHostsController',
-    ['$scope', 'Nutupane', 'Host', 'Environment', 'CurrentOrganization',
-    function ($scope, Nutupane, Host, Environment, CurrentOrganization) {
+angular.module('Bastion.errata').controller('ErratumContentHostsController',
+    ['$scope', 'Nutupane', 'Host', 'IncrementalUpdate', 'Environment', 'CurrentOrganization',
+    function ($scope, Nutupane, Host, IncrementalUpdate, Environment, CurrentOrganization) {
         var nutupane, params;
 
         $scope.successMessages = [];
@@ -27,11 +28,12 @@ angular.module('Bastion.errata').controller('ErrataContentHostsController',
         };
 
         nutupane = new Nutupane(Host, params, 'postIndex');
-        nutupane.table.closeItem = function () {};
+        $scope.controllerName = 'hosts';
+        nutupane.masterOnly = true;
         nutupane.enableSelectAllResults();
 
         $scope.nutupane = nutupane;
-        $scope.detailsTable = nutupane.table;
+        $scope.table = nutupane.table;
         $scope.nutupane.searchTransform = function(term) {
             var addition = '( ' + $scope.errataSearchString($scope.restrictInstallable) + ' )';
             if (angular.isDefined($scope.environmentId)) {
@@ -74,16 +76,15 @@ angular.module('Bastion.errata').controller('ErrataContentHostsController',
         };
 
         $scope.goToNextStep = function () {
-            $scope.$parent.numberOfContentHostsToUpdate = nutupane.table.allResultsSelectCount();
-            $scope.$parent.selectedContentHosts = nutupane.getAllSelectedResults();
+            IncrementalUpdate.setBulkContentHosts(nutupane.getAllSelectedResults());
 
             if ($scope.errata && $scope.errata.id) {
-                $scope.transitionTo('errata.details.apply', {errataId: $scope.errata.id});
+                $scope.transitionTo('erratum.apply', {errataId: $scope.errata.id});
             } else {
-                $scope.transitionTo('errata.apply.confirm');
+                $scope.transitionTo('apply-errata.confirm');
             }
         };
 
-        $scope.checkIfIncrementalUpdateRunning();
+        $scope.incrementalUpdates = IncrementalUpdate.getIncrementalUpdates();
     }
 ]);

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/errata/details/{errata-details-repositories.controller.js → erratum-repositories.controller.js}

@@ -1,6 +1,6 @@
 /**
  * @ngdoc object
- * @name  Bastion.errata.controller:ErrataDetailsRepositoriesController
+ * @name  Bastion.errata.controller:ErratumRepositoriesController
  *
  * @requires $scope
  * @requires $q
@@ -13,7 +13,7 @@
  * @description
  *   Provides the functionality for the errata details repositories page.
  */
-angular.module('Bastion.errata').controller('ErrataDetailsRepositoriesController',
+angular.module('Bastion.errata').controller('ErratumRepositoriesController',
 ['$scope', '$q', 'Nutupane', 'Repository', 'Environment', 'ContentView', 'CurrentOrganization',
 function ($scope, $q, Nutupane, Repository, Environment, ContentView, CurrentOrganization) {
     var repositoriesNutupane, environment, contentView, params = {
@@ -22,8 +22,9 @@ function ($scope, $q, Nutupane, Repository, Environment, ContentView, CurrentOrg
     };
 
     repositoriesNutupane = new Nutupane(Repository, params);
-    $scope.detailsTable = repositoriesNutupane.table;
-    $scope.detailsTable.initialLoad = false;
+    $scope.controllerName = 'katello_repositories';
+    $scope.table = repositoriesNutupane.table;
+    $scope.table.initialLoad = false;
     repositoriesNutupane.masterOnly = true;
     repositoriesNutupane.setSearchKey('repositoriesSearch');
 
@@ -37,10 +38,10 @@ function ($scope, $q, Nutupane, Repository, Environment, ContentView, CurrentOrg
         $scope.contentViewFilter = _.find($scope.contentViews, {'default': true});
     });
 
-    $scope.detailsTable.working = true;
+    $scope.table.working = true;
     $q.all([contentView.$promise, environment.$promise]).then(function () {
         $scope.filterErrata();
-        $scope.detailsTable.working = false;
+        $scope.table.working = false;
     });
 
     $scope.filterErrata = function () {

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/errata/details/{errata-details.controller.js → erratum.controller.js}

@@ -1,15 +1,15 @@
 /**
  * @ngdoc object
- * @name  Bastion.errata.controller:ErrataDetailsController
+ * @name  Bastion.errata.controller:ErratumController
  *
  * @requires $scope
  * @requires Errata
  * @requires ApiErrorHandler
  *
  * @description
- *   Provides the functionality for the errata details action pane.
+ *   Provides the functionality for the errata pages.
  */
-angular.module('Bastion.errata').controller('ErrataDetailsController', ['$scope', 'Erratum', 'ApiErrorHandler',
+angular.module('Bastion.errata').controller('ErratumController', ['$scope', 'Erratum', 'ApiErrorHandler',
     function ($scope, Erratum, ApiErrorHandler) {
         $scope.panel = {
             error: false,

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

@@ -0,0 +1,78 @@
+<span page-title>{{ 'Apply Errata to Content Hosts' | translate }}</span>
+
+<h3 translate>Apply to Content Hosts</h3>
+
+<div data-extend-template="layouts/partials/table.html">
+  <div data-block="list-actions">
+    <button type="button" class="btn btn-primary"
+            ng-click="goToNextStep()"
+            ng-hide="denied('edit_hosts')"
+            ng-disabled="table.numSelected == 0 || incrementalUpdates.length > 0">
+      <span translate>Apply to Hosts</span>
+    </button>
+  </div>
+
+  <div data-block="search-filter">
+    <select class="form-control"
+            ng-model="environmentFilter"
+            ng-options="environment.id as environment.name for environment in environments"
+            ng-change="selectEnvironment(environmentFilter)">
+      <option value="" disabled selected >Filter by Environment</option>
+    </select>
+
+
+    <a ng-show="environmentFilter" ng-click="selectEnvironment(undefined)">
+      <i class="fa fa-remove"></i>
+    </a>
+  </div>
+
+  <div class="filters">
+    <label class="checkbox-inline">
+      <input type="checkbox" ng-model="restrictInstallable" ng-change="toggleInstallable()"/>
+      <span translate>Only show content hosts where the errata is currently installable in the host's Lifecycle Environment.</span>
+    </label>
+  </div>
+
+  <span data-block="no-rows-message" translate>
+    No Content Hosts match this Erratum.
+  </span>
+
+  <span data-block="no-search-results-message" translate>
+    Your search returned zero Content Hosts.
+  </span>
+
+  <div data-block="table">
+    <p bst-alert="warning" ng-show="table.rows.length > 0 && stateIncludes('erratum.content-hosts.unavailable')">
+      <span translate>The Content View or Lifecycle Environment needs to be updated in order to make errata available to these hosts.</span>
+    </p>
+
+    <table class="table table-striped table-bordered"
+           ng-class="{'table-mask': table.working}"
+           ng-show="table.rows.length > 0">
+      <thead>
+        <tr bst-table-head row-select>
+          <th bst-table-column="name"><span translate>Name</span></th>
+          <th bst-table-column="os"><span translate>OS</span></th>
+          <th bst-table-column="environment"><span translate>Environment</span></th>
+          <th bst-table-column="contentView"><span translate>Content View</span></th>
+        </tr>
+      </thead>
+
+      <tbody>
+        <tr bst-table-row ng-repeat="contentHost in table.rows" row-select="contentHost"
+            ng-controller="ContentHostStatusController">
+          <td bst-table-cell>
+            <a ui-sref="content-host.info({hostId: contentHost.id})">
+              {{ contentHost.name }}
+            </a>
+          </td>
+          <td bst-table-cell>{{ contentHost.operatingsystem_name }}</td>
+          <td bst-table-cell>{{ contentHost.content_facet_attributes.lifecycle_environment_name }}</td>
+          <td bst-table-cell>{{ contentHost.content_facet_attributes.content_view_name || "" }}</td>
+        </tr>
+      </tbody>
+    </table>
+
+    <div data-block="footer-actions" class="footer-actions"></div>
+  </div>
+</div>

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

@@ -0,0 +1,58 @@
+<span page-title ng-model="errata">{{ 'Errata: ' | translate }} {{ errata.title }}</span>
+
+<div data-extend-template="layouts/two-column-details.html">
+  <div data-block="left-column">
+    <h4 translate>{{ errata.title }}</h4>
+
+    <dl class="dl-horizontal dl-horizontal-left">
+      <dt translate>Advisory</dt>
+      <dd>{{ errata.errata_id }}</dd>
+
+      <dt translate>CVEs</dt>
+      <dd>
+        <span ng-repeat="cve in errata.cves">
+          <a href="{{ cve.href }}">{{ cve.cve_id }}</a>
+          <span ng-show="!$last">,</span>
+        </span>
+        <span ng-show="errata.cves.length === 0" translate>N/A</span>
+      </dd>
+
+      <dt translate>Type</dt>
+      <dd>{{ errata.type | errataType }}</dd>
+
+      <dt translate>Severity</dt>
+      <dd>{{ errata.severity | errataSeverity }}</dd>
+
+      <dt translate>Issued</dt>
+      <dd>{{ errata.issued | date:'shortDate' }}</dd>
+
+      <dt translate>Last Updated On</dt>
+      <dd>{{ errata.updated | date:'shortDate' }}</dd>
+
+      <dt translate>Reboot Suggested?</dt>
+      <dd>{{ errata.reboot_suggested | booleanToYesNo }}</dd>
+    </dl>
+
+    <h3 translate>Topic</h3>
+    <p class="info-paragraph">{{ errata.summary }}</p>
+
+
+    <h3 translate>Description</h3>
+    <p class="info-paragraph">{{ errata.description }}</p>
+
+    <h3 translate>Solution</h3>
+    <p class="info-paragraph">{{ errata.solution }}</p>
+  </div>
+
+  <div data-block="right-column">
+    <h3 translate>Affected Packages</h3>
+
+    <ul class="list-unstyled">
+      <li ng-repeat="package in errata.packages">
+        <a href="/packages?search={{package}}">
+          {{ package }}
+        </a>
+      </li>
+    </ul>
+  </div>
+</div>

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/errata/details/views/{errata-details-repositories.html → erratum-repositories.html}

@@ -1,38 +1,25 @@
 <span page-title ng-model="errata">{{ 'Repositories for Errata: ' | translate }} {{ errata.title }}</span>
 
-<div data-extend-template="layouts/details-nutupane.html">
+<h3 translate>Repositories containing Errata {{ errata.errata_id }}</h3>
 
-  <div data-block="header">
-    <h3 translate>Repositories containing Errata {{ errata.errata_id }}</h3>
-  </div>
-
-  <div data-block="actions"></div>
-
-  <div data-block="filters">
-    <form class="col-sm-5" role="form">
-      <div class="form-group">
-        <div class="col-sm-2">
-          <select class="form-control"
-                  ng-disabled="!environments"
-                  ng-model="environmentFilter"
-                  ng-options="e.id as e.name for e in environments"
-                  ng-change="filterErrata()">
-          </select>
-        </div>
+<div data-extend-template="layouts/partials/table.html">
+  <div data-block="search-filter">
+    <select class="form-control"
+            ng-disabled="!environments"
+            ng-model="environmentFilter"
+            ng-options="e.id as e.name for e in environments"
+            ng-change="filterErrata()">
+    </select>
 
-        <div class="col-sm-2">
-          <select class="form-control"
-                  ng-disabled="!contentViews || filteredCVs.length === 0"
-                  ng-model="contentViewFilter"
-                  ng-options="cv as cv.name for cv in filteredCVs = (contentViews | filter:{environments: environmentFilter})"
-                  ng-change="filterErrata()">
-          </select>
-          <p class="help-block" translate ng-show="filteredCVs.length === 0">
-            There are no Content Views in this Environment.
-          </p>
-        </div>
-      </div>
-    </form>
+    <select class="form-control"
+            ng-disabled="!contentViews || filteredCVs.length === 0"
+            ng-model="contentViewFilter"
+            ng-options="cv as cv.name for cv in filteredCVs = (contentViews | filter:{environments: environmentFilter})"
+            ng-change="filterErrata()">
+    </select>
+    <p class="help-block" translate ng-show="filteredCVs.length === 0">
+      There are no Content Views in this Environment.
+    </p>
   </div>
 
   <span data-block="no-rows-message" translate>
@@ -45,8 +32,8 @@
 
   <div data-block="table">
     <table class="table table-striped table-bordered"
-           ng-class="{'table-mask': detailsTable.working}"
-           ng-show="detailsTable.rows.length > 0">
+           ng-class="{'table-mask': table.working}"
+           ng-show="table.rows.length > 0">
       <thead>
         <tr bst-table-head>
           <th bst-table-column="name"><span translate>Name</span></th>
@@ -57,14 +44,14 @@
 
       <tbody>
         <tr bst-table-row
-            ng-repeat="repository in detailsTable.rows">
+            ng-repeat="repository in table.rows">
           <td bst-table-cell>
             <a ng-href="/products/{{ repository.product.id }}/repositories/{{ repository.library_instance_id || repository.id }}">
               {{ repository.name }}
             </a>
           </td>
           <td bst-table-cell>
-            <a ui-sref="repositories({productId: repository.product.id})">
+            <a ui-sref="product.info({productId: repository.product.id})">
               {{ repository.product.name }}
             </a>
           </td>