foreman_rh_cloud 13.0.8 → 13.0.9

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/InsightsTable/__tests__/InsightsTable.test.js

@@ -1,26 +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';
 
-jest.mock('foremanReact/Root/Context/ForemanContext', () => ({
-  useForemanContext: () => ({
-    metadata: {
-      foreman_rh_cloud: {
-        iop: true,
-      },
-    },
-  }),
-  useForemanSettings: () => ({
-    perPage: 20,
-  }),
-}));
+jest.mock('../../../../common/Hooks/ConfigHooks');
 
-const fixtures = {
-  'render with Props': tableProps,
-};
+const { renderWithStore } = rtlHelpers;
 
 describe('InsightsTable', () => {
-  describe('rendering', () =>
-    testComponentSnapshotsWithFixtures(InsightsTable, fixtures));
+  afterEach(() => {
+    jest.clearAllMocks();
+  });
+
+  it('renders without crashing', () => {
+    renderWithStore(<InsightsTable {...tableProps} />);
+  });
 });

data/webpack/InsightsVulnerabilityHostIndexExtensions/__tests__/CVECountCell.test.js

@@ -1,12 +1,14 @@
 import React from 'react';
-import { render, screen } from '@testing-library/react';
+import { screen } from '@testing-library/react';
+import { rtlHelpers } from 'foremanReact/common/rtlTestHelpers';
 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');
 
+const { renderWithStore } = rtlHelpers;
+
 API.get.mockImplementation(async () => ({
   data: [
     {
@@ -18,17 +20,13 @@ API.get.mockImplementation(async () => ({
 }));
 
 const hostDetailsMock = {
-      name: 'test-host.example.com',
-      subscription_facet_attributes: {
-        uuid: 'test-uuid-123',
-      },
-    };
+  name: 'test-host.example.com',
+  subscription_facet_attributes: {
+    uuid: 'test-uuid-123',
+  },
+};
 
 describe('CVECountCell', () => {
-  beforeEach(() => {
-    ConfigHooks.useIopConfig.mockReturnValue(true);
-  });
-
   afterEach(() => {
     jest.clearAllMocks();
   });
@@ -40,35 +38,92 @@ describe('CVECountCell', () => {
         uuid: null, // no subscription
       },
     };
-    render(<CVECountCell hostDetails={hostDetailsMockIoP} />);
+    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', () => {
-    ConfigHooks.useIopConfig.mockReturnValue(false);
-    render(<CVECountCell hostDetails={hostDetailsMock} />);
+    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();
-    expect(ConfigHooks.useIopConfig).toHaveBeenCalled();
   });
 
   it('renders UnknownIcon when IoP is enabled but CVE API call fails', () => {
-    // Mock successful IoP config
-    ConfigHooks.useIopConfig.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} />);
+    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();
-    expect(ConfigHooks.useIopConfig).toHaveBeenCalled();
   });
 
   it('renders UnknownIcon when IoP is undefined (API call pending)', () => {
-    ConfigHooks.useIopConfig.mockReturnValue(undefined);
-    render(<CVECountCell hostDetails={hostDetailsMock} />);
+    renderWithStore(<CVECountCell hostDetails={hostDetailsMock} />, {
+      router: {
+        location: {
+          pathname: '/',
+          search: '',
+          hash: '',
+          query: {},
+        },
+      },
+      API: {
+        ADVISOR_ENGINE_CONFIG: {
+          status: 'PENDING',
+        },
+      },
+    });
     expect(screen.getByRole('img', { hidden: true })).toBeTruthy();
-    expect(ConfigHooks.useIopConfig).toHaveBeenCalled();
   });
 });

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: foreman_rh_cloud
 version: !ruby/object:Gem::Version
-  version: 13.0.8
+  version: 13.0.9
 platform: ruby
 authors:
 - Foreman Red Hat Cloud team
@@ -196,7 +196,7 @@ files:
 - 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/async/upload_report_direct_job.rb
 - lib/foreman_inventory_upload/generators/archived_report.rb
 - lib/foreman_inventory_upload/generators/fact_helpers.rb
 - lib/foreman_inventory_upload/generators/json_stream.rb
@@ -205,7 +205,6 @@ files:
 - lib/foreman_inventory_upload/generators/slice.rb
 - lib/foreman_inventory_upload/generators/tags.rb
 - lib/foreman_inventory_upload/notifications/manifest_import_success_notification_override.rb
-- lib/foreman_inventory_upload/scripts/uploader.sh.erb
 - lib/foreman_rh_cloud.rb
 - lib/foreman_rh_cloud/async/exponential_backoff.rb
 - lib/foreman_rh_cloud/engine.rb
@@ -279,7 +278,7 @@ files:
 - test/jobs/queue_for_upload_job_test.rb
 - test/jobs/remove_insights_hosts_job_test.rb
 - test/jobs/single_host_report_job_test.rb
-- test/jobs/upload_report_job_test.rb
+- test/jobs/upload_report_direct_job_test.rb
 - test/models/insights_client_report_status_test.rb
 - test/test_plugin_helper.rb
 - test/unit/archived_report_generator_test.rb
@@ -443,7 +442,6 @@ files:
 - webpack/ForemanInventoryUpload/Components/PageHeader/PageTitle.js
 - webpack/ForemanInventoryUpload/Components/PageHeader/__tests__/PageHeader.test.js
 - webpack/ForemanInventoryUpload/Components/PageHeader/__tests__/PageTitle.test.js
-- webpack/ForemanInventoryUpload/Components/PageHeader/__tests__/__snapshots__/PageHeader.test.js.snap
 - webpack/ForemanInventoryUpload/Components/PageHeader/__tests__/__snapshots__/PageTitle.test.js.snap
 - webpack/ForemanInventoryUpload/Components/PageHeader/components/CloudConnectorButton/CloudConnectorActions.js
 - webpack/ForemanInventoryUpload/Components/PageHeader/components/CloudConnectorButton/CloudConnectorButton.js
@@ -588,7 +586,6 @@ files:
 - webpack/InsightsCloudSync/Components/InsightsTable/__tests__/InsightsTable.test.js
 - webpack/InsightsCloudSync/Components/InsightsTable/__tests__/InsightsTableActions.test.js
 - webpack/InsightsCloudSync/Components/InsightsTable/__tests__/InsightsTableSelectors.test.js
-- webpack/InsightsCloudSync/Components/InsightsTable/__tests__/__snapshots__/InsightsTable.test.js.snap
 - webpack/InsightsCloudSync/Components/InsightsTable/__tests__/__snapshots__/InsightsTableActions.test.js.snap
 - webpack/InsightsCloudSync/Components/InsightsTable/__tests__/__snapshots__/InsightsTableSelectors.test.js.snap
 - webpack/InsightsCloudSync/Components/InsightsTable/__tests__/fixtures.js
@@ -648,7 +645,6 @@ files:
 - webpack/__mocks__/foremanReact/common/I18n.js
 - webpack/__mocks__/foremanReact/common/MountingService.js
 - webpack/__mocks__/foremanReact/common/helpers.js
-- webpack/__mocks__/foremanReact/common/hooks/API/APIHooks.js
 - webpack/__mocks__/foremanReact/components/ConfirmModal/index.js
 - webpack/__mocks__/foremanReact/components/Head.js
 - webpack/__mocks__/foremanReact/components/Layout/LayoutConstants.js
@@ -740,7 +736,7 @@ test_files:
 - test/jobs/queue_for_upload_job_test.rb
 - test/jobs/remove_insights_hosts_job_test.rb
 - test/jobs/single_host_report_job_test.rb
-- test/jobs/upload_report_job_test.rb
+- test/jobs/upload_report_direct_job_test.rb
 - test/models/insights_client_report_status_test.rb
 - test/test_plugin_helper.rb
 - test/unit/archived_report_generator_test.rb