From 7b9ce64929d537e340b8dea7ec461fc4df019ea8 Mon Sep 17 00:00:00 2001
From: Nadja Heitmann <nadjah@atix.de>
Date: Mon, 11 Nov 2024 13:44:37 +0000
Subject: [PATCH 01/29] Fixes #38011 - Apply environment filter for content
 override

---
 .../api/v2/host_subscriptions_controller.rb   |  6 ++--
 .../v2/host_subscriptions_controller_test.rb  | 32 +++++++++++++++++++
 2 files changed, 35 insertions(+), 3 deletions(-)

diff --git a/app/controllers/katello/api/v2/host_subscriptions_controller.rb b/app/controllers/katello/api/v2/host_subscriptions_controller.rb
index 865dac810e1..04400d68afa 100644
--- a/app/controllers/katello/api/v2/host_subscriptions_controller.rb
+++ b/app/controllers/katello/api/v2/host_subscriptions_controller.rb
@@ -184,7 +184,7 @@ def content_override
         validate_content_overrides_enabled(override_params)
       end
       sync_task(::Actions::Katello::Host::UpdateContentOverrides, @host, content_override_values, false)
-      fetch_product_content
+      fetch_product_content(!params.dig(:content_overrides_search, :search).nil? && Foreman::Cast.to_bool(params.dig(:content_overrides_search, :limit_to_env)))
     end
 
     api :GET, "/hosts/:host_id/subscriptions/available_release_versions", N_("Show releases available for the content host")
@@ -203,8 +203,8 @@ def enabled_repositories
 
     private
 
-    def fetch_product_content
-      content_finder = ProductContentFinder.new(:consumable => @host.subscription_facet)
+    def fetch_product_content(limit_to_env = false)
+      content_finder = ProductContentFinder.new(:match_environment => limit_to_env, :consumable => @host.subscription_facet)
       content = content_finder.presenter_with_overrides(@host.subscription_facet.candlepin_consumer.content_overrides)
       respond_with_template_collection("index", 'repository_sets', :collection => full_result_response(content))
     end
diff --git a/test/controllers/api/v2/host_subscriptions_controller_test.rb b/test/controllers/api/v2/host_subscriptions_controller_test.rb
index eaad900c11e..7af50624e94 100644
--- a/test/controllers/api/v2/host_subscriptions_controller_test.rb
+++ b/test/controllers/api/v2/host_subscriptions_controller_test.rb
@@ -239,6 +239,38 @@ def test_find_content_overrides_with_empty_string_search
       refute_equal result, "wrong"
     end
 
+    def test_fetch_product_content_with_respect_to_environment
+      # Create fake product content and stub ProductContentFinder
+      pcf = mock
+      pcf.stubs(:presenter_with_overrides)
+
+      controller = ::Katello::Api::V2::HostSubscriptionsController.new
+      controller.stubs(:respond_with_template_collection)
+      controller.stubs(:sync_task)
+      controller.stubs(:validate_content_overrides_enabled)
+      controller.stubs(:full_result_response)
+      controller.instance_variable_set(:@host, @host)
+      controller.instance_variable_set(:@content_overrides, [{:content_label => 'some-content', :value => 1}])
+
+      # Actual tests that expect the correct parameters to be passed to 'content_override'
+      ProductContentFinder.expects(:new).with(match_environment: true, consumable: @host.subscription_facet).returns(pcf)
+      ProductContentFinder.expects(:new).with(match_environment: false, consumable: @host.subscription_facet).returns(pcf).times(3)
+
+      # Invoke the call to the controller with a variaty of parameters
+      # Try with limit_to_env enabled
+      controller.params = { :host_id => @host.id, :content_overrides_search => { :search => '', :limit_to_env => true} }
+      controller.send(:content_override)
+      # Try with limit_to_env disabled
+      controller.params = { :host_id => @host.id, :content_overrides_search => { :search => '', :limit_to_env => false} }
+      controller.send(:content_override)
+      # Try with limit_to_env not set - should be the same as disabled
+      controller.params = { :host_id => @host.id, :content_overrides_search => { :search => ''} }
+      controller.send(:content_override)
+      # Try without search params - should be the same as disabled
+      controller.params = { :host_id => @host.id}
+      controller.send(:content_override)
+    end
+
     def test_find_content_overrides_with_empty_string_search_limited_to_environment
       # Create Host with "fedora" and "rhel" as content
       content_view = katello_content_views(:library_dev_view)

From f07701af308530a2c1c5f70d6a01711998ab3ead Mon Sep 17 00:00:00 2001
From: Nadja Heitmann <nadjah@atix.de>
Date: Thu, 12 Dec 2024 17:02:57 +0100
Subject: [PATCH 02/29] Fixes #38083 - Add repository filter to Debian packages
 page (#11255)

---
 .../bastion_katello/debs/debs.controller.js   | 68 +++++++++++++------
 .../bastion_katello/debs/views/debs.html      |  4 ++
 .../test/debs/debs.controller.test.js         | 25 ++++++-
 3 files changed, 73 insertions(+), 24 deletions(-)

diff --git a/engines/bastion_katello/app/assets/javascripts/bastion_katello/debs/debs.controller.js b/engines/bastion_katello/app/assets/javascripts/bastion_katello/debs/debs.controller.js
index 4cf9adb0c7d..7a2e6ca390e 100644
--- a/engines/bastion_katello/app/assets/javascripts/bastion_katello/debs/debs.controller.js
+++ b/engines/bastion_katello/app/assets/javascripts/bastion_katello/debs/debs.controller.js
@@ -1,38 +1,52 @@
-(function () {
-    'use strict';
-
-    /**
-     * @ngdoc controller
-     * @name  Bastion.debs.controller:DebsController
-     *
-     * @description
-     *   Handles fetching deb packages and populating Nutupane based on the current
-     *   ui-router state.
-     *
-     * @requires translate
-     *
-     */
-    function DebsController($scope, $location, translate, Nutupane, Deb, CurrentOrganization) {
+/**
+ * @ngdoc controller
+ * @name  Bastion.debs.controller:DebsController
+ *
+ * @description
+ *   Handles fetching deb packages and populating Nutupane based on the current
+ *   ui-router state.
+ *
+ * @requires translate
+ *
+ */
+angular.module('Bastion.debs').controller('DebsController',
+    ['$scope', '$location', 'translate', 'Nutupane', 'Deb', 'Repository', 'CurrentOrganization',
+    function DebsController($scope, $location, translate, Nutupane, Deb, Repository, CurrentOrganization) {
         var nutupane;
 
         var params = {
             'organization_id': CurrentOrganization,
             'search': $location.search().search || "",
+            'repository_id': $location.search().repositoryId || null,
             'paged': true,
             'sort_by': 'name',
             'sort_order': 'ASC'
         };
 
-        nutupane = new Nutupane(Deb, params);
+        nutupane = $scope.nutupane = new Nutupane(Deb, params);
         nutupane.primaryOnly = true;
 
         $scope.table = nutupane.table;
 
         // Labels so breadcrumb strings can be translated
         $scope.label = translate('Debs');
+        $scope.repositoriesLabel = translate('Repositories');
 
         $scope.controllerName = 'katello_debs';
 
+        $scope.repository = {name: translate('All Repositories'), id: 'all'};
+
+        Repository.queryUnpaged({'organization_id': CurrentOrganization, 'content_type': 'deb', 'with_content': 'deb'}, function (response) {
+            $scope.repositories = [$scope.repository];
+            $scope.repositories = $scope.repositories.concat(response.results);
+
+            if ($location.search().repositoryId) {
+                $scope.repository = _.find($scope.repositories, function (repository) {
+                    return repository.id === parseInt($location.search().repositoryId, 10);
+                });
+            }
+        });
+
         Deb.queryPaged({'organization_id': CurrentOrganization}, function (result) {
             $scope.packageCount = result.total;
         });
@@ -50,12 +64,22 @@
             nutupane.refresh();
         };
 
-    }
+        $scope.$watch('repository', function (repository) {
+            var nutupaneParams = nutupane.getParams();
 
-    angular
-        .module('Bastion.debs')
-        .controller('DebsController', DebsController);
+            if (repository.id === 'all') {
+                nutupaneParams['repository_id'] = null;
+                nutupane.setParams(nutupaneParams);
+            } else {
+                $location.search('repositoryId', repository.id);
+                nutupaneParams['repository_id'] = repository.id;
+                nutupane.setParams(nutupaneParams);
+            }
 
-    DebsController.$inject = ['$scope', '$location', 'translate', 'Nutupane', 'Deb', 'CurrentOrganization'];
+            if (!nutupane.table.initialLoad) {
+                nutupane.refresh();
+            }
+        });
 
-})();
+    }]
+);
diff --git a/engines/bastion_katello/app/assets/javascripts/bastion_katello/debs/views/debs.html b/engines/bastion_katello/app/assets/javascripts/bastion_katello/debs/views/debs.html
index 935a718c314..01c2219bdc4 100644
--- a/engines/bastion_katello/app/assets/javascripts/bastion_katello/debs/views/debs.html
+++ b/engines/bastion_katello/app/assets/javascripts/bastion_katello/debs/views/debs.html
@@ -6,6 +6,10 @@
     <h2 translate>Deb Packages</h2>
   </header>
 
+  <div data-block="search-filter">
+    <select class="form-control" ng-model="repository" ng-options="repository.name for (id, repository) in repositories"></select>
+  </div>
+
   <div data-block="filters">
     <label class="checkbox-inline" title="{{ 'Only show Packages that are Applicable to one or more Content Hosts' | translate }}">
       <input type="checkbox" ng-model="showApplicable" ng-disabled="showUpgradable" ng-change="toggleFilters()"/>
diff --git a/engines/bastion_katello/test/debs/debs.controller.test.js b/engines/bastion_katello/test/debs/debs.controller.test.js
index e171628025e..beb211d2901 100644
--- a/engines/bastion_katello/test/debs/debs.controller.test.js
+++ b/engines/bastion_katello/test/debs/debs.controller.test.js
@@ -4,6 +4,7 @@ describe('Controller: DebsController', function() {
         $controller,
         dependencies,
         Deb,
+        Repository,
         Nutupane;
 
     beforeEach(module('Bastion.debs', 'Bastion.test-mocks'));
@@ -25,7 +26,7 @@ describe('Controller: DebsController', function() {
 
     beforeEach(inject(function(_$controller_, $rootScope, _$location_, MockResource, translateMock) {
         Deb = MockResource.$new();
-        //Repository = MockResource.$new();
+        Repository = MockResource.$new();
         $scope = $rootScope.$new();
         $location = _$location_;
 
@@ -36,7 +37,7 @@ describe('Controller: DebsController', function() {
             Nutupane: Nutupane,
             Deb: Deb,
             //Task: Task,
-            //Repository: Repository,
+            Repository: Repository,
             CurrentOrganization: 'CurrentOrganization',
             translate: translateMock
         };
@@ -63,4 +64,24 @@ describe('Controller: DebsController', function() {
         expect($scope.table.params['packages_restrict_applicable']).toBe(true)
         expect($scope.table.params['packages_restrict_upgradable']).toBe(true)
     });
+
+    it('should set the repository_id param on Nutupane when a repository is chosen', function () {
+        spyOn($scope.nutupane, 'setParams');
+        spyOn($scope.nutupane, 'refresh');
+
+        $scope.repository = {id: 1};
+        $scope.$apply();
+
+        expect($scope.nutupane.setParams).toHaveBeenCalledWith({'repository_id': 1});
+        expect($scope.nutupane.refresh).toHaveBeenCalled();
+    });
+
+    it('allows the setting of the repositoryId via a query string parameter', function () {
+        $location.search('repositoryId', '1');
+
+        $controller('DebsController', dependencies);
+
+        expect($scope.repository.id).toBe(1);
+    });
+
 });

From a153d9423d6f4555dc55575c3e5b859b9aecf2fd Mon Sep 17 00:00:00 2001
From: Samir Jha <samirjha1525@gmail.com>
Date: Thu, 12 Dec 2024 13:39:00 -0500
Subject: [PATCH 03/29] Fixes #37859 - Re-drop evr extension in katello
 (#11159)

---
 config/initializers/monkeys.rb                |   1 -
 db/migrate/20200213184848_create_evr_type.rb  | 127 +++++++++++++-
 ...4161240_katello_recreate_evr_constructs.rb | 160 ++++++++++++++++++
 lib/monkeys/fx_sqlite_skip.rb                 |  13 --
 4 files changed, 286 insertions(+), 15 deletions(-)
 create mode 100644 db/migrate/20240924161240_katello_recreate_evr_constructs.rb
 delete mode 100644 lib/monkeys/fx_sqlite_skip.rb

diff --git a/config/initializers/monkeys.rb b/config/initializers/monkeys.rb
index 8ed5b9fe7a5..1cba332c8aa 100644
--- a/config/initializers/monkeys.rb
+++ b/config/initializers/monkeys.rb
@@ -1,4 +1,3 @@
 #place where monkey patches are required
 require 'monkeys/ar_postgres_evr_t'
-require 'monkeys/fx_sqlite_skip'
 require 'monkeys/remove_hidden_distribution'
diff --git a/db/migrate/20200213184848_create_evr_type.rb b/db/migrate/20200213184848_create_evr_type.rb
index 8bd6bfe9148..d0122e3c52a 100644
--- a/db/migrate/20200213184848_create_evr_type.rb
+++ b/db/migrate/20200213184848_create_evr_type.rb
@@ -4,7 +4,132 @@ class CreateEvrType < ActiveRecord::Migration[5.2]
   def up
     unless connection.adapter_name.downcase.include?('sqlite')
 
-      enable_extension "evr"
+      execute <<~SQL
+              create type evr_array_item as (
+          n       NUMERIC,
+          s       TEXT
+        );
+        
+        create type evr_t as (
+          epoch INT,
+          version evr_array_item[],
+          release evr_array_item[]
+        );
+        
+        CREATE FUNCTION evr_trigger() RETURNS trigger AS $$
+          BEGIN
+            NEW.evr = (select ROW(coalesce(NEW.epoch::numeric,0),
+                                  rpmver_array(coalesce(NEW.version,'empty'))::evr_array_item[],
+                                  rpmver_array(coalesce(NEW.release,'empty'))::evr_array_item[])::evr_t);
+            RETURN NEW;
+          END;
+        $$ language 'plpgsql';
+        
+        create or replace FUNCTION empty(t TEXT)
+        	RETURNS BOOLEAN as $$
+        	BEGIN
+        		return t ~ '^[[:space:]]*$';
+        	END;
+        $$ language 'plpgsql';
+        
+        create or replace FUNCTION isalpha(ch CHAR)
+          RETURNS BOOLEAN as $$
+          BEGIN
+            if ascii(ch) between ascii('a') and ascii('z') or
+                ascii(ch) between ascii('A') and ascii('Z')
+            then
+              return TRUE;
+            end if;
+            return FALSE;
+          END;
+        $$ language 'plpgsql';
+        
+        create or replace FUNCTION isalphanum(ch CHAR)
+        	RETURNS BOOLEAN as $$
+        	BEGIN
+        		if ascii(ch) between ascii('a') and ascii('z') or
+        			ascii(ch) between ascii('A') and ascii('Z') or
+        			ascii(ch) between ascii('0') and ascii('9')
+        		then
+        			return TRUE;
+        		end if;
+        		return FALSE;
+        	END;
+        $$ language 'plpgsql';
+        
+        create or replace function isdigit(ch CHAR)
+        	RETURNS BOOLEAN as $$
+        	BEGIN
+        	  if ascii(ch) between ascii('0') and ascii('9')
+        	  then
+        		return TRUE;
+        	  end if;
+        	  return FALSE;
+        	END ;
+        $$ language 'plpgsql';
+        
+        create or replace FUNCTION rpmver_array (string1 IN VARCHAR)
+        	RETURNS evr_array_item[] as $$
+        	declare
+        		str1 VARCHAR := string1;
+        		digits VARCHAR(10) := '0123456789';
+        		lc_alpha VARCHAR(27) := 'abcdefghijklmnopqrstuvwxyz';
+        		uc_alpha VARCHAR(27) := 'ABCDEFGHIJKLMNOPQRSTUVWXYZ';
+        		alpha VARCHAR(54) := lc_alpha || uc_alpha;
+        		one VARCHAR;
+        		isnum BOOLEAN;
+        		ver_array evr_array_item[] := ARRAY[]::evr_array_item[];
+        	BEGIN
+        		if str1 is NULL
+        		then
+        			RAISE EXCEPTION 'VALUE_ERROR.';
+        		end if;
+        
+        		one := str1;
+        		<<segment_loop>>
+        		while one <> ''
+        		loop
+        			declare
+        				segm1 VARCHAR;
+        				segm1_n NUMERIC := 0;
+        			begin
+        				-- Throw out all non-alphanum characters
+        				while one <> '' and not isalphanum(one)
+        				loop
+        					one := substr(one, 2);
+        				end loop;
+        				str1 := one;
+        				if str1 <> '' and isdigit(str1)
+        				then
+        					str1 := ltrim(str1, digits);
+        					isnum := true;
+        				else
+        					str1 := ltrim(str1, alpha);
+        					isnum := false;
+        				end if;
+        				if str1 <> ''
+        				then segm1 := substr(one, 1, length(one) - length(str1));
+        				else segm1 := one;
+        				end if;
+        
+        				if segm1 = '' then return ver_array; end if; /* arbitrary */
+        				if isnum
+        				then
+        					segm1 := ltrim(segm1, '0');
+        					if segm1 <> '' then segm1_n := segm1::numeric; end if;
+        					segm1 := NULL;
+        				else
+        				end if;
+        				ver_array := array_append(ver_array, (segm1_n, segm1)::evr_array_item);
+        				one := str1;
+        			end;
+        		end loop segment_loop;
+        
+        		return ver_array;
+        	END ;
+        $$ language 'plpgsql';
+        
+      SQL
 
       add_column :katello_rpms, :evr, :evr_t
       add_column :katello_installed_packages, :evr, :evr_t
diff --git a/db/migrate/20240924161240_katello_recreate_evr_constructs.rb b/db/migrate/20240924161240_katello_recreate_evr_constructs.rb
new file mode 100644
index 00000000000..1a5367e64f2
--- /dev/null
+++ b/db/migrate/20240924161240_katello_recreate_evr_constructs.rb
@@ -0,0 +1,160 @@
+class KatelloRecreateEvrConstructs < ActiveRecord::Migration[6.1]
+  def up
+    if !extension_enabled?('evr')
+      return
+    else
+      execute <<~SQL
+        DROP EXTENSION evr CASCADE;
+      SQL
+
+      execute <<~SQL
+              create type evr_array_item as (
+          n       NUMERIC,
+          s       TEXT
+        );
+        
+        create type evr_t as (
+          epoch INT,
+          version evr_array_item[],
+          release evr_array_item[]
+        );
+        
+        CREATE FUNCTION evr_trigger() RETURNS trigger AS $$
+          BEGIN
+            NEW.evr = (select ROW(coalesce(NEW.epoch::numeric,0),
+                                  rpmver_array(coalesce(NEW.version,'empty'))::evr_array_item[],
+                                  rpmver_array(coalesce(NEW.release,'empty'))::evr_array_item[])::evr_t);
+            RETURN NEW;
+          END;
+        $$ language 'plpgsql';
+        
+        create or replace FUNCTION empty(t TEXT)
+        	RETURNS BOOLEAN as $$
+        	BEGIN
+        		return t ~ '^[[:space:]]*$';
+        	END;
+        $$ language 'plpgsql';
+        
+        create or replace FUNCTION isalpha(ch CHAR)
+          RETURNS BOOLEAN as $$
+          BEGIN
+            if ascii(ch) between ascii('a') and ascii('z') or
+                ascii(ch) between ascii('A') and ascii('Z')
+            then
+              return TRUE;
+            end if;
+            return FALSE;
+          END;
+        $$ language 'plpgsql';
+        
+        create or replace FUNCTION isalphanum(ch CHAR)
+        	RETURNS BOOLEAN as $$
+        	BEGIN
+        		if ascii(ch) between ascii('a') and ascii('z') or
+        			ascii(ch) between ascii('A') and ascii('Z') or
+        			ascii(ch) between ascii('0') and ascii('9')
+        		then
+        			return TRUE;
+        		end if;
+        		return FALSE;
+        	END;
+        $$ language 'plpgsql';
+        
+        create or replace function isdigit(ch CHAR)
+        	RETURNS BOOLEAN as $$
+        	BEGIN
+        	  if ascii(ch) between ascii('0') and ascii('9')
+        	  then
+        		return TRUE;
+        	  end if;
+        	  return FALSE;
+        	END ;
+        $$ language 'plpgsql';
+        
+        create or replace FUNCTION rpmver_array (string1 IN VARCHAR)
+        	RETURNS evr_array_item[] as $$
+        	declare
+        		str1 VARCHAR := string1;
+        		digits VARCHAR(10) := '0123456789';
+        		lc_alpha VARCHAR(27) := 'abcdefghijklmnopqrstuvwxyz';
+        		uc_alpha VARCHAR(27) := 'ABCDEFGHIJKLMNOPQRSTUVWXYZ';
+        		alpha VARCHAR(54) := lc_alpha || uc_alpha;
+        		one VARCHAR;
+        		isnum BOOLEAN;
+        		ver_array evr_array_item[] := ARRAY[]::evr_array_item[];
+        	BEGIN
+        		if str1 is NULL
+        		then
+        			RAISE EXCEPTION 'VALUE_ERROR.';
+        		end if;
+        
+        		one := str1;
+        		<<segment_loop>>
+        		while one <> ''
+        		loop
+        			declare
+        				segm1 VARCHAR;
+        				segm1_n NUMERIC := 0;
+        			begin
+        				-- Throw out all non-alphanum characters
+        				while one <> '' and not isalphanum(one)
+        				loop
+        					one := substr(one, 2);
+        				end loop;
+        				str1 := one;
+        				if str1 <> '' and isdigit(str1)
+        				then
+        					str1 := ltrim(str1, digits);
+        					isnum := true;
+        				else
+        					str1 := ltrim(str1, alpha);
+        					isnum := false;
+        				end if;
+        				if str1 <> ''
+        				then segm1 := substr(one, 1, length(one) - length(str1));
+        				else segm1 := one;
+        				end if;
+        
+        				if segm1 = '' then return ver_array; end if; /* arbitrary */
+        				if isnum
+        				then
+        					segm1 := ltrim(segm1, '0');
+        					if segm1 <> '' then segm1_n := segm1::numeric; end if;
+        					segm1 := NULL;
+        				else
+        				end if;
+        				ver_array := array_append(ver_array, (segm1_n, segm1)::evr_array_item);
+        				one := str1;
+        			end;
+        		end loop segment_loop;
+        
+        		return ver_array;
+        	END ;
+        $$ language 'plpgsql';
+        
+      SQL
+
+      add_column :katello_rpms, :evr, :evr_t
+      add_column :katello_installed_packages, :evr, :evr_t
+
+      execute <<-SQL
+        update katello_rpms SET evr = (ROW(coalesce(epoch::numeric,0),
+                                           rpmver_array(coalesce(version,'empty'))::evr_array_item[],
+                                           rpmver_array(coalesce(release,'empty'))::evr_array_item[])::evr_t);
+
+        update katello_installed_packages SET evr = (ROW(coalesce(epoch::numeric,0),
+                                                         rpmver_array(coalesce(version,'empty'))::evr_array_item[],
+                                                         rpmver_array(coalesce(release,'empty'))::evr_array_item[])::evr_t);
+      SQL
+
+      create_trigger :evr_insert_trigger_katello_rpms, on: :katello_rpms
+      create_trigger :evr_update_trigger_katello_rpms, on: :katello_rpms
+      create_trigger :evr_insert_trigger_katello_installed_packages, on: :katello_installed_packages
+      create_trigger :evr_update_trigger_katello_installed_packages, on: :katello_installed_packages
+    end
+  end
+
+  def down
+    fail ActiveRecord::IrreversibleMigration
+  end
+end
diff --git a/lib/monkeys/fx_sqlite_skip.rb b/lib/monkeys/fx_sqlite_skip.rb
deleted file mode 100644
index a9a4bf0ac74..00000000000
--- a/lib/monkeys/fx_sqlite_skip.rb
+++ /dev/null
@@ -1,13 +0,0 @@
-module Fx
-  module SchemaDumper
-    # @api private
-    module Trigger
-      def tables(stream)
-        unless ActiveRecord::Migration[5.2].connection.adapter_name.downcase.include?('sqlite')
-          super
-          triggers(stream)
-        end
-      end
-    end
-  end
-end

From b551d41d853d53e5f753b6ac609bb956f46295fe Mon Sep 17 00:00:00 2001
From: Samir Jha <samirjha1525@gmail.com>
Date: Thu, 12 Dec 2024 15:18:00 -0500
Subject: [PATCH 04/29] Refs #37859 - Fix rubocop on master (#11258)

---
 db/migrate/20200213184848_create_evr_type.rb  | 22 +++++++++----------
 ...4161240_katello_recreate_evr_constructs.rb | 22 +++++++++----------
 2 files changed, 22 insertions(+), 22 deletions(-)

diff --git a/db/migrate/20200213184848_create_evr_type.rb b/db/migrate/20200213184848_create_evr_type.rb
index d0122e3c52a..4426fd730ff 100644
--- a/db/migrate/20200213184848_create_evr_type.rb
+++ b/db/migrate/20200213184848_create_evr_type.rb
@@ -9,13 +9,13 @@ def up
           n       NUMERIC,
           s       TEXT
         );
-        
+
         create type evr_t as (
           epoch INT,
           version evr_array_item[],
           release evr_array_item[]
         );
-        
+
         CREATE FUNCTION evr_trigger() RETURNS trigger AS $$
           BEGIN
             NEW.evr = (select ROW(coalesce(NEW.epoch::numeric,0),
@@ -24,14 +24,14 @@ def up
             RETURN NEW;
           END;
         $$ language 'plpgsql';
-        
+
         create or replace FUNCTION empty(t TEXT)
         	RETURNS BOOLEAN as $$
         	BEGIN
         		return t ~ '^[[:space:]]*$';
         	END;
         $$ language 'plpgsql';
-        
+
         create or replace FUNCTION isalpha(ch CHAR)
           RETURNS BOOLEAN as $$
           BEGIN
@@ -43,7 +43,7 @@ def up
             return FALSE;
           END;
         $$ language 'plpgsql';
-        
+
         create or replace FUNCTION isalphanum(ch CHAR)
         	RETURNS BOOLEAN as $$
         	BEGIN
@@ -56,7 +56,7 @@ def up
         		return FALSE;
         	END;
         $$ language 'plpgsql';
-        
+
         create or replace function isdigit(ch CHAR)
         	RETURNS BOOLEAN as $$
         	BEGIN
@@ -67,7 +67,7 @@ def up
         	  return FALSE;
         	END ;
         $$ language 'plpgsql';
-        
+
         create or replace FUNCTION rpmver_array (string1 IN VARCHAR)
         	RETURNS evr_array_item[] as $$
         	declare
@@ -84,7 +84,7 @@ def up
         		then
         			RAISE EXCEPTION 'VALUE_ERROR.';
         		end if;
-        
+
         		one := str1;
         		<<segment_loop>>
         		while one <> ''
@@ -111,7 +111,7 @@ def up
         				then segm1 := substr(one, 1, length(one) - length(str1));
         				else segm1 := one;
         				end if;
-        
+
         				if segm1 = '' then return ver_array; end if; /* arbitrary */
         				if isnum
         				then
@@ -124,11 +124,11 @@ def up
         				one := str1;
         			end;
         		end loop segment_loop;
-        
+
         		return ver_array;
         	END ;
         $$ language 'plpgsql';
-        
+
       SQL
 
       add_column :katello_rpms, :evr, :evr_t
diff --git a/db/migrate/20240924161240_katello_recreate_evr_constructs.rb b/db/migrate/20240924161240_katello_recreate_evr_constructs.rb
index 1a5367e64f2..e0a28790d26 100644
--- a/db/migrate/20240924161240_katello_recreate_evr_constructs.rb
+++ b/db/migrate/20240924161240_katello_recreate_evr_constructs.rb
@@ -12,13 +12,13 @@ def up
           n       NUMERIC,
           s       TEXT
         );
-        
+
         create type evr_t as (
           epoch INT,
           version evr_array_item[],
           release evr_array_item[]
         );
-        
+
         CREATE FUNCTION evr_trigger() RETURNS trigger AS $$
           BEGIN
             NEW.evr = (select ROW(coalesce(NEW.epoch::numeric,0),
@@ -27,14 +27,14 @@ def up
             RETURN NEW;
           END;
         $$ language 'plpgsql';
-        
+
         create or replace FUNCTION empty(t TEXT)
         	RETURNS BOOLEAN as $$
         	BEGIN
         		return t ~ '^[[:space:]]*$';
         	END;
         $$ language 'plpgsql';
-        
+
         create or replace FUNCTION isalpha(ch CHAR)
           RETURNS BOOLEAN as $$
           BEGIN
@@ -46,7 +46,7 @@ def up
             return FALSE;
           END;
         $$ language 'plpgsql';
-        
+
         create or replace FUNCTION isalphanum(ch CHAR)
         	RETURNS BOOLEAN as $$
         	BEGIN
@@ -59,7 +59,7 @@ def up
         		return FALSE;
         	END;
         $$ language 'plpgsql';
-        
+
         create or replace function isdigit(ch CHAR)
         	RETURNS BOOLEAN as $$
         	BEGIN
@@ -70,7 +70,7 @@ def up
         	  return FALSE;
         	END ;
         $$ language 'plpgsql';
-        
+
         create or replace FUNCTION rpmver_array (string1 IN VARCHAR)
         	RETURNS evr_array_item[] as $$
         	declare
@@ -87,7 +87,7 @@ def up
         		then
         			RAISE EXCEPTION 'VALUE_ERROR.';
         		end if;
-        
+
         		one := str1;
         		<<segment_loop>>
         		while one <> ''
@@ -114,7 +114,7 @@ def up
         				then segm1 := substr(one, 1, length(one) - length(str1));
         				else segm1 := one;
         				end if;
-        
+
         				if segm1 = '' then return ver_array; end if; /* arbitrary */
         				if isnum
         				then
@@ -127,11 +127,11 @@ def up
         				one := str1;
         			end;
         		end loop segment_loop;
-        
+
         		return ver_array;
         	END ;
         $$ language 'plpgsql';
-        
+
       SQL
 
       add_column :katello_rpms, :evr, :evr_t

From cf57e55407a6437fea6c540ae5578c6fc687d77f Mon Sep 17 00:00:00 2001
From: Quirin Pamp <pamp@atix.de>
Date: Mon, 9 Dec 2024 16:49:52 +0100
Subject: [PATCH 05/29] Fixes #38096 - Fix flat APT repo handling

---
 app/models/katello/repository.rb | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/app/models/katello/repository.rb b/app/models/katello/repository.rb
index 3abccdeb136..f1daefb7681 100644
--- a/app/models/katello/repository.rb
+++ b/app/models/katello/repository.rb
@@ -1059,10 +1059,15 @@ def deb_pulp_components(version_href = self.version_href)
       pulp_api.list({:repository_version => version_href}).results.map { |x| x.component }.uniq
     end
 
+    def deb_sanitize_pulp_distribution(distribution)
+      return "flat-repo" if distribution&.end_with?("/")
+      distribution
+    end
+
     def deb_pulp_distributions(version_href = self.version_href)
       return [] if version_href.blank?
       pulp_api = Katello::Pulp3::Repository.instance_for_type(self, SmartProxy.pulp_primary).api.content_release_components_api
-      pulp_api.list({:repository_version => version_href}).results.map { |x| x.distribution }.uniq
+      pulp_api.list({:repository_version => version_href}).results.map { |x| deb_sanitize_pulp_distribution(x.distribution) }.uniq
     end
 
     def sync_status

From 26d9ea98729fbe744e000c2e10b4654266542b0e Mon Sep 17 00:00:00 2001
From: Nadja Heitmann <nadjah@atix.de>
Date: Fri, 13 Dec 2024 11:22:14 +0000
Subject: [PATCH 06/29] Fixes #38097 - Add packages count to new All Hosts page

---
 app/views/katello/api/v2/hosts/base.json.rabl  |  8 --------
 .../api/v2/hosts/os_attributes.json.rabl       | 13 +++++++++++++
 lib/katello/plugin.rb                          |  2 ++
 test/views/api/v2/hosts_test.rb                | 18 ++++++++++++++++++
 webpack/ForemanColumnExtensions/index.js       |  9 +++++++--
 5 files changed, 40 insertions(+), 10 deletions(-)
 create mode 100644 app/views/katello/api/v2/hosts/os_attributes.json.rabl
 create mode 100644 test/views/api/v2/hosts_test.rb

diff --git a/app/views/katello/api/v2/hosts/base.json.rabl b/app/views/katello/api/v2/hosts/base.json.rabl
index 4bdf894928d..21326cbea0d 100644
--- a/app/views/katello/api/v2/hosts/base.json.rabl
+++ b/app/views/katello/api/v2/hosts/base.json.rabl
@@ -5,14 +5,6 @@ object @resource
 
 attributes :id, :name, :description
 
-node :operatingsystem_family do |resource|
-  resource.operatingsystem&.family
-end
-
-node :operatingsystem_major do |resource|
-  resource.operatingsystem&.major
-end
-
 if @facet
   node :content_view do
     content_view = @facet&.single_content_view
diff --git a/app/views/katello/api/v2/hosts/os_attributes.json.rabl b/app/views/katello/api/v2/hosts/os_attributes.json.rabl
new file mode 100644
index 00000000000..963eb4e0207
--- /dev/null
+++ b/app/views/katello/api/v2/hosts/os_attributes.json.rabl
@@ -0,0 +1,13 @@
+object @resource
+
+@resource ||= @object
+
+attributes :id, :name, :description
+
+node :operatingsystem_family do |resource|
+  resource.operatingsystem&.family
+end
+
+node :operatingsystem_major do |resource|
+  resource.operatingsystem&.major
+end
diff --git a/lib/katello/plugin.rb b/lib/katello/plugin.rb
index 4c5ee25098e..138452ea333 100644
--- a/lib/katello/plugin.rb
+++ b/lib/katello/plugin.rb
@@ -298,6 +298,8 @@
   extend_rabl_template 'api/v2/smart_proxies/main', 'katello/api/v2/smart_proxies/pulp_info'
   extend_rabl_template 'api/v2/hosts/show', 'katello/api/v2/hosts/host_collections'
   extend_rabl_template 'api/v2/hosts/show', 'katello/api/v2/hosts/show'
+  extend_rabl_template 'api/v2/hosts/show', 'katello/api/v2/hosts/os_attributes'
+  extend_rabl_template 'api/v2/hosts/index', 'katello/api/v2/hosts/os_attributes'
 
   # Katello variables for Host Registration
   extend_allowed_registration_vars :activation_keys
diff --git a/test/views/api/v2/hosts_test.rb b/test/views/api/v2/hosts_test.rb
new file mode 100644
index 00000000000..7c467485a41
--- /dev/null
+++ b/test/views/api/v2/hosts_test.rb
@@ -0,0 +1,18 @@
+require 'katello_test_helper'
+
+module Katello
+  class HostsViewTest < ActiveSupport::TestCase
+    def setup
+      @host = FactoryBot.build(:host, :with_operatingsystem,
+                               :compute_resource_id => compute_resources(:one).id)
+    end
+
+    def test_base
+      render_rabl('katello/api/v2/hosts/base.json', @host)
+    end
+
+    def test_show
+      render_rabl('katello/api/v2/hosts/show.json', @host)
+    end
+  end
+end
diff --git a/webpack/ForemanColumnExtensions/index.js b/webpack/ForemanColumnExtensions/index.js
index 07859f780a7..dacdfd093db 100644
--- a/webpack/ForemanColumnExtensions/index.js
+++ b/webpack/ForemanColumnExtensions/index.js
@@ -97,6 +97,7 @@ const hostsIndexColumnExtensions = [
       const registered = !!hostDetails?.subscription_facet_attributes?.uuid;
       const { security, bugfix, enhancement } = errataCounts ?? {};
       const upgradableRpmCount = hostDetails?.content_facet_attributes?.upgradable_package_count;
+      const upgradableDebCount = hostDetails?.content_facet_attributes?.upgradable_deb_count;
       if (!registered) return '—';
       const hostErrataUrl = type => `hosts/${hostDetails?.name}#/Content/errata?type=${type}&show=installable`;
       return (
@@ -119,10 +120,14 @@ const hostsIndexColumnExtensions = [
               <Link to={hostErrataUrl('enhancement')}>{enhancement}</Link>
             </FlexItem>
           }
-          {upgradableRpmCount !== undefined &&
+          {(upgradableRpmCount !== undefined || upgradableDebCount !== undefined) &&
             <FlexItem>
               <PackageIcon />
-              <Link to={`hosts/${hostDetails?.name}#/Content/Packages?status=Upgradable`}>{upgradableRpmCount}</Link>
+              { hostDetails?.operatingsystem_family === 'Debian' ?
+                <Link to={`hosts/${hostDetails?.name}#/Content/Debs?status=Upgradable`}>{upgradableDebCount}</Link>
+                :
+                <Link to={`hosts/${hostDetails?.name}#/Content/Packages?status=Upgradable`}>{upgradableRpmCount}</Link>
+              }
             </FlexItem>
           }
         </Flex>

From 380e7ed17310eebcb7430b86ca433d2fb7fadd26 Mon Sep 17 00:00:00 2001
From: Pavan Soma Shekar <32700193+pavanshekar@users.noreply.github.com>
Date: Thu, 19 Dec 2024 12:02:07 -0500
Subject: [PATCH 07/29] Fixes #37895 - Handle version removal for multi-CV
 activation key (#11246)

---
 .../reassign_objects.rb                       |  6 +++-
 .../CVReassignActivationKeysForm.js           | 21 +++++++++++++-
 .../RemoveSteps/CVVersionRemoveReview.js      | 29 +++++++++++++++----
 .../Versions/Delete/affectedActivationKeys.js |  6 +++-
 4 files changed, 53 insertions(+), 9 deletions(-)

diff --git a/app/lib/actions/katello/content_view_environment/reassign_objects.rb b/app/lib/actions/katello/content_view_environment/reassign_objects.rb
index 74e0fedf4de..b479b939768 100644
--- a/app/lib/actions/katello/content_view_environment/reassign_objects.rb
+++ b/app/lib/actions/katello/content_view_environment/reassign_objects.rb
@@ -9,7 +9,11 @@ def plan(content_view_environment, options)
             end
 
             content_view_environment.activation_keys.each do |key|
-              plan_action(ActivationKey::Reassign, key, options[:key_content_view_id], options[:key_environment_id])
+              if key.multi_content_view_environment?
+                key.content_view_environments = key.content_view_environments - [content_view_environment]
+              else
+                plan_action(ActivationKey::Reassign, key, options[:key_content_view_id], options[:key_environment_id])
+              end
             end
           end
         end
diff --git a/webpack/scenes/ContentViews/Details/Versions/Delete/RemoveSteps/CVReassignActivationKeysForm.js b/webpack/scenes/ContentViews/Details/Versions/Delete/RemoveSteps/CVReassignActivationKeysForm.js
index cffab1454af..e273589571d 100644
--- a/webpack/scenes/ContentViews/Details/Versions/Delete/RemoveSteps/CVReassignActivationKeysForm.js
+++ b/webpack/scenes/ContentViews/Details/Versions/Delete/RemoveSteps/CVReassignActivationKeysForm.js
@@ -1,12 +1,13 @@
 import React, { useState, useContext } from 'react';
 import { useDispatch, useSelector } from 'react-redux';
 import useDeepCompareEffect from 'use-deep-compare-effect';
-import { ExpandableSection, SelectOption } from '@patternfly/react-core';
+import { ExpandableSection, SelectOption, Alert, AlertActionCloseButton } from '@patternfly/react-core';
 import { STATUS } from 'foremanReact/constants';
 import { translate as __ } from 'foremanReact/common/I18n';
 import EnvironmentPaths from '../../../../components/EnvironmentPaths/EnvironmentPaths';
 import getContentViews from '../../../../ContentViewsActions';
 import { selectContentViewError, selectContentViews, selectContentViewStatus } from '../../../../ContentViewSelectors';
+import { selectCVActivationKeys } from '../../../ContentViewDetailSelectors';
 import AffectedActivationKeys from '../affectedActivationKeys';
 import DeleteContext from '../DeleteContext';
 import ContentViewSelect from '../../../../components/ContentViewSelect/ContentViewSelect';
@@ -17,7 +18,9 @@ const CVReassignActivationKeysForm = () => {
   const contentViewsInEnvResponse = useSelector(selectContentViews);
   const contentViewsInEnvStatus = useSelector(selectContentViewStatus);
   const contentViewsInEnvError = useSelector(selectContentViewError);
+  const activationKeysResponse = useSelector(selectCVActivationKeys);
   const cvInEnvLoading = contentViewsInEnvStatus === STATUS.PENDING;
+  const [alertDismissed, setAlertDismissed] = useState(false);
   const [cvSelectOpen, setCVSelectOpen] = useState(false);
   const [cvSelectOptions, setCvSelectionOptions] = useState([]);
   const [showActivationKeys, setShowActivationKeys] = useState(false);
@@ -72,6 +75,9 @@ const CVReassignActivationKeysForm = () => {
     contentViewsInEnvError, selectedEnvForAK, setSelectedCVForAK, setSelectedCVNameForAK,
     cvInEnvLoading, selectedCVForAK, cvId, versionEnvironments, selectedEnvSet]);
 
+  const multiCVWarning = activationKeysResponse?.results?.some?.(key =>
+    key.multi_content_view_environment);
+
   const fetchSelectedCVName = (id) => {
     const { results } = contentViewsInEnvResponse ?? { };
     return results.filter(cv => cv.id === id)[0]?.name;
@@ -102,8 +108,21 @@ const CVReassignActivationKeysForm = () => {
     cvSelectOptions,
   });
 
+  const multiCVRemovalInfo = __('This environment is used in one or more multi-environment activation keys. The environment will simply be removed from the multi-environment keys. The content view and lifecycle environment you select here will only apply to single-environment activation keys. See hammer activation-key --help for more details.');
+
   return (
     <>
+      {!alertDismissed && multiCVWarning && (
+        <Alert
+          ouiaId="multi-cv-warning-alert"
+          variant="warning"
+          isInline
+          title={__('Warning')}
+          actionClose={<AlertActionCloseButton onClose={() => setAlertDismissed(true)} />}
+        >
+          <p>{multiCVRemovalInfo}</p>
+        </Alert>
+      )}
       <EnvironmentPaths
         userCheckedItems={selectedEnvForAK}
         setUserCheckedItems={setSelectedEnvForAK}
diff --git a/webpack/scenes/ContentViews/Details/Versions/Delete/RemoveSteps/CVVersionRemoveReview.js b/webpack/scenes/ContentViews/Details/Versions/Delete/RemoveSteps/CVVersionRemoveReview.js
index 31c13fbc9bb..4726fd3f6dd 100644
--- a/webpack/scenes/ContentViews/Details/Versions/Delete/RemoveSteps/CVVersionRemoveReview.js
+++ b/webpack/scenes/ContentViews/Details/Versions/Delete/RemoveSteps/CVVersionRemoveReview.js
@@ -18,12 +18,17 @@ const CVVersionRemoveReview = () => {
   const activationKeysResponse = useSelector(state => selectCVActivationKeys(state, cvId));
   const hostsResponse = useSelector(state => selectCVHosts(state, cvId));
   const { results: hostResponse } = hostsResponse;
-  const { results: akResponse } = activationKeysResponse;
+  const { results: akResponse = [] } = activationKeysResponse || {};
   const selectedEnv = versionEnvironments.filter(env => selectedEnvSet.has(env.id));
   const versionDeleteInfo = __(`Version ${versionNameToRemove} will be deleted from all environments. It will no longer be available for promotion.`);
   const removalNotice = __(`Version ${versionNameToRemove} will be removed from the environments listed below, and will remain available for later promotion. ` +
     'Changes listed below will be effective after clicking Remove.');
 
+  const multiCVActivationKeys = akResponse.filter(key => key.multi_content_view_environment);
+  const multiCVActivationKeysCount = multiCVActivationKeys.length;
+
+  const singleCVActivationKeysCount = akResponse.length - multiCVActivationKeysCount;
+
   return (
     <>
       <WizardHeader title={__('Review details')} />
@@ -62,11 +67,23 @@ const CVVersionRemoveReview = () => {
       {affectedActivationKeys &&
         <>
           <h3>{__('Activation keys')}</h3>
-          <Flex>
-            <FlexItem><ExclamationTriangleIcon /></FlexItem>
-            <FlexItem><p>{__(`${pluralize(akResponse.length, 'activation key')} will be moved to content view ${selectedCVNameForAK} in `)}</p></FlexItem>
-            <FlexItem><Label isTruncated color="purple" href={`/lifecycle_environments/${selectedEnvForAK[0].id}`}>{selectedEnvForAK[0].name}</Label></FlexItem>
-          </Flex>
+          {singleCVActivationKeysCount > 0 && (
+            <Flex>
+              <FlexItem><ExclamationTriangleIcon /></FlexItem>
+              <FlexItem><p>{__(`${pluralize(singleCVActivationKeysCount, 'activation key')} will be moved to content view ${selectedCVNameForAK} in `)}</p></FlexItem>
+              <FlexItem><Label isTruncated color="purple" href={`/lifecycle_environments/${selectedEnvForAK[0].id}`}>{selectedEnvForAK[0].name}</Label></FlexItem>
+            </Flex>
+          )}
+          {multiCVActivationKeysCount > 0 && (
+            <Flex>
+              <FlexItem><ExclamationTriangleIcon /></FlexItem>
+              <FlexItem>
+                <p>
+                  {__(`Content view environment will be removed from ${pluralize(multiCVActivationKeysCount, 'multi-environment activation key')}.`)}
+                </p>
+              </FlexItem>
+            </Flex>
+          )}
         </>}
     </>
   );
diff --git a/webpack/scenes/ContentViews/Details/Versions/Delete/affectedActivationKeys.js b/webpack/scenes/ContentViews/Details/Versions/Delete/affectedActivationKeys.js
index 02af9570e24..a08960f6e43 100644
--- a/webpack/scenes/ContentViews/Details/Versions/Delete/affectedActivationKeys.js
+++ b/webpack/scenes/ContentViews/Details/Versions/Delete/affectedActivationKeys.js
@@ -35,6 +35,7 @@ const AffectedActivationKeys = ({
   const columnHeaders = [
     __('Name'),
     __('Environment'),
+    __('Multi Content View Environment'),
   ];
   const emptyContentTitle = __('No matching activation keys found.');
   const emptyContentBody = __("Given criteria doesn't match any activation keys. Try changing your rule.");
@@ -65,12 +66,15 @@ const AffectedActivationKeys = ({
         </Tr>
       </Thead>
       <Tbody>
-        {results?.map(({ name, id, environment }) => (
+        {results?.map(({
+          name, id, environment, multi_content_view_environment: multiContentViewEnvironment,
+        }) => (
           <Tr ouiaId={id} key={id}>
             <Td>
               <a rel="noreferrer" target="_blank" href={urlBuilder(`activation_keys/${id}`, '')}>{name}</a>
             </Td>
             <Td><EnvironmentLabels environments={environment} /></Td>
+            <Td>{ multiContentViewEnvironment ? 'Yes' : 'No' }</Td>
           </Tr>
         ))
         }

From 916e7023b57e818a1fa2e00d86d7f074aabf89e6 Mon Sep 17 00:00:00 2001
From: Lucy Fu <lufu@redhat.com>
Date: Wed, 11 Dec 2024 16:47:54 -0500
Subject: [PATCH 08/29] Fixes #38084 - Add new REX job templates for bootc
 upgrade/switch/rollback

---
 .../foreman/job_templates/bootc_action.erb    | 26 +++++++++++++++++++
 .../foreman/job_templates/bootc_rollback.erb  | 13 ++++++++++
 .../foreman/job_templates/bootc_status.erb    | 13 ++++++++++
 .../foreman/job_templates/bootc_switch.erb    | 13 ++++++++++
 .../foreman/job_templates/bootc_upgrade.erb   | 13 ++++++++++
 db/seeds.d/75-job_templates.rb                |  6 ++++-
 lib/katello/plugin.rb                         |  4 +++
 7 files changed, 87 insertions(+), 1 deletion(-)
 create mode 100644 app/views/foreman/job_templates/bootc_action.erb
 create mode 100644 app/views/foreman/job_templates/bootc_rollback.erb
 create mode 100644 app/views/foreman/job_templates/bootc_status.erb
 create mode 100644 app/views/foreman/job_templates/bootc_switch.erb
 create mode 100644 app/views/foreman/job_templates/bootc_upgrade.erb

diff --git a/app/views/foreman/job_templates/bootc_action.erb b/app/views/foreman/job_templates/bootc_action.erb
new file mode 100644
index 00000000000..18007b0a3ee
--- /dev/null
+++ b/app/views/foreman/job_templates/bootc_action.erb
@@ -0,0 +1,26 @@
+<%#
+kind: job_template
+name: Bootc Action - Script Default
+model: JobTemplate
+job_category: Bootc
+description_format: 'bootc %{action} %{options} %{target}'
+provider_type: script
+feature: katello_bootc_action
+template_inputs:
+- name: action
+  description: 'The bootc action: upgrade, switch, rollback or status'
+  input_type: user
+  options: "upgrade\nswitch\nrollback\nstatus"
+  required: true
+- name: options
+  description: Additional options for bootc action
+  input_type: user
+  required: false
+- name: target
+  description: Target for bootc switch action
+  input_type: user
+  required: false
+%>
+
+bootc <%= input('action') %> <%= input('options') %> <%= input('target') %>
+subscription-manager facts --update
diff --git a/app/views/foreman/job_templates/bootc_rollback.erb b/app/views/foreman/job_templates/bootc_rollback.erb
new file mode 100644
index 00000000000..0ba6ea8332c
--- /dev/null
+++ b/app/views/foreman/job_templates/bootc_rollback.erb
@@ -0,0 +1,13 @@
+<%#
+kind: job_template
+name: Bootc Rollback - Script Default
+job_category: Bootc
+description_format: 'bootc rollback'
+feature: katello_bootc_rollback
+provider_type: script
+foreign_input_sets:
+- template: Bootc Action - Script Default
+  exclude: action, options, target
+%>
+
+<%= render_template('Bootc Action - Script Default', :action => 'rollback') %>
diff --git a/app/views/foreman/job_templates/bootc_status.erb b/app/views/foreman/job_templates/bootc_status.erb
new file mode 100644
index 00000000000..7a1204ad7cd
--- /dev/null
+++ b/app/views/foreman/job_templates/bootc_status.erb
@@ -0,0 +1,13 @@
+<%#
+kind: job_template
+name: Bootc Status - Script Default
+job_category: Bootc
+description_format: 'bootc status %{options}'
+feature: katello_bootc_status
+provider_type: script
+foreign_input_sets:
+- template: Bootc Action - Script Default
+  exclude: action, target
+%>
+
+<%= render_template('Bootc Action - Script Default', :action => 'status') %>
diff --git a/app/views/foreman/job_templates/bootc_switch.erb b/app/views/foreman/job_templates/bootc_switch.erb
new file mode 100644
index 00000000000..b10d1739f66
--- /dev/null
+++ b/app/views/foreman/job_templates/bootc_switch.erb
@@ -0,0 +1,13 @@
+<%#
+kind: job_template
+name: Bootc Switch - Script Default
+job_category: Bootc
+description_format: 'bootc switch %{options} %{target}'
+feature: katello_bootc_switch
+provider_type: script
+foreign_input_sets:
+- template: Bootc Action - Script Default
+  exclude: action
+%>
+
+<%= render_template('Bootc Action - Script Default', :action => 'switch') %>
diff --git a/app/views/foreman/job_templates/bootc_upgrade.erb b/app/views/foreman/job_templates/bootc_upgrade.erb
new file mode 100644
index 00000000000..fc7be23ce8c
--- /dev/null
+++ b/app/views/foreman/job_templates/bootc_upgrade.erb
@@ -0,0 +1,13 @@
+<%#
+kind: job_template
+name: Bootc Upgrade - Script Default
+job_category: Bootc
+description_format: 'bootc upgrade %{options}'
+feature: katello_bootc_upgrade
+provider_type: script
+foreign_input_sets:
+- template: Bootc Action - Script Default
+  exclude: action, target
+%>
+
+<%= render_template('Bootc Action - Script Default', :action => 'upgrade') %>
diff --git a/db/seeds.d/75-job_templates.rb b/db/seeds.d/75-job_templates.rb
index 385bc3f3ae6..17247eb9c39 100644
--- a/db/seeds.d/75-job_templates.rb
+++ b/db/seeds.d/75-job_templates.rb
@@ -1,8 +1,12 @@
 User.as_anonymous_admin do
   JobTemplate.without_auditing do
+    # let's name root template as *_action.erb
+    root_action_files = Dir[File.join("#{Katello::Engine.root}/app/views/foreman/job_templates/**/*_action.erb")]
     template_files = Dir[File.join("#{Katello::Engine.root}/app/views/foreman/job_templates/**/*.erb")]
     template_files.reject! { |file| file.end_with?('_ansible_default.erb') } unless Katello.with_ansible?
-    template_files.each do |template|
+
+    # root templates need to be imported first
+    (root_action_files + (template_files - root_action_files)).each do |template|
       sync = !Rails.env.test? && Setting[:remote_execution_sync_templates]
       template = JobTemplate.import_raw!(File.read(template), :default => true, :lock => true, :update => sync)
 
diff --git a/lib/katello/plugin.rb b/lib/katello/plugin.rb
index 138452ea333..d1354d19bd8 100644
--- a/lib/katello/plugin.rb
+++ b/lib/katello/plugin.rb
@@ -698,6 +698,10 @@ def katello_template_setting_values(name)
   RemoteExecutionFeature.register(:katello_module_stream_action, N_("Katello: Module Stream Actions"),
                                   :description => N_("Perform a module stream action via Katello interface"),
                                   :provided_inputs => ['action', 'module_spec', 'options'])
+  RemoteExecutionFeature.register(:katello_bootc_upgrade, N_("Katello: Bootc Upgrade"), :description => N_("Bootc upgrade via Bootc interface"))
+  RemoteExecutionFeature.register(:katello_bootc_switch, N_("Katello: Bootc Switch"), :description => N_("Bootc switch via Bootc interface"))
+  RemoteExecutionFeature.register(:katello_bootc_rollback, N_("Katello: Bootc Rollback"), :description => N_("Bootc rollback via Bootc interface"))
+  RemoteExecutionFeature.register(:katello_bootc_status, N_("Katello: Bootc Status"), :description => N_("Bootc status via Bootc interface"))
   allowed_template_helpers :errata
 
   RemoteExecutionProvider.singleton_class.prepend(Katello::Concerns::RemoteExecutionProviderExtensions)

From 81742d9f681498f01b14c6515c348b876d2a144f Mon Sep 17 00:00:00 2001
From: Evgeni Golov <evgeni@golov.de>
Date: Fri, 20 Dec 2024 15:05:15 +0100
Subject: [PATCH 09/29] pin angular tests to Ubuntu 22.04 (#11271)

24.04 seems to have issues starting Chrome
---
 .github/workflows/ruby.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/ruby.yml b/.github/workflows/ruby.yml
index 9edd0cb76f4..ea468284289 100644
--- a/.github/workflows/ruby.yml
+++ b/.github/workflows/ruby.yml
@@ -31,7 +31,7 @@ jobs:
 
   angular:
     name: Angular ${{ matrix.engine }} - NodeJS ${{ matrix.node }}
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-22.04
     strategy:
       fail-fast: false
       matrix:

From dbfa2ef50c46faade2d44a320957db69637d51f8 Mon Sep 17 00:00:00 2001
From: Samir Jha <samirjha1525@gmail.com>
Date: Fri, 20 Dec 2024 09:57:49 -0500
Subject: [PATCH 10/29] Fixes #38114 - Document path-id param for environment
 create (#11268)

---
 app/controllers/katello/api/v2/environments_controller.rb | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/app/controllers/katello/api/v2/environments_controller.rb b/app/controllers/katello/api/v2/environments_controller.rb
index 764a4aa5810..a0e70be7067 100644
--- a/app/controllers/katello/api/v2/environments_controller.rb
+++ b/app/controllers/katello/api/v2/environments_controller.rb
@@ -84,6 +84,10 @@ def show
       ID of an environment that is prior to the new environment in the chain. It has to be
       either the ID of Library or the ID of an environment at the end of a chain.
     DESC
+    param :path_id, Integer, :desc => <<-DESC
+      If you are adding an environment to an existing path after Library, pass the ID of the environment that is the current successor of Library in the path.
+      It has to be the id of the old environment following library in this path.
+    DESC
     def create
       create_params = environment_params
       create_params[:label] = labelize_params(create_params)

From 1891dc425a285f006affc6922fcd7be976f17f88 Mon Sep 17 00:00:00 2001
From: Samir Jha <samirjha1525@gmail.com>
Date: Fri, 20 Dec 2024 14:28:08 -0500
Subject: [PATCH 11/29] Fixes #38102 - Auth token of flatpak-remote shouldn't
 be returned by API (#11261)

---
 app/views/katello/api/v2/flatpak_remotes/base.json.rabl | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/views/katello/api/v2/flatpak_remotes/base.json.rabl b/app/views/katello/api/v2/flatpak_remotes/base.json.rabl
index 95075ae85fa..425b06b772d 100644
--- a/app/views/katello/api/v2/flatpak_remotes/base.json.rabl
+++ b/app/views/katello/api/v2/flatpak_remotes/base.json.rabl
@@ -2,4 +2,4 @@ extends 'katello/api/v2/common/identifier'
 extends 'katello/api/v2/common/org_reference'
 
 attributes :name
-attributes :url, :description, :username, :token, :seeded, :registry_url
+attributes :url, :description, :username, :seeded, :registry_url

From 7a9771dfcc5226020e0fdc2359a78f6b6627ecd8 Mon Sep 17 00:00:00 2001
From: Maria <mariaaga@redhat.com>
Date: Fri, 20 Dec 2024 19:47:18 +0000
Subject: [PATCH 12/29] Fixes #37402 - add jquery-ui dependency (#10982)

---
 katello.gemspec | 1 +
 1 file changed, 1 insertion(+)

diff --git a/katello.gemspec b/katello.gemspec
index edbc9c7a978..ffc5f635bfc 100644
--- a/katello.gemspec
+++ b/katello.gemspec
@@ -64,6 +64,7 @@ Gem::Specification.new do |gem|
   # UI
   gem.add_dependency "deface", '>= 1.0.2', '< 2.0.0'
   gem.add_dependency "angular-rails-templates", "~> 1.1"
+  gem.add_dependency "jquery-ui-rails", "~> 6.0"
 
   gem.add_development_dependency "theforeman-rubocop", '~> 0.1.0'
 end

From fb6cca703783c443c4a4f4a368f8d5fe1072c20e Mon Sep 17 00:00:00 2001
From: Samir Jha <samirjha1525@gmail.com>
Date: Mon, 23 Dec 2024 12:15:23 -0500
Subject: [PATCH 13/29] Fixes #38117 - Refresh smart proxy sync history when
 proxy is updated (#11270)

---
 .../katello/concerns/smart_proxy_extensions.rb  | 14 ++++++++++++++
 .../concerns/smart_proxy_extensions_test.rb     | 17 +++++++++++++++++
 2 files changed, 31 insertions(+)

diff --git a/app/models/katello/concerns/smart_proxy_extensions.rb b/app/models/katello/concerns/smart_proxy_extensions.rb
index 3761f4110e6..abbbc998191 100644
--- a/app/models/katello/concerns/smart_proxy_extensions.rb
+++ b/app/models/katello/concerns/smart_proxy_extensions.rb
@@ -33,6 +33,7 @@ def refresh
         before_create :associate_default_locations
         before_create :associate_lifecycle_environments
         before_validation :set_default_download_policy
+        after_update :refresh_smart_proxy_sync_histories
 
         lazy_accessor :pulp_repositories, :initializer => lambda { |_s| pulp_node.extensions.repository.retrieve_all }
 
@@ -471,6 +472,9 @@ def add_lifecycle_environment(environment)
       end
 
       def remove_lifecycle_environment(environment)
+        smart_proxy_helper = ::Katello::SmartProxyHelper.new(self)
+        repos = smart_proxy_helper.repositories_available_to_capsule(environment)
+        smart_proxy_helper.clear_smart_proxy_sync_histories(repos) unless repos.empty?
         self.lifecycle_environments.find(environment.id)
         unless self.lifecycle_environments.destroy(environment)
           fail _("Could not remove the lifecycle environment from the smart proxy")
@@ -479,6 +483,16 @@ def remove_lifecycle_environment(environment)
         raise _("Lifecycle environment was not attached to the smart proxy; therefore, no changes were made.")
       end
 
+      def refresh_smart_proxy_sync_histories
+        smart_proxy_helper = ::Katello::SmartProxyHelper.new(self)
+        repos = smart_proxy_helper.repositories_available_to_capsule.select(:id)
+        if repos.size == 0
+          self.smart_proxy_sync_histories.delete_all
+        else
+          self.smart_proxy_sync_histories.where.not(repository_id: repos).delete_all
+        end
+      end
+
       def available_lifecycle_environments(organization_id = nil)
         scope = Katello::KTEnvironment.not_in_capsule(self)
         scope = scope.where(organization_id: organization_id) if organization_id
diff --git a/test/models/concerns/smart_proxy_extensions_test.rb b/test/models/concerns/smart_proxy_extensions_test.rb
index 107d0da2243..7888dc51fb9 100644
--- a/test/models/concerns/smart_proxy_extensions_test.rb
+++ b/test/models/concerns/smart_proxy_extensions_test.rb
@@ -144,6 +144,7 @@ def test_update_global_content_counts
                ostree_repo, deb_repo, python_repo, cvv_container_repo]
       @proxy.lifecycle_environments << [container_repo.environment, cvv_container_repo.environment]
       ::Katello::SmartProxyHelper.any_instance.expects(:repositories_available_to_capsule).once.returns(repos)
+      @proxy.expects(:refresh_smart_proxy_sync_histories).returns(true)
       @proxy.update_content_counts!
       counts = @proxy.content_counts
       expected_counts = { "content_view_versions" =>
@@ -247,6 +248,7 @@ def test_update_environment_content_counts
                                  .with(container_repo.environment, nil)
                                  .once
                                  .returns(repos)
+      @proxy.expects(:refresh_smart_proxy_sync_histories).returns(true)
       @proxy.update_content_counts!(environment: container_repo.environment)
       counts = @proxy.content_counts
       expected_counts = { "content_view_versions" =>
@@ -277,6 +279,7 @@ def test_update_content_view_counts
                                  .with(nil, cvv_container_repo.content_view_version.content_view)
                                  .once
                                  .returns(repos)
+      @proxy.expects(:refresh_smart_proxy_sync_histories).returns(true)
       @proxy.update_content_counts!(environment: nil,
                                     content_view: cvv_container_repo.content_view_version.content_view,
                                     repository: nil)
@@ -303,6 +306,7 @@ def test_update_content_view_counts
 
     def test_update_repository_counts
       cvv_container_repo = setup_cvv_container_repo
+      @proxy.expects(:refresh_smart_proxy_sync_histories).returns(true)
       @proxy.lifecycle_environments << cvv_container_repo.environment
       @proxy.update_content_counts!(repository: cvv_container_repo)
       counts = @proxy.content_counts
@@ -326,6 +330,19 @@ def test_update_repository_counts
       assert_equal expected_counts, counts
     end
 
+    def test_refresh_sync_history
+      file_repo = katello_repositories(:pulp3_file_1)
+      file_repo.update library_instance_id: file_repo.id
+      repos = [file_repo]
+      @proxy.lifecycle_environments = [file_repo.environment]
+      ::Katello::SmartProxyHelper.any_instance.expects(:repositories_available_to_capsule)
+                                 .returns(repos)
+      file_repo.create_smart_proxy_sync_history(@proxy)
+      assert_equal 1, @proxy.smart_proxy_sync_histories.count
+      @proxy.remove_lifecycle_environment(file_repo.environment)
+      assert_equal 0, @proxy.smart_proxy_sync_histories.count
+    end
+
     def test_sets_default_download_policy
       Setting[:default_proxy_download_policy] = ::Katello::RootRepository::DOWNLOAD_ON_DEMAND
       @proxy.save!

From ec7ef5c70fd68e865a580ef498bbda2909728cdc Mon Sep 17 00:00:00 2001
From: Ian Ballou <ianballou67@gmail.com>
Date: Tue, 7 Jan 2025 14:31:57 -0500
Subject: [PATCH 14/29] Fixes #38072 - add host bootc_images endpoint (#11257)

* Fixes #38072 - add host bootc_images endpoint

* Refs #38072 - bootc api pagination data + UI-friendly data re-org

* Refs #38072 - add host searching to bootc images api

* Refs #38072 - select default pagination properly

* Refs #38072 - add sorting support to bootc_image api
---
 .../api/v2/host_bootc_images_controller.rb    | 61 +++++++++++++++++++
 config/routes/api/v2.rb                       |  4 ++
 config/routes/overrides.rb                    |  1 +
 lib/katello/permissions/host_permissions.rb   |  2 +
 .../v2/host_bootc_images_controller_test.rb   | 52 ++++++++++++++++
 5 files changed, 120 insertions(+)
 create mode 100644 app/controllers/katello/api/v2/host_bootc_images_controller.rb
 create mode 100644 test/controllers/api/v2/host_bootc_images_controller_test.rb

diff --git a/app/controllers/katello/api/v2/host_bootc_images_controller.rb b/app/controllers/katello/api/v2/host_bootc_images_controller.rb
new file mode 100644
index 00000000000..3aaab688841
--- /dev/null
+++ b/app/controllers/katello/api/v2/host_bootc_images_controller.rb
@@ -0,0 +1,61 @@
+module Katello
+  class Api::V2::HostBootcImagesController < Api::V2::ApiController
+    include Katello::Concerns::FilteredAutoCompleteSearch
+
+    resource_description do
+      api_version 'v2'
+      api_base_url "/api"
+    end
+
+    api :GET, "/hosts/bootc_images", N_("List booted bootc container images for hosts")
+    param_group :search, Api::V2::ApiController
+    def bootc_images
+      params[:sort_by] ||= 'bootc_booted_image'
+      params[:sort_order] ||= 'asc'
+      if params[:order]
+        params[:order] = "#{params[:order].split(' ')[0]} #{sanitize_sort_order(params[:order].split(' ')[1])}"
+      else
+        params[:order] = "#{params[:sort_by]} #{sanitize_sort_order(params[:sort_order])}"
+      end
+      per_page = params[:per_page].present? ? params[:per_page].to_i : Setting[:entries_per_page]
+      page = params[:page].present? ? params[:page].to_i : 1
+
+      bootc_image_map = bootc_host_image_map
+      paged_images = bootc_image_map.to_a.paginate(page: page, per_page: per_page)
+      results = paged_images.collect { |image| { bootc_booted_image: image[0], digests: image[1] } }
+      render json: { total: bootc_image_map.size, page: page, per_page: per_page, subtotal: bootc_image_map.size, results: results}
+    end
+
+    private
+
+    def sanitize_sort_order(sort_order)
+      if sort_order.present? && ['asc', 'desc'].include?(sort_order.downcase)
+        sort_order.downcase
+      else
+        'asc'
+      end
+    end
+
+    def index_relation
+      query = resource_class.authorized(:view_hosts).distinct
+      query.joins(:content_facet).where.not(bootc_booted_image: nil, bootc_booted_digest: nil)
+      query
+    end
+
+    def resource_class
+      ::Host::Managed
+    end
+
+    def bootc_host_image_map
+      content_facets = ::Katello::Host::ContentFacet.where(host_id: ::Host::Managed.joins(:content_facet).search_for(params[:search]).pluck(:id))
+      aggregate_bootc_data = content_facets.where.not(bootc_booted_image: nil, bootc_booted_digest: nil).
+          select(:bootc_booted_image, :bootc_booted_digest, 'COUNT(hosts.id) as host_count').
+          joins(:host).group(:bootc_booted_image, :bootc_booted_digest).order(params[:order])
+      bootc_image_map = Hash.new { |h, k| h[k] = [] }
+      aggregate_bootc_data.each do |host_image|
+        bootc_image_map[host_image.bootc_booted_image] << { bootc_booted_digest: host_image.bootc_booted_digest, host_count: host_image.host_count.to_i }
+      end
+      bootc_image_map
+    end
+  end
+end
diff --git a/config/routes/api/v2.rb b/config/routes/api/v2.rb
index c6c894a76fe..d3dd1fa9272 100644
--- a/config/routes/api/v2.rb
+++ b/config/routes/api/v2.rb
@@ -30,6 +30,10 @@ class ActionDispatch::Routing::Mapper
           end
         end
 
+        api_resources :host_bootc_images, :only => [:auto_complete_search] do
+          get :auto_complete_search, :on => :collection
+        end
+
         api_resources :capsules, :only => [:index, :show] do
           member do
             resource :content, :only => [], :controller => 'capsule_content' do
diff --git a/config/routes/overrides.rb b/config/routes/overrides.rb
index 142312d6e8d..32bcf9d5fdb 100644
--- a/config/routes/overrides.rb
+++ b/config/routes/overrides.rb
@@ -59,6 +59,7 @@ def matches?(request)
 
           collection do
             match '/auto_complete_search' => 'host_autocomplete#auto_complete_search', :via => :get
+            match '/bootc_images' => 'host_bootc_images#bootc_images', :via => :get
             match '/bulk/add_host_collections' => 'hosts_bulk_actions#bulk_add_host_collections', :via => :put
             match '/bulk/remove_host_collections' => 'hosts_bulk_actions#bulk_remove_host_collections', :via => :put
             match '/bulk/remove_host_collections' => 'hosts_bulk_actions#bulk_remove_host_collections', :via => :put
diff --git a/lib/katello/permissions/host_permissions.rb b/lib/katello/permissions/host_permissions.rb
index 4677cdf23f9..f573eee7db2 100644
--- a/lib/katello/permissions/host_permissions.rb
+++ b/lib/katello/permissions/host_permissions.rb
@@ -43,6 +43,8 @@
 
 Foreman::AccessControl.permission(:view_hosts).actions.concat [
   'hosts/content_hosts',
+  'katello/api/v2/host_bootc_images/bootc_images',
+  'katello/api/v2/host_bootc_images/auto_complete_search',
   'katello/api/v2/host_autocomplete/auto_complete_search',
   'katello/api/v2/host_errata/index',
   'katello/api/v2/host_errata/show',
diff --git a/test/controllers/api/v2/host_bootc_images_controller_test.rb b/test/controllers/api/v2/host_bootc_images_controller_test.rb
new file mode 100644
index 00000000000..32fe82b7a9f
--- /dev/null
+++ b/test/controllers/api/v2/host_bootc_images_controller_test.rb
@@ -0,0 +1,52 @@
+# encoding: utf-8
+
+require "katello_test_helper"
+
+module Katello
+  class Api::V2::HostBootcImagesControllerTest < ActionController::TestCase
+    tests ::Katello::Api::V2::HostBootcImagesController
+
+    def setup
+      setup_controller_defaults_api
+      setup_foreman_routes
+      @host1 = FactoryBot.create(:host, :with_content, :with_subscription, :content_view => katello_content_views(:library_dev_view),
+                                :lifecycle_environment => katello_environments(:library))
+      @host2 = FactoryBot.create(:host, :with_content, :with_subscription, :content_view => katello_content_views(:library_dev_view),
+                                :lifecycle_environment => katello_environments(:library))
+      @host3 = FactoryBot.create(:host, :with_content, :with_subscription, :content_view => katello_content_views(:library_dev_view),
+                                :lifecycle_environment => katello_environments(:library))
+      @host1.content_facet.update!(bootc_booted_image: 'image1')
+      @host1.content_facet.update!(bootc_booted_digest: 'sha256:dcfb2965cda67bd3731408ace23dd07ff3116168c2b832e16bba8234525724a3')
+      @host2.content_facet.update!(bootc_booted_image: 'image1')
+      @host2.content_facet.update!(bootc_booted_digest: 'sha256:dcfb2965cda67bd3731408ace23dd07ff3116168c2b832e16bba8234525724a3')
+      @host3.content_facet.update!(bootc_booted_image: 'image2')
+      @host3.content_facet.update!(bootc_booted_digest: 'sha256:dcfb2965cda67bc3731408aae23dd07ff3116168c2b832e16bba8234525724a5')
+    end
+
+    def test_bootc_images_counts_properly_no_paging
+      get :bootc_images
+      assert_response :success
+      results = JSON.parse(@response.body)['results']
+      assert_includes results, {"bootc_booted_image" => "image1", "digests" => [{"bootc_booted_digest" => "sha256:dcfb2965cda67bd3731408ace23dd07ff3116168c2b832e16bba8234525724a3", "host_count" => 2}]}
+      assert_includes results, {"bootc_booted_image" => "image2", "digests" => [{"bootc_booted_digest" => "sha256:dcfb2965cda67bc3731408aae23dd07ff3116168c2b832e16bba8234525724a5", "host_count" => 1}]}
+    end
+
+    def test_bootc_images_pages
+      @host2.content_facet.update!(bootc_booted_image: 'image3')
+      @host2.content_facet.update!(bootc_booted_digest: 'sha256:dcfb2965cda67bd3731408ace93dd07ff3116168c2b832e16bba8234525724c9')
+      get :bootc_images, params: { page: 1, per_page: 1 }
+      page1 = @response.body
+      get :bootc_images, params: { page: 2, per_page: 1 }
+      page2 = @response.body
+      get :bootc_images, params: { page: 3, per_page: 1 }
+      page3 = @response.body
+      get :bootc_images, params: { page: 4, per_page: 1 }
+      page4 = @response.body
+
+      assert_equal [{"bootc_booted_image" => "image1", "digests" => [{"bootc_booted_digest" => "sha256:dcfb2965cda67bd3731408ace23dd07ff3116168c2b832e16bba8234525724a3", "host_count" => 1}]}], JSON.parse(page1)['results']
+      assert_equal [{"bootc_booted_image" => "image2", "digests" => [{"bootc_booted_digest" => "sha256:dcfb2965cda67bc3731408aae23dd07ff3116168c2b832e16bba8234525724a5", "host_count" => 1}]}], JSON.parse(page2)['results']
+      assert_equal [{"bootc_booted_image" => "image3", "digests" => [{"bootc_booted_digest" => "sha256:dcfb2965cda67bd3731408ace93dd07ff3116168c2b832e16bba8234525724c9", "host_count" => 1}]}], JSON.parse(page3)['results']
+      assert_empty JSON.parse(page4)['results']
+    end
+  end
+end

From f649253fc253567c4f3933926ba574992471f6f7 Mon Sep 17 00:00:00 2001
From: Maria <mariaaga@redhat.com>
Date: Wed, 8 Jan 2025 16:21:45 +0000
Subject: [PATCH 15/29] Refs #37402 - require jquery-ui dependency (#11274)

---
 lib/katello.rb | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/lib/katello.rb b/lib/katello.rb
index 0b694b3b9d6..7c6972dca25 100644
--- a/lib/katello.rb
+++ b/lib/katello.rb
@@ -12,6 +12,8 @@
 
 require "deface"
 
+require "jquery-ui-rails"
+
 # to make Foreman#in_rake? helper available if Foreman's lib is available
 lib_foreman = File.expand_path('lib/foreman', Rails.root)
 require lib_foreman if Dir.exist?(lib_foreman)

From 2607abb55b6154c8f2763dc444b418ce48d3eb06 Mon Sep 17 00:00:00 2001
From: Ewoud Kohl van Wijngaarden <ewoud@kohlvanwijngaarden.nl>
Date: Wed, 8 Jan 2025 18:00:05 +0100
Subject: [PATCH 16/29] Sync translation infrastructure from
 foreman_plugin_template (#11193)

This copies the Makefile from foreman_plugin_template to resolve an
issue with the time stamp handling and pulling in new translations that
made it past 50%.

It also ignores action_names.rb since that's now considered a best
practice. Generated files do not belong in git.
---
 .gitignore             |   1 +
 locale/Makefile        |  44 +++++-----
 locale/action_names.rb | 181 -----------------------------------------
 3 files changed, 21 insertions(+), 205 deletions(-)
 delete mode 100644 locale/action_names.rb

diff --git a/.gitignore b/.gitignore
index 63493844a8c..b418ed9d5b1 100644
--- a/.gitignore
+++ b/.gitignore
@@ -29,6 +29,7 @@ locale/*/*.po.time_stamp
 locale/.cache/*
 locale/*/*.pox
 locale/*/LC_MESSAGES
+locale/action_names.rb
 .yardoc
 yardoc
 doc/apidoc*
diff --git a/locale/Makefile b/locale/Makefile
index 12660d09969..3102bb3e2ad 100644
--- a/locale/Makefile
+++ b/locale/Makefile
@@ -6,20 +6,19 @@
 # make tx-update - download and merge translations from Transifex
 # make clean - clean everything
 #
-DOMAIN = katello
-VERSION = $(shell git describe --abbrev=0 --tags)
+DOMAIN = $(shell ruby -rrubygems -e 'puts Gem::Specification::load(Dir.glob("../*.gemspec")[0]).name')
+VERSION = $(shell ruby -rrubygems -e 'puts Gem::Specification::load(Dir.glob("../*.gemspec")[0]).version')
 POTFILE = $(DOMAIN).pot
 MOFILE = $(DOMAIN).mo
-ACTIONFILE = action_names.rb
 POFILES = $(shell find . -name '$(DOMAIN).po')
 MOFILES = $(patsubst %.po,%.mo,$(POFILES))
 POXFILES = $(patsubst %.po,%.pox,$(POFILES))
 EDITFILES = $(patsubst %.po,%.edit.po,$(POFILES))
+JSFILES = $(shell find ../app/assets/javascripts/*/locale -name '$(DOMAIN).js')
 
 %.mo: %.po
 	mkdir -p $(shell dirname $@)/LC_MESSAGES
 	msgfmt -o $(shell dirname $@)/LC_MESSAGES/$(MOFILE) $<
-	touch $(shell dirname $@)/LC_MESSAGES/$(MOFILE)
 
 # Generate MO files from PO files
 all-mo: $(MOFILES)
@@ -32,9 +31,16 @@ all-mo: $(MOFILES)
 	cat $@
 	! grep -q msgid $@
 
-%.edit.po:
+%.edit.po: %.po.time_stamp
 	touch $@
 
+# gettext will trash the .edit.po file if the time stamp doesn't exist or is older than the po file
+%.po.time_stamp: %.po
+	touch --reference $< $@
+
+# Prevent make from treating this as an intermediate file to be cleaned up
+.PRECIOUS: %.po.time_stamp
+
 check: $(POXFILES)
 
 # Unify duplicate translations
@@ -44,34 +50,24 @@ uniq-po:
 	done
 
 tx-pull: $(EDITFILES)
-	tx pull -f
+	# Initialize new languages
+	cd .. && tx pull -f --all --minimum-perc 50
+	# Force update all existing languages
+	cd .. && tx pull -f --minimum-perc 0
 	for f in $(EDITFILES) ; do \
 		sed -i 's/^\("Project-Id-Version: \).*$$/\1$(DOMAIN) $(VERSION)\\n"/' $$f; \
 	done
 
 tx-update: tx-pull
 	@echo
-	@echo Run rake plugin:gettext[$(DOMAIN)] and rake plugin:po_to_json[$(DOMAIN)] from the Foreman installation, then make -C locale po-files to finish
+	@echo Run rake plugin:gettext[$(DOMAIN)] from the Foreman installation
+	@echo then run rake plugin:po_to_json[$(DOMAIN)] from the Foreman installation
+	@echo then run make -C locale mo-files to finish
 	@echo
 
-commit-translation-files: $(POFILES)
-	git add $(POFILES) $(POTFILE) $(ACTIONFILE) ../app/assets/javascripts/katello/locale
+mo-files: $(MOFILES)
+	git add $(POFILES) $(POTFILE) $(JSFILES) ../locale/*/LC_MESSAGES
 	git commit -m "i18n - pulling from tx"
 	@echo
 	@echo Changes commited!
 	@echo
-
-# Workaround when rake task fails (https://github.com/ruby/rake/pull/182)
-extract:
-	rxgettext \
-		--sort-output \
-		--sort-by-msgid \
-		--no-wrap \
-		--no-location \
-		-o ${DOMAIN}.pot \
-		--package-name=${DOMAIN} \
-		--package-version="${VERSION}" \
-		--msgid-bugs-address=foreman-dev@googlegroups.com \
-		--copyright-holder="Foreman developers" \
-		--copyright-year=$(shell date +%Y) \
-		$(shell find ../app -type f -name \*.rb -o -name \*.erb)
diff --git a/locale/action_names.rb b/locale/action_names.rb
deleted file mode 100644
index e0ec9aa6f30..00000000000
--- a/locale/action_names.rb
+++ /dev/null
@@ -1,181 +0,0 @@
-# Autogenerated!
-_("Abstract async task")
-_("Attach subscriptions")
-_("Auto attach subscriptions")
-_("Bulk generate applicability for hosts")
-_("Commit upload")
-_("Copy all units")
-_("Copy content")
-_("Copy version units to library")
-_("Copy version")
-_("Create Alternate Content Source")
-_("Create Container Push Repository Root")
-_("Create Export History")
-_("Create Import History")
-_("Create Syncable Export History")
-_("Create exporter")
-_("Create import")
-_("Create importer")
-_("Create publication")
-_("Create remote")
-_("Create remote")
-_("Create")
-_("Create")
-_("Create")
-_("Create")
-_("Create")
-_("Create")
-_("Create")
-_("Delete Activation Key")
-_("Delete Lifecycle Environment")
-_("Delete Manifest")
-_("Delete Product")
-_("Delete distributions")
-_("Delete orphan alternate content sources")
-_("Delete orphan distributions")
-_("Delete orphan remotes")
-_("Delete orphan repository versions")
-_("Delete orphaned migrated repositories")
-_("Delete remote")
-_("Delete remote")
-_("Delete repository references")
-_("Delete version")
-_("Delete")
-_("Delete")
-_("Delete")
-_("Delete")
-_("Delete")
-_("Delete")
-_("Delete")
-_("Destroy Alternate Content Source")
-_("Destroy Content Host")
-_("Destroy exporter")
-_("Destroy importer")
-_("Destroy")
-_("Disable Simple Content Access")
-_("Disable")
-_("Discover")
-_("Enable Simple Content Access")
-_("Enable")
-_("Environment contents refresh")
-_("Errata mail")
-_("Errata mail")
-_("Export Library")
-_("Export Repository")
-_("Export")
-_("Export")
-_("Export")
-_("Fetch pxe files")
-_("Filtered index content")
-_("Generate host applicability")
-_("Generate metadata")
-_("Generate metadata")
-_("Generate repository applicability")
-_("Hypervisors update")
-_("Hypervisors")
-_("Import Content View Version")
-_("Import Default Content View")
-_("Import Manifest")
-_("Import Repository")
-_("Import migration")
-_("Import repository upload")
-_("Import upload")
-_("Import upload")
-_("Import")
-_("Incremental Update of  Content View Version(s) ")
-_("Incremental Update")
-_("Index content")
-_("Index errata")
-_("Index module streams")
-_("Index package groups")
-_("Initialize")
-_("Instance update")
-_("Metadata generate")
-_("Multi copy all units")
-_("Multi copy content")
-_("Multi copy units")
-_("Product Create")
-_("Promote")
-_("Promotion to Environment")
-_("Publish Lifecycle Environment Container Repositories")
-_("Publish")
-_("Purge completed tasks")
-_("Reclaim space")
-_("Reclaim space")
-_("Refresh Alternate Content Source")
-_("Refresh Manifest")
-_("Refresh all distributions")
-_("Refresh distribution")
-_("Refresh distribution")
-_("Refresh if needed")
-_("Refresh remote")
-_("Refresh remote")
-_("Refresh repos")
-_("Refresh")
-_("Refresh")
-_("Refresh")
-_("Reindex subscriptions")
-_("Remove Content")
-_("Remove Version")
-_("Remove Versions and Associations")
-_("Remove from Environment")
-_("Remove orphans")
-_("Remove orphans")
-_("Remove subscriptions")
-_("Remove units")
-_("Remove units")
-_("Remove unneeded repos")
-_("Repair")
-_("Repositories certs reset")
-_("Repositories gpg reset")
-_("Republish Version Repositories")
-_("Run Sync Plan:")
-_("Save artifact")
-_("Save distribution references")
-_("Save publication")
-_("Save version")
-_("Save versions")
-_("Scan cdn")
-_("Sync capsule")
-_("Sync")
-_("Sync")
-_("Sync")
-_("Syncable export")
-_("Synchronize smart proxy")
-_("Synchronize")
-_("Toggle")
-_("Update Alternate Content Source")
-_("Update CDN Configuration")
-_("Update Content Counts")
-_("Update Content Overrides")
-_("Update content urls")
-_("Update content view environments for host")
-_("Update distributions")
-_("Update http proxy details")
-_("Update http proxy")
-_("Update redhat repository")
-_("Update release version for host")
-_("Update remote")
-_("Update remote")
-_("Update repository")
-_("Update")
-_("Update")
-_("Update")
-_("Update")
-_("Update")
-_("Update")
-_("Update")
-_("Update")
-_("Update")
-_("Updating System Purpose for host")
-_("Updating repository authentication configuration")
-_("Updating repository authentication configuration")
-_("Upload content")
-_("Upload file")
-_("Upload into")
-_("Upload into")
-_("Upload tag")
-_("Verify checksum for content on smart proxy")
-_("Verify checksum of version repositories")
-_("Verify checksum")
-_("Verify checksum")

From 87f14da7b86017c90a406ef2a5d77790c04994b6 Mon Sep 17 00:00:00 2001
From: Ian Ballou <ianballou67@gmail.com>
Date: Wed, 8 Jan 2025 15:51:29 -0500
Subject: [PATCH 17/29] Fixes #38103 - disallow direct container tar uploads
 (#11262)

---
 .../katello/api/v2/content_uploads_controller.rb           | 3 ++-
 lib/katello/repository_types/docker.rb                     | 1 -
 test/controllers/api/v2/content_uploads_controller_test.rb | 7 +++++++
 test/controllers/api/v2/repositories_controller_test.rb    | 4 ++--
 4 files changed, 11 insertions(+), 4 deletions(-)

diff --git a/app/controllers/katello/api/v2/content_uploads_controller.rb b/app/controllers/katello/api/v2/content_uploads_controller.rb
index d28e457c7ce..024f43bca7f 100644
--- a/app/controllers/katello/api/v2/content_uploads_controller.rb
+++ b/app/controllers/katello/api/v2/content_uploads_controller.rb
@@ -12,9 +12,10 @@ class Api::V2::ContentUploadsController < Api::V2::ApiController
     param :repository_id, :number, :required => true, :desc => N_("repository id")
     param :size, :number, :required => true, :desc => N_("Size of file to upload")
     param :checksum, String, :required => false, :desc => N_("Checksum of file to upload")
-    param :content_type, RepositoryTypeManager.uploadable_content_types(false).map(&:label), :required => false, :desc => N_("content type ('deb', 'docker_manifest', 'file', 'ostree_ref', 'rpm', 'srpm')")
+    param :content_type, RepositoryTypeManager.uploadable_content_types(false).map(&:label), :required => false, :desc => N_("content type ('deb', 'file', 'ostree_ref', 'rpm', 'srpm')")
     def create
       fail Katello::Errors::InvalidRepositoryContent, _("Cannot upload Ansible collections.") if @repository.ansible_collection?
+      fail Katello::Errors::InvalidRepositoryContent, _("Cannot upload container content via Hammer/API. Use podman push instead.") if @repository.docker?
       content_type = params[:content_type] || ::Katello::RepositoryTypeManager.find(@repository.content_type)&.default_managed_content_type&.label
       RepositoryTypeManager.check_content_matches_repo_type!(@repository, content_type)
       if ::Katello::RepositoryTypeManager.generic_content_type?(content_type)
diff --git a/lib/katello/repository_types/docker.rb b/lib/katello/repository_types/docker.rb
index 2cfc69629d9..b73a3c33cba 100644
--- a/lib/katello/repository_types/docker.rb
+++ b/lib/katello/repository_types/docker.rb
@@ -27,7 +27,6 @@
                :priority => 1,
                :pulp3_service_class => ::Katello::Pulp3::DockerManifest,
                :removable => true,
-               :uploadable => true,
                :primary_content => true
   content_type Katello::DockerManifestList,
                :priority => 2,
diff --git a/test/controllers/api/v2/content_uploads_controller_test.rb b/test/controllers/api/v2/content_uploads_controller_test.rb
index 171571c8033..f917920272e 100644
--- a/test/controllers/api/v2/content_uploads_controller_test.rb
+++ b/test/controllers/api/v2/content_uploads_controller_test.rb
@@ -46,6 +46,13 @@ def test_create_generic_upload_request
       assert_response :success
     end
 
+    def test_create_container_upload_request
+      container_repo = katello_repositories(:busybox)
+      post :create, params: { :repository_id => container_repo.id, :size => 100, :checksum => 'test_checksum2' }
+      assert_response :error
+      assert_match 'Cannot upload container content via Hammer/API. Use podman push instead.', @response.body
+    end
+
     def test_create_collection_upload_request
       ansible_collection_repo = katello_repositories(:pulp3_ansible_collection_1)
       post :create, params: { :repository_id => ansible_collection_repo.id, :size => 100, :checksum => 'test_checksum' }
diff --git a/test/controllers/api/v2/repositories_controller_test.rb b/test/controllers/api/v2/repositories_controller_test.rb
index 430838cf9f8..7c704194b59 100644
--- a/test/controllers/api/v2/repositories_controller_test.rb
+++ b/test/controllers/api/v2/repositories_controller_test.rb
@@ -929,8 +929,8 @@ def test_upload_content_bad_type
       post :upload_content, params: { :id => @repository.id, :content_type => 'cheese' }
 
       assert_response 422
-      response =  "{\"displayMessage\":\"Invalid params provided - content_type must be one of deb,docker_manifest,file,ostree_ref,python_package,rpm,srpm\"," \
-        "\"errors\":[\"Invalid params provided - content_type must be one of deb,docker_manifest,file,ostree_ref,python_package,rpm,srpm\"]}"
+      response =  "{\"displayMessage\":\"Invalid params provided - content_type must be one of deb,file,ostree_ref,python_package,rpm,srpm\"," \
+        "\"errors\":[\"Invalid params provided - content_type must be one of deb,file,ostree_ref,python_package,rpm,srpm\"]}"
       assert_match response, @response.body
     end
 

From 469efd5b76f78869fdc92d442853315678ea77e9 Mon Sep 17 00:00:00 2001
From: MariaAga <mariaaga@redhat.com>
Date: Mon, 16 Dec 2024 14:09:39 +0000
Subject: [PATCH 18/29] Fixes #38104 - Hide Media when Synced Content is
 selected

---
 .../_host_synced_content_select.html.erb           | 14 ++++++++++----
 1 file changed, 10 insertions(+), 4 deletions(-)

diff --git a/app/views/overrides/activation_keys/_host_synced_content_select.html.erb b/app/views/overrides/activation_keys/_host_synced_content_select.html.erb
index a94e6833f67..068050cd177 100644
--- a/app/views/overrides/activation_keys/_host_synced_content_select.html.erb
+++ b/app/views/overrides/activation_keys/_host_synced_content_select.html.erb
@@ -23,9 +23,15 @@
              :class => 'form-control',  :name => ks_repo_select_name, :disabled => kickstart_options.empty? %>
 <% end %>
 
-<% content_for(:javascripts) do -%>
-  <script>
+<script>
+  if(window.allJsLoaded){
     KT.hosts.set_media_selection_bindings();
     KT.hosts.update_media_enablement();
-  </script>
-<% end -%>
\ No newline at end of file
+  }
+  else {
+  $(document).on('ContentLoad', function(){
+    KT.hosts.set_media_selection_bindings();
+    KT.hosts.update_media_enablement();
+  }); 
+  } 
+</script>

From f5f8f4f56120ee21ddbd497004c4575bf9f2f5eb Mon Sep 17 00:00:00 2001
From: Quirin Pamp <pamp@atix.de>
Date: Tue, 3 Dec 2024 18:43:17 +0100
Subject: [PATCH 19/29] Fixes #38061 - Use advanced copy API for deb content

This fixes deb content filters with structured APT enabled.
---
 app/services/katello/pulp3/repository/apt.rb  | 34 +++++++++----------
 .../katello/pulp3/repository/apt/apt_test.rb  | 14 --------
 2 files changed, 16 insertions(+), 32 deletions(-)

diff --git a/app/services/katello/pulp3/repository/apt.rb b/app/services/katello/pulp3/repository/apt.rb
index 2673e5209a0..9a5ded6c651 100644
--- a/app/services/katello/pulp3/repository/apt.rb
+++ b/app/services/katello/pulp3/repository/apt.rb
@@ -226,23 +226,6 @@ def copy_content_from_mapping(repo_id_map, _options = {})
           multi_copy_units(repo_id_map, dependency_solving)
         end
 
-        def copy_units(content_unit_hrefs, remove_all)
-          remove_all = true if remove_all.nil?
-          tasks = []
-
-          if content_unit_hrefs.sort!.any?
-            first_slice = remove_all
-            content_unit_hrefs.each_slice(UNIT_LIMIT) do |slice|
-              tasks << add_content(slice, first_slice)
-              first_slice = false
-            end
-          # If we're merging composite cv repositories, don't clear out the Pulp repository.
-          elsif remove_all
-            tasks << remove_all_content
-          end
-          tasks
-        end
-
         def copy_content_for_source(source_repository, options = {})
           # copy_units_by_href(source_repository.debs.pluck(:pulp_id))
           filters = ContentViewDebFilter.where(:id => options[:filter_ids])
@@ -261,7 +244,22 @@ def copy_content_for_source(source_repository, options = {})
 
           content_unit_hrefs = whitelist_ids - blacklist_ids
 
-          copy_units(content_unit_hrefs.uniq, options[:remove_all])
+          pulp_deb_copy_serializer = PulpDebClient::Copy.new
+          pulp_deb_copy_serializer.dependency_solving = false
+          pulp_deb_copy_serializer.config = [{
+            source_repo_version: source_repository.version_href,
+            dest_repo: repository_reference.repository_href,
+            content: content_unit_hrefs,
+          }]
+
+          remove_all = options[:remove_all]
+          remove_all = true if remove_all.nil?
+
+          if remove_all
+            remove_all_content_from_repo(repository_reference.repository_href)
+          end
+
+          copy_content_chunked(pulp_deb_copy_serializer)
         end
 
         def regenerate_applicability
diff --git a/test/services/katello/pulp3/repository/apt/apt_test.rb b/test/services/katello/pulp3/repository/apt/apt_test.rb
index ee7731c982a..8705240ee49 100644
--- a/test/services/katello/pulp3/repository/apt/apt_test.rb
+++ b/test/services/katello/pulp3/repository/apt/apt_test.rb
@@ -16,20 +16,6 @@ def teardown
             ensure_creatable(@repo, @proxy)
           end
 
-          def test_copy_units_does_not_clear_repo_during_composite_merger
-            service = Katello::Pulp3::Repository::Apt.new(@repo, @proxy)
-            service.expects(:remove_all_content).never
-            service.copy_units([], false)
-          end
-
-          def test_copy_units_rewrites_missing_content_error
-            fake_content_href = '/pulp/api/v3/repositories/deb/apt/aaaaaaaa-aaaa-aaaa-aaaa-aaaaaaaaaaaa/'
-            service = Katello::Pulp3::Repository::Apt.new(@repo, @proxy)
-            create_repo(@repo, @proxy)
-            error = assert_raises(::Katello::Errors::Pulp3Error) { service.copy_units([fake_content_href], false) }
-            assert_match(/Please run `foreman-rake katello:delete_orphaned_content` to fix the following repository: Debian 9 amd64./, error.message)
-          end
-
           def test_remote_options
             @repo.root.url = "http://foo.com/bar/"
             service = Katello::Pulp3::Repository::Apt.new(@repo, @proxy)

From 25e95465376dfead5d0772dd24fb873dd5bb0f2a Mon Sep 17 00:00:00 2001
From: Lucy Fu <lufu@redhat.com>
Date: Thu, 9 Jan 2025 15:20:56 -0500
Subject: [PATCH 20/29] Fixes #38113 - Add link to REX job templates for bootc
 action (#11272)

---
 lib/katello/plugin.rb                                     | 1 +
 .../HostDetails/DetailsTabCards/ImageModeCard.js          | 8 ++++++++
 2 files changed, 9 insertions(+)

diff --git a/lib/katello/plugin.rb b/lib/katello/plugin.rb
index d1354d19bd8..15001859612 100644
--- a/lib/katello/plugin.rb
+++ b/lib/katello/plugin.rb
@@ -698,6 +698,7 @@ def katello_template_setting_values(name)
   RemoteExecutionFeature.register(:katello_module_stream_action, N_("Katello: Module Stream Actions"),
                                   :description => N_("Perform a module stream action via Katello interface"),
                                   :provided_inputs => ['action', 'module_spec', 'options'])
+  RemoteExecutionFeature.register(:katello_bootc_action, N_("Katello: Bootc Action"), :description => N_("Katello Bootc interface"))
   RemoteExecutionFeature.register(:katello_bootc_upgrade, N_("Katello: Bootc Upgrade"), :description => N_("Bootc upgrade via Bootc interface"))
   RemoteExecutionFeature.register(:katello_bootc_switch, N_("Katello: Bootc Switch"), :description => N_("Bootc switch via Bootc interface"))
   RemoteExecutionFeature.register(:katello_bootc_rollback, N_("Katello: Bootc Rollback"), :description => N_("Bootc rollback via Bootc interface"))
diff --git a/webpack/components/extensions/HostDetails/DetailsTabCards/ImageModeCard.js b/webpack/components/extensions/HostDetails/DetailsTabCards/ImageModeCard.js
index d6333d515b7..499c7ea63c4 100644
--- a/webpack/components/extensions/HostDetails/DetailsTabCards/ImageModeCard.js
+++ b/webpack/components/extensions/HostDetails/DetailsTabCards/ImageModeCard.js
@@ -9,6 +9,7 @@ import {
 } from '@patternfly/react-core';
 import CardTemplate from 'foremanReact/components/HostDetails/Templates/CardItem/CardTemplate';
 import FontAwesomeImageModeIcon from '../../../../components/extensions/Hosts/FontAwesomeImageModeIcon';
+import { createJob } from '../Tabs/customizedRexUrlHelpers';
 
 const cardHeader = (
   <>
@@ -16,6 +17,11 @@ const cardHeader = (
     <FontAwesomeImageModeIcon />
   </>
 );
+const actionUrl = hostname => createJob({
+  hostname,
+  feature: 'katello_bootc_action',
+  inputs: {},
+});
 
 const ImageModeCard = ({ isExpandedGlobal, hostDetails }) => {
   const imageMode = hostDetails?.content_facet_attributes?.bootc_booted_image;
@@ -28,6 +34,7 @@ const ImageModeCard = ({ isExpandedGlobal, hostDetails }) => {
       masonryLayout
       isExpandedGlobal={isExpandedGlobal}
     >
+      <a href={actionUrl(hostDetails.name)}>{__('Modify via remote execution')}</a>
       <DescriptionList isHorizontal>
         <DescriptionListGroup>
           <Dt>{__('Running image')}</Dt>
@@ -58,6 +65,7 @@ const ImageModeCard = ({ isExpandedGlobal, hostDetails }) => {
 ImageModeCard.propTypes = {
   isExpandedGlobal: PropTypes.bool,
   hostDetails: PropTypes.shape({
+    name: PropTypes.string,
     content_facet_attributes: PropTypes.shape({
       bootc_booted_image: PropTypes.string,
       bootc_booted_digest: PropTypes.string,

From 68b1db34593597d77dbba126a53dbec2d3aa4fa3 Mon Sep 17 00:00:00 2001
From: Quinn James <35753203+qcjames53@users.noreply.github.com>
Date: Mon, 13 Jan 2025 10:00:20 -0500
Subject: [PATCH 21/29] Fixes #37946 - Add 'allow_other_types' option in errata
 filters (#11188)

---
 .../content_view_filter_rules_controller.rb   |  4 +-
 .../katello/api/v2/errata_controller.rb       | 13 ++++-
 ...tent_view_erratum_filter_rule_validator.rb |  4 +-
 .../katello/content_view_erratum_filter.rb    | 20 +++++++-
 app/models/katello/erratum.rb                 | 10 +++-
 .../content_view_filter_rules/show.json.rabl  |  1 +
 ...es_to_content_view_erratum_filter_rules.rb |  6 +++
 .../content_view_erratum_filter_test.rb       | 51 ++++++++++++++++---
 .../Filters/CVErrataDateFilterContent.js      | 46 ++++++++++++++---
 .../Filters/CVErrataIDFilterContent.js        | 15 +++++-
 .../Details/Filters/CVFilterDetailType.js     |  2 +-
 .../cvErrataDateFilterContent.test.js         |  1 +
 12 files changed, 149 insertions(+), 24 deletions(-)
 create mode 100644 db/migrate/20241120213713_add_allow_other_types_to_content_view_erratum_filter_rules.rb

diff --git a/app/controllers/katello/api/v2/content_view_filter_rules_controller.rb b/app/controllers/katello/api/v2/content_view_filter_rules_controller.rb
index 0b61607da58..5054a94e332 100644
--- a/app/controllers/katello/api/v2/content_view_filter_rules_controller.rb
+++ b/app/controllers/katello/api/v2/content_view_filter_rules_controller.rb
@@ -40,6 +40,7 @@ def resource_class
     param :types, Array, :desc => N_("erratum: types (enhancement, bugfix, security)")
     param :date_type, String, :desc => N_("erratum: search using the 'Issued On' or 'Updated On' column of the errata. Values are 'issued'/'updated'")
     param :module_stream_ids, Array, :desc => N_("module stream ids")
+    param :allow_other_types, :bool, :desc => N_("erratum: allow types not matching a valid errata type")
     def create
       rule_clazz = ContentViewFilter.rule_class_for(@filter)
 
@@ -89,6 +90,7 @@ def show
     param :start_date, String, :desc => N_("erratum: start date (YYYY-MM-DD)")
     param :end_date, String, :desc => N_("erratum: end date (YYYY-MM-DD)")
     param :types, Array, :desc => N_("erratum: types (enhancement, bugfix, security)")
+    param :allow_other_types, :bool, :desc => N_("erratum: allow types not matching a valid errata type")
     def update
       update_params = rule_params
       update_params[:name] = update_params[:name].first if update_params[:name]
@@ -136,7 +138,7 @@ def rule_params
 
       @rule_params ||= params.fetch(:content_view_filter_rule, {}).
             permit(:uuid, :version, :min_version, :max_version, :architecture,
-                    :errata_id, :start_date, :end_date, :date_type,
+                    :errata_id, :start_date, :end_date, :date_type, :allow_other_types,
                     :types => [], :module_stream_ids => [], :errata_ids => [], name: [])
     end
 
diff --git a/app/controllers/katello/api/v2/errata_controller.rb b/app/controllers/katello/api/v2/errata_controller.rb
index d8040aea0b8..57f113c4182 100644
--- a/app/controllers/katello/api/v2/errata_controller.rb
+++ b/app/controllers/katello/api/v2/errata_controller.rb
@@ -59,9 +59,20 @@ def custom_index_relation(collection)
         fail HttpErrors::UnprocessableEntity, msg
       end
 
+      custom_index_relation_handle_type_and_time(collection)
+    end
+
+    def custom_index_relation_handle_type_and_time(collection)
       collection = collection.where("#{date_type} >= ?", params[:start_date]) if params[:start_date]
       collection = collection.where("#{date_type} <= ?", params[:end_date]) if params[:end_date]
-      collection = collection.of_type(params[:types]) if params[:types]
+      if params[:types]
+        include_other = params[:types]&.include?('other')
+        params[:types]&.delete('other')
+        collection = collection.of_type(
+          params[:types],
+          include_other
+        )
+      end
       collection
     end
 
diff --git a/app/lib/katello/validators/content_view_erratum_filter_rule_validator.rb b/app/lib/katello/validators/content_view_erratum_filter_rule_validator.rb
index 3eee2a8f252..7b512488c6d 100644
--- a/app/lib/katello/validators/content_view_erratum_filter_rule_validator.rb
+++ b/app/lib/katello/validators/content_view_erratum_filter_rule_validator.rb
@@ -2,9 +2,9 @@ module Katello
   module Validators
     class ContentViewErratumFilterRuleValidator < ActiveModel::Validator
       def validate(record)
-        if record.errata_id.blank? && record.start_date.blank? && record.end_date.blank? && record.types.blank?
+        if record.errata_id.blank? && record.start_date.blank? && record.end_date.blank? && record.types.blank? && record.allow_other_types == false
           invalid_parameters = _("Invalid erratum filter rule specified, Must specify at least one of the following:" \
-                                     " 'errata_id', 'start_date', 'end_date' or 'types'")
+            " 'errata_id', 'start_date', 'end_date', 'types', or 'allow_other_types'")
           record.errors.add(:base, invalid_parameters)
           return
         end
diff --git a/app/models/katello/content_view_erratum_filter.rb b/app/models/katello/content_view_erratum_filter.rb
index ee8d9f98103..a6e39a65c19 100644
--- a/app/models/katello/content_view_erratum_filter.rb
+++ b/app/models/katello/content_view_erratum_filter.rb
@@ -92,9 +92,21 @@ def erratum_arel
     end
 
     def types_clause
+      # Create an array to store output clauses for quick type filtering later
+      conditions = []
+
+      # Add clauses for types in the filter
       types = erratum_rules.first.types
-      return if types.blank?
-      errata_types_in(types)
+      conditions << errata_types_in(types) unless types.blank?
+
+      # Add clauses for 'other' types
+      conditions << errata_types_not_in(Erratum::TYPES) if erratum_rules.first.allow_other_types?
+
+      # Reduce the array of clauses to a single clause and return
+      return if conditions.empty?
+      conditions.reduce(nil) do |combined_clause, condition|
+        combined_clause ? combined_clause.or(condition) : condition
+      end
     end
 
     def filter_by_id?
@@ -105,6 +117,10 @@ def errata_types_in(types)
       erratum_arel[:errata_type].in(types)
     end
 
+    def errata_types_not_in(types)
+      erratum_arel[:errata_type].not_in(types)
+    end
+
     def errata_in(ids)
       erratum_arel[:errata_id].in(ids)
     end
diff --git a/app/models/katello/erratum.rb b/app/models/katello/erratum.rb
index b68062ee1cd..9a6b3893d51 100644
--- a/app/models/katello/erratum.rb
+++ b/app/models/katello/erratum.rb
@@ -48,8 +48,14 @@ class Erratum < Katello::Model
                   :validator => ->(value) { ['true', 'false'].include?(value.downcase) },
                   :operators => ["="]
 
-    def self.of_type(type)
-      where(:errata_type => type)
+    def self.of_type(type, include_other = false)
+      if include_other
+        where.not(
+          :errata_type => [Erratum::SECURITY, Erratum::BUGZILLA, Erratum::ENHANCEMENT].flatten
+          ).or(where(:errata_type => type))
+      else
+        where(:errata_type => type)
+      end
     end
 
     scope :security, -> { of_type(Erratum::SECURITY) }
diff --git a/app/views/katello/api/v2/content_view_filter_rules/show.json.rabl b/app/views/katello/api/v2/content_view_filter_rules/show.json.rabl
index 38c1b04a2b1..d7024c206e7 100644
--- a/app/views/katello/api/v2/content_view_filter_rules/show.json.rabl
+++ b/app/views/katello/api/v2/content_view_filter_rules/show.json.rabl
@@ -13,6 +13,7 @@ attributes :start_date, :if => lambda { |rule| rule.respond_to?(:start_date) &&
 attributes :end_date, :if => lambda { |rule| rule.respond_to?(:end_date) && !rule.end_date.blank? }
 attributes :architecture, :if => lambda { |rule| rule.respond_to?(:architecture) && !rule.architecture.blank? }
 attributes :types, :if => lambda { |rule| rule.respond_to?(:types) && !rule.types.blank? }
+attributes :allow_other_types, :if => lambda { |rule| rule.respond_to?(:allow_other_types) }
 attributes :date_type, :if => lambda { |rule| rule.respond_to?(:date_type) }
 attributes :module_stream_id, :if => lambda { |rule| rule.respond_to?(:module_stream_id) && !rule.module_stream_id.blank? }
 if @resource&.try(:module_stream)
diff --git a/db/migrate/20241120213713_add_allow_other_types_to_content_view_erratum_filter_rules.rb b/db/migrate/20241120213713_add_allow_other_types_to_content_view_erratum_filter_rules.rb
new file mode 100644
index 00000000000..adac4544e52
--- /dev/null
+++ b/db/migrate/20241120213713_add_allow_other_types_to_content_view_erratum_filter_rules.rb
@@ -0,0 +1,6 @@
+class AddAllowOtherTypesToContentViewErratumFilterRules < ActiveRecord::Migration[6.1]
+  def change
+    add_column :katello_content_view_erratum_filter_rules, :allow_other_types, :boolean,
+      :default => false, :null => false
+  end
+end
diff --git a/test/models/content_view_erratum_filter_test.rb b/test/models/content_view_erratum_filter_test.rb
index 02491f8baa9..a4439339d70 100644
--- a/test/models/content_view_erratum_filter_test.rb
+++ b/test/models/content_view_erratum_filter_test.rb
@@ -6,6 +6,9 @@ def setup
       @repo = katello_repositories(:fedora_17_x86_64)
     end
 
+    TYPICAL_TYPES_RESPONSE =
+      " AND \"katello_errata\".\"errata_type\" IN ('bugfix', 'enhancement', 'security')".freeze
+
     def test_erratum_by_id_returns_arel_for_specified_errata_id
       erratum = katello_errata(:security)
       @repo.errata = [erratum]
@@ -24,7 +27,7 @@ def test_errata_by_start_date_returns_arel_for_errata_by_updated_date_and_errata
       filter = id_rule.filter
       filter.reload
 
-      assert_equal "\"katello_errata\".\"updated\" >= '#{start_date}' AND \"katello_errata\".\"errata_type\" IN ('bugfix', 'enhancement', 'security')",
+      assert_equal "\"katello_errata\".\"updated\" >= '#{start_date}'" + TYPICAL_TYPES_RESPONSE,
         filter.generate_clauses(@repo).to_sql
     end
 
@@ -35,7 +38,7 @@ def test_errata_by_start_date_returns_arel_for_errata_by_issued_date_and_errata_
       filter = id_rule.filter
       filter.reload
 
-      assert_equal "\"katello_errata\".\"issued\" >= '#{start_date}' AND \"katello_errata\".\"errata_type\" IN ('bugfix', 'enhancement', 'security')",
+      assert_equal "\"katello_errata\".\"issued\" >= '#{start_date}'" + TYPICAL_TYPES_RESPONSE,
         filter.generate_clauses(@repo).to_sql
     end
 
@@ -45,7 +48,7 @@ def test_errata_by_end_date_returns_arel_for_errata_by_updated_date_and_errata_t
       filter = id_rule.filter
       filter.reload
 
-      assert_equal "\"katello_errata\".\"updated\" <= '#{end_date}' AND \"katello_errata\".\"errata_type\" IN ('bugfix', 'enhancement', 'security')",
+      assert_equal "\"katello_errata\".\"updated\" <= '#{end_date}'" + TYPICAL_TYPES_RESPONSE,
         filter.generate_clauses(@repo).to_sql
     end
 
@@ -56,7 +59,7 @@ def test_errata_by_end_date_returns_arel_for_errata_by_issued_date_and_errata_ty
       filter = id_rule.filter
       filter.reload
 
-      assert_equal "\"katello_errata\".\"issued\" <= '#{end_date}' AND \"katello_errata\".\"errata_type\" IN ('bugfix', 'enhancement', 'security')",
+      assert_equal "\"katello_errata\".\"issued\" <= '#{end_date}'" + TYPICAL_TYPES_RESPONSE,
         filter.generate_clauses(@repo).to_sql
     end
 
@@ -69,6 +72,16 @@ def test_errata_by_type_returns_arel_by_errata_type
         filter.generate_clauses(@repo).to_sql
     end
 
+    def test_errata_by_type_returns_arel_by_errata_type_other
+      id_rule = FactoryBot.create(:katello_content_view_erratum_filter_rule, :allow_other_types => true)
+      id_rule.update!(types: [])
+      filter = id_rule.filter
+      filter.reload
+
+      assert_equal "\"katello_errata\".\"errata_type\" NOT IN ('security', 'bugfix', 'recommended', 'enhancement', 'optional')",
+        filter.generate_clauses(@repo).to_sql
+    end
+
     def test_content_unit_pulp_ids_with_empty_errata_list_returns_empty_result
       rpm1 = @repo.rpms.first
       rpm2 = @repo.rpms.last
@@ -209,13 +222,16 @@ def test_content_unit_pulp_ids_by_issued_end_date_returns_pulp_hrefs
     end
 
     def test_content_unit_pulp_ids_by_errata_type
-      rpm1 = @repo.rpms.first
-      rpm2 = @repo.rpms.last
+      rpm1 = @repo.rpms[0]
+      rpm2 = @repo.rpms[1]
+      rpm3 = @repo.rpms[2]
 
       erratum1 = Katello::Erratum.new(:pulp_id => "one", :errata_id => "ERRATA1", :errata_type => 'bugfix')
       erratum1.packages << Katello::ErratumPackage.new(:filename => rpm1.filename, :name => "e1", :nvrea => "e1")
       erratum2 = Katello::Erratum.new(:pulp_id => "two", :errata_id => "ERRATA2", :errata_type => 'security')
       erratum2.packages << Katello::ErratumPackage.new(:filename => rpm2.filename, :name => "e2", :nvrea => "e2")
+      erratum3 = Katello::Erratum.new(:pulp_id => "three", :errata_id => "ERRATA3", :errata_type => 'not_recognized')
+      erratum3.packages << Katello::ErratumPackage.new(:filename => rpm3.filename, :name => "e3", :nvrea => "e3")
 
       @repo.errata = [erratum2]
       @repo.save!
@@ -226,5 +242,28 @@ def test_content_unit_pulp_ids_by_errata_type
 
       assert_equal [rpm2.pulp_id], filter.content_unit_pulp_ids(@repo)
     end
+
+    def test_content_unit_pulp_ids_by_errata_type_other
+      rpm1 = @repo.rpms[0]
+      rpm2 = @repo.rpms[1]
+      rpm3 = @repo.rpms[2]
+
+      erratum1 = Katello::Erratum.new(:pulp_id => "one", :errata_id => "ERRATA1", :errata_type => 'bugfix')
+      erratum1.packages << Katello::ErratumPackage.new(:filename => rpm1.filename, :name => "e1", :nvrea => "e1")
+      erratum2 = Katello::Erratum.new(:pulp_id => "two", :errata_id => "ERRATA2", :errata_type => 'security')
+      erratum2.packages << Katello::ErratumPackage.new(:filename => rpm2.filename, :name => "e2", :nvrea => "e2")
+      erratum3 = Katello::Erratum.new(:pulp_id => "three", :errata_id => "ERRATA3", :errata_type => 'not_recognized')
+      erratum3.packages << Katello::ErratumPackage.new(:filename => rpm3.filename, :name => "e3", :nvrea => "e3")
+
+      @repo.errata = [erratum3]
+      @repo.save!
+
+      id_rule = FactoryBot.create(:katello_content_view_erratum_filter_rule, :allow_other_types => true)
+      id_rule.update!(types: [])
+      filter = id_rule.filter
+      filter.reload
+
+      assert_equal [rpm3.pulp_id], filter.content_unit_pulp_ids(@repo)
+    end
   end
 end
diff --git a/webpack/scenes/ContentViews/Details/Filters/CVErrataDateFilterContent.js b/webpack/scenes/ContentViews/Details/Filters/CVErrataDateFilterContent.js
index 8eb5c2204d9..7c4ebd491e9 100644
--- a/webpack/scenes/ContentViews/Details/Filters/CVErrataDateFilterContent.js
+++ b/webpack/scenes/ContentViews/Details/Filters/CVErrataDateFilterContent.js
@@ -46,7 +46,12 @@ const CVErrataDateFilterContent = ({
     selectCVFilterDetails(state, cvId, filterId), shallowEqual);
   const { repositories = [], rules } = filterDetails;
   const [{
-    id, types, start_date: ruleStartDate, end_date: ruleEndDate, date_type: ruleDateType,
+    id,
+    types,
+    allow_other_types: ruleAllowOtherTypes,
+    start_date: ruleStartDate,
+    end_date: ruleEndDate,
+    date_type: ruleDateType,
   } = {}] = rules;
   const { permissions } = details;
   const [startDate, setStartDate] = useState(convertAPIDateToUIFormat(ruleStartDate));
@@ -54,12 +59,23 @@ const CVErrataDateFilterContent = ({
   const [dateType, setDateType] = useState(ruleDateType);
   const [dateTypeSelectOpen, setDateTypeSelectOpen] = useState(false);
   const [typeSelectOpen, setTypeSelectOpen] = useState(false);
-  const [selectedTypes, setSelectedTypes] = useState(types);
   const dispatch = useDispatch();
   const [activeTabKey, setActiveTabKey] = useState(0);
   const [startEntry, setStartEntry] = useState(false);
   const [endEntry, setEndEntry] = useState(false);
 
+  const getInitialSelectedTypes = () => {
+    if (!types) {
+      return ['other'];
+    }
+    if (ruleAllowOtherTypes) {
+      return [...types, 'other'];
+    }
+    return types;
+  };
+
+  const [selectedTypes, setSelectedTypes] = useState(getInitialSelectedTypes());
+
   const onSave = () => {
     dispatch(editCVFilterRule(
       filterId,
@@ -68,8 +84,9 @@ const CVErrataDateFilterContent = ({
         content_view_filter_id: filterId,
         start_date: startDate && startDate !== '' ? dateParse(startDate) : null,
         end_date: endDate && endDate !== '' ? dateParse(endDate) : null,
-        types: selectedTypes,
+        types: selectedTypes.filter(e => e !== 'other'),
         date_type: dateType,
+        allow_other_types: selectedTypes.includes('other'),
       },
       () => {
         dispatch({ type: CONTENT_VIEW_NEEDS_PUBLISH });
@@ -81,15 +98,21 @@ const CVErrataDateFilterContent = ({
   const resetFilters = () => {
     setStartDate(convertAPIDateToUIFormat(ruleStartDate));
     setEndDate(convertAPIDateToUIFormat(ruleEndDate));
-    setSelectedTypes(types);
     setDateType(ruleDateType);
+    setSelectedTypes(getInitialSelectedTypes());
   };
 
   const onTypeSelect = (selection) => {
     if (selectedTypes.includes(selection)) {
+      // If the selection is the only selection remaining, do not allow it to be removed
       if (selectedTypes.length === 1) return;
+
+      // Filter out the current selection to deselect it
       setSelectedTypes(selectedTypes.filter(e => e !== selection));
-    } else setSelectedTypes([...selectedTypes, selection]);
+    } else {
+      // Add the selection to the selected types
+      setSelectedTypes([...selectedTypes, selection]);
+    }
   };
 
   const singleSelection = selection => (selectedTypes.length === 1
@@ -99,7 +122,7 @@ const CVErrataDateFilterContent = ({
     (
       isEqual(convertAPIDateToUIFormat(ruleStartDate), startDate) &&
       isEqual(convertAPIDateToUIFormat(ruleEndDate), endDate) &&
-      isEqual(sortBy(types), sortBy(selectedTypes)) &&
+      isEqual(sortBy(getInitialSelectedTypes()), sortBy(selectedTypes)) &&
       isEqual(ruleDateType, dateType)
     );
 
@@ -171,6 +194,15 @@ const CVErrataDateFilterContent = ({
                       {__('Bugfix')}
                     </p>
                   </SelectOption>
+                  <SelectOption
+                    isDisabled={singleSelection('other') || !hasPermission(permissions, 'edit_content_views')}
+                    key="other"
+                    value="other"
+                  >
+                    <p style={{ marginTop: '4px' }}>
+                      {__('Other')}
+                    </p>
+                  </SelectOption>
                 </Select>
               </FlexItem>
               <FlexItem span={1} spacer={{ default: 'spacerNone' }}>
@@ -178,7 +210,7 @@ const CVErrataDateFilterContent = ({
                   <Tooltip
                     position="top"
                     content={
-                      __('Atleast one errata type needs to be selected.')
+                      __('At least one errata type option needs to be selected.')
                     }
                   >
                     <OutlinedQuestionCircleIcon />
diff --git a/webpack/scenes/ContentViews/Details/Filters/CVErrataIDFilterContent.js b/webpack/scenes/ContentViews/Details/Filters/CVErrataIDFilterContent.js
index 479b0fefa06..aaba31870ef 100644
--- a/webpack/scenes/ContentViews/Details/Filters/CVErrataIDFilterContent.js
+++ b/webpack/scenes/ContentViews/Details/Filters/CVErrataIDFilterContent.js
@@ -60,7 +60,7 @@ const CVErrataIDFilterContent = ({
   const hasNotAddedSelected = rows.some(({ selected, added }) => selected && !added);
   const [statusSelected, setStatusSelected] = useState(ALL_STATUSES);
   const [typeSelectOpen, setTypeSelectOpen] = useState(false);
-  const [selectedTypes, setSelectedTypes] = useState(ERRATA_TYPES);
+  const [selectedTypes, setSelectedTypes] = useState([...ERRATA_TYPES, 'other']);
   const [startDate, setStartDate] = useState('');
   const [endDate, setEndDate] = useState('');
   const activeFilters = [statusSelected, selectedTypes, startDate, endDate];
@@ -198,9 +198,15 @@ const CVErrataIDFilterContent = ({
 
   const onTypeSelect = (selection) => {
     if (selectedTypes.includes(selection)) {
+      // If the selection is the only selection remaining, do not allow it to be removed
       if (selectedTypes.length === 1) return;
+
+      // Filter out the current selection to deselect it
       setSelectedTypes(selectedTypes.filter(e => e !== selection));
-    } else setSelectedTypes([...selectedTypes, selection]);
+    } else {
+      // Add the current selection to the selected types
+      setSelectedTypes([...selectedTypes, selection]);
+    }
     setTypeSelectOpen(false);
   };
 
@@ -326,6 +332,11 @@ const CVErrataIDFilterContent = ({
                           {__('Bugfix')}
                         </p>
                       </SelectOption>
+                      <SelectOption isDisabled={singleSelection('bugfix')} key="other" value="other">
+                        <p style={{ marginTop: '4px' }}>
+                          {__('Other')}
+                        </p>
+                      </SelectOption>
                     </Select>
                   </SplitItem>
                   {hasPermission(permissions, 'edit_content_views') &&
diff --git a/webpack/scenes/ContentViews/Details/Filters/CVFilterDetailType.js b/webpack/scenes/ContentViews/Details/Filters/CVFilterDetailType.js
index a80905ca575..46bc9cf6c80 100644
--- a/webpack/scenes/ContentViews/Details/Filters/CVFilterDetailType.js
+++ b/webpack/scenes/ContentViews/Details/Filters/CVFilterDetailType.js
@@ -47,7 +47,7 @@ const CVFilterDetailType = ({
       details={details}
     />);
   case 'erratum':
-    if (head(rules)?.types) {
+    if (head(rules)?.types || head(rules)?.allow_other_types) {
       return (<CVErrataDateFilterContent
         cvId={cvId}
         filterId={filterId}
diff --git a/webpack/scenes/ContentViews/Details/Filters/__tests__/cvErrataDateFilterContent.test.js b/webpack/scenes/ContentViews/Details/Filters/__tests__/cvErrataDateFilterContent.test.js
index cb6497f9ae5..71f9d7a3b79 100644
--- a/webpack/scenes/ContentViews/Details/Filters/__tests__/cvErrataDateFilterContent.test.js
+++ b/webpack/scenes/ContentViews/Details/Filters/__tests__/cvErrataDateFilterContent.test.js
@@ -23,6 +23,7 @@ test('Can display errata-date filter rule and edit', async (done) => {
     end_date: '2020-08-15T12:00:00.000Z',
     types: ['enhancement', 'security'],
     date_type: 'issued',
+    allow_other_types: false,
   };
 
   const ruleEditScope = nockInstance

From b316f4cc1faacb70307c692c693b31a122a48198 Mon Sep 17 00:00:00 2001
From: Leos Stejskal <github@stejskalleos.cz>
Date: Mon, 13 Jan 2025 19:55:43 +0100
Subject: [PATCH 22/29] refs #37923 - Bug fixes & improvements for the Default
 HTTP proxy (#11266)

Follow up on PR#11183 with:
* Unified naming of the parameter ('content_default_http_proxy')
* On edit form showing information if the capsule is default
* Fixed API + extended show with 'content_default_http_proxy'
---
 .../v2/http_proxies_controller_extensions.rb  |  4 +--
 .../http_proxies_controller_extensions.rb     |  2 +-
 .../katello/concerns/http_proxy_extensions.rb |  4 +++
 .../api/v2/http_proxies/show.json.rabl        |  1 +
 .../_update_setting_input.html.erb            | 30 ++++++++++---------
 lib/katello/plugin.rb                         |  1 +
 6 files changed, 25 insertions(+), 17 deletions(-)
 create mode 100644 app/views/katello/api/v2/http_proxies/show.json.rabl

diff --git a/app/controllers/katello/concerns/api/v2/http_proxies_controller_extensions.rb b/app/controllers/katello/concerns/api/v2/http_proxies_controller_extensions.rb
index 2d2f8c5baca..2839a6a82f9 100644
--- a/app/controllers/katello/concerns/api/v2/http_proxies_controller_extensions.rb
+++ b/app/controllers/katello/concerns/api/v2/http_proxies_controller_extensions.rb
@@ -5,9 +5,9 @@ module V2
         module HttpProxiesControllerExtensions
           extend ::Apipie::DSL::Concern
 
-          update_api(:create) do
+          update_api(:create, :show) do
             param :http_proxy, Hash do
-              param :default_content_proxy, :bool, :required => false, :desc => N_('Set this HTTP proxy as the default content HTTP proxy')
+              param :content_default_http_proxy, :bool, :required => false, :desc => N_('Set this HTTP proxy as the default content HTTP proxy')
             end
           end
         end
diff --git a/app/controllers/katello/concerns/http_proxies_controller_extensions.rb b/app/controllers/katello/concerns/http_proxies_controller_extensions.rb
index 303a9e11c8e..00049d9282c 100644
--- a/app/controllers/katello/concerns/http_proxies_controller_extensions.rb
+++ b/app/controllers/katello/concerns/http_proxies_controller_extensions.rb
@@ -11,7 +11,7 @@ module HttpProxiesControllerExtensions
 
       def update_content_default_http_proxy
         return unless @http_proxy.persisted?
-        return unless ActiveRecord::Type::Boolean.new.deserialize(params.dig('http_proxy', 'default_content'))
+        return unless ActiveRecord::Type::Boolean.new.deserialize(params.dig('http_proxy', 'content_default_http_proxy'))
 
         Setting[:content_default_http_proxy] = @http_proxy.name
       end
diff --git a/app/models/katello/concerns/http_proxy_extensions.rb b/app/models/katello/concerns/http_proxy_extensions.rb
index ad2ef8d9aa7..d12940d0ec3 100644
--- a/app/models/katello/concerns/http_proxy_extensions.rb
+++ b/app/models/katello/concerns/http_proxy_extensions.rb
@@ -84,6 +84,10 @@ def name_and_url
         uri.user = nil
         "#{name} (#{uri})"
       end
+
+      def content_default_http_proxy?
+        Setting[:content_default_http_proxy] == name
+      end
     end
   end
 end
diff --git a/app/views/katello/api/v2/http_proxies/show.json.rabl b/app/views/katello/api/v2/http_proxies/show.json.rabl
new file mode 100644
index 00000000000..9e41a1adf72
--- /dev/null
+++ b/app/views/katello/api/v2/http_proxies/show.json.rabl
@@ -0,0 +1 @@
+node(:content_default_http_proxy) { |sp| sp.content_default_http_proxy? }
diff --git a/app/views/overrides/http_proxies/_update_setting_input.html.erb b/app/views/overrides/http_proxies/_update_setting_input.html.erb
index a9141f4bcde..991456abc43 100644
--- a/app/views/overrides/http_proxies/_update_setting_input.html.erb
+++ b/app/views/overrides/http_proxies/_update_setting_input.html.erb
@@ -1,16 +1,18 @@
-<% if @http_proxy.new_record? %>
-  <div class="clearfix">
-    <div class="form-group ">
-      <label class="col-md-2 control-label" for="http_proxy_default_content">
-        Default content HTTP proxy
-      </label>
-      <div class="col-md-4">
-        <%= check_box_tag 'http_proxy[default_content]',
-                          '1',
-                          params.dig('http_proxy', 'default_content') == '1',
-                          id: 'http_proxy_default_content' %>
-        Set this proxy as the default for content, updating the 'Default HTTP Proxy' setting.
-      </div>
+<div class="clearfix">
+  <div class="form-group ">
+    <label class="col-md-2 control-label" for="http_proxy_content_default_http_proxy">
+      Default content HTTP proxy
+    </label>
+    <div class="col-md-4">
+    <% if @http_proxy.new_record? %>
+      <%= check_box_tag 'http_proxy[content_default_http_proxy]',
+                        '1',
+                        params.dig('http_proxy', 'content_default_http_proxy') == '1',
+                        id: 'content_default_http_proxy' %>
+      Set this proxy as the default for content, updating the 'Default HTTP Proxy' setting.
+    <% else %>
+      <%= @http_proxy.content_default_http_proxy? ? _('Yes') : _('No') %>
+    <% end %>
     </div>
   </div>
-<% end %>
+</div>
diff --git a/lib/katello/plugin.rb b/lib/katello/plugin.rb
index 15001859612..aeda28a33f2 100644
--- a/lib/katello/plugin.rb
+++ b/lib/katello/plugin.rb
@@ -300,6 +300,7 @@
   extend_rabl_template 'api/v2/hosts/show', 'katello/api/v2/hosts/show'
   extend_rabl_template 'api/v2/hosts/show', 'katello/api/v2/hosts/os_attributes'
   extend_rabl_template 'api/v2/hosts/index', 'katello/api/v2/hosts/os_attributes'
+  extend_rabl_template 'api/v2/http_proxies/show', 'katello/api/v2/http_proxies/show'
 
   # Katello variables for Host Registration
   extend_allowed_registration_vars :activation_keys

From 2053361665c65451aae0eab6f49c57f0d9a7b5ac Mon Sep 17 00:00:00 2001
From: Samir Jha <samirjha1525@gmail.com>
Date: Wed, 15 Jan 2025 09:39:04 -0500
Subject: [PATCH 23/29] Fixes #38105 - Filter flatpak index to only show host's
 faltapks (#11251)

---
 .../registry/registry_proxies_controller.rb   | 22 ++++++++++++++++++-
 config/routes/api/registry.rb                 |  1 +
 .../permissions/registry_permissions.rb       |  1 +
 3 files changed, 23 insertions(+), 1 deletion(-)

diff --git a/app/controllers/katello/api/registry/registry_proxies_controller.rb b/app/controllers/katello/api/registry/registry_proxies_controller.rb
index f224f725e49..965ca134a8a 100644
--- a/app/controllers/katello/api/registry/registry_proxies_controller.rb
+++ b/app/controllers/katello/api/registry/registry_proxies_controller.rb
@@ -5,7 +5,7 @@ class Api::Registry::RegistryProxiesController < Api::V2::ApiController
     before_action :confirm_settings
     skip_before_action :authorize
     before_action :optional_authorize, only: [:token, :catalog]
-    before_action :registry_authorize, except: [:token, :v1_search, :catalog]
+    before_action :registry_authorize, except: [:token, :v1_search, :catalog, :static_index]
     before_action :authorize_repository_read, only: [:pull_manifest, :tags_list, :check_blob, :pull_blob]
     before_action :container_push_prop_validation, only: [:start_upload_blob, :upload_blob, :finish_upload_blob, :push_manifest]
     before_action :create_container_repo_if_needed, only: [:start_upload_blob, :upload_blob, :finish_upload_blob, :push_manifest]
@@ -806,5 +806,25 @@ def render_podman_error(code, message, status = :bad_request)
     def item_not_found(item)
       render_podman_error("NAME_UNKNOWN", _("%s was not found!") % item, :not_found)
     end
+
+    def static_index
+      host_ip = request.remote_ip
+      host = ::Host.joins(:primary_interface).where("nics.ip = :host_ip OR nics.ip6 = :host_ip", host_ip: host_ip)&.first
+      flatpak_index = (redirect_client { Resources::Registry::Proxy.get(@_request.fullpath, headers) })
+      flatpak_index_json = JSON.parse(flatpak_index)
+      # Filter out repositories if it's a registered host
+      if host&.content_view_environments&.any?
+        # host.update(flatpak_index: flatpak_index) Will this help??
+        repos = host.content_view_environments.flat_map do |cve|
+          cve.content_view_version.repositories
+        end
+        available_container_repo_names = repos.map(&:container_repository_name)
+        flatpak_index_json['Results'] = flatpak_index_json['Results'].select do |result|
+          available_container_repo_names.include?(result['Name'])
+        end
+      end
+      # Otherwise just return unfiltered pulp flatpak index
+      render json: flatpak_index_json
+    end
   end
 end
diff --git a/config/routes/api/registry.rb b/config/routes/api/registry.rb
index e4a365ed80a..d5ff6ec475d 100644
--- a/config/routes/api/registry.rb
+++ b/config/routes/api/registry.rb
@@ -19,6 +19,7 @@ class ActionDispatch::Routing::Mapper
       match '/v2' => 'registry_proxies#ping', :via => :get
       match '/v1/_ping' => 'registry_proxies#v1_ping', :via => :get
       match '/v1/search' => 'registry_proxies#v1_search', :via => :get
+      match '/index/static' => 'registry_proxies#static_index', :via => :get
     end
   end
 end
diff --git a/lib/katello/permissions/registry_permissions.rb b/lib/katello/permissions/registry_permissions.rb
index 40119b16d31..223ffbd8584 100644
--- a/lib/katello/permissions/registry_permissions.rb
+++ b/lib/katello/permissions/registry_permissions.rb
@@ -14,4 +14,5 @@
   'katello/api/registry/registry_proxies/start_upload_blob',
   'katello/api/registry/registry_proxies/upload_blob',
   'katello/api/registry/registry_proxies/finish_upload_blob',
+  'katello/api/registry/registry_proxies/static_index',
 ]

From ea0409b1d46482db15e72e69c943ececa5396e15 Mon Sep 17 00:00:00 2001
From: Samir Jha <samirjha1525@gmail.com>
Date: Wed, 15 Jan 2025 15:49:43 -0500
Subject: [PATCH 24/29] Fixes #38109 - As a user, I want to install flatpaks on
 remote hosts (#11264)

---
 .../foreman/job_templates/flatpak_install.erb | 23 ++++++++++++++
 .../job_templates/flatpak_login_action.erb    | 30 +++++++++++++++++++
 .../foreman/job_templates/flatpak_setup.erb   | 27 +++++++++++++++++
 3 files changed, 80 insertions(+)
 create mode 100644 app/views/foreman/job_templates/flatpak_install.erb
 create mode 100644 app/views/foreman/job_templates/flatpak_login_action.erb
 create mode 100644 app/views/foreman/job_templates/flatpak_setup.erb

diff --git a/app/views/foreman/job_templates/flatpak_install.erb b/app/views/foreman/job_templates/flatpak_install.erb
new file mode 100644
index 00000000000..f461ce663d2
--- /dev/null
+++ b/app/views/foreman/job_templates/flatpak_install.erb
@@ -0,0 +1,23 @@
+<%#
+kind: job_template
+name: Install Flatpak application on host
+job_category: Katello
+description_format: 'Install Flatpak application %{Application name} on host'
+provider_type: script
+template_inputs:
+- name: Flatpak remote name
+  description: Name of remote to use on host
+  input_type: user
+  required: false
+- name: Application name
+  description: Name of the application to install
+  input_type: user
+  required: true
+%>
+
+<%
+  remote_name = input('Flatpak remote name')
+  app_name = input('Application name')
+%>
+
+sudo dbus-launch flatpak install <%= remote_name %> <%= app_name %> --assumeyes
\ No newline at end of file
diff --git a/app/views/foreman/job_templates/flatpak_login_action.erb b/app/views/foreman/job_templates/flatpak_login_action.erb
new file mode 100644
index 00000000000..407b52d25db
--- /dev/null
+++ b/app/views/foreman/job_templates/flatpak_login_action.erb
@@ -0,0 +1,30 @@
+<%#
+kind: job_template
+name: Login to flatpak registry via podman
+job_category: Katello
+description_format: 'Login to flatpak registry via podman'
+provider_type: script
+template_inputs:
+- name: Flatpak registry URL
+  description: URL of server/capsule
+  input_type: user
+  required: true
+- name: Username
+  description: Username for container registry login
+  input_type: user
+  required: true
+- name: Password
+  description: Password/Access token for container registry login
+  input_type: user
+  required: true
+  hidden_value: true
+%>
+
+<%
+  server_url = input('Flatpak registry URL')
+  username = input('Username')
+  password = input('Password')
+%>
+
+sudo podman login <%= server_url %> --username <%= username %> --password <%= password %>
+sudo cp /run/containers/0/auth.json /etc/flatpak/oci-auth.json
\ No newline at end of file
diff --git a/app/views/foreman/job_templates/flatpak_setup.erb b/app/views/foreman/job_templates/flatpak_setup.erb
new file mode 100644
index 00000000000..d4d5d9deaa1
--- /dev/null
+++ b/app/views/foreman/job_templates/flatpak_setup.erb
@@ -0,0 +1,27 @@
+<%#
+kind: job_template
+name: Set up Flatpak remote on host
+job_category: Katello
+description_format: 'Set up Flatpak remote on host'
+provider_type: script
+template_inputs:
+- name: Remote Name
+  description: Remote name for Flatpak
+  input_type: user
+  required: true
+- name: Flatpak registry URL
+  description: URL of server/capsule
+  input_type: user
+  required: true
+foreign_input_sets:
+- template: Login to flatpak registry via podman
+  exclude: Flatpak registry URL
+%>
+
+<%
+  remote_name = input('Remote Name')
+  registry_url = input('Flatpak registry URL')
+%>
+
+sudo flatpak remote-add --authenticator-name=org.flatpak.Authenticator.Oci <%= remote_name %> oci+<%= registry_url %>/
+<%= render_template('Login to flatpak registry via podman', 'Flatpak registry URL': registry_url) %>
\ No newline at end of file

From d041f949beb8d5c30eb5f3005ffe3ac1d1721987 Mon Sep 17 00:00:00 2001
From: Markus Bucher <bucher@atix.de>
Date: Tue, 3 Dec 2024 17:16:38 +0100
Subject: [PATCH 25/29] Fixes #38076 - Sanitize content_view repository_ids
 param

---
 app/controllers/katello/api/v2/content_views_controller.rb | 5 ++++-
 test/controllers/api/v2/content_views_controller_test.rb   | 4 ++--
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/app/controllers/katello/api/v2/content_views_controller.rb b/app/controllers/katello/api/v2/content_views_controller.rb
index a182c1eaa48..197ab139c59 100644
--- a/app/controllers/katello/api/v2/content_views_controller.rb
+++ b/app/controllers/katello/api/v2/content_views_controller.rb
@@ -288,7 +288,10 @@ def view_params
       if (!@content_view || !@content_view.composite?)
         attrs.push({:repository_ids => []}, :repository_ids)
       end
-      params.require(:content_view).permit(*attrs).to_h
+      result = params.require(:content_view).permit(*attrs).to_h
+      # sanitize repository_ids to be a list of integers
+      result[:repository_ids] = result[:repository_ids].compact.map(&:to_i) if result[:repository_ids].present?
+      result
     end
 
     def find_environment
diff --git a/test/controllers/api/v2/content_views_controller_test.rb b/test/controllers/api/v2/content_views_controller_test.rb
index 98cc4e1300e..14bbfca2e87 100644
--- a/test/controllers/api/v2/content_views_controller_test.rb
+++ b/test/controllers/api/v2/content_views_controller_test.rb
@@ -243,8 +243,8 @@ def test_update_repositories_strings
 
       params = { :repository_ids => [repository.id.to_s] }
       assert_sync_task(::Actions::Katello::ContentView::Update) do |_content_view, content_view_params|
-        assert_equal content_view_params.key?(:repository_ids), true
-        assert_equal content_view_params[:repository_ids], params[:repository_ids]
+        assert content_view_params.key?(:repository_ids)
+        assert_equal [repository.id], content_view_params[:repository_ids]
       end
       put :update, params: { :id => @library_dev_staging_view.id, :content_view => params }
 

From fcd6cdb830fe3a77c342752203cd2f9af618c688 Mon Sep 17 00:00:00 2001
From: Lucas <116588+hairmare@users.noreply.github.com>
Date: Fri, 20 Dec 2024 20:23:35 +0100
Subject: [PATCH 26/29] Fixes #38137 - Do not double-escape * during package
 update

---
 ...pdate_packages_by_search_query_-_katello_ansible_default.erb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/views/foreman/job_templates/update_packages_by_search_query_-_katello_ansible_default.erb b/app/views/foreman/job_templates/update_packages_by_search_query_-_katello_ansible_default.erb
index 855b1c4b270..0cd69d31ef3 100644
--- a/app/views/foreman/job_templates/update_packages_by_search_query_-_katello_ansible_default.erb
+++ b/app/views/foreman/job_templates/update_packages_by_search_query_-_katello_ansible_default.erb
@@ -22,7 +22,7 @@ template_inputs:
   versions: input('Selected update versions')
 ) -%>
 <% if package_names.empty? -%>
-<%= render_template('Package Action - Ansible Default', :state => 'latest', :name => '"*"') %>
+<%= render_template('Package Action - Ansible Default', :state => 'latest', :name => '*') %>
 <% else -%>
 ---
 - hosts: all

From 0f63d27fbd3cacfe7c77067c5b21f6f28d9631fa Mon Sep 17 00:00:00 2001
From: Lucy Fu <lufu@redhat.com>
Date: Wed, 15 Jan 2025 13:38:02 -0500
Subject: [PATCH 27/29] Refs #38127 - Add sort options to host bootc_images
 endpoint

---
 .../katello/api/v2/host_bootc_images_controller.rb   | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

diff --git a/app/controllers/katello/api/v2/host_bootc_images_controller.rb b/app/controllers/katello/api/v2/host_bootc_images_controller.rb
index 3aaab688841..d3a11566502 100644
--- a/app/controllers/katello/api/v2/host_bootc_images_controller.rb
+++ b/app/controllers/katello/api/v2/host_bootc_images_controller.rb
@@ -23,7 +23,17 @@ def bootc_images
       bootc_image_map = bootc_host_image_map
       paged_images = bootc_image_map.to_a.paginate(page: page, per_page: per_page)
       results = paged_images.collect { |image| { bootc_booted_image: image[0], digests: image[1] } }
-      render json: { total: bootc_image_map.size, page: page, per_page: per_page, subtotal: bootc_image_map.size, results: results}
+      render json: {
+        total: bootc_image_map.size,
+        page: page,
+        per_page: per_page,
+        subtotal: bootc_image_map.size,
+        sort: {
+          by: params[:sort_by],
+          order: params[:sort_order],
+        },
+        results: results,
+      }
     end
 
     private

From dfa1ec8b2d28bb2ea0498308b3801f51fcdb2d76 Mon Sep 17 00:00:00 2001
From: Ian Ballou <ianballou67@gmail.com>
Date: Fri, 17 Jan 2025 17:11:01 -0500
Subject: [PATCH 28/29] Fixes #38128 - allow blank image mode digests (#11275)

---
 app/models/katello/host/content_facet.rb             | 2 +-
 test/models/concerns/host_managed_extensions_test.rb | 7 +++++++
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/app/models/katello/host/content_facet.rb b/app/models/katello/host/content_facet.rb
index ae25d2fd1e9..0fdea8d25eb 100644
--- a/app/models/katello/host/content_facet.rb
+++ b/app/models/katello/host/content_facet.rb
@@ -59,7 +59,7 @@ class ContentFacet < Katello::Model
       validates_associated :content_view_environment_content_facets, :message => _("invalid: The content source must sync the lifecycle environment assigned to the host. See the logs for more information.")
       validates :host, :presence => true, :allow_blank => false
       validates :bootc_booted_digest, :bootc_available_digest, :bootc_staged_digest, :bootc_rollback_digest,
-                format: { with: /\Asha256:[A-Fa-f0-9]{64}\z/, message: "must be a valid sha256 digest", allow_nil: true }
+                format: { with: /\Asha256:[A-Fa-f0-9]{64}\z/, message: "must be a valid sha256 digest", allow_blank: true }
 
       scope :with_environments, ->(lifecycle_environments) do
         joins(:content_view_environment_content_facets => :content_view_environment).
diff --git a/test/models/concerns/host_managed_extensions_test.rb b/test/models/concerns/host_managed_extensions_test.rb
index ae6227ea8a3..89c3219c327 100644
--- a/test/models/concerns/host_managed_extensions_test.rb
+++ b/test/models/concerns/host_managed_extensions_test.rb
@@ -70,6 +70,13 @@ def test_pools_expiring_in_days
       assert_includes ::Host.search_for('pools_expiring_in_days = 30'), host_with_pool
     end
 
+    def test_bootc_allow_blank
+      Support::HostSupport.attach_content_facet(@foreman_host, @view, @library)
+      @foreman_host.content_facet.update(bootc_booted_image: 'quay.io/salami/soup')
+      @foreman_host.content_facet.update(bootc_booted_digest: '')
+      assert @foreman_host.content_facet.image_mode_host?
+    end
+
     def test_image_mode_search
       host_no_image = FactoryBot.create(:host, :with_content, :with_subscription, :content_view => @library_view, :lifecycle_environment => @library)
       Support::HostSupport.attach_content_facet(@foreman_host, @view, @library)

From 4b9bac94930a1c6fa04ec9b51555dc8d0756add9 Mon Sep 17 00:00:00 2001
From: Jeremy Lenz <jlenz@redhat.com>
Date: Mon, 20 Jan 2025 10:25:01 -0500
Subject: [PATCH 29/29] Fixes #38143 - Add hint to error message about MultiCV
 (#11278)

---
 app/models/katello/activation_key.rb     | 2 +-
 app/models/katello/host/content_facet.rb | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/models/katello/activation_key.rb b/app/models/katello/activation_key.rb
index 571f2e57b2d..4666df4d71d 100644
--- a/app/models/katello/activation_key.rb
+++ b/app/models/katello/activation_key.rb
@@ -92,7 +92,7 @@ def self.in_environments(envs)
     def content_view_environments=(new_cves)
       if new_cves.length > 1 && !Setting['allow_multiple_content_views']
         fail ::Katello::Errors::MultiEnvironmentNotSupportedError,
-        _("Assigning an activation key to multiple content view environments is not enabled.")
+        _("Assigning an activation key to multiple content view environments is not enabled. To enable, set the allow_multiple_content_views setting.")
       end
       super(new_cves)
       Katello::ContentViewEnvironmentActivationKey.reprioritize_for_activation_key(self, new_cves)
diff --git a/app/models/katello/host/content_facet.rb b/app/models/katello/host/content_facet.rb
index 0fdea8d25eb..353c010c2a7 100644
--- a/app/models/katello/host/content_facet.rb
+++ b/app/models/katello/host/content_facet.rb
@@ -136,7 +136,7 @@ def single_lifecycle_environment
       def content_view_environments=(new_cves)
         if new_cves.length > 1 && !Setting['allow_multiple_content_views']
           fail ::Katello::Errors::MultiEnvironmentNotSupportedError,
-          _("Assigning a host to multiple content view environments is not enabled.")
+          _("Assigning a host to multiple content view environments is not enabled. To enable, set the allow_multiple_content_views setting.")
         end
         super(new_cves)
         Katello::ContentViewEnvironmentContentFacet.reprioritize_for_content_facet(self, new_cves)