foreman_rh_cloud 12.2.17 → 13.0.0

data/webpack/InsightsCloudSync/Components/ToolbarDropdown.js

@@ -8,12 +8,12 @@ import {
 } from '@patternfly/react-core/deprecated';
 import { ExternalLinkAltIcon } from '@patternfly/react-icons';
 import { redHatAdvisorSystems } from '../InsightsCloudSyncHelpers';
-import { useIopConfig } from '../../common/Hooks/ConfigHooks';
+import { useAdvisorEngineConfig } from '../../common/Hooks/ConfigHooks';
 
 const ToolbarDropdown = ({ onRecommendationSync }) => {
   const [isDropdownOpen, setIsDropdownOpen] = useState(false);
-  const isIop = useIopConfig();
-  if (isIop) {
+  const isLocalAdvisorEngine = useAdvisorEngineConfig();
+  if (isLocalAdvisorEngine) {
     return null;
   }
   const dropdownItems = [

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 { useIopConfig } from '../common/Hooks/ConfigHooks';
+import { useAdvisorEngineConfig } 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 isIop = useIopConfig();
+  const isLocalAdvisorEngine = useAdvisorEngineConfig();
 
-  return isIop ? (
+  return isLocalAdvisorEngine ? (
     <IopRecommendationsPageWrapped {...props} />
   ) : (
     <InsightsCloudSync {...props} />

data/webpack/InsightsCloudSync/InsightsCloudSync.test.js

@@ -2,16 +2,6 @@ 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`] = `
-<IopRecommendationsPageWrapped
+<InsightsCloudSync
   fetchInsights={[Function]}
   query=""
   status="RESOLVED"

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

@@ -21,7 +21,7 @@ import {
   selectHits,
 } from '../InsightsCloudSync/Components/InsightsTable/InsightsTableSelectors';
 import { redHatAdvisorSystems } from '../InsightsCloudSync/InsightsCloudSyncHelpers';
-import { useIopConfig } from '../common/Hooks/ConfigHooks';
+import { useAdvisorEngineConfig } from '../common/Hooks/ConfigHooks';
 import { generateRuleUrl } from '../InsightsCloudSync/InsightsCloudSync';
 import { providerOptions } from '../common/ScalprumModule/ScalprumContext';
 
@@ -30,30 +30,15 @@ const NewHostDetailsTab = ({ hostName, router }) => {
   const dispatch = useDispatch();
   const query = useSelector(selectSearch);
   const hits = useSelector(selectHits);
-  const isIop = useIopConfig();
-
-  useEffect(
-    () => () => {
-      // Preserve hash when clearing search params to prevent tab navigation bugs
-      if (router && typeof router.replace === 'function') {
-        const replaceOptions = { search: null };
-        if (router.location && router.location.hash) {
-          replaceOptions.hash = router.location.hash;
-        }
-        router.replace(replaceOptions);
-      }
-    },
-    [router]
-  );
+  const isLocalAdvisorEngine = useAdvisorEngineConfig();
+
+  useEffect(() => () => router.replace({ search: null }), [router]);
 
   const onSearch = q => dispatch(fetchInsights({ query: q, page: 1 }));
 
   const [isDropdownOpen, setIsDropdownOpen] = useState(false);
-  const onSatInsightsClick = () => {
-    if (router && typeof router.push === 'function') {
-      router.push({ pathname: '/foreman_rh_cloud/insights_cloud' });
-    }
-  };
+  const onSatInsightsClick = () =>
+    router.push({ pathname: '/foreman_rh_cloud/insights_cloud' });
 
   const dropdownItems = [
     <DropdownItem key="insights-link" ouiaId="insights-link">
@@ -61,7 +46,7 @@ const NewHostDetailsTab = ({ hostName, router }) => {
     </DropdownItem>,
   ];
 
-  if (hits.length && !isIop) {
+  if (hits.length && !isLocalAdvisorEngine) {
     const { host_uuid: uuid } = hits[0];
     dropdownItems.push(
       <DropdownItem key="insights-advisor-link" ouiaId="insights-advisor-link">
@@ -146,15 +131,28 @@ const IopInsightsTabWrapped = props => (
 );
 
 const InsightsTab = props => {
-  const isIop = useIopConfig();
+  const { response } = props;
+  const isLocalAdvisorEngine =
+    // eslint-disable-next-line camelcase
+    response?.insights_attributes?.use_iop_mode;
 
-  return isIop ? (
+  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 { useIopConfig } from '../common/Hooks/ConfigHooks';
 
 const vulnerabilityApiPath = path =>
   insightsCloudUrl(`api/vulnerability/v1/${path}`);
 
 export const CVECountCell = ({ hostDetails }) => {
-  const isIopEnabled = useIopConfig();
-
   // 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

@@ -1,14 +1,9 @@
 import React from 'react';
-import { screen } from '@testing-library/react';
-import { rtlHelpers } from 'foremanReact/common/rtlTestHelpers';
+import { render, screen } from '@testing-library/react';
 import { API } from 'foremanReact/redux/API';
 import { CVECountCell } from '../CVECountCell';
 
 jest.mock('foremanReact/redux/API');
-jest.mock('../../common/Hooks/ConfigHooks');
-
-const { renderWithStore } = rtlHelpers;
-
 API.get.mockImplementation(async () => ({
   data: [
     {
@@ -19,111 +14,15 @@ API.get.mockImplementation(async () => ({
   ],
 }));
 
-const hostDetailsMock = {
-  name: 'test-host.example.com',
-  subscription_facet_attributes: {
-    uuid: 'test-uuid-123',
-  },
-};
-
 describe('CVECountCell', () => {
-  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
       },
     };
-    renderWithStore(<CVECountCell hostDetails={hostDetailsMockIoP} />, {
-      router: {
-        location: {
-          pathname: '/',
-          search: '',
-          hash: '',
-          query: {},
-        },
-      },
-      API: {
-        ADVISOR_ENGINE_CONFIG: {
-          response: { use_iop_mode: true },
-          status: 'RESOLVED',
-        },
-      },
-    });
-    expect(screen.getByRole('img', { hidden: true })).toBeTruthy();
-  });
-
-  it('renders UnknownIcon when IoP is not enabled', () => {
-    renderWithStore(<CVECountCell hostDetails={hostDetailsMock} />, {
-      router: {
-        location: {
-          pathname: '/',
-          search: '',
-          hash: '',
-          query: {},
-        },
-      },
-      API: {
-        ADVISOR_ENGINE_CONFIG: {
-          response: { use_iop_mode: false },
-          status: 'RESOLVED',
-        },
-      },
-    });
-    expect(screen.getByRole('img', { hidden: true })).toBeTruthy();
-  });
-
-  it('renders UnknownIcon when IoP is enabled but CVE API call fails', () => {
-    // Mock CVE API failure - override the global mock for this test
-    API.get.mockImplementationOnce(async () => {
-      throw new Error('CVE API call failed');
-    });
-
-    renderWithStore(<CVECountCell hostDetails={hostDetailsMock} />, {
-      router: {
-        location: {
-          pathname: '/',
-          search: '',
-          hash: '',
-          query: {},
-        },
-      },
-      API: {
-        ADVISOR_ENGINE_CONFIG: {
-          response: { use_iop_mode: true },
-          status: 'RESOLVED',
-        },
-        // Mock the API failure state for the CVE endpoint
-        [`HOST_CVE_COUNT_${hostDetailsMock.subscription_facet_attributes.uuid}`]: {
-          status: 'ERROR',
-          error: 'CVE API call failed',
-        },
-      },
-    });
-    // Should render UnknownIcon when CVE API fails
-    expect(screen.getByRole('img', { hidden: true })).toBeTruthy();
-  });
-
-  it('renders UnknownIcon when IoP is undefined (API call pending)', () => {
-    renderWithStore(<CVECountCell hostDetails={hostDetailsMock} />, {
-      router: {
-        location: {
-          pathname: '/',
-          search: '',
-          hash: '',
-          query: {},
-        },
-      },
-      API: {
-        ADVISOR_ENGINE_CONFIG: {
-          status: 'PENDING',
-        },
-      },
-    });
+    render(<CVECountCell hostDetails={hostDetailsMock} />);
     expect(screen.getByRole('img', { hidden: true })).toBeTruthy();
   });
 });

data/webpack/__mocks__/foremanReact/common/hooks/API/APIHooks.js

@@ -0,0 +1,3 @@
+export const useAPI = jest.fn(() => ({
+  response: {},
+}));

data/webpack/__tests__/ForemanRhCloudHelpers.test.js

@@ -1,5 +1,5 @@
 import { testSelectorsSnapshotWithFixtures } from '@theforeman/test';
-import { foremanUrl, vulnerabilityDisabled, hasNoInsightsFacet } from '../ForemanRhCloudHelpers';
+import { foremanUrl, vulnerabilityDisabled } from '../ForemanRhCloudHelpers';
 
 global.URL_PREFIX = 'MY_TEST_URL_PREFIX.example.com';
 
@@ -34,21 +34,6 @@ const fixtures = {
     }),
   'vulnerabilityDisabled returns true for missing hostDetails': () =>
     vulnerabilityDisabled({}),
-  'hasNoInsightsFacet returns false when insights_attributes is present': () =>
-    hasNoInsightsFacet({
-      response: {
-        insights_attributes: {
-          uuid: 'test-uuid',
-          insights_hits_count: 5,
-        },
-      },
-    }),
-  'hasNoInsightsFacet returns true when insights_attributes is missing': () =>
-    hasNoInsightsFacet({
-      response: {},
-    }),
-  'hasNoInsightsFacet returns true when response is missing': () =>
-    hasNoInsightsFacet({}),
 };
 
 describe('ForemanRhCloud helpers', () =>

data/webpack/__tests__/__snapshots__/ForemanRhCloudHelpers.test.js.snap

@@ -1,11 +1,5 @@
 // Jest Snapshot v1, https://goo.gl/fbAQLP
 
-exports[`ForemanRhCloud helpers hasNoInsightsFacet returns false when insights_attributes is present 1`] = `false`;
-
-exports[`ForemanRhCloud helpers hasNoInsightsFacet returns true when insights_attributes is missing 1`] = `true`;
-
-exports[`ForemanRhCloud helpers hasNoInsightsFacet returns true when response is missing 1`] = `true`;
-
 exports[`ForemanRhCloud helpers should return foreman Url 1`] = `"MY_TEST_URL_PREFIX.example.com/test_path"`;
 
 exports[`ForemanRhCloud helpers vulnerabilityDisabled returns false for RHEL host with vulnerability enabled 1`] = `false`;

data/webpack/common/Hooks/ConfigHooks.js

@@ -1,5 +1,18 @@
-import { useForemanContext } from 'foremanReact/Root/Context/ForemanContext';
+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,
+    }
+  );
 
-export const useIopConfig = () =>
   // eslint-disable-next-line camelcase
-  useForemanContext().metadata?.foreman_rh_cloud?.iop;
+  return advisorEngineConfig?.use_iop_mode;
+};