katello 4.14.1 → 4.14.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: eb838f1316844984ac6a811415ee7ffd5b91c7e4b968b96de55b0bf3adf1f0b7
-  data.tar.gz: b8158bfab87d2e3cbe687af69e65962a8627bc78516f6f20b190864854eee4e3
+  metadata.gz: bdd67a5d3169bbda126588bc123ac23ad95514e886fd546d212c149f5a62f7b8
+  data.tar.gz: 4b5681c673e1ecb65a71796ef5b493380363345336100efdf55a06ae818bf708
 SHA512:
-  metadata.gz: e2e57134ff21bfaffb6bd31b2954adad011b6cb63991e66a2ca54d08f596b63c061177049402aa9831e8407ef2d7006f0b2d536892757c69e5cc5f716cdff687
-  data.tar.gz: f2badc68f6c7b3638fb076e2cabeca5a60c073fffee6d6a7c6e2f886a906085adc5d54fc5babc44280f00a1a1e5e7a188b25b7de64a359ead41950b9ec289367
+  metadata.gz: d1834fc21b5fe071b50fb04837dd361f8d5dbe49155a3bfc195151ac1a3c7154dc426d25cd83cbd6e2d90c3d89135068ca79c5ce032e65ad29cccad57af3527b
+  data.tar.gz: 25fb6125c429eea841b1f1c4be625a4f51268ef126a3122f7357104721aa883d8a38cfb958565a642c7c6edf52b59119a0ded847063b9012ee92476890faa887

data/app/controllers/katello/api/v2/activation_keys_controller.rb

@@ -19,8 +19,8 @@ module Katello
     api :GET, "/environments/:environment_id/activation_keys"
     api :GET, "/organizations/:organization_id/activation_keys"
     param :organization_id, :number, :desc => N_("organization identifier"), :required => true
-    param :environment_id, :number, :desc => N_("environment identifier")
-    param :content_view_id, :number, :desc => N_("content view identifier")
+    param :environment_id, :number, :desc => N_("environment identifier"), :allow_nil => true
+    param :content_view_id, :number, :desc => N_("content view identifier"), :allow_nil => true
     param :name, String, :desc => N_("activation key name to filter by")
     param_group :search, Api::V2::ApiController
     add_scoped_search_description_for(ActivationKey)

data/app/lib/actions/katello/repository/destroy.rb

@@ -70,11 +70,7 @@ module Actions
           # Remove products from ACS's that contain no repositories which both
           # match the ACS content type and have a non-nil URL
           product = repository.product
-          repo_content_types = Set.new
-          product.repositories.each do |test_repo|
-            # we need to check id because test_repo will still contain the old, non-nil url
-            repo_content_types.add(test_repo.content_type) if (repository.id != test_repo.id) && test_repo.url.present?
-          end
+          repo_content_types = ::Katello::RootRepository.where(:id => product.repositories.where.not(:id => repository.id).select(:root_id)).where.not(:url => [nil, '']).distinct.pluck(:content_type)
           ::Katello::AlternateContentSource.with_products(product).each do |acs|
             unless repo_content_types.include?(acs.content_type)
               acs.products = acs.products - [product]

data/app/lib/actions/katello/repository/update.rb

@@ -91,11 +91,7 @@ module Actions
           # Remove products from ACS's that contain no repositories which both
           # match the ACS content type and have a non-nil URL
           product = repository.product
-          repo_content_types = Set.new
-          product.acs_compatible_repositories.each do |test_repo|
-            # we need to check id because test_repo will still contain the old, non-nil url
-            repo_content_types.add(test_repo.content_type) if (repository.id != test_repo.id) && test_repo.url.present?
-          end
+          repo_content_types = ::Katello::RootRepository.where(:id => product.repositories.where.not(:id => repository.id).select(:root_id)).where.not(:url => [nil, '']).distinct.pluck(:content_type)
           ::Katello::AlternateContentSource.with_products(product).each do |acs|
             unless repo_content_types.include?(acs.content_type)
               acs.products = acs.products - [product]

data/app/models/katello/concerns/content_facet_host_extensions.rb

@@ -79,22 +79,14 @@ module Katello
       module ClassMethods
         def find_by_applicable_errata(_key, operator, value)
           conditions = sanitize_sql_for_conditions(["#{Katello::Erratum.table_name}.errata_id #{operator} ?", value_to_sql(operator, value)])
-          hosts = ::Host::Managed.joins(:applicable_errata).where(conditions)
-          if hosts.empty?
-            { :conditions => "1=0" }
-          else
-            { :conditions => "#{::Host::Managed.table_name}.id IN (#{hosts.pluck(:id).join(',')})" }
-          end
+          hosts = ::Host::Managed.joins(:applicable_errata).select(:id).where(conditions)
+          { :conditions => "#{::Host::Managed.table_name}.id IN (#{hosts.to_sql})" }
         end
 
         def find_by_installable_errata(_key, operator, value)
           conditions = sanitize_sql_for_conditions(["#{Katello::Erratum.table_name}.errata_id #{operator} ?", value_to_sql(operator, value)])
-          facets = Katello::Host::ContentFacet.joins_installable_errata.where(conditions)
-          if facets.empty?
-            { :conditions => "1=0" }
-          else
-            { :conditions => "#{::Host::Managed.table_name}.id IN (#{facets.pluck(:host_id).join(',')})" }
-          end
+          facets = Katello::Host::ContentFacet.joins_installable_errata.select(:host_id).where(conditions)
+          { :conditions => "#{::Host::Managed.table_name}.id IN (#{facets.to_sql})" }
         end
 
         def find_by_applicable_debs(_key, operator, value)
@@ -117,42 +109,26 @@ module Katello
 
         def find_by_applicable_rpms(_key, operator, value)
           conditions = sanitize_sql_for_conditions(["#{Katello::Rpm.table_name}.nvra #{operator} ?", value_to_sql(operator, value)])
-          hosts = ::Host::Managed.joins(:applicable_rpms).where(conditions)
-          if hosts.empty?
-            { :conditions => "1=0" }
-          else
-            { :conditions => "#{::Host::Managed.table_name}.id IN (#{hosts.pluck(:id).join(',')})" }
-          end
+          hosts = ::Host::Managed.joins(:applicable_rpms).select(:id).where(conditions)
+          { :conditions => "#{::Host::Managed.table_name}.id IN (#{hosts.to_sql})" }
         end
 
         def find_by_installable_rpms(_key, operator, value)
           conditions = sanitize_sql_for_conditions(["#{Katello::Rpm.table_name}.nvra #{operator} ?", value_to_sql(operator, value)])
-          facets = Katello::Host::ContentFacet.joins_installable_rpms.where(conditions)
-          if facets.empty?
-            { :conditions => "1=0" }
-          else
-            { :conditions => "#{::Host::Managed.table_name}.id IN (#{facets.pluck(:host_id).join(',')})" }
-          end
+          facets = Katello::Host::ContentFacet.joins_installable_rpms.select(:host_id).where(conditions)
+          { :conditions => "#{::Host::Managed.table_name}.id IN (#{facets.to_sql})" }
         end
 
         def find_by_repository_content_label(_key, operator, value)
           conditions = sanitize_sql_for_conditions(["#{Katello::Content.table_name}.label #{operator} ?", value_to_sql(operator, value)])
-          facets = Katello::Host::ContentFacet.joins_repositories.where(conditions)
-          if facets.empty?
-            { :conditions => "1=0" }
-          else
-            { :conditions => "#{::Host::Managed.table_name}.id IN (#{facets.pluck(:host_id).join(',')})" }
-          end
+          facets = Katello::Host::ContentFacet.joins_repositories.select(:host_id).where(conditions)
+          { :conditions => "#{::Host::Managed.table_name}.id IN (#{facets.to_sql})" }
         end
 
         def find_by_repository_name(_key, operator, value)
           conditions = sanitize_sql_for_conditions(["#{Katello::RootRepository.table_name}.name #{operator} ?", value_to_sql(operator, value)])
-          facets = Katello::Host::ContentFacet.joins_repositories.where(conditions)
-          if facets.empty?
-            { :conditions => "1=0" }
-          else
-            { :conditions => "#{::Host::Managed.table_name}.id IN (#{facets.pluck(:host_id).join(',')})" }
-          end
+          facets = Katello::Host::ContentFacet.joins_repositories.select(:host_id).where(conditions)
+          { :conditions => "#{::Host::Managed.table_name}.id IN (#{facets.to_sql})" }
         end
 
         def in_content_view_environments(content_views: nil, lifecycle_environments: nil)

data/lib/katello/version.rb

@@ -1,3 +1,3 @@
 module Katello
-  VERSION = "4.14.1".freeze
+  VERSION = "4.14.2".freeze
 end

data/webpack/redux/actions/RedHatRepositories/helpers.js

@@ -28,15 +28,15 @@ const recommendedRepositoriesSatTools = [
   'satellite-client-6-for-rhel-9-x86_64-rpms',
   'satellite-client-6-for-rhel-8-x86_64-rpms',
   'rhel-7-server-els-satellite-client-6-rpms',
-  'rhel-7-server-els-satellite-6-client-2-rpms',
-  'satellite-6-client-2-for-rhel-8-x86_64-rpms',
-  'satellite-6-client-2-for-rhel-9-x86_64-rpms',
 ];
 
 const recommendedRepositoriesMisc = [
-  'satellite-capsule-6.15-for-rhel-8-x86_64-rpms',
-  'satellite-maintenance-6.15-for-rhel-8-x86_64-rpms',
-  'satellite-utils-6.15-for-rhel-8-x86_64-rpms',
+  'satellite-capsule-6.16-for-rhel-8-x86_64-rpms',
+  'satellite-maintenance-6.16-for-rhel-8-x86_64-rpms',
+  'satellite-utils-6.16-for-rhel-8-x86_64-rpms',
+  'satellite-utils-6.16-for-rhel-9-x86_64-rpms',
+  'satellite-maintenance-6.16-for-rhel-9-x86_64-rpms',
+  'satellite-capsule-6.16-for-rhel-9-x86_64-rpms',
 ];
 
 const recommendedRepositorySetLables = recommendedRepositoriesRHEL

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: katello
 version: !ruby/object:Gem::Version
-  version: 4.14.1
+  version: 4.14.2
 platform: ruby
 authors:
 - N/A
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-11-04 00:00:00.000000000 Z
+date: 2024-12-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -4387,55 +4387,103 @@ files:
 - locale/Makefile
 - locale/README
 - locale/action_names.rb
+- locale/bn/LC_MESSAGES/katello.mo
 - locale/bn/katello.po
+- locale/bn_IN/LC_MESSAGES/katello.mo
 - locale/bn_IN/katello.po
+- locale/ca/LC_MESSAGES/katello.mo
 - locale/ca/katello.po
+- locale/cs/LC_MESSAGES/katello.mo
 - locale/cs/katello.po
+- locale/cs_CZ/LC_MESSAGES/katello.mo
 - locale/cs_CZ/katello.po
+- locale/de/LC_MESSAGES/katello.mo
 - locale/de/katello.po
+- locale/de_AT/LC_MESSAGES/katello.mo
 - locale/de_AT/katello.po
+- locale/de_DE/LC_MESSAGES/katello.mo
 - locale/de_DE/katello.po
+- locale/el/LC_MESSAGES/katello.mo
 - locale/el/katello.po
+- locale/en/LC_MESSAGES/katello.mo
 - locale/en/katello.po
+- locale/en_GB/LC_MESSAGES/katello.mo
 - locale/en_GB/katello.po
+- locale/en_US/LC_MESSAGES/katello.mo
 - locale/en_US/katello.po
+- locale/es/LC_MESSAGES/katello.mo
 - locale/es/katello.po
+- locale/et_EE/LC_MESSAGES/katello.mo
 - locale/et_EE/katello.po
+- locale/fr/LC_MESSAGES/katello.mo
 - locale/fr/katello.po
+- locale/gl/LC_MESSAGES/katello.mo
 - locale/gl/katello.po
+- locale/gu/LC_MESSAGES/katello.mo
 - locale/gu/katello.po
+- locale/he_IL/LC_MESSAGES/katello.mo
 - locale/he_IL/katello.po
+- locale/hi/LC_MESSAGES/katello.mo
 - locale/hi/katello.po
+- locale/id/LC_MESSAGES/katello.mo
 - locale/id/katello.po
+- locale/it/LC_MESSAGES/katello.mo
 - locale/it/katello.po
+- locale/ja/LC_MESSAGES/katello.mo
 - locale/ja/katello.po
+- locale/ka/LC_MESSAGES/katello.mo
 - locale/ka/katello.po
 - locale/katello.pot
+- locale/kn/LC_MESSAGES/katello.mo
 - locale/kn/katello.po
+- locale/ko/LC_MESSAGES/katello.mo
 - locale/ko/katello.po
+- locale/ml_IN/LC_MESSAGES/katello.mo
 - locale/ml_IN/katello.po
+- locale/mr/LC_MESSAGES/katello.mo
 - locale/mr/katello.po
+- locale/nl_NL/LC_MESSAGES/katello.mo
 - locale/nl_NL/katello.po
+- locale/or/LC_MESSAGES/katello.mo
 - locale/or/katello.po
+- locale/pa/LC_MESSAGES/katello.mo
 - locale/pa/katello.po
+- locale/pl/LC_MESSAGES/katello.mo
 - locale/pl/katello.po
+- locale/pl_PL/LC_MESSAGES/katello.mo
 - locale/pl_PL/katello.po
+- locale/pt/LC_MESSAGES/katello.mo
 - locale/pt/katello.po
+- locale/pt_BR/LC_MESSAGES/katello.mo
 - locale/pt_BR/katello.po
+- locale/ro/LC_MESSAGES/katello.mo
 - locale/ro/katello.po
+- locale/ro_RO/LC_MESSAGES/katello.mo
 - locale/ro_RO/katello.po
+- locale/ru/LC_MESSAGES/katello.mo
 - locale/ru/katello.po
+- locale/sl/LC_MESSAGES/katello.mo
 - locale/sl/katello.po
+- locale/sv_SE/LC_MESSAGES/katello.mo
 - locale/sv_SE/katello.po
+- locale/ta/LC_MESSAGES/katello.mo
 - locale/ta/katello.po
+- locale/ta_IN/LC_MESSAGES/katello.mo
 - locale/ta_IN/katello.po
+- locale/te/LC_MESSAGES/katello.mo
 - locale/te/katello.po
+- locale/tr/LC_MESSAGES/katello.mo
 - locale/tr/katello.po
 - locale/update-i18n
+- locale/vi/LC_MESSAGES/katello.mo
 - locale/vi/katello.po
+- locale/vi_VN/LC_MESSAGES/katello.mo
 - locale/vi_VN/katello.po
+- locale/zh/LC_MESSAGES/katello.mo
 - locale/zh/katello.po
+- locale/zh_CN/LC_MESSAGES/katello.mo
 - locale/zh_CN/katello.po
+- locale/zh_TW/LC_MESSAGES/katello.mo
 - locale/zh_TW/katello.po
 - package.json
 - vendor/assets/images/katello/add2.png