katello 4.8.4 → 4.9.0.rc1

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

@@ -1,4 +1,6 @@
 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
@@ -8,15 +10,6 @@ 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?
@@ -38,6 +31,14 @@ 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/api/v2/content_view_repositories/show_all.json.rabl

@@ -6,3 +6,9 @@ child @collection[:results] => :results do
   extends 'katello/api/v2/repositories/base'
   node(:added_to_content_view) { |repo| repo.in_content_view?(@content_view) }
 end
+
+if @organization
+  node :org_repository_count do
+    @organization.repositories.count
+  end
+end

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

@@ -75,7 +75,7 @@ child :environments => :environments do
 end
 
 child :archived_repos => :repositories do
-  attributes :id, :name, :label, :content_type, :library_instance_id
+  attributes :id, :name, :label, :content_type, :library_instance_id, :mirroring_policy
 end
 
 child :last_event => :last_event do
@@ -85,3 +85,13 @@ end
 child :active_history => :active_history do
   extends 'katello/api/v2/content_view_histories/show'
 end
+
+node :filters_applied do |cv_version|
+  cv_version.filters_applied?
+end
+
+if ::Foreman::Cast.to_bool(params.fetch(:include_applied_filters, false))
+  node :applied_filters do |cv_version|
+    cv_version.applied_filters
+  end
+end

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

@@ -12,6 +12,8 @@ attributes :import_only
 attributes :generated_for
 attributes :related_cv_count
 attributes :related_composite_cvs
+attributes :needs_publish? => :needs_publish
+attributes :filtered? => :filtered
 
 node :next_version do |content_view|
   content_view.next_version.to_f.to_s
@@ -66,6 +68,7 @@ child :versions => :versions do
   attributes :id, :version
   attributes :created_at => :published
   attributes :environment_ids
+  attributes :filters_applied? => :filters_applied
 end
 
 if params.key?(:include_permissions)

data/app/views/katello/api/v2/docker_tags/_base.json.rabl

@@ -22,6 +22,10 @@ child :repositories => :repositories do
   attributes :id, :name, :full_path
 end
 
+node :upstream_name do |item|
+  item.upstream_name
+end
+
 child :product => :product do
   attributes :id, :name
 end

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

@@ -6,6 +6,16 @@ extends 'katello/api/v2/common/org_reference'
 attributes :library
 attributes :registry_name_pattern, :registry_unauthenticated_pull
 
+if @content_source.present?
+  node :content_source do |env|
+    {
+      :name => @content_source.name,
+      :id => @content_source_id,
+      :environment_is_associated => env.content_source_associated?(@content_source)
+    }
+  end
+end
+
 node :prior do |env|
   if env.prior
     {name: env.prior.name, :id => env.prior.id}

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

@@ -0,0 +1 @@
+object false

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

@@ -5,3 +5,9 @@ extends "katello/api/v2/common/metadata"
 child @collection[:results] => :results do
   extends "katello/api/v2/repositories/base"
 end
+
+if @organization
+  node :org_repository_count do
+    @organization.repositories.count
+  end
+end

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

@@ -28,6 +28,7 @@ glue(@resource.root) do
   attributes :http_proxy_id
   attributes :http_proxy_name
   attributes :retain_package_versions_count
+  attributes :metadata_expire
 
   node :http_proxy do
     attributes :id => @resource.root&.http_proxy&.id, :name => @resource.root&.http_proxy&.name, :policy => @resource.root&.http_proxy_policy

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

@@ -38,11 +38,11 @@ child @resource.repositories => :repositories do
 end
 
 node :archRestricted do |pc|
-  pc.arch
+  pc.repositories&.first&.arch
 end
 
 node :osRestricted do |pc|
-  pc.os_versions&.first
+  pc.repositories&.first&.os_versions&.first
 end
 
 node :override do |pc|
@@ -63,3 +63,9 @@ node :enabled_content_override do |pc|
     override&.computed_value
   end
 end
+
+node :redhat do |pc|
+  if pc&.product&.respond_to? :redhat?
+    pc.product.redhat?
+  end
+end

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

@@ -5,6 +5,26 @@
     option.kt-cv  { margin-left: 1em; }
 </style>
 <% spinner_path = asset_path('spinner.gif') %>
+<% edit_action = params[:action] == 'edit' %>
+
+<% if edit_action && !using_hostgroups_page? %>
+  <div style="margin-left: 270px">
+    <%= link_to _("Change content source"), "/change_host_content_source?host_id=#{@host.id}" %>
+  </div>
+<% end %>
+
+<% cs_select_id =  using_hostgroups_page? ? :content_source_id : :content_source_id %>
+<% 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 => edit_action
+  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]' %>
@@ -15,7 +35,7 @@
     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
   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
+    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 => edit_action
   end
 end %>
 
@@ -27,19 +47,6 @@ end %>
     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
   else
-    select_tag cv_select_id,  content_views_for_host(@host, :selected_host_group => @hostgroup || @host.hostgroup, :include_blank => blank_or_inherit_with_id(f, :content_view)), :data => {"spinner_path" => spinner_path}, :class => 'form-control',  :name => cv_select_name
-  end
-end %>
-
-<% cs_select_id =  using_hostgroups_page? ? :content_source_id : :content_source_id %>
-<% 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
+    select_tag cv_select_id,  content_views_for_host(@host, :selected_host_group => @hostgroup || @host.hostgroup, :include_blank => blank_or_inherit_with_id(f, :content_view)), :data => {"spinner_path" => spinner_path}, :class => 'form-control',  :name => cv_select_name, :disabled => edit_action
   end
 end %>

data/app/views/smart_proxies/_disk_usage.html.erb

@@ -4,6 +4,7 @@
       <%= disk['header'] %>
     </div>
 
+    <%- if disk['used'] >= 0 && disk['total'] >= 0 -%>
     <div class="progress progress-label-top-right">
       <div class="progress-bar progress-bar-<%= disk['size_status'] %>" role="progressbar" aria-valuenow="<%= disk['percentage'] %>" aria-valuemin="0" aria-valuemax="100" style="width: <%= disk['percentage'] %>%;" data-toggle="tooltip" title="<%= _('%s Used') % humanize_bytes(disk['used']) %>">
         <span><strong><%= _('%{used} of %{total}') % {:used => humanize_bytes(disk['used']),:total => humanize_bytes(disk['total'])} %></strong> Used</span>
@@ -13,5 +14,6 @@
         <span class="sr-only"><%= _('%s Available') % humanize_bytes(disk['free']) %></span>
       </div>
     </div>
+    <%- end -%>
   </div>
 </div>

data/ca/redhat-uep.pem

@@ -1,50 +1,50 @@
 -----BEGIN CERTIFICATE-----
-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
-iRZpyzOZmeineJvhrJZ4Tvs=
+MIIG/jCCBOagAwIBAgICAtYwDQYJKoZIhvcNAQELBQAwgbExCzAJBgNVBAYTAlVT
+MRcwFQYDVQQIDA5Ob3J0aCBDYXJvbGluYTEWMBQGA1UECgwNUmVkIEhhdCwgSW5j
+LjEYMBYGA1UECwwPUmVkIEhhdCBOZXR3b3JrMTEwLwYDVQQDDChSZWQgSGF0IEVu
+dGl0bGVtZW50IE9wZXJhdGlvbnMgQXV0aG9yaXR5MSQwIgYJKoZIhvcNAQkBFhVj
+YS1zdXBwb3J0QHJlZGhhdC5jb20wHhcNMjIwMTIxMTcyNDU1WhcNMzAwNDI0MTcy
+NDU1WjCBrjELMAkGA1UEBhMCVVMxFzAVBgNVBAgMDk5vcnRoIENhcm9saW5hMRYw
+FAYDVQQKDA1SZWQgSGF0LCBJbmMuMRgwFgYDVQQLDA9SZWQgSGF0IE5ldHdvcmsx
+LjAsBgNVBAMMJVJlZCBIYXQgRW50aXRsZW1lbnQgUHJvZHVjdCBBdXRob3JpdHkx
+JDAiBgkqhkiG9w0BCQEWFWNhLXN1cHBvcnRAcmVkaGF0LmNvbTCCAiIwDQYJKoZI
+hvcNAQEBBQADggIPADCCAgoCggIBANkLqzHgFZwh1bLmTUM3IljHaXeCwFZNnhro
+DdHMZgac6FSPJSLCTpiZKTgLhTkDF/Qga/EbkMoOK9fzh/634ZuhYBiMPEximaFg
+v9QfbXmak4jPOZOv9RkTcXZOnVCu+x1TtDzCCrTQR0cSLF3EcydavruVjwXrPaRF
+Rp24nUzVJJJ60iHcp0yXKgCPyNFQLKi6l/O1yUs1yr0YpRPqf3yx5lUwH35dQp/w
+8ilC8Z2u6KMqyip36nkOXSvGjK9QEkNcKYVqIS43oJcvVdGphIvhx1pzi/LaMScv
+L1lE1M8wL2eGU7U1dusRnrWWVhGjcr+2Ar9gHsY3AUNsfno6xSa1TaPY4sx0tOhy
+vFIB1QyoZlXAHtv+cqyQoygy8INRSX4ysIc4S2HTVQno6cvAh0J3cDtBF9YR7/wH
+z0UwJq+aj4RxQ/rriK2K0i1KYDC5lmvXYpyXBnipQNSibxuXphjDN5OuF6+3SU6F
+6OZaBsmepbyjyCi5n3lzEVv+Pgass8GztYuGiBwGXEjwxRilsLrxdIlVGFFFccNJ
+76j2QOK6Kufo/2Es9KuVxlYIiLd+IbZb7py6fyAhmCQUesxB3AfWmRiXQ3Cb6GGY
+8OxqYcOpRRek2uIpqMoRhAlio3dYqbN6KXDfg5VNMglK3CF1SFwJ5E8LuaHDoAJM
+a3/+hY6nAgMBAAGjggEfMIIBGzAdBgNVHQ4EFgQUlv27HEBA/0CErbIfCybBw2pv
+1nwwgeUGA1UdIwSB3TCB2oAUxEl4VkWdHixhYMNmS1gFNy8DInuhgbakgbMwgbAx
+CzAJBgNVBAYTAlVTMRcwFQYDVQQIDA5Ob3J0aCBDYXJvbGluYTEQMA4GA1UEBwwH
+UmFsZWlnaDEWMBQGA1UECgwNUmVkIEhhdCwgSW5jLjEYMBYGA1UECwwPUmVkIEhh
+dCBOZXR3b3JrMR4wHAYDVQQDDBVFbnRpdGxlbWVudCBNYXN0ZXIgQ0ExJDAiBgkq
+hkiG9w0BCQEWFWNhLXN1cHBvcnRAcmVkaGF0LmNvbYIJAJGKz8qFAAAAMBIGA1Ud
+EwEB/wQIMAYBAf8CAQAwDQYJKoZIhvcNAQELBQADggIBAAHXJaMuS/lKEdlmewTU
+0pKjTBpFfRSxQP1xO7stDfTDggeDSyzDx/iibX/hfw6x/Y2AyU2MtqSAiiTyYuB4
+kmK0QhqSnOzwANSpy1zn5SvB9LxO3H0v2KV6J9uJjL3v+h2zxHRo5O0X0ZxfKQS6
+5dd52S8aEvSVnxoLyr4JLxF9nEW0Dp1cu9P2qPdRWLQSLJEsbsv454KsyGsOfT3o
+YYgD8+oddMR042s5yNegBj4TohMgaeNREr7kjZzJZ+z7kgCupSSq0SG2KfihwaC1
+hju/dUq9me9JkW7hztxUrZVvrZR+hnlpD+taSDuR9JO9xLrDDfxRa377IyYjlkQW
+hdjquuo4jKWp13Vjf9/z+kuui3YFupqvbnSGoV8f2sME0Yh5DFppKLaVzTxljH3K
+YUqyfdVToqsApcWqmSLUwXDhjTzgehqIcQfyK/Klx5+wm4jsKBUeSalS684ML8iT
+8+LNjw8eMBX5sM9ZuiU4tpqFoXiwrYwk05RPLI6Rr5kunRIfRvSnQJ07pMTfSmtx
+Qrz8crKhTY3+HxiZJ/486bOQm+Bz3rf2DyZopY06Q2sm79Y3ax/j3vdYyBEoKzuU
+YjTwYnAoxQWrjgbpvutdTlVTgTrRz2NSEgPyX59LQWa6+zFMbvAt0y8FW76p+e+p
+PQBPkUhYa+TflZocXlPSXau9
 -----END CERTIFICATE-----
 -----BEGIN CERTIFICATE-----
-MIIGejCCBGKgAwIBAgIJAJGKz8qFAAAIMA0GCSqGSIb3DQEBDAUAMIGwMQswCQYD
+MIIGejCCBGKgAwIBAgIJAJGKz8qFAAAAMA0GCSqGSIb3DQEBCwUAMIGwMQswCQYD
 VQQGEwJVUzEXMBUGA1UECAwOTm9ydGggQ2Fyb2xpbmExEDAOBgNVBAcMB1JhbGVp
 Z2gxFjAUBgNVBAoMDVJlZCBIYXQsIEluYy4xGDAWBgNVBAsMD1JlZCBIYXQgTmV0
 d29yazEeMBwGA1UEAwwVRW50aXRsZW1lbnQgTWFzdGVyIENBMSQwIgYJKoZIhvcN
-AQkBFhVjYS1zdXBwb3J0QHJlZGhhdC5jb20wHhcNMTgwOTEyMTgxMzIxWhcNMzAw
-MzE1MTgxMzIxWjCBsTELMAkGA1UEBhMCVVMxFzAVBgNVBAgMDk5vcnRoIENhcm9s
+AQkBFhVjYS1zdXBwb3J0QHJlZGhhdC5jb20wHhcNMjIwMTIxMTYyOTA1WhcNMzIw
+MTE5MTYyOTA1WjCBsTELMAkGA1UEBhMCVVMxFzAVBgNVBAgMDk5vcnRoIENhcm9s
 aW5hMRYwFAYDVQQKDA1SZWQgSGF0LCBJbmMuMRgwFgYDVQQLDA9SZWQgSGF0IE5l
 dHdvcmsxMTAvBgNVBAMMKFJlZCBIYXQgRW50aXRsZW1lbnQgT3BlcmF0aW9ucyBB
 dXRob3JpdHkxJDAiBgkqhkiG9w0BCQEWFWNhLXN1cHBvcnRAcmVkaGF0LmNvbTCC
@@ -62,18 +62,18 @@ dnL7KkILPFyCcEhQITnu70Qn9sQlwYcRoYF2LWAm9DtLrBT0Y0w7wQHh8vNhwEQ7
 k5G87WpwzcC8y6ePR0vFAgMBAAGjgZMwgZAwHQYDVR0OBBYEFMRJeFZFnR4sYWDD
 ZktYBTcvAyJ7MB8GA1UdIwQYMBaAFIhLpkXERuyP1s+m9hrPJjyQzH8XMAwGA1Ud
 EwQFMAMBAf8wCwYDVR0PBAQDAgEGMBEGCWCGSAGG+EIBAQQEAwIBBjAgBgNVHREE
-GTAXgRVjYS1zdXBwb3J0QHJlZGhhdC5jb20wDQYJKoZIhvcNAQEMBQADggIBAGKk
-q5Ab0AC7SOCYq9up5z0twbe+gI72cm854+VhcxafnLP2/4nH6nQauKLKEFLI8+fV
-RAwYxm1f5nuEiaTvjPE0umYdgMlpEJQeGdW/+/DotDaOon1G6bSMEKFvaKcBHKqa
-kBxQ29trwMG2WN8qZ7/H3XzBvLZ+JrYr01vDSV0P4tcBFOytbMZeJr4xmfxiqWxp
-VUM9eGf6z+ngXyth8lohxGd9MMXwsaPdvM+wptp3AQpq5wFPWyfJqCd6uBxu09k1
-ns3Y/sya2GHqDK4bUW6gCHO13gkYviTCIBLAlX7PDeK5nYVcq8HvTLU9+H9BFGix
-YGDdHphz7i5qO/gLLLcfKhENP6jtbe8i6nwqeDzj+DMy38iMWNYFVWn1OrBaQMtf
-wlVfyRJij9SfyiUAVFld1RoPAN/haf1VmF/0dGrOigibYijqnHvDJffMUND/sbk8
-df6O6VYjvLLlwry4W4dHiLLA7NAHGtkUv2g1+oH1lQIfRG+PvZhWz4pGT1AlzfwD
-aXUfX2X+Bo9tYr9BGy5Li1pLGLvfw+an7cBAbBaw8+HhAHt+Vm4F03KX/bHlge0a
-fMYK6FoA/xQSaZ6IPm4HfPSMvhboguVG+/AZQN4/UxjDleoEz8b0CWYafcJRRZch
-BdxBjTy7JLf3j0HCbenZQF83wwtrSmiTOTK1tLsm
+GTAXgRVjYS1zdXBwb3J0QHJlZGhhdC5jb20wDQYJKoZIhvcNAQELBQADggIBAJ7G
+6lRBNMUJuXE9LevQ5ppJFQH46LTYDgYKDKKmYgQMtxHxLlsU+2Z/ZXClHYN0fVhK
+JLiZsYPHaGpTtlMXQjIwuRE2tNezaBejJCyqRiPAp7wlbFwHijcqW3j9X1tsVul9
+ry0IEHKe1uK/EtObPpGMGugsUSIRul38X+gDkkkVnIczl8xCxmpRu4XZuGZZsCR2
+O8eZM4pyjucMRskf6oC8FpJbTa+DHJlSLyZanMmNAs3Vg58FlJL+hTOHklPg9QnC
+rSqZRfexbaqN1L9bjg5QQihCrkMRnD1T5as+8YZjDOJh1KLbVi75YFlC9KLcQ9qu
+iQP6knsyjdn5o9lTNF021nOO6rK5nwXPDbRPu/G3un1PjQWSv+KhktJqPOCvLoXN
+/20AqMqEVTcPgEiGYB3U3IVD8+EX7J+1xl8fBYTi9IUZGpjBuPtovPMmmVq4mN2G
+KXu8ehqgn/coNql1TYseNXfgYVnBV1g0VaQ57PpSHNQRyANQ3grjZ1dhpLsptzT2
+bP1PBUvltR8ROTg9syo54tIvhWRO3sIpwftK6IeF5MYcyhyG32GoM6qcgiLFL87j
+DLA87Vtwm02AAx0TBGVlDgsUflMeR3N0Y5PK1tuqGWf+E19/rsnbPgkedGdjb1Bp
+tKXPTiXLrM+P1uEq3eSVmm5vWHwB/QZ4XOQgobPk
 -----END CERTIFICATE-----
 -----BEGIN CERTIFICATE-----
 MIIHZDCCBUygAwIBAgIJAOb+QiglyeZeMA0GCSqGSIb3DQEBBQUAMIGwMQswCQYD

data/db/migrate/20220228173251_remove_drpm_from_ignorable_content.rb

@@ -6,7 +6,6 @@ class RemoveDrpmFromIgnorableContent < ActiveRecord::Migration[6.0]
       else
         root.ignorable_content = []
       end
-      root.checksum_type = nil if root.download_policy == ::Katello::RootRepository::DOWNLOAD_ON_DEMAND
       root.save!
     end
   end

data/db/migrate/20230328180352_add_applied_filters_to_katello_content_view_versions.rb

@@ -0,0 +1,5 @@
+class AddAppliedFiltersToKatelloContentViewVersions < ActiveRecord::Migration[6.1]
+  def change
+    add_column :katello_content_view_versions, :applied_filters, :jsonb
+  end
+end

data/db/migrate/20230503190626_add_metadata_expire_to_root.rb

@@ -0,0 +1,5 @@
+class AddMetadataExpireToRoot < ActiveRecord::Migration[6.1]
+  def change
+    add_column :katello_root_repositories, :metadata_expire, :integer
+  end
+end

data/db/seeds.d/111-upgrade_tasks.rb

@@ -9,6 +9,7 @@ UpgradeTask.define_tasks(:katello) do
     {:name => 'katello:upgrades:4.2:remove_checksum_values'},
     {:name => 'katello:upgrades:4.4:publish_import_cvvs'},
     {:name => 'katello:upgrades:4.8:fix_incorrect_providers'},
-    {:name => 'katello:upgrades:4.8:regenerate_imported_repository_metadata'}
+    {:name => 'katello:upgrades:4.8:regenerate_imported_repository_metadata'},
+    {:name => 'katello:upgrades:4.9:update_custom_products_enablement'}
   ]
 end

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/activation-keys/details/activation-key-associations.controller.js

@@ -9,13 +9,14 @@
  * @requires ActivationKey
  * @requires ContentHostsHelper
  * @requires CurrentOrganization
+ * @requires newHostDetailsUI
  *
  * @description
  *   Provides the functionality for activation key associations.
  */
 angular.module('Bastion.activation-keys').controller('ActivationKeyAssociationsController',
-    ['$scope', '$location', 'translate', 'Nutupane', 'ActivationKey', 'ContentHostsHelper', 'CurrentOrganization', 'Host',
-    function ($scope, $location, translate, Nutupane, ActivationKey, ContentHostsHelper, CurrentOrganization, Host) {
+    ['$scope', '$location', 'translate', 'Nutupane', 'ActivationKey', 'ContentHostsHelper', 'CurrentOrganization', 'Host', 'newHostDetailsUI',
+    function ($scope, $location, translate, Nutupane, ActivationKey, ContentHostsHelper, CurrentOrganization, Host, newHostDetailsUI) {
         var contentHostsNutupane, nutupaneParams, params = {
             'organization_id': CurrentOrganization,
             'search': $location.search().search || "",
@@ -46,6 +47,7 @@ angular.module('Bastion.activation-keys').controller('ActivationKeyAssociationsC
 
         $scope.table = contentHostsNutupane.table;
         $scope.table.working = true;
+        $scope.newHostDetailsUI = newHostDetailsUI;
 
         if ($scope.contentHosts) {
             $scope.table.working = false;

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/activation-keys/details/activation-key-repository-sets.controller.js

@@ -27,10 +27,26 @@ angular.module('Bastion.activation-keys').controller('ActivationKeyRepositorySet
         $scope.nutupane = new Nutupane(RepositorySet, params);
         $scope.nutupane.primaryOnly = true;
         $scope.table = $scope.nutupane.table;
+        $scope.repositoryTypes = {
+            redhat: translate("Red Hat"),
+            custom: translate("Custom")
+        };
+
+        $scope.repositoryType = {};
+
         $scope.contentAccessModes = {
             contentAccessModeAll: $scope.simpleContentAccessEnabled,
             contentAccessModeEnv: false
         };
+
+        $scope.selectRepositoryType = function () {
+            delete $scope.nutupane.table.params['repository_type'];
+            if (!_.isEmpty($scope.repositoryType.value)) {
+                $scope.nutupane.table.params['repository_type'] = $scope.repositoryType.value;
+            }
+            $scope.nutupane.refresh();
+        };
+
         $scope.toggleFilters = function () {
             $scope.nutupane.table.params['content_access_mode_env'] = $scope.contentAccessModes.contentAccessModeEnv;
             $scope.nutupane.table.params['content_access_mode_all'] = $scope.contentAccessModes.contentAccessModeAll || $scope.simpleContentAccessEnabled;

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/activation-keys/details/views/activation-key-associations-content-hosts.html

@@ -28,9 +28,10 @@
         <tr bst-table-row ng-repeat="host in table.rows"
             ng-controller="ContentHostStatusController">
           <td bst-table-cell>
-            <a ui-sref="content-host.info({hostId: host.id})">
-              {{ host.name }}
-            </a>
+            <span ng-switch="newHostDetailsUI">
+              <a ng-switch-when="true" ng-href="/new/hosts/{{host.name}}">{{ host.name }}</a>
+              <a ng-switch-when="false" ui-sref="content-host.info({hostId: host.id})">{{ host.name }}</a>
+            </span>
           </td>
           <td bst-table-cell ng-if="!simpleContentAccessEnabled">
             <span ng-class="getHostStatusIcon(host.subscription_global_status)">

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/activation-keys/details/views/activation-key-repository-sets.html

@@ -15,10 +15,24 @@
       <input type="checkbox" ng-model="contentAccessModes.contentAccessModeAll" ng-change="toggleFilters()"/>
       <span translate>Show All</span>
     </label>
-    <label class="checkbox-inline" title="{{ 'Limit Repository Sets to only those available in this Activation Key\'s Lifecycle Environment' | translate }}">
+    <label  class="checkbox-inline limit-to-environment-label"
+            title="{{ 'Limit Repository Sets to only those available in this Activation Key\'s Lifecycle  Environment' | translate }}">
       <input type="checkbox" ng-model="contentAccessModes.contentAccessModeEnv" ng-change="toggleFilters()"/>
       <span translate>Limit to Environment</span>
     </label>
+
+    <label class="repository-type-label">
+      <span translate>Repository type</span>
+      <select
+              id="repositoryTypes"
+              name="repositoryTypes"
+              ng-model="repositoryType.value"
+              ng-options="id as name for (id, name) in repositoryTypes"
+              ng-change="selectRepositoryType()"
+              >
+          <option value="">{{'All' | translate}}</option>
+      </select>
+    </label>
   </div>
 
   <div data-block="list-actions">

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/activation-keys/details/views/activation-key-subscriptions.html

@@ -16,7 +16,7 @@
     </span>
   </div>
   <p bst-alert="info" ng-hide="simpleContentAccessEnabled || !activationKey.auto_attach">
-    <span>When Auto Attach is enabled, registering systems will be attached to all associated custom products and only associated Red Hat subscriptions required to satisfy the system's installed products.</span>
+    <span translate>When Auto Attach is enabled, registering systems will be attached to all associated custom products and only associated Red Hat subscriptions required to satisfy the system's installed products.</span>
   </p>
   <p bst-alert="info" ng-hide="simpleContentAccessEnabled || activationKey.auto_attach">
     <span translate>When Auto Attach is disabled, registering systems will be attached to all associated subscriptions.</span>

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/common/views/katello-agent-notice.html

@@ -1,7 +1,7 @@
 <section>
   <p bst-alert="warning" >
     <span translate>
-      Katello-agent is deprecated and will be removed in Katello 4.10.
+      Katello-agent is deprecated and will be removed in a future release.
     </span>
   </p>
 </section>

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/content-credentials/views/content-credentials.html

@@ -50,7 +50,7 @@
         </td>
         <td bst-table-cell class="number-cell">{{ contentCredential.ssl_ca_alternate_content_sources.length +
           contentCredential.ssl_client_alternate_content_sources.length +
-          contentCredential.ssl_client_key_alternate_content_sources.length || 0 }}
+          contentCredential.ssl_key_alternate_content_sources.length || 0 }}
       </td>
       </tr>
       </tbody>

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

@@ -16,13 +16,14 @@
  * @requires Notification
  * @requires BastionConfig
  * @requires hostIds
+ * @requires newHostDetailsUI
  *
  * @description
  *   A controller for providing bulk action functionality to the content hosts page.
  */
 angular.module('Bastion.content-hosts').controller('ContentHostsBulkErrataModalController',
-    ['$scope', '$http', '$location', '$window', '$timeout', '$uibModalInstance', 'HostBulkAction', 'HostCollection', 'Nutupane', 'CurrentOrganization', 'Erratum', 'Notification', 'BastionConfig', 'hostIds',
-    function ($scope, $http, $location, $window, $timeout, $uibModalInstance, HostBulkAction, HostCollection, Nutupane, CurrentOrganization, Erratum, Notification, BastionConfig, hostIds) {
+    ['$scope', '$http', '$location', '$window', '$timeout', '$uibModalInstance', 'HostBulkAction', 'HostCollection', 'Nutupane', 'CurrentOrganization', 'Erratum', 'Notification', 'BastionConfig', 'hostIds', 'newHostDetailsUI',
+    function ($scope, $http, $location, $window, $timeout, $uibModalInstance, HostBulkAction, HostCollection, Nutupane, CurrentOrganization, Erratum, Notification, BastionConfig, hostIds, newHostDetailsUI) {
         function installParams() {
             var params = hostIds;
             params['content_type'] = 'errata';
@@ -58,6 +59,7 @@ angular.module('Bastion.content-hosts').controller('ContentHostsBulkErrataModalC
         $scope.katelloAgentPresent = BastionConfig.katelloAgentPresent;
         $scope.allHostsSelected = hostIds.allResultsSelected;
         $scope.hostToolingEnabled = BastionConfig.hostToolingEnabled;
+        $scope.newHostDetailsUI = newHostDetailsUI;
 
         $scope.errataActionFormValues = {
             authenticityToken: $window.AUTH_TOKEN.replace(/"/g, '')

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/content-hosts/bulk/views/content-host-bulk-module-streams-modal.html

@@ -1,5 +1,5 @@
 <div data-extend-template="components/views/bst-modal.html">
-  <h4 data-block="modal-header">Content Host Module Stream Management</h4>
+  <h4 translate data-block="modal-header">Content Host Module Stream Management</h4>
   <div data-block="modal-body">
     <div bst-feature-flag="remote_actions">
       <h3 translate ng-hide="selectedModuleStreamOption === 'available'">Available Module Streams</h3>

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/content-hosts/bulk/views/content-hosts-bulk-environment-modal.html

@@ -1,5 +1,5 @@
 <div data-extend-template="components/views/bst-modal.html">
-  <h4 data-block="modal-header" translate>Content Host Bulk Content</h4>
+  <h4 translate data-block="modal-header" translate>Content Host Bulk Content</h4>
 
   <div data-block="modal-body">
     <h4 translate>Assign Lifecycle Environment and Content View</h4>

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/content-hosts/bulk/views/content-hosts-bulk-errata-modal.html

@@ -101,10 +101,16 @@
              <td bst-table-cell>{{ erratum.title }}</td>
              <td class="small" bst-table-cell>{{ erratum.issued }}</td>
              <td class="small" bst-table-cell class="number-cell">
-               <a target="_blank" href="{{ '/content_hosts?search=installable_errata%3D' + erratum.errata_id }}">
-                <span> {{ erratum.affected_hosts_count }} </span>
-                 <span class="fa fa-external-link"/>
-               </a>
+              <span ng-switch="newHostDetailsUI">
+                <a ng-switch-when="true" target="_blank" href="{{ '/hosts?search=installable_errata%3D' + erratum.errata_id }}">
+                  {{ erratum.affected_hosts_count }}
+                <span class="fa fa-external-link"/>
+                </a>
+                <a ng-switch-when="false" target="_blank" href="{{ '/content_hosts?search=installable_errata%3D' + erratum.errata_id }}">
+                {{ erratum.affected_hosts_count }}
+                <span class="fa fa-external-link"/>
+              </a>
+              </span>
              </td>
            </tr>
          </tbody>

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/content-hosts/bulk/views/content-hosts-bulk-host-collections-modal.html

@@ -1,5 +1,5 @@
 <div data-extend-template="components/views/bst-modal.html">
-  <h4 data-block="modal-header">Host Collection Membership Management</h4>
+  <h4 translate data-block="modal-header">Host Collection Membership Management</h4>
 
   <div data-block="modal-body">
     <div class="row">

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/content-hosts/bulk/views/content-hosts-bulk-repository-sets-modal.html

@@ -1,5 +1,5 @@
 <div data-extend-template="components/views/bst-modal.html">
-  <h4 data-block="modal-header">Repository Sets Management</h4>
+  <h4 translate data-block="modal-header">Repository Sets Management</h4>
 
   <div data-block="modal-body">
     <div class="row">

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/content-hosts/bulk/views/content-hosts-bulk-subscriptions-modal.html

@@ -11,7 +11,7 @@
           <span translate>Auto-Attach</span>
         </button>
 
-        <p class="help-text" ng-show="table.numSelected === 0 && !simpleContentAccessEnabled">
+        <p class="help-text" translate ng-show="table.numSelected === 0 && !simpleContentAccessEnabled">
           Auto-attach available subscriptions to all selected hosts.
         </p>
 
@@ -19,7 +19,7 @@
         <div content-access-mode-banner/>
         </p>
 
-        <p class="help-text" ng-show="table.numSelected > 0 && !simpleContentAccessEnabled">
+        <p class="help-text" translate ng-show="table.numSelected > 0 && !simpleContentAccessEnabled">
           Auto-attach uses all available subscriptions, not a selected subset.
         </p>
       </div>