katello 4.9.0.rc2 → 4.9.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d870b3e8317aae2cc5675bdebddc2541257c470714209df06d79135ebc751643
-  data.tar.gz: e19a405204719de4c723e6b7a0c4612e40983698df33562f74e28e0eb2fb83f6
+  metadata.gz: 2725e254c69e3a52955ec2e85605097ad13751770b46de79a14bb6153451e5b7
+  data.tar.gz: a59ffe3ac6b743b36ac2207a44c333dc504975b54d23efb2d9d04aa13741c575
 SHA512:
-  metadata.gz: ee637b366b689e48fdbde217e2255b683c35095ffcbc3ad1234b9446ba7757be992a5b33a61650dc1fc5ac25ff4474185e2e58772991475c0f6a78627bbd70c4
-  data.tar.gz: 6eac40d9467c4365c19c82ecdce5d53f42418f511c7e35e12f987c5e58b432c3919f0ff0a2c1d581084e14e8f1ca29147f298a505331ec1d6907a6f132b4e209
+  metadata.gz: 78951d090b4e05283c65ebb11d2c18475ffc2afa26cb2c1f981a425f18cd85bf9a82c84c06e33dc8c05348a1b9f8af845adb482fd0075116f75da85c847e5d31
+  data.tar.gz: 5c2acdd95ed253669357a68142f42c8b09ba5b34603bfa9acf1e029cdc32c9696d1edb40a8e616e032747c6771110ca54bd048b4108a342d755b1d000270766c

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

@@ -87,7 +87,7 @@ module Katello
       end
     end
 
-    api :POST, '/capsules/:id/reclaim_space', N_('Reclaim space from all On Demand repositories on a smart proxy')
+    api :POST, '/capsules/:id/content/reclaim_space', N_('Reclaim space from all On Demand repositories on a smart proxy')
     param :id, :number, :required => true, :desc => N_('Id of the smart proxy')
     def reclaim_space
       find_capsule(true)

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

@@ -78,11 +78,8 @@ module Katello
 
     api :PUT, "/content_view_versions/:id/republish_repositories", N_("Forces a republish of the version's repositories' metadata")
     param :id, :number, :desc => N_("Content view version identifier"), :required => true
-    param :force, :bool, :desc => N_("Force metadata regeneration to proceed.  Dangerous when repositories use the 'Complete Mirroring' mirroring policy"), :required => true
+    param :force, :bool, :desc => N_("Force metadata regeneration to proceed. (Deprecated)"), deprecated: true
     def republish_repositories
-      unless ::Foreman::Cast.to_bool(params[:force])
-        fail HttpErrors::BadRequest, _("Metadata republishing must be forced because it is a dangerous operation.")
-      end
       task = async_task(::Actions::Katello::ContentViewVersion::RepublishRepositories, @content_view_version)
       respond_for_async :resource => task
     end

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

@@ -258,7 +258,8 @@ module Katello
         fail HttpErrors::BadRequest, _("Both major and minor parameters have to be used to override a CV version")
       end
 
-      if (::Foreman::Cast.to_bool(params[:publish_only_if_needed]) && !@content_view.needs_publish?)
+      cv_needs_publish = @content_view.needs_publish?
+      if (::Foreman::Cast.to_bool(params[:publish_only_if_needed]) && !cv_needs_publish.nil? && !cv_needs_publish)
         fail HttpErrors::BadRequest, _("Content view does not need a publish since there are no audited changes since the last publish." \
                                      " Pass check_needs_publish parameter as false if you don't want to check if content view needs a publish.")
       end

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

@@ -180,11 +180,14 @@ module Katello
     protected
 
     def action_permission
-      if %w(download_debug_certificate redhat_provider repo_discover cdn_configuration
-            cancel_repo_discover).include?(params[:action])
-        :edit
-      elsif params[:action] == "releases"
+      if params[:action] == "releases"
+        :view
+      elsif params[:action] == "download_debug_certificate" &&
+          Organization.find(params[:id]).authorized?(:export_content)
         :view
+      elsif %w(download_debug_certificate redhat_provider repo_discover cdn_configuration
+               cancel_repo_discover).include?(params[:action])
+        :edit
       else
         super
       end

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

@@ -323,12 +323,12 @@ module Katello
       render :json => repo_types.values
     end
 
-    api :PUT, "/repositories/:id/republish", N_("Forces a republish of the specified repository, regenerating metadata and symlinks on the filesystem.")
+    api :PUT, "/repositories/:id/republish", N_("Forces a republish of the specified repository, regenerating metadata and symlinks on the filesystem. Not allowed for repositories with the 'Complete Mirroring' mirroring policy.")
     param :id, :number, :desc => N_("Repository identifier"), :required => true
-    param :force, :bool, :desc => N_("Force metadata regeneration to proceed.  Dangerous when repositories use the 'Complete Mirroring' mirroring policy."), :required => true
+    param :force, :bool, :desc => N_("Force metadata regeneration to proceed. (Deprecated)"), deprecated: true
     def republish
-      unless ::Foreman::Cast.to_bool(params[:force])
-        fail HttpErrors::BadRequest, _('Metadata republishing must be forced because it is a dangerous operation.')
+      if @repository.mirroring_policy == Katello::RootRepository::MIRRORING_POLICY_COMPLETE
+        fail HttpErrors::BadRequest, _("Metadata republishing is not allowed on repositories with the 'Complete Mirroring' mirroring policy.")
       end
       task = async_task(::Actions::Katello::Repository::MetadataGenerate, @repository)
       respond_for_async :resource => task

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

@@ -55,7 +55,7 @@ module Actions
 
         def trigger_capsule_sync(_execution_plan)
           environment = ::Katello::KTEnvironment.find(input[:environment_id])
-          if !input[:incremental_update] && sync_proxies?(environment)
+          if !input[:incremental_update] && sync_proxies?(environment) && Setting[:foreman_proxy_content_auto_sync]
             ForemanTasks.async_task(ContentView::CapsuleSync,
                                     ::Katello::ContentView.find(input[:content_view_id]),
                                     environment)

data/app/lib/actions/katello/content_view_version/auto_create_redhat_repositories.rb

@@ -15,7 +15,8 @@ module Actions
             helper.creatable.each do |root|
               plan_action(::Actions::Katello::RepositorySet::EnableRepository,
                             root[:product], root[:content], root[:substitutions],
-                            override_url: root[:override_url])
+                            override_url: root[:override_url],
+                            override_arch: root[:override_arch])
             end
             helper.updatable.each do |root|
               plan_action(::Actions::Katello::Repository::Update, root[:repository], root[:options])

data/app/lib/actions/katello/content_view_version/republish_repositories.rb

@@ -5,7 +5,7 @@ module Actions
         def plan(content_view_version)
           action_subject(content_view_version.content_view)
           plan_self(:version_id => content_view_version.id)
-          plan_action(::Actions::Katello::Repository::BulkMetadataGenerate, content_view_version.repositories)
+          plan_action(::Actions::Katello::Repository::BulkMetadataGenerate, content_view_version.repositories.joins(:root).where.not(root: { mirroring_policy: ::Katello::RootRepository::MIRRORING_POLICY_COMPLETE }))
         end
 
         def run

data/app/lib/actions/katello/orphan_cleanup/remove_orphaned_content_units.rb

@@ -0,0 +1,22 @@
+module Actions
+  module Katello
+    module OrphanCleanup
+      class RemoveOrphanedContentUnits < Actions::Base
+        def run
+          models = []
+
+          ::Katello::RepositoryTypeManager.enabled_repository_types.each_value do |repo_type|
+            models << repo_type.content_types_to_index
+          end
+          models.flatten.each do |content_type|
+            content_type.model_class.orphaned.destroy_all
+          end
+        end
+
+        def rescue_strategy
+          Dynflow::Action::Rescue::Skip
+        end
+      end
+    end
+  end
+end

data/app/lib/actions/katello/orphan_cleanup/remove_orphans.rb

@@ -7,27 +7,16 @@ module Actions
         end
         def plan(proxy)
           sequence do
+            if proxy.pulp_primary?
+              ::Katello::RootRepository.orphaned.destroy_all
+              plan_action(RemoveOrphanedContentUnits)
+            end
             if proxy.pulp3_enabled?
               plan_action(
                 Actions::Pulp3::Orchestration::OrphanCleanup::RemoveOrphans,
                 proxy)
             end
-            plan_self
-          end
-        end
-
-        def run
-          models = []
-          ::Katello::RepositoryTypeManager.enabled_repository_types.each_value do |repo_type|
-            indexable_types = repo_type.content_types_to_index
-            models += indexable_types&.map(&:model_class)
-            models.select! { |model| model.many_repository_associations }
-          end
-          models.each do |model|
-            model.joins("left join katello_#{model.repository_association} on #{model.table_name}.id = katello_#{model.repository_association}.#{model.unit_id_field}").where("katello_#{model.repository_association}.#{model.unit_id_field} IS NULL").destroy_all
           end
-
-          ::Katello::RootRepository.orphaned.destroy_all
         end
       end
     end

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

@@ -23,7 +23,7 @@ module Actions
                         rpm_filenames: rpm_filenames,
                         copy_contents: copy_contents,
                         solve_dependencies: content_view.solve_dependencies,
-                        metadata_generate: !incremental)
+                        generate_metadata: true)
           end
         end
 

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

@@ -10,7 +10,7 @@ module Actions
             plan_action(::Actions::Katello::Repository::MultiCloneContents, extended_repo_map,
                         copy_contents: true,
                         solve_dependencies: true,
-                        metadata_generate: !incremental)
+                        generate_metadata: true)
           end
         end
 

data/app/lib/actions/katello/repository_set/enable_repository.rb

@@ -6,7 +6,8 @@ module Actions
           _("Enable")
         end
 
-        def plan(product, content, substitutions, override_url: nil)
+        def plan(product, content, substitutions, override_url: nil,
+                 override_arch: nil)
           mapper = ::Katello::Candlepin::RepositoryMapper.new(product,
                                                                content,
                                                                substitutions)
@@ -15,6 +16,7 @@ module Actions
             fail ::Katello::Errors::ConflictException, _("The repository is already enabled")
           end
           repository = mapper.build_repository
+          repository.root.arch = override_arch if override_arch.present?
           if override_url
             repository.root.url = override_url
             repository.root.download_policy = ::Katello::RootRepository::DOWNLOAD_IMMEDIATE if URI(override_url).scheme == 'file'

data/app/lib/katello/resources/cdn/katello_cdn.rb

@@ -11,10 +11,14 @@ module Katello
           super
         end
 
-        def fetch_paths(content_path)
+        def fetch_repo_set(content_path)
           url = "/katello/api/v2/repository_sets?organization_id=#{organization['id']}&search=#{CGI.escape("path = #{content_path}")}"
           response = get(url)
-          repo_set = JSON.parse(response)['results'].first
+          JSON.parse(response)['results'].first
+        end
+
+        def fetch_paths(content_path)
+          repo_set = fetch_repo_set(content_path)
 
           fail _("Upstream organization %s does not provide this content path") % @organization_label if repo_set.nil?
 
@@ -33,8 +37,8 @@ module Katello
           results = json_body['results']
 
           results.map do |repo|
-            Katello::Content.substitute_content_path(arch: repo[:arch],
-                                                     releasever: repo[:minor],
+            Katello::Content.substitute_content_path(arch: repo['arch'],
+                                                     releasever: repo['minor'],
                                                      content_path: content_path)
           end
         end

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

@@ -169,9 +169,9 @@ module Katello
 
       def orphaned
         if many_repository_associations
-          where.not(:id => repository_association_class.where(:repository_id => ::Katello::Repository.all).select(unit_id_field))
+          where.not(:id => repository_association_class.select(unit_id_field))
         else
-          where.not(:repository_id => ::Katello::Repository.all)
+          where.not(:repository_id => ::Katello::Repository.select(:id))
         end
       end
 

data/app/models/katello/content_view.rb

@@ -799,6 +799,7 @@ module Katello
       # True:
       #     a) When content/repo/filter change audit records exist
       #     b) CV hasn't ever been published
+      #     c) CV dependency_solving != latest_version.applied_filters.dependency_solving
       # nil:
       #     a) When CV version creation audit is missing(Indicating audit cleanup)
       #     b) Version doesn't have audited_filters set indicating
@@ -815,6 +816,8 @@ module Katello
       # return true if the audit records clearly show we have unpublished changes
       return true if (audited_cv_repositories_since_last_publish.present? || audited_cv_repository_changed.present? ||
         audited_cv_filters_changed.present? || audited_cv_filter_rules_changed.present?)
+      # return true if the dependency solving changed for CV between last publish and now
+      return true if dependency_solving_changed?
       # if we didn't return `true` already, either the audit records show that we don't need to publish, or we may
       # have insufficient data to make the determination (either audits were cleaned, or never got created at all).
       # first, check for the `create` audit record; its absence indicates that audits were cleaned some time after
@@ -831,6 +834,10 @@ module Katello
       latest_version_object.applied_filters.nil? ? nil : false
     end
 
+    def dependency_solving_changed?
+      latest_version_object.applied_filters && solve_dependencies != latest_version_object.applied_filters['dependency_solving']
+    end
+
     def filtered?
       filters.present?
     end

data/app/models/katello/repository.rb

@@ -935,7 +935,6 @@ module Katello
         repository_type.content_types_to_index.each do |type|
           Katello::Logging.time("CONTENT_INDEX", data: {type: type.model_class}) do
             Katello::ContentUnitIndexer.new(content_type: type, repository: self, optimized: !full_index).import_all
-            type.model_class.orphaned.destroy_all
           end
         end
         repository_type.index_additional_data_proc&.call(self)

data/app/models/katello/root_repository.rb

@@ -130,7 +130,7 @@ module Katello
       where(:http_proxy_policy => RootRepository::USE_SELECTED_HTTP_PROXY).
       where(:http_proxy_id => http_proxy_id)
     }
-    scope :orphaned, -> { where.not(id: Katello::Repository.pluck(:root_id).uniq) }
+    scope :orphaned, -> { where.not(id: Katello::Repository.select(:root_id)) }
     scope :redhat, -> { joins(:provider).merge(Katello::Provider.redhat) }
     scope :custom, -> { where.not(:id => self.redhat) }
     delegate :redhat?, :provider, :organization, to: :product

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

@@ -29,10 +29,12 @@ module Katello
 
             root = product.root_repositories.find do |r|
               if repo.content&.id && repo.redhat
-                r.content.cp_content_id == repo.content.id &&
+                repo_exists = r.content.cp_content_id == repo.content.id &&
                   r.arch == repo.arch &&
                   r.major == repo.major &&
                   r.minor == repo.minor
+
+                repo_exists || r.label == repo.label
               else
                 r.label == repo.label
               end
@@ -46,11 +48,13 @@ module Katello
                 basearch: repo.arch,
                 releasever: repo.minor
               }
-              creatable << { product: product,
-                             content: product_content,
-                             substitutions: substitutions,
-                             override_url: fetch_feed_url(repo)
-                           }
+              creatable << {
+                product: product,
+                content: product_content,
+                substitutions: substitutions,
+                override_url: fetch_feed_url(repo),
+                override_arch: repo.arch
+              }
             else
               creatable << { repository: product.add_repo(create_repo_params(repo, product)) }
             end

data/app/services/katello/pulp3/repository/docker.rb

@@ -70,7 +70,7 @@ module Katello
         rescue api.client_module::ApiError => e
           if e.message.include? 'Could not find the following content units'
             raise ::Katello::Errors::Pulp3Error, "Content units that do not exist in Pulp were requested to be copied."\
-              " Please run a complete sync on the following repository: #{repository_reference.root_repository.name}. Original error: #{e.message}"
+              " Please run `foreman-rake katello:delete_orphaned_content` to fix the following repository: #{repository_reference.root_repository.name}. Original error: #{e.message}"
           else
             raise e
           end

data/app/services/katello/pulp3/repository.rb

@@ -39,6 +39,7 @@ module Katello
 
       def self.api(smart_proxy, repository_type_label)
         repo_type = RepositoryTypeManager.enabled_repository_types[repository_type_label]
+        fail _("%s content type is not enabled." % repository_type_label) unless repo_type
         repo_type.pulp3_api(smart_proxy)
       end
 
@@ -496,7 +497,8 @@ module Katello
       rescue api.client_module::ApiError => e
         if e.message.include? 'Could not find the following content units'
           raise ::Katello::Errors::Pulp3Error, "Content units that do not exist in Pulp were requested to be copied."\
-            " Please run a complete sync on the following repository: #{repository_reference.root_repository.name}. Original error: #{e.message}"
+             " Please run `foreman-rake katello:delete_orphaned_content` to fix the following repository:"\
+            " #{repository_reference.root_repository.name}. Original error: #{e.message}"
         else
           raise e
         end
@@ -508,7 +510,7 @@ module Katello
       rescue api.client_module::ApiError => e
         if e.message.include? 'Could not find the following content units'
           raise ::Katello::Errors::Pulp3Error, "Content units that do not exist in Pulp were requested to be copied."\
-            " Please run a complete sync on the following repository:"\
+            " Please run `foreman-rake katello:delete_orphaned_content` to fix the following repository:"\
             " #{::Katello::Pulp3::RepositoryReference.find_by(repository_href: repository_href).root_repository.name}. Original error: #{e.message}"
         else
           raise e

data/app/services/katello/pulp3/smart_proxy_mirror_repository.rb

@@ -79,18 +79,19 @@ module Katello
         known_acss = smart_proxy.smart_proxy_alternate_content_sources
         known_acs_hrefs = known_acss.pluck(:alternate_content_source_href) if known_acss.present?
 
-        file_acs_api = ::Katello::Pulp3::Repository.api(smart_proxy, 'file').alternate_content_source_api
-        yum_acs_api = ::Katello::Pulp3::Repository.api(smart_proxy, 'yum').alternate_content_source_api
-
-        orphan_file_acs_hrefs = file_acs_api.list.results.map(&:pulp_href) - known_acs_hrefs
-        orphan_yum_acs_hrefs = yum_acs_api.list.results.map(&:pulp_href) - known_acs_hrefs
-
-        orphan_file_acs_hrefs.each do |orphan_file_acs_href|
-          tasks << file_acs_api.delete(orphan_file_acs_href)
+        if RepositoryTypeManager.enabled_repository_types['file']
+          file_acs_api = ::Katello::Pulp3::Repository.api(smart_proxy, 'file').alternate_content_source_api
+          orphan_file_acs_hrefs = file_acs_api.list.results.map(&:pulp_href) - known_acs_hrefs
+          orphan_file_acs_hrefs.each do |orphan_file_acs_href|
+            tasks << file_acs_api.delete(orphan_file_acs_href)
+          end
         end
-
-        orphan_yum_acs_hrefs.each do |orphan_yum_acs_href|
-          tasks << yum_acs_api.delete(orphan_yum_acs_href)
+        if RepositoryTypeManager.enabled_repository_types['yum']
+          yum_acs_api = ::Katello::Pulp3::Repository.api(smart_proxy, 'yum').alternate_content_source_api
+          orphan_yum_acs_hrefs = yum_acs_api.list.results.map(&:pulp_href) - known_acs_hrefs
+          orphan_yum_acs_hrefs.each do |orphan_yum_acs_href|
+            tasks << yum_acs_api.delete(orphan_yum_acs_href)
+          end
         end
       end
 

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

@@ -1,6 +1,4 @@
 attributes :id, :uuid
-attributes :content_view_id, :content_view_name
-attributes :lifecycle_environment_id, :lifecycle_environment_name
 attributes :content_source_id, :content_source_name
 attributes :kickstart_repository_id, :kickstart_repository_name
 attributes :errata_counts
@@ -10,6 +8,15 @@ attributes :applicable_rpm_count => :applicable_package_count
 attributes :upgradable_rpm_count => :upgradable_package_count
 attributes :applicable_module_stream_count, :upgradable_module_stream_count
 
+child :content_view_environments => :content_view_environments do
+  node :content_view do |cve|
+    { id: cve.content_view.id, name: cve.content_view.name, composite: cve.content_view.composite }
+  end
+  node :lifecycle_environment do |cve|
+    { id: cve.lifecycle_environment.id, name: cve.lifecycle_environment.name }
+  end
+end
+
 node :content_view do |content_facet|
   content_view = content_facet.single_content_view
   if content_view.present?
@@ -31,14 +38,6 @@ node :lifecycle_environment do |content_facet|
   end
 end
 
-child :content_views => :content_views do
-  attributes :id, :name, :composite
-end
-
-child :lifecycle_environments => :lifecycle_environments do
-  attributes :id, :name
-end
-
 child :content_source => :content_source do
   attributes :id, :name, :url
 end

data/app/views/katello/hosts/_errata_counts.html.erb

@@ -1,4 +1,8 @@
+<% if Setting["host_details_ui"] %>
+<a href="/new/hosts/<%= host.name %>#/Content/errata">
+<% else %>
 <a href="/content_hosts/<%= host.id %>/errata">
+<% end %>
   <span class="aligned-errata-count">
     <span class="errata-count <%= counts[:security].to_i.positive? ? 'red' : 'black' %>">
       <span>
@@ -20,8 +24,13 @@
     </span>
   </span>
 </a>
+
 <% if !host.operatingsystem_name&.match(/Debian|Ubuntu/) %>
+<% if Setting["host_details_ui"] %>
+<a href="/new/hosts/<%= host.name %>#/Content/packages">
+<% else %>
 <a href="/content_hosts/<%= host.id %>/packages/applicable">
+<% end %>
   <span class="aligned-errata-count">
     <span class="errata-count <%= host.content_facet_attributes&.upgradable_rpm_count&.positive? ? 'green' : 'black' %>"
       <span>
@@ -33,7 +42,11 @@
 </a>
 <% end %>
 <% if host.operatingsystem_name&.match(/Debian|Ubuntu/) %>
+<% if Setting["host_details_ui"] %>
+<a href="/new/hosts/<%= host.name %>#/Content/packages">
+<% else %>
 <a href="/content_hosts/<%= host.id %>/debs/applicable">
+<% end %>
   <span class="aligned-errata-count">
     <span class="errata-count <%= host.content_facet_attributes&.upgradable_deb_count&.positive? ? 'green' : 'black' %>"
       <span>

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/products/details/repositories/repository.factory.js

@@ -18,7 +18,7 @@ angular.module('Bastion.repositories').factory('Repository',
                 update: { method: 'PUT' },
                 sync: { method: 'POST', params: { action: 'sync' } },
                 verifyChecksum: { method: 'POST', params: { action: 'verify_checksum' }},
-                republishMetadata: { method: 'PUT', params: { action: 'republish', force: true }},
+                republishMetadata: { method: 'PUT', params: { action: 'republish'}},
                 reclaimSpace: { method: 'POST', params: { action: 'reclaim_space' }},
                 removePackages: { method: 'PUT', params: { action: 'remove_packages'}},
                 removeContent: { method: 'PUT', params: { action: 'remove_content'}},

data/lib/katello/plugin.rb

@@ -748,7 +748,7 @@ Foreman::Plugin.register :katello do
     :attach_subscriptions, :view_host_collections,
     :view_organizations, :view_lifecycle_environments, :view_products,
     :view_locations, :view_domains, :view_architectures,
-    :view_operatingsystems, :view_smart_proxies
+    :view_operatingsystems, :view_smart_proxies, :view_params
   ]
 
   role 'Content Importer', [

data/lib/katello/tasks/upgrades/4.9/update_custom_products_enablement.rake

@@ -3,8 +3,10 @@ namespace :katello do
     namespace '4.9' do
       desc "Update custom products enablement"
       task :update_custom_products_enablement => ['environment'] do
-        migrator = Katello::Util::DefaultEnablementMigrator.new
-        migrator.execute!
+        if ::Katello::ProductContent.custom.where(enabled: true).exists?
+          migrator = Katello::Util::DefaultEnablementMigrator.new
+          migrator.execute!
+        end
       end
     end
   end

data/lib/katello/version.rb

@@ -1,3 +1,3 @@
 module Katello
-  VERSION = "4.9.0.rc2".freeze
+  VERSION = "4.9.1".freeze
 end

data/webpack/components/RoutedTabs/index.js

@@ -23,6 +23,7 @@ const RoutedTabs = ({
       >
         {tabs.map(({ key, title }) => (
           <Tab
+            ouiaId={`routed-tabs-tab-${key}`}
             href={`#/${key}`}
             key={key}
             eventKey={key}

data/webpack/components/extensions/HostDetails/Cards/ContentViewDetailsCard/ContentViewDetailsCard.js

@@ -106,7 +106,7 @@ const HostContentViewDetails = ({
               <h3>{__('Content view')}</h3>
             </Flex>
             <Flex direction={{ default: 'row', sm: 'row' }} flexWrap={{ default: 'wrap' }}>
-              <a style={{ fontSize: '14px' }} href={`/content_views/${contentView.id}`}>{`${contentView.name}`}</a>
+              <a style={{ fontSize: '14px' }} href={`/content_views/${contentView.id}`}>{contentView.name}</a>
               <Tooltip
                 position="top"
                 enableFlip
@@ -119,7 +119,7 @@ const HostContentViewDetails = ({
                   }}
                 />}
               >
-                <Label isTruncated color="purple" href={`/lifecycle_environments/${lifecycleEnvironment.id}`}>{`${lifecycleEnvironment.name}`}</Label>
+                <Label isTruncated color="purple" href={`/lifecycle_environments/${lifecycleEnvironment.id}`}>{lifecycleEnvironment.name}</Label>
               </Tooltip>
             </Flex>
           </Flex>

data/webpack/components/extensions/HostDetails/Tabs/ContentTab/index.js

@@ -24,6 +24,7 @@ const ContentTab = ({ location: { pathname } }) => {
       >
         {filteredTabs.map(({ key, title }) => (
           <Tab
+            ouiaId={`host-content-tabs-tab-${key}`}
             key={key}
             eventKey={key}
             title={<TabTitleText>{title}</TabTitleText>}

data/webpack/components/extensions/HostDetails/Tabs/PackagesTab/PackagesTab.js

@@ -580,7 +580,7 @@ export const PackagesTab = () => {
               }
 
               return (
-                <Tr key={`${id}`} ouiaId={`action-row-${id}`}>
+                <Tr key={id} ouiaId={`action-row-${id}`}>
                   {showActions ? (
                     <Td
                       select={{

data/webpack/components/extensions/RegistrationCommands/__tests__/__snapshots__/ActivationKeys.test.js.snap

@@ -2,7 +2,7 @@
 
 exports[`ActivationKeys renders 1`] = `
 <FormGroup
-  fieldId="reg_katello_ak"
+  fieldId="activation_keys_field"
   helperText="From host group: "
   helperTextInvalid={
     <a
@@ -36,7 +36,7 @@ exports[`ActivationKeys renders 1`] = `
     favoritesLabel="Favorites"
     hasInlineFilter={false}
     hasPlaceholderStyle={false}
-    id="reg_katello_ak"
+    id="activation_keys_field"
     inlineFilterPlaceholderText={null}
     inputAutoComplete="off"
     inputIdPrefix=""
@@ -58,7 +58,7 @@ exports[`ActivationKeys renders 1`] = `
     onSelect={[Function]}
     onToggle={[Function]}
     onTypeaheadInputChanged={null}
-    ouiaId="reg-katello-ak"
+    ouiaId="activation-keys-field"
     ouiaSafe={true}
     placeholderText="No Activation keys to select"
     position="left"

data/webpack/components/extensions/RegistrationCommands/fields/ActivationKeys.js

@@ -45,7 +45,7 @@ const ActivationKeys = ({
   return (
     <FormGroup
       label={__('Activation Keys')}
-      fieldId="reg_katello_ak"
+      fieldId="activation_keys_field"
       helperText={hostGroupActivationKeys && sprintf('From host group: %s', hostGroupActivationKeys)}
       helperTextInvalid={activationKeys?.length === 0 ? <a href="/activation_keys/new">{__('Create new activation key')}</a> : __('No Activation Keys selected')}
       validated={validateAKField(hostGroupId, pluginValues?.activationKeys, hostGroupActivationKeys)}
@@ -53,14 +53,14 @@ const ActivationKeys = ({
       isRequired
     >
       <Select
-        ouiaId="reg-katello-ak"
+        ouiaId="activation-keys-field"
         selections={selectedKeys}
         variant={SelectVariant.typeaheadMulti}
         onToggle={() => setIsOpen(!isOpen)}
         onSelect={onSelect}
         onClear={() => updatePluginValues([])}
         isOpen={isOpen}
-        id="reg_katello_ak"
+        id="activation_keys_field"
         className="without_select2"
         isDisabled={isLoading || activationKeys?.length === 0}
         placeholderText={activationKeys?.length === 0 ? __('No Activation keys to select') : ''}