fix(VULN-2507): Upgrade react-router-dom to v6 (#1905)

Fixes https://issues.redhat.com/browse/VULN-2507. --------- Co-authored-by: Michael Johnson <micjohns@newbeginnings.usersys.redhat.com> Co-authored-by: Georgii Karataev <georgkarat@gmail.com>
RedHatInsights · Sep 11, 2023 · 0406a7e · 0406a7e
1 parent 22e36c3
commit 0406a7e
Show file tree

Hide file tree

Showing 45 changed files with 8,352 additions and 13,788 deletions.
diff --git a/config/cypress.webpack.config.js b/config/cypress.webpack.config.js
@@ -7,6 +7,21 @@ const { config: webpackConfig, plugins } = config({
     rootFolder: resolve(__dirname, '../')
 });
 
+webpackConfig.module.rules.push({
+    resolve: {
+        alias: {
+            '@redhat-cloud-services/frontend-components/useChrome': resolve(
+                __dirname,
+                './overrideChrome.js'
+            ),
+            '../useChrome': resolve(
+                __dirname,
+                './overrideChrome.js'
+            )
+        }
+    }
+});
+
 plugins.push(
     new webpack.DefinePlugin({
         insights: {

diff --git a/config/dev.webpack.config.js b/config/dev.webpack.config.js
@@ -28,7 +28,12 @@ plugins.push(
         exposes: {
             './RootApp': resolve(__dirname, '../src/AppEntry'),
             './SystemDetail': resolve(__dirname, '../src/index.js')
-        }
+        },
+        shared: [
+            {
+                'react-router-dom': { singleton: true, requiredVersion: '*' }
+            }
+        ]
     })
 );
 

diff --git a/config/overrideChrome.js b/config/overrideChrome.js
@@ -0,0 +1,6 @@
+export default () => ({
+    updateDocumentTitle: () => undefined,
+    isBeta: () => true,
+    getApp: () => 'patch',
+    getBundle: () => 'insights'
+});
diff --git a/config/prod.webpack.config.js b/config/prod.webpack.config.js
@@ -13,7 +13,12 @@ plugins.push(
         exposes: {
             './RootApp': resolve(__dirname, '../src/AppEntry'),
             './SystemDetail': resolve(__dirname, '../src/index.js')
-        }
+        },
+        shared: [
+            {
+                'react-router-dom': { singleton: true, requiredVersion: '*' }
+            }
+        ]
     })
 );
 

diff --git a/config/setupTests.js b/config/setupTests.js
@@ -2,6 +2,7 @@ import { configure, mount, render, shallow } from 'enzyme';
 import Adapter from '@wojtekmaj/enzyme-adapter-react-17';
 import React from 'react';
 import 'babel-polyfill';
+import { TextDecoder, TextEncoder } from 'util';
 
 configure({ adapter: new Adapter() });
 
@@ -12,20 +13,22 @@ global.React = React;
 jest.mock('@redhat-cloud-services/frontend-components/useChrome', () => ({
     __esModule: true,
     default: () => ({
-      updateDocumentTitle: jest.fn(),
-      appAction: jest.fn(),
-      appObjectId: jest.fn(),
-      on: jest.fn(),
-      isBeta: jest.fn(),
-      hideGlobalFilter: jest.fn()
+        updateDocumentTitle: jest.fn(),
+        appAction: jest.fn(),
+        appObjectId: jest.fn(),
+        on: () => { },
+        isBeta: jest.fn(),
+        hideGlobalFilter: () => { },
+        getApp: () => 'vulnerability',
+        getBundle: () => 'insights',
     }),
     useChrome: () => ({
-      isBeta: jest.fn(),
-      chrome: jest.fn(),
-      updateDocumentTitle: jest.fn(),
-      hideGlobalFilter: jest.fn()
+        isBeta: jest.fn(),
+        chrome: jest.fn(),
+        updateDocumentTitle: jest.fn(),
+        hideGlobalFilter: jest.fn()
     }),
-  }));
+}));
 
 window.insights = {
     chrome: {
@@ -83,4 +86,30 @@ global.window.__scalprum__ = {
 };
 
 jest.useFakeTimers('modern').setSystemTime(new Date('2020-01-01').getTime());
+
+jest.mock('@redhat-cloud-services/frontend-components/Inventory', () => ({
+    InventoryTable: (props) => <div {...props} />,
+}));
 
+jest.mock('@redhat-cloud-services/frontend-components/AsyncComponent', () => {
+    return {
+        __esModule: true,
+        default: () => (<div>AsyncComponent</div>)
+    };
+});
+
+jest.mock('@redhat-cloud-services/frontend-components-pdf-generator', () => {
+    return {
+        __esModule: true,
+        Section: () => (<div />),
+        Panel: () => (<div />),
+        PanelItem: () => (<div />),
+        InsightsLabel: () => (<div />),
+        Table: () => (<div />),
+        Paragraph: () => (<div />)
+    };
+});
+
+// Required for React 18 but not provided by jsdom env. See: /~https://github.com/jsdom/jsdom/issues/2524
+global.TextEncoder = TextEncoder;
+global.TextDecoder = TextDecoder;