katello 4.18.0.rc2 → 4.18.0

data/app/controllers/katello/api/registry/registry_proxies_controller.rb

@@ -517,11 +517,11 @@ module Katello
         PersonalAccessToken.transaction do
           personal_token = PersonalAccessToken.where(user_id: User.current.id, name: 'registry').first
           if personal_token.nil?
-            personal_token = PersonalAccessToken.new(user: User.current, name: 'registry', expires_at: 6.minutes.from_now)
+            personal_token = PersonalAccessToken.new(user: User.current, name: 'registry', expires_at: Setting['registry_token_expiration_minutes'].minutes.from_now)
             personal_token.generate_token
             personal_token.save!
           else
-            personal_token.expires_at = 6.minutes.from_now
+            personal_token.expires_at = Setting['registry_token_expiration_minutes'].minutes.from_now
             personal_token.save!
           end
         rescue ActiveRecord::RecordInvalid

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

@@ -1,11 +1,12 @@
 module Katello
   class Api::V2::ContentExportIncrementalsController < Api::V2::ExportsController
-    before_action :find_exportable_organization, :only => [:library]
-    before_action :find_exportable_content_view_version, :only => [:version]
-    before_action :find_exportable_repository, :only => [:repository]
-    before_action :find_library_export_view, :only => [:library]
-    before_action :find_repository_export_view, :only => [:repository]
-    before_action :find_history, :only => [:version, :library, :repository]
+    before_action :find_exportable_content_view_version, :only => [:version]                        # determines @view
+    before_action :find_exportable_organization, :only => [:library]                                # determines @organization
+    before_action :find_library_export_view, :only => [:library]                                    # determines @view from @organization
+    before_action :find_exportable_repository, :only => [:repository]                               # finds @repository
+    before_action :find_repository_export_view, :only => [:repository]                              # determines @view from @repository
+    before_action :find_incremental_history, :only => [:version, :library, :repository]             # determines @history from @view
+    before_action :determine_export_format_from_history, :only => [:version, :library, :repository] # determines @export_format from @history
 
     def_param_group :incremental do
       param :from_history_id, :number, :desc => N_("Export history identifier used for incremental export. "\
@@ -42,25 +43,74 @@ module Katello
 
     private
 
+    def find_export_view_helper(name_importable, name_syncable, organization, generated_for_importable, generated_for_syncable)
+      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)
+        end
+        unless params[:format].present? && params[:format] == ::Katello::Pulp3::ContentViewVersion::Export::IMPORTABLE
+          syncable_result = determine_view_from_name(name_syncable,
+          organization,
+          generated_for_syncable)
+        end
+        @view = [importable_result, syncable_result].compact.max_by(&:updated_at)
+      end
+      check_for_blank_view
+    end
+
     def find_library_export_view
-      @view = ::Katello::Pulp3::ContentViewVersion::Export.find_library_export_view(destination_server: params[:destination_server],
-                                                                organization: @organization,
-                                                                format: find_export_format,
-                                                                create_by_default: false)
+      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
+
+    def determine_view_from_name(name, organization, generated_for)
+      ::Katello::ContentView.where(name: name,
+                                   organization: organization,
+                                   generated_for: generated_for).first
+    end
+
+    def check_for_blank_view
       if @view.blank?
-        msg = _("Unable to incrementally export. Do a Full Export on the library content "\
-                "before updating from the latest increment.")
+        valid_params = ""
+        valid_params << " 'from_history_id':#{params[:from_history_id]}" if params[:from_history_id].present?
+        valid_params << " 'format':#{params[:format]}" if params[:format].present?
+        if valid_params.blank?
+          msg = _("Unable to find a base content view to use for incremental export. Please run a complete export instead.")
+        else
+          msg = _("Unable to find a base content view to use for incremental export using the provided parameters:%{params}") % { params: valid_params }
+        end
         fail HttpErrors::BadRequest, msg
       end
     end
 
-    def find_repository_export_view
-      @view = ::Katello::Pulp3::ContentViewVersion::Export.find_repository_export_view(
-                                                                repository: @repository,
-                                                                create_by_default: false,
-                                                                format: find_export_format)
-      if @view.blank?
-        msg = _("Unable to incrementally export. Do a Full Export on the repository content.")
+    def determine_export_format_from_history
+      @export_format = @history.metadata[:format]
+
+      if params[:format].present? && @export_format != params[:format]
+        msg = _("The provided incremental export format '%{provided}' must match the previous export's format '%{previous}'. "\
+          "Consider using 'from_history_id' to point to a matching export.") % { provided: params[:format], previous: @export_format }
         fail HttpErrors::BadRequest, msg
       end
     end

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

@@ -75,7 +75,9 @@ module Katello
     end
 
     def find_export_format
-      if params[:format]
+      if @export_format.present?
+        @export_format
+      elsif params[:format]
         unless ::Katello::Pulp3::ContentViewVersion::Export::FORMATS.include?(params[:format])
           fail HttpErrors::UnprocessableEntity, _('Invalid export format provided. Format must be one of  %s ') %
                                             ::Katello::Pulp3::ContentViewVersion::Export::FORMATS.join(',')
@@ -113,14 +115,11 @@ module Katello
       end
     end
 
-    def find_history
+    def find_incremental_history
       if params[:from_history_id].present?
-        @history = ::Katello::ContentViewVersionExportHistory.find(params[:from_history_id])
-        if @history.blank?
-          throw_resource_not_found(name: 'export history',
-                                   id: params[:from_history_id])
-        end
+        find_incremental_history_from_id
       else
+        # Use the latest export
         @history = ::Katello::ContentViewVersionExportHistory.
                       latest(@view, destination_server: params[:destination_server])
         if @history.blank?
@@ -129,5 +128,13 @@ module Katello
         end
       end
     end
+
+    def find_incremental_history_from_id
+      @history = ::Katello::ContentViewVersionExportHistory.find(params[:from_history_id])
+      if @history.blank?
+        throw_resource_not_found(name: 'export history',
+                                  id: params[:from_history_id])
+      end
+    end
   end
 end

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

@@ -56,6 +56,7 @@ module Katello
     param :product_name, String, :desc => N_("Name of the product to mirror the remote repository to")
     param :organization_id, :number, :desc => N_("organization identifier")
     def mirror
+      validate_product_for_mirroring
       task = async_task(::Actions::Katello::Flatpak::MirrorRemoteRepository, @flatpak_remote_repository, @product)
       respond_for_async :resource => task
     end
@@ -94,5 +95,13 @@ module Katello
     def rejected_autocomplete_items
       ['flatpak_remote_id', 'flatpak_remote']
     end
+
+    private
+
+    def validate_product_for_mirroring
+      return unless @product&.redhat?
+      msg = _("Flatpak repositories cannot be mirrored into Red Hat products. Please select a custom product.")
+      fail HttpErrors::UnprocessableEntity, msg
+    end
   end
 end

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

@@ -7,6 +7,7 @@ module Katello
       bugfix: Katello::Erratum::BUGZILLA, # ['bugfix', 'recommended']
       security: Katello::Erratum::SECURITY, # ['security']
       enhancement: Katello::Erratum::ENHANCEMENT, # ['enhancement', 'optional']
+      other: 'other', # any type not in the above categories
     }.freeze
 
     before_action :find_host, only: :index
@@ -15,6 +16,8 @@ module Katello
     before_action :find_environment, only: :index
     before_action :find_content_view, only: :index
 
+    after_action :strip_errata_type, only: :auto_complete_search
+
     resource_description do
       api_version 'v2'
       api_base_url "/api"
@@ -41,7 +44,7 @@ module Katello
     param :content_view_id, :number, :desc => N_("Calculate Applicable Errata based on a particular Content View"), :required => false
     param :environment_id, :number, :desc => N_("Calculate Applicable Errata based on a particular Environment"), :required => false
     param :include_applicable, :bool, :desc => N_("Return errata that are applicable to this host. Defaults to false)"), :required => false
-    param :type, String, :desc => N_("Return only errata of a particular type (security, bugfix, enhancement)"), :required => false
+    param :type, String, :desc => N_("Return only errata of a particular type (security, bugfix, enhancement, other)"), :required => false
     param :severity, String, :desc => N_("Return only errata of a particular severity (None, Low, Moderate, Important, Critical)"), :required => false
     param_group :search, Api::V2::ApiController
     def index
@@ -89,7 +92,12 @@ module Katello
         relation = @host.content_facet.installable_errata(@environment, @content_view)
       end
       if params[:type].present?
-        relation = relation.where(:errata_type => TYPES_FROM_PARAMS[params[:type].to_sym])
+        type_param = params[:type].to_sym
+        if type_param == :other
+          relation = relation.where.not(:errata_type => [Katello::Erratum::SECURITY, Katello::Erratum::BUGZILLA, Katello::Erratum::ENHANCEMENT].flatten)
+        elsif TYPES_FROM_PARAMS[type_param].present?
+          relation = relation.where(:errata_type => TYPES_FROM_PARAMS[type_param])
+        end
       end
       if params[:severity].present?
         params[:severity] = ['None', ''] if params[:severity] == 'None'
@@ -142,6 +150,20 @@ module Katello
       end
     end
 
+    def strip_errata_type
+      return if response.body.blank?
+
+      begin
+        items = JSON.parse(response.body)
+      rescue JSON::ParserError
+        return
+      end
+
+      filtered = items.reject { |h| h['part'].to_s.strip == 'errata_type' }
+
+      response.body = filtered.to_json
+    end
+
     def validate_index_params!
       if (params[:content_view_id] && params[:environment_id].nil?) || (params[:environment_id] && params[:content_view_id].nil?)
         fail _("Either both parameters 'content_view_id' and 'environment_id' should be specified or neither should be specified")

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

@@ -4,16 +4,22 @@ module Katello
 
     include Api::V2::Rendering
     include ForemanTasks::Triggers
-
-    before_action :local_find_taxonomy, :only => %w(repo_discover cancel_repo_discover
-                                                    download_debug_certificate cdn_configuration
-                                                    redhat_provider update releases)
+    LOCAL_FIND_TAXONOMY_ACTIONS = %w(repo_discover cancel_repo_discover download_debug_certificate
+                                     cdn_configuration redhat_provider update releases).freeze
+    before_action :local_find_taxonomy, :only => LOCAL_FIND_TAXONOMY_ACTIONS
 
     resource_description do
       api_version 'v2'
       api_base_url "/katello/api"
     end
 
+    def self.before_find_taxonomy_actions
+      # used by RH Cloud to delay the execution of local_find_taxonomy
+      skip_before_action :local_find_taxonomy, :only => LOCAL_FIND_TAXONOMY_ACTIONS
+      yield
+      before_action :local_find_taxonomy, :only => LOCAL_FIND_TAXONOMY_ACTIONS
+    end
+
     def_param_group :resource do
       param :organization, Hash, :required => true, :action_aware => true do
         param :name, String, :required => true

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

@@ -1,7 +1,7 @@
 module Katello
   class Api::V2::RepositoriesController < Api::V2::ApiController # rubocop:disable Metrics/ClassLength
     include Katello::Concerns::FilteredAutoCompleteSearch
-
+    INDEX_ACTIONS = [:index, :auto_complete_search].freeze
     generic_repo_wrap_params = []
     RepositoryTypeManager.generic_remote_options(defined_only: true).each do |option|
       generic_repo_wrap_params << option.name
@@ -16,8 +16,8 @@ module Katello
     CONTENT_CREDENTIAL_SSL_CLIENT_CERT_TYPE = "ssl_client_cert".freeze
     CONTENT_CREDENTIAL_SSL_CLIENT_KEY_TYPE = "ssl_client_key".freeze
 
-    before_action :find_optional_organization, :only => [:index, :auto_complete_search]
-    before_action :find_product, :only => [:index, :auto_complete_search]
+    before_action :find_optional_organization, :only => INDEX_ACTIONS
+    before_action :find_product, :only => INDEX_ACTIONS
     before_action :find_product_for_create, :only => [:create]
     before_action :find_organization_from_product, :only => [:create]
     before_action :find_unauthorized_katello_resource, :only => [:gpg_key_content]
@@ -35,6 +35,15 @@ module Katello
     skip_before_action :authorize, :only => [:gpg_key_content]
     skip_before_action :check_media_type, :only => [:upload_content]
 
+    def self.before_index_actions
+      # used by RH Cloud to delay the execution of find_optional_organization and find_product
+      skip_before_action :find_optional_organization, :only => INDEX_ACTIONS
+      skip_before_action :find_product, :only => INDEX_ACTIONS
+      yield
+      before_action :find_optional_organization, :only => INDEX_ACTIONS
+      before_action :find_product, :only => INDEX_ACTIONS
+    end
+
     def custom_index_relation(collection)
       collection.includes(:product)
     end

data/app/controllers/katello/concerns/api/v2/hosts_controller_extensions.rb

@@ -18,7 +18,8 @@ module Katello
 
       included do
         prepend Overrides
-        before_action :set_content_view_environments, only: [:create, :update]
+        around_action :handle_content_view_environments_for_create, only: [:create]
+        before_action :handle_content_view_environments_for_update, only: [:update]
 
         def destroy
           Katello::RegistrationManager.unregister_host(@host, :unregistering => false)
@@ -34,21 +35,48 @@ module Katello
           render(:locals => { :resource => @host }, :template => 'katello/api/v2/hosts/show', :status => :ok)
         end
 
-        def set_content_view_environments
+        def handle_content_view_environments_for_create
+          # validations should occur before the action so that the request can fail and not render multiple responses
+          cves = validate_content_view_environment_params
+          yield
+          # the actual assigning needs to wait until the host is created
+          set_content_view_environments(cves)
+        end
+
+        def handle_content_view_environments_for_update
+          cves = validate_content_view_environment_params
+          set_content_view_environments(cves)
+        end
+
+        def validate_content_view_environment_params
           content_facet_attributes = params.dig(:host, :content_facet_attributes)
-          return if content_facet_attributes.blank? || @host&.content_facet.blank? ||
-            (cve_params[:content_view_id].present? && cve_params[:lifecycle_environment_id].present?)
+          return if content_facet_attributes.blank? ||
+          (cve_params[:content_view_id].present? && cve_params[:lifecycle_environment_id].present?)
+
           cves = ::Katello::ContentViewEnvironment.fetch_content_view_environments(
             labels: cve_params[:content_view_environments],
             ids: cve_params[:content_view_environment_ids],
-            organization: @organization || @host&.organization)
-          if cves.present?
-            @host.content_facet.content_view_environments = cves
-          else
+            organization: find_organization || @host&.organization)
+          if cves.blank?
             handle_errors(labels: cve_params[:content_view_environments],
               ids: cve_params[:content_view_environment_ids])
           end
+          cves
+        end
+
+        # rubocop:disable Naming/AccessorMethodName
+        def set_content_view_environments(cves)
+          return if cves.blank?
+          if @host.blank?
+            Rails.logger.debug "No host; not assigning content view environments"
+            return
+          elsif @host&.content_facet.blank?
+            content_facet = Katello::Host::ContentFacet.new(host: @host)
+            @host.content_facet = content_facet
+          end
+          @host.content_facet.content_view_environments = cves
         end
+        # rubocop:enable Naming/AccessorMethodName
 
         def cve_params
           params.require(:host).require(:content_facet_attributes).permit(:content_view_id, :lifecycle_environment_id, content_view_environments: [], content_view_environment_ids: [])

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

@@ -20,7 +20,15 @@ module Actions
         end
 
         def run
-          ::Katello::Repository.where(id: input[:repository_ids]).destroy_all
+          ::Katello::Repository.where(id: input[:repository_ids]).each do |repository|
+            SmartProxy.unscoped.with_repo(repository).each do |smart_proxy|
+              next if smart_proxy.pulp_primary?
+
+              smart_proxy.content_counts&.dig("content_view_versions", repository.content_view_version_id.to_s, "repositories")&.delete(repository.id.to_s)
+              smart_proxy.save
+            end
+            repository.destroy!
+          end
         end
       end
     end

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

@@ -96,8 +96,9 @@ module Actions
         end
 
         def handle_redhat_content(repository)
-          if repository.content_view.content_view_environment(repository.environment)
-            plan_action(Candlepin::Environment::SetContent, repository.content_view, repository.environment, repository.content_view.content_view_environment(repository.environment))
+          content_view_environment = repository.content_view.content_view_environment(repository.environment)
+          if content_view_environment && !repository.content_view.rolling?
+            plan_action(Candlepin::Environment::SetContent, repository.content_view, repository.environment, content_view_environment)
           end
         end
 

data/app/lib/actions/pulp3/orchestration/content_view_version/export_library.rb

@@ -13,9 +13,8 @@ module Actions
             }.merge(opts)
             action_subject(organization)
             validate_repositories_immediate!(organization) if options[:fail_on_missing_content]
-            content_view = ::Katello::Pulp3::ContentViewVersion::Export.find_library_export_view(destination_server: options[:destination_server],
+            content_view = ::Katello::Pulp3::ContentViewVersion::Export.find_or_create_library_export_view(destination_server: options[:destination_server],
                                                                            organization: organization,
-                                                                           create_by_default: true,
                                                                            format: options[:format])
             repo_ids_in_library = organization.default_content_view_version.repositories.exportable(format: options[:format]).immediate_or_none.pluck(:id)
             content_view.update!(repository_ids: repo_ids_in_library)

data/app/lib/actions/pulp3/orchestration/content_view_version/export_repository.rb

@@ -8,9 +8,8 @@ module Actions
             action_subject(repository)
             validate_repositories_immediate!(repository)
             validate_export_types!(repository, opts[:format])
-            content_view = ::Katello::Pulp3::ContentViewVersion::Export.find_repository_export_view(
+            content_view = ::Katello::Pulp3::ContentViewVersion::Export.find_or_create_repository_export_view(
                                                                            repository: repository,
-                                                                           create_by_default: true,
                                                                            format: opts[:format])
             content_view.update!(repository_ids: [repository.library_instance_or_self.id])
 

data/app/lib/katello/errors.rb

@@ -178,5 +178,7 @@ module Katello
         _('Orphan cleanup failed to delete some Pulp repository versions. Check the logs for more details.')
       end
     end
+
+    class InvalidExportFormat < StandardError; end
   end
 end

data/app/models/katello/content_view_environment.rb

@@ -32,6 +32,9 @@ module Katello
     scope :non_generated, -> { where(content_view: ::Katello::ContentView.ignore_generated) }
 
     scoped_search :on => :id, :complete_value => true
+    scoped_search :on => :label, :complete_value => true
+    scoped_search :relation => :content_view, :on => :label, :rename => :content_view
+    scoped_search :relation => :lifecycle_environment, :on => :label, :rename => :lifecycle_environment
 
     alias :lifecycle_environment :environment
     has_one :organization, :through => :environment

data/app/models/katello/rhel_lifecycle_status.rb

@@ -14,7 +14,9 @@ module Katello
 
     RHEL_EOS_SCHEDULE = { # dates that each support category ends
       'RHEL10' => {
-        'full_support' => nil,
+        'full_support' => end_of_day('2030-05-31'),
+        'maintenance_support' => end_of_day('2035-05-31'),
+        'extended_support' => end_of_day('2038-05-31'),
       },
       'RHEL9' => {
         'full_support' => end_of_day('2027-05-31'),

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

@@ -5,6 +5,9 @@ module Katello
         include ImportExportCommon
         SYNCABLE = "syncable".freeze
         IMPORTABLE = "importable".freeze
+        UNDEFINED = "undefined".freeze
+
+        # Available formats for export (UNDEFINED excluded)
         FORMATS = [SYNCABLE, IMPORTABLE].freeze
 
         attr_reader :smart_proxy, :content_view_version, :destination_server, :from_content_view_version, :repository, :base_path
@@ -142,37 +145,41 @@ module Katello
           is_a?(SyncableFormatExport) ? SYNCABLE : IMPORTABLE
         end
 
-        def self.find_library_export_view(destination_server:, organization:, create_by_default: false,
-                                          format: IMPORTABLE)
-          if format == IMPORTABLE
-            generated_for = :library_export
-            name = ::Katello::ContentView::EXPORT_LIBRARY
-          else
-            generated_for = :library_export_syncable
-            name = "#{::Katello::ContentView::EXPORT_LIBRARY}-SYNCABLE"
-          end
-
-          find_generated_export_view(create_by_default: create_by_default,
+        def self.find_or_create_library_export_view(destination_server:, organization:,
+                                          format: UNDEFINED)
+          case format
+          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,
                                      destination_server: destination_server,
                                      organization: organization,
-                                     name: name,
-                                     generated_for: generated_for)
+                                     name: ::Katello::ContentView::EXPORT_LIBRARY,
+                                     generated_for: :library_export)
+          when SYNCABLE
+            return find_generated_export_view(create_by_default: true,
+                                     destination_server: destination_server,
+                                     organization: organization,
+                                     name: "#{::Katello::ContentView::EXPORT_LIBRARY}-SYNCABLE",
+                                     generated_for: :library_export_syncable)
+          else
+            fail ::Katello::Errors::InvalidExportFormat, _("Unknown library export format '%s'.") % format
+          end
         end
 
-        def self.find_repository_export_view(repository:, create_by_default: false,
-                                              format: IMPORTABLE)
-          if format == IMPORTABLE
-            generated_for = :repository_export
-            name = "Export-#{repository.label}-#{repository.library_instance_or_self.id}"
+        def self.find_or_create_repository_export_view(repository:, format: UNDEFINED)
+          case format
+          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,
+              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,
+              name: "Export-SYNCABLE-#{repository.label}-#{repository.library_instance_or_self.id}", generated_for: :repository_export_syncable)
           else
-            generated_for = :repository_export_syncable
-            name = "Export-SYNCABLE-#{repository.label}-#{repository.library_instance_or_self.id}"
+            fail ::Katello::Errors::InvalidExportFormat, _("Unknown repository export format '%s'.") % format
           end
-          find_generated_export_view(create_by_default: create_by_default,
-                                     destination_server: nil,
-                                     organization: repository.organization,
-                                     name: name,
-                                     generated_for: generated_for)
         end
 
         def self.generate_product_repo_strings(repositories:)

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

@@ -74,7 +74,7 @@ module Katello
           # You are trying to export between an incrementally updated content view version and regular version
           if from_content_view_version.incrementally_updated? != content_view_version.incrementally_updated?
             fail ExportValidationError,
-                 _("Cannot incrementally export from a incrementally exported version and a regular version or vice-versa. "\
+                 _("Cannot incrementally export from a incrementally updated version and a regular version or vice-versa. "\
                    " The exported Content View Version '%{content_view} %{current}' "\
                    "cannot be incrementally exported from version '%{from}.'"\
                                " Please do a full export." % { content_view: content_view_version.content_view.name,

data/app/views/katello/api/v2/content_facet/base.json.rabl

@@ -31,6 +31,9 @@ child :content_view_environments => :content_view_environments do
   node :label do |cve|
     cve.label
   end
+  node :id do |cve|
+    cve.id
+  end
 end
 
 attributes :content_view_environment_labels

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/errata/errata-type.filter.js

@@ -25,7 +25,7 @@ angular.module('Bastion.errata').filter('errataType', ['translate', function (tr
             errataType = translate('Security Advisory');
             break;
         default:
-            errataType = type;
+            errataType = translate('Other Advisory');
         }
 
         return errataType;

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/i18n/bastion_katello.pot

@@ -2956,6 +2956,10 @@ msgstr ""
 msgid "OSTree Repositories <div>{{ library.counts.ostree_repositories || 0 }}</div>"
 msgstr ""
 
+#: app/assets/javascripts/bastion_katello/errata/errata-type.filter.js
+msgid "Other Advisory"
+msgstr ""
+
 #: app/assets/javascripts/bastion_katello/activation-keys/details/activation-key-repository-sets.controller.js
 msgid "Overridden"
 msgstr ""
@@ -4733,6 +4737,10 @@ msgstr ""
 msgid "Username of the upstream repository user for authentication. Leave empty if repository does not require authentication."
 msgstr ""
 
+#: app/assets/javascripts/bastion_katello/products/discovery/views/discovery.html
+msgid "Using a search parameter will improve repository discovery. A blank search might return an incomplete list due to registry's API limits."
+msgstr ""
+
 #: app/assets/javascripts/bastion_katello/products/details/repositories/details/views/repository-info.html
 msgid "Variant"
 msgstr ""

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

@@ -293,6 +293,12 @@ msgid ""
 "  This Host is not currently registered with subscription-manager. Use the <a href=\"/hosts/register\">Register Host</a> workflow to complete registration."
 msgstr ""
 
+#: app/assets/javascripts/bastion_katello/content-hosts/views/content-hosts.html
+msgid ""
+"<span> {{table.numSelected &gt 1? 'Register Content Hosts':'Register Content"
+" Host' | translate}} </span>"
+msgstr ""
+
 #: app/assets/javascripts/bastion_katello/content-hosts/details/views/content-host-info.html
 msgid "1 Content Host"
 msgid_plural ""
@@ -670,7 +676,6 @@ msgstr ""
 
 #: app/assets/javascripts/bastion_katello/errata/views/apply-errata-confirm.html
 #: app/assets/javascripts/bastion_katello/errata/views/apply-errata.html
-#: app/assets/javascripts/bastion_katello/errata/views/errata.html
 msgid "Apply Errata"
 msgstr ""
 
@@ -3494,10 +3499,6 @@ msgstr ""
 msgid "Register a Content Host"
 msgstr ""
 
-#: app/assets/javascripts/bastion_katello/content-hosts/views/content-hosts.html
-msgid "Register Content Host"
-msgstr ""
-
 #: app/assets/javascripts/bastion_katello/content-hosts/details/views/content-host-info.html
 #: app/assets/javascripts/bastion_katello/content-hosts/views/content-hosts.html
 msgid "Registered"