katello 3.5.2 → 3.6.0.rc1

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/debs/details/views/deb.html

@@ -0,0 +1,37 @@
+<span page-title ng-model="deb">{{ 'Deb: ' | translate }} {{ deb.name }}</span>
+
+<div data-extend-template="layouts/details-page-with-breadcrumbs.html">
+  <div data-block="header" translate>
+    {{ deb.name }}
+  </div>
+
+  <nav data-block="navigation">
+    <ul class="nav nav-tabs">
+      <li ng-class="{active: isState('deb.info')}">
+        <a ui-sref="deb.info">
+          <span translate>
+            Details
+          </span>
+        </a>
+      </li>
+      <li ng-show="permitted('view_products')" ng-class="{active: isState('deb.repositories')}">
+        <a ui-sref="deb.repositories">
+          <span translate>
+            Library Repositories
+          </span>
+        </a>
+      </li>
+      <li ng-show="permitted('view_content_views')" ng-class="{active: isState('deb.content-views')}">
+        <a ui-sref="deb.content-views">
+          <span translate>
+            Content Views
+          </span>
+        </a>
+      </li>
+    </ul>
+  </nav>
+
+  <div data-block="content">
+    <section ui-view></section>
+  </div>
+</div>

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

@@ -0,0 +1,43 @@
+<span page-title>{{ 'Deb Packages' | translate }}</span>
+
+<div data-extend-template="layouts/table-with-header.html">
+  <div data-block="header" translate>
+    Debs
+  </div>
+
+  <span data-block="no-rows-message" translate>
+    You currently don't have any Debs.
+  </span>
+
+  <span data-block="no-search-results-message" translate>
+    Your search returned zero Debs.
+  </span>
+
+  <div data-block="table">
+    <table class="table table-striped table-bordered" ng-class="{'table-mask': table.working}">
+      <thead>
+        <tr bst-table-head>
+          <th bst-table-column="name"><span translate>Name</span></th>
+          <th bst-table-column="version"><span translate>Version</span></th>
+          <th bst-table-column="architecture"><span translate>Architecture</span></th>
+        </tr>
+      </thead>
+
+      <tbody>
+        <tr bst-table-row ng-repeat="deb in table.rows">
+          <td bst-table-cell>
+            <a ui-sref="deb.info({debId: deb.id})">
+              {{ deb.name }}
+            </a>
+          </td>
+          <td bst-table-cell>
+            {{ deb.version }}
+          </td>
+          <td bst-table-cell>
+            {{ deb.architecture }}
+          </td>
+        </tr>
+      </tbody>
+    </table>
+  </div>
+</div>

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/docker-manifest-lists/docker-manifest-list.factory.js

@@ -0,0 +1,26 @@
+(function () {
+    'use strict';
+
+    /**
+     * @ngdoc factory
+     * @name  Bastion.docker-manifest-lists.factory:DockerManifestList
+     *
+     * @description
+     *   Provides a BastionResource for interacting with Docker Manifest Lists
+     */
+    function DockerManifestList(BastionResource) {
+        return BastionResource('katello/api/v2/docker_manifest_lists/:id',
+            {'id': '@id'},
+            {
+                'autocomplete': {method: 'GET', isArray: true, params: {id: 'auto_complete_search'}}
+            }
+        );
+    }
+
+    angular
+        .module('Bastion.docker-manifest-lists')
+        .factory('DockerManifestList', DockerManifestList);
+
+    DockerManifestList.$inject = ['BastionResource'];
+
+})();

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/docker-manifest-lists/docker-manifest-lists.module.js

@@ -0,0 +1,19 @@
+(function () {
+    'use strict';
+
+    /**
+     * @ngdoc module
+     * @name  Bastion.docker-manifest-lists
+     *
+     * @description
+     *   Module for Docker Manifest List related functionality.
+     */
+    angular
+        .module('Bastion.docker-manifest-lists', [
+            'ui.router',
+            'Bastion',
+            'Bastion.i18n',
+            'Bastion.components'
+        ]);
+
+})();

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/docker-tags/details/docker-tag-details.controller.js

@@ -7,13 +7,14 @@
  * @requires DockerTag
  * @requires CurrentOrganization
  * @requires ApiErrorHandler
+ * @requires translate
  *
  * @description
  *   Provides the functionality for the docker tags details action pane.
  */
 angular.module('Bastion.docker-tags').controller('DockerTagDetailsController',
-    ['$scope', '$location', 'DockerTag', 'CurrentOrganization', 'ApiErrorHandler',
-    function ($scope, $location, DockerTag, CurrentOrganization, ApiErrorHandler) {
+    ['$scope', '$location', 'DockerTag', 'CurrentOrganization', 'ApiErrorHandler', 'translate',
+    function ($scope, $location, DockerTag, CurrentOrganization, ApiErrorHandler, translate) {
         $scope.panel = {
             error: false,
             loading: true
@@ -23,11 +24,24 @@ angular.module('Bastion.docker-tags').controller('DockerTagDetailsController',
             $scope.panel.loading = false;
         }
 
-        $scope.tag = DockerTag.get({id: $scope.$stateParams.tagId}, function () {
+        $scope.tag = DockerTag.get({id: $scope.$stateParams.tagId}, function (data) {
+            if (data.manifest_schema1) {
+                data.manifest_schema1["manifest_type_display"] = $scope.getManifestDisplayType(data.manifest_schema1);
+            }
+            if (data.manifest_schema2) {
+                data.manifest_schema2["manifest_type_display"] = $scope.getManifestDisplayType(data.manifest_schema2);
+            }
             $scope.panel.loading = false;
         }, function (response) {
             $scope.panel.loading = false;
             ApiErrorHandler.handleGETRequestErrors(response, $scope);
         });
+
+        $scope.getManifestDisplayType = function (schema) {
+            if (schema['manifest_type'] === 'image') {
+                return translate("Image");
+            }
+            return translate("List");
+        };
     }
 ]);

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/docker-tags/details/docker-tag-environments.controller.js

@@ -6,14 +6,13 @@
  * @requires $location
  * @requires DockerTag
  * @requires CurrentOrganization
- * @requires translate
  *
  * @description
  *   Provides the functionality for the docker tags details environments list.
  */
 angular.module('Bastion.docker-tags').controller('DockerTagEnvironmentsController',
-    ['$scope', '$location', 'Nutupane', 'DockerTag', 'CurrentOrganization', 'translate',
-    function ($scope, $location, Nutupane, DockerTag, CurrentOrganization, translate) {
+    ['$scope', '$location', 'Nutupane', 'DockerTag', 'CurrentOrganization',
+    function ($scope, $location, Nutupane, DockerTag, CurrentOrganization) {
         var params = {
             'organization_id': CurrentOrganization,
             'search': $location.search().search || "",
@@ -52,13 +51,5 @@ angular.module('Bastion.docker-tags').controller('DockerTagEnvironmentsControlle
         } else {
             $scope.tag.$promise.then(renderTable);
         }
-
-        $scope.getManifestType = function (schema) {
-            if (schema['manifest_type'] === 'image') {
-                return translate("Image");
-            }
-            return translate("List");
-        };
-
     }
 ]);

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/docker-tags/details/views/docker-tag-details.html

@@ -1,8 +1,8 @@
-<span page-title ng-model="tag">{{ 'Details for Docker Tag:' | translate }} {{ tag.full_name }}</span>
+<span page-title ng-model="tag">{{ 'Details for Docker Tag:' | translate }} {{ tag.name }}</span>
 
 <div data-extend-template="layouts/details-page-with-breadcrumbs.html">
   <header data-block="header">
-    <h2>{{ tag.full_name }}</h2>
+    <h2>{{ tag.name }}</h2>
   </header>
 
   <nav data-block="navigation">

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/docker-tags/details/views/docker-tag-info.html

@@ -21,28 +21,27 @@
 
   <div data-block="right-column">
     <h4 translate>Docker Manifest</h4>
-    <div ng-if="!_.isEmpty(tag.manifest_schema1)">
+    <div ng-if="tag.manifest_schema1">
       <h5 translate>Schema Version 1</h5>
       <dl class="dl-horizontal dl-horizontal-left">
-        <dt translate>Name</dt>
+
+        <dt translate>Manifest Type</dt>
         <dd>
-          {{ tag.manifest_schema1.name }}
+          {{ tag.manifest_schema1.manifest_type_display }}
         </dd>
-
         <dt translate>Digest</dt>
         <dd>
           {{ tag.manifest_schema1.digest }}
         </dd>
       </dl>
     </div>
-    <div ng-if="!_.isEmpty(tag.manifest_schema2)">
+    <div ng-if="tag.manifest_schema2">
       <h5 translate>Schema Version 2</h5>
       <dl class="dl-horizontal dl-horizontal-left">
-        <dt translate>Name</dt>
+        <dt translate>Manifest Type</dt>
         <dd>
-          {{ tag.manifest_schema2.name }}
+          {{ tag.manifest_schema2.manifest_type_display }}
         </dd>
-
         <dt translate>Digest</dt>
         <dd>
           {{ tag.manifest_schema2.digest }}

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/docker-tags/docker-tags.routes.js

@@ -38,7 +38,7 @@ angular.module('Bastion.docker-tags').config(['$stateProvider', function ($state
         permission: 'view_products',
         templateUrl: 'docker-tags/details/views/docker-tag-info.html',
         ncyBreadcrumb: {
-            label: "{{ tag.full_name }}",
+            label: "{{ tag.name }}",
             parent: 'docker-tag'
         }
     })

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/docker-tags/views/docker-tags.html

@@ -29,7 +29,7 @@
         <tr bst-table-row ng-repeat="tag in table.rows">
           <td bst-table-cell>
             <a ui-sref="docker-tag.info({tagId: tag.id})">
-              {{ tag.full_name }}
+              {{ tag.name }}
             </a>
           </td>
           <td bst-table-cell>

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

@@ -15,11 +15,11 @@
   <table data-block="table" class="table table-striped table-bordered">
     <thead>
       <tr bst-table-head>
-        <th bst-table-column="errataId" sortable>{{ "Errata ID" | translate }}</th>
+        <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">{{ "Applicable Content Hosts" | translate }}</th>
-        <th bst-table-column="updated">{{ "Updated" | translate }}</th>
+        <th bst-table-column="updated" sortable>{{ "Updated" | translate }}</th>
       </tr>
     </thead>
 

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

@@ -15,7 +15,7 @@
 angular.module('Bastion.errata').controller('ErratumContentHostsController',
     ['$scope', 'Nutupane', 'Host', 'IncrementalUpdate', 'Environment', 'CurrentOrganization',
     function ($scope, Nutupane, Host, IncrementalUpdate, Environment, CurrentOrganization) {
-        var nutupane, params, searchString, nutupaneParams = {
+        var nutupane, params, nutupaneParams = {
             'overrideAutoLoad': true
         };
 
@@ -27,8 +27,9 @@ angular.module('Bastion.errata').controller('ErratumContentHostsController',
         };
 
         nutupane = new Nutupane(Host, params, 'postIndex', nutupaneParams);
-        nutupane.enableSelectAllResults();
         $scope.controllerName = 'hosts';
+        nutupane.masterOnly = true;
+        nutupane.enableSelectAllResults();
 
         $scope.nutupane = nutupane;
         $scope.table = nutupane.table;
@@ -37,17 +38,14 @@ angular.module('Bastion.errata').controller('ErratumContentHostsController',
             if (errataSearchStringAddition) {
                 addition = '( ' + errataSearchStringAddition + ' )';
             }
-            if (angular.isDefined($scope.environmentId)) {
-                addition = addition + ' and lifecycle_environment_id = ' + $scope.environmentId;
+            if (angular.isDefined($scope.environmentFilter)) {
+                addition = addition + ' and lifecycle_environment_id = ' + $scope.environmentFilter;
             }
 
             if (term === "" || angular.isUndefined(term)) {
-                searchString = addition;
-            } else {
-                searchString = term + ' and ' + addition;
+                return addition;
             }
-
-            return searchString;
+            return term + ' and ' + addition;
         };
 
         Environment.queryUnpaged(function (response) {
@@ -60,7 +58,7 @@ angular.module('Bastion.errata').controller('ErratumContentHostsController',
 
         $scope.errataSearchString = function(installable) {
             var searchTerm = installable ? 'installable_errata' : 'applicable_errata',
-                searchStatements, errataIds, hostSearchString;
+                searchStatements, errataIds;
 
             if ($scope.errata) {
                 errataIds = [$scope.errata['errata_id']];
@@ -71,21 +69,17 @@ angular.module('Bastion.errata').controller('ErratumContentHostsController',
             searchStatements = _.map(errataIds, function(errataId) {
                 return searchTerm + ' = "' + errataId + '"';
             });
-
-            hostSearchString = searchStatements.join(" or ");
-
-            return hostSearchString;
+            return searchStatements.join(" or ");
         };
         nutupane.load();
 
         $scope.selectEnvironment = function (environmentId) {
-            $scope.environmentId = environmentId;
+            $scope.environmentFilter = environmentId;
             nutupane.refresh();
         };
 
         $scope.goToNextStep = function () {
-            var bulkContentHosts = nutupane.getAllSelectedResults();
-
+            IncrementalUpdate.setBulkContentHosts(nutupane.getAllSelectedResults());
             if ($scope.errata) {
                 IncrementalUpdate.setErrataIds([$scope.errata['errata_id']]);
             }
@@ -95,14 +89,6 @@ angular.module('Bastion.errata').controller('ErratumContentHostsController',
             } else {
                 $scope.transitionTo('apply-errata.confirm');
             }
-
-            if ($scope.table.allResultsSelected) {
-                bulkContentHosts.included.search = searchString;
-            } else {
-                bulkContentHosts.included.search = null;
-            }
-
-            IncrementalUpdate.setBulkContentHosts(bulkContentHosts);
         };
 
         $scope.incrementalUpdates = IncrementalUpdate.getIncrementalUpdates();

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

@@ -46,9 +46,7 @@
       <span translate>The Content View or Lifecycle Environment needs to be updated in order to make errata available to these hosts.</span>
     </p>
 
-    <div data-extend-template="layouts/select-all-results.html"></div>
-
-    <table class="table table-striped table-bordered">
+    <table class="table table-striped table-bordered" ng-class="{'table-mask': table.working}">
       <thead>
         <tr bst-table-head row-select>
           <th bst-table-column="name"><span translate>Name</span></th>
@@ -72,5 +70,7 @@
         </tr>
       </tbody>
     </table>
+
+    <div data-block="footer-actions" class="footer-actions"></div>
   </div>
 </div>

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

@@ -9,7 +9,7 @@
  */
 angular.module('Bastion.errata').config(['$stateProvider', function ($stateProvider) {
     $stateProvider.state('errata', {
-        url: '/errata?repositoryId',
+        url: '/errata',
         permission: ['view_products', 'view_content_views'],
         views: {
           '@': {

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

@@ -8,7 +8,7 @@
      *   Provides a helper service for Incremental Updates.
      *
      */
-    function IncrementalUpdate($q, $httpParamSerializer, Task, CurrentOrganization) {
+    function IncrementalUpdate($q, Task, CurrentOrganization) {
         var getIdsFromBulk;
 
         getIdsFromBulk = function (bulkResource) {
@@ -66,7 +66,6 @@
          * Allows setting the Bulk Content Hosts.
          *
          * @param {Object} bulkContentHosts the bulk selection of the content hosts.
-         * @param {Array} errataIds the errata IDs to add to the bulk search
          *
          * @returns {Boolean}
          */
@@ -134,6 +133,6 @@
 
     angular.module('Bastion.errata').service('IncrementalUpdate', IncrementalUpdate);
 
-    IncrementalUpdate.$inject = ['$q', '$httpParamSerializer', 'Task', 'CurrentOrganization'];
+    IncrementalUpdate.$inject = ['$q', 'Task', 'CurrentOrganization'];
 
 })();

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

@@ -16,23 +16,12 @@
   <h3 ng-show="errata" translate>Apply {{ errata.errata_id }}</h3>
 
   <section ng-hide="updates.length > 0">
-    <div ng-show="errata">
-      <p translate ng-show="contentHostIds.length === 0">
-        Apply {{ errata.errata_id }} to all Content Host(s)?
-      </p>
-      <p translate ng-hide="contentHostIds.length === 0">
-        Apply {{ errata.errata_id }} to {{ contentHostIds.length  }} Content Host(s)?
-      </p>
-    </div>
-
-    <div ng-hide="errata">
-      <p translate ng-show="contentHostIds.length === 0">
-        Apply {{ errataIds.length }} Errata to all Content Host(s)?
-      </p>
-      <p translate ng-hide="contentHostIds.length === 0">
-        Apply {{ errataIds.length }} Errata to {{ contentHostIds.length }} Content Host(s)?
-      </p>
-    </div>
+    <p translate ng-show="errata">
+      Apply {{ errata.errata_id }} to {{ contentHostIds.length  }} Content Host(s)?
+    </p>
+    <p translate ng-hide="errata">
+      Apply {{ errataIds.length }} Errata to {{ contentHostIds.length }} Content Host(s)?
+    </p>
   </section>
 
   <section ng-show="updates.length > 0">