foreman_rh_cloud 14.0.3 → 14.1.1

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

@@ -58,6 +58,8 @@ const InsightsTable = ({
     if (hideHost) setColumns(getColumnsWithoutHostname());
   }, [hits, selectedIds, hideHost]);
 
+  const hasSelectableRows = rows.some(row => !row.disableCheckbox);
+
   return (
     <React.Fragment>
       <SelectAllAlert
@@ -71,10 +73,11 @@ const InsightsTable = ({
         className="rh-cloud-recommendations-table"
         ouiaId="rh-cloud-recommendations-table"
         aria-label="Recommendations Table"
-        onSelect={(_event, isSelected, rowId) =>
-          onTableSelect(isSelected, rowId, rows, selectedIds)
-        }
-        canSelectAll={rows.length > 0}
+        {...(hasSelectableRows && {
+          onSelect: (_event, isSelected, rowId) =>
+            onTableSelect(isSelected, rowId, rows, selectedIds),
+        })}
+        canSelectAll={hasSelectableRows}
         sortBy={{
           index: getSortColumnIndex(columns, sortBy),
           direction: sortOrder,

data/webpack/InsightsCloudSync/Components/InsightsTable/table.scss

@@ -5,6 +5,15 @@
     }
   }
 
+  tbody .pf-v5-c-table__check {
+    vertical-align: middle;
+  }
+
+  thead .pf-v5-c-table__check label {
+    position: relative;
+    top: 2px;
+  }
+
   .td-insights-remediate-playbook {
     svg {
       margin-right: 5px;

data/webpack/InsightsHostDetailsTab/NewHostDetailsTab.js

@@ -25,6 +25,11 @@ import { useIopConfig } from '../common/Hooks/ConfigHooks';
 import { generateRuleUrl } from '../InsightsCloudSync/InsightsCloudSync';
 import { createProviderOptions } from '../common/ScalprumModule/ScalprumContext';
 import { useInsightsPermissions } from '../common/Hooks/PermissionsHooks';
+import {
+  isNotRhelHost,
+  hasNoInsightsFacet,
+  useTabRedirect,
+} from '../ForemanRhCloudHelpers';
 
 // Hosted Insights advisor
 const NewHostDetailsTab = ({ hostName, router }) => {
@@ -128,17 +133,32 @@ NewHostDetailsTab.defaultProps = {
 const scope = 'advisor';
 const module = './SystemDetailWrapped';
 
-const IopInsightsTab = props => (
-  <div className="advisor">
-    <ScalprumComponent
-      scope={scope}
-      module={module}
-      IopRemediationModal={RemediationModal}
-      generateRuleUrl={generateRuleUrl}
-      {...props}
-    />
-  </div>
-);
+const IopInsightsTab = props => {
+  // eslint-disable-next-line camelcase
+  const systemId = props.response?.subscription_facet_attributes?.uuid;
+  return (
+    <div className="advisor">
+      <ScalprumComponent
+        key={systemId || props.hostName}
+        scope={scope}
+        module={module}
+        IopRemediationModal={RemediationModal}
+        generateRuleUrl={generateRuleUrl}
+        {...props}
+      />
+    </div>
+  );
+};
+
+IopInsightsTab.propTypes = {
+  hostName: PropTypes.string,
+  response: PropTypes.object,
+};
+
+IopInsightsTab.defaultProps = {
+  hostName: '',
+  response: {},
+};
 
 const IopInsightsTabWrapped = props => {
   const permissions = useInsightsPermissions();
@@ -150,7 +170,18 @@ const IopInsightsTabWrapped = props => {
 };
 
 const InsightsTab = props => {
+  const { response } = props;
   const isIop = useIopConfig();
+  const isHostDataLoaded = Boolean(response?.id);
+  const shouldHideTab = useTabRedirect(
+    isHostDataLoaded &&
+      (isNotRhelHost({ hostDetails: response }) ||
+        hasNoInsightsFacet({ response, hostDetails: response }))
+  );
+
+  if (shouldHideTab) {
+    return null;
+  }
 
   return isIop ? (
     <IopInsightsTabWrapped {...props} />
@@ -159,6 +190,16 @@ const InsightsTab = props => {
   );
 };
 
-InsightsTab.defaultProps = {};
+InsightsTab.propTypes = {
+  response: PropTypes.shape({
+    id: PropTypes.number,
+    operatingsystem_name: PropTypes.string,
+    insights_attributes: PropTypes.object,
+  }),
+};
+
+InsightsTab.defaultProps = {
+  response: {},
+};
 
 export default InsightsTab;

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

@@ -2,9 +2,20 @@ import React from 'react';
 import { render } from '@testing-library/react';
 import '@testing-library/jest-dom';
 import { Provider } from 'react-redux';
+import { MemoryRouter } from 'react-router-dom';
 import configureMockStore from 'redux-mock-store';
 import thunk from 'redux-thunk';
 import NewHostDetailsTab from '../NewHostDetailsTab';
+import { OVERVIEW_TAB_PATH } from '../../ForemanRhCloudHelpers';
+
+const mockHistoryReplace = jest.fn();
+
+jest.mock('react-router-dom', () => ({
+  ...jest.requireActual('react-router-dom'),
+  useHistory: () => ({
+    replace: mockHistoryReplace,
+  }),
+}));
 
 jest.mock('../../common/Hooks/ConfigHooks', () => ({
   useIopConfig: jest.fn(() => false),
@@ -14,8 +25,33 @@ jest.mock('foremanReact/common/I18n', () => ({
   translate: jest.fn(str => str),
 }));
 
+jest.mock(
+  'foremanReact/components/SearchBar',
+  () => () => <div>SearchBar</div>,
+  { virtual: true }
+);
+
+jest.mock('../../InsightsCloudSync/Components/InsightsTable', () => () => (
+  <div>InsightsTable</div>
+));
+
+jest.mock('../../InsightsCloudSync/Components/RemediationModal', () => () => (
+  <div>RemediationModal</div>
+));
+
+jest.mock(
+  '../../InsightsCloudSync/Components/InsightsTable/Pagination',
+  () => () => <div>Pagination</div>
+);
+
 const mockStore = configureMockStore([thunk]);
 
+const defaultResponse = {
+  id: 1,
+  operatingsystem_name: 'Red Hat Enterprise Linux 8',
+  insights_attributes: { uuid: 'test-uuid' },
+};
+
 describe('NewHostDetailsTab', () => {
   let store;
   let mockRouter;
@@ -68,17 +104,18 @@ describe('NewHostDetailsTab', () => {
     it('should preserve hash when clearing search params on unmount', () => {
       const { unmount } = render(
         <Provider store={store}>
-          <NewHostDetailsTab
-            hostName="test-host.example.com"
-            router={mockRouter}
-          />
+          <MemoryRouter>
+            <NewHostDetailsTab
+              hostName="test-host.example.com"
+              router={mockRouter}
+              response={defaultResponse}
+            />
+          </MemoryRouter>
         </Provider>
       );
 
-      // Unmount the component to trigger cleanup
       unmount();
 
-      // Verify router.replace was called with both search: null AND the existing hash
       expect(mockRouter.replace).toHaveBeenCalledWith({
         search: null,
         hash: '#/Insights',
@@ -90,16 +127,18 @@ describe('NewHostDetailsTab', () => {
 
       const { unmount } = render(
         <Provider store={store}>
-          <NewHostDetailsTab
-            hostName="test-host.example.com"
-            router={mockRouter}
-          />
+          <MemoryRouter>
+            <NewHostDetailsTab
+              hostName="test-host.example.com"
+              router={mockRouter}
+              response={defaultResponse}
+            />
+          </MemoryRouter>
         </Provider>
       );
 
       unmount();
 
-      // When there's no hash, should only pass search: null
       expect(mockRouter.replace).toHaveBeenCalledWith({
         search: null,
       });
@@ -114,16 +153,18 @@ describe('NewHostDetailsTab', () => {
 
       const { unmount } = render(
         <Provider store={store}>
-          <NewHostDetailsTab
-            hostName="test-host.example.com"
-            router={routerWithoutLocation}
-          />
+          <MemoryRouter>
+            <NewHostDetailsTab
+              hostName="test-host.example.com"
+              router={routerWithoutLocation}
+              response={defaultResponse}
+            />
+          </MemoryRouter>
         </Provider>
       );
 
       unmount();
 
-      // Should still call replace with search: null even if location is undefined
       expect(routerWithoutLocation.replace).toHaveBeenCalledWith({
         search: null,
       });
@@ -132,23 +173,94 @@ describe('NewHostDetailsTab', () => {
     it('should use the latest hash value at unmount time, not a stale captured value', () => {
       const { unmount } = render(
         <Provider store={store}>
-          <NewHostDetailsTab
-            hostName="test-host.example.com"
-            router={mockRouter}
-          />
+          <MemoryRouter>
+            <NewHostDetailsTab
+              hostName="test-host.example.com"
+              router={mockRouter}
+              response={defaultResponse}
+            />
+          </MemoryRouter>
         </Provider>
       );
 
-      // Change the hash after mount, before unmount
       mockRouter.location.hash = '#/Overview';
 
       unmount();
 
-      // Verify router.replace was called with the UPDATED hash, not the initial '#/Insights'
       expect(mockRouter.replace).toHaveBeenCalledWith({
         search: null,
         hash: '#/Overview',
       });
     });
   });
+
+  describe('tab visibility', () => {
+    it('should redirect to Overview when host is not RHEL', () => {
+      const nonRhelResponse = {
+        id: 2,
+        operatingsystem_name: 'Ubuntu 20.04',
+        insights_attributes: { uuid: 'test-uuid' },
+      };
+
+      render(
+        <Provider store={store}>
+          <MemoryRouter>
+            <NewHostDetailsTab
+              hostName="test-host.example.com"
+              response={nonRhelResponse}
+            />
+          </MemoryRouter>
+        </Provider>
+      );
+
+      expect(mockHistoryReplace).toHaveBeenCalledWith(OVERVIEW_TAB_PATH);
+    });
+
+    it('should redirect to Overview when insights facet is missing', () => {
+      const responseWithoutInsights = {
+        id: 3,
+        operatingsystem_name: 'Red Hat Enterprise Linux 8',
+      };
+
+      render(
+        <Provider store={store}>
+          <MemoryRouter>
+            <NewHostDetailsTab
+              hostName="test-host.example.com"
+              response={responseWithoutInsights}
+            />
+          </MemoryRouter>
+        </Provider>
+      );
+
+      expect(mockHistoryReplace).toHaveBeenCalledWith(OVERVIEW_TAB_PATH);
+    });
+
+    it('should not redirect when host is valid RHEL with insights facet', () => {
+      render(
+        <Provider store={store}>
+          <MemoryRouter>
+            <NewHostDetailsTab
+              hostName="test-host.example.com"
+              response={defaultResponse}
+            />
+          </MemoryRouter>
+        </Provider>
+      );
+
+      expect(mockHistoryReplace).not.toHaveBeenCalled();
+    });
+
+    it('should not redirect when host data is not yet loaded', () => {
+      render(
+        <Provider store={store}>
+          <MemoryRouter>
+            <NewHostDetailsTab hostName="test-host.example.com" response={{}} />
+          </MemoryRouter>
+        </Provider>
+      );
+
+      expect(mockHistoryReplace).not.toHaveBeenCalled();
+    });
+  });
 });

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: foreman_rh_cloud
 version: !ruby/object:Gem::Version
-  version: 14.0.3
+  version: 14.1.1
 platform: ruby
 authors:
 - Foreman Red Hat Cloud team
@@ -101,6 +101,7 @@ files:
 - app/controllers/concerns/foreman_rh_cloud/iop_smart_proxy_access.rb
 - app/controllers/concerns/foreman_rh_cloud/registration_manager_extensions.rb
 - app/controllers/concerns/insights_cloud/candlepin_cache.rb
+- app/controllers/concerns/insights_cloud/candlepin_proxies_extensions.rb
 - app/controllers/concerns/insights_cloud/client_authentication.rb
 - app/controllers/concerns/insights_cloud/package_profile_upload_extensions.rb
 - app/controllers/concerns/inventory_upload/report_actions.rb
@@ -248,6 +249,7 @@ files:
 - test/controllers/insights_cloud/api/advisor_engine_controller_test.rb
 - test/controllers/insights_cloud/api/cloud_request_controller_test.rb
 - test/controllers/insights_cloud/api/machine_telemetries_controller_test.rb
+- test/controllers/insights_cloud/candlepin_proxies_extensions_test.rb
 - test/controllers/insights_cloud/ui_requests_controller_test.rb
 - test/controllers/insights_sync/settings_controller_test.rb
 - test/controllers/inventory_upload/api/inventory_controller_test.rb
@@ -274,6 +276,7 @@ files:
 - test/jobs/single_host_report_job_test.rb
 - test/jobs/upload_report_direct_job_test.rb
 - test/models/insights_client_report_status_test.rb
+- test/models/inventory_sync/inventory_status_test.rb
 - test/test_plugin_helper.rb
 - test/unit/archived_report_generator_test.rb
 - test/unit/fact_helpers_test.rb
@@ -448,6 +451,7 @@ files:
 - webpack/ForemanInventoryUpload/Components/PageHeader/components/SyncButton/__tests__/__snapshots__/integrations.test.js.snap
 - webpack/ForemanInventoryUpload/Components/PageHeader/components/SyncButton/__tests__/integrations.test.js
 - webpack/ForemanInventoryUpload/Components/PageHeader/components/SyncButton/components/Toast.js
+- webpack/ForemanInventoryUpload/Components/PageHeader/components/SyncButton/components/__tests__/Toast.test.js
 - webpack/ForemanInventoryUpload/Components/PageHeader/components/SyncButton/index.js
 - webpack/ForemanInventoryUpload/Components/PageHeader/components/ToolbarButtons/ToolbarButtons.js
 - webpack/ForemanInventoryUpload/Components/PageHeader/components/ToolbarButtons/__tests__/ToolbarButtons.test.js
@@ -677,6 +681,7 @@ test_files:
 - test/controllers/insights_cloud/api/advisor_engine_controller_test.rb
 - test/controllers/insights_cloud/api/cloud_request_controller_test.rb
 - test/controllers/insights_cloud/api/machine_telemetries_controller_test.rb
+- test/controllers/insights_cloud/candlepin_proxies_extensions_test.rb
 - test/controllers/insights_cloud/ui_requests_controller_test.rb
 - test/controllers/insights_sync/settings_controller_test.rb
 - test/controllers/inventory_upload/api/inventory_controller_test.rb
@@ -703,6 +708,7 @@ test_files:
 - test/jobs/single_host_report_job_test.rb
 - test/jobs/upload_report_direct_job_test.rb
 - test/models/insights_client_report_status_test.rb
+- test/models/inventory_sync/inventory_status_test.rb
 - test/test_plugin_helper.rb
 - test/unit/archived_report_generator_test.rb
 - test/unit/fact_helpers_test.rb