foreman_rh_cloud 13.2.5 → 13.2.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 57ce80b0bae4a115918ce35f98537e6b1c300b01c8b6ccf17f472b9249068754
-  data.tar.gz: 2068954bb5a0d6ae8c8a3463eb56fa6ef7d62340d6b8b874517e9667253db360
+  metadata.gz: 59eab13298515d3f87c52f499b2d79522b5455985ed8c2652400df1790fe7133
+  data.tar.gz: 14f62161dbd0e8b635b9d7728f41d121c6be2b76cc042b4c7168d20ca2376641
 SHA512:
-  metadata.gz: 1a96441f4ab3b127d838b29ed8c763c23d2b4e1ade1bcf10739f411018da0506c58b9b044806aec9d977c4c90a83820cc625f58b96a03104302ba244a2db9e2e
-  data.tar.gz: def92bf339332df4f82f2716996e57df7774856459dcdf626497c97b8dfc887ae39a7a0a9979e4f5efda0d53f201ac3500f12c19eb99ab6964e0ae0e95e7fe3e
+  metadata.gz: 2da9750fa293b99a458766c2b08ed045f1d39c07f5275918d8900f146764226654579a92ced0fe033666faf94e4067b8522e2991c19522be5bd067e6f705ef68
+  data.tar.gz: e3a262a6166e9c4c5901f4c57d052b24c405756ed0a71acfb3dd71d62a66e99f09d6ff5f0df904d3a932c68d58204466689a587d1c1f723a27e769b9c9789234

data/lib/foreman_rh_cloud/version.rb

@@ -1,3 +1,3 @@
 module ForemanRhCloud
-  VERSION = '13.2.5'.freeze
+  VERSION = '13.2.7'.freeze
 end

data/package.json

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

data/webpack/CVEsHostDetailsTab/CVEsHostDetailsTab.js

@@ -10,7 +10,12 @@ const CVEsHostDetailsTab = ({ systemId }) => {
   const module = './SystemDetailTable';
   return (
     <div className="rh-cloud-insights-vulnerability-host-details-component vulnerability">
-      <ScalprumComponent scope={scope} module={module} systemId={systemId} />
+      <ScalprumComponent
+        key={systemId}
+        scope={scope}
+        module={module}
+        systemId={systemId}
+      />
     </div>
   );
 };

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

@@ -11,14 +11,25 @@ jest.mock('foremanReact/Root/Context/ForemanContext', () => ({
   useForemanPermissions: () => new Set(['view_vulnerability']),
 }));
 
-jest.mock('@scalprum/react-core', () => ({
-  ScalprumComponent: jest.fn(props => (
-    <div data-testid="mock-scalprum-component">{JSON.stringify(props)}</div>
-  )),
-  ScalprumProvider: jest.fn(({ children }) => <div>{children}</div>),
-}));
+const mockUnmountTracker = jest.fn();
+jest.mock('@scalprum/react-core', () => {
+  const ReactMock = require('react');
+  return {
+    ScalprumComponent: jest.fn(props => {
+      ReactMock.useEffect(() => mockUnmountTracker, []);
+      return (
+        <div data-testid="mock-scalprum-component">{JSON.stringify(props)}</div>
+      );
+    }),
+    ScalprumProvider: jest.fn(({ children }) => <div>{children}</div>),
+  };
+});
 
 describe('CVEsHostDetailsTabWrapper', () => {
+  beforeEach(() => {
+    jest.clearAllMocks();
+  });
+
   it('renders without crashing', () => {
     const { container } = render(
       <CVEsHostDetailsTabWrapper
@@ -31,4 +42,32 @@ describe('CVEsHostDetailsTabWrapper', () => {
       )
     ).toBeTruthy();
   });
+
+  it('remounts ScalprumComponent when systemId changes', () => {
+    const { ScalprumComponent } = require('@scalprum/react-core');
+
+    const { rerender } = render(
+      <CVEsHostDetailsTabWrapper
+        response={{ subscription_facet_attributes: { uuid: 'uuid-host-A' } }}
+      />
+    );
+
+    expect(mockUnmountTracker).not.toHaveBeenCalled();
+    expect(ScalprumComponent).toHaveBeenLastCalledWith(
+      expect.objectContaining({ systemId: 'uuid-host-A' }),
+      expect.anything()
+    );
+
+    rerender(
+      <CVEsHostDetailsTabWrapper
+        response={{ subscription_facet_attributes: { uuid: 'uuid-host-B' } }}
+      />
+    );
+
+    expect(mockUnmountTracker).toHaveBeenCalledTimes(1);
+    expect(ScalprumComponent).toHaveBeenLastCalledWith(
+      expect.objectContaining({ systemId: 'uuid-host-B' }),
+      expect.anything()
+    );
+  });
 });

data/webpack/InsightsHostDetailsTab/NewHostDetailsTab.js

@@ -33,13 +33,28 @@ const NewHostDetailsTab = ({ hostName, router }) => {
   const hits = useSelector(selectHits);
   const isIop = useIopConfig();
 
-  useEffect(() => () => router.replace({ search: null }), [router]);
+  useEffect(
+    () => () => {
+      // Preserve hash when clearing search params to prevent tab navigation bugs
+      if (router && typeof router.replace === 'function') {
+        const replaceOptions = { search: null };
+        if (router.location && router.location.hash) {
+          replaceOptions.hash = router.location.hash;
+        }
+        router.replace(replaceOptions);
+      }
+    },
+    [router]
+  );
 
   const onSearch = q => dispatch(fetchInsights({ query: q, page: 1 }));
 
   const [isDropdownOpen, setIsDropdownOpen] = useState(false);
-  const onSatInsightsClick = () =>
-    router.push({ pathname: '/foreman_rh_cloud/insights_cloud' });
+  const onSatInsightsClick = () => {
+    if (router && typeof router.push === 'function') {
+      router.push({ pathname: '/foreman_rh_cloud/insights_cloud' });
+    }
+  };
 
   const dropdownItems = [
     <DropdownItem key="insights-link" ouiaId="insights-link">
@@ -113,17 +128,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();

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

@@ -0,0 +1,154 @@
+import React from 'react';
+import { render } from '@testing-library/react';
+import '@testing-library/jest-dom';
+import { Provider } from 'react-redux';
+import configureMockStore from 'redux-mock-store';
+import thunk from 'redux-thunk';
+import NewHostDetailsTab from '../NewHostDetailsTab';
+
+jest.mock('../../common/Hooks/ConfigHooks', () => ({
+  useIopConfig: jest.fn(() => false),
+}));
+
+jest.mock('foremanReact/common/I18n', () => ({
+  translate: jest.fn(str => str),
+}));
+
+const mockStore = configureMockStore([thunk]);
+
+describe('NewHostDetailsTab', () => {
+  let store;
+  let mockRouter;
+
+  beforeEach(() => {
+    mockRouter = {
+      push: jest.fn(),
+      replace: jest.fn(),
+      location: {
+        pathname: '/new/hosts/test-host.example.com',
+        search: '?page=1&per_page=20',
+        hash: '#/Insights',
+        query: { page: '1', per_page: '20' },
+      },
+    };
+
+    store = mockStore({
+      API: {},
+      ForemanRhCloud: {
+        InsightsCloudSync: {
+          table: {
+            selectedIds: {},
+            isAllSelected: false,
+            showSelectAllAlert: false,
+          },
+        },
+      },
+      insightsHostDetailsTab: {
+        query: '',
+        hits: [],
+        selectedIds: {},
+        error: null,
+      },
+      router: {
+        location: {
+          pathname: '/new/hosts/test-host.example.com',
+          search: '?page=1&per_page=20',
+          hash: '#/Insights',
+          query: { page: '1', per_page: '20' },
+        },
+      },
+    });
+  });
+
+  afterEach(() => {
+    jest.clearAllMocks();
+  });
+
+  describe('cleanup effect', () => {
+    it('should preserve hash when clearing search params on unmount', () => {
+      const { unmount } = render(
+        <Provider store={store}>
+          <NewHostDetailsTab
+            hostName="test-host.example.com"
+            router={mockRouter}
+          />
+        </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',
+      });
+    });
+
+    it('should only clear search params when no hash exists', () => {
+      mockRouter.location.hash = '';
+
+      const { unmount } = render(
+        <Provider store={store}>
+          <NewHostDetailsTab
+            hostName="test-host.example.com"
+            router={mockRouter}
+          />
+        </Provider>
+      );
+
+      unmount();
+
+      // When there's no hash, should only pass search: null
+      expect(mockRouter.replace).toHaveBeenCalledWith({
+        search: null,
+      });
+    });
+
+    it('should handle router.location being undefined gracefully', () => {
+      const routerWithoutLocation = {
+        push: jest.fn(),
+        replace: jest.fn(),
+        location: undefined,
+      };
+
+      const { unmount } = render(
+        <Provider store={store}>
+          <NewHostDetailsTab
+            hostName="test-host.example.com"
+            router={routerWithoutLocation}
+          />
+        </Provider>
+      );
+
+      unmount();
+
+      // Should still call replace with search: null even if location is undefined
+      expect(routerWithoutLocation.replace).toHaveBeenCalledWith({
+        search: null,
+      });
+    });
+
+    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}
+          />
+        </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',
+      });
+    });
+  });
+});

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: foreman_rh_cloud
 version: !ruby/object:Gem::Version
-  version: 13.2.5
+  version: 13.2.7
 platform: ruby
 authors:
 - Foreman Red Hat Cloud team
@@ -586,6 +586,7 @@ files:
 - webpack/InsightsHostDetailsTab/__tests__/InsightsTabReducer.test.js
 - webpack/InsightsHostDetailsTab/__tests__/InsightsTabSelectors.test.js
 - webpack/InsightsHostDetailsTab/__tests__/InsightsTotalRiskChart.test.js
+- webpack/InsightsHostDetailsTab/__tests__/NewHostDetailsTab.test.js
 - webpack/InsightsHostDetailsTab/__tests__/__snapshots__/InsightsTab.test.js.snap
 - webpack/InsightsHostDetailsTab/__tests__/__snapshots__/InsightsTabActions.test.js.snap
 - webpack/InsightsHostDetailsTab/__tests__/__snapshots__/InsightsTabReducer.test.js.snap
@@ -668,7 +669,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 4.0.3
+rubygems_version: 4.0.6
 specification_version: 4
 summary: Summary of ForemanRhCloud.
 test_files: