katello 4.20.0 → 4.20.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6906fd0237d8f131b8dd191803695f7af15dc79908dd2d1e6d3385394bedc997
-  data.tar.gz: 20cd7a88f0eae1a31a6ba650e2d761626ebbdd70f3ebc9ae21d362c8144bdd1e
+  metadata.gz: 752107902c268ac7230e4ba7c967a1f273c871559b80dd30ff622337d2cb2f56
+  data.tar.gz: 514cbd47032ce0940e1246d2cd5b23f290958289858241bfc1e2bff9caa3928f
 SHA512:
-  metadata.gz: c973d2b28b03b6dbfe9a3373fd57edd647974e25dc56531630809c3b14c4f3528becbf28725dd7d1b00200149870a81e1a0d45db855b69d484b4c9d967e5afeb
-  data.tar.gz: ce0c166fef878d6a477e6f003dcda75364d95026237f695db2689bbdbbf06731d3df3ac5a0610e6ce04388cd845df2dfb44cd71c463536748be0f02896f95889
+  metadata.gz: ec64a4c18b636df115542a86fa8874c9db757bde3fac4084f23b8ff0aac7baa51fcaf79d88cd684d5c83862e229f743aca63d5d033b9bec9fef7a762743948af
+  data.tar.gz: 6430af999d6bfb5478fab680b5ece3986c12841da4fedb5d7cbce05fd381d6ed96b58b71d89a3df59d436a4d88629faeef4afc18ddd39c4869280028d1890a00

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

@@ -15,7 +15,8 @@ module Katello
     param :content_type, RepositoryTypeManager.uploadable_content_types(false).map(&:label), :required => false, :desc => N_("content type ('deb', 'file', 'ostree_ref', 'rpm', 'srpm')")
     def create
       fail Katello::Errors::InvalidRepositoryContent, _("Cannot upload Ansible collections.") if @repository.ansible_collection?
-      fail Katello::Errors::InvalidRepositoryContent, _("Cannot upload container content via Hammer/API. Use podman push instead.") if @repository.docker?
+      # params[:size].to_i > 0 confirms if user is trying to upload a docker image.
+      fail Katello::Errors::InvalidRepositoryContent, _("Cannot upload container content via Hammer/API. Use podman push instead.") if @repository.docker? && params[:size].to_i > 0
       content_type = params[:content_type] || ::Katello::RepositoryTypeManager.find(@repository.content_type)&.default_managed_content_type&.label
       RepositoryTypeManager.check_content_matches_repo_type!(@repository, content_type)
       if ::Katello::RepositoryTypeManager.generic_content_type?(content_type)

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

@@ -10,13 +10,15 @@ module Katello
     api :GET, "/hosts/bootc_images", N_("List booted bootc container images for hosts")
     param_group :search, Api::V2::ApiController
     def bootc_images
-      params[:sort_by] ||= 'bootc_booted_image'
-      params[:sort_order] ||= 'asc'
       if params[:order]
-        params[:order] = "#{params[:order].split(' ')[0]} #{sanitize_sort_order(params[:order].split(' ')[1])}"
+        parts = params[:order].split(' ')
+        params[:sort_by] = sanitize_sort_column(parts[0])
+        params[:sort_order] = sanitize_sort_order(parts[1])
       else
-        params[:order] = "#{params[:sort_by]} #{sanitize_sort_order(params[:sort_order])}"
+        params[:sort_by] = sanitize_sort_column(params[:sort_by])
+        params[:sort_order] = sanitize_sort_order(params[:sort_order])
       end
+      params[:order] = "#{params[:sort_by]} #{params[:sort_order]}"
       per_page = params[:per_page].present? ? params[:per_page].to_i : Setting[:entries_per_page]
       page = params[:page].present? ? params[:page].to_i : 1
 
@@ -38,6 +40,8 @@ module Katello
 
     private
 
+    SORTABLE_COLUMNS = %w[bootc_booted_image bootc_booted_digest host_count].freeze
+
     def sanitize_sort_order(sort_order)
       if sort_order.present? && ['asc', 'desc'].include?(sort_order.downcase)
         sort_order.downcase
@@ -46,6 +50,10 @@ module Katello
       end
     end
 
+    def sanitize_sort_column(sort_column)
+      SORTABLE_COLUMNS.include?(sort_column) ? sort_column : 'bootc_booted_image'
+    end
+
     def index_relation
       query = resource_class.authorized(:view_hosts).distinct
       query.joins(:content_facet).where.not(bootc_booted_image: nil, bootc_booted_digest: nil)

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

@@ -34,15 +34,16 @@ module Katello
                                     :ssl_ca_cert,
                                     :custom_cdn)
 
+          @cert_store = OpenSSL::X509::Store.new
           if options[:ssl_ca_cert].present?
-            @cert_store = OpenSSL::X509::Store.new
             Foreman::Util.add_ca_bundle_to_store(options[:ssl_ca_cert], @cert_store)
           elsif options[:ssl_ca_file]
-            @cert_store = OpenSSL::X509::Store.new
             @cert_store.add_file(options[:ssl_ca_file])
+          else
+            @cert_store.set_default_paths
           end
 
-          if @cert_store && proxy&.cacert&.present?
+          if proxy&.cacert&.present?
             Foreman::Util.add_ca_bundle_to_store(proxy.cacert, @cert_store)
           end
 
@@ -59,8 +60,12 @@ module Katello
             options[:ssl_ca_file] = self.ca_file
             self.new(cdn_configuration.url, options)
           elsif cdn_configuration.custom_cdn?
-            options[:ssl_ca_cert] = cdn_configuration.ssl_ca
-            if cdn_configuration.custom_cdn_auth_enabled?
+            if cdn_configuration.ssl_ca.present?
+              options[:ssl_ca_cert] = cdn_configuration.ssl_ca
+            elsif cdn_configuration.redhat_cdn_host?
+              options[:ssl_ca_file] = self.ca_file
+            end
+            if cdn_configuration.custom_cdn_auth_enabled? || cdn_configuration.redhat_cdn_host?
               options[:ssl_client_cert] = OpenSSL::X509::Certificate.new(product.certificate)
               options[:ssl_client_key] = OpenSSL::PKey::RSA.new(product.key)
             end

data/app/models/katello/cdn_configuration.rb

@@ -41,8 +41,10 @@ module Katello
       custom_cdn_auth_enabled
     end
 
-    def redhat_cdn_url?
-      Katello::Resources::CDN::CdnResource.redhat_cdn?(url)
+    def redhat_cdn_host?
+      URI.parse(url).host&.end_with?('.redhat.com')
+    rescue URI::InvalidURIError
+      false
     end
 
     def export_sync?

data/app/models/katello/host/content_facet.rb

@@ -194,6 +194,19 @@ module Katello
         content_view_environments.first.default_environment?
       end
 
+      def content_view_environments_all_default_or_rolling?
+        return if content_view_environments.blank?
+        # Returns true if all applicable errata are installable, meaning:
+        # - First CVEnv is Library (Default Org View + Library environment), OR
+        # - All CVEnvs are rolling CVs or Library hosts
+        # This determines whether the Applicable/Installable toggle should be hidden.
+        return true if content_view_environments.first.default_environment?
+
+        content_view_environments.all? do |cve|
+          cve.content_view&.rolling? || cve.default_environment?
+        end
+      end
+
       def update_repositories_by_paths(paths)
         prefixes = %w(/pulp/deb/ /pulp/repos/ /pulp/content/)
         relative_paths = []
@@ -337,9 +350,10 @@ module Katello
         facet = host.content_facet || host.build_content_facet
         attrs_to_add = {}
         BOOTC_FIELD_FACT_NAMES.each do |fact_name|
+          next unless parser.facts.key?(fact_name)
           fact_value = parser.facts[fact_name]
           field_name = fact_name.tr(".", "_")
-          attrs_to_add[field_name] = fact_value # overwrite with nil if fact is not present
+          attrs_to_add[field_name] = fact_value
         end
         if attrs_to_add['bootc_booted_digest'].present?
           manifest_entity = find_manifest_entity(digest: attrs_to_add['bootc_booted_digest'])

data/app/services/katello/managed_content_medium_provider.rb

@@ -17,7 +17,7 @@ module Katello
     # If there are any 'AppStream' variants, we need to make them
     # available to Anaconda
     def additional_media
-      appstream_repos = entity.operatingsystem.variant_repos(entity, 'AppStream')
+      appstream_repos = entity.operatingsystem.try(:variant_repos, entity, 'AppStream') || []
       super + (appstream_repos.present? ? appstream_repos : [])
     end
 

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

@@ -509,8 +509,12 @@ module Katello
           }
         elsif root.redhat? && root.cdn_configuration.custom_cdn?
           options = {
-            ca_cert: root.cdn_configuration.ssl_ca,
+            ca_cert: custom_cdn_ca_cert,
           }
+          if root.cdn_configuration.redhat_cdn_host?
+            options[:client_cert] = root.product.certificate
+            options[:client_key] = root.product.key
+          end
         elsif root.redhat? && root.cdn_configuration.network_sync?
           options = {
             client_cert: root.cdn_configuration.ssl_cert,
@@ -524,13 +528,18 @@ module Katello
             ca_cert: root.ssl_ca_cert&.content,
           }
         end
-        append_proxy_cacert(options) if options.key?(:cacert)
+        append_proxy_cacert(options) if options.key?(:ca_cert)
         options
       end
 
+      def custom_cdn_ca_cert
+        return root.cdn_configuration.ssl_ca if root.cdn_configuration.ssl_ca.present?
+        ::File.read(::Katello::Resources::CDN::CdnResource.ca_file) if root.cdn_configuration.redhat_cdn_host?
+      end
+
       def append_proxy_cacert(options)
-        if root.http_proxy&.cacert&.present? && options.key?(:cacert)
-          options[:cacert] += "\n#{root.http_proxy&.cacert}"
+        if root.http_proxy&.cacert&.present? && options.key?(:ca_cert)
+          options[:ca_cert] = [options[:ca_cert], root.http_proxy.cacert].compact.join("\n")
         end
         options
       end

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

@@ -114,8 +114,8 @@ end
 
 node :permissions do |content_credential|
   {
-    :view_content_credenials => content_credential.readable?,
-    :edit_content_credenials => content_credential.editable?,
-    :destroy_content_credenials => content_credential.deletable?,
+    :view_content_credentials => content_credential.readable?,
+    :edit_content_credentials => content_credential.editable?,
+    :destroy_content_credentials => content_credential.deletable?,
   }
 end

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

@@ -44,6 +44,10 @@ node :multi_content_view_environment do |content_facet|
   content_facet.multi_content_view_environment?
 end
 
+node :content_view_environments_all_default_or_rolling do |content_facet|
+  content_facet.content_view_environments_all_default_or_rolling?
+end
+
 node :allow_multiple_content_views do
   Setting['allow_multiple_content_views']
 end

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

@@ -34,6 +34,7 @@
     });
     angular.module('Bastion.auth').value('Permissions', angular.fromJson(`<%= User.current.cached_roles.collect { |role| role.permissions }.flatten.to_json.html_safe %>`));
     angular.module('Bastion').value('newHostDetailsUI', "<%= Setting[:host_details_ui] %>");
+    angular.module('Bastion').value('newHostsPage', "<%= Setting[:new_hosts_page] %>");
     angular.module('Bastion').value('experimentalLabsSetting', "<%= Setting[:lab_features] %>");
   </script>
 

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

@@ -17,13 +17,14 @@
  * @requires BastionConfig
  * @requires hostIds
  * @requires newHostDetailsUI
+ * @requires newHostsPage
  *
  * @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', 'newHostDetailsUI',
-    function ($scope, $http, $location, $window, $timeout, $uibModalInstance, HostBulkAction, HostCollection, Nutupane, CurrentOrganization, Erratum, Notification, BastionConfig, hostIds, newHostDetailsUI) {
+    ['$scope', '$http', '$location', '$window', '$timeout', '$uibModalInstance', 'HostBulkAction', 'HostCollection', 'Nutupane', 'CurrentOrganization', 'Erratum', 'Notification', 'BastionConfig', 'hostIds', 'newHostDetailsUI', 'newHostsPage',
+    function ($scope, $http, $location, $window, $timeout, $uibModalInstance, HostBulkAction, HostCollection, Nutupane, CurrentOrganization, Erratum, Notification, BastionConfig, hostIds, newHostDetailsUI, newHostsPage) {
         function fetchErratum(errataId) {
             $scope.erratum = Erratum.get({id: errataId, 'organization_id': CurrentOrganization});
         }
@@ -43,6 +44,12 @@ angular.module('Bastion.content-hosts').controller('ContentHostsBulkErrataModalC
         $scope.allHostsSelected = hostIds.allResultsSelected;
         $scope.hostToolingEnabled = BastionConfig.hostToolingEnabled;
         $scope.newHostDetailsUI = newHostDetailsUI;
+        $scope.newHostsPage = (newHostsPage === 'true');
+
+        $scope.hostsUrl = function(errataId) {
+            var basePath = $scope.newHostsPage ? '/new/hosts' : '/hosts';
+            return basePath + '?search=installable_errata%3D' + errataId;
+        };
 
         $scope.errataActionFormValues = {
             authenticityToken: $window.AUTH_TOKEN.replace(/"/g, '')

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

@@ -100,7 +100,7 @@
              <td class="small" bst-table-cell>{{ erratum.issued }}</td>
              <td class="small" bst-table-cell class="number-cell">
               <span ng-switch="newHostDetailsUI">
-                <a ng-switch-when="true" target="_blank" href="{{ '/hosts?search=installable_errata%3D' + erratum.errata_id }}">
+                <a ng-switch-when="true" target="_blank" href="{{ hostsUrl(erratum.errata_id) }}">
                   {{ erratum.affected_hosts_count }}
                   <span class="fa fa-external-link"></span>
                 </a>

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/debs/details/deb.controller.js

@@ -7,11 +7,12 @@
      * @requires Host
      * @requires CurrentOrganization
      * @requires newHostDetailsUI
+     * @requires newHostsPage
      *
      * @description
      *   Provides the functionality for the debs details action pane.
      */
-    function DebController($scope, Deb, Host, CurrentOrganization, ApiErrorHandler, newHostDetailsUI) {
+    function DebController($scope, Deb, Host, CurrentOrganization, ApiErrorHandler, newHostDetailsUI, newHostsPage) {
         $scope.panel = {
             error: false,
             loading: true
@@ -23,6 +24,12 @@
 
         $scope.installedPackageCount = undefined;
         $scope.newHostDetailsUI = (newHostDetailsUI === 'true');
+        $scope.newHostsPage = (newHostsPage === 'true');
+
+        $scope.newHostUrl = function(field) {
+            var basePath = $scope.newHostsPage ? '/new/hosts' : '/hosts';
+            return basePath + '?search=' + $scope.createSearchString(field);
+        };
 
         $scope.fetchHostCount = function() {
             Host.get({'per_page': 0, 'search': $scope.createRawSearchString('installed_deb'), 'organization_id': CurrentOrganization}, function (data) {
@@ -51,6 +58,6 @@
         .module('Bastion.debs')
         .controller('DebController', DebController);
 
-    DebController.$inject = ['$scope', 'Deb', 'Host', 'CurrentOrganization', 'ApiErrorHandler', 'newHostDetailsUI'];
+    DebController.$inject = ['$scope', 'Deb', 'Host', 'CurrentOrganization', 'ApiErrorHandler', 'newHostDetailsUI', 'newHostsPage'];
 
 })();

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

@@ -9,7 +9,7 @@
       <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') }}" target="_blank" rel="noreferrer noopener" translate>
+          <a ng-if="newHostDetailsUI" href="{{ newHostUrl('installed_deb') }}" target="_blank" rel="noreferrer noopener" translate>
             {{ installedDebCount }} Host(s)
           </a>
           <a ng-if="!newHostDetailsUI" href="{{ '/content_hosts?search=' + createSearchString('installed_deb') }}" target="_blank" rel="noreferrer noopener" translate>
@@ -20,7 +20,7 @@
 
       <dt translate>Applicable To</dt>
       <dd>
-        <a ng-if="newHostDetailsUI" href="{{ '/hosts?search=' + createSearchString('applicable_debs') }}" target="_blank" rel="noreferrer noopener" translate>
+        <a ng-if="newHostDetailsUI" href="{{ newHostUrl('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') }}" target="_blank" rel="noreferrer noopener" translate>
@@ -30,7 +30,7 @@
 
       <dt translate>Upgradable For</dt>
       <dd>
-        <a ng-if="newHostDetailsUI" href="{{ '/hosts?search=' + createSearchString('upgradable_debs') }}" target="_blank" rel="noreferrer noopener" translate>
+        <a ng-if="newHostDetailsUI" href="{{ newHostUrl('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') }}" target="_blank" rel="noreferrer noopener" translate>

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/packages/details/package.controller.js

@@ -8,13 +8,14 @@
  * @requires CurrentOrganization
  * @requires ApiErrorHandler
  * @requires newHostDetailsUI
+ * @requires newHostsPage
  *
  * @description
  *   Provides the functionality for the package page.
  */
 angular.module('Bastion.packages').controller('PackageController',
-    ['$scope', 'Package', 'Host', 'CurrentOrganization', 'ApiErrorHandler', 'newHostDetailsUI', 'newHostDetailsUI',
-    function ($scope, Package, Host, CurrentOrganization, ApiErrorHandler, newHostDetailsUI) {
+    ['$scope', 'Package', 'Host', 'CurrentOrganization', 'ApiErrorHandler', 'newHostDetailsUI', 'newHostsPage',
+    function ($scope, Package, Host, CurrentOrganization, ApiErrorHandler, newHostDetailsUI, newHostsPage) {
         $scope.panel = {
             error: false,
             loading: true
@@ -26,6 +27,7 @@ angular.module('Bastion.packages').controller('PackageController',
 
         $scope.installedPackageCount = undefined;
         $scope.newHostDetailsUI = (newHostDetailsUI === 'true');
+        $scope.newHostsPage = (newHostsPage === 'true');
 
         $scope.fetchHostCount = function() {
             Host.get({'per_page': 0, 'search': $scope.createSearchString('installed_package'), 'organization_id': CurrentOrganization}, function (data) {
@@ -43,7 +45,8 @@ angular.module('Bastion.packages').controller('PackageController',
         };
 
         $scope.newHostUrl = function(field) {
-            return '/hosts?search=' + encodeURIComponent($scope.createSearchString(field));
+            var basePath = $scope.newHostsPage ? '/new/hosts' : '/hosts';
+            return basePath + '?search=' + encodeURIComponent($scope.createSearchString(field));
         };
 
         $scope.package = Package.get({id: $scope.$stateParams.packageId}, function () {

data/lib/katello/version.rb

@@ -1,3 +1,3 @@
 module Katello
-  VERSION = "4.20.0".freeze
+  VERSION = "4.20.1".freeze
 end

data/locale/action_names.rb

@@ -2,7 +2,6 @@
 _("Abstract async task")
 _("Add rolling repo clone")
 _("Bulk generate applicability for hosts")
-_("Clean Backend Objects")
 _("Commit upload")
 _("Copy all units")
 _("Copy content")
@@ -13,7 +12,6 @@ _("Create Container Push Repository Root")
 _("Create Export History")
 _("Create Import History")
 _("Create Syncable Export History")
-_("Create content view")
 _("Create exporter")
 _("Create import")
 _("Create importer")

data/webpack/components/Bookmark/AddBookmarkModal.js

@@ -51,7 +51,7 @@ const AddBookmarkModal = ({ selectedItem, onClose, controller }) => {
         </FormGroup>
         <FormGroup label={__('Search Query')} isRequired fieldId="query">
           <TextInput
-            ouiaId="query-inout"
+            ouiaId="query-input"
             isRequired
             type="text"
             id="query"

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

@@ -403,11 +403,11 @@ export const ErrataTab = () => {
     </>
   ) : null;
 
-  const hostIsNonLibrary = (
-    (contentFacet?.contentViewDefault === false ||
-      contentFacet.lifecycleEnvironmentLibrary === false) &&
-    contentFacet.contentView.rolling === false
-  );
+  // Show the Applicable/Installable toggle when not all errata are installable.
+  // contentViewEnvironmentsAllDefaultOrRolling is true when all CVEnvs are Library or rolling,
+  // meaning all applicable errata are installable and the toggle is unnecessary.
+  const showApplicableInstallableToggle =
+    contentFacet?.contentViewEnvironmentsAllDefaultOrRolling === false;
   const toggleGroup = (
     <Split hasGutter>
       <SplitItem>
@@ -432,7 +432,7 @@ export const ErrataTab = () => {
           isDisabled={!results?.length}
         />
       </SplitItem>
-      {hostIsNonLibrary &&
+      {showApplicableInstallableToggle &&
         <SplitItem>
           <ToggleGroup aria-label="Installable Errata">
             <ToggleGroupItem
@@ -510,7 +510,7 @@ export const ErrataTab = () => {
           displaySelectAllCheckbox={showActions}
           requestKey={HOST_ERRATA_KEY}
           alwaysShowActionButtons={false}
-          alwaysShowToggleGroup={hostIsNonLibrary && neededErrata}
+          alwaysShowToggleGroup={showApplicableInstallableToggle && neededErrata}
         >
           <Thead>
             <Tr ouiaId="row-header">

data/webpack/components/extensions/HostDetails/Tabs/__tests__/errataTab.test.js

@@ -19,11 +19,7 @@ jest.mock('../../hostDetailsHelpers', () => ({
 const contentFacetAttributes = {
   id: 11,
   uuid: 'e5761ea3-4117-4ecf-83d0-b694f99b389e',
-  content_view_default: false,
-  contentView: {
-    rolling: false,
-  },
-  lifecycle_environment_library: false,
+  content_view_environments_all_default_or_rolling: false,
   errata_counts: {
     total: 3,
   },
@@ -572,139 +568,45 @@ test('Select all is disabled if all rows are selected', async (done) => {
   done(); // Pass jest callback to confirm test is done
 });
 
-test('Toggle Group shows if it\'s not the default content view or library enviroment', async (done) => {
-  // Setup autocomplete with mockForemanAutoComplete since we aren't adding /katello
-  const autocompleteScope = mockForemanAutocomplete(nockInstance, autocompleteUrl);
-  const mockErrata = makeMockErrata({});
-  // return errata data results when we look for errata
-  const scope = nockInstance
-    .get(hostErrata)
-    .query(defaultQuery)
-    .reply(200, mockErrata);
-
-  const {
-    queryByLabelText,
-    getAllByText,
-  } = renderWithRedux(<ErrataTab />, renderOptions(cfWithErrataTotal(mockErrata.total)));
-
-  // Assert that the errata are now showing on the screen, but wait for them to appear.
-  await patientlyWaitFor(() => expect(getAllByText('Important')[0]).toBeInTheDocument());
-  expect(queryByLabelText('Installable Errata')).toBeInTheDocument();
-  assertNockRequest(autocompleteScope);
-  assertNockRequest(scope);
-  done(); // Pass jest callback to confirm test is done
-});
-
-test('Toggle Group shows if it\'s the default content view but non-library environment', async (done) => {
-  // Setup autocomplete with mockForemanAutoComplete since we aren't adding /katello
+test('Toggle Group shows when content_view_environments_all_default_or_rolling is false', async (done) => {
   const autocompleteScope = mockForemanAutocomplete(nockInstance, autocompleteUrl);
   const mockErrata = makeMockErrata({});
   const options = renderOptions({
     ...cfWithErrataTotal(mockErrata.total),
-    content_view_default: true,
+    content_view_environments_all_default_or_rolling: false,
   });
-  // return errata data results when we look for errata
   const scope = nockInstance
     .get(hostErrata)
     .query(defaultQuery)
     .reply(200, mockErrata);
 
-  const {
-    queryByLabelText,
-    getAllByText,
-  } = renderWithRedux(<ErrataTab />, options);
+  const { queryByLabelText, getAllByText } = renderWithRedux(<ErrataTab />, options);
 
-  // Assert that the errata are now showing on the screen, but wait for them to appear.
   await patientlyWaitFor(() => expect(getAllByText('Important')[0]).toBeInTheDocument());
   expect(queryByLabelText('Installable Errata')).toBeInTheDocument();
   assertNockRequest(autocompleteScope);
   assertNockRequest(scope);
-  done(); // Pass jest callback to confirm test is done
-});
-
-test('Toggle Group shows if it\'s the library environment but non-default content view', async (done) => {
-  // Setup autocomplete with mockForemanAutoComplete since we aren't adding /katello
-  const autocompleteScope = mockForemanAutocomplete(nockInstance, autocompleteUrl);
-  const mockErrata = makeMockErrata({});
-  const options = renderOptions({
-    ...cfWithErrataTotal(mockErrata.total),
-    lifecycle_environment_library: true,
-  });
-
-  // return errata data results when we look for errata
-  const scope = nockInstance
-    .get(hostErrata)
-    .query(defaultQuery)
-    .reply(200, mockErrata);
-
-  const {
-    queryByLabelText,
-    getAllByText,
-  } = renderWithRedux(<ErrataTab />, options);
-
-  // Assert that the errata are now showing on the screen, but wait for them to appear.
-  await patientlyWaitFor(() => expect(getAllByText('Important')[0]).toBeInTheDocument());
-  expect(queryByLabelText('Installable Errata')).toBeInTheDocument();
-  assertNockRequest(autocompleteScope);
-  assertNockRequest(scope);
-  done(); // Pass jest callback to confirm test is done
-});
-
-test('Toggle Group does not show if it\'s the default content view and library environment', async (done) => {
-  // Setup autocomplete with mockForemanAutoComplete since we aren't adding /katello
-  const autocompleteScope = mockForemanAutocomplete(nockInstance, autocompleteUrl);
-  const mockErrata = makeMockErrata({});
-  const options = renderOptions({
-    ...cfWithErrataTotal(mockErrata.total),
-    content_view_default: true,
-    lifecycle_environment_library: true,
-  });
-  // return errata data results when we look for errata
-  const scope = nockInstance
-    .get(hostErrata)
-    .query(defaultQuery)
-    .reply(200, mockErrata);
-
-  const {
-    queryByLabelText,
-    getAllByText,
-  } = renderWithRedux(<ErrataTab />, options);
-
-  // Assert that the errata are now showing on the screen, but wait for them to appear.
-  await patientlyWaitFor(() => expect(getAllByText('Important')[0]).toBeInTheDocument());
-  expect(queryByLabelText('Installable Errata')).not.toBeInTheDocument();
-  assertNockRequest(autocompleteScope);
-  assertNockRequest(scope);
-  done(); // Pass jest callback to confirm test is done
+  done();
 });
 
-test('Toggle Group does not show if it\'s a rolling content view and library environment', async (done) => {
-  // Setup autocomplete with mockForemanAutoComplete since we aren't adding /katello
+test('Toggle Group does not show when content_view_environments_all_default_or_rolling is true', async (done) => {
   const autocompleteScope = mockForemanAutocomplete(nockInstance, autocompleteUrl);
   const mockErrata = makeMockErrata({});
   const options = renderOptions({
     ...cfWithErrataTotal(mockErrata.total),
-    contentView: {
-      rolling: true,
-    },
-    lifecycle_environment_library: true,
+    content_view_environments_all_default_or_rolling: true,
   });
-  // return errata data results when we look for errata
   const scope = nockInstance
     .get(hostErrata)
     .query(defaultQuery)
     .reply(200, mockErrata);
 
-  const {
-    queryByLabelText,
-    getAllByText,
-  } = renderWithRedux(<ErrataTab />, options);
+  const { queryByLabelText, getAllByText } = renderWithRedux(<ErrataTab />, options);
 
-  // Assert that the errata are now showing on the screen, but wait for them to appear.
   await patientlyWaitFor(() => expect(getAllByText('Important')[0]).toBeInTheDocument());
   expect(queryByLabelText('Installable Errata')).not.toBeInTheDocument();
   assertNockRequest(autocompleteScope);
-  assertNockRequest(scope, done); // Pass jest callback to confirm test is done
+  assertNockRequest(scope, done);
 });
 
 test('Selection is disabled for errata which are applicable but not installable', async (done) => {

data/webpack/scenes/AlternateContentSources/Create/__tests__/contentCredentials.fixtures.json

@@ -33,9 +33,9 @@
       "ssl_key_products": [],
       "ssl_key_root_repos": [],
       "permissions": {
-        "view_content_credenials": true,
-        "edit_content_credenials": true,
-        "destroy_content_credenials": true
+        "view_content_credentials": true,
+        "edit_content_credentials": true,
+        "destroy_content_credentials": true
       }
     },
     {
@@ -60,9 +60,9 @@
       "ssl_key_products": [],
       "ssl_key_root_repos": [],
       "permissions": {
-        "view_content_credenials": true,
-        "edit_content_credenials": true,
-        "destroy_content_credenials": true
+        "view_content_credentials": true,
+        "edit_content_credentials": true,
+        "destroy_content_credentials": true
       }
     }
   ]

data/webpack/scenes/ContainerImages/Booted/BootedContainerImagesPage.js

@@ -104,7 +104,7 @@ const BootedContainerImagesPage = () => {
     <TableIndexPage
       apiUrl={BOOTED_CONTAINER_IMAGES_API_PATH}
       apiOptions={apiOptions}
-      createable={false}
+      creatable={false}
       isDeleteable={false}
       controller="/katello/api/v2/host_bootc_images"
     >

data/webpack/scenes/ContentCredentials/__tests__/contentCredentials.fixtures.js

@@ -35,9 +35,9 @@ const contentCredentialsResponse = Immutable({
       ssl_key_products: [],
       ssl_key_root_repos: [],
       permissions: {
-        view_content_credenials: true,
-        edit_content_credenials: true,
-        destroy_content_credenials: true,
+        view_content_credentials: true,
+        edit_content_credentials: true,
+        destroy_content_credentials: true,
       },
     },
     {
@@ -62,9 +62,9 @@ const contentCredentialsResponse = Immutable({
       ssl_key_products: [],
       ssl_key_root_repos: [],
       permissions: {
-        view_content_credenials: true,
-        edit_content_credenials: true,
-        destroy_content_credenials: true,
+        view_content_credentials: true,
+        edit_content_credentials: true,
+        destroy_content_credentials: true,
       },
     },
   ],

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: katello
 version: !ruby/object:Gem::Version
-  version: 4.20.0
+  version: 4.20.1
 platform: ruby
 authors:
 - N/A
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2026-03-11 00:00:00.000000000 Z
+date: 2026-05-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -5624,7 +5624,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.6
+rubygems_version: 3.2.33
 signing_key:
 specification_version: 4
 summary: Content and Subscription Management plugin for Foreman