foreman_rh_cloud 13.0.7 → 13.0.9

data/webpack/ForemanInventoryUpload/Components/Dashboard/Dashboard.js

@@ -49,7 +49,8 @@ class Dashboard extends React.Component {
       showFullScreen,
       activeTab,
     } = this.props;
-    const downloadButtonDisabled = () => account.report_file_paths.length === 0;
+    const downloadButtonDisabled = () =>
+      !account.report_file_paths || account.report_file_paths.length === 0;
     return (
       <NavContainer
         items={[
@@ -120,6 +121,7 @@ Dashboard.propTypes = {
     generate_report_status: PropTypes.string,
     upload_report_status: PropTypes.string,
     report_file_paths: PropTypes.arrayOf(PropTypes.string),
+    id: PropTypes.number,
   }),
   showFullScreen: PropTypes.bool,
   toggleFullScreen: PropTypes.func,
@@ -140,6 +142,7 @@ Dashboard.defaultProps = {
     generate_report_status: 'unknown',
     upload_report_status: 'unknown',
     report_file_paths: [],
+    id: 0,
   },
   showFullScreen: false,
   toggleFullScreen: noop,

data/webpack/ForemanInventoryUpload/Components/PageHeader/PageHeader.js

@@ -6,26 +6,33 @@ import InventoryFilter from '../InventoryFilter';
 import ToolbarButtons from './components/ToolbarButtons';
 import SettingsWarning from './components/SettingsWarning';
 import PageTitle from './PageTitle';
+import { useIopConfig } from '../../../common/Hooks/ConfigHooks';
 import './PageHeader.scss';
 
-const PageHeader = () => (
-  <div className="inventory-upload-header">
-    <SettingsWarning />
-    <PageTitle />
-    <div className="inventory-upload-header-description">
-      <InventorySettings />
-      <PageDescription />
+const PageHeader = () => {
+  const isIop = useIopConfig();
+
+  return (
+    <div className="inventory-upload-header">
+      <SettingsWarning />
+      <PageTitle />
+      {!isIop && (
+        <div className="inventory-upload-header-description">
+          <InventorySettings />
+          <PageDescription />
+        </div>
+      )}
+      <Grid.Row>
+        <Grid.Col xs={4}>
+          <InventoryFilter />
+        </Grid.Col>
+        <Grid.Col xs={7} xsOffset={1}>
+          <ToolbarButtons />
+        </Grid.Col>
+      </Grid.Row>
     </div>
-    <Grid.Row>
-      <Grid.Col xs={4}>
-        <InventoryFilter />
-      </Grid.Col>
-      <Grid.Col xs={7} xsOffset={1}>
-        <ToolbarButtons />
-      </Grid.Col>
-    </Grid.Row>
-  </div>
-);
+  );
+};
 
 PageHeader.propTypes = {};
 

data/webpack/ForemanInventoryUpload/Components/PageHeader/__tests__/PageHeader.test.js

@@ -1,13 +1,183 @@
-import { testComponentSnapshotsWithFixtures } from '@theforeman/test';
-
+import React from 'react';
+import { screen } from '@testing-library/react';
+import { rtlHelpers } from 'foremanReact/common/rtlTestHelpers';
 import PageHeader from '../PageHeader';
 
-const fixtures = {
-  'render without Props': {},
-  /** fixtures, props for the component */
-};
+// Create a variable to control IoP mode in tests
+let mockIopMode = false;
+
+// Mock ForemanContext
+jest.mock('foremanReact/Root/Context/ForemanContext', () => ({
+  useForemanContext: () => ({
+    metadata: {
+      foreman_rh_cloud: {
+        iop: mockIopMode,
+      },
+    },
+    UI: {},
+  }),
+}));
+
+// Mock child components to isolate PageHeader testing
+// This prevents child component complexity from affecting our tests
+jest.mock('../components/SettingsWarning', () => () => (
+  <div data-testid="settings-warning">SettingsWarning</div>
+));
+jest.mock('../PageTitle', () => () => (
+  <div data-testid="page-title">PageTitle</div>
+));
+jest.mock('../../InventorySettings', () => () => (
+  <div data-testid="inventory-settings">InventorySettings</div>
+));
+jest.mock('../components/PageDescription', () => () => (
+  <div data-testid="page-description">PageDescription</div>
+));
+jest.mock('../../InventoryFilter', () => () => (
+  <div data-testid="inventory-filter">InventoryFilter</div>
+));
+jest.mock('../components/ToolbarButtons', () => () => (
+  <div data-testid="toolbar-buttons">ToolbarButtons</div>
+));
+
+const { renderWithStore } = rtlHelpers;
 
 describe('PageHeader', () => {
-  describe('rendering', () =>
-    testComponentSnapshotsWithFixtures(PageHeader, fixtures));
+  describe('component behavior', () => {
+    test('renders all components when not in IoP mode', () => {
+      mockIopMode = false; // Ensure IoP mode is disabled for this test
+
+      renderWithStore(<PageHeader />, {
+        API: {
+          INVENTORY_SETTINGS: {
+            response: { subscriptionConnectionEnabled: true },
+          },
+          ADVISOR_ENGINE_CONFIG: {
+            response: { use_iop_mode: false },
+            status: 'RESOLVED',
+          },
+        },
+      });
+
+      // All components should be present when not in IoP mode
+      expect(screen.getByTestId('settings-warning')).toBeTruthy();
+      expect(screen.getByTestId('page-title')).toBeTruthy();
+      expect(screen.getByTestId('inventory-settings')).toBeTruthy();
+      expect(screen.getByTestId('page-description')).toBeTruthy();
+      expect(screen.getByTestId('inventory-filter')).toBeTruthy();
+      expect(screen.getByTestId('toolbar-buttons')).toBeTruthy();
+    });
+
+    test('hides inventory settings and description when in IoP mode', () => {
+      mockIopMode = true; // Enable IoP mode for this test
+
+      renderWithStore(<PageHeader />, {
+        API: {
+          INVENTORY_SETTINGS: {
+            response: { subscriptionConnectionEnabled: true },
+          },
+          ADVISOR_ENGINE_CONFIG: {
+            response: { use_iop_mode: true },
+            status: 'RESOLVED',
+          },
+        },
+      });
+
+      // Core components should still be present
+      expect(screen.getByTestId('settings-warning')).toBeTruthy();
+      expect(screen.getByTestId('page-title')).toBeTruthy();
+      expect(screen.getByTestId('inventory-filter')).toBeTruthy();
+      expect(screen.getByTestId('toolbar-buttons')).toBeTruthy();
+
+      // These components should be hidden in IoP mode
+      expect(screen.queryByTestId('inventory-settings')).toBeNull();
+      expect(screen.queryByTestId('page-description')).toBeNull();
+    });
+
+    test('renders with correct CSS class', () => {
+      mockIopMode = false; // Ensure IoP mode is disabled for this test
+
+      const { container } = renderWithStore(<PageHeader />, {
+        API: {
+          INVENTORY_SETTINGS: {
+            response: { subscriptionConnectionEnabled: true },
+          },
+          ADVISOR_ENGINE_CONFIG: {
+            response: { use_iop_mode: false },
+            status: 'RESOLVED',
+          },
+        },
+      });
+
+      expect(container.querySelector('.inventory-upload-header')).toBeTruthy();
+    });
+
+    test('renders grid layout with correct structure', () => {
+      mockIopMode = false; // Ensure IoP mode is disabled for this test
+
+      const { container } = renderWithStore(<PageHeader />, {
+        API: {
+          INVENTORY_SETTINGS: {
+            response: { subscriptionConnectionEnabled: true },
+          },
+          ADVISOR_ENGINE_CONFIG: {
+            response: { use_iop_mode: false },
+            status: 'RESOLVED',
+          },
+        },
+      });
+
+      const gridRow = container.querySelector('.row');
+      expect(gridRow).toBeTruthy();
+
+      const filterColumn = container.querySelector('.col-xs-4');
+      expect(filterColumn).toBeTruthy();
+
+      const toolbarColumn = container.querySelector('.col-xs-7');
+      expect(toolbarColumn).toBeTruthy();
+    });
+
+    test('renders description section only when not in IoP mode', () => {
+      mockIopMode = false; // Ensure IoP mode is disabled for this test
+
+      const { container } = renderWithStore(<PageHeader />, {
+        API: {
+          INVENTORY_SETTINGS: {
+            response: { subscriptionConnectionEnabled: true },
+          },
+          ADVISOR_ENGINE_CONFIG: {
+            response: { use_iop_mode: false },
+            status: 'RESOLVED',
+          },
+        },
+      });
+
+      // Description section should be present when not in IoP mode
+      const descriptionSection = container.querySelector(
+        '.inventory-upload-header-description'
+      );
+      expect(descriptionSection).toBeTruthy();
+    });
+
+    test('does not render description section when in IoP mode', () => {
+      mockIopMode = true; // Enable IoP mode for this test
+
+      const { container } = renderWithStore(<PageHeader />, {
+        API: {
+          INVENTORY_SETTINGS: {
+            response: { subscriptionConnectionEnabled: true },
+          },
+          ADVISOR_ENGINE_CONFIG: {
+            response: { use_iop_mode: true },
+            status: 'RESOLVED',
+          },
+        },
+      });
+
+      // Description section should not be present in IoP mode
+      const descriptionSection = container.querySelector(
+        '.inventory-upload-header-description'
+      );
+      expect(descriptionSection).toBeNull();
+    });
+  });
 });

data/webpack/ForemanInventoryUpload/Components/PageHeader/components/ToolbarButtons/ToolbarButtons.js

@@ -4,11 +4,13 @@ import SyncButton from '../SyncButton';
 import CloudConnectorButton from '../CloudConnectorButton';
 import './toolbarButtons.scss';
 import { selectSubscriptionConnectionEnabled } from '../../../InventorySettings/InventorySettingsSelectors';
+import { useIopConfig } from '../../../../../common/Hooks/ConfigHooks';
 
 const ToolbarButtons = () => {
   const subscriptionConnectionEnabled = useSelector(
     selectSubscriptionConnectionEnabled
   );
+  const isIop = useIopConfig();
 
   if (!subscriptionConnectionEnabled) {
     return null;
@@ -16,7 +18,7 @@ const ToolbarButtons = () => {
 
   return (
     <div className="inventory_toolbar_buttons">
-      <CloudConnectorButton />
+      {!isIop && <CloudConnectorButton />}
       <SyncButton />
     </div>
   );

data/webpack/ForemanInventoryUpload/Components/PageHeader/components/ToolbarButtons/__tests__/ToolbarButtons.test.js

@@ -1,60 +1,78 @@
 import React from 'react';
-import { Provider } from 'react-redux';
-import configureMockStore from 'redux-mock-store';
-import thunk from 'redux-thunk';
-import { screen, render } from '@testing-library/react';
+import { screen } from '@testing-library/react';
+import { rtlHelpers } from 'foremanReact/common/rtlTestHelpers';
 import ToolbarButtons from '../ToolbarButtons';
+import { useIopConfig } from '../../../../../../common/Hooks/ConfigHooks';
+import { selectSubscriptionConnectionEnabled } from '../../../../InventorySettings/InventorySettingsSelectors';
 
-const middlewares = [thunk];
-const mockStore = configureMockStore(middlewares);
-
-const renderOptions = {
-  API: {
-    INVENTORY_SETTINGS: {
-      response: { subscriptionConnectionEnabled: true },
-    },
-  },
-  ForemanRhCloud: {
-    inventoryUpload: {
-      accountsList: {
-        CloudConnectorStatus: {},
-      },
-    },
-  },
-};
+// Mock the config hook
+jest.mock('../../../../../../common/Hooks/ConfigHooks', () => ({
+  useIopConfig: jest.fn(),
+}));
+
+// Mock the selector
+jest.mock('../../../../InventorySettings/InventorySettingsSelectors', () => ({
+  selectSubscriptionConnectionEnabled: jest.fn(),
+}));
+
+// Mock child components to isolate ToolbarButtons testing
+jest.mock(
+  '../../SyncButton',
+  () =>
+    function MockSyncButton() {
+      return <div data-testid="sync-button">Sync all inventory status</div>;
+    }
+);
+jest.mock(
+  '../../CloudConnectorButton',
+  () =>
+    function MockCloudConnectorButton() {
+      return (
+        <div data-testid="cloud-connector-button">
+          Configure cloud connector
+        </div>
+      );
+    }
+);
+
+const { renderWithStore } = rtlHelpers;
 
 describe('ToolbarButtons', () => {
-  test('when subscription connection is enabled', () => {
-    const store = mockStore(renderOptions);
-
-    render(
-      <Provider store={store}>
-        <ToolbarButtons />
-      </Provider>
-    );
-    expect(screen.queryAllByText('Configure cloud connector')).toHaveLength(1);
-    expect(screen.queryAllByText('Sync all inventory status')).toHaveLength(1);
+  test('renders both buttons when subscription connection is enabled and not in IOP mode', () => {
+    useIopConfig.mockReturnValue(false);
+    selectSubscriptionConnectionEnabled.mockReturnValue(true);
+
+    renderWithStore(<ToolbarButtons />);
+
+    expect(screen.getByTestId('cloud-connector-button')).toBeTruthy();
+    expect(screen.getByTestId('sync-button')).toBeTruthy();
   });
 
-  test('when subscription connection is not enabled', () => {
-    const localSetting = {
-      API: {
-        INVENTORY_SETTINGS: {
-          response: { subscriptionConnectionEnabled: false },
-        },
-      },
-    };
-    const store = mockStore({
-      ...renderOptions,
-      ...localSetting,
-    });
-
-    render(
-      <Provider store={store}>
-        <ToolbarButtons />
-      </Provider>
-    );
-    expect(screen.queryAllByText('Configure cloud connector')).toHaveLength(0);
-    expect(screen.queryAllByText('Sync all inventory status')).toHaveLength(0);
+  test('renders only sync button when in IOP mode', () => {
+    useIopConfig.mockReturnValue(true);
+    selectSubscriptionConnectionEnabled.mockReturnValue(true);
+
+    renderWithStore(<ToolbarButtons />);
+
+    expect(screen.queryByTestId('cloud-connector-button')).toBeNull();
+    expect(screen.getByTestId('sync-button')).toBeTruthy();
+  });
+
+  test('renders nothing when subscription connection is not enabled', () => {
+    useIopConfig.mockReturnValue(false);
+    selectSubscriptionConnectionEnabled.mockReturnValue(false);
+
+    const { container } = renderWithStore(<ToolbarButtons />);
+
+    expect(container.firstChild).toBeNull();
+  });
+
+  test('renders toolbar buttons container with correct className when enabled', () => {
+    useIopConfig.mockReturnValue(false);
+    selectSubscriptionConnectionEnabled.mockReturnValue(true);
+
+    const { container } = renderWithStore(<ToolbarButtons />);
+
+    expect(container.querySelector('.inventory_toolbar_buttons')).toBeTruthy();
   });
 });

data/webpack/InsightsCloudSync/Components/InsightsSettings/InsightsSettings.js

@@ -3,19 +3,19 @@ import PropTypes from 'prop-types';
 import { translate as __ } from 'foremanReact/common/I18n';
 import SwitcherPF4 from '../../../common/Switcher/SwitcherPF4';
 import './insightsSettings.scss';
-import { useAdvisorEngineConfig } from '../../../common/Hooks/ConfigHooks';
+import { useIopConfig } from '../../../common/Hooks/ConfigHooks';
 
 const InsightsSettings = ({
   insightsSyncEnabled,
   getInsightsSyncSettings,
   setInsightsSyncEnabled,
 }) => {
-  const isLocalAdvisorEngine = useAdvisorEngineConfig();
+  const isIop = useIopConfig();
   useEffect(() => {
     getInsightsSyncSettings();
   }, [getInsightsSyncSettings]);
 
-  if (isLocalAdvisorEngine) return null;
+  if (isIop) return null;
 
   return (
     <div className="insights_settings">

data/webpack/InsightsCloudSync/Components/InsightsTable/InsightsTable.js

@@ -16,7 +16,7 @@ import TableEmptyState from '../../../common/table/EmptyState';
 import { modifySelectedRows, getSortColumnIndex } from './InsightsTableHelpers';
 import Pagination from './Pagination';
 import './table.scss';
-import { useAdvisorEngineConfig } from '../../../common/Hooks/ConfigHooks';
+import { useIopConfig } from '../../../common/Hooks/ConfigHooks';
 
 const InsightsTable = ({
   page,
@@ -48,17 +48,11 @@ const InsightsTable = ({
     fetchInsights({ page, perPage, query, sortBy, sortOrder });
   }, [hostname]);
 
-  const isLocalAdvisorEngine = useAdvisorEngineConfig();
+  const isIop = useIopConfig();
 
   useEffect(() => {
     setRows(
-      modifySelectedRows(
-        hits,
-        selectedIds,
-        showSelectAllAlert,
-        hideHost,
-        isLocalAdvisorEngine
-      )
+      modifySelectedRows(hits, selectedIds, showSelectAllAlert, hideHost, isIop)
     );
 
     if (hideHost) setColumns(getColumnsWithoutHostname());

data/webpack/InsightsCloudSync/Components/InsightsTable/__tests__/InsightsTable.test.js

@@ -1,13 +1,18 @@
-import { testComponentSnapshotsWithFixtures } from '@theforeman/test';
-
+import React from 'react';
+import { rtlHelpers } from 'foremanReact/common/rtlTestHelpers';
 import InsightsTable from '../InsightsTable';
 import { tableProps } from './fixtures';
 
-const fixtures = {
-  'render with Props': tableProps,
-};
+jest.mock('../../../../common/Hooks/ConfigHooks');
+
+const { renderWithStore } = rtlHelpers;
 
 describe('InsightsTable', () => {
-  describe('rendering', () =>
-    testComponentSnapshotsWithFixtures(InsightsTable, fixtures));
+  afterEach(() => {
+    jest.clearAllMocks();
+  });
+
+  it('renders without crashing', () => {
+    renderWithStore(<InsightsTable {...tableProps} />);
+  });
 });

data/webpack/InsightsCloudSync/Components/RemediationModal/RemediationModal.js

@@ -16,7 +16,7 @@ import { modifyRows } from './RemediationHelpers';
 import ModalFooter from './RemediationModalFooter';
 import TableEmptyState from '../../../common/table/EmptyState';
 import './RemediationModal.scss';
-import { useAdvisorEngineConfig } from '../../../common/Hooks/ConfigHooks';
+import { useIopConfig } from '../../../common/Hooks/ConfigHooks';
 
 /* eslint-disable spellcheck/spell-checker */
 
@@ -82,7 +82,7 @@ const RemediationModal = ({
   const [rows, setRows] = React.useState([]);
   const toggleModal = () => setOpen(prevValue => !prevValue);
 
-  const isIop = useAdvisorEngineConfig();
+  const isIop = useIopConfig();
   useEffect(() => {
     // only fetch for Hosted. IoP provides via props.
     if (!isIop && open)

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 { useAdvisorEngineConfig } from '../../common/Hooks/ConfigHooks';
+import { useIopConfig } from '../../common/Hooks/ConfigHooks';
 
 const ToolbarDropdown = ({ onRecommendationSync }) => {
   const [isDropdownOpen, setIsDropdownOpen] = useState(false);
-  const isLocalAdvisorEngine = useAdvisorEngineConfig();
-  if (isLocalAdvisorEngine) {
+  const isIop = useIopConfig();
+  if (isIop) {
     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 { 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;