DISPATCH-2234: Update JavaScript console packages for the 1.19.0 rele…

…ase (#1517) * Error: A <Route> is only ever to be used as the child of <Routes> element, never rendered directly. Please wrap your <Route> in a <Routes>. * Error: You cannot render a <Router> inside another <Router>. You should never have more than one in your app. See https://reactrouter.com/docs/en/v6/upgrading/v5, and therein linked https://gist.github.com/mjackson/d54b40a094277b7afdd6b81f51a0393f * BREAKING CHANGE: webpack < 5 used to include polyfills for node.js core modules by default. * Module not found: Error: Can't resolve 'os' in '/home/jdanek/repos/qpid/qpid-dispatch/console/react/node_modules/rhea/lib' * facebook/create-react-app#11756 * downgraded and filled amqp/rhea#379
apache · Feb 17, 2022 · 25261f4 · 25261f4
1 parent 4c8008b
commit 25261f4
Show file tree

Hide file tree

Showing 11 changed files with 5,076 additions and 5,985 deletions.
diff --git a/console/react/package-lock.json b/console/react/package-lock.json
diff --git a/console/react/package.json b/console/react/package.json
@@ -1,25 +1,25 @@
 {
   "name": "dispatch-console",
-  "version": "1.17.0",
+  "version": "1.19.0",
   "private": true,
   "dependencies": {
-    "@patternfly/patternfly": "^4.125.3",
-    "@patternfly/react-charts": "^6.15.14",
-    "@patternfly/react-core": "^4.147.0",
-    "@patternfly/react-icons": "^4.11.8",
-    "@patternfly/react-styles": "^4.11.8",
-    "@patternfly/react-table": "^4.29.37",
-    "@patternfly/react-topology": "^4.9.42",
+    "@patternfly/patternfly": "^4.171.1",
+    "@patternfly/react-charts": "^6.45.15",
+    "@patternfly/react-core": "^4.192.15",
+    "@patternfly/react-icons": "^4.43.15",
+    "@patternfly/react-styles": "^4.42.15",
+    "@patternfly/react-table": "^4.61.15",
+    "@patternfly/react-topology": "^4.39.15",
     "d3": "^3.5.17",
     "d3-queue": "^3.0.7",
-    "express": "^4.17.1",
+    "express": "^4.17.2",
     "font-awesome": "^4.7.0",
-    "prop-types": "^15.7.2",
+    "prop-types": "^15.8.1",
     "react": "^17.0.2",
     "react-dom": "^17.0.2",
     "react-fontawesome": "^1.7.1",
-    "react-router-dom": "^5.2.0",
-    "rhea": "^2.0.4",
+    "react-router-dom": "^6.2.1",
+    "rhea": "^3.0.0",
     "topojson-client": "^3.1.0"
   },
   "scripts": {
@@ -59,14 +59,14 @@
   },
   "devDependencies": {
     "@react-mock/localstorage": "^0.1.2",
-    "@testing-library/jest-dom": "^5.14.1",
-    "@testing-library/react": "^12.0.0",
-    "@types/jest": "^27.0.1",
-    "body-parser": "^1.19.0",
-    "browserslist": "^4.16.8",
+    "@testing-library/jest-dom": "^5.16.2",
+    "@testing-library/react": "^12.1.3",
+    "@types/jest": "^27.4.0",
+    "body-parser": "^1.19.2",
+    "browserslist": "^4.19.1",
     "jest-axe": "^5.0.1",
-    "prettier": "^2.3.2",
+    "prettier": "^2.5.1",
     "react-scripts": "^4.0.3",
-    "typescript": "^4.3.5"
+    "typescript": "^4.5.5"
   }
 }
diff --git a/console/react/src/App.js b/console/react/src/App.js
@@ -17,8 +17,9 @@ specific language governing permissions and limitations
 under the License.
 */
 
-import React, { Component } from "react";
-import { HashRouter as Router, Route } from "react-router-dom";
+import React from "react";
+import { unstable_HistoryRouter as HistoryRouter } from "react-router-dom";
+import { createHashHistory } from "history";
 
 import "@patternfly/patternfly/patternfly.css";
 import "@patternfly/patternfly/patternfly-addons.css";
@@ -28,26 +29,22 @@ import "@patternfly/patternfly/components/Nav/nav.css";
 import { QDRService } from "./common/qdrService";
 import "./App.css";
 import PageLayout from "./overview/dashboard/layout";
-class App extends Component {
-  state = {};
-
-  render() {
-    // service is passed in to make testing easier
-    const service = new QDRService();
-    // also, a router is used here to provide PageLayout with a history property
-    return (
-      <Router>
-        <div className="App pf-m-redhat-font">
-          <Route
-            path="/"
-            render={props => (
-              <PageLayout service={service} {...props} config={this.props.config} />
-            )}
-          />
-        </div>
-      </Router>
-    );
-  }
+
+function App(props) {
+
+  // service is passed in to make testing easier
+  const service = new QDRService();
+
+  // also, a router is used here to provide PageLayout with a history property
+  const history = createHashHistory({ window });
+
+  return (
+    <HistoryRouter history={history}>
+      <div className="App pf-m-redhat-font">
+        <PageLayout service={service} {...props} history={history} config={props.config}/>
+      </div>
+    </HistoryRouter>
+  );
 }
 
 export default App;
diff --git a/console/react/src/details/createTablePage.js b/console/react/src/details/createTablePage.js
@@ -43,7 +43,7 @@ import {
 
 import { cellWidth } from "@patternfly/react-table";
 import { Card, CardBody } from "@patternfly/react-core";
-import { Redirect } from "react-router-dom";
+import { Navigate } from "react-router-dom";
 import { dataMap as detailsDataMap, defaultData } from "./entityData";
 
 class CreateTablePage extends React.Component {
@@ -263,7 +263,7 @@ class CreateTablePage extends React.Component {
   render() {
     if (this.state.redirect) {
       return (
-        <Redirect
+        <Navigate
           to={{
             pathname: this.state.redirectPath,
             state: this.state.redirectState

diff --git a/console/react/src/details/detailsTablePage.js b/console/react/src/details/detailsTablePage.js
@@ -37,7 +37,7 @@ import {
   TableVariant
 } from "@patternfly/react-table";
 import { Card, CardBody } from "@patternfly/react-core";
-import { Redirect } from "react-router-dom";
+import { Navigate } from "react-router-dom";
 import { dataMap } from "../overview/entityData";
 import { dataMap as detailsDataMap, defaultData } from "./entityData";
 import Updated from "../common/updated";
@@ -171,7 +171,7 @@ class DetailsTablePage extends React.Component {
   render() {
     if (this.state.redirect) {
       return (
-        <Redirect
+        <Navigate
           to={{
             pathname: this.state.redirectPath,
             state: this.state.redirectState

diff --git a/console/react/src/details/entityListTable.js b/console/react/src/details/entityListTable.js
@@ -27,7 +27,7 @@ import {
   TableVariant
 } from "@patternfly/react-table";
 import { Button, Pagination } from "@patternfly/react-core";
-import { Redirect } from "react-router-dom";
+import { Navigate } from "react-router-dom";
 import TableToolbar from "../common/tableToolbar";
 import { dataMap, defaultData } from "./entityData";
 import EmptyTable from "./emptyTablePage";
@@ -402,7 +402,7 @@ class EntityListTable extends React.Component {
 
     if (this.state.redirect) {
       return (
-        <Redirect
+        <Navigate
           to={{
             pathname: this.dataSource.detailPath || "/details",
             state: this.state.redirectState

diff --git a/console/react/src/details/updateTablePage.js b/console/react/src/details/updateTablePage.js
@@ -43,7 +43,7 @@ import {
 
 import { cellWidth } from "@patternfly/react-table";
 import { Card, CardBody } from "@patternfly/react-core";
-import { Redirect } from "react-router-dom";
+import { Navigate } from "react-router-dom";
 import { dataMap as detailsDataMap, defaultData } from "./entityData";
 import { utils } from "../common/amqp/utilities";
 
@@ -270,7 +270,7 @@ class UpdateTablePage extends React.Component {
   render() {
     if (this.state.redirect) {
       return (
-        <Redirect
+        <Navigate
           to={{
             pathname: this.state.redirectPath,
             state: this.state.redirectState