katello 4.8.0.rc2 → 4.8.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 623f96f2d316d946b9a19bbed0bd70a58c56541dfcde05261848efb7f868881d
-  data.tar.gz: f39b3c6dca68f3b742f6a09fb5a821ab5e9d11128835023f09a5a8df30a27272
+  metadata.gz: 81c709207089041832e6dd1b447a01d0d40dc228480d4b4e43b536c853242662
+  data.tar.gz: 94ec8c4161ff3f63d2a48d4be430b5942b7a40684c4bc39a6c734597ed9f39bf
 SHA512:
-  metadata.gz: 3d4e46aa5cdededbea344d58cc4dd5c43c1fcdd480e5a62594a1bf0892ff80c048e07a3a7460646b2778502849cc58d7ab6f8f22aaeb1ce3fd0ea8aa59f844c7
-  data.tar.gz: 97fa1540ab108458032dc4a4963b9644af0a6c7207079bf2c3ef2cc895cacab6521eec73e4ed4aadc2eaf8428fc3b2d5b7bec489a03f02a2d972310344b7c07f
+  metadata.gz: 1923b0ae05a6bb6c92b7b807793ce795e4ed90a26e598124a0441b49cb30270ec4829eb0ae0a95944de20bb4db5366b9219ac247667e194b8de88c6a7a933e82
+  data.tar.gz: 062cd9f6c371824bbe22b4b686735eba4ac0ee5ebd316fe4e06fa74b942e58da6f891ef6c3d5ed92158e9d32878bfc533574419b63836d4f4078a3b85eca54bb

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

@@ -26,8 +26,10 @@ module Katello
     api :PUT, "/organizations/:organization_id/simple_content_access/enable",
       N_("Enable simple content access for a manifest")
     param :organization_id, :number, :desc => N_("Organization ID"), :required => true
+    param :auto_create_overrides, :bool, :desc => N_("Automatically create disabled content overrides for custom products which do not have an attached subscription"), :required => false, :default => true
     def enable
-      task = async_task(::Actions::Katello::Organization::SimpleContentAccess::Enable, params[:organization_id])
+      auto_create = params.key?(:auto_create_overrides) ? ::Foreman::Cast.to_bool(params[:auto_create_overrides]) : true
+      task = async_task(::Actions::Katello::Organization::SimpleContentAccess::Enable, params[:organization_id], auto_create_overrides: auto_create)
       respond_for_async :resource => task
     end
 

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

@@ -112,15 +112,8 @@ module Actions
           version.update_content_counts!
           # update errata applicability counts for all hosts in the CV & Library
           unless input[:skip_promotion]
-            content_view = ::Katello::ContentView.find(input[:content_view_id])
-            lifecycle_environment = ::Katello::KTEnvironment.find(input[:environment_id])
-            ::Katello::Host::ContentFacet.in_content_views_and_environments(
-              content_views: [content_view],
-              lifecycle_environments: [lifecycle_environment]
-            ).each do |facet|
-              facet.update_applicability_counts
-              facet.update_errata_status
-            end
+            environment = ::Katello::KTEnvironment.find(input[:environment_id])
+            ::Katello::ContentView.find(input[:content_view_id]).update_host_statuses(environment)
           end
 
           history = ::Katello::ContentViewHistory.find(input[:history_id])

data/app/lib/actions/katello/organization/simple_content_access/enable.rb

@@ -3,6 +3,16 @@ module Actions
     module Organization
       module SimpleContentAccess
         class Enable < Toggle
+          def plan(organization_id, auto_create_overrides: true)
+            input[:auto_create_overrides] = auto_create_overrides
+            sequence do
+              if auto_create_overrides
+                plan_action(PrepareContentOverrides, organization_id)
+              end
+              super(organization_id) # puts plan_self inside the sequence
+            end
+          end
+
           def content_access_mode_value
             SIMPLE_CONTENT_ACCESS_ENABLED_VALUE
           end

data/app/lib/actions/katello/organization/simple_content_access/prepare_content_overrides.rb

@@ -0,0 +1,36 @@
+module Actions
+  module Katello
+    module Organization
+      module SimpleContentAccess
+        class PrepareContentOverrides < Actions::Base
+          def plan(organization_id)
+            Rails.logger.info "PrepareContentOverrides plan: #{organization_id.inspect}"
+            organization = ::Organization.find(organization_id.to_i)
+            org_name = organization.name
+
+            plan_self(organization_id: organization_id, organization_name: org_name)
+          end
+
+          def run
+            organization = ::Organization.find(input[:organization_id].to_i)
+            migrator = ::Katello::Util::ContentOverridesMigrator.new(organization: organization)
+
+            output[:migrator_result] = migrator.execute_non_sca_overrides!
+          end
+
+          def rescue_strategy
+            Dynflow::Action::Rescue::Skip
+          end
+
+          def humanized_name
+            N_("Prepare content overrides for Simple Content Access")
+          end
+
+          def humanized_input
+            _("for organization %s") % input[:organization_name]
+          end
+        end
+      end
+    end
+  end
+end

data/app/lib/actions/katello/organization/simple_content_access/toggle.rb

@@ -12,9 +12,15 @@ module Actions
           attr_reader :organization
 
           def plan(organization_id)
-            @organization = ::Organization.find(organization_id)
+            organization = ::Organization.find(organization_id.to_i)
+            input[:organization_name] = organization.name
+            input[:organization_label] = organization.label
             action_subject organization
-            ::Katello::Resources::Candlepin::Owner.update(@organization.label, contentAccessMode: content_access_mode_value)
+            plan_self(organization_id: organization_id)
+          end
+
+          def run
+            ::Katello::Resources::Candlepin::Owner.update(input[:organization_label], contentAccessMode: content_access_mode_value)
           end
 
           def failure_notification(plan)
@@ -30,6 +36,10 @@ module Actions
             )
           end
 
+          def humanized_input
+            _("for organization %s") % input[:organization_name]
+          end
+
           private
 
           def consumer

data/app/lib/katello/util/content_overrides_migrator.rb

@@ -0,0 +1,98 @@
+module Katello
+  module Util
+    class ContentOverridesMigrator # used in Actions::Katello::Organization::SimpleContentAccess::PrepareContentOverrides
+      include ActionView::Helpers::TextHelper
+
+      def initialize(organization:)
+        @organization = organization
+      end
+
+      def execute_non_sca_overrides!
+        host_errors = create_disabled_overrides_for_non_sca_org_hosts(organization: @organization)
+        ak_errors = create_disabled_overrides_for_non_sca_org_activation_keys(organization: @organization)
+
+        total_errors = host_errors + ak_errors
+        finish_message = "Finished creating overrides in non-SCA orgs; #{total_errors == 0 ? "no errors" : "#{pluralize(total_errors, "error")}"}"
+        messages = { result: finish_message, errors: total_errors }
+        messages[:host_errors] = "Hosts - #{pluralize(host_errors, "error")} creating disabled overrides for unsubscribed content; see log messages above" if host_errors > 0
+        messages[:ak_errors] = "Activation keys - #{pluralize(ak_errors, "error")} creating disabled overrides for unsubscribed content; see log messages above" if ak_errors > 0
+        messages[:success_message] = "You may now switch all organizations to Simple Content Access mode without any change in access to content." if total_errors == 0
+        Rails.logger.info finish_message
+        Rails.logger.info messages[:host_errors] if messages[:host_errors]
+        Rails.logger.info messages[:ak_errors] if messages[:ak_errors]
+        Rails.logger.info messages[:success_message] if messages[:success_message]
+        messages
+      end
+
+      def create_disabled_overrides_for_non_sca(consumable:)
+        content_finder = ::Katello::ProductContentFinder.new(
+                match_subscription: false,
+                match_environment: false,
+                consumable: consumable
+              )
+        subscribed_content_finder = ::Katello::ProductContentFinder.new(
+          match_subscription: true,
+          match_environment: false,
+          consumable: consumable
+        )
+        candlepin_resource = consumable.is_a?(::Katello::Host::SubscriptionFacet) ? ::Katello::Resources::Candlepin::Consumer : ::Katello::Resources::Candlepin::ActivationKey
+        consumable_id = consumable.is_a?(::Katello::Host::SubscriptionFacet) ? consumable.uuid : consumable.cp_id
+        repos_with_existing_overrides = candlepin_resource.content_overrides(consumable_id).map do |override|
+          override[:contentLabel]
+        end
+        unsubscribed_content = content_finder.custom_content_labels - subscribed_content_finder.custom_content_labels - repos_with_existing_overrides
+        new_overrides = unsubscribed_content.map do |repo_label|
+          ::Katello::ContentOverride.new(
+            repo_label,
+            { name: "enabled", value: "0" } # Override to disabled
+          )
+        end
+        return if new_overrides.blank?
+        if consumable.is_a? ::Katello::Host::SubscriptionFacet
+          ::Katello::Resources::Candlepin::Consumer.update_content_overrides(
+            consumable.uuid,
+            new_overrides.map(&:to_entitlement_hash)
+          )
+        else
+          ::Katello::Resources::Candlepin::ActivationKey.update_content_overrides(
+            consumable.cp_id,
+            new_overrides.map(&:to_entitlement_hash)
+          )
+        end
+      end
+
+      def create_disabled_overrides_for_non_sca_org_hosts(organization:)
+        errors = 0
+        fail _("Organization must be specified") if organization.blank?
+        return 0 if organization.simple_content_access? # subscription attachment is meaningless with SCA
+        Rails.logger.info("Hosts - Creating disabled overrides for unsubscribed content in organization #{organization.name}")
+        # only registered hosts with content!
+        hosts_to_update = organization.hosts.joins(:subscription_facet).where.not("#{Katello::Host::SubscriptionFacet.table_name}.host_id" => nil)
+        hosts_to_update.each do |host|
+          create_disabled_overrides_for_non_sca(consumable: host.subscription_facet)
+        rescue => e
+          errors += 1
+          Rails.logger.error("Failed to update host #{host.name}: #{e.message}")
+          Rails.logger.debug e.backtrace.join("\n")
+        end
+        errors
+      end
+
+      def create_disabled_overrides_for_non_sca_org_activation_keys(organization:)
+        errors = 0
+        fail _("Organization must be specified") if organization.blank?
+        return 0 if organization.simple_content_access? # subscription attachment is meaningless with SCA
+        Rails.logger.info("Activation keys - Creating disabled overrides for unsubscribed content in organization #{organization.name}")
+        aks_to_update = organization.activation_keys
+        aks_to_update.each do |ak|
+          create_disabled_overrides_for_non_sca(consumable: ak)
+        rescue => e
+          errors += 1
+          Rails.logger.error("Failed to update activation key #{ak.name}: #{e.message}")
+          Rails.logger.debug e.backtrace.join("\n")
+        end
+        errors
+      end
+    end
+  end
+end

data/app/models/katello/content_view.rb

@@ -652,12 +652,16 @@ module Katello
     end
 
     def check_orphaned_content_facets!(environments: [])
-      ::Katello::Host::ContentFacet.in_content_views_and_environments(
-        content_views: [self],
-        lifecycle_environments: environments
-      ).each do |facet|
-        unless facet.host
-          fail _("Orphaned content facets for deleted hosts exist for the content view and environment. Please run rake task : katello:clean_orphaned_facets and try again!")
+      Location.no_taxonomy_scope do
+        User.as_anonymous_admin do
+          ::Katello::Host::ContentFacet.in_content_views_and_environments(
+            content_views: [self],
+            lifecycle_environments: environments
+          ).each do |facet|
+            unless facet.host
+              fail _("Orphaned content facets for deleted hosts exist for the content view and environment. Please run rake task : katello:clean_orphaned_facets and try again!")
+            end
+          end
         end
       end
     end

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

@@ -298,19 +298,26 @@ module Katello
       end
 
       def katello_agent_installed?
-        self.host.installed_packages.where("#{Katello::InstalledPackage.table_name}.name" => 'katello-agent').any?
+        self.host.installed_packages.where("#{Katello::InstalledPackage.table_name}.name" => 'katello-agent').any? ||
+          self.host.installed_debs.where("#{Katello::InstalledDeb.table_name}.name" => 'katello-agent').any?
       end
 
       def tracer_installed?
         self.host.installed_packages.where("#{Katello::InstalledPackage.table_name}.name" => [ "python-#{HOST_TOOLS_TRACER_PACKAGE_NAME}",
                                                                                                "python3-#{HOST_TOOLS_TRACER_PACKAGE_NAME}",
-                                                                                               HOST_TOOLS_TRACER_PACKAGE_NAME ]).any?
+                                                                                               HOST_TOOLS_TRACER_PACKAGE_NAME ]).any? ||
+          self.host.installed_debs.where("#{Katello::InstalledDeb.table_name}.name" => [ "python-#{HOST_TOOLS_TRACER_PACKAGE_NAME}",
+                                                                                         "python3-#{HOST_TOOLS_TRACER_PACKAGE_NAME}",
+                                                                                         HOST_TOOLS_TRACER_PACKAGE_NAME ]).any?
       end
 
       def host_tools_installed?
         host.installed_packages.where("#{Katello::InstalledPackage.table_name}.name" => [ "python-#{HOST_TOOLS_PACKAGE_NAME}",
                                                                                           "python3-#{HOST_TOOLS_PACKAGE_NAME}",
-                                                                                          HOST_TOOLS_PACKAGE_NAME ]).any?
+                                                                                          HOST_TOOLS_PACKAGE_NAME ]).any? ||
+          host.installed_debs.where("#{Katello::InstalledDeb.table_name}.name" => [ "python-#{HOST_TOOLS_PACKAGE_NAME}",
+                                                                                    "python3-#{HOST_TOOLS_PACKAGE_NAME}",
+                                                                                    HOST_TOOLS_PACKAGE_NAME ]).any?
       end
 
       def update_errata_status

data/db/migrate/20220110223754_update_disconnected_settings.rb

@@ -1,19 +1,23 @@
 class UpdateDisconnectedSettings < ActiveRecord::Migration[6.0]
+  class FakeSetting < Katello::Model
+    self.table_name = 'settings'
+  end
+
   def up
-    setting_disconnected = Setting.find_by(name: 'content_disconnected')
+    setting_disconnected = FakeSetting.find_by(name: 'content_disconnected')
     setting = Setting.find_by(name: 'subscription_connection_enabled')
 
     setting&.update!(
       value: !setting_disconnected&.value
     )
-    Setting.where(:name => 'content_disconnected').delete_all
+    FakeSetting.where(:name => 'content_disconnected').delete_all
   end
 
   def down
     remove_column :katello_cdn_configurations, :airgapped
     setting_disconnected = Setting.find_by(name: 'subscription_connection_enabled')
-    Setting.set('content_disconnected', N_("A server operating in disconnected mode does not communicate with the Red Hat CDN."),
-               !setting_disconnected.value, N_('Disconnected mode'))
+    FakeSetting.set('content_disconnected', N_("A server operating in disconnected mode does not communicate with the Red Hat CDN."),
+                    !setting_disconnected.value, N_('Disconnected mode'))
 
     Setting.where(:name => 'subscription_connection_enabled').delete_all
   end

data/db/migrate/20230119003859_ensure_repo_username_password_nil_not_blank.rb

@@ -2,7 +2,7 @@ class EnsureRepoUsernamePasswordNilNotBlank < ActiveRecord::Migration[6.1]
   def change
     ::Katello::Repository.library.each do |repo|
       if repo.upstream_username == '' && repo.upstream_password == ''
-        repo.update(upstream_username: nil, upstream_password: nil)
+        repo.root.update(upstream_username: nil, upstream_password: nil)
       end
     end
   end

data/lib/katello/plugin.rb

@@ -651,18 +651,6 @@ Foreman::Plugin.register :katello do
         full_name: N_('Applicability Batch Size'),
         description: N_("Number of host applicability calculations to process per task.")
 
-      setting 'autosearch_while_typing',
-        type: :boolean,
-        default: true,
-        full_name: N_('Autosearch'),
-        description: N_('For pages that support it, automatically perform search while typing in search input.')
-
-      setting 'autosearch_delay',
-        type: :integer,
-        default: 500,
-        full_name: N_('Autosearch delay'),
-        description: N_('If Autosearch is enabled, delay in milliseconds before executing searches while typing.')
-
       setting 'bulk_load_size',
         type: :integer,
         default: 2000,

data/lib/katello/version.rb

@@ -1,3 +1,3 @@
 module Katello
-  VERSION = "4.8.0.rc2".freeze
+  VERSION = "4.8.1".freeze
 end

data/webpack/components/Content/{ContentPage.js → GenericContentPage.js}

@@ -4,8 +4,9 @@ import { Grid, Col, Row, Form, FormGroup } from 'react-bootstrap';
 import SearchBar from 'foremanReact/components/SearchBar';
 import { getControllerSearchProps } from 'foremanReact/constants';
 import ContentTable from './ContentTable';
+import { useClearSearch } from '../extensions/SearchBar/SearchBarHooks';
 
-const ContentPage = ({
+const GenericContentPage = ({
   header, onSearch, bookmarkController,
   autocompleteEndpoint, autocompleteQueryParams,
   updateSearchQuery, initialInputValue,
@@ -15,6 +16,7 @@ const ContentPage = ({
     ...getControllerSearchProps(autocompleteEndpoint, `searchBar-content-page-${header}`, true, autocompleteQueryParams),
     controller: bookmarkController,
   };
+  const searchBarKey = useClearSearch({ updateSearchQuery });
   return (
     <Grid bsClass="container-fluid">
       <Row>
@@ -27,6 +29,7 @@ const ContentPage = ({
           <Form className="toolbar-pf-actions">
             <FormGroup className="toolbar-pf toolbar-pf-filter">
               <SearchBar
+                key={searchBarKey}
                 data={searchDataProp}
                 onSearch={onSearch}
                 onSearchChange={updateSearchQuery}
@@ -49,7 +52,7 @@ const ContentPage = ({
   );
 };
 
-ContentPage.propTypes = {
+GenericContentPage.propTypes = {
   header: PropTypes.string.isRequired,
   content: PropTypes.shape({}).isRequired,
   tableSchema: PropTypes.arrayOf(PropTypes.shape({})).isRequired,
@@ -62,10 +65,10 @@ ContentPage.propTypes = {
   bookmarkController: PropTypes.string,
 };
 
-ContentPage.defaultProps = {
+GenericContentPage.defaultProps = {
   autocompleteEndpoint: undefined,
   autocompleteQueryParams: undefined,
   bookmarkController: undefined,
 };
 
-export default ContentPage;
+export default GenericContentPage;

data/webpack/components/Content/__tests__/ContentTable.test.js

@@ -1,9 +1,9 @@
 import React from 'react';
 import { shallow } from 'enzyme';
 import toJson from 'enzyme-to-json';
-import ContentTable from '../ContentTable';
 import { LoadingState } from '../../../components/LoadingState';
 import { Table } from '../../../components/pf3Table';
+import ContentTable from '../ContentTable';
 
 describe('Content Table', () => {
   it('should render and contain appropriate components', async () => {

data/webpack/components/Content/__tests__/GenericContentPage.test.js

@@ -0,0 +1,35 @@
+import React from 'react';
+import { act } from 'react-test-renderer';
+import { renderWithRedux, patientlyWaitFor } from 'react-testing-lib-wrapper';
+import { CONTENT_KEY } from '../../../scenes/Content/ContentConstants';
+import GenericContentPage from '../GenericContentPage';
+
+const renderOptions = () => ({
+  apiNamespace: CONTENT_KEY,
+});
+
+test('Can render the basic component with no data', async (done) => {
+  const contentHeader = 'Content Header';
+  const content = { results: [] };
+  const onSearch = jest.fn();
+  const updateSearchQuery = jest.fn();
+  const searchQuery = '';
+  const onPaginationChange = jest.fn();
+  const TableSchema = [];
+  const bookmarkController = 'module_streams';
+
+  const { getByText } = renderWithRedux(<GenericContentPage
+    header={contentHeader}
+    content={content}
+    tableSchema={TableSchema}
+    onSearch={onSearch}
+    updateSearchQuery={updateSearchQuery}
+    initialInputValue={searchQuery}
+    onPaginationChange={onPaginationChange}
+    bookmarkController={bookmarkController}
+  />, renderOptions());
+
+  await patientlyWaitFor(() =>
+    expect(getByText(contentHeader)).toBeInTheDocument());
+  act(done);
+});

data/webpack/components/Search/SearchText.js

@@ -0,0 +1,70 @@
+import React, { useState } from 'react';
+import PropTypes from 'prop-types';
+import { SearchAutocomplete } from 'foremanReact/components/SearchBar/SearchAutocomplete';
+import { useAPI } from 'foremanReact/common/hooks/API/APIHooks';
+import { STATUS } from 'foremanReact/constants';
+import { noop } from 'foremanReact/common/helpers';
+
+const SearchText = ({
+  data: {
+    autocomplete: { url, apiParams } = { url: '' },
+    disabled,
+  },
+  initialQuery,
+  onSearchChange,
+  name,
+}) => {
+  const [search, setSearch] = useState(initialQuery || '');
+  const getAPIparams = input => ({ ...apiParams(input) });
+  const { response, status, setAPIOptions } = useAPI('get', url, {
+    params: getAPIparams(search),
+  });
+  const onChange = (newValue) => {
+    onSearchChange(newValue);
+    setSearch(newValue);
+    setAPIOptions({ params: { ...getAPIparams(newValue) } });
+  };
+  const error =
+    status === STATUS.ERROR || response?.[0]?.error
+      ? response?.[0]?.error || response.message
+      : null;
+
+  let results = [];
+  if (Array.isArray(response) && !error) {
+    results = response.map(item => ({ label: item, category: '' }));
+  }
+
+  return (
+    <div className="foreman-search-text">
+      <SearchAutocomplete
+        results={results}
+        onSearchChange={onChange}
+        value={search}
+        disabled={disabled}
+        error={error}
+        name={name}
+      />
+    </div>
+  );
+};
+
+SearchText.propTypes = {
+  data: PropTypes.shape({
+    autocomplete: PropTypes.shape({
+      url: PropTypes.string.isRequired,
+      apiParams: PropTypes.func,
+    }).isRequired,
+    disabled: PropTypes.bool,
+  }).isRequired,
+  initialQuery: PropTypes.string,
+  onSearchChange: PropTypes.func,
+  name: PropTypes.string,
+};
+
+SearchText.defaultProps = {
+  initialQuery: '',
+  onSearchChange: noop,
+  name: null,
+};
+
+export default SearchText;

data/webpack/components/Table/EmptyStateMessage.js

@@ -14,7 +14,7 @@ import { translate as __ } from 'foremanReact/common/I18n';
 import { CubeIcon, ExclamationCircleIcon, SearchIcon, CheckCircleIcon, PlusCircleIcon } from '@patternfly/react-icons';
 import { global_danger_color_200 as dangerColor, global_success_color_100 as successColor } from '@patternfly/react-tokens';
 import { useDispatch, useSelector } from 'react-redux';
-import { selectHostDetailsClearSearch } from '../extensions/HostDetails/HostDetailsSelectors';
+import { selectSearchBarClearSearch } from '../extensions/SearchBar/SearchBarSelectors';
 
 const KatelloEmptyStateIcon = ({
   error, search, customIcon, happyIcon,
@@ -51,7 +51,7 @@ const EmptyStateMessage = ({
   const defaultSecondaryActionText = searchIsActive ? __('Clear search') : __('Clear filters');
   const secondaryActionText = secondaryActionTextOverride || defaultSecondaryActionText;
   const dispatch = useDispatch();
-  const clearSearch = useSelector(selectHostDetailsClearSearch);
+  const clearSearch = useSelector(selectSearchBarClearSearch);
   const showSecondaryActionAnchor = showSecondaryAction && secondaryActionLink;
   const handleClick = () => {
     if (searchIsActive) {

data/webpack/components/Table/TableWrapper.js

@@ -14,6 +14,7 @@ import MainTable from './MainTable';
 import { getPageStats } from './helpers';
 import SelectAllCheckbox from '../SelectAllCheckbox';
 import { orgId } from '../../services/api';
+import { useClearSearch } from '../extensions/SearchBar/SearchBarHooks';
 
 /* Patternfly 4 table wrapper */
 const TableWrapper = ({
@@ -132,6 +133,8 @@ const TableWrapper = ({
     spawnFetch();
   }, [searchQuery, spawnFetch, additionalListeners]);
 
+  const searchBarKey = useClearSearch({ updateSearchQuery });
+
   // If the new page wouldn't exist because of a perPage change,
   // we should set the current page to the last page.
   const validatePagination = (data) => {
@@ -194,6 +197,7 @@ const TableWrapper = ({
               data={searchDataProp}
               initialQuery={searchQuery}
               onSearch={search => updateSearchQuery(search)}
+              key={searchBarKey}
             />
           </FlexItem>
         }

data/webpack/components/extensions/HostDetails/HostDetailsConstants.js

@@ -1,3 +1,2 @@
-export const SET_CLEAR_SEARCH = 'SET_CLEAR_SEARCH';
 const HOST_DETAILS = 'HOST_DETAILS';
 export default HOST_DETAILS;

data/webpack/components/extensions/HostDetails/HostDetailsSelectors.js

@@ -14,9 +14,3 @@ export const selectHostDetailsStatus = state =>
 
 export const selectHostDetailsError = state =>
   selectAPIError(state, HOST_DETAILS_KEY);
-
-export const selectHostDetailsState = state =>
-  state.katello.hostDetails;
-
-export const selectHostDetailsClearSearch = state =>
-  selectHostDetailsState(state).clearSearch;

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

@@ -49,8 +49,8 @@ import {
 const moduleStreamSupported = ({ os, version }) =>
   os.match(/RedHat|RHEL|CentOS|Rocky|AlmaLinux|OracleLinux/i) && Number(version) > 7;
 export const hideModuleStreamsTab = ({ hostDetails }) => {
-  const osMatch = hostDetails?.operatingsystem_name?.match(/(\w+) (\d+)/);
-  if (!osMatch) return true;
+  const osMatch = hostDetails?.operatingsystem_name?.match(/(\D+) (\d+)/);
+  if (!osMatch) return false;
   const [, os, version] = osMatch;
   return !(osMatch && moduleStreamSupported({ os, version }));
 };