foreman_rh_cloud 13.0.8 → 13.0.10

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/__tests__/__snapshots__/PageTitle.test.js.snap

@@ -24,7 +24,7 @@ exports[`PageTitle rendering render without Props 1`] = `
       dropdownItems={
         Array [
           <DropdownItem
-            href="/foreman_tasks/tasks?search=label+%3D+ForemanInventoryUpload%3A%3AAsync%3A%3AGenerateReportJob+or+label+%3D+ForemanInventoryUpload%3A%3AAsync%3A%3AGenerateAllReportsJob&page=1"
+            href="/foreman_tasks/tasks?search=label+%3D+ForemanInventoryUpload%3A%3AAsync%3A%3AHostInventoryReportJob+or+label+%3D+ForemanInventoryUpload%3A%3AAsync%3A%3AGenerateAllReportsJob&page=1"
             ouiaId="tasks-history-button"
             rel="noopener noreferrer"
             target="_blank"
@@ -32,7 +32,7 @@ exports[`PageTitle rendering render without Props 1`] = `
             Actions history
           </DropdownItem>,
           <DropdownItem
-            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"
+            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"
             ouiaId="inventory-documentation-button"
             rel="noopener noreferrer"
             target="_blank"

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/ForemanInventoryUpload/Components/TabHeader/TabHeader.js

@@ -2,10 +2,12 @@ import React from 'react';
 import { useSelector } from 'react-redux';
 import PropTypes from 'prop-types';
 import { Grid, Button, Icon } from 'patternfly-react';
+import { Tooltip } from '@patternfly/react-core';
 import { noop } from 'foremanReact/common/helpers';
 import { sprintf, translate as __ } from 'foremanReact/common/I18n';
 import { selectSubscriptionConnectionEnabled } from '../InventorySettings/InventorySettingsSelectors';
 import { isExitCodeLoading } from '../../ForemanInventoryHelpers';
+import { useIopConfig } from '../../../common/Hooks/ConfigHooks';
 import './tabHeader.scss';
 
 const TabHeader = ({
@@ -18,10 +20,23 @@ const TabHeader = ({
   const subscriptionConnectionEnabled = useSelector(
     selectSubscriptionConnectionEnabled
   );
+  const isIop = Boolean(useIopConfig());
   const buttonGenerateLabel = subscriptionConnectionEnabled
     ? __('Generate and upload report')
     : __('Generate report');
 
+  const isUploadDisabled = !isIop && !subscriptionConnectionEnabled;
+  const isButtonDisabled = isExitCodeLoading(exitCode) || isUploadDisabled;
+  const tooltipContent = __(
+    'Upload is disabled because subscription connection is not enabled. Enable it in Administer > Settings > Content.'
+  );
+
+  const generateButton = onRestart ? (
+    <Button bsStyle="primary" onClick={onRestart} disabled={isButtonDisabled}>
+      {buttonGenerateLabel}
+    </Button>
+  ) : null;
+
   return (
     <Grid.Row className="tab-header">
       <Grid.Col sm={6}>
@@ -29,15 +44,13 @@ const TabHeader = ({
       </Grid.Col>
       <Grid.Col sm={6}>
         <div className="tab-action-buttons">
-          {onRestart ? (
-            <Button
-              bsStyle="primary"
-              onClick={onRestart}
-              disabled={isExitCodeLoading(exitCode)}
-            >
-              {buttonGenerateLabel}
-            </Button>
-          ) : null}
+          {generateButton && isUploadDisabled ? (
+            <Tooltip content={tooltipContent}>
+              <div style={{ display: 'inline-block' }}>{generateButton}</div>
+            </Tooltip>
+          ) : (
+            generateButton
+          )}
           {onDownload ? (
             <Button onClick={onDownload} disabled={downloadButtonDisabled()}>
               {__('Download Report')} <Icon name="download" />

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

@@ -4,13 +4,21 @@ import configureMockStore from 'redux-mock-store';
 import thunk from 'redux-thunk';
 import { screen, render } from '@testing-library/react';
 import { noop } from 'foremanReact/common/helpers';
+import * as ConfigHooks from '../../../../common/Hooks/ConfigHooks';
 import TabHeader from '../TabHeader';
 
 const middlewares = [thunk];
 const mockStore = configureMockStore(middlewares);
 
+jest.mock('../../../../common/Hooks/ConfigHooks');
+
 describe('TabHeader', () => {
-  test('when subscription connection is enabled', () => {
+  beforeEach(() => {
+    ConfigHooks.useIopConfig = jest.fn();
+  });
+
+  test('when subscription connection is enabled and not IoP', () => {
+    ConfigHooks.useIopConfig.mockReturnValue(false);
     const renderOptions = {
       API: {
         INVENTORY_SETTINGS: {
@@ -20,16 +28,19 @@ describe('TabHeader', () => {
     };
     const store = mockStore(renderOptions);
 
-    render(
+    const { container } = render(
       <Provider store={store}>
         <TabHeader exitCode="exit 0" onRestart={noop} toggleFullScreen={noop} />
       </Provider>
     );
     expect(screen.queryAllByText('Generate and upload report')).toHaveLength(1);
     expect(screen.queryAllByText('Full Screen')).toHaveLength(1);
+    const button = container.querySelector('button[class*="btn-primary"]');
+    expect(button.hasAttribute('disabled')).toBe(false);
   });
 
-  test('when subscription connection is not enabled', () => {
+  test('when subscription connection is not enabled and not IoP - button is disabled with tooltip', () => {
+    ConfigHooks.useIopConfig.mockReturnValue(false);
     const renderOptions = {
       API: {
         INVENTORY_SETTINGS: {
@@ -39,7 +50,7 @@ describe('TabHeader', () => {
     };
     const store = mockStore(renderOptions);
 
-    render(
+    const { container } = render(
       <Provider store={store}>
         <TabHeader exitCode="exit 0" onRestart={noop} toggleFullScreen={noop} />
       </Provider>
@@ -47,5 +58,57 @@ describe('TabHeader', () => {
 
     expect(screen.queryAllByText('Generate report')).toHaveLength(1);
     expect(screen.queryAllByText('Full Screen')).toHaveLength(1);
+    const button = container.querySelector('button[class*="btn-primary"]');
+    expect(button.hasAttribute('disabled')).toBe(true);
+
+    // Verify button is wrapped in a div for tooltip (Patternfly requirement)
+    // The tooltip content prop is passed but not rendered in the DOM until hover
+    const wrapper = button.parentElement;
+    expect(wrapper.tagName).toBe('DIV');
+    expect(wrapper.style.display).toBe('inline-block');
+  });
+
+  test('when subscription connection is not enabled but IoP is enabled - button is enabled', () => {
+    ConfigHooks.useIopConfig.mockReturnValue(true);
+    const renderOptions = {
+      API: {
+        INVENTORY_SETTINGS: {
+          response: { subscriptionConnectionEnabled: false },
+        },
+      },
+    };
+    const store = mockStore(renderOptions);
+
+    const { container } = render(
+      <Provider store={store}>
+        <TabHeader exitCode="exit 0" onRestart={noop} toggleFullScreen={noop} />
+      </Provider>
+    );
+
+    expect(screen.queryAllByText('Generate report')).toHaveLength(1);
+    const button = container.querySelector('button[class*="btn-primary"]');
+    expect(button.hasAttribute('disabled')).toBe(false);
+  });
+
+  test('when IoP is enabled and subscription connection is enabled - button is enabled', () => {
+    ConfigHooks.useIopConfig.mockReturnValue(true);
+    const renderOptions = {
+      API: {
+        INVENTORY_SETTINGS: {
+          response: { subscriptionConnectionEnabled: true },
+        },
+      },
+    };
+    const store = mockStore(renderOptions);
+
+    const { container } = render(
+      <Provider store={store}>
+        <TabHeader exitCode="exit 0" onRestart={noop} toggleFullScreen={noop} />
+      </Provider>
+    );
+
+    expect(screen.queryAllByText('Generate and upload report')).toHaveLength(1);
+    const button = container.querySelector('button[class*="btn-primary"]');
+    expect(button.hasAttribute('disabled')).toBe(false);
   });
 });