foreman_rh_cloud 12.2.16 → 13.0.0

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

@@ -1,183 +1,13 @@
-import React from 'react';
-import { screen } from '@testing-library/react';
-import { rtlHelpers } from 'foremanReact/common/rtlTestHelpers';
-import PageHeader from '../PageHeader';
-
-// 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: {},
-  }),
-}));
+import { testComponentSnapshotsWithFixtures } from '@theforeman/test';
 
-// 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>
-));
+import PageHeader from '../PageHeader';
 
-const { renderWithStore } = rtlHelpers;
+const fixtures = {
+  'render without Props': {},
+  /** fixtures, props for the component */
+};
 
 describe('PageHeader', () => {
-  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();
-    });
-  });
+  describe('rendering', () =>
+    testComponentSnapshotsWithFixtures(PageHeader, fixtures));
 });

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

@@ -0,0 +1,36 @@
+// Jest Snapshot v1, https://goo.gl/fbAQLP
+
+exports[`PageHeader rendering render without Props 1`] = `
+<div
+  className="inventory-upload-header"
+>
+  <ConnectedSettingsWarning />
+  <PageTitle />
+  <div
+    className="inventory-upload-header-description"
+  >
+    <ConnectedInventorySettings />
+    <PageDescription />
+  </div>
+  <Row
+    bsClass="row"
+    componentClass="div"
+  >
+    <Col
+      bsClass="col"
+      componentClass="div"
+      xs={4}
+    >
+      <Connect(InventoryFilter) />
+    </Col>
+    <Col
+      bsClass="col"
+      componentClass="div"
+      xs={7}
+      xsOffset={1}
+    >
+      <ToolbarButtons />
+    </Col>
+  </Row>
+</div>
+`;

data/webpack/ForemanInventoryUpload/Components/PageHeader/__tests__/__snapshots__/PageTitle.test.js.snap

@@ -32,7 +32,7 @@ exports[`PageTitle rendering render without Props 1`] = `
             Actions history
           </DropdownItem>,
           <DropdownItem
-            href="/links/manual/?root_url=https%3A%2F%2Fdocs.redhat.com%2Fen%2Fdocumentation%2Fred_hat_lightspeed%2F1-latest%2Fhtml-single%2Fred_hat_lightspeed_remediations_guide%2Findex"
+            href="/links/manual/?root_url=https%3A%2F%2Faccess.redhat.com%2Fdocumentation%2Fen-us%2Fred_hat_insights%2F2023%2Fhtml%2Fred_hat_insights_remediations_guide%2Fhost-communication-with-insights_red-hat-insights-remediation-guide%23uploading-satellite-host-inventory-to-insights_configuring-satellite-cloud-connector"
             ouiaId="inventory-documentation-button"
             rel="noopener noreferrer"
             target="_blank"

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

@@ -4,13 +4,11 @@ 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;
@@ -18,7 +16,7 @@ const ToolbarButtons = () => {
 
   return (
     <div className="inventory_toolbar_buttons">
-      {!isIop && <CloudConnectorButton />}
+      <CloudConnectorButton />
       <SyncButton />
     </div>
   );

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

@@ -1,78 +1,60 @@
 import React from 'react';
-import { screen } from '@testing-library/react';
-import { rtlHelpers } from 'foremanReact/common/rtlTestHelpers';
+import { Provider } from 'react-redux';
+import configureMockStore from 'redux-mock-store';
+import thunk from 'redux-thunk';
+import { screen, render } from '@testing-library/react';
 import ToolbarButtons from '../ToolbarButtons';
-import { useIopConfig } from '../../../../../../common/Hooks/ConfigHooks';
-import { selectSubscriptionConnectionEnabled } from '../../../../InventorySettings/InventorySettingsSelectors';
 
-// 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;
+const middlewares = [thunk];
+const mockStore = configureMockStore(middlewares);
+
+const renderOptions = {
+  API: {
+    INVENTORY_SETTINGS: {
+      response: { subscriptionConnectionEnabled: true },
+    },
+  },
+  ForemanRhCloud: {
+    inventoryUpload: {
+      accountsList: {
+        CloudConnectorStatus: {},
+      },
+    },
+  },
+};
 
 describe('ToolbarButtons', () => {
-  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 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 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();
+  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);
   });
 });

data/webpack/ForemanInventoryUpload/ForemanInventoryHelpers.js

@@ -7,7 +7,7 @@ export const inventoryUrl = path =>
 export const getInventoryDocsUrl = () =>
   foremanUrl(
     `/links/manual/?root_url=${URI.encode(
-      'https://docs.redhat.com/en/documentation/red_hat_lightspeed/1-latest/html-single/red_hat_lightspeed_remediations_guide/index'
+      'https://access.redhat.com/documentation/en-us/red_hat_insights/2023/html/red_hat_insights_remediations_guide/host-communication-with-insights_red-hat-insights-remediation-guide#uploading-satellite-host-inventory-to-insights_configuring-satellite-cloud-connector'
     )}`
   );
 

data/webpack/ForemanInventoryUpload/__tests__/__snapshots__/ForemanInventoryHelpers.test.js.snap

@@ -2,4 +2,4 @@
 
 exports[`ForemanInventoryUpload helpers should return inventory Url 1`] = `"/foreman_inventory_upload/test_path"`;
 
-exports[`ForemanInventoryUpload helpers should return inventory docs url 1`] = `"/links/manual/?root_url=https%3A%2F%2Fdocs.redhat.com%2Fen%2Fdocumentation%2Fred_hat_lightspeed%2F1-latest%2Fhtml-single%2Fred_hat_lightspeed_remediations_guide%2Findex"`;
+exports[`ForemanInventoryUpload helpers should return inventory docs url 1`] = `"/links/manual/?root_url=https%3A%2F%2Faccess.redhat.com%2Fdocumentation%2Fen-us%2Fred_hat_insights%2F2023%2Fhtml%2Fred_hat_insights_remediations_guide%2Fhost-communication-with-insights_red-hat-insights-remediation-guide%23uploading-satellite-host-inventory-to-insights_configuring-satellite-cloud-connector"`;

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/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 { useIopConfig } from '../../../common/Hooks/ConfigHooks';
+import { useAdvisorEngineConfig } from '../../../common/Hooks/ConfigHooks';
 
 const InsightsSettings = ({
   insightsSyncEnabled,
   getInsightsSyncSettings,
   setInsightsSyncEnabled,
 }) => {
-  const isIop = useIopConfig();
+  const isLocalAdvisorEngine = useAdvisorEngineConfig();
   useEffect(() => {
     getInsightsSyncSettings();
   }, [getInsightsSyncSettings]);
 
-  if (isIop) return null;
+  if (isLocalAdvisorEngine) 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 { useIopConfig } from '../../../common/Hooks/ConfigHooks';
+import { useAdvisorEngineConfig } from '../../../common/Hooks/ConfigHooks';
 
 const InsightsTable = ({
   page,
@@ -48,11 +48,17 @@ const InsightsTable = ({
     fetchInsights({ page, perPage, query, sortBy, sortOrder });
   }, [hostname]);
 
-  const isIop = useIopConfig();
+  const isLocalAdvisorEngine = useAdvisorEngineConfig();
 
   useEffect(() => {
     setRows(
-      modifySelectedRows(hits, selectedIds, showSelectAllAlert, hideHost, isIop)
+      modifySelectedRows(
+        hits,
+        selectedIds,
+        showSelectAllAlert,
+        hideHost,
+        isLocalAdvisorEngine
+      )
     );
 
     if (hideHost) setColumns(getColumnsWithoutHostname());

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

@@ -1,33 +1,13 @@
-import React from 'react';
-import { rtlHelpers } from 'foremanReact/common/rtlTestHelpers';
+import { testComponentSnapshotsWithFixtures } from '@theforeman/test';
+
 import InsightsTable from '../InsightsTable';
 import { tableProps } from './fixtures';
 
-jest.mock('foremanReact/Root/Context/ForemanContext', () => ({
-  useForemanContext: () => ({
-    metadata: {
-      foreman_rh_cloud: {
-        iop: true,
-      },
-    },
-  }),
-  useForemanSettings: () => ({
-    perPage: 20,
-  }),
-}));
-
-const { renderWithStore } = rtlHelpers;
-
 const fixtures = {
   'render with Props': tableProps,
 };
 
 describe('InsightsTable', () => {
-  afterEach(() => {
-    jest.clearAllMocks();
-  });
-
-  it('renders without crashing', () => {
-    renderWithStore(<InsightsTable {...tableProps} />);
-  });
+  describe('rendering', () =>
+    testComponentSnapshotsWithFixtures(InsightsTable, fixtures));
 });

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

@@ -0,0 +1,112 @@
+// Jest Snapshot v1, https://goo.gl/fbAQLP
+
+exports[`InsightsTable rendering render with Props 1`] = `
+<Fragment>
+  <SelectAllAlert
+    clearAllSelection={[Function]}
+    isAllSelected={false}
+    selectAll={[Function]}
+    selectedIds={Object {}}
+    showSelectAllAlert={false}
+  />
+  <Table
+    actionsMenuAppendTo="inline"
+    aria-label="Recommendations Table"
+    borders={true}
+    canCollapseAll={false}
+    canSelectAll={false}
+    canSortFavorites={true}
+    cells={
+      Array [
+        Object {
+          "id": "hostname",
+          "sortKey": "hostname",
+          "title": "Hostname",
+          "transforms": Array [
+            [Function],
+            [Function],
+          ],
+        },
+        Object {
+          "id": "recommendation",
+          "sortKey": "title",
+          "title": "Recommendation",
+          "transforms": Array [
+            [Function],
+            [Function],
+          ],
+        },
+        Object {
+          "cellTransforms": Array [
+            [Function],
+          ],
+          "id": "total risk",
+          "sortKey": "total_risk",
+          "title": "Total risk",
+          "transforms": Array [
+            [Function],
+            [Function],
+          ],
+        },
+        Object {
+          "cellTransforms": Array [
+            [Function],
+          ],
+          "id": "remediate",
+          "title": "Remediate",
+          "transforms": Array [
+            [Function],
+          ],
+        },
+        Object {
+          "cellTransforms": Array [
+            [Function],
+          ],
+          "id": "actions",
+          "title": "",
+          "transforms": Array [
+            [Function],
+          ],
+        },
+      ]
+    }
+    className="rh-cloud-recommendations-table"
+    collapseAllAriaLabel=""
+    contentId="expanded-content"
+    dropdownDirection="down"
+    dropdownPosition="right"
+    expandId="expandable-toggle"
+    gridBreakPoint="grid-md"
+    isHeaderSelectDisabled={false}
+    isNested={false}
+    isStickyHeader={false}
+    isTreeTable={false}
+    onSelect={[Function]}
+    onSort={[Function]}
+    ouiaId="rh-cloud-recommendations-table"
+    ouiaSafe={true}
+    role="grid"
+    rowLabeledBy="simple-node"
+    rows={Array []}
+    selectVariant="checkbox"
+    sortBy={
+      Object {
+        "direction": "desc",
+        "index": 3,
+      }
+    }
+    variant="compact"
+  >
+    <TableHeader />
+    <TableBody />
+  </Table>
+  <TableEmptyState
+    error={null}
+    rowsLength={0}
+    status="RESOLVED"
+  />
+  <Pagination
+    variant="bottom"
+  />
+</Fragment>
+`;

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 { useIopConfig } from '../../../common/Hooks/ConfigHooks';
+import { useAdvisorEngineConfig } 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 = useIopConfig();
+  const isIop = useAdvisorEngineConfig();
   useEffect(() => {
     // only fetch for Hosted. IoP provides via props.
     if (!isIop && open)