katello 4.18.0 → 4.18.1

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

@@ -43,52 +43,74 @@ module Katello
 
     private
 
-    def find_export_view_helper(name_importable, name_syncable, organization, generated_for_importable, generated_for_syncable)
+    def find_library_export_view
       if params[:from_history_id].present?
         find_incremental_history_from_id
         @view = @history&.content_view_version&.content_view
       else
-        importable_result = nil
-        syncable_result = nil
-        unless params[:format].present? && params[:format] == ::Katello::Pulp3::ContentViewVersion::Export::SYNCABLE
-          importable_result = determine_view_from_name(name_importable,
-          organization,
-          generated_for_importable)
+        # Determine format for finding existing view
+        format = params[:format] || ::Katello::Pulp3::ContentViewVersion::Export::UNDEFINED
+
+        # Try to find existing views based on format
+        views = []
+        if format != ::Katello::Pulp3::ContentViewVersion::Export::SYNCABLE
+          importable_view = ::Katello::Pulp3::ContentViewVersion::Export.find_export_view(
+            destination_server: params[:destination_server],
+            organization: @organization,
+            name: ::Katello::ContentView::EXPORT_LIBRARY,
+            generated_for: :library_export
+          )
+          views << importable_view if importable_view
         end
-        unless params[:format].present? && params[:format] == ::Katello::Pulp3::ContentViewVersion::Export::IMPORTABLE
-          syncable_result = determine_view_from_name(name_syncable,
-          organization,
-          generated_for_syncable)
+
+        if format != ::Katello::Pulp3::ContentViewVersion::Export::IMPORTABLE
+          syncable_view = ::Katello::Pulp3::ContentViewVersion::Export.find_export_view(
+            destination_server: params[:destination_server],
+            organization: @organization,
+            name: "#{::Katello::ContentView::EXPORT_LIBRARY}-SYNCABLE",
+            generated_for: :library_export_syncable
+          )
+          views << syncable_view if syncable_view
         end
-        @view = [importable_result, syncable_result].compact.max_by(&:updated_at)
+
+        @view = views.compact.max_by(&:updated_at)
       end
       check_for_blank_view
     end
 
-    def find_library_export_view
-      find_export_view_helper(
-        ::Katello::ContentView::EXPORT_LIBRARY,
-        "#{::Katello::ContentView::EXPORT_LIBRARY}-SYNCABLE",
-        @organization,
-        :library_export,
-        :library_export_syncable
-      )
-    end
-
     def find_repository_export_view
-      find_export_view_helper(
-        "Export-#{@repository.label}-#{@repository.library_instance_or_self.id}",
-        "Export-SYNCABLE-#{@repository.label}-#{@repository.library_instance_or_self.id}",
-        @repository.organization,
-        :repository_export,
-        :repository_export_syncable
-      )
-    end
+      if params[:from_history_id].present?
+        find_incremental_history_from_id
+        @view = @history&.content_view_version&.content_view
+      else
+        # Determine format for finding existing view
+        format = params[:format] || ::Katello::Pulp3::ContentViewVersion::Export::UNDEFINED
+
+        # Try to find existing views based on format
+        views = []
+        if format != ::Katello::Pulp3::ContentViewVersion::Export::SYNCABLE
+          importable_view = ::Katello::Pulp3::ContentViewVersion::Export.find_export_view(
+            destination_server: nil,
+            organization: @repository.organization,
+            name: "Export-#{@repository.label}-#{@repository.library_instance_or_self.id}",
+            generated_for: :repository_export
+          )
+          views << importable_view if importable_view
+        end
 
-    def determine_view_from_name(name, organization, generated_for)
-      ::Katello::ContentView.where(name: name,
-                                   organization: organization,
-                                   generated_for: generated_for).first
+        if format != ::Katello::Pulp3::ContentViewVersion::Export::IMPORTABLE
+          syncable_view = ::Katello::Pulp3::ContentViewVersion::Export.find_export_view(
+            destination_server: nil,
+            organization: @repository.organization,
+            name: "Export-SYNCABLE-#{@repository.label}-#{@repository.library_instance_or_self.id}",
+            generated_for: :repository_export_syncable
+          )
+          views << syncable_view if syncable_view
+        end
+
+        @view = views.compact.max_by(&:updated_at)
+      end
+      check_for_blank_view
     end
 
     def check_for_blank_view

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

@@ -55,8 +55,8 @@ module Katello
           collection = collection.applicable_to_hosts(hosts)
         end
       end
-      date_type = params[:date_type].present? ? params[:date_type] : ContentViewErratumFilterRule::UPDATED
-      unless ContentViewErratumFilterRule::DATE_TYPES.include?(date_type)
+      @date_type = params[:date_type].present? ? params[:date_type] : ContentViewErratumFilterRule::UPDATED
+      unless ContentViewErratumFilterRule::DATE_TYPES.include?(@date_type)
         msg = _("Invalid params provided - date_type must be one of %s" % ContentViewErratumFilterRule::DATE_TYPES.join(","))
         fail HttpErrors::UnprocessableEntity, msg
       end
@@ -65,8 +65,8 @@ module Katello
     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.where("#{@date_type} >= ?", params[:start_date]) if params[:start_date]
+      collection = collection.where("#{@date_type} <= ?", params[:end_date]) if params[:end_date]
       if params[:types]
         include_other = params[:types]&.include?('other')
         params[:types]&.delete('other')

data/app/lib/actions/katello/content_view/publish.rb

@@ -59,13 +59,6 @@ module Actions
             if options[:importing]
               handle_importing_content(version, options[:path], options[:metadata])
             elsif options[:syncable]
-              if separated_repo_map[:pulp3_deb_multicopy].keys.flatten.present?
-                plan_action(::Actions::Katello::Repository::MultiCloneToVersion, separated_repo_map[:pulp3_deb_multicopy], version)
-              end
-              if separated_repo_map[:pulp3_yum_multicopy].keys.flatten.present?
-                plan_action(::Actions::Katello::Repository::MultiCloneToVersion, separated_repo_map[:pulp3_yum_multicopy], version)
-              end
-
               # Create import history for syncable imports so they display under hammer's content-import list command.
               if options[:path] && options[:metadata]
                 plan_action(
@@ -76,6 +69,13 @@ module Actions
                   content_view_name: version.content_view.name
                 )
               end
+            else
+              if separated_repo_map[:pulp3_deb_multicopy].keys.flatten.present?
+                plan_action(::Actions::Katello::Repository::MultiCloneToVersion, separated_repo_map[:pulp3_deb_multicopy], version)
+              end
+              if separated_repo_map[:pulp3_yum_multicopy].keys.flatten.present?
+                plan_action(::Actions::Katello::Repository::MultiCloneToVersion, separated_repo_map[:pulp3_yum_multicopy], version)
+              end
             end
 
             concurrence do

data/app/models/katello/deb.rb

@@ -4,8 +4,6 @@ module Katello
 
     CONTENT_TYPE = 'deb'.freeze
 
-    has_many :repository_debs, :class_name => "Katello::RepositoryDeb", :dependent => :destroy, :inverse_of => :deb
-    has_many :repositories, :through => :repository_debs, :class_name => "Katello::Repository"
     has_many :content_facet_applicable_debs, :class_name => "Katello::ContentFacetApplicableDeb",
              :dependent => :destroy, :inverse_of => :deb
     has_many :content_facets, :through => :content_facet_applicable_debs, :class_name => "Katello::Host::ContentFacet"

data/app/services/katello/product_content_finder.rb

@@ -26,9 +26,17 @@ module Katello
       structured_apt_roots = roots.where(:content_id => nil)
       if structured_apt_roots.any?
         deb_repos_query = Katello::Repository.where(root: structured_apt_roots)
-        environment = consumable.respond_to?(:environment) ? consumable.environment : consumable.content_view_environments.select(:environment_id).map(&:environment_id)
-        deb_repos = match_environment ? deb_repos_query.where(content_view_version: versions, environment: environment) : deb_repos_query.where(:library_instance_id => nil)
-        content_ids += deb_repos.pluck(:content_id)
+        deb_repos_library = Set.new
+        deb_repos_batch = []
+        if match_environment
+          consumable.content_view_environments.each do |cve|
+            deb_repos_batch = deb_repos_query.where("content_view_version_id = ? AND environment_id = ?", cve.content_view_version_id, cve.environment_id).where.not(library_instance_id: deb_repos_library.to_a)
+            deb_repos_library.merge(deb_repos_batch.pluck(:library_instance_id))
+            content_ids += deb_repos_batch.pluck(:content_id)
+          end
+        else
+          content_ids += deb_repos_query.where(:library_instance_id => nil).pluck(:content_id)
+        end
       end
 
       consumable.organization.enabled_product_content_for(content_ids)

data/app/services/katello/pulp3/content_view_version/export.rb

@@ -133,12 +133,27 @@ module Katello
           MetadataGenerator.new(export_service: self).generate!
         end
 
-        def self.find_generated_export_view(destination_server:, organization:, name:, generated_for:, create_by_default: false)
-          name += "-#{destination_server}" unless destination_server.blank?
-          select_method = create_by_default ? :first_or_create : :first
-          ::Katello::ContentView.where(name: name,
-                                       organization: organization,
-                                       generated_for: generated_for).send(select_method)
+        def self.find_export_view(name:, organization:, generated_for:, destination_server: nil)
+          full_name = destination_server.blank? ? name : "#{name}-#{destination_server}"
+
+          ::Katello::ContentView.where(
+            name: full_name,
+            organization: organization,
+            generated_for: generated_for
+          ).first
+        end
+
+        # Find or create export view
+        def self.find_or_create_export_view(name:, organization:, generated_for:, destination_server: nil)
+          find_export_view(name: name, organization: organization, generated_for: generated_for, destination_server: destination_server) ||
+            begin
+              full_name = destination_server.blank? ? name : "#{name}-#{destination_server}"
+              ::Katello::ContentView.create!(
+                name: full_name,
+                organization: organization,
+                generated_for: generated_for
+              )
+            end
         end
 
         def format
@@ -151,13 +166,13 @@ module Katello
           when UNDEFINED
             fail ::Katello::Errors::InvalidExportFormat, _("Export format must be specified for library exports.")
           when IMPORTABLE
-            return find_generated_export_view(create_by_default: true,
+            return find_or_create_export_view(
                                      destination_server: destination_server,
                                      organization: organization,
                                      name: ::Katello::ContentView::EXPORT_LIBRARY,
                                      generated_for: :library_export)
           when SYNCABLE
-            return find_generated_export_view(create_by_default: true,
+            return find_or_create_export_view(
                                      destination_server: destination_server,
                                      organization: organization,
                                      name: "#{::Katello::ContentView::EXPORT_LIBRARY}-SYNCABLE",
@@ -172,10 +187,10 @@ module Katello
           when UNDEFINED
             fail ::Katello::Errors::InvalidExportFormat, _("Export format must be specified for non-incremental repository exports.")
           when IMPORTABLE
-            return find_generated_export_view(create_by_default: true, destination_server: nil, organization: repository.organization,
+            return find_or_create_export_view(destination_server: nil, organization: repository.organization,
               name: "Export-#{repository.label}-#{repository.library_instance_or_self.id}", generated_for: :repository_export)
           when SYNCABLE
-            return find_generated_export_view(create_by_default: true, destination_server: nil, organization: repository.organization,
+            return find_or_create_export_view(destination_server: nil, organization: repository.organization,
               name: "Export-SYNCABLE-#{repository.label}-#{repository.library_instance_or_self.id}", generated_for: :repository_export_syncable)
           else
             fail ::Katello::Errors::InvalidExportFormat, _("Unknown repository export format '%s'.") % format

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/i18n/locale/fr.po

@@ -10,11 +10,12 @@
 # Baptiste Agasse <baptiste.agasse@gmail.com>, 2023
 # Bryan Kearney <bryan.kearney@gmail.com>, 2025
 # Ewoud Kohl van Wijngaarden <ewoud+transifex@kohlvanwijngaarden.nl>, 2025
+# Ondřej Gajdušek, 2025
 # 
 msgid ""
 msgstr ""
 "Project-Id-Version: \n"
-"Last-Translator: Ewoud Kohl van Wijngaarden <ewoud+transifex@kohlvanwijngaarden.nl>, 2025\n"
+"Last-Translator: Ondřej Gajdušek, 2025\n"
 "Language-Team: French (https://app.transifex.com/foreman/teams/114/fr/)\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -331,6 +332,8 @@ msgid ""
 "<span> {{table.numSelected &gt 1? 'Register Content Hosts':'Register Content"
 " Host' | translate}} </span>"
 msgstr ""
+"<span> {{table.numSelected &gt 1? 'Register Content Hosts':'Register Content"
+" Host' | translate}} </span>"
 
 #: app/assets/javascripts/bastion_katello/content-hosts/details/views/content-host-info.html
 msgid "1 Content Host"
@@ -3604,6 +3607,8 @@ msgid ""
 "Please select a lifecycle environment. Lifecycle environment and content "
 "view must be provided together."
 msgstr ""
+"Veuillez sélectionner un environnement de cycle de vie. L'environnement de "
+"cycle de vie et la vue de contenu doivent être fournis ensemble."
 
 #: app/assets/javascripts/bastion_katello/content-hosts/bulk/views/content-hosts-bulk-environment-modal.html
 msgid "Please select an environment."

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/i18n/locale/ja.po

@@ -4,11 +4,12 @@
 # Amit Upadhye <aupadhye@redhat.com>, 2023
 # Bryan Kearney <bryan.kearney@gmail.com>, 2023
 # Ewoud Kohl van Wijngaarden <ewoud+transifex@kohlvanwijngaarden.nl>, 2025
+# Ondřej Gajdušek, 2025
 # 
 msgid ""
 msgstr ""
 "Project-Id-Version: \n"
-"Last-Translator: Ewoud Kohl van Wijngaarden <ewoud+transifex@kohlvanwijngaarden.nl>, 2025\n"
+"Last-Translator: Ondřej Gajdušek, 2025\n"
 "Language-Team: Japanese (https://app.transifex.com/foreman/teams/114/ja/)\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -314,6 +315,8 @@ msgid ""
 "<span> {{table.numSelected &gt 1? 'Register Content Hosts':'Register Content"
 " Host' | translate}} </span>"
 msgstr ""
+"<span> {{table.numSelected &gt 1? 'Register Content Hosts':'Register Content"
+" Host' | translate}} </span>"
 
 #: app/assets/javascripts/bastion_katello/content-hosts/details/views/content-host-info.html
 msgid "1 Content Host"
@@ -3367,7 +3370,7 @@ msgstr "コンテンツビューが選択されていることを確認してく
 msgid ""
 "Please select a lifecycle environment. Lifecycle environment and content "
 "view must be provided together."
-msgstr ""
+msgstr "ライフサイクル環境を選択してください。ライフサイクル環境とコンテンツビューは一緒に提供する必要があります。"
 
 #: app/assets/javascripts/bastion_katello/content-hosts/bulk/views/content-hosts-bulk-environment-modal.html
 msgid "Please select an environment."

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/i18n/locale/ko.po

@@ -4,11 +4,12 @@
 # 0868a4d1af5275b3f70b0a6dac4c99a4, 2023
 # Bryan Kearney <bryan.kearney@gmail.com>, 2023
 # Ewoud Kohl van Wijngaarden <ewoud+transifex@kohlvanwijngaarden.nl>, 2025
+# Ondřej Gajdušek, 2025
 # 
 msgid ""
 msgstr ""
 "Project-Id-Version: \n"
-"Last-Translator: Ewoud Kohl van Wijngaarden <ewoud+transifex@kohlvanwijngaarden.nl>, 2025\n"
+"Last-Translator: Ondřej Gajdušek, 2025\n"
 "Language-Team: Korean (https://app.transifex.com/foreman/teams/114/ko/)\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -310,6 +311,8 @@ msgid ""
 "<span> {{table.numSelected &gt 1? 'Register Content Hosts':'Register Content"
 " Host' | translate}} </span>"
 msgstr ""
+"<span> {{table.numSelected &gt 1? 'Register Content Hosts':'Register Content"
+" Host' | translate}} </span>"
 
 #: app/assets/javascripts/bastion_katello/content-hosts/details/views/content-host-info.html
 msgid "1 Content Host"
@@ -3360,7 +3363,7 @@ msgstr "컨텐츠 보기가 선택되어 있는지 확인하십시오."
 msgid ""
 "Please select a lifecycle environment. Lifecycle environment and content "
 "view must be provided together."
-msgstr ""
+msgstr "라이프사이클 환경을 선택하세요. 라이프사이클 환경과 콘텐츠 뷰는 함께 제공되어야 합니다."
 
 #: app/assets/javascripts/bastion_katello/content-hosts/bulk/views/content-hosts-bulk-environment-modal.html
 msgid "Please select an environment."

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/i18n/locale/zh_CN.po

@@ -6,11 +6,12 @@
 # Bryan Kearney <bryan.kearney@gmail.com>, 2023
 # Amit Upadhye <aupadhye@redhat.com>, 2025
 # Ewoud Kohl van Wijngaarden <ewoud+transifex@kohlvanwijngaarden.nl>, 2025
+# Ondřej Gajdušek, 2025
 # 
 msgid ""
 msgstr ""
 "Project-Id-Version: \n"
-"Last-Translator: Ewoud Kohl van Wijngaarden <ewoud+transifex@kohlvanwijngaarden.nl>, 2025\n"
+"Last-Translator: Ondřej Gajdušek, 2025\n"
 "Language-Team: Chinese (China) (https://app.transifex.com/foreman/teams/114/zh_CN/)\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -310,6 +311,8 @@ msgid ""
 "<span> {{table.numSelected &gt 1? 'Register Content Hosts':'Register Content"
 " Host' | translate}} </span>"
 msgstr ""
+"<span> {{table.numSelected &gt 1? 'Register Content Hosts':'Register Content"
+" Host' | translate}} </span>"
 
 #: app/assets/javascripts/bastion_katello/content-hosts/details/views/content-host-info.html
 msgid "1 Content Host"
@@ -3320,7 +3323,7 @@ msgstr "请确保选择了内容视图。"
 msgid ""
 "Please select a lifecycle environment. Lifecycle environment and content "
 "view must be provided together."
-msgstr ""
+msgstr "请选择一个生命周期环境。生命周期环境和内容视图必须一起提供。"
 
 #: app/assets/javascripts/bastion_katello/content-hosts/bulk/views/content-hosts-bulk-environment-modal.html
 msgid "Please select an environment."