foreman_rh_cloud 14.1.0 → 14.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ecc86813dfba949a2d7125c96245b767f5ecc4edee058828bac97042ce5d4ee0
-  data.tar.gz: e6d920065bbe1a0a560c49050614abbad1c72d4f4c5e1494edf390db0495833e
+  metadata.gz: c171d38bbf5ab4518afbd0bfa19123c63c3d711bcf4a64070f215890b18cd5fe
+  data.tar.gz: 82b8598bf7fd4fec088e01f9c94986e1f73975bca9818fa386bbc82792ebdd93
 SHA512:
-  metadata.gz: e672658acda2399401392268c238361a81720e58d6d5693e70b1195c8aaef4d22ee35918b1ee329fae40d03efb09ad77c5562e9d81a905bd9e3b86945ed5a7f7
-  data.tar.gz: 1ff3460a85b2a26b64de9a472dcaf864bcb9cdd71043736a94f7f0784eb48ed91dcee94c84ae7ad4ae3c10bd31df8addd89175cf7c9ff6b221b8fadbe5035391
+  metadata.gz: 331610ee54d503abfa397fd3a4b599ab864dedee5ba0cf6e268d1577db10d0f2187e46829ed35a1133f95398843d9d967b74da6dbee8b99e66a43ee69e6853ff
+  data.tar.gz: f495666febadc11ae9924350a7cbb3ec11a5e07945a42e06aad8c923bccd751632b5d87d171d0eb1f248fbbf8f40bd225d13d8f4f9ae1ff9e2b9e6785f34260a

data/lib/foreman_rh_cloud/version.rb

@@ -1,3 +1,3 @@
 module ForemanRhCloud
-  VERSION = '14.1.0'.freeze
+  VERSION = '14.1.1'.freeze
 end

data/package.json

@@ -1,6 +1,6 @@
 {
   "name": "foreman_rh_cloud",
-  "version": "14.1.0",
+  "version": "14.1.1",
   "description": "Inventory Upload =============",
   "main": "index.js",
   "scripts": {

data/webpack/CVEsHostDetailsTab/CVEsHostDetailsTab.js

@@ -3,6 +3,10 @@ import PropTypes from 'prop-types';
 import { ScalprumComponent, ScalprumProvider } from '@scalprum/react-core';
 import { createProviderOptions } from '../common/ScalprumModule/ScalprumContext';
 import { useInsightsPermissions } from '../common/Hooks/PermissionsHooks';
+import {
+  vulnerabilityDisabled,
+  useTabRedirect,
+} from '../ForemanRhCloudHelpers';
 import './CVEsHostDetailsTab.scss';
 
 const CVEsHostDetailsTab = ({ systemId }) => {
@@ -26,6 +30,15 @@ CVEsHostDetailsTab.propTypes = {
 
 const CVEsHostDetailsTabWrapper = ({ response }) => {
   const permissions = useInsightsPermissions();
+  const isHostDataLoaded = Boolean(response?.id);
+  const shouldHideTab = useTabRedirect(
+    isHostDataLoaded && vulnerabilityDisabled({ hostDetails: response })
+  );
+
+  if (shouldHideTab) {
+    return null;
+  }
+
   return (
     <ScalprumProvider {...createProviderOptions(permissions)}>
       <CVEsHostDetailsTab
@@ -38,10 +51,19 @@ const CVEsHostDetailsTabWrapper = ({ response }) => {
 
 CVEsHostDetailsTabWrapper.propTypes = {
   response: PropTypes.shape({
+    id: PropTypes.number,
+    operatingsystem_name: PropTypes.string,
+    vulnerability: PropTypes.shape({
+      enabled: PropTypes.bool,
+    }),
     subscription_facet_attributes: PropTypes.shape({
-      uuid: PropTypes.string.isRequired,
+      uuid: PropTypes.string,
     }),
-  }).isRequired,
+  }),
+};
+
+CVEsHostDetailsTabWrapper.defaultProps = {
+  response: {},
 };
 
 export default CVEsHostDetailsTabWrapper;

data/webpack/CVEsHostDetailsTab/__tests__/CVEsHostDetailsTab.test.js

@@ -1,6 +1,17 @@
 import React from 'react';
 import { render } from '@testing-library/react';
+import { MemoryRouter } from 'react-router-dom';
 import CVEsHostDetailsTabWrapper from '../CVEsHostDetailsTab';
+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('foremanReact/Root/Context/ForemanContext', () => ({
   useForemanContext: () => ({
@@ -25,31 +36,44 @@ jest.mock('@scalprum/react-core', () => {
   };
 });
 
+const defaultResponse = {
+  id: 1,
+  operatingsystem_name: 'Red Hat Enterprise Linux 8',
+  vulnerability: { enabled: true },
+  subscription_facet_attributes: { uuid: '1-2-3' },
+};
+
 describe('CVEsHostDetailsTabWrapper', () => {
   beforeEach(() => {
     jest.clearAllMocks();
   });
 
-  it('renders without crashing', () => {
+  it('renders without crashing and does not redirect for valid host', () => {
     const { container } = render(
-      <CVEsHostDetailsTabWrapper
-        response={{ subscription_facet_attributes: { uuid: '1-2-3' } }}
-      />
+      <MemoryRouter>
+        <CVEsHostDetailsTabWrapper response={defaultResponse} />
+      </MemoryRouter>
     );
     expect(
       container.querySelector(
         '.rh-cloud-insights-vulnerability-host-details-component'
       )
     ).toBeTruthy();
+    expect(mockHistoryReplace).not.toHaveBeenCalled();
   });
 
   it('remounts ScalprumComponent when systemId changes', () => {
     const { ScalprumComponent } = require('@scalprum/react-core');
 
+    const responseHostA = {
+      ...defaultResponse,
+      subscription_facet_attributes: { uuid: 'uuid-host-A' },
+    };
+
     const { rerender } = render(
-      <CVEsHostDetailsTabWrapper
-        response={{ subscription_facet_attributes: { uuid: 'uuid-host-A' } }}
-      />
+      <MemoryRouter>
+        <CVEsHostDetailsTabWrapper response={responseHostA} />
+      </MemoryRouter>
     );
 
     expect(mockUnmountTracker).not.toHaveBeenCalled();
@@ -58,10 +82,15 @@ describe('CVEsHostDetailsTabWrapper', () => {
       expect.anything()
     );
 
+    const responseHostB = {
+      ...defaultResponse,
+      subscription_facet_attributes: { uuid: 'uuid-host-B' },
+    };
+
     rerender(
-      <CVEsHostDetailsTabWrapper
-        response={{ subscription_facet_attributes: { uuid: 'uuid-host-B' } }}
-      />
+      <MemoryRouter>
+        <CVEsHostDetailsTabWrapper response={responseHostB} />
+      </MemoryRouter>
     );
 
     expect(mockUnmountTracker).toHaveBeenCalledTimes(1);
@@ -70,4 +99,38 @@ describe('CVEsHostDetailsTabWrapper', () => {
       expect.anything()
     );
   });
+
+  it('redirects to Overview when tab should be hidden', () => {
+    const nonRhelResponse = {
+      id: 2,
+      operatingsystem_name: 'Ubuntu 20.04',
+      vulnerability: { enabled: false },
+      subscription_facet_attributes: { uuid: '1-2-3' },
+    };
+
+    const { container } = render(
+      <MemoryRouter>
+        <CVEsHostDetailsTabWrapper response={nonRhelResponse} />
+      </MemoryRouter>
+    );
+
+    expect(mockHistoryReplace).toHaveBeenCalledWith(OVERVIEW_TAB_PATH);
+    expect(
+      container.querySelector(
+        '.rh-cloud-insights-vulnerability-host-details-component'
+      )
+    ).toBeNull();
+  });
+
+  it('does not redirect when host data is not yet loaded', () => {
+    const emptyResponse = { subscription_facet_attributes: { uuid: '1-2-3' } };
+
+    render(
+      <MemoryRouter>
+        <CVEsHostDetailsTabWrapper response={emptyResponse} />
+      </MemoryRouter>
+    );
+
+    expect(mockHistoryReplace).not.toHaveBeenCalled();
+  });
 });

data/webpack/ForemanRhCloudHelpers.js

@@ -1,3 +1,6 @@
+import { useEffect } from 'react';
+import { useHistory } from 'react-router-dom';
+
 /**
  * copied from core, since it's not in the ReactApp folder,
  * it's complicated to import it and mock it in tests.
@@ -5,6 +8,25 @@
  */
 export const foremanUrl = path => `${window.URL_PREFIX}${path}`;
 
+export const OVERVIEW_TAB_PATH = '/Overview';
+
+/**
+ * Redirects to Overview tab when the current tab should be hidden
+ * @param {boolean} shouldRedirect - Whether to redirect (e.g., host loaded AND tab should hide)
+ * @returns {boolean} - Returns shouldRedirect for convenience
+ */
+export const useTabRedirect = shouldRedirect => {
+  const history = useHistory();
+
+  useEffect(() => {
+    if (shouldRedirect && history) {
+      history.replace(OVERVIEW_TAB_PATH);
+    }
+  }, [shouldRedirect, history]);
+
+  return shouldRedirect;
+};
+
 export const isNotRhelHost = ({ hostDetails }) =>
   // This regex tries matches sane variations of "RedHat", "RHEL" and "RHCOS"
   !new RegExp('red[\\s\\-]?hat|rh[\\s\\-]?el|rhc[\\s\\-]?os', 'i').test(

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 }) => {
@@ -165,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} />
@@ -174,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.1.0
+  version: 14.1.1
 platform: ruby
 authors:
 - Foreman Red Hat Cloud team