katello 3.3.2 → 3.4.0.rc1

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/errata/views/apply-errata-confirm.html

@@ -1,16 +1,5 @@
 <span page-title>{{ 'Apply Errata' | translate }}</span>
 
-<ol class="breadcrumb">
-  <li>
-    <a ui-sref="errata.index" translate>Errata List</a>
-  </li>
-  <li>
-    <a ng-show="errata" ui-sref="errata.details.apply" translate>Select Content Hosts</a>
-    <a ng-hide="errata" ui-sref="errata.apply.select-content-hosts" translate>Select Content Hosts</a>
-  </li>
-  <li class="active" translate>Confirm</li>
-</ol>
-
 <div bst-alerts success-messages="successMessages" error-messages="errorMessages"></div>
 
 <section class="col-md-4" ng-hide="selectedContentHosts">
@@ -28,16 +17,16 @@
 <section class="details details-full" ng-show="selectedContentHosts && errataIds">
   <h3 ng-show="errata" translate>Apply {{ errata.errata_id }}</h3>
 
-  <section ng-hide="updates">
+  <section ng-hide="updates.length > 0">
     <p translate ng-show="errata">
-      Apply {{ errata.errata_id }} to {{ numberOfContentHostsToUpdate }} Content Host(s)?
+      Apply {{ errata.errata_id }} to {{ contentHostIds.length  }} Content Host(s)?
     </p>
     <p translate ng-hide="errata">
-      Apply {{ errataIds.length }} Errata to {{ numberOfContentHostsToUpdate }} Content Host(s)?
+      Apply {{ errataIds.length }} Errata to {{ contentHostIds.length }} Content Host(s)?
     </p>
   </section>
 
-  <section ng-show="updates">
+  <section ng-show="updates.length > 0">
     <p translate>
       One or more of the selected Errata are not Installable via your published Content View versions running on the selected hosts.  The new Content View Versions (specified below)
       will be created which will make this Errata Installable in the host's Environment.  This new version will replace the current version in your host's Lifecycle
@@ -108,7 +97,8 @@
         * These marked Content View Versions are from Composite Content Views.  Their components needing updating are listed underneath.
       </span>
     </div>
-    <div class="checkbox" ng-show="updates">
+
+    <div class="checkbox" ng-show="updates.length > 0">
       <label>
         <input name="applyErrata" ng-model="applyErrata" type="checkbox"/>
         <span translate>Apply Errata to Content Hosts immediately after publishing.</span>
@@ -117,7 +107,7 @@
 
     <button type="button" class="btn btn-default" ng-click="transitionBack()" translate>Cancel</button>
     <button type="submit" class="btn btn-primary"
-            ng-disabled="applyingErrata || incrementalUpdateInProgress">
+            ng-disabled="applyingErrata || incrementalUpdates.length > 0">
       <i class="fa fa-spinner fa-spin" ng-show="applyingErrata"></i>
       <span ng-show="applyingErrata" translate>Applying</span>
       <span ng-hide="applyingErrata" translate>Confirm</span>

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

@@ -1,17 +1,7 @@
-<ol class="breadcrumb">
-  <li>
-    <a ui-sref="errata.index" translate>Errata List</a>
-  </li>
-  <li class="active" translate>Select Content Hosts</li>
-</ol>
-
-<div data-extend-template="errata/details/views/errata-details-content-hosts.html">
-  <div data-block="header"></div>
-  <div data-block="actions"></div>
-
-  <div data-block="footer-actions" class="footer-actions">
-    <button type="button" class="btn btn-default" ng-click="transitionTo('errata.index')" translate>Cancel</button>
-    <button type="submit" class="btn btn-primary" ng-disabled="detailsTable.numSelected === 0 || incrementalUpdateInProgress"
+<div data-extend-template="errata/details/views/erratum-content-hosts.html">
+  <div data-block="list-actions">
+    <button type="button" class="btn btn-default" ng-click="transitionTo('errata')" translate>Cancel</button>
+    <button type="submit" class="btn btn-primary" ng-disabled="table.numSelected === 0 || incrementalUpdates.length > 0"
             ng-click="goToNextStep()" translate>Next</button>
   </div>
 </div>

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/errata/views/apply-errata.html

@@ -1,32 +1,15 @@
 <span page-title>{{ 'Apply Errata' | translate }}</span>
 
-<section class="nutupane-details" ng-cloak bst-container-scroll>
-
-  <header class="details-header">
-    <h2 class="fl" translate>Apply Errata</h2>
-
-    <div class="fr">
-      <button class="btn btn-default" ui-sref="errata.index">
-        <i class="icon-remove"></i>
-        {{ "Close" | translate }}
-      </button>
-    </div>
+<div data-extend-template="layouts/details-page-with-breadcrumbs.html">
+  <header data-block="header" translate>
+    Apply Errata
   </header>
 
-  <div>
-    <div bst-alert="warning" ng-show="errataIds.length === 0">
-      <i class="icon-exclamation-sign"></i>
-      <span translate>At least one Errata needs to be selected to Apply.</span>
-    </div>
-
-    <div bst-alert="info" ng-show="state.working">
-      <i class="fa fa-spinner fa-spin"></i>
-      <span translate>Processing</span>
-    </div>
-
-    <span ng-disabled="table.numSelected == 0">
-      <div ui-view></div>
-    </span>
+  <div bst-alert="warning" ng-show="errataIds.length === 0">
+    <span translate>At least one Errata needs to be selected to Apply.</span>
   </div>
 
-</section>
+  <div data-block="content" ng-hide="errataIds.length > 0">
+    <section ui-view></section>
+  </div>
+</div>

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

@@ -1,7 +1,7 @@
 <div data-extend-template="tasks/views/task-details.html">
   <div data-block="back-button"></div>
   <div class="details-actions fr">
-    <button class="btn btn-default" ui-sref="errata.index">
+    <button type="button" class="btn btn-default" ui-sref="errata">
       <i class="fa fa-remove"></i>
       {{ "Close" | translate }}
     </button>

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/errata/views/errata-tasks-list.html

@@ -1,5 +1,5 @@
 <h3 translate>Errata Task List</h3>
-<div tasks-table  details-state="errata.tasks.details"
+<div tasks-table  details-state="errata.tasks.task"
      known-context="errata,organization"
      resource-type="Katello::Erratum"
      resource-id="{{ errara.id }}"/>

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/errata/views/errata-tasks.html

@@ -1,12 +1,9 @@
 <span page-title>{{ 'Errata Tasks' | translate }}</span>
 
-<section class="nutupane-details">
-  <div class="details-actions fr">
-    <button class="btn btn-default" ui-sref="errata.index">
-      <i class="fa fa-remove"></i>
-      {{ "Close" | translate }}
-    </button>
+<div data-extend-template="layouts/details-page-with-breadcrumbs.html">
+  <div data-block="content">
+    <section ui-view></section>
   </div>
-  <h2 translate>Applying Bulk Errata Update</h2>
-  <div ui-view></div>
-</section>
+</div>
+
+

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

@@ -1,49 +1,34 @@
 <span page-title>{{ 'Errata' | translate }}</span>
 
-<div data-extend-template="layouts/nutupane.html">
-
-  <div data-block="messages">
-    <div bst-alert="info" ng-show="incrementalUpdateInProgress">
-      <div>
-        <p translate>There is currently an Incremental Update task in progress.  This update must finish before applying existing updates.</p>
-        <div>
-          <a href="/foreman_tasks/tasks/{{incrementalUpdates[0].id}}" translate>Click here to check the status of the task.</a>
-        </div>
-      </div>
-    </div>
-  </div>
-
-  <div data-block="header">
-    {{ 'Errata' | translate }}
+<div data-extend-template="layouts/table-with-header.html">
+  <div data-block="header" translate>
+    Errata
   </div>
 
-  <div data-block="actions">
-    <button class="btn btn-primary"
+  <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 || incrementalUpdateInProgress">
-      <i class="icon-plus"></i>
+            ng-disabled="table.numSelected == 0 || incrementalUpdates.length > 0">
       <span translate>Apply Errata</span>
     </button>
   </div>
 
   <div data-block="search-filter">
-    <div class="col-sm-3">
-      <select class="form-control" ng-model="repository" ng-options="repository.name for (id, repository) in repositories"></select>
-    </div>
+    <select class="form-control" ng-model="repository" ng-options="repository.name for (id, repository) in repositories"></select>
+  </div>
 
-    <div class="col-sm-3">
-      <label class="checkbox-inline" title="{{ 'Only show Errata that are Applicable to one or more Content Hosts' | translate }}">
-        <input type="checkbox" ng-model="showApplicable" ng-disabled="showInstallable" ng-change="toggleFilters()"/>
-        <span translate>Applicable</span>
-        <i class="fa fa-question-circle" ng-show="showInstallable" title="{{ 'Errata are automatically Applicable if they are Installable' | translate }}"></i>
-      </label>
-
-      <label class="checkbox-inline" title="{{ 'Only show Errata that are Installable on one or more Content Hosts' | translate }}">
-        <input type="checkbox" ng-model="showInstallable" ng-change="toggleFilters()"/>
-        <span translate>Installable</span>
-      </label>
-    </div>
+  <div data-block="filters">
+    <label class="checkbox-inline" title="{{ 'Only show Errata that are Applicable to one or more Content Hosts' | translate }}">
+      <input type="checkbox" ng-model="showApplicable" ng-disabled="showInstallable" ng-change="toggleFilters()"/>
+      <span translate>Applicable</span>
+      <i class="fa fa-question-circle" ng-show="showInstallable" title="{{ 'Errata are automatically Applicable if they are Installable' | translate }}"></i>
+    </label>
+
+    <label class="checkbox-inline" title="{{ 'Only show Errata that are Installable on one or more Content Hosts' | translate }}">
+      <input type="checkbox" ng-model="showInstallable" ng-change="toggleFilters()"/>
+      <span translate>Installable</span>
+    </label>
   </div>
 
   <span data-block="no-rows-message">
@@ -59,5 +44,63 @@
     Your search returned zero Errata.
   </span>
 
+  <div data-block="messages">
+    <div bst-alert="info" ng-show="incrementalUpdates.length > 0">
+      <div>
+        <p translate>There is currently an Incremental Update task in progress.  This update must finish before applying existing updates.</p>
+        <div>
+          <a href="/foreman_tasks/tasks/{{incrementalUpdates[0].id}}" translate>Click here to check the status of the task.</a>
+        </div>
+      </div>
+    </div>
+  </div>
+
+  <div data-block="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="errata_id" sortable>{{ "Errata ID" | translate }}</th>
+          <th bst-table-column="title">{{ "Title" | translate }}</th>
+          <th bst-table-column="type">{{ "Type" | translate }}</th>
+          <th bst-table-column="numberOfContentHosts">{{ "Content Host Counts" | translate }}</th>
+          <th bst-table-column="updated" sortable>{{ "Updated" | translate }}</th>
+        </tr>
+      </thead>
+
+      <tbody>
+        <tr bst-table-row ng-repeat="errata in table.rows" row-select="errata">
+          <td bst-table-cell>
+            <a ui-sref="erratum.info({errataId: errata.id})">
+              {{ errata.errata_id }}
+            </a>
+            <i class="fa fa-chevron-right selected-icon" ng-show="errata.selected"></i>
+          </td>
+          <td bst-table-cell>
+            {{ errata.title }}
+          </td>
+          <td bst-table-cell>
+            <span ng-show="errata.type == 'security'">
+              <i class="fa fa-warning inline-icon" title="{{ 'Security' | translate }}"></i>
+            </span>
 
+            <span ng-show="errata.type == 'bugfix'">
+              <i class="fa fa-bug inline-icon" title="{{ 'Bug Fix' | translate }}"></i>
+            </span>
+
+            <span ng-show="errata.type == 'enhancement'">
+              <i class="fa fa-plus-square inline-icon" title="{{ 'Enhancement' | translate }}"></i>
+            </span>
+
+            {{ errata.type | errataType}}
+            <span ng-show="errata.severity">- {{ errata.severity | errataSeverity}}</span>
+          </td>
+          <td bst-table-cell>
+            <span translate>{{ errata.hosts_applicable_count || 0 }} Applicable, </span>
+            <span translate>{{ errata.hosts_available_count || 0 }} Installable</span>
+          </td>
+          <td bst-table-cell>{{ errata.updated | date:'shortDate'}}</td>
+        </tr>
+      </tbody>
+    </table>
+  </div>
 </div>

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/files/details/file-content-views.controller.js

@@ -0,0 +1,44 @@
+(function () {
+
+    /**
+     * @ngdoc object
+     * @name  Bastion.files.controller:FileContentViewsController
+     *
+     * @description
+     *   Provides the functionality for the files details contentViews page.
+     */
+    function FileContentViewsController($scope, Nutupane, ContentViewVersion, CurrentOrganization) {
+        var contentViewsNutupane,
+            params = {
+                'file_id': $scope.$stateParams.fileId,
+                'organization_id': CurrentOrganization
+            };
+
+        contentViewsNutupane = new Nutupane(ContentViewVersion, params);
+        $scope.controllerName = 'katello_content_views';
+        contentViewsNutupane.masterOnly = true;
+        contentViewsNutupane.setSearchKey('contentViewsSearch');
+
+        $scope.table = contentViewsNutupane.table;
+
+        $scope.environmentNames = function (environments) {
+            var names = _.map(environments, function (environment) {
+                return environment.name;
+            });
+
+            return names.join(',');
+        };
+    }
+
+    angular
+        .module('Bastion.files')
+        .controller('FileContentViewsController', FileContentViewsController);
+
+    FileContentViewsController.$inject = [
+        '$scope',
+        'Nutupane',
+        'ContentViewVersion',
+        'CurrentOrganization'
+    ];
+
+})();

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/files/details/file-repositories.controller.js

@@ -0,0 +1,36 @@
+(function () {
+
+    /**
+     * @ngdoc object
+     * @name  Bastion.files.controller:FileRepositoriesController
+     *
+     * @description
+     *   Provides the functionality for the files details repositories page.
+     */
+    function FileRepositoriesController($scope, Nutupane, Repository, CurrentOrganization) {
+        var repositoriesNutupane,
+            params = {
+                'file_id': $scope.$stateParams.fileId,
+                'organization_id': CurrentOrganization
+            };
+
+        repositoriesNutupane = new Nutupane(Repository, params);
+        $scope.controllerName = 'katello_repositories';
+        repositoriesNutupane.masterOnly = true;
+        repositoriesNutupane.setSearchKey('repositoriesSearch');
+
+        $scope.table = repositoriesNutupane.table;
+    }
+
+    angular
+        .module('Bastion.files')
+        .controller('FileRepositoriesController', FileRepositoriesController);
+
+    FileRepositoriesController.$inject = [
+        '$scope',
+        'Nutupane',
+        'Repository',
+        'CurrentOrganization'
+    ];
+
+})();

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/files/details/file.controller.js

@@ -0,0 +1,37 @@
+(function () {
+
+    /**
+     * @ngdoc object
+     * @name  Bastion.files.controller:FileController
+     *
+     * @description
+     *   Provides the functionality for the files details action pane.
+     */
+    function FileController($scope, File, ApiErrorHandler) {
+        $scope.successMessages = [];
+        $scope.errorMessages = [];
+
+        $scope.panel = {
+            error: false,
+            loading: true
+        };
+
+        if ($scope.file) {
+            $scope.panel.loading = false;
+        }
+
+        $scope.file = File.get({id: $scope.$stateParams.fileId}, function () {
+            $scope.panel.loading = false;
+        }, function (response) {
+            $scope.panel.loading = false;
+            ApiErrorHandler.handleGETRequestErrors(response, $scope);
+        });
+    }
+
+    angular
+        .module('Bastion.files')
+        .controller('FileController', FileController);
+
+    FileController.$inject = ['$scope', 'File', 'ApiErrorHandler'];
+
+})();

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/files/details/views/file-content-views.html

@@ -0,0 +1,43 @@
+<span page-title ng-model="file">{{ 'Content Views for File: ' | translate }} {{ file.name }}</span>
+
+<h3 translate>Content Views that contain this File</h3>
+
+<div data-extend-template="layouts/partials/table.html">
+  <span data-block="no-rows-message" translate>
+    No Content Views contain this File
+  </span>
+
+  <span data-block="no-search-results-message" translate>
+    Your search returned zero Content Views
+  </span>
+
+  <div data-block="table">
+    <table class="table table-striped table-bordered"
+           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>
+          <th bst-table-column="name"><span translate>Environment</span></th>
+          <th bst-table-column="name"><span translate>Version</span></th>
+        </tr>
+      </thead>
+
+      <tbody>
+        <tr bst-table-row ng-repeat="version in table.rows">
+          <td bst-table-cell>
+            <a ui-sref="content-view.info({contentViewId: version.content_view.id})">
+              {{ version.content_view.name }}
+            </a>
+          </td>
+          <td>
+            {{ environmentNames(version.environments) }}
+          </td>
+          <td>
+            {{ version.version }}
+          </td>
+        </tr>
+      </tbody>
+    </table>
+  </div>
+</div>