katello 4.11.1 → 4.12.0.rc2

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

@@ -73,18 +73,27 @@ module Katello
           "/pulp/deb/#{repo.relative_path}/".sub('//', '/')
         end
 
-        def multi_copy_units(repo_id_map, dependency_solving)
+        def multi_copy_units(repo_id_map, _dependency_solving)
           tasks = []
 
           if repo_id_map.values.pluck(:content_unit_hrefs).flatten.any?
             data = PulpDebClient::Copy.new
-            data.dependency_solving = dependency_solving
+            data.dependency_solving = false
             data.config = []
             repo_id_map.each do |source_repo_ids, dest_repo_id_map|
               dest_repo = ::Katello::Repository.find(dest_repo_id_map[:dest_repo])
               dest_repo_href = ::Katello::Pulp3::Repository::Apt.new(dest_repo, SmartProxy.pulp_primary).repository_reference.repository_href
               content_unit_hrefs = dest_repo_id_map[:content_unit_hrefs]
               # Not needed during incremental update due to dest_base_version
+              # -> Unless incrementally updating a CV repo that is a soft copy of its library instance.
+              # -> I.e. no filters and not an incremental version.
+              unless dest_repo_id_map[:base_version]
+                # Don't perform extra content actions if the repo is a soft copy of its library instance.
+                # Taken care of by the IncrementalUpdate action.
+                unless dest_repo.soft_copy_of_library?
+                  tasks << remove_all_content_from_repo(dest_repo_href)
+                end
+              end
               source_repo_ids.each do |source_repo_id|
                 source_repo_version = ::Katello::Repository.find(source_repo_id).version_href
                 config = { source_repo_version: source_repo_version, dest_repo: dest_repo_href, content: content_unit_hrefs }
@@ -203,9 +212,9 @@ module Katello
           filter_list_map
         end
 
-        def copy_content_from_mapping(repo_id_map, options = {})
+        def copy_content_from_mapping(repo_id_map, _options = {})
           repo_id_map.each do |source_repo_ids, dest_repo_map|
-            filters = ContentViewDebFilter.where(:id => options[:filter_ids])
+            filters = ContentViewDebFilter.where(:id => dest_repo_map[:filter_ids])
 
             filter_list_map = { whitelist_ids: [], blacklist_ids: [] }
             filter_list_map = add_filter_content(source_repo_ids, filters, filter_list_map)
@@ -218,7 +227,7 @@ module Katello
             dest_repo_map[:content_unit_hrefs] = content_unit_hrefs.uniq.sort
           end
 
-          dependency_solving = options[:solve_dependencies] || false
+          dependency_solving = false
 
           multi_copy_units(repo_id_map, dependency_solving)
         end
@@ -233,7 +242,8 @@ module Katello
               tasks << add_content(slice, first_slice)
               first_slice = false
             end
-          else
+          # If we're merging composite cv repositories, don't clear out the Pulp repository.
+          elsif remove_all
             tasks << remove_all_content
           end
           tasks

data/app/services/katello/registration_manager.rb

@@ -148,7 +148,7 @@ module Katello
         end
       end
 
-      def register_host(host, consumer_params, content_view_environments, activation_keys = []) # rubocop:disable Metrics/MethodLength
+      def register_host(host, consumer_params, content_view_environments, activation_keys = [])
         new_host = host.new_record?
         unless new_host
           host.save!
@@ -172,7 +172,6 @@ module Katello
         host.content_facet.cves_changed = false # prevent backend_update_needed from triggering an update on a nonexistent consumer
         host.subscription_facet = populate_subscription_facet(host, activation_keys, consumer_params, host_uuid)
         host.save! # the host has content and subscription facets at this point
-        create_initial_subscription_status(host)
 
         User.as_anonymous_admin do
           begin
@@ -219,10 +218,6 @@ module Katello
         destroy_host_record(host.id)
       end
 
-      def create_initial_subscription_status(host)
-        host.subscription_facet.update_subscription_status(::Katello::SubscriptionStatus::UNKNOWN)
-      end
-
       def create_in_candlepin(host, content_view_environments, consumer_params, activation_keys)
         # if CP fails, nothing to clean up yet w.r.t. backend services
         cp_create = ::Katello::Resources::Candlepin::Consumer.create(content_view_environments.map(&:cp_id), consumer_params, activation_keys.map(&:cp_name), host.organization)
@@ -243,7 +238,6 @@ module Katello
         host.subscription_facet.save!
         host.refresh_statuses([
                                 ::Katello::ErrataStatus,
-                                ::Katello::SubscriptionStatus,
                                 ::Katello::RhelLifecycleStatus
                               ])
       end
@@ -314,12 +308,6 @@ module Katello
         end
 
         host.get_status(::Katello::ErrataStatus).destroy
-        host.get_status(::Katello::PurposeSlaStatus).destroy
-        host.get_status(::Katello::PurposeRoleStatus).destroy
-        host.get_status(::Katello::PurposeUsageStatus).destroy
-        host.get_status(::Katello::PurposeAddonsStatus).destroy
-        host.get_status(::Katello::PurposeStatus).destroy
-        host.get_status(::Katello::SubscriptionStatus).destroy
         host.get_status(::Katello::TraceStatus).destroy
         host.installed_packages.delete_all
 

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

@@ -12,7 +12,6 @@ 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|

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

@@ -3,6 +3,7 @@ object @resource
 extends "katello/api/v2/content_views/base"
 
 attributes :content_host_count
+attributes :needs_publish? => :needs_publish
 
 node :errors do
   unless @resource.valid?

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

@@ -2,3 +2,5 @@ object @resource
 
 attributes :id, :name
 attributes :version, :architecture
+attributes :upgradable_versions
+attributes :deb_id

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

@@ -4,6 +4,15 @@ object @resource
 @facet = @resource.content_facet
 
 attributes :id, :name, :description
+
+node :operatingsystem_family do |resource|
+  resource.operatingsystem&.family
+end
+
+node :operatingsystem_major do |resource|
+  resource.operatingsystem&.major
+end
+
 if @facet
   node :content_view do
     content_view = @facet&.single_content_view

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

@@ -1,6 +1,3 @@
 child :subscription_facet => :subscription_facet_attributes do
   extends 'katello/api/v2/subscription_facet/base'
 end
-
-attributes :subscription_status, :subscription_status_label, :subscription_global_status,
-           :if => @object.get_status(Katello::SubscriptionStatus).relevant?

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

@@ -7,6 +7,9 @@ child :subscription_facet => :subscription_facet_attributes do |_facet|
 
   child :hypervisor_host => :virtual_host do
     attributes :id, :name
+    node :display_name do |host|
+      host.to_label
+    end
   end
 
   child :virtual_guests => :virtual_guests do

data/app/views/katello/sync_management/index.html.erb

@@ -1,17 +1,18 @@
-<%= javascript 'katello/sync_management' %>
+<% content_for(:katello_javascripts) do -%>
+  <%= javascript_include_tag 'katello/sync_management' %>
+  <script>
+    localize({
+      "cancel": "<%= escape_javascript(_('Cancel')) %>",
+      "cancelled": "<%= escape_javascript(_('Sync Canceled')) %>",
+      "error": "<%= escape_javascript(_('Error')) %>",
+      "complete": "<%= escape_javascript(_('Sync complete.')) %>",
+      "no_start_time": "<%= escape_javascript(_('No start time currently available.')) %>"
+    });
 
-<%= javascript do %>
-  localize({
-    "cancel": "<%= escape_javascript(_('Cancel')) %>",
-    "cancelled": "<%= escape_javascript(_('Sync Canceled')) %>",
-    "error": "<%= escape_javascript(_('Error')) %>",
-    "complete": "<%= escape_javascript(_('Sync complete.')) %>",
-    "no_start_time": "<%= escape_javascript(_('No start time currently available.')) %>"
-  });
-
-    KT.repo_status = $.parseJSON('<%= escape_javascript(@repo_status.to_json.html_safe) %>');
-    KT.permissions = { "syncable" : <%= any_syncable? %> };
-<% end %>
+      KT.repo_status = $.parseJSON('<%= escape_javascript(@repo_status.to_json.html_safe) %>');
+      KT.permissions = { "syncable" : <%= any_syncable? %> };
+  </script>
+<% end -%>
 
 <% if Organization.current -%>
     <%= hidden_field_tag :organization_id, Organization.current.id%>

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

@@ -29,23 +29,27 @@ end %>
 <% 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
-  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
-  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, :disabled =>  cv_lce_disabled?
-  end
-end %>
+<%= field(f, env_select_attr, {:label => _("Lifecycle Environment")}) 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) %>
+    <%= 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 %>
+  <% end %>
+<% 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
-  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
-  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, :disabled =>  cv_lce_disabled?
-  end
-end %>
+<%= field(f, cv_select_attr, {:label => _("Content View")}) 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? %>
+    <%= hidden_field_tag 'host[content_facet_attributes][content_view_id]', fetch_content_view(@host).try(:id) %>
+    <%= 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 =>  true %>
+  <% 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 %>

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

@@ -3,7 +3,7 @@
      kickstart_repo_id = kickstart_repository_id(@host, :selected_host_group => @host&.hostgroup)
      kickstart_options = kickstart_repository_options(@host, :selected_host_group => @host&.hostgroup)
    elsif using_hostgroups_page?
-     kickstart_repo_id = kickstart_repository_id(@host, :selected_host_group => @host&.hostgroup)
+     kickstart_repo_id = kickstart_repository_id(@hostgroup, :selected_host_group => @host&.hostgroup)
      kickstart_options = kickstart_repository_options(@hostgroup)
    else
      kickstart_repo_id = kickstart_repository_id(@host, :selected_host_group => @hostgroup)
@@ -23,7 +23,9 @@
              :class => 'form-control',  :name => ks_repo_select_name, :disabled => kickstart_options.empty?
 end %>
 
-<script>
-  KT.hosts.set_media_selection_bindings();
-  KT.hosts.update_media_enablement();
-</script>
+<% content_for(:javascripts) do -%>
+  <script>
+    KT.hosts.set_media_selection_bindings();
+    KT.hosts.update_media_enablement();
+  </script>
+<% end -%>

data/app/views/overrides/organizations/_edit_override.html.erb

@@ -11,16 +11,4 @@
                :type => :button, :style => 'margin-top: 8px;', :class => 'btn btn-small',
                'data-url' => "/katello/api/v2/organizations/#{@taxonomy.id}/download_debug_certificate"
   end %>
-
-  <%= field(f, _('Simple Content Access')) do
-    tag1 = hidden_field_tag 'simple_content_access', '0'
-    tag2 = check_box_tag 'simple_content_access', '1', @taxonomy.simple_content_access?(cached: false)
-    tag1 + tag2
-  end %>
-
-  <div class="alert alert-warning" role="alert">
-    <%= link_to _('Simple Content Access'), 'https://access.redhat.com/articles/transition_of_subscription_services_to_the_hybrid_cloud_console', :rel => "external" %>
-    <%= _(' will be required for all organizations in Katello 4.12.') %>
-  </div>
-
 <% end %>

data/db/migrate/20131014225132_add_users_fields.rb

@@ -3,7 +3,6 @@ class AddUsersFields < ActiveRecord::Migration[4.2]
     add_column :users, :helptips_enabled, :boolean, :default => true
     add_column :users, :hidden, :boolean, :default => false, :null => false
     add_column :users, :page_size, :integer, :default => 25, :null => false
-    add_column :users, :disabled, :boolean, :default => false
     add_column :users, :preferences, :text
     add_column :users, :remote_id, :string, :limit => 255
   end

data/db/migrate/20150603045418_remove_user_fields.rb

@@ -2,7 +2,6 @@ class RemoveUserFields < ActiveRecord::Migration[4.2]
   def up
     remove_column :users, :helptips_enabled
     remove_column :users, :page_size
-    remove_column :users, :disabled
     remove_column :users, :preferences
     remove_column :users, :remote_id
   end
@@ -11,7 +10,6 @@ class RemoveUserFields < ActiveRecord::Migration[4.2]
     add_column :users, :helptips_enabled, :boolean, :default => true
     add_column :users, :hidden, :boolean, :default => false, :null => false
     add_column :users, :page_size, :integer, :default => 25, :null => false
-    add_column :users, :disabled, :boolean, :default => false
     add_column :users, :preferences, :text
     add_column :users, :remote_id, :string, :limit => 255
   end

data/db/migrate/20160404132250_remove_katello_from_notification_name.rb

@@ -1,26 +1,8 @@
 class RemoveKatelloFromNotificationName < ActiveRecord::Migration[4.2]
-  class FakeMailNotification < ApplicationRecord
-    self.table_name = 'mail_notifications'
-  end
-
   def up
-    FakeMailNotification.all.each do |notification|
-      if notification_names.keys.include?(notification.name)
-        new_name = notification_names[notification.name]
-        FakeMailNotification.where(:name => new_name).destroy_all
-        notification.name = new_name
-        notification.save!
-      end
-    end
-  end
-
-  private
-
-  def notification_names
-    {
-      :katello_promote_errata => 'promote_errata',
-      :katello_sync_errata => 'sync_errata',
-      :katello_host_advisory => 'host_errata_advisory'
-    }.with_indifferent_access
+    # historical placeholder
+    # only required on setups before https://projects.theforeman.org/issues/14459
+    # we can safely assume that fresh installs have the above change already
+    # and existing install had this migration applied back in 2016
   end
 end

data/db/migrate/20160505181337_rename_katello_settings.rb

@@ -1,9 +1,9 @@
 class RenameKatelloSettings < ActiveRecord::Migration[4.2]
   def up
-    Setting.where(category: 'Setting::Katello').update_all(:category => 'Setting::Content')
+    Setting.where(category: 'Setting::Katello').update_all(:category => 'Setting::Content') if column_exists?(:settings, :category)
   end
 
   def down
-    Setting.where(category: 'Setting::Content').update_all(:category => 'Setting::Katello')
+    Setting.where(category: 'Setting::Content').update_all(:category => 'Setting::Katello') if column_exists?(:settings, :category)
   end
 end

data/db/migrate/20200818192230_update_system_purpose_status.rb

@@ -1,12 +1,18 @@
 class UpdateSystemPurposeStatus < ActiveRecord::Migration[6.0]
   def change
-    purpose_types = Katello::HostStatusManager::PURPOSE_STATUS.map(&:to_s)
+    purpose_types = [
+      "Katello::PurposeStatus",
+      "Katello::PurposeAddonsStatus",
+      "Katello::PurposeRoleStatus",
+      "Katello::PurposeSlaStatus",
+      "Katello::PurposeUsageStatus"
+    ]
 
     # load both sets of host statuses and *then* update them to make sure we update the correct statuses
     unknown_statuses = ::HostStatus::Status.where(type: purpose_types, status: 2).pluck(:id)
     matched_statuses = ::HostStatus::Status.where(type: purpose_types, status: 0).pluck(:id)
 
-    ::HostStatus::Status.where(id: unknown_statuses).update_all(status: Katello::PurposeStatus::UNKNOWN) # 2 => 0
-    ::HostStatus::Status.where(id: matched_statuses).update_all(status: Katello::PurposeStatus::MATCHED) # 0 => 2
+    ::HostStatus::Status.where(id: unknown_statuses).update_all(status: 0) # 2 => 0
+    ::HostStatus::Status.where(id: matched_statuses).update_all(status: 2) # 0 => 2
   end
 end

data/db/migrate/20240111032511_add_index_to_host_installed_packages.rb

@@ -0,0 +1,16 @@
+class AddIndexToHostInstalledPackages < ActiveRecord::Migration[6.1]
+  def up
+    add_index :katello_host_installed_packages, [:installed_package_id],
+      :name => 'katello_host_installed_packages_ip_id'
+    add_index :katello_host_installed_packages, [:host_id],
+      :name => 'katello_host_installed_packages_host_id'
+  end
+
+  def down
+    remove_index :katello_host_installed_packages,
+      :name => 'katello_host_installed_packages_ip_id'
+
+    remove_index :katello_host_installed_packages,
+      :name => 'katello_host_installed_packages_host_id'
+  end
+end

data/db/migrate/20240123120109_remove_pulp_export_destination_setting.rb

@@ -0,0 +1,9 @@
+class RemovePulpExportDestinationSetting < ActiveRecord::Migration[6.1]
+  def up
+    Setting.where(name: 'pulp_export_destination').delete_all
+  end
+
+  def down
+    # no action, seeding on app start should create the object with the default value
+  end
+end

data/db/migrate/20240207191223_remove_entitlement_mode_host_statuses.rb

@@ -0,0 +1,30 @@
+class RemoveEntitlementModeHostStatuses < ActiveRecord::Migration[6.1]
+  class FakeTablePreference < ApplicationRecord
+    self.table_name = 'table_preferences'
+    serialize :columns
+  end
+
+  def up
+    obsolete_statuses = [
+      "Katello::SubscriptionStatus",
+      "Katello::PurposeStatus",
+      "Katello::PurposeAddonsStatus",
+      "Katello::PurposeRoleStatus",
+      "Katello::PurposeSlaStatus",
+      "Katello::PurposeUsageStatus"
+    ]
+
+    ::HostStatus::Status.where(type: obsolete_statuses).delete_all
+
+    FakeTablePreference.where(name: "hosts").each do |table_preference|
+      next unless table_preference.columns.include?("subscription_status")
+      new_columns = table_preference.columns - ["subscription_status"]
+      if new_columns.present?
+        table_preference.columns = new_columns
+        table_preference.save(validate: false)
+      else
+        table_preference.destroy
+      end
+    end
+  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.12:update_content_access_modes'}
   ]
 end

data/engines/bastion/app/assets/javascripts/bastion/bastion.js

@@ -36,5 +36,3 @@
 
 //= require "bastion/features/features.module"
 //= require_tree "./features"
-
-//= require "bastion/bastion-bootstrap"

data/engines/bastion/app/views/bastion/layouts/assets.html.erb

@@ -10,11 +10,13 @@
 <% end %>
 
 <% content_for(:javascripts) do %>
-  <%= javascript_include_tag 'bastion/bastion' %>
+
+  <%=  javascript_tag("window.tfm.tools.loadPluginModule('/webpack/katello','katello','./common_index');".html_safe) %>
+  <%= javascript_include_tag('bastion/bastion', {type: 'module'})%>
   <% if File.exist?("#{Bastion::Engine.root}/vendor/assets/javascripts/#{Bastion.localization_path(I18n.locale)}") %>
     <%= javascript_include_tag(Bastion.localization_path(I18n.locale)) %>
   <% end %>
-  <script type="text/javascript">
+  <script type="module">
     angular.module('Bastion.features').value('FeatureSettings', angular.fromJson(<%= SETTINGS[:features].nil? ? {} : SETTINGS[:features].to_json.html_safe %>));
     angular.module('Bastion').value('currentLocale', '<%= I18n.locale %>');
     angular.module('Bastion').value('CurrentOrganization', "<%= Organization.current.id if Organization.current %>");
@@ -34,6 +36,8 @@
     angular.module('Bastion').value('newHostDetailsUI', "<%= Setting[:host_details_ui] %>");
     angular.module('Bastion').value('experimentalLabsSetting', "<%= Setting[:lab_features] %>");
   </script>
+
+  <%= javascript_include_tag('bastion_katello/bastion_katello',  {type: 'module'}) %>
   <% Bastion.plugins.each do |name, plugin| %>
     <%= include_plugin_js(plugin) %>
   <% end %>

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

@@ -39,7 +39,7 @@ angular.module('Bastion.activation-keys').controller('ActivationKeyRepositorySet
 
         $scope.contentAccessModes = {
             contentAccessModeAll: $scope.simpleContentAccessEnabled,
-            contentAccessModeEnv: false
+            contentAccessModeEnv: true
         };
 
         $scope.selectRepositoryType = function () {
@@ -56,6 +56,8 @@ angular.module('Bastion.activation-keys').controller('ActivationKeyRepositorySet
             $scope.nutupane.refresh();
         };
 
+        $scope.toggleFilters();
+
         success = function () {
             $scope.table.working = false;
             Notification.setSuccessMessage(translate('Repository Sets settings saved successfully.'));

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

@@ -29,12 +29,8 @@
             ng-controller="ContentHostStatusController">
           <td bst-table-cell>
             <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)">
+              <a ng-switch-when="true" ng-href="/new/hosts/{{host.name}}">{{ host.display_name }}</a>
+              <a ng-switch-when="false" ui-sref="content-host.info({hostId: host.id})">{{ host.display_name }}</a>
             </span>
           </td>
           <td bst-table-cell>{{ host.content_facet_attributes.lifecycle_environment.name }}</td>

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

@@ -31,7 +31,6 @@
   </div>
 
   <nav data-block="navigation">
-    <div content-access-mode-banner></div>
     <ul class="nav nav-tabs details-nav">
       <li ng-class="{active: isState('activation-key.info')}">
         <a ui-sref="activation-key.info">

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/bastion-katello-bootstrap.js

@@ -1,29 +1,45 @@
-BASTION_MODULES.push(
-    'Bastion.capsule-content',
-    'Bastion.pulp-primary',
-    'Bastion.activation-keys',
-    'Bastion.architectures' ,
-    'Bastion.common',
-    'Bastion.content-views',
-    'Bastion.content-views.versions',
-    'Bastion.debs',
-    'Bastion.docker-tags',
-    'Bastion.files',
-    'Bastion.ansible-collections',
-    'Bastion.hosts',
-    'Bastion.module-streams',
-    'Bastion.environments',
-    'Bastion.content-credentials',
-    'Bastion.hosts',
-    'Bastion.capsules',
-    'Bastion.organizations',
-    'Bastion.products',
-    'Bastion.repositories',
-    'Bastion.subscriptions',
-    'Bastion.sync-plans',
-    'Bastion.http-proxies',
-    'Bastion.host-collections',
-    'Bastion.content-hosts',
-    'Bastion.tasks',
-    'Bastion.settings'
-);
+var BASTION_MODULES = [
+  'angular-blocks',
+  'ngAnimate',
+  'ngSanitize',
+  'templates',
+  'ui.bootstrap',
+  'ui.bootstrap.tpls',
+  'Bastion.auth',
+  'Bastion.menu',
+  'Bastion.i18n',
+  'Bastion.features',
+  'Bastion.routing',
+  'Bastion.capsule-content',
+  'Bastion.pulp-primary',
+  'Bastion.activation-keys',
+  'Bastion.architectures',
+  'Bastion.common',
+  'Bastion.content-views',
+  'Bastion.content-views.versions',
+  'Bastion.debs',
+  'Bastion.docker-tags',
+  'Bastion.files',
+  'Bastion.ansible-collections',
+  'Bastion.hosts',
+  'Bastion.module-streams',
+  'Bastion.environments',
+  'Bastion.content-credentials',
+  'Bastion.hosts',
+  'Bastion.capsules',
+  'Bastion.organizations',
+  'Bastion.products',
+  'Bastion.repositories',
+  'Bastion.subscriptions',
+  'Bastion.sync-plans',
+  'Bastion.http-proxies',
+  'Bastion.host-collections',
+  'Bastion.content-hosts',
+  'Bastion.tasks',
+  'Bastion.settings'
+];
+
+// Check if the document has already been bootstrapped.
+if (!angular.element(document).injector()) {
+    angular.bootstrap(document, BASTION_MODULES);
+}

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/content-hosts/content-hosts-helper.service.js

@@ -38,16 +38,6 @@ angular.module('Bastion.content-hosts').service('ContentHostsHelper',
             return icons[globalStatus];
         };
 
-        this.getHostPurposeStatusIcon = function (statusCode) {
-            var code = parseInt(statusCode);
-
-            if (code === 2) { // matched
-                return 'pficon pficon-ok';
-            } else if (code === 1) { // mismatched
-                return 'pficon pficon-warning-triangle-o';
-            }
-        };
-
         this.rebootRequired = function(traces) {
             return traces.some(function(trace) {
                 return trace.reboot_required;

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

@@ -24,7 +24,6 @@ angular.module('Bastion.content-hosts').controller('ContentHostDetailsController
         $scope.menuExpander = MenuExpander;
 
         $scope.getHostStatusIcon = ContentHostsHelper.getHostStatusIcon;
-        $scope.getHostPurposeStatusIcon = ContentHostsHelper.getHostPurposeStatusIcon;
 
         $scope.organization = Organization.get({id: CurrentOrganization}, function(org) {
             $scope.purposeAddonsCount += org.system_purposes.addons.length;