foreman_rh_cloud 12.2.13 → 13.0.0

data/test/jobs/inventory_hosts_sync_test.rb

@@ -2,7 +2,7 @@ require 'test_plugin_helper'
 require 'foreman_tasks/test_helpers'
 
 class InventoryHostsSyncTest < ActiveSupport::TestCase
-  include Dynflow::Testing::Factories
+  include ForemanTasks::TestHelpers::WithInThreadExecutor
   include MockCerts
   include KatelloCVEHelper
 
@@ -302,8 +302,7 @@ class InventoryHostsSyncTest < ActiveSupport::TestCase
 
     @host2.build_insights.save
 
-    action = create_and_plan_action(InventorySync::Async::InventoryHostsSync, [@host1.organization, @host2.organization])
-    run_action(action)
+    ForemanTasks.sync_task(InventorySync::Async::InventoryHostsSync, [@host1.organization, @host2.organization])
 
     @host2.reload
 
@@ -318,8 +317,7 @@ class InventoryHostsSyncTest < ActiveSupport::TestCase
       InventorySync::Async::InventoryHostsSync.any_instance.stubs(:candlepin_id_cert)
     end
 
-    action = create_and_plan_action(InventorySync::Async::InventoryHostsSync, [@host1.organization, @host2.organization])
-    run_action(action)
+    ForemanTasks.sync_task(InventorySync::Async::InventoryHostsSync, [@host1.organization, @host2.organization])
 
     @host2.reload
 
@@ -338,8 +336,7 @@ class InventoryHostsSyncTest < ActiveSupport::TestCase
 
     assert_nil @host2.insights
 
-    action = create_and_plan_action(InventorySync::Async::InventoryHostsSync, [@host1.organization, @host2.organization])
-    run_action(action)
+    ForemanTasks.sync_task(InventorySync::Async::InventoryHostsSync, [@host1.organization, @host2.organization])
 
     @host2.reload
 
@@ -356,8 +353,7 @@ class InventoryHostsSyncTest < ActiveSupport::TestCase
       InventorySync::Async::InventoryHostsSync.any_instance.stubs(:candlepin_id_cert)
     end
 
-    action = create_and_plan_action(InventorySync::Async::InventoryHostsSync, [org])
-    run_action(action)
+    ForemanTasks.sync_task(InventorySync::Async::InventoryHostsSync, [org])
 
     assert_equal 3, InsightsMissingHost.count
   end
@@ -374,8 +370,7 @@ class InventoryHostsSyncTest < ActiveSupport::TestCase
       InventorySync::Async::InventoryHostsSync.any_instance.stubs(:candlepin_id_cert)
     end
 
-    action = create_and_plan_action(InventorySync::Async::InventoryHostsSync, [org])
-    run_action(action)
+    ForemanTasks.sync_task(InventorySync::Async::InventoryHostsSync, [org])
 
     assert_equal 3, InsightsMissingHost.count
   end

data/test/jobs/inventory_scheduled_sync_test.rb

@@ -2,7 +2,7 @@ require 'test_plugin_helper'
 require 'foreman_tasks/test_helpers'
 
 class InventoryScheduledSyncTest < ActiveSupport::TestCase
-  include Dynflow::Testing::Factories
+  include ForemanTasks::TestHelpers::WithInThreadExecutor
 
   test 'Schedules an execution if auto upload is enabled' do
     Setting[:allow_auto_inventory_upload] = true
@@ -11,8 +11,7 @@ class InventoryScheduledSyncTest < ActiveSupport::TestCase
     InventorySync::Async::InventoryScheduledSync.any_instance.expects(:plan_org_sync).times(Organization.unscoped.count)
     InventorySync::Async::InventoryScheduledSync.any_instance.expects(:plan_remove_insights_hosts).times(Organization.unscoped.count)
 
-    action = create_and_plan_action(InventorySync::Async::InventoryScheduledSync)
-    run_action(action)
+    ForemanTasks.sync_task(InventorySync::Async::InventoryScheduledSync)
   end
 
   test 'Skips execution if with_iop_smart_proxy? is true' do
@@ -20,9 +19,8 @@ class InventoryScheduledSyncTest < ActiveSupport::TestCase
 
     InventorySync::Async::InventoryScheduledSync.any_instance.expects(:plan_org_sync).never
 
-    action = create_and_plan_action(InventorySync::Async::InventoryScheduledSync)
-    action = run_action(action)
-    status = action.output[:status].to_s
+    task = ForemanTasks.sync_task(InventorySync::Async::InventoryScheduledSync)
+    status = task.output[:status].to_s
     assert_match(/Foreman is configured with a local IoP Smart Proxy/, status)
   end
 
@@ -31,8 +29,7 @@ class InventoryScheduledSyncTest < ActiveSupport::TestCase
 
     InventorySync::Async::InventoryScheduledSync.any_instance.expects(:plan_org_sync).never
 
-    action = create_and_plan_action(InventorySync::Async::InventoryScheduledSync)
-    run_action(action)
+    ForemanTasks.sync_task(InventorySync::Async::InventoryScheduledSync)
   end
 
   test 'Skips mismatch deletion if the setting is disabled' do
@@ -42,7 +39,6 @@ class InventoryScheduledSyncTest < ActiveSupport::TestCase
     InventorySync::Async::InventoryScheduledSync.any_instance.expects(:plan_org_sync).times(Organization.unscoped.count)
     InventorySync::Async::InventoryScheduledSync.any_instance.expects(:plan_remove_insights_hosts).never
 
-    action = create_and_plan_action(InventorySync::Async::InventoryScheduledSync)
-    run_action(action)
+    ForemanTasks.sync_task(InventorySync::Async::InventoryScheduledSync)
   end
 end

data/test/jobs/inventory_self_host_sync_test.rb

@@ -2,7 +2,7 @@ require 'test_plugin_helper'
 require 'foreman_tasks/test_helpers'
 
 class InventorySelfHostSyncTest < ActiveSupport::TestCase
-  include Dynflow::Testing::Factories
+  include ForemanTasks::TestHelpers::WithInThreadExecutor
   include MockCerts
 
   setup do

data/test/jobs/remove_insights_hosts_job_test.rb

@@ -2,7 +2,7 @@ require 'test_plugin_helper'
 require 'foreman_tasks/test_helpers'
 
 class RemoveInsightsHostJobTest < ActiveSupport::TestCase
-  include Dynflow::Testing::Factories
+  include ForemanTasks::TestHelpers::WithInThreadExecutor
 
   setup do
     User.current = User.find_by(login: 'secret_admin')
@@ -18,10 +18,10 @@ class RemoveInsightsHostJobTest < ActiveSupport::TestCase
 
     FactoryBot.create(:insights_missing_host, organization: @org)
 
-    action = create_and_plan_action(ForemanInventoryUpload::Async::RemoveInsightsHostsJob, '', @org.id)
-    run_action(action)
+    task = ForemanTasks.sync_task(ForemanInventoryUpload::Async::RemoveInsightsHostsJob, '', @org.id)
 
     assert_equal 0, InsightsMissingHost.count
+    assert_equal 'success', task.result
   end
 
   test 'Does not delete hosts on cloud failure' do
@@ -31,13 +31,14 @@ class RemoveInsightsHostJobTest < ActiveSupport::TestCase
 
     FactoryBot.create(:insights_missing_host, organization: @org)
 
-    action = create_and_plan_action(ForemanInventoryUpload::Async::RemoveInsightsHostsJob, '', @org.id)
-
-    assert_raises(StandardError) do
-      run_action(action)
+    begin
+      ForemanTasks.sync_task(ForemanInventoryUpload::Async::RemoveInsightsHostsJob, '', @org.id)
+    rescue ForemanTasks::TaskError => ex
+      task = ex.task
     end
 
     assert_equal 1, InsightsMissingHost.count
+    assert_equal 'error', task.result
   end
 
   test 'Paginates the hosts list' do
@@ -53,12 +54,12 @@ class RemoveInsightsHostJobTest < ActiveSupport::TestCase
     FactoryBot.create(:insights_missing_host, organization: @org)
     FactoryBot.create(:insights_missing_host, organization: @org)
 
-    action = create_and_plan_action(ForemanInventoryUpload::Async::RemoveInsightsHostsJob, '', @org.id)
-    action = run_action(action)
+    task = ForemanTasks.sync_task(ForemanInventoryUpload::Async::RemoveInsightsHostsJob, '', @org.id)
 
     assert_equal 0, InsightsMissingHost.count
-    assert_equal 'response1', action.output[:response_page1]
-    assert_equal 'response2', action.output[:response_page2]
+    assert_equal 'success', task.result
+    assert_equal 'response1', task.output[:response_page1]
+    assert_equal 'response2', task.output[:response_page2]
   end
 
   test 'Uses scoped_search to select hosts' do
@@ -72,12 +73,12 @@ class RemoveInsightsHostJobTest < ActiveSupport::TestCase
     FactoryBot.create(:insights_missing_host, name: 'test a', organization: @org)
     FactoryBot.create(:insights_missing_host, name: 'test b', organization: @org)
 
-    action = create_and_plan_action(ForemanInventoryUpload::Async::RemoveInsightsHostsJob, 'name ~ b', @org.id)
-    action = run_action(action)
+    task = ForemanTasks.sync_task(ForemanInventoryUpload::Async::RemoveInsightsHostsJob, 'name ~ b', @org.id)
 
     assert_equal 1, InsightsMissingHost.count
     assert_equal 'test a', InsightsMissingHost.first.name
-    assert_equal 'response1', action.output[:response_page1]
+    assert_equal 'success', task.result
+    assert_equal 'response1', task.output[:response_page1]
   end
 
   def mock_response(code: 200, body: '')

data/test/jobs/upload_report_job_test.rb

@@ -2,7 +2,8 @@ require 'test_plugin_helper'
 require 'foreman_tasks/test_helpers'
 
 class UploadReportJobTest < ActiveSupport::TestCase
-  include Dynflow::Testing::Factories
+  include ForemanTasks::TestHelpers::WithInThreadExecutor
+  include FolderIsolation
 
   test 'returns aborted state when disconnected' do
     organization = FactoryBot.create(:organization)
@@ -13,13 +14,11 @@ class UploadReportJobTest < ActiveSupport::TestCase
     )
     ForemanInventoryUpload::Async::UploadReportJob.any_instance.expects(:content_disconnected?).returns(true)
 
-    action = create_and_plan_action(ForemanInventoryUpload::Async::UploadReportJob, '', organization.id)
-    run_action(action)
+    ForemanTasks.sync_task(ForemanInventoryUpload::Async::UploadReportJob, '', organization.id)
 
     label = ForemanInventoryUpload::Async::UploadReportJob.output_label(organization.id)
     progress_output = ForemanInventoryUpload::Async::ProgressOutput.get(label)
-    assert_match(/upload was canceled because connection to Insights is not enabled/, progress_output.full_output)
-    assert_match(/Report location:/, progress_output.full_output)
+    assert_match(/Upload canceled/, progress_output.full_output)
     assert_match(/exit 1/, progress_output.status)
   end
 
@@ -27,8 +26,7 @@ class UploadReportJobTest < ActiveSupport::TestCase
     organization = FactoryBot.create(:organization)
     Organization.any_instance.expects(:owner_details).returns(nil)
 
-    action = create_and_plan_action(ForemanInventoryUpload::Async::UploadReportJob, '', organization.id)
-    run_action(action)
+    ForemanTasks.sync_task(ForemanInventoryUpload::Async::UploadReportJob, '', organization.id)
 
     label = ForemanInventoryUpload::Async::UploadReportJob.output_label(organization.id)
     progress_output = ForemanInventoryUpload::Async::ProgressOutput.get(label)

data/test/unit/fact_helpers_test.rb

@@ -313,51 +313,4 @@ class FactHelpersTest < ActiveSupport::TestCase
       assert_equal '10.230.230.3', ip3
     end
   end
-
-  describe 'IoP smart proxy checks' do
-    test 'obfuscate_hostname? returns false when global setting is enabled but IoP is present' do
-      Setting.expects(:[]).with(:obfuscate_inventory_hostnames).returns(true)
-      ForemanRhCloud.expects(:with_iop_smart_proxy?).returns(true)
-      host = mock('host')
-      # When IoP is present, it falls back to checking host-specific facts
-      @instance.expects(:fact_value).with(host, 'insights_client::obfuscate_hostname_enabled').returns(nil)
-
-      result = @instance.obfuscate_hostname?(host)
-
-      refute result
-    end
-
-    test 'obfuscate_hostname? returns true when global setting is enabled and IoP is not present' do
-      Setting.expects(:[]).with(:obfuscate_inventory_hostnames).returns(true)
-      ForemanRhCloud.expects(:with_iop_smart_proxy?).returns(false)
-      host = mock('host')
-
-      result = @instance.obfuscate_hostname?(host)
-
-      assert result
-    end
-
-    test 'obfuscate_ips? returns false when global setting is enabled but IoP is present' do
-      Setting.expects(:[]).with(:obfuscate_inventory_ips).returns(true)
-      ForemanRhCloud.expects(:with_iop_smart_proxy?).returns(true)
-      host = mock('host')
-      # When IoP is present, it falls back to checking host-specific facts
-      @instance.expects(:fact_value).with(host, 'insights_client::obfuscate_ipv4_enabled').returns(nil)
-      @instance.expects(:fact_value).with(host, 'insights_client::obfuscate_ipv6_enabled').returns(nil)
-
-      result = @instance.obfuscate_ips?(host)
-
-      refute result
-    end
-
-    test 'obfuscate_ips? returns true when global setting is enabled and IoP is not present' do
-      Setting.expects(:[]).with(:obfuscate_inventory_ips).returns(true)
-      ForemanRhCloud.expects(:with_iop_smart_proxy?).returns(false)
-      host = mock('host')
-
-      result = @instance.obfuscate_ips?(host)
-
-      assert result
-    end
-  end
 end

data/test/unit/slice_generator_test.rb

@@ -107,36 +107,6 @@ class SliceGeneratorTest < ActiveSupport::TestCase
     assert_equal 'test_nic1', actual_nic['name']
   end
 
-  test 'does not generate a report with minimal data collection when iop is present' do
-    Setting[:insights_minimal_data_collection] = true
-    ForemanRhCloud.stubs(:with_iop_smart_proxy?).returns(true)
-
-    batch = Host.where(id: @host.id).in_batches.first
-    generator = create_generator(batch)
-
-    json_str = generator.render
-    actual = JSON.parse(json_str.join("\n"))
-
-    assert_equal '00000000-0000-0000-0000-000000000000', actual['report_slice_id']
-    assert_not_nil(actual_host = actual['hosts'].first)
-    assert_nil actual_host['ip_addresses']
-    assert_nil actual_host['mac_addresses']
-    assert_equal @host.fqdn, actual_host['fqdn']
-    assert_equal '1234', actual_host['account']
-    assert_equal 1, generator.hosts_count
-    assert_not_nil(actual_system_profile = actual_host['system_profile'])
-    assert_nil actual_system_profile['number_of_cpus']
-    assert_nil actual_system_profile['number_of_sockets']
-    assert_nil actual_system_profile['cores_per_socket']
-    assert_nil actual_system_profile['system_memory_bytes']
-    assert_nil actual_system_profile['os_release']
-    assert_not_nil(actual_network_interfaces = actual_system_profile['network_interfaces'])
-    assert_not_nil(actual_nic = actual_network_interfaces.first)
-    refute actual_nic.key?('mtu')
-    refute actual_nic.key?('mac_address')
-    assert_equal 'test_nic1', actual_nic['name']
-  end
-
   test 'generates a report with minimal data collection' do
     Setting[:insights_minimal_data_collection] = true
     create_fact_values(@host,
@@ -960,33 +930,6 @@ class SliceGeneratorTest < ActiveSupport::TestCase
     assert_equal 'alibaba', actual_profile['cloud_provider']
   end
 
-  test 'do not exclude packages when iop is present' do
-    Setting[:exclude_installed_packages] = true
-    ForemanRhCloud.stubs(:with_iop_smart_proxy?).returns(true)
-    installed_package = ::Katello::InstalledPackage.create(name: 'test-package', nvrea: 'test-package-1.0.x86_64', nvra: 'test-package-1.0.x86_64')
-
-    another_host = FactoryBot.create(
-      :host,
-      :with_subscription,
-      :with_content,
-      content_view: @host.content_views.first,
-      lifecycle_environment: @host.lifecycle_environments.first,
-      organization: @host.organization,
-      installed_packages: [installed_package]
-    )
-
-    batch = Host.where(id: another_host.id).in_batches.first
-    generator = create_generator(batch)
-
-    json_str = generator.render
-    actual = JSON.parse(json_str.join("\n"))
-
-    assert_equal '00000000-0000-0000-0000-000000000000', actual['report_slice_id']
-    assert_not_nil(actual_host = actual['hosts'].first)
-    assert_not_nil(actual_profile = actual_host['system_profile'])
-    assert_not_nil(actual_profile['installed_packages'])
-  end
-
   test 'include packages installed in the report' do
     Setting[:exclude_installed_packages] = false
     installed_package = ::Katello::InstalledPackage.create(name: 'test-package', nvrea: 'test-package-1.0.x86_64', nvra: 'test-package-1.0.x86_64')

data/webpack/ForemanRhCloudFills.js

@@ -4,11 +4,7 @@ import { translate as __ } from 'foremanReact/common/I18n';
 import InventoryAutoUploadSwitcher from './ForemanInventoryUpload/SubscriptionsPageExtension/InventoryAutoUpload';
 import NewHostDetailsTab from './InsightsHostDetailsTab/NewHostDetailsTab';
 import { InsightsTotalRiskChartWrapper } from './InsightsHostDetailsTab/InsightsTotalRiskChartWrapper';
-import {
-  isNotRhelHost,
-  vulnerabilityDisabled,
-  hasNoInsightsFacet,
-} from './ForemanRhCloudHelpers';
+import { isNotRhelHost, vulnerabilityDisabled } from './ForemanRhCloudHelpers';
 import CVEsHostDetailsTabWrapper from './CVEsHostDetailsTab/CVEsHostDetailsTab';
 
 const fills = [
@@ -24,7 +20,7 @@ const fills = [
     component: props => <NewHostDetailsTab {...props} />,
     weight: 400,
     metadata: {
-      hideTab: props => isNotRhelHost(props) || hasNoInsightsFacet(props),
+      hideTab: isNotRhelHost,
       title: __('Recommendations'),
     },
   },

data/webpack/ForemanRhCloudHelpers.js

@@ -14,7 +14,3 @@ export const isNotRhelHost = ({ hostDetails }) =>
 
 export const vulnerabilityDisabled = ({ hostDetails }) =>
   isNotRhelHost({ hostDetails }) || !hostDetails?.vulnerability?.enabled;
-
-export const hasNoInsightsFacet = ({ response, hostDetails }) =>
-  // eslint-disable-next-line camelcase
-  !(response?.insights_attributes || hostDetails?.insights_attributes);

data/webpack/InsightsHostDetailsTab/InsightsTab.scss

@@ -88,7 +88,3 @@
 #new_host_details_insights_tab {
   padding: 24px;
 }
-
-#total-risks-dropdown-container ul.pf-v5-c-menu__list {
-  margin-bottom: 0px;
-}

data/webpack/InsightsHostDetailsTab/InsightsTotalRiskChart.js

@@ -3,7 +3,8 @@ import PropTypes from 'prop-types';
 import { useDispatch } from 'react-redux';
 import { push } from 'connected-react-router';
 import { useHistory } from 'react-router-dom';
-import { Bullseye, DropdownItem, Title } from '@patternfly/react-core';
+import { Bullseye, Title } from '@patternfly/react-core';
+import { DropdownItem } from '@patternfly/react-core/deprecated';
 import {
   ChartDonut,
   ChartLegend,
@@ -18,67 +19,36 @@ import SkeletonLoader from 'foremanReact/components/common/SkeletonLoader';
 import { insightsCloudUrl } from '../InsightsCloudSync/InsightsCloudSyncHelpers';
 import { getInitialRisks, theme } from './InsightsTabConstants';
 
-const InsightsTotalRiskCard = ({ hostDetails }) => {
-  const { id, insights_attributes: insightsFacet } = hostDetails;
-  const uuid = insightsFacet?.uuid;
-  // eslint-disable-next-line camelcase
-  const isIop = insightsFacet?.use_iop_mode;
+const InsightsTotalRiskCard = ({ hostDetails: { id } }) => {
   const [totalRisks, setTotalRisks] = useState(getInitialRisks());
   const hashHistory = useHistory();
   const dispatch = useDispatch();
   const API_KEY = `HOST_${id}_RECOMMENDATIONS`;
   const API_OPTIONS = useMemo(() => ({ key: API_KEY }), [API_KEY]);
+  const url = id && insightsCloudUrl(`hits/${id}`); // This will keep the API call from being triggered if there's no host id.
+  const {
+    status = STATUS.PENDING,
+    response: { hits = [] },
+  } = useAPI('get', url, API_OPTIONS);
 
-  // This will keep the API call from being triggered if there's no host id.
-  const url = isIop
-    ? uuid && insightsCloudUrl(`api/insights/v1/system/${uuid}`)
-    : id && insightsCloudUrl(`hits/${id}`);
-  const { status = STATUS.PENDING, response } = useAPI('get', url, API_OPTIONS);
-
-  const checkRisks = useMemo(() => {
-    if (!response || status !== STATUS.RESOLVED) {
-      return getInitialRisks();
-    }
-
-    const risks = getInitialRisks();
-    if (isIop) {
-      const {
-        low_hits: lowHits = 0,
-        moderate_hits: moderateHits = 0,
-        important_hits: importantHits = 0,
-        critical_hits: criticalHits = 0,
-        hits = 0,
-      } = response;
-
-      risks[1].value += lowHits;
-      risks[2].value += moderateHits;
-      risks[3].value += importantHits;
-      risks[4].value += criticalHits;
-      risks.total = hits;
-    } else {
-      const { hits = [] } = response;
+  useEffect(() => {
+    if (status === STATUS.RESOLVED) {
+      const risks = getInitialRisks();
       hits.forEach(({ total_risk: risk }) => {
         risks[risk].value += 1;
       });
       risks.total = hits.length;
+      setTotalRisks(risks);
     }
-    return risks;
-  }, [response, status, isIop]);
-
-  useEffect(() => {
-    setTotalRisks(checkRisks);
-  }, [checkRisks]);
-
-  if (!insightsFacet) return null;
+  }, [hits, status]);
 
   const onChartClick = (evt, { index }) => {
     hashHistory.push(`/Insights`);
-    !isIop &&
-      dispatch(
-        push({
-          search: `search=total_risk+%3D+${index + 1}`,
-        })
-      );
+    dispatch(
+      push({
+        search: `search=total_risk+%3D+${index + 1}`,
+      })
+    );
   };
 
   const onChartHover = (evt, { index }) => [
@@ -92,16 +62,11 @@ const InsightsTotalRiskCard = ({ hostDetails }) => {
   const { 1: low, 2: moderate, 3: important, 4: critical, total } = totalRisks;
 
   // eslint-disable-next-line react/prop-types
-  const LegendLabel = ({ index, ...rest }) => {
-    if (isIop) {
-      return <ChartLabel {...rest} />;
-    }
-    return (
-      <a key={index} onClick={() => onChartClick(null, { index })}>
-        <ChartLabel {...rest} />
-      </a>
-    );
-  };
+  const LegendLabel = ({ index, ...rest }) => (
+    <a key={index} onClick={() => onChartClick(null, { index })}>
+      <ChartLabel {...rest} />
+    </a>
+  );
 
   const legend = (
     <ChartLegend
@@ -162,7 +127,6 @@ const InsightsTotalRiskCard = ({ hostDetails }) => {
   return (
     <CardTemplate
       header={__('Total risks')}
-      overrideDropdownProps={{ id: 'total-risks-dropdown-container' }}
       dropdownItems={[
         <DropdownItem
           key="insights-tab"

data/webpack/InsightsHostDetailsTab/NewHostDetailsTab.js

@@ -131,15 +131,28 @@ const IopInsightsTabWrapped = props => (
 );
 
 const InsightsTab = props => {
-  const isLocalIop = useAdvisorEngineConfig();
+  const { response } = props;
+  const isLocalAdvisorEngine =
+    // eslint-disable-next-line camelcase
+    response?.insights_attributes?.use_iop_mode;
 
-  return isLocalIop ? (
+  return isLocalAdvisorEngine ? (
     <IopInsightsTabWrapped {...props} />
   ) : (
     <NewHostDetailsTab {...props} />
   );
 };
 
-InsightsTab.defaultProps = {};
+InsightsTab.propTypes = {
+  response: PropTypes.shape({
+    insights_attributes: {
+      use_iop_mode: PropTypes.bool,
+    },
+  }),
+};
+
+InsightsTab.defaultProps = {
+  response: {},
+};
 
 export default InsightsTab;

data/webpack/InsightsVulnerabilityHostIndexExtensions/CVECountCell.js

@@ -3,31 +3,25 @@ import PropTypes from 'prop-types';
 import { UnknownIcon } from '@patternfly/react-icons';
 import { Link } from 'react-router-dom';
 import { useAPI } from 'foremanReact/common/hooks/API/APIHooks';
+
 import { insightsCloudUrl } from '../InsightsCloudSync/InsightsCloudSyncHelpers';
-import { useAdvisorEngineConfig } from '../common/Hooks/ConfigHooks';
 
 const vulnerabilityApiPath = path =>
   insightsCloudUrl(`api/vulnerability/v1/${path}`);
 
 export const CVECountCell = ({ hostDetails }) => {
-  const isIopEnabled = useAdvisorEngineConfig();
-
   // eslint-disable-next-line camelcase
   const uuid = hostDetails?.subscription_facet_attributes?.uuid;
 
   const key = `HOST_CVE_COUNT_${uuid}`;
   const response = useAPI(
-    isIopEnabled && uuid ? 'get' : null,
+    uuid ? 'get' : null,
     vulnerabilityApiPath(`systems?uuid=${uuid}`),
     {
       key,
     }
   );
 
-  if (!isIopEnabled) {
-    return <UnknownIcon />;
-  }
-
   if (uuid === undefined) {
     return <UnknownIcon />;
   }

data/webpack/InsightsVulnerabilityHostIndexExtensions/__tests__/CVECountCell.test.js

@@ -2,11 +2,8 @@ import React from 'react';
 import { render, screen } from '@testing-library/react';
 import { API } from 'foremanReact/redux/API';
 import { CVECountCell } from '../CVECountCell';
-import * as ConfigHooks from '../../common/Hooks/ConfigHooks';
 
 jest.mock('foremanReact/redux/API');
-jest.mock('../../common/Hooks/ConfigHooks');
-
 API.get.mockImplementation(async () => ({
   data: [
     {
@@ -17,58 +14,15 @@ API.get.mockImplementation(async () => ({
   ],
 }));
 
-const hostDetailsMock = {
-      name: 'test-host.example.com',
-      subscription_facet_attributes: {
-        uuid: 'test-uuid-123',
-      },
-    };
-
 describe('CVECountCell', () => {
-  beforeEach(() => {
-    ConfigHooks.useAdvisorEngineConfig.mockReturnValue(true);
-  });
-
-  afterEach(() => {
-    jest.clearAllMocks();
-  });
-
-  it('renders an empty cves count column when no subscription UUID', () => {
-    const hostDetailsMockIoP = {
+  it('renders an empty cves count column', () => {
+    const hostDetailsMock = {
       name: 'test-host.example.com',
       subscription_facet_attributes: {
         uuid: null, // no subscription
       },
     };
-    render(<CVECountCell hostDetails={hostDetailsMockIoP} />);
-    expect(screen.getByRole('img', { hidden: true })).toBeTruthy();
-  });
-
-  it('renders UnknownIcon when IoP is not enabled', () => {
-    ConfigHooks.useAdvisorEngineConfig.mockReturnValue(false);
-    render(<CVECountCell hostDetails={hostDetailsMock} />);
-    expect(screen.getByRole('img', { hidden: true })).toBeTruthy();
-    expect(ConfigHooks.useAdvisorEngineConfig).toHaveBeenCalled();
-  });
-
-  it('renders UnknownIcon when IoP is enabled but CVE API call fails', () => {
-    // Mock successful IoP config
-    ConfigHooks.useAdvisorEngineConfig.mockReturnValue(true);
-    // Mock CVE API failure - override the global mock for this test
-    API.get.mockImplementationOnce(async () => {
-      throw new Error('CVE API call failed');
-    });
-
-    render(<CVECountCell hostDetails={hostDetailsMock} />);
-    // Should render UnknownIcon when CVE API fails
-    expect(screen.getByRole('img', { hidden: true })).toBeTruthy();
-    expect(ConfigHooks.useAdvisorEngineConfig).toHaveBeenCalled();
-  });
-
-  it('renders UnknownIcon when IoP is undefined (API call pending)', () => {
-    ConfigHooks.useAdvisorEngineConfig.mockReturnValue(undefined);
     render(<CVECountCell hostDetails={hostDetailsMock} />);
     expect(screen.getByRole('img', { hidden: true })).toBeTruthy();
-    expect(ConfigHooks.useAdvisorEngineConfig).toHaveBeenCalled();
   });
 });