foreman_rh_cloud 13.0.6 → 13.0.8

data/webpack/InsightsCloudSync/InsightsCloudSync.js

@@ -3,7 +3,7 @@ import PropTypes from 'prop-types';
 import PageLayout from 'foremanReact/routes/common/PageLayout/PageLayout';
 import { ScalprumComponent, ScalprumProvider } from '@scalprum/react-core';
 import InsightsTable from './Components/InsightsTable';
-import { useAdvisorEngineConfig } from '../common/Hooks/ConfigHooks';
+import { useIopConfig } from '../common/Hooks/ConfigHooks';
 import { foremanUrl } from '../ForemanRhCloudHelpers';
 import RemediationModal from './Components/RemediationModal';
 import {
@@ -85,9 +85,9 @@ const IopRecommendationsPageWrapped = props => (
 );
 
 const RecommendationsPage = props => {
-  const isLocalAdvisorEngine = useAdvisorEngineConfig();
+  const isIop = useIopConfig();
 
-  return isLocalAdvisorEngine ? (
+  return isIop ? (
     <IopRecommendationsPageWrapped {...props} />
   ) : (
     <InsightsCloudSync {...props} />

data/webpack/InsightsCloudSync/InsightsCloudSync.test.js

@@ -2,6 +2,16 @@ import { testComponentSnapshotsWithFixtures } from '@theforeman/test';
 import { noop } from 'foremanReact/common/helpers';
 import InsightsCloudSync from './InsightsCloudSync';
 
+jest.mock('foremanReact/Root/Context/ForemanContext', () => ({
+  useForemanContext: () => ({
+    metadata: {
+      foreman_rh_cloud: {
+        iop: true,
+      },
+    },
+  }),
+}));
+
 const fixtures = {
   render: {
     status: 'RESOLVED',

data/webpack/InsightsCloudSync/__snapshots__/InsightsCloudSync.test.js.snap

@@ -1,7 +1,7 @@
 // Jest Snapshot v1, https://goo.gl/fbAQLP
 
 exports[`InsightsCloudSync render 1`] = `
-<InsightsCloudSync
+<IopRecommendationsPageWrapped
   fetchInsights={[Function]}
   query=""
   status="RESOLVED"

data/webpack/InsightsHostDetailsTab/NewHostDetailsTab.js

@@ -21,7 +21,7 @@ import {
   selectHits,
 } from '../InsightsCloudSync/Components/InsightsTable/InsightsTableSelectors';
 import { redHatAdvisorSystems } from '../InsightsCloudSync/InsightsCloudSyncHelpers';
-import { useAdvisorEngineConfig } from '../common/Hooks/ConfigHooks';
+import { useIopConfig } from '../common/Hooks/ConfigHooks';
 import { generateRuleUrl } from '../InsightsCloudSync/InsightsCloudSync';
 import { providerOptions } from '../common/ScalprumModule/ScalprumContext';
 
@@ -30,7 +30,7 @@ const NewHostDetailsTab = ({ hostName, router }) => {
   const dispatch = useDispatch();
   const query = useSelector(selectSearch);
   const hits = useSelector(selectHits);
-  const isLocalAdvisorEngine = useAdvisorEngineConfig();
+  const isIop = useIopConfig();
 
   useEffect(() => () => router.replace({ search: null }), [router]);
 
@@ -46,7 +46,7 @@ const NewHostDetailsTab = ({ hostName, router }) => {
     </DropdownItem>,
   ];
 
-  if (hits.length && !isLocalAdvisorEngine) {
+  if (hits.length && !isIop) {
     const { host_uuid: uuid } = hits[0];
     dropdownItems.push(
       <DropdownItem key="insights-advisor-link" ouiaId="insights-advisor-link">
@@ -131,9 +131,9 @@ const IopInsightsTabWrapped = props => (
 );
 
 const InsightsTab = props => {
-  const isLocalIop = useAdvisorEngineConfig();
+  const isIop = useIopConfig();
 
-  return isLocalIop ? (
+  return isIop ? (
     <IopInsightsTabWrapped {...props} />
   ) : (
     <NewHostDetailsTab {...props} />

data/webpack/InsightsVulnerabilityHostIndexExtensions/CVECountCell.js

@@ -4,13 +4,13 @@ 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';
+import { useIopConfig } from '../common/Hooks/ConfigHooks';
 
 const vulnerabilityApiPath = path =>
   insightsCloudUrl(`api/vulnerability/v1/${path}`);
 
 export const CVECountCell = ({ hostDetails }) => {
-  const isIopEnabled = useAdvisorEngineConfig();
+  const isIopEnabled = useIopConfig();
 
   // eslint-disable-next-line camelcase
   const uuid = hostDetails?.subscription_facet_attributes?.uuid;

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

@@ -26,7 +26,7 @@ const hostDetailsMock = {
 
 describe('CVECountCell', () => {
   beforeEach(() => {
-    ConfigHooks.useAdvisorEngineConfig.mockReturnValue(true);
+    ConfigHooks.useIopConfig.mockReturnValue(true);
   });
 
   afterEach(() => {
@@ -45,15 +45,15 @@ describe('CVECountCell', () => {
   });
 
   it('renders UnknownIcon when IoP is not enabled', () => {
-    ConfigHooks.useAdvisorEngineConfig.mockReturnValue(false);
+    ConfigHooks.useIopConfig.mockReturnValue(false);
     render(<CVECountCell hostDetails={hostDetailsMock} />);
     expect(screen.getByRole('img', { hidden: true })).toBeTruthy();
-    expect(ConfigHooks.useAdvisorEngineConfig).toHaveBeenCalled();
+    expect(ConfigHooks.useIopConfig).toHaveBeenCalled();
   });
 
   it('renders UnknownIcon when IoP is enabled but CVE API call fails', () => {
     // Mock successful IoP config
-    ConfigHooks.useAdvisorEngineConfig.mockReturnValue(true);
+    ConfigHooks.useIopConfig.mockReturnValue(true);
     // Mock CVE API failure - override the global mock for this test
     API.get.mockImplementationOnce(async () => {
       throw new Error('CVE API call failed');
@@ -62,13 +62,13 @@ describe('CVECountCell', () => {
     render(<CVECountCell hostDetails={hostDetailsMock} />);
     // Should render UnknownIcon when CVE API fails
     expect(screen.getByRole('img', { hidden: true })).toBeTruthy();
-    expect(ConfigHooks.useAdvisorEngineConfig).toHaveBeenCalled();
+    expect(ConfigHooks.useIopConfig).toHaveBeenCalled();
   });
 
   it('renders UnknownIcon when IoP is undefined (API call pending)', () => {
-    ConfigHooks.useAdvisorEngineConfig.mockReturnValue(undefined);
+    ConfigHooks.useIopConfig.mockReturnValue(undefined);
     render(<CVECountCell hostDetails={hostDetailsMock} />);
     expect(screen.getByRole('img', { hidden: true })).toBeTruthy();
-    expect(ConfigHooks.useAdvisorEngineConfig).toHaveBeenCalled();
+    expect(ConfigHooks.useIopConfig).toHaveBeenCalled();
   });
 });

data/webpack/common/Hooks/ConfigHooks.js

@@ -1,18 +1,5 @@
-import { useAPI } from 'foremanReact/common/hooks/API/APIHooks';
-import {
-  ADVISOR_ENGINE_CONFIG_KEY,
-  ADVISOR_ENGINE_CONFIG_PATH,
-} from '../../InsightsCloudSync/Components/InsightsTable/InsightsTableConstants';
-
-export const useAdvisorEngineConfig = () => {
-  const { response: advisorEngineConfig } = useAPI(
-    'get',
-    ADVISOR_ENGINE_CONFIG_PATH,
-    {
-      key: ADVISOR_ENGINE_CONFIG_KEY,
-    }
-  );
+import { useForemanContext } from 'foremanReact/Root/Context/ForemanContext';
 
+export const useIopConfig = () =>
   // eslint-disable-next-line camelcase
-  return advisorEngineConfig?.use_iop_mode;
-};
+  useForemanContext().metadata?.foreman_rh_cloud?.iop;

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: foreman_rh_cloud
 version: !ruby/object:Gem::Version
-  version: 13.0.6
+  version: 13.0.8
 platform: ruby
 authors:
 - Foreman Red Hat Cloud team
@@ -99,6 +99,7 @@ files:
 - app/controllers/api/v2/rh_cloud/cloud_request_controller.rb
 - app/controllers/api/v2/rh_cloud/inventory_controller.rb
 - app/controllers/concerns/foreman_rh_cloud/iop_smart_proxy_access.rb
+- app/controllers/concerns/foreman_rh_cloud/registration_manager_extensions.rb
 - app/controllers/concerns/insights_cloud/candlepin_cache.rb
 - app/controllers/concerns/insights_cloud/client_authentication.rb
 - app/controllers/concerns/insights_cloud/package_profile_upload_extensions.rb
@@ -262,7 +263,11 @@ files:
 - test/factories/inventory_upload_factories.rb
 - test/jobs/cloud_connector_announce_task_test.rb
 - test/jobs/connector_playbook_execution_reporter_task_test.rb
+- test/jobs/create_missing_insights_facets_test.rb
 - test/jobs/exponential_backoff_test.rb
+- test/jobs/generate_host_report_test.rb
+- test/jobs/generate_report_job_test.rb
+- test/jobs/host_inventory_report_job_test.rb
 - test/jobs/insights_client_status_aging_test.rb
 - test/jobs/insights_full_sync_test.rb
 - test/jobs/insights_resolutions_sync_test.rb
@@ -273,6 +278,7 @@ files:
 - test/jobs/inventory_self_host_sync_test.rb
 - test/jobs/queue_for_upload_job_test.rb
 - test/jobs/remove_insights_hosts_job_test.rb
+- test/jobs/single_host_report_job_test.rb
 - test/jobs/upload_report_job_test.rb
 - test/models/insights_client_report_status_test.rb
 - test/test_plugin_helper.rb
@@ -280,6 +286,7 @@ files:
 - test/unit/fact_helpers_test.rb
 - test/unit/foreman_rh_cloud_self_host_test.rb
 - test/unit/insights_facet_test.rb
+- test/unit/lib/foreman_rh_cloud/registration_manager_extensions_test.rb
 - test/unit/lib/insights_cloud/async/vmaas_reposcan_sync_test.rb
 - test/unit/metadata_generator_test.rb
 - test/unit/playbook_progress_generator_test.rb
@@ -717,7 +724,11 @@ test_files:
 - test/factories/inventory_upload_factories.rb
 - test/jobs/cloud_connector_announce_task_test.rb
 - test/jobs/connector_playbook_execution_reporter_task_test.rb
+- test/jobs/create_missing_insights_facets_test.rb
 - test/jobs/exponential_backoff_test.rb
+- test/jobs/generate_host_report_test.rb
+- test/jobs/generate_report_job_test.rb
+- test/jobs/host_inventory_report_job_test.rb
 - test/jobs/insights_client_status_aging_test.rb
 - test/jobs/insights_full_sync_test.rb
 - test/jobs/insights_resolutions_sync_test.rb
@@ -728,6 +739,7 @@ test_files:
 - test/jobs/inventory_self_host_sync_test.rb
 - test/jobs/queue_for_upload_job_test.rb
 - test/jobs/remove_insights_hosts_job_test.rb
+- test/jobs/single_host_report_job_test.rb
 - test/jobs/upload_report_job_test.rb
 - test/models/insights_client_report_status_test.rb
 - test/test_plugin_helper.rb
@@ -735,6 +747,7 @@ test_files:
 - test/unit/fact_helpers_test.rb
 - test/unit/foreman_rh_cloud_self_host_test.rb
 - test/unit/insights_facet_test.rb
+- test/unit/lib/foreman_rh_cloud/registration_manager_extensions_test.rb
 - test/unit/lib/insights_cloud/async/vmaas_reposcan_sync_test.rb
 - test/unit/metadata_generator_test.rb
 - test/unit/playbook_progress_generator_test.rb