Fixes #39330 - Update tests for deprecated CV/LCE param removal

Update content_facet_ignore_update? to check content_view_environment_ids
instead of the removed content_view_id/lifecycle_environment_id params.
Without this, Host.new with content_facet_attributes would silently reject
the nested attributes and not build the content facet.

Update all test files to use content_view_environment_ids (hosts) and
content_view_environment_id (hostgroups) instead of the removed params.

Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>

Author: jeremylenz

app/assets/javascripts/katello/hosts/host_and_hostgroup_edit.js

@@ -54,16 +54,16 @@ KT.hosts.refreshContentViewEnvironments = function() {
   $.get(url, params, function(data) {
     var foundPreviousValue = false;
 
-    if (previousInheritText && (previousInheritText.includes('Inherit') || previousInheritText === '')) {
+    if (inheritOption.length && (inheritOption.val() === '' || previousInheritDataId)) {
       var inheritOpt = $("<option />").text(previousInheritText).val('');
       if (previousInheritDataId) inheritOpt.attr('data-id', previousInheritDataId);
       select.append(inheritOpt);
     }
 
-    $.each(data.results, function(index, cve) {
-      var label = cve.lifecycle_environment.name + ' / ' + cve.content_view.name;
-      var option = $("<option />").val(cve.id).text(label);
-      if (cve.id === parseInt(previousValue)) {
+    $.each(data.results, function(index, cvEnv) {
+      var label = cvEnv.label;
+      var option = $("<option />").val(cvEnv.id).text(label);
+      if (cvEnv.id === parseInt(previousValue)) {
         option.prop('selected', true);
         foundPreviousValue = true;
       }
@@ -99,14 +99,20 @@ KT.hosts.onKatelloHostEditLoad = function(){
 };
 
 KT.hosts.getSelectedContentViewEnvironment = function() {
-    var cveId = $("#hostgroup_content_view_environment_id").val();
-    if (!cveId) {
-        cveId = $("#host_content_view_environment_id").val();
+    var cvEnvId = $("#hostgroup_content_view_environment_id").val();
+    if (!cvEnvId) {
+        cvEnvId = $("#host_content_view_environment_id").val();
     }
-    if (!cveId) {
-        cveId = $("#hostgroup_content_view_environment_id > option:selected").data("id");
+    if (!cvEnvId) {
+        cvEnvId = $("#hostgroup_content_view_environment_id > option:selected").data("id");
     }
-    return cveId;
+    if (!cvEnvId) {
+        var hiddenInput = $("input[name='host[content_facet_attributes][content_view_environment_ids][]']").first();
+        if (hiddenInput.length) {
+            cvEnvId = hiddenInput.val();
+        }
+    }
+    return cvEnvId;
 };
 
 KT.hosts.toggle_installation_medium = function() {

app/controllers/katello/api/rhsm/candlepin_proxies_controller.rb

@@ -428,13 +428,13 @@ def update_environments_from_facts(param_environments)
     end
 
     def get_content_view_environment(key, value)
-      cve = nil
+      cvenv = nil
       if value
-        cve = ContentViewEnvironment.where(key => value).first
-        fail HttpErrors::NotFound, _("Couldn't find environment '%s'") % value unless cve
-        deny_access unless cve.readable? || User.consumer?
+        cvenv = ContentViewEnvironment.where(key => value).first
+        fail HttpErrors::NotFound, _("Couldn't find environment '%s'") % value unless cvenv
+        deny_access unless cvenv.readable? || User.consumer?
       end
-      cve
+      cvenv
     end
 
     def get_content_view_environments(label = nil, organization = nil)

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

@@ -58,7 +58,7 @@ def index
     param_group :activation_key
     def create
       @activation_key = ActivationKey.new(activation_key_params) do |activation_key|
-        activation_key.content_view_environments = @content_view_environments if update_cves?
+        activation_key.content_view_environments = @content_view_environments if update_cvenvs?
         activation_key.organization = @organization
         activation_key.user = current_user
       end
@@ -73,7 +73,7 @@ def create
     param :id, :number, :desc => N_("ID of the activation key"), :required => true
     param :name, String, :desc => N_("name"), :required => false
     def update
-      if @content_view_environments.present? || update_cves?
+      if @content_view_environments.present? || update_cvenvs?
         @activation_key.update!(content_view_environments: @content_view_environments)
       end
       sync_task(::Actions::Katello::ActivationKey::Update, @activation_key, activation_key_params)
@@ -220,7 +220,7 @@ def index_relation
 
     def find_content_view_environments
       @content_view_environments = []
-      if params[:content_view_environments] || params[:content_view_environment_ids]
+      if params_likely_not_from_angularjs? && (params[:content_view_environments] || params[:content_view_environment_ids])
         @content_view_environments = ::Katello::ContentViewEnvironment.fetch_content_view_environments(
           labels: params[:content_view_environments],
           ids: params[:content_view_environment_ids],
@@ -229,20 +229,36 @@ def find_content_view_environments
           handle_errors(labels: params[:content_view_environments],
           ids: params[:content_view_environment_ids])
         end
+        @content_view_environments.each do |cvenv|
+          throw_resource_not_found(name: 'content_view_environment', id: cvenv.id) unless cvenv.readable?
+        end
       end
-      handle_blank_cve_params
+      handle_blank_cvenv_params
       @organization ||= @content_view_environments.first&.organization
     end
 
-    def handle_blank_cve_params
+    def params_likely_not_from_angularjs?
+      # AngularJS sends back the activation key's existing API response as params.
+      # This means content_view_environments arrives as a nested hash instead of
+      # a comma-separated string of labels, which would cause fetch_content_view_environments to fail.
+      # We detect AngularJS by the presence of multi_content_view_environment — a computed
+      # response-only value that a real API client would never submit.
+      !params.key?(:multi_content_view_environment)
+    end
+
+    def handle_blank_cvenv_params
+      if params.key?(:environment) && params.key?(:content_view)
+        return # AngularJS sends nested environment and content_view params; ignore them
+      end
       if params.key?(:content_view_environments) && params[:content_view_environments].blank?
         @content_view_environments = []
       elsif params.key?(:content_view_environment_ids) && params[:content_view_environment_ids].blank?
         @content_view_environments = []
       end
     end
 
-    def update_cves?
+    def update_cvenvs?
+      return false unless params_likely_not_from_angularjs?
       params.key?(:content_view_environments) ||
         params.key?(:content_view_environment_ids)
     end

app/controllers/katello/api/v2/content_view_versions_controller.rb

@@ -229,7 +229,7 @@ def find_version_environments
           @composite_version_environments += lookup_all_composites(version_environment[:content_view_version]) if params[:propagate_all_composites]
         end
       end
-      @composite_version_environments.uniq! { |cve| cve[:content_view_version] }
+      @composite_version_environments.uniq! { |cvenv| cvenv[:content_view_version] }
     end
 
     def lookup_all_composites(component)

app/controllers/katello/api/v2/hosts_bulk_actions_controller.rb

@@ -224,13 +224,13 @@ def available_incremental_updates
       version_environments = {}
       content_facets = Katello::Host::ContentFacet.with_non_installable_errata(@errata, @hosts)
 
-      ContentViewEnvironment.for_content_facets(content_facets).each do |cve|
-        version = cve.content_view_version
+      ContentViewEnvironment.for_content_facets(content_facets).each do |cvenv|
+        version = cvenv.content_view_version
         version_environment = version_environments[version] || {:content_view_version => version, :environments => []}
-        version_environment[:environments] << cve.environment unless version_environment[:environments].include?(cve.environment)
+        version_environment[:environments] << cvenv.environment unless version_environment[:environments].include?(cvenv.environment)
         version_environment[:next_version] ||= version.next_incremental_version
         version_environment[:content_host_count] ||= 0
-        version_environment[:content_host_count] += content_facets.with_content_view_environments(cve).count
+        version_environment[:content_host_count] += content_facets.with_content_view_environments(cvenv).count
 
         if version.content_view.composite?
           version_environment[:components] = version.components_needing_errata(@errata)

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

@@ -61,15 +61,15 @@ def handle_content_view_environments_for_update
         def validate_content_view_environment_params
           content_facet_attributes = params.dig(:host, :content_facet_attributes)
           return if content_facet_attributes.blank?
-          return unless cve_params[:content_view_environments].present? || cve_params[:content_view_environment_ids].present?
+          return unless cvenv_params[:content_view_environments].present? || cvenv_params[:content_view_environment_ids].present?
 
           cves = ::Katello::ContentViewEnvironment.fetch_content_view_environments(
-            labels: cve_params[:content_view_environments],
-            ids: cve_params[:content_view_environment_ids],
+            labels: cvenv_params[:content_view_environments],
+            ids: cvenv_params[:content_view_environment_ids],
             organization: find_organization || @host&.organization)
           if cves.blank?
-            handle_errors(labels: cve_params[:content_view_environments],
-              ids: cve_params[:content_view_environment_ids])
+            handle_errors(labels: cvenv_params[:content_view_environments],
+              ids: cvenv_params[:content_view_environment_ids])
           end
           cves
         end
@@ -88,7 +88,7 @@ def set_content_view_environments(cves)
         end
         # rubocop:enable Naming/AccessorMethodName
 
-        def cve_params
+        def cvenv_params
           params.require(:host).require(:content_facet_attributes).permit(content_view_environments: [], content_view_environment_ids: [])
         end
       end

app/controllers/katello/concerns/authorization/api/v2/content_views_controller.rb

@@ -110,15 +110,15 @@ def authorize_activation_key_environments(view, options)
     end
 
     def authorize_hostgroup_content_view_environment(view, options)
-      cv_env_id = options[:hostgroup_content_view_environment_id]
-      if cv_env_id
-        cv_env = ContentViewEnvironment.joins(:content_view, :environment)
-          .where(id: cv_env_id)
+      cvenv_id = options[:hostgroup_content_view_environment_id]
+      if cvenv_id
+        cvenv = ContentViewEnvironment.joins(:content_view, :environment)
+          .where(id: cvenv_id)
           .where("#{ContentView.table_name}.organization_id" => view.organization.id)
           .first
-        fail HttpErrors::NotFound, _("Couldn't find host group content view environment id '%s'") % cv_env_id unless cv_env
+        fail HttpErrors::NotFound, _("Couldn't find host group content view environment id '%s'") % cvenv_id unless cvenv
         # deny if we cannot reassign hostgroups to the new content view environment
-        return deny_access unless cv_env.content_view.readable? && cv_env.environment.readable?
+        return deny_access unless cvenv.content_view.readable? && cvenv.environment.readable?
       end
       true
     end

app/helpers/katello/content_options_helper.rb

@@ -21,7 +21,7 @@ def content_options(host, selected_id, object_type, options = {})
         end
 
         if orgs.count > 1
-          all_options << %(<optgroup label="#{org.name}">#{content_object_options}</optgroup>)
+          all_options << %(<optgroup label="#{h(org.name)}">#{content_object_options}</optgroup>)
         else
           all_options << content_object_options
         end
@@ -58,54 +58,54 @@ def content_view_environment_options(hostgroup, options = {})
       include_blank = '<option></option>' if include_blank == true
 
       orgs = relevant_organizations(hostgroup)
-      current_cve = fetch_content_view_environment(hostgroup, options)
+      current_cvenv = fetch_content_view_environment(hostgroup, options)
       content_source = fetch_content_source(hostgroup, options)
 
-      all_options = build_cve_options_for_orgs(orgs, current_cve, content_source)
+      all_options = build_cvenv_options_for_orgs(orgs, current_cvenv, content_source)
       all_options = all_options.join
       all_options.insert(0, include_blank) if include_blank
       all_options.html_safe # User content is safely escaped with h()
     end
     # rubocop:enable Rails/OutputSafety
 
-    def build_cve_options_for_orgs(orgs, current_cve, content_source)
+    def build_cvenv_options_for_orgs(orgs, current_cvenv, content_source)
       orgs.map do |org|
-        cves = fetch_cves_for_org(org, current_cve, content_source)
-        cve_options = build_cve_option_tags(cves, current_cve)
+        cvenvs = fetch_cvenvs_for_org(org, current_cvenv, content_source)
+        cvenv_options = build_cvenv_option_tags(cvenvs, current_cvenv)
 
         if orgs.count > 1
-          %(<optgroup label="#{org.name}">#{cve_options}</optgroup>)
+          %(<optgroup label="#{h(org.name)}">#{cvenv_options}</optgroup>)
         else
-          cve_options
+          cvenv_options
         end
       end
     end
 
-    def fetch_cves_for_org(org, current_cve, content_source)
-      cves = Katello::ContentViewEnvironment.joins(:content_view, :environment)
+    def fetch_cvenvs_for_org(org, current_cvenv, content_source)
+      cvenvs = Katello::ContentViewEnvironment.joins(:content_view, :environment)
                .where("#{Katello::ContentView.table_name}.organization_id" => org.id)
                .order("#{Katello::KTEnvironment.table_name}.name", "#{Katello::ContentView.table_name}.name")
                .to_a
 
-      cves = filter_cves_by_content_source(cves, content_source, org) if content_source.present?
-      cves |= [current_cve] if current_cve.present? && current_cve.content_view.organization_id == org.id
-      cves
+      cvenvs = filter_cvenvs_by_content_source(cvenvs, content_source, org) if content_source.present?
+      cvenvs |= [current_cvenv] if current_cvenv.present? && current_cvenv.content_view.organization_id == org.id
+      cvenvs
     end
 
-    def filter_cves_by_content_source(cves, content_source, org)
-      return cves if content_source.pulp_primary?
+    def filter_cvenvs_by_content_source(cvenvs, content_source, org)
+      return cvenvs if content_source.pulp_primary?
 
       available_env_ids = content_source.lifecycle_environments.where(organization_id: org.id).pluck(:id)
-      return cves unless available_env_ids.any?
+      return cvenvs unless available_env_ids.any?
 
-      cves.select { |cve| available_env_ids.include?(cve.environment_id) }
+      cvenvs.select { |cvenv| available_env_ids.include?(cvenv.environment_id) }
     end
 
-    def build_cve_option_tags(cves, current_cve)
-      option_tags = cves.map do |cve|
-        selected = current_cve&.id == cve.id ? 'selected' : ''
-        label = cve.default_environment? ? cve.environment.name : "#{cve.environment.name} / #{cve.content_view.name}"
-        %(<option value="#{cve.id}" #{selected}>#{h(label)}</option>)
+    def build_cvenv_option_tags(cvenvs, current_cvenv)
+      option_tags = cvenvs.map do |cvenv|
+        selected = current_cvenv&.id == cvenv.id ? 'selected' : ''
+        label = cvenv.label
+        %(<option value="#{cvenv.id}" #{selected}>#{h(label)}</option>)
       end
       option_tags.join
     end
@@ -160,16 +160,11 @@ def blank_or_inherit_with_id(f, attr) # f is Rails convention for form objects
 
     def blank_or_inherit_cvenv(f) # f is Rails convention for form objects
       return true unless f.object.respond_to?(:parent_id) && f.object.parent_id
-      parent_cve = f.object.parent&.content_view_environment
-      inherited_value = parent_cve.try(:id) || ''
-
-      if parent_cve
-        cve_name = if parent_cve.default_environment?
-                     parent_cve.environment.name
-                   else
-                     "#{parent_cve.environment.name} / #{parent_cve.content_view.name}"
-                   end
-        %(<option data-id="#{inherited_value}" value="">#{h(_('Inherit parent (%s)') % cve_name)}</option>)
+      parent_cvenv = f.object.parent&.content_view_environment
+      inherited_value = parent_cvenv.try(:id) || ''
+
+      if parent_cvenv
+        %(<option data-id="#{inherited_value}" value="">#{h(_('Inherit parent (%s)') % parent_cvenv.label)}</option>)
       else
         %(<option value="">#{_('Inherit parent')}</option>)
       end

app/helpers/katello/hosts_and_hostgroups_helper.rb

@@ -73,9 +73,10 @@ def fetch_content_view(host_or_hostgroup, options = {})
     def fetch_content_view_environment(host_or_hostgroup, options = {})
       if host_or_hostgroup&.content_facet.present?
         if host_or_hostgroup.is_a?(::Hostgroup)
-          return host_or_hostgroup.content_facet.content_view_environment
+          return host_or_hostgroup.content_facet.content_view_environment if host_or_hostgroup.content_facet.content_view_environment.present?
         else
-          return host_or_hostgroup.content_facet.content_view_environments.first
+          first_cvenv = host_or_hostgroup.content_facet.content_view_environments.first
+          return first_cvenv if first_cvenv.present?
         end
       end
       selected_host_group = options.fetch(:selected_host_group, nil)
@@ -135,29 +136,29 @@ def inherited_or_own_content_source_id(host_or_hostgroup, hostgroup)
       content_source_id
     end
 
-    def inherited_or_own_cve_id(host_or_hostgroup, hostgroup)
-      inherited_cve_id = hostgroup.content_facet&.content_view_environment_id
-      inherited_cve_id ||= hostgroup.send(:inherited_ancestry_attribute, :content_view_environment_id, :content_facet) if hostgroup.ancestry.present?
+    def inherited_or_own_cvenv_id(host_or_hostgroup, hostgroup)
+      inherited_cvenv_id = hostgroup.content_facet&.content_view_environment_id
+      inherited_cvenv_id ||= hostgroup.send(:inherited_ancestry_attribute, :content_view_environment_id, :content_facet) if hostgroup.ancestry.present?
 
       case host_or_hostgroup
       when ::Hostgroup
-        own_cve_id = host_or_hostgroup.content_facet&.content_view_environment_id
-        own_cve_id && own_cve_id != inherited_cve_id ? own_cve_id : inherited_cve_id
+        own_cvenv_id = host_or_hostgroup.content_facet&.content_view_environment_id
+        own_cvenv_id && own_cvenv_id != inherited_cvenv_id ? own_cvenv_id : inherited_cvenv_id
       when ::Host::Managed
-        own_cve = host_or_hostgroup.content_view_environments.first
-        own_cve && own_cve.id != inherited_cve_id ? own_cve.id : inherited_cve_id
+        own_cvenv = host_or_hostgroup.content_view_environments.first
+        own_cvenv && own_cvenv.id != inherited_cvenv_id ? own_cvenv.id : inherited_cvenv_id
       else
-        inherited_cve_id
+        inherited_cvenv_id
       end
     end
 
     def hostgroup_content_facet(hostgroup, param_host)
-      cve_id = inherited_or_own_cve_id(param_host, hostgroup)
+      cvenv_id = inherited_or_own_cvenv_id(param_host, hostgroup)
       content_source_id = inherited_or_own_content_source_id(param_host, hostgroup)
       facet = ::Katello::Host::ContentFacet.new(:content_source_id => content_source_id)
-      if cve_id
-        cve = ::Katello::ContentViewEnvironment.find_by(id: cve_id)
-        facet.content_view_environments = [cve] if cve
+      if cvenv_id
+        cvenv = ::Katello::ContentViewEnvironment.find_by(id: cvenv_id)
+        facet.content_view_environments = [cvenv] if cvenv
       end
       facet
     end