katello 4.10.0 → 4.11.0.rc2

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

@@ -27,6 +27,13 @@ angular.module('Bastion.packages').controller('PackagesController',
 
         nutupane = $scope.nutupane = new Nutupane(Package, params);
         $scope.controllerName = 'katello_erratum_packages';
+
+        // Labels so breadcrumb strings can be translated
+        $scope.label = translate('Packages');
+        $scope.dependenciesLabel = translate('Dependencies');
+        $scope.filesLabel = translate('Files');
+        $scope.repositoriesLabel = translate('Repositories');
+
         nutupane.primaryOnly = true;
         $scope.table = nutupane.table;
         $scope.removeRow = nutupane.removeRow;

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/products/details/product-repositories.controller.js

@@ -30,6 +30,11 @@ angular.module('Bastion.products').controller('ProductRepositoriesController',
             'paged': true
         });
         $scope.controllerName = 'katello_repositories';
+
+        // Labels so breadcrumb strings can be translated
+        $scope.label = translate('Repositories');
+        $scope.tasksLabel = translate('Tasks');
+
         repositoriesNutupane.primaryOnly = true;
 
         function getParams() {

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/products/details/repositories/details/repository-details-advanced-sync.controller.js

@@ -6,13 +6,14 @@
  * @requires $state
  * @requires Notification
  * @requires Repository
+ * @requires translate
  *
  * @description
  *   Provides the functionality for advanced repository syncing
  */
 angular.module('Bastion.repositories').controller('RepositoryAdvancedSyncController',
-    ['$scope', '$state', 'Notification', 'Repository',
-    function ($scope, $state, Notification, Repository) {
+    ['$scope', '$state', 'Notification', 'Repository', 'translate',
+    function ($scope, $state, Notification, Repository, translate) {
         var errorHandler = function errorHandler(response) {
             angular.forEach(response.data.errors, function (error) {
                 Notification.setErrorMessage(error);
@@ -20,6 +21,9 @@ angular.module('Bastion.repositories').controller('RepositoryAdvancedSyncControl
             $scope.working = false;
         };
 
+        // Labels so breadcrumb strings can be translated
+        $scope.label = translate('Advanced Sync');
+
         $scope.advancedSync = function (syncType) {
             var params = {id: $scope.repository.id};
             if (syncType === "skipMetadataCheck") {

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/products/details/repositories/details/repository-details-manage-content.controller.js

@@ -28,6 +28,17 @@ angular.module('Bastion.repositories').controller('RepositoryManageContentContro
     function ($scope, $state, translate, Notification, Nutupane, Repository, Package, PackageGroup, DockerManifest, DockerManifestList, DockerTag, File, Deb, ModuleStream, AnsibleCollection, GenericContent, RepositoryTypesService) {
         var contentTypes, nutupaneParams;
 
+        // Labels so breadcrumb strings can be translated
+        $scope.packagesLabel = translate('Packages');
+        $scope.packageGroupsLabel = translate('Package Groups');
+        $scope.dockerManifestsLabel = translate('Container Image Manifests');
+        $scope.dockerTagsLabel = translate('Docker Tags');
+        $scope.dockerManifestListsLabel = translate('Container Image Manifest Lists');
+        $scope.filesLabel = translate('Files');
+        $scope.moduleStreamsLabel = translate('Module Streams');
+        $scope.debsLabel = translate('Debs');
+        $scope.ansibleCollectionsLabel = translate('Ansible Collections');
+
         function success(response, selected) {
             var message;
 

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/products/details/repositories/new/new-repository.controller.js

@@ -56,6 +56,9 @@ angular.module('Bastion.repositories').controller('NewRepositoryController',
                 }
             }
 
+            // Labels so breadcrumb strings can be translated
+            $scope.label = translate('New Repository');
+
             $scope.page = {
                 error: false,
                 loading: true

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/products/details/repositories/views/product-repositories.html

@@ -168,9 +168,9 @@
 
             <span ng-show="repository.content_type == 'file'">
               <div>
-                <span translate>
+                <a translate ui-sref="product.repository.manage-content.files({productId: product.id, repositoryId: repository.id})">
                   {{ repository.content_counts.file || 0 }} Files
-                </span>
+                </a>
               </div>
             </span>
 

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/products/discovery/discovery-create.controller.js

@@ -21,6 +21,9 @@ angular.module('Bastion.products').controller('DiscoveryCreateController',
     ['$scope', '$q', 'Notification', 'CurrentOrganization', 'Product', 'Repository', 'ContentCredential', 'FormUtils', 'DiscoveryRepositories', 'translate', 'ApiErrorHandler',
     function ($scope, $q, Notification, CurrentOrganization, Product, Repository, ContentCredential, FormUtils, DiscoveryRepositories, translate, ApiErrorHandler) {
 
+        // Labels so breadcrumb strings can be translated
+        $scope.label = translate('Create Repositories');
+
         $scope.table = {
             rows: DiscoveryRepositories.getRows(),
             resource: {

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/products/discovery/discovery.controller.js

@@ -20,6 +20,9 @@ angular.module('Bastion.products').controller('DiscoveryController',
     function ($scope, $q, $filter, Notification, Task, Organization, CurrentOrganization, DiscoveryRepositories, ContainerRegistries, translate) {
         var transformRows, setDiscoveryDetails;
 
+        // Labels so breadcrumb strings can be translated
+        $scope.label = translate('Discover Repositories');
+
         $scope.discovery = {
             url: '',
             contentType: 'yum'

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/products/new/product-form.controller.js

@@ -9,6 +9,7 @@
  * @requires ContentCredential
  * @requires SyncPlan
  * @requires FormUtils
+ * @requires translate
  *
  *
  * @description
@@ -17,8 +18,8 @@
  *   within the table.
  */
 angular.module('Bastion.products').controller('ProductFormController',
-    ['$scope', '$q', '$uibModal', 'Product', 'ContentCredential', 'SyncPlan', 'FormUtils', 'Notification',
-    function ($scope, $q, $uibModal, Product, ContentCredential, SyncPlan, FormUtils, Notification) {
+    ['$scope', '$q', '$uibModal', 'Product', 'ContentCredential', 'SyncPlan', 'FormUtils', 'Notification', 'translate',
+    function ($scope, $q, $uibModal, Product, ContentCredential, SyncPlan, FormUtils, Notification, translate) {
 
         function fetchContentCredentials() {
             return ContentCredential.queryUnpaged(function (contentCredentials) {
@@ -48,6 +49,9 @@ angular.module('Bastion.products').controller('ProductFormController',
             });
         }
 
+        // Labels so breadcrumb strings can be translated
+        $scope.label = translate('New Product');
+
         $scope.product = $scope.product || new Product();
 
         $scope.$watch('product.name', function () {

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

@@ -50,6 +50,10 @@ angular.module('Bastion.products').controller('ProductsController',
         nutupaneParams = {
             'disableAutoLoad': true
         };
+
+        // Labels so breadcrumb strings can be translated
+        $scope.label = translate('Products');
+
         $scope.disableRepoDiscovery = true;
         nutupane = new Nutupane(Product, params, undefined, nutupaneParams);
         $scope.controllerName = 'katello_products';

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/subscriptions/views/content-access-mode-banner.html

@@ -5,6 +5,6 @@ This organization has Simple Content Access enabled.  Hosts are not required to
 </div>
 <div id="non-sca-banner" bst-alert="warning" ng-if="!simpleContentAccessEnabled">
   <span translate>
-This organization is not using <a target="_blank" href="https://access.redhat.com/articles/simple-content-access">Simple Content Access.</a> Entitlement-based subscription management is deprecated and will be removed in a future version.
+This organization is not using <a target="_blank" href="https://access.redhat.com/articles/simple-content-access">Simple Content Access.</a> Entitlement-based subscription management is deprecated and will be removed in Katello 4.12.
   </span>
 </div>

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/sync-plans/details/sync-plan-add-products.controller.js

@@ -32,6 +32,10 @@ angular.module('Bastion.sync-plans').controller('SyncPlanAddProductsController',
 
             productsNutupane = new Nutupane(Product, params);
             $scope.controllerName = 'katello_products';
+
+            // Labels so breadcrumb strings can be translated
+            $scope.label = translate('Add Products');
+
             $scope.table = productsNutupane.table;
 
             $scope.addProducts = function () {
@@ -57,7 +61,7 @@ angular.module('Bastion.sync-plans').controller('SyncPlanAddProductsController',
 
                 error = function (response) {
                     deferred.reject(response.data.errors);
-                    Notification.setErrorMessage(response.data.errors.base);
+                    Notification.setErrorMessage(response.data.displayMessage);
                     $scope.table.working = false;
                 };
 

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/sync-plans/details/sync-plan-products.controller.js

@@ -33,6 +33,10 @@ angular.module('Bastion.sync-plans').controller('SyncPlanProductsController',
 
             productsNutupane = new Nutupane(Product, params);
             $scope.controllerName = 'katello_products';
+
+            // Labels so breadcrumb strings can be translated
+            $scope.label = translate('List Products');
+
             $scope.table = productsNutupane.table;
 
             $scope.removeProducts = function () {

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/sync-plans/new/new-sync-plan.controller.js

@@ -21,6 +21,9 @@ angular.module('Bastion.sync-plans').controller('NewSyncPlanController',
             $scope.syncPlan.startDate = new Date();
             $scope.isWorking = false;
 
+            // Labels so breadcrumb strings can be translated
+            $scope.label = translate('Sync Plans');
+
             function success(syncPlan) {
                 $scope.isWorking = false;
                 $scope.$state.go('sync-plan.info', {syncPlanId: syncPlan.id});

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/sync-plans/sync-plans.controller.js

@@ -28,6 +28,10 @@ angular.module('Bastion.sync-plans').controller('SyncPlansController',
 
             nutupane = new Nutupane(SyncPlan, params);
             $scope.controllerName = 'katello_sync_plans';
+
+            // Labels so breadcrumb strings can be translated
+            $scope.label = translate('Sync Plans');
+
             nutupane.primaryOnly = true;
 
             $scope.syncPlanTable = nutupane.table;

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/tasks/task-details.controller.js

@@ -5,17 +5,21 @@
  * @requires $scope
  * @requires $rootScope
  * @requires Task
+ * @requires translate
  *
  * @description
  *   Provides the functionality for the details of a task.
  */
 angular.module('Bastion.tasks').controller('TaskDetailsController',
-    ['$scope', '$rootScope', 'Task',
-    function ($scope, $rootScope, Task) {
+    ['$scope', '$rootScope', 'Task', 'translate',
+    function ($scope, $rootScope, Task, translate) {
         var taskId;
 
         taskId = $scope.$stateParams.taskId;
 
+        // Labels so breadcrumb strings can be translated
+        $scope.label = translate('Bulk Task');
+
         $scope.unregisterSearch = function () {
             Task.unregisterSearch($scope.searchId);
             $scope.searchId = undefined;

data/lib/katello/engine.rb

@@ -68,9 +68,7 @@ module Katello
 
     initializer "katello.register_actions", :before => :finisher_hook do |_app|
       ForemanTasks.dynflow.require!
-      if (Setting.table_exists? rescue(false)) && Setting['host_tasks_workers_pool_size'].to_i > 0
-        ForemanTasks.dynflow.config.queues.add(HOST_TASKS_QUEUE, :pool_size => Setting['host_tasks_workers_pool_size'])
-      end
+      ForemanTasks.dynflow.config.queues.add(HOST_TASKS_QUEUE)
 
       action_paths = %W(#{Katello::Engine.root}/app/lib/actions
                         #{Katello::Engine.root}/app/lib/headpin/actions
@@ -197,6 +195,7 @@ module Katello
       #Api controller extensions
       ::Api::V2::HostsController.include Katello::Concerns::Api::V2::HostsControllerExtensions
       ::Api::V2::HostsController.include Katello::Concerns::ContentFacetHostsControllerExtensions
+      ::Api::V2::HostsBulkActionsController.include Katello::Concerns::Api::V2::HostsBulkActionsControllerExtensions
       ::Api::V2::HostgroupsController.include Katello::Concerns::Api::V2::HostgroupsControllerExtensions
       ::Api::V2::SmartProxiesController.include Katello::Concerns::Api::V2::SmartProxiesControllerExtensions
       ::Api::V2::RegistrationController.include ::Foreman::Controller::SmartProxyAuth

data/lib/katello/permission_creator.rb

@@ -54,14 +54,14 @@ module Katello
       @plugin.permission :manage_capsule_content,
                          {
                            'katello/api/v2/capsule_content' => [:add_lifecycle_environment, :remove_lifecycle_environment,
-                                                                :sync, :reclaim_space, :cancel_sync],
+                                                                :update_counts, :sync, :reclaim_space, :cancel_sync],
                            'katello/api/v2/capsules' => [:index, :show]
                          },
                          :resource_type => 'SmartProxy'
 
       @plugin.permission :view_capsule_content,
                          {
-                           'katello/api/v2/capsule_content' => [:lifecycle_environments, :available_lifecycle_environments, :sync_status],
+                           'katello/api/v2/capsule_content' => [:counts, :lifecycle_environments, :available_lifecycle_environments, :sync_status],
                            'smart_proxies' => [:pulp_storage, :pulp_status, :show_with_content]
                          },
                          :resource_type => "SmartProxy"

data/lib/katello/plugin.rb

@@ -272,6 +272,10 @@ Foreman::Plugin.register :katello do
       use_pagelet :hosts_table_column_content, :name
       add_pagelet :hosts_table_column_header, key: :subscription_status, label: _('Subscription status'), sortable: true, class: common_class, width: '10%', export_key: 'subscription_global_status'
       add_pagelet :hosts_table_column_content, key: :subscription_status, class: common_class, callback: ->(host) { host_status_icon(host.subscription_global_status) }
+
+      add_pagelet :hosts_table_column_header, key: :rhel_lifecycle_status, label: _('RHEL Lifecycle status'), sortable: true, class: common_class, width: '10%', export_key: 'rhel_lifecycle_status'
+      add_pagelet :hosts_table_column_content, key: :rhel_lifecycle_status, class: common_class, callback: ->(host) { host_status_icon(host.rhel_lifecycle_global_status) }
+
       add_pagelet :hosts_table_column_header, key: :installable_updates, label: _('Installable updates'), class: common_class, width: '15%',
                   export_data: [:security, :bugfix, :enhancement].map { |kind| CsvExporter::ExportDefinition.new("installable_updates.#{kind}", callback: ->(host) { (host.content_facet_attributes&.errata_counts || {})[kind] }) } +
                                [:rpm, :deb].map { |kind| CsvExporter::ExportDefinition.new("installable_packages.#{kind}", callback: ->(host) { host&.content_facet_attributes&.public_send("upgradable_#{kind}_count".to_sym) || 0 }) }

data/lib/katello/repository_types/ostree.rb

@@ -22,6 +22,7 @@ Katello::RepositoryTypeManager.register('ostree') do
 
   generic_content_type 'ostree_ref',
                        pluralized_name: "OSTree Refs",
+                       pulpcore_name: "ostree.refs",
                        model_class: Katello::GenericContentUnit,
                        pulp3_api: PulpOstreeClient::ContentRefsApi,
                        pulp3_service_class: Katello::Pulp3::GenericContentUnit,

data/lib/katello/repository_types/python.rb

@@ -32,6 +32,7 @@ Katello::RepositoryTypeManager.register('python') do
 
   generic_content_type 'python_package',
                        pluralized_name: "Python Packages",
+                       pulpcore_name: "python.python",
                        model_class: Katello::GenericContentUnit,
                        pulp3_api: PulpPythonClient::ContentPackagesApi,
                        pulp3_model: PulpPythonClient::PythonPythonPackageContent,

data/lib/katello/scheduled_jobs.rb

@@ -1,6 +1,6 @@
 # First, we check if there's a job already enqueued for any notifications
 ::Foreman::Application.dynflow.config.on_init do |world|
-  [CreateExpiredManifestNotifications, CreatePulpDiskSpaceNotifications, SendExpireSoonNotifications].each do |job_class|
+  [CreateExpiredManifestNotifications, CreateHostLifecycleExpireSoonNotifications, CreatePulpDiskSpaceNotifications, SendExpireSoonNotifications].each do |job_class|
     job_class.spawn_if_missing(world)
   end
 end

data/lib/katello/version.rb

@@ -1,3 +1,3 @@
 module Katello
-  VERSION = "4.10.0".freeze
+  VERSION = "4.11.0.rc2".freeze
 end

data/locale/action_names.rb

@@ -2,7 +2,6 @@
 _("Abstract async task")
 _("Abstract")
 _("Action with sub plans")
-_("Agent action")
 _("Attach subscriptions")
 _("Auto attach subscriptions")
 _("Bulk generate applicability for hosts")
@@ -47,7 +46,6 @@ _("Index content")
 _("Index errata")
 _("Index module streams")
 _("Index package groups")
-_("Install Applicable Errata")
 _("Instance update")
 _("Package Profile Update")
 _("Product Create")
@@ -63,7 +61,6 @@ _("Remove Version")
 _("Remove Versions and Associations")
 _("Remove from Environment")
 _("Remove subscriptions")
-_("Report")
 _("Republish Version Repositories")
 _("Run Sync Plan:")
 _("Sync capsule")
@@ -72,6 +69,7 @@ _("Synchronize smart proxy")
 _("Synchronize")
 _("Update Alternate Content Source")
 _("Update CDN Configuration")
+_("Update Content Counts")
 _("Update Content Overrides")
 _("Update content urls")
 _("Update for host")