katello 4.13.1 → 4.14.0.rc1

data/app/views/foreman/job_templates/install_errata_by_search_query.erb

@@ -19,9 +19,11 @@ foreign_input_sets:
 <% render_error(N_("No errata matching given search query")) if !input("Errata search query").blank? && advisory_ids.blank? -%>
 # RESOLVED_ERRATA_IDS=<%= advisory_ids.join(',') %>
 
+<%= snippet_if_exists(template_name + " custom pre") %>
 <% if @host.operatingsystem.family == 'Suse' -%>
     <%= render_template('Package Action - Script Default', :action => 'install -n -t patch', :package => advisory_ids.join(' ')) %>
 <% else -%>
     <% advisories = advisory_ids.map { |e| "--advisory=#{e}" }.join(' ') -%>
     <%= render_template('Package Action - Script Default', :action => 'update-minimal', :package => advisories) %>
 <% end -%>
+<%= snippet_if_exists(template_name + " custom post") %>

data/app/views/foreman/job_templates/install_errata_by_search_query_-_katello_ansible_default.erb

@@ -1,7 +1,7 @@
 <%#
 kind: job_template
 name: Install errata by search query - Katello Ansible Default
-job_category: Katello
+job_category: Katello via Ansible
 description_format: 'Install errata %{Errata search query}'
 feature: katello_errata_install_by_search
 provider_type: Ansible
@@ -16,9 +16,11 @@ template_inputs:
 <% render_error(N_("No errata matching given search query")) if !input("Errata search query").blank? && advisory_ids.blank? -%>
 # RESOLVED_ERRATA_IDS=<%= advisory_ids.join(',') %>
 
+<%= snippet_if_exists(template_name + " custom pre") %>
 <% if @host.operatingsystem.family == 'Suse' -%>
 <%= render_template('Run Command - Ansible Default', :command => "zypper -n install -t patch #{advisory_ids.join(' ')}") %>
 <% else -%>
 <% advisories = advisory_ids.map { |e| "--advisory=#{e}" }.join(' ') -%>
 <%= render_template('Run Command - Ansible Default', :command => "yum -y update-minimal #{advisories}") %>
 <% end -%>
+<%= snippet_if_exists(template_name + " custom post") %>

data/app/views/foreman/job_templates/install_packages_by_search_query_-_katello_ansible_default.erb

@@ -1,7 +1,7 @@
 <%#
 kind: job_template
 name: Install packages by search query - Katello Ansible Default
-job_category: Katello
+job_category: Katello via Ansible
 description_format: 'Install package(s) %{Package search query}'
 feature: katello_package_install_by_search
 provider_type: Ansible

data/app/views/foreman/job_templates/remove_packages_by_search_query_-_katello_ansible_default.erb

@@ -1,7 +1,7 @@
 <%#
 kind: job_template
 name: Remove packages by search query - Katello Ansible Default
-job_category: Katello
+job_category: Katello via Ansible
 description_format: 'Remove package(s) %{Packages search query}'
 feature: katello_package_remove_by_search
 provider_type: Ansible
@@ -19,7 +19,7 @@ template_inputs:
 - hosts: all
   tasks:
     - package:
-        name: 
+        name:
 <% package_names.each do |package_name| -%>
           - <%= package_name %>
 <% end -%>

data/app/views/foreman/job_templates/resolve_traces.erb

@@ -20,5 +20,9 @@ reboot = commands.delete('reboot')
 shutdown -r +1
 <% else -%>
 <%= commands.join("\n") %>
-sudo katello-tracer-upload
+RUN_TRACER_CMD='katello-tracer-upload'
+if [ "$(id -u)" -ne 0 ]; then
+  RUN_TRACER_CMD='sudo katello-tracer-upload'
+fi
+$RUN_TRACER_CMD
 <% end %>

data/app/views/foreman/job_templates/update_packages_by_search_query_-_katello_ansible_default.erb

@@ -1,7 +1,7 @@
 <%#
 kind: job_template
 name: Update packages by search query - Katello Ansible Default
-job_category: Katello
+job_category: Katello via Ansible
 description_format: 'Update package(s) %{Packages search query}'
 feature: katello_package_update_by_search
 provider_type: Ansible

data/app/views/foreman/job_templates/upload_profile.erb

@@ -10,6 +10,8 @@ feature: katello_upload_profile
 #!/bin/sh
 <% if @host.operatingsystem.family == 'Redhat' -%>
 dnf uploadprofile --force-upload
+<% elsif @host.operatingsystem.family == 'Suse' -%>
+katello-package-upload --force
 <% else -%>
 package-profile-upload --force-upload
 <% end -%>

data/app/views/foreman/smart_proxies/_reclaim_space.html.erb

@@ -1,10 +1,12 @@
 <div>
   <h3><%= _('Reclaim Space') %></h3>
-  <p translate>
-    <strong>Warning</strong>: reclaiming space will delete all cached content units in "On Demand" repositories on this Smart Proxy.<br>
-    Take precaution when cleaning custom repositories whose upstream parents don't keep old package versions.
-    Storage used by deleted repositories will be reclaimed during the next orphan cleanup run.
-  </p>
+  <% unless Setting[:hide_reclaim_space_warning] %>
+    <p translate>
+      <strong>Warning</strong>: reclaiming space will delete all cached content units in "On Demand" repositories on this Smart Proxy.<br>
+      Take precaution when cleaning custom repositories whose upstream parents don't keep old package versions.
+      Storage used by deleted repositories will be reclaimed during the next orphan cleanup run.
+    </p>
+  <% end %>
   <div class="button">
     <button class="btn btn-default" type="button" id="reclaimSpaceButton" ng-click="reclaimSpace()" translate>
       Reclaim Space

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

@@ -10,13 +10,29 @@ 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 }
+    {
+      id: cve.content_view&.id,
+      name: cve.content_view&.name,
+      composite: cve.content_view&.composite,
+      content_view_version: cve.content_view_version&.version,
+      content_view_version_id: cve.content_view_version&.id,
+      content_view_version_latest: cve.content_view_version&.latest?,
+      content_view_default: cve.content_view&.default?
+    }
   end
   node :lifecycle_environment do |cve|
-    { id: cve.lifecycle_environment.id, name: cve.lifecycle_environment.name }
+    {
+      id: cve.lifecycle_environment&.id,
+      name: cve.lifecycle_environment&.name,
+      lifecycle_environment_library: cve.lifecycle_environment&.library?
+    }
+  end
+  node :candlepin_name do |cve|
+    cve.candlepin_name
   end
 end
 
+# single cv/lce for backward compatibility
 node :content_view do |content_facet|
   content_view = content_facet.single_content_view
   if content_view.present?

data/app/views/katello/api/v2/packages/thindex.json.rabl

@@ -0,0 +1,6 @@
+object false
+
+extends "katello/api/v2/common/metadata"
+child @collection[:results] => :results do |_results|
+  attributes :name, :id
+end

data/app/views/katello/api/v2/repositories/show.json.rabl

@@ -28,6 +28,8 @@ glue(@resource.root) do
   attributes :http_proxy_name
   attributes :retain_package_versions_count
   attributes :metadata_expire
+  attributes :allow_updates? => :allow_updates
+  attributes :is_container_push? => :is_container_push
 
   node :http_proxy do
     attributes :id => @resource.root&.http_proxy&.id, :name => @resource.root&.http_proxy&.name, :policy => @resource.root&.http_proxy_policy
@@ -58,14 +60,12 @@ attributes :promoted? => :promoted
 attributes :content_view_version_id, :library_instance_id
 attributes :last_contents_changed
 
-if @resource.is_a?(Katello::Repository)
-  if @resource.distribution_version || @resource.distribution_arch || @resource.distribution_family || @resource.distribution_variant
-    attributes :distribution_version
-    attributes :distribution_arch
-    attributes :distribution_bootable? => :distribution_bootable
-    attributes :distribution_family
-    attributes :distribution_variant
-  end
+if @resource.is_a?(Katello::Repository) && (@resource.distribution_version || @resource.distribution_arch || @resource.distribution_family || @resource.distribution_variant)
+  attributes :distribution_version
+  attributes :distribution_arch
+  attributes :distribution_bootable? => :distribution_bootable
+  attributes :distribution_family
+  attributes :distribution_variant
 end
 
 node :permissions do |repo|

data/app/views/katello/api/v2/repository_sets/show.json.rabl

@@ -65,7 +65,7 @@ node :enabled_content_override do |pc|
 end
 
 node :redhat do |pc|
-  if pc&.product&.respond_to? :redhat?
+  if pc&.product.respond_to? :redhat?
     pc.product.redhat?
   end
 end

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

@@ -1,4 +1,4 @@
-attributes :id, :uuid, :last_checkin, :service_level, :release_version, :autoheal, :registered_at, :registered_through, :purpose_role, :purpose_usage, :hypervisor
+attributes :id, :uuid, :last_checkin, :service_level, :release_version, :autoheal, :registered_at, :registered_through, :purpose_role, :purpose_usage, :hypervisor, :convert2rhel_through_foreman
 
 child :user => :user do
   attributes :id, :login

data/app/views/katello/api/v2/subscriptions/index.json.rabl

@@ -6,5 +6,6 @@ extends 'katello/api/v2/subscriptions/permissions'
 
 child @collection[:results] => :results do
   attributes :quantity_attached
+  attributes :product_host_count
   extends "katello/api/v2/subscriptions/base"
 end

data/app/views/katello/api/v2/subscriptions/show.json.rabl

@@ -6,6 +6,7 @@ attributes :arch
 attributes :description
 attributes :support_type
 attributes :roles, :usage, :addons
+attributes :product_host_count
 
 node(:host_count) do |subscription|
   subscription.hosts.count

data/app/views/overrides/activation_keys/_host_environment_select.html.erb

@@ -16,24 +16,26 @@
 <% cs_select_name =  using_hostgroups_page? ? 'hostgroup[content_source_id]' : 'host[content_facet_attributes][content_source_id]' %>
 <% cs_select_attr = using_hostgroups_page? ? 'content_source' : 'content_facet.content_source' %>
 
-<%= field(f, cs_select_attr, {:label => _("Content Source")}) do
-  if using_hostgroups_page?
-    select_tag cs_select_id, content_source_options(@hostgroup, :include_blank => blank_or_inherit_with_id(f, :content_source)), :data => {"spinner_path" => spinner_path},
-               :class => 'form-control',  :name => cs_select_name
-  else
-    select_tag cs_select_id, content_source_options(@host, :selected_host_group => @hostgroup || @host.hostgroup, :include_blank => blank_or_inherit_with_id(f, :content_source)), :data => {"spinner_path" => spinner_path}, :class => 'form-control',  :name => cs_select_name, :disabled => cv_lce_disabled?
-  end
-end %>
+<%= field(f, cs_select_attr, {:label => _("Content Source"), :help_inline => content_source_inherited?(@host) ? 'Inherited from host group' : nil }) do %>
+  <% if using_hostgroups_page? %>
+    <%= select_tag cs_select_id, content_source_options(@hostgroup, :include_blank => blank_or_inherit_with_id(f, :content_source)), :data => {"spinner_path" => spinner_path},
+               :class => 'form-control',  :name => cs_select_name %>
+  <% else %>
+    <%= hidden_field_tag 'host[content_facet_attributes][content_source_id]', fetch_content_source(@host).try(:id) %>
+    <%= select_tag cs_select_id, content_source_options(@host, :selected_host_group => @hostgroup || @host.hostgroup, :include_blank => blank_or_inherit_with_id(f, :content_source)), :data => {"spinner_path" => spinner_path}, :class => 'form-control',  :name => cs_select_name, :disabled => cv_lce_disabled? %>
+  <% end %>
+<% end %>
 
 <% env_select_id = using_hostgroups_page? ? :hostgroup_lifecycle_environment_id : :host_lifecycle_environment_id %>
 <% env_select_name =  using_hostgroups_page? ? 'hostgroup[lifecycle_environment_id]' : 'host[content_facet_attributes][lifecycle_environment_id]' %>
 <% env_select_attr = using_hostgroups_page? ? 'lifecycle_environment' : 'content_facet.single_lifecycle_environment' %>
 
-<%= field(f, env_select_attr, {:label => _("Lifecycle Environment")}) do %>
+<%= field(f, env_select_attr, {:label => _("Lifecycle Environment"), :help_inline => lifecycle_environment_inherited?(@host) ? 'Inherited from host group' : nil}) do %>
   <% if using_hostgroups_page? %>
     <%= select_tag env_select_id, lifecycle_environment_options(@hostgroup, :include_blank => blank_or_inherit_with_id(f, :lifecycle_environment)), :class => 'form-control',  :name => env_select_name %>
   <% elsif cv_lce_disabled? %>
-    <%= hidden_field_tag 'host[content_facet_attributes][lifecycle_environment_id]', fetch_lifecycle_environment(@host).try(:id) %>
+    <% host_or_hostgroup_lce = (@host.lifecycle_environments.empty? && @host.hostgroup.present? && @host.hostgroup.lifecycle_environment.present?) ? fetch_lifecycle_environment(@host.hostgroup) : fetch_lifecycle_environment(@host) %>
+    <%= hidden_field_tag 'host[content_facet_attributes][lifecycle_environment_id]', host_or_hostgroup_lce.try(:id) %>
     <%= select_tag env_select_id, lifecycle_environment_options(@host, :selected_host_group => @hostgroup || @host.hostgroup, :include_blank => blank_or_inherit_with_id(f, :lifecycle_environment)), :class => 'form-control',  :name => env_select_name, :disabled => true %>
   <% else %>
     <%= select_tag env_select_id, lifecycle_environment_options(@host, :selected_host_group => @hostgroup || @host.hostgroup, :include_blank => blank_or_inherit_with_id(f, :lifecycle_environment)), :class => 'form-control',  :name => env_select_name %>
@@ -43,7 +45,8 @@ end %>
 <% cv_select_id =  using_hostgroups_page? ? :hostgroup_content_view_id : :host_content_view_id %>
 <% cv_select_name =  using_hostgroups_page? ? 'hostgroup[content_view_id]' : 'host[content_facet_attributes][content_view_id]' %>
 <% cv_select_attr = using_hostgroups_page? ? 'content_view' : 'content_facet.single_content_view' %>
-<%= field(f, cv_select_attr, {:label => _("Content View")}) do %>
+
+<%= field(f, cv_select_attr, {:label => _("Content View"), :help_inline => content_view_inherited?(@host) ? 'Inherited from host group' : nil}) do %>
   <% if using_hostgroups_page? %>
     <%= select_tag cv_select_id,  content_views_for_host(@hostgroup, :include_blank => blank_or_inherit_with_id(f, :content_view)), :data => {"spinner_path" => spinner_path}, :class => 'form-control',  :name => cv_select_name %>
   <% elsif cv_lce_disabled? %>

data/app/views/overrides/activation_keys/_host_synced_content_select.html.erb

@@ -18,10 +18,10 @@
 
 <% spinner_path = asset_path('spinner.gif') %>
 
-<%= field(f, ks_repo_select_attr, {:label => _("Synced Content")}) do
-  select_tag ks_repo_select_id,  view_to_options(kickstart_options, kickstart_repo_id, blank_or_inherit_with_id(f, :kickstart_repository)), :data => {"spinner_path" => spinner_path, "kickstart-repository-id" => kickstart_repo_id},
-             :class => 'form-control',  :name => ks_repo_select_name, :disabled => kickstart_options.empty?
-end %>
+<%= field(f, ks_repo_select_attr, {:label => _("Synced Content"), :help_inline => kickstart_repo_inheritable?(@host) ? 'Automatically selected from content source, lifecycle environment, content_view, architecture, and operating system' : nil}) do %>
+  <%= select_tag ks_repo_select_id,  view_to_options(kickstart_options, kickstart_repo_id, blank_or_inherit_with_id(f, :kickstart_repository)), :data => {"spinner_path" => spinner_path, "kickstart-repository-id" => kickstart_repo_id},
+             :class => 'form-control',  :name => ks_repo_select_name, :disabled => kickstart_options.empty? %>
+<% end %>
 
 <% content_for(:javascripts) do -%>
   <script>

data/config/routes/api/v2.rb

@@ -266,6 +266,8 @@ Katello::Engine.routes.draw do
           end
         end
 
+        match "/packages/thindex" => "packages#thindex", :via => :get
+
         api_resources :packages, :only => [:index, :show] do
           collection do
             get :auto_complete_search
@@ -429,7 +431,7 @@ Katello::Engine.routes.draw do
           api_resources :packages, :only => [:index, :show]
           api_resources :package_groups, :only => [:index, :show]
           api_resources :files, :only => [:index, :show], :controller => 'file_units'
-          api_resources :errata, :only => [:index, :show], :constraints => {:id => /[0-9a-zA-Z\-\+%_.:]+/}
+          api_resources :errata, :only => [:index, :show], :constraints => {:id => /[0-9a-zA-Z\-+%_.:]+/}
           api_resources :docker_manifests, :only => [:index, :show]
           api_resources :docker_manifest_lists, :only => [:index, :show]
           api_resources :docker_tags, :only => [:index, :show]

data/config/routes.rb

@@ -10,9 +10,7 @@ Katello::Engine.routes.draw do
       end
     end
 
-    if Katello.with_remote_execution?
-      match '/remote_execution' => 'remote_execution#create', :via => [:post]
-    end
+    match '/remote_execution' => 'remote_execution#create', :via => [:post]
   end
 
   get '/katello/providers/redhat_provider', to: redirect('/redhat_repositories')

data/db/migrate/20160114200145_add_mirror_on_sync_to_repositories.rb

@@ -2,6 +2,7 @@ class AddMirrorOnSyncToRepositories < ActiveRecord::Migration[4.2]
   class RepositoryMirrorOnSync < ApplicationRecord
     self.table_name = "katello_repositories"
   end
+
   def change
     add_column :katello_repositories, :mirror_on_sync, :boolean, :default => true, :null => false
     RepositoryMirrorOnSync.update_all(:mirror_on_sync => false)

data/db/migrate/20160131182301_add_download_policy_to_katello_repositories.rb

@@ -2,6 +2,7 @@ class AddDownloadPolicyToKatelloRepositories < ActiveRecord::Migration[4.2]
   class DownloadPolicyRepository < ApplicationRecord
     self.table_name = "katello_repositories"
   end
+
   def change
     add_column :katello_repositories, :download_policy, :string, :limit => 255
     DownloadPolicyRepository.where(content_type: 'yum').update_all(download_policy: 'immediate')

data/db/migrate/20210119162528_delete_puppet_and_ostree_repos.rb

@@ -14,12 +14,15 @@ class DeletePuppetAndOstreeRepos < ActiveRecord::Migration[6.0]
   class FakeContentViewPuppetEnvironment < Katello::Model
     self.table_name = 'katello_content_view_puppet_environments'
   end
+
   class FakePuppetModule < Katello::Model
     self.table_name = 'katello_puppet_modules'
   end
+
   class FakeRepositoryOstreeBranch < Katello::Model
     self.table_name = 'katello_repository_ostree_branches'
   end
+
   class FakeOstreeBranch < Katello::Model
     self.table_name = 'katello_ostree_branches'
   end

data/db/migrate/20240522165308_add_priority_to_content_view_environment_content_facet.rb

@@ -0,0 +1,5 @@
+class AddPriorityToContentViewEnvironmentContentFacet < ActiveRecord::Migration[6.1]
+  def change
+    add_column :katello_content_view_environment_content_facets, :priority, :integer, default: 0, null: false
+  end
+end

data/db/migrate/20240621121212_katello_repository_debs_id_bigint.rb

@@ -0,0 +1,6 @@
+class KatelloRepositoryDebsIdBigint < ActiveRecord::Migration[6.1]
+  def change
+    change_column :katello_repository_debs, :id, :bigint
+    execute 'ALTER SEQUENCE katello_repository_debs_id_seq AS bigint;'
+  end
+end

data/db/migrate/20240729192228_add_convert2rhel_to_host_facets.rb

@@ -0,0 +1,9 @@
+class AddConvert2rhelToHostFacets < ActiveRecord::Migration[6.1]
+  def up
+    add_column :katello_subscription_facets, :convert2rhel_through_foreman, :int4
+  end
+
+  def down
+    remove_column :subscription_facets, :convert2rhel_through_foreman
+  end
+end

data/db/seeds.d/102-organizations.rb

@@ -8,12 +8,10 @@ unless Rails.env.test?
   ::Katello::OrganizationCreator.seed_all_organizations!
 end
 
-if ENV['SEED_ORGANIZATION']
-  if Setting['db_pending_seed']
-    admin = User.where(:login => ENV['SEED_ADMIN_USER'].present? ? ENV['SEED_ADMIN_USER'] : 'admin').first
-    if admin && admin.default_organization.nil?
-      admin.default_organization = Organization.find_by(:name => ENV['SEED_ORGANIZATION'])
-      admin.save!
-    end
+if ENV['SEED_ORGANIZATION'] && (Setting['db_pending_seed'])
+  admin = User.where(:login => ENV['SEED_ADMIN_USER'].present? ? ENV['SEED_ADMIN_USER'] : 'admin').first
+  if admin && admin.default_organization.nil?
+    admin.default_organization = Organization.find_by(:name => ENV['SEED_ORGANIZATION'])
+    admin.save!
   end
 end

data/db/seeds.d/150-module_job_templates.rb

@@ -1,12 +1,10 @@
-if Katello.with_remote_execution?
-  User.as_anonymous_admin do
-    JobTemplate.without_auditing do
-      module_template = JobTemplate.find_by(name: 'Module Action - Script Default')
-      if module_template
-        module_template.sync_feature('katello_module_stream_action')
-        module_template.organizations << Organization.unscoped.all if module_template.organizations.empty?
-        module_template.locations << Location.unscoped.all if module_template.locations.empty?
-      end
+User.as_anonymous_admin do
+  JobTemplate.without_auditing do
+    module_template = JobTemplate.find_by(name: 'Module Action - Script Default')
+    if module_template
+      module_template.sync_feature('katello_module_stream_action')
+      module_template.organizations << Organization.unscoped.all if module_template.organizations.empty?
+      module_template.locations << Location.unscoped.all if module_template.locations.empty?
     end
   end
 end

data/db/seeds.d/75-job_templates.rb

@@ -1,20 +1,13 @@
-if Katello.with_remote_execution?
-  User.as_anonymous_admin do
-    JobTemplate.without_auditing do
-      template_files = Dir[File.join("#{Katello::Engine.root}/app/views/foreman/job_templates/**/*.erb")]
-      template_files.reject! { |file| file.end_with?('_ansible_default.erb') } unless Katello.with_ansible?
-      template_files.each do |template|
-        sync = !Rails.env.test? && Setting[:remote_execution_sync_templates]
-        # import! was renamed to import_raw! around 1.3.1
-        if JobTemplate.respond_to?('import_raw!')
-          template = JobTemplate.import_raw!(File.read(template), :default => true, :lock => true, :update => sync)
-        else
-          template = JobTemplate.import!(File.read(template), :default => true, :lock => true, :update => sync)
-        end
+User.as_anonymous_admin do
+  JobTemplate.without_auditing do
+    template_files = Dir[File.join("#{Katello::Engine.root}/app/views/foreman/job_templates/**/*.erb")]
+    template_files.reject! { |file| file.end_with?('_ansible_default.erb') } unless Katello.with_ansible?
+    template_files.each do |template|
+      sync = !Rails.env.test? && Setting[:remote_execution_sync_templates]
+      template = JobTemplate.import_raw!(File.read(template), :default => true, :lock => true, :update => sync)
 
-        template.organizations << Organization.unscoped.all if template&.organizations&.empty?
-        template.locations << Location.unscoped.all if template&.locations&.empty?
-      end
+      template.organizations << Organization.unscoped.all if template&.organizations&.empty?
+      template.locations << Location.unscoped.all if template&.locations&.empty?
     end
   end
 end

data/engines/bastion_katello/README.md

@@ -10,8 +10,11 @@ The only real difference, as far as the user is concerned, is that the applicati
 sudo dnf -y install epel-release epel-next-release
 sudo dnf -y install npm chromium-headless chromium
 cd ./engines/bastion_katello
+sudo npm install -g bower
 sudo npm install -g grunt-cli
 npm install
+cd ../bastion
+npm install
 ```
 
 ```

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/content-hosts/content/content-host-errata.controller.js

@@ -62,14 +62,14 @@ angular.module('Bastion.content-hosts').controller('ContentHostErrataController'
                 previousEnv;
 
             if (host.hasContent()) {
-                currentEnv = translate("Current Lifecycle Environment (%e/%cv)").replace("%e", host.content_facet_attributes.lifecycle_environment.name).replace("%cv", host.content_facet_attributes.content_view_name);
+                currentEnv = translate("Current Lifecycle Environment (%e/%cv)").replace("%e", host.content_facet_attributes.lifecycle_environment.name).replace("%cv", host.content_facet_attributes.content_view.name);
                 $scope.errataOptions = [{name: currentEnv, label: 'current', order: 3}];
 
                 if (!host['content_facet_attributes']['lifecycle_environment_library?']) {
                     Environment.get({id: host['content_facet_attributes'].lifecycle_environment.id}).$promise.then(function (env) {
-                        previousEnv = translate("Previous Lifecycle Environment (%e/%cv)").replace('%e', env.prior.name).replace("%cv", host.content_facet_attributes.content_view_name);
+                        previousEnv = translate("Previous Lifecycle Environment (%e/%cv)").replace('%e', env.prior.name).replace("%cv", host.content_facet_attributes.content_view.name);
                         $scope.errataOptions.push({name: previousEnv,
-                                                   label: 'prior', order: 2, 'content_view_id': host.content_facet_attributes.content_view_id, 'environment_id': env.prior.id});
+                                                   label: 'prior', order: 2, 'content_view_id': host.content_facet_attributes.content_view.id, 'environment_id': env.prior.id});
 
                     });
                 }

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/debs/details/views/deb-info.html

@@ -9,10 +9,10 @@
       <dd>
         <i class="fa fa-spinner fa-spin" ng-show="installedDebCount === undefined"></i>
         <span ng-show="installedDebCount !== undefined">
-          <a ng-if="newHostDetailsUI" href="{{ '/hosts?search=' + createSearchString('installed_deb') }}" translate>
+          <a ng-if="newHostDetailsUI" href="{{ '/hosts?search=' + createSearchString('installed_deb') }}" target="_blank" rel="noreferrer noopener" translate>
             {{ installedDebCount }} Host(s)
           </a>
-          <a ng-if="!newHostDetailsUI" href="{{ '/content_hosts?search=' + createSearchString('installed_deb') }}" translate>
+          <a ng-if="!newHostDetailsUI" href="{{ '/content_hosts?search=' + createSearchString('installed_deb') }}" target="_blank" rel="noreferrer noopener" translate>
             {{ installedDebCount }} Host(s)
           </a>
         </span>
@@ -20,20 +20,20 @@
 
       <dt translate>Applicable To</dt>
       <dd>
-        <a ng-if="newHostDetailsUI" href="{{ '/hosts?search=' + createSearchString('applicable_debs') }}" translate>
+        <a ng-if="newHostDetailsUI" href="{{ '/hosts?search=' + createSearchString('applicable_debs') }}" target="_blank" rel="noreferrer noopener" translate>
           {{ deb.hosts_applicable_count }} Host(s)
         </a>
-        <a ng-if="!newHostDetailsUI" href="{{ '/content_hosts?search=' + createSearchString('applicable_debs') }}" translate>
+        <a ng-if="!newHostDetailsUI" href="{{ '/content_hosts?search=' + createSearchString('applicable_debs') }}" target="_blank" rel="noreferrer noopener" translate>
           {{ deb.hosts_applicable_count }} Host(s)
         </a>
       </dd>
 
       <dt translate>Upgradable For</dt>
       <dd>
-        <a ng-if="newHostDetailsUI" href="{{ '/hosts?search=' + createSearchString('upgradable_debs') }}" translate>
+        <a ng-if="newHostDetailsUI" href="{{ '/hosts?search=' + createSearchString('upgradable_debs') }}" target="_blank" rel="noreferrer noopener" translate>
           {{ deb.hosts_available_count }} Host(s)
         </a>
-        <a ng-if="!newHostDetailsUI" href="{{ '/content_hosts?search=' + createSearchString('upgradable_debs') }}" translate>
+        <a ng-if="!newHostDetailsUI" href="{{ '/content_hosts?search=' + createSearchString('upgradable_debs') }}" target="_blank" rel="noreferrer noopener" translate>
           {{ deb.hosts_available_count }} Host(s)
         </a>
       </dd>

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/errata/details/views/erratum-content-hosts.html

@@ -68,8 +68,8 @@
             </span>
           </td>
           <td bst-table-cell>{{ contentHost.operatingsystem_name }}</td>
-          <td bst-table-cell>{{ contentHost.content_facet_attributes.lifecycle_environment_name }}</td>
-          <td bst-table-cell>{{ contentHost.content_facet_attributes.content_view_name || "" }}</td>
+          <td bst-table-cell>{{ contentHost.content_facet_attributes.lifecycle_environment.name }}</td>
+          <td bst-table-cell>{{ contentHost.content_facet_attributes.content_view.name || "" }}</td>
         </tr>
       </tbody>
     </table>

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

@@ -1938,10 +1938,6 @@ msgstr ""
 msgid "Finished At"
 msgstr ""
 
-#: app/assets/javascripts/bastion_katello/products/details/repositories/new/views/new-repository.html
-msgid "For older operating systems such as Red Hat Enterprise Linux 5 or CentOS 5 it is recommended to use sha1."
-msgstr ""
-
 #: app/assets/javascripts/bastion_katello/products/details/repositories/new/views/new-repository.html
 msgid ""
 "For On Demand synchronization, only the metadata is downloaded during sync and packages are fetched and stored on the filesystem when clients request them.\n"
@@ -4282,6 +4278,10 @@ msgstr ""
 msgid "The selected environment contains no Content Views, please select a different environment."
 msgstr ""
 
+#: app/assets/javascripts/bastion_katello/products/details/repositories/details/views/repository-info.html
+msgid "The sha1 checksum type is no longer supported. The checksum type will reset to 'Default' at the next edit or change in content."
+msgstr ""
+
 #: app/assets/javascripts/bastion_katello/sync-plans/new/views/new-sync-plan-form.html
 msgid "The time the sync should happen in your current time zone."
 msgstr ""

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/packages/details/views/package-info.html

@@ -9,10 +9,10 @@
       <dd>
         <i class="fa fa-spinner fa-spin" ng-show="installedPackageCount === undefined"></i>
         <span ng-show="installedPackageCount !== undefined">
-          <a ng-if="newHostDetailsUI" href="{{ newHostUrl('installed_package') }}" translate>
+          <a ng-if="newHostDetailsUI" href="{{ newHostUrl('installed_package') }}" target="_blank" rel="noreferrer noopener" translate>
             {{ installedPackageCount }} Host(s)
           </a>
-          <a ng-if="!newHostDetailsUI" href="{{ encodedUrl('installed_package') }}" translate>
+          <a ng-if="!newHostDetailsUI" href="{{ encodedUrl('installed_package') }}" target="_blank" rel="noreferrer noopener" translate>
             {{ installedPackageCount }} Host(s)
           </a>
         </span>
@@ -20,20 +20,20 @@
 
       <dt translate>Applicable To</dt>
       <dd>
-        <a ng-if="newHostDetailsUI" href="{{ newHostUrl('applicable_rpms') }}" translate>
+        <a ng-if="newHostDetailsUI" href="{{ newHostUrl('applicable_rpms') }}" target="_blank" rel="noreferrer noopener" translate>
           {{ package.hosts_applicable_count }} Host(s)
         </a>
-        <a ng-if="!newHostDetailsUI" href="{{ encodedUrl('applicable_rpms') }}" translate>
+        <a ng-if="!newHostDetailsUI" href="{{ encodedUrl('applicable_rpms') }}" target="_blank" rel="noreferrer noopener" translate>
           {{ package.hosts_applicable_count }} Host(s)
         </a>
       </dd>
 
       <dt translate>Upgradable For</dt>
       <dd>
-        <a ng-if="newHostDetailsUI" href="{{ newHostUrl('upgradable_rpms') }}" translate>
+        <a ng-if="newHostDetailsUI" href="{{ newHostUrl('upgradable_rpms') }}" target="_blank" rel="noreferrer noopener" translate>
           {{ package.hosts_available_count }} Host(s)
         </a>
-        <a ng-if="!newHostDetailsUI" href="{{ encodedUrl('upgradable_rpms') }}" translate>
+        <a ng-if="!newHostDetailsUI" href="{{ encodedUrl('upgradable_rpms') }}" target="_blank" rel="noreferrer noopener" translate>
           {{ package.hosts_available_count }} Host(s)
         </a>
       </dd>