foreman_rh_cloud 13.0.4 → 13.0.6

data/webpack/InsightsHostDetailsTab/InsightsTotalRiskChart.js

@@ -18,36 +18,67 @@ import SkeletonLoader from 'foremanReact/components/common/SkeletonLoader';
 import { insightsCloudUrl } from '../InsightsCloudSync/InsightsCloudSyncHelpers';
 import { getInitialRisks, theme } from './InsightsTabConstants';
 
-const InsightsTotalRiskCard = ({ hostDetails: { id } }) => {
+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 [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);
 
-  useEffect(() => {
-    if (status === STATUS.RESOLVED) {
-      const risks = getInitialRisks();
+  // 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;
       hits.forEach(({ total_risk: risk }) => {
         risks[risk].value += 1;
       });
       risks.total = hits.length;
-      setTotalRisks(risks);
     }
-  }, [hits, status]);
+    return risks;
+  }, [response, status, isIop]);
+
+  useEffect(() => {
+    setTotalRisks(checkRisks);
+  }, [checkRisks]);
+
+  if (!insightsFacet) return null;
 
   const onChartClick = (evt, { index }) => {
     hashHistory.push(`/Insights`);
-    dispatch(
-      push({
-        search: `search=total_risk+%3D+${index + 1}`,
-      })
-    );
+    !isIop &&
+      dispatch(
+        push({
+          search: `search=total_risk+%3D+${index + 1}`,
+        })
+      );
   };
 
   const onChartHover = (evt, { index }) => [
@@ -61,11 +92,16 @@ const InsightsTotalRiskCard = ({ hostDetails: { id } }) => {
   const { 1: low, 2: moderate, 3: important, 4: critical, total } = totalRisks;
 
   // eslint-disable-next-line react/prop-types
-  const LegendLabel = ({ index, ...rest }) => (
-    <a key={index} onClick={() => onChartClick(null, { index })}>
-      <ChartLabel {...rest} />
-    </a>
-  );
+  const LegendLabel = ({ index, ...rest }) => {
+    if (isIop) {
+      return <ChartLabel {...rest} />;
+    }
+    return (
+      <a key={index} onClick={() => onChartClick(null, { index })}>
+        <ChartLabel {...rest} />
+      </a>
+    );
+  };
 
   const legend = (
     <ChartLegend

data/webpack/InsightsHostDetailsTab/__tests__/InsightsTotalRiskChart.test.js

@@ -0,0 +1,194 @@
+import React from 'react';
+import { render, screen, waitFor } from '@testing-library/react';
+import '@testing-library/jest-dom';
+import { Provider } from 'react-redux';
+import { ConnectedRouter } from 'connected-react-router';
+import { createMemoryHistory } from 'history';
+import configureMockStore from 'redux-mock-store';
+import { STATUS } from 'foremanReact/constants';
+import * as APIHooks from 'foremanReact/common/hooks/API/APIHooks';
+import InsightsTotalRiskCard from '../InsightsTotalRiskChart';
+
+jest.mock('foremanReact/common/hooks/API/APIHooks');
+jest.mock('foremanReact/common/I18n', () => ({
+  translate: jest.fn(str => str),
+}));
+
+const mockStore = configureMockStore();
+const history = createMemoryHistory();
+const store = mockStore({
+  router: {
+    location: {
+      pathname: '/',
+      search: '',
+      hash: '',
+      state: null,
+    },
+    action: 'POP',
+  },
+});
+
+const defaultHostDetails = {
+  id: 1,
+  insights_attributes: {
+    uuid: 'test-uuid',
+    use_iop_mode: false,
+  },
+};
+
+const renderComponent = (props = {}) => {
+  const allProps = {
+    hostDetails: defaultHostDetails,
+    ...props,
+  };
+
+  return render(
+    <Provider store={store}>
+      <ConnectedRouter history={history}>
+        <InsightsTotalRiskCard {...allProps} />
+      </ConnectedRouter>
+    </Provider>
+  );
+};
+
+describe('InsightsTotalRiskChart', () => {
+  beforeEach(() => {
+    store.clearActions();
+    jest.clearAllMocks();
+  });
+
+  it('should show loading state initially', () => {
+    APIHooks.useAPI.mockReturnValue({
+      status: STATUS.PENDING,
+      response: null,
+    });
+
+    renderComponent();
+    // SkeletonLoader shows loading state when status is PENDING
+    expect(screen.queryByText('No results found')).not.toBeInTheDocument();
+    expect(
+      screen.queryByTestId('rh-cloud-total-risk-card')
+    ).not.toBeInTheDocument();
+  });
+
+  it('should display error state when API fails', async () => {
+    APIHooks.useAPI.mockReturnValue({
+      status: STATUS.ERROR,
+      response: null,
+    });
+
+    renderComponent();
+    expect(screen.getByText('No results found')).toBeInTheDocument();
+    expect(
+      screen.queryByTestId('rh-cloud-total-risk-card')
+    ).not.toBeInTheDocument();
+  });
+
+  it('should handle non-IoP mode API response correctly', async () => {
+    const mockResponse = {
+      hits: [
+        { total_risk: 1 },
+        { total_risk: 2 },
+        { total_risk: 2 },
+        { total_risk: 3 },
+        { total_risk: 4 },
+      ],
+    };
+
+    APIHooks.useAPI.mockReturnValue({
+      status: STATUS.RESOLVED,
+      response: mockResponse,
+    });
+
+    renderComponent();
+
+    await waitFor(() => {
+      // Check if total number of recommendations is displayed
+      expect(screen.getByText('5')).toBeInTheDocument();
+      // Check if risk levels are displayed correctly
+      expect(screen.getByText(/Low: 1/)).toBeInTheDocument();
+      expect(screen.getByText(/Moderate: 2/)).toBeInTheDocument();
+      expect(screen.getByText(/Important: 1/)).toBeInTheDocument();
+      expect(screen.getByText(/Critical: 1/)).toBeInTheDocument();
+    });
+  });
+
+  it('should handle IOP mode API response correctly', async () => {
+    const mockResponse = {
+      low_hits: 2,
+      moderate_hits: 3,
+      important_hits: 1,
+      critical_hits: 2,
+      hits: 8,
+    };
+
+    APIHooks.useAPI.mockReturnValue({
+      status: STATUS.RESOLVED,
+      response: mockResponse,
+    });
+
+    renderComponent({
+      hostDetails: {
+        ...defaultHostDetails,
+        insights_attributes: {
+          ...defaultHostDetails.insights_attributes,
+          use_iop_mode: true,
+        },
+      },
+    });
+
+    await waitFor(() => {
+      // Check if total number of recommendations is displayed
+      expect(screen.getByText('8')).toBeInTheDocument();
+      // Check if risk levels are displayed correctly
+      expect(screen.getByText(/Low: 2/)).toBeInTheDocument();
+      expect(screen.getByText(/Moderate: 3/)).toBeInTheDocument();
+      expect(screen.getByText(/Important: 1/)).toBeInTheDocument();
+      expect(screen.getByText(/Critical: 2/)).toBeInTheDocument();
+    });
+  });
+
+  it('should show empty state when no recommendations exist', async () => {
+    APIHooks.useAPI.mockReturnValue({
+      status: STATUS.RESOLVED,
+      response: { hits: [] },
+    });
+
+    renderComponent();
+
+    await waitFor(() => {
+      expect(screen.getByText(/Low: 0/)).toBeInTheDocument();
+      expect(screen.getByText(/Moderate: 0/)).toBeInTheDocument();
+      expect(screen.getByText(/Important: 0/)).toBeInTheDocument();
+      expect(screen.getByText(/Critical: 0/)).toBeInTheDocument();
+    });
+  });
+
+  it('should use correct API endpoint based on IOP mode', () => {
+    renderComponent({
+      hostDetails: {
+        ...defaultHostDetails,
+        insights_attributes: {
+          ...defaultHostDetails.insights_attributes,
+          use_iop_mode: true,
+        },
+      },
+    });
+
+    expect(APIHooks.useAPI).toHaveBeenCalledWith(
+      'get',
+      expect.stringContaining('/api/insights/v1/system/test-uuid'),
+      expect.any(Object)
+    );
+
+    jest.clearAllMocks();
+
+    renderComponent();
+
+    expect(APIHooks.useAPI).toHaveBeenCalledWith(
+      'get',
+      expect.stringContaining('/hits/1'),
+      expect.any(Object)
+    );
+  });
+});

data/webpack/InsightsVulnerabilityHostIndexExtensions/CVECountCell.js

@@ -3,25 +3,31 @@ 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(
-    uuid ? 'get' : null,
+    isIopEnabled && 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,8 +2,11 @@ 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: [
     {
@@ -14,15 +17,58 @@ API.get.mockImplementation(async () => ({
   ],
 }));
 
+const hostDetailsMock = {
+      name: 'test-host.example.com',
+      subscription_facet_attributes: {
+        uuid: 'test-uuid-123',
+      },
+    };
+
 describe('CVECountCell', () => {
-  it('renders an empty cves count column', () => {
-    const hostDetailsMock = {
+  beforeEach(() => {
+    ConfigHooks.useAdvisorEngineConfig.mockReturnValue(true);
+  });
+
+  afterEach(() => {
+    jest.clearAllMocks();
+  });
+
+  it('renders an empty cves count column when no subscription UUID', () => {
+    const hostDetailsMockIoP = {
       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();
   });
 });

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: foreman_rh_cloud
 version: !ruby/object:Gem::Version
-  version: 13.0.4
+  version: 13.0.6
 platform: ruby
 authors:
 - Foreman Red Hat Cloud team
@@ -139,7 +139,6 @@ files:
 - app/services/foreman_rh_cloud/cloud_presence.rb
 - app/services/foreman_rh_cloud/cloud_request.rb
 - app/services/foreman_rh_cloud/cloud_request_forwarder.rb
-- app/services/foreman_rh_cloud/gateway_request.rb
 - app/services/foreman_rh_cloud/hit_remediations_retriever.rb
 - app/services/foreman_rh_cloud/hits_uploader.rb
 - app/services/foreman_rh_cloud/insights_api_forwarder.rb
@@ -185,13 +184,17 @@ files:
 - db/seeds.d/50_job_templates.rb
 - lib/foreman_inventory_upload.rb
 - lib/foreman_inventory_upload/async/async_helpers.rb
+- lib/foreman_inventory_upload/async/create_missing_insights_facets.rb
 - lib/foreman_inventory_upload/async/delayed_start.rb
 - lib/foreman_inventory_upload/async/generate_all_reports_job.rb
+- lib/foreman_inventory_upload/async/generate_host_report.rb
 - lib/foreman_inventory_upload/async/generate_report_job.rb
+- lib/foreman_inventory_upload/async/host_inventory_report_job.rb
 - lib/foreman_inventory_upload/async/progress_output.rb
 - lib/foreman_inventory_upload/async/queue_for_upload_job.rb
 - lib/foreman_inventory_upload/async/remove_insights_hosts_job.rb
 - lib/foreman_inventory_upload/async/shell_process.rb
+- lib/foreman_inventory_upload/async/single_host_report_job.rb
 - lib/foreman_inventory_upload/async/upload_report_job.rb
 - lib/foreman_inventory_upload/generators/archived_report.rb
 - lib/foreman_inventory_upload/generators/fact_helpers.rb
@@ -621,6 +624,7 @@ files:
 - webpack/InsightsHostDetailsTab/__tests__/InsightsTabIntegration.test.js
 - webpack/InsightsHostDetailsTab/__tests__/InsightsTabReducer.test.js
 - webpack/InsightsHostDetailsTab/__tests__/InsightsTabSelectors.test.js
+- webpack/InsightsHostDetailsTab/__tests__/InsightsTotalRiskChart.test.js
 - webpack/InsightsHostDetailsTab/__tests__/__snapshots__/InsightsTab.test.js.snap
 - webpack/InsightsHostDetailsTab/__tests__/__snapshots__/InsightsTabActions.test.js.snap
 - webpack/InsightsHostDetailsTab/__tests__/__snapshots__/InsightsTabReducer.test.js.snap

data/app/services/foreman_rh_cloud/gateway_request.rb

@@ -1,26 +0,0 @@
-module ForemanRhCloud
-  module GatewayRequest
-    extend ActiveSupport::Concern
-
-    include CloudRequest
-
-    def execute_cloud_request(params)
-      certs = params.delete(:certs) || foreman_certificates
-      final_params = {
-        ssl_client_cert: OpenSSL::X509::Certificate.new(certs[:cert]),
-        ssl_client_key: OpenSSL::PKey.read(certs[:key]),
-        ssl_ca_file: Setting[:ssl_ca_file],
-        verify_ssl: OpenSSL::SSL::VERIFY_PEER,
-      }.deep_merge(params)
-
-      super(final_params)
-    end
-
-    def foreman_certificates
-      {
-        cert: File.read(Setting[:ssl_certificate]),
-        key: File.read(Setting[:ssl_priv_key]),
-      }
-    end
-  end
-end