Updated libraries

TIER · Apr 21, 2022 · 7d5d84e · 7d5d84e
1 parent df6ded6
commit 7d5d84e
Show file tree

Hide file tree

Showing 90 changed files with 29,355 additions and 30,230 deletions.
diff --git a/ui/.nvmrc b/ui/.nvmrc
@@ -1 +1 @@
-10.15.3
+16.14.2
diff --git a/ui/build.gradle b/ui/build.gradle
@@ -4,8 +4,8 @@ plugins {
 }
 
 node {
-    version = '10.15.3'
-    npmVersion = '6.4.1'
+    version = '16.14.2'
+    npmVersion = '8.5.0'
     download = true
 }
 

diff --git a/ui/package-lock.json b/ui/package-lock.json
diff --git a/ui/package.json b/ui/package.json
@@ -1,144 +1,144 @@
 {
-  "name": "ui",
-  "version": "0.1.0",
-  "private": true,
-  "homepage": ".",
-  "dependencies": {
-    "@fortawesome/fontawesome-free": "^5.15.3",
-    "@fortawesome/fontawesome-svg-core": "^1.2.35",
-    "@fortawesome/free-regular-svg-icons": "^5.15.3",
-    "@fortawesome/free-solid-svg-icons": "^5.15.3",
-    "@fortawesome/react-fontawesome": "^0.1.14",
-    "@rjsf/bootstrap-4": "^2.5.1",
-    "@rjsf/core": "^2.5.1",
-    "bootstrap": "^4.6.0",
-    "date-fns": "^2.21.1",
-    "deep-object-diff": "^1.1.0",
-    "file-saver": "^2.0.5",
-    "lodash": "^4.17.21",
-    "prop-types": "^15.7.2",
-    "query-string": "^7.0.0",
-    "react": "^17.0.2",
-    "react-bootstrap": "^1.5.2",
-    "react-bootstrap-typeahead": "^5.1.4",
-    "react-dom": "^17.0.2",
-    "react-hook-form": "^7.5.2",
-    "react-infinite-scroll-component": "^6.1.0",
-    "react-router-dom": "^5.2.0",
-    "react-scroll": "^1.8.2",
-    "react-simple-code-editor": "^0.11.0",
-    "use-http": "^1.0.20",
-    "use-query-params": "^1.2.2",
-    "web-vitals": "^1.0.1"
-  },
-  "devDependencies": {
-    "@testing-library/jest-dom": "^5.13.0",
-    "@testing-library/react": "^11.2.7",
-    "@testing-library/user-event": "^12.1.10",
-    "fast-check": "^2.16.0",
-    "http-proxy-middleware": "^1.2.0",
-    "jest-fast-check": "^1.0.2",
-    "react-scripts": "4.0.3",
-    "sass": "1.32.11"
-  },
-  "scripts": {
-    "start": "react-scripts start",
-    "build": "GENERATE_SOURCEMAP=true react-scripts build",
-    "buildProd": "react-scripts build && npm run copy",
-    "test": "react-scripts test",
-    "eject": "react-scripts eject",
-    "build:static": "sass src/static.scss ./build/unsecured/static.css",
-    "copy:static": "node ./build",
-    "copy": "npm run copy:static && npm run build:static"
-  },
-  "jest": {
-    "testMatch": [
-      "**/?(*.)+(spec|test).[jt]s?(x)"
-    ],
-    "collectCoverageFrom": [
-      "src/**/*.{js,jsx}",
-      "!src/testing/**/*.*",
-      "!src/*.js"
-    ],
-    "coverageThreshold": {
-      "global": {
-        "branches": 0,
-        "functions": 0,
-        "lines": 0,
-        "statements": 0
-      },
-      "./src/app/i18n/": {
-        "branches": 80,
-        "functions": 80,
-        "lines": 80,
-        "statements": 80
-      },
-      "./src/app/core/": {
-        "branches": 80,
-        "functions": 80,
-        "lines": 80,
-        "statements": 80
-      },
-      "./src/app/metadata/domain/filter/definition": {
-        "branches": 80,
-        "functions": 80,
-        "lines": 80,
-        "statements": 80
-      },
-      "./src/app/metadata/domain/provider/definition/": {
-        "branches": 80,
-        "functions": 80,
-        "lines": 80,
-        "statements": 80
-      },
-      "./src/app/metadata/domain/source/definition/": {
-        "branches": 80,
-        "functions": 80,
-        "lines": 80,
-        "statements": 80
-      },
-      "./src/app/metadata/domain/attribute/": {
-        "branches": 80,
-        "functions": 80,
-        "lines": 80,
-        "statements": 80
-      },
-      "./src/app/metadata/hooks/": {
-        "branches": 50,
-        "functions": 80,
-        "lines": 80,
-        "statements": 80
-      },
-      "./src/app/metadata/contention/": {
-        "branches": 80,
-        "functions": 80,
-        "lines": 80,
-        "statements": 80
-      },
-      "./src/app/metadata/component/": {
-        "branches": 0,
-        "functions": 0,
-        "lines": 0,
-        "statements": 0
-      }
+    "name": "ui",
+    "version": "0.1.0",
+    "private": true,
+    "homepage": ".",
+    "dependencies": {
+        "@fortawesome/fontawesome-free": "^5.15.3",
+        "@fortawesome/fontawesome-svg-core": "^1.2.35",
+        "@fortawesome/free-regular-svg-icons": "^5.15.3",
+        "@fortawesome/free-solid-svg-icons": "^5.15.3",
+        "@fortawesome/react-fontawesome": "^0.1.18",
+        "@rjsf/core": "^4.1.1",
+        "bootstrap": "^5.1.3",
+        "date-fns": "^2.28.0",
+        "deep-object-diff": "^1.1.7",
+        "file-saver": "^2.0.5",
+        "lodash": "^4.17.21",
+        "prop-types": "^15.8.1",
+        "query-string": "^7.1.1",
+        "react": "^18.0.0",
+        "react-bootstrap": "^2.3.0",
+        "react-bootstrap-typeahead": "^5.1.4",
+        "react-dom": "^18.0.0",
+        "react-hook-form": "^7.30.0",
+        "react-infinite-scroll-component": "^6.1.0",
+        "react-router": "^5.1.0",
+        "react-router-dom": "^5.1.0",
+        "react-scroll": "^1.8.7",
+        "react-simple-code-editor": "^0.11.0",
+        "use-http": "^1.0.26",
+        "use-query-params": "^1.2.3",
+        "web-vitals": "^2.1.4"
+    },
+    "devDependencies": {
+        "@testing-library/jest-dom": "^5.16.4",
+        "@testing-library/react": "^13.1.1",
+        "@testing-library/user-event": "^14.1.1",
+        "fast-check": "^2.24.0",
+        "http-proxy-middleware": "^2.0.6",
+        "jest-fast-check": "^1.0.2",
+        "react-scripts": "5.0.1",
+        "sass": "1.50.1"
+    },
+    "scripts": {
+        "start": "BROWSER=none react-scripts start",
+        "build": "GENERATE_SOURCEMAP=true react-scripts build",
+        "buildProd": "react-scripts build && npm run copy",
+        "test": "react-scripts test",
+        "eject": "react-scripts eject",
+        "build:static": "sass src/static.scss ./build/unsecured/static.css",
+        "copy:static": "node ./build",
+        "copy": "npm run copy:static && npm run build:static"
+    },
+    "jest": {
+        "testMatch": [
+            "**/?(*.)+(spec|test).[jt]s?(x)"
+        ],
+        "collectCoverageFrom": [
+            "src/**/*.{js,jsx}",
+            "!src/testing/**/*.*",
+            "!src/*.js"
+        ],
+        "coverageThreshold": {
+            "global": {
+                "branches": 0,
+                "functions": 0,
+                "lines": 0,
+                "statements": 0
+            },
+            "./src/app/i18n/": {
+                "branches": 80,
+                "functions": 80,
+                "lines": 80,
+                "statements": 80
+            },
+            "./src/app/core/": {
+                "branches": 80,
+                "functions": 80,
+                "lines": 80,
+                "statements": 80
+            },
+            "./src/app/metadata/domain/filter/definition": {
+                "branches": 80,
+                "functions": 80,
+                "lines": 80,
+                "statements": 80
+            },
+            "./src/app/metadata/domain/provider/definition/": {
+                "branches": 80,
+                "functions": 80,
+                "lines": 80,
+                "statements": 80
+            },
+            "./src/app/metadata/domain/source/definition/": {
+                "branches": 80,
+                "functions": 80,
+                "lines": 80,
+                "statements": 80
+            },
+            "./src/app/metadata/domain/attribute/": {
+                "branches": 80,
+                "functions": 80,
+                "lines": 80,
+                "statements": 80
+            },
+            "./src/app/metadata/hooks/": {
+                "branches": 50,
+                "functions": 80,
+                "lines": 80,
+                "statements": 80
+            },
+            "./src/app/metadata/contention/": {
+                "branches": 80,
+                "functions": 80,
+                "lines": 80,
+                "statements": 80
+            },
+            "./src/app/metadata/component/": {
+                "branches": 0,
+                "functions": 0,
+                "lines": 0,
+                "statements": 0
+            }
+        }
+    },
+    "eslintConfig": {
+        "extends": [
+            "react-app",
+            "react-app/jest"
+        ]
+    },
+    "browserslist": {
+        "production": [
+            ">0.2%",
+            "not dead",
+            "not op_mini all"
+        ],
+        "development": [
+            "last 1 chrome version",
+            "last 1 firefox version",
+            "last 1 safari version"
+        ]
     }
-  },
-  "eslintConfig": {
-    "extends": [
-      "react-app",
-      "react-app/jest"
-    ]
-  },
-  "browserslist": {
-    "production": [
-      ">0.2%",
-      "not dead",
-      "not op_mini all"
-    ],
-    "development": [
-      "last 1 chrome version",
-      "last 1 firefox version",
-      "last 1 safari version"
-    ]
-  }
 }
diff --git a/ui/src/app/App.js b/ui/src/app/App.js
@@ -1,12 +1,16 @@
 import React from 'react';
 import {
     BrowserRouter as Router,
-    Switch,
     Redirect,
-    Route
 } from "react-router-dom";
+
+import {
+    Switch,
+    Route,
+} from "react-router";
 import { QueryParamProvider } from 'use-query-params';
 import { Provider as HttpProvider } from 'use-http';
+import Button from 'react-bootstrap/Button';
 
 import './App.scss';
 import { I18nProvider } from './i18n/context/I18n.provider';
@@ -27,7 +31,6 @@ import { Filter } from './metadata/Filter';
 import { Contention } from './metadata/contention/ContentionContext';
 import { SessionModal } from './core/user/SessionModal';
 import { Roles } from './admin/Roles';
-import Button from 'react-bootstrap/Button';
 import { Groups } from './admin/Groups';
 import { BASE_PATH } from './App.constant';
 

diff --git a/ui/src/app/admin/Groups.js b/ui/src/app/admin/Groups.js
@@ -25,7 +25,9 @@ export function Groups() {
                 <Route path={`${path}/:id/edit`} render={() =>
                     <EditGroup />
                 } />
-                <Redirect exact path={`${path}`} to={`${path}/list`} />
+                <Route path={`${path}`} exact render={
+                    <Redirect to={`${path}/list`} />
+                } />
             </Switch>
         </>
     );

diff --git a/ui/src/app/admin/Roles.js b/ui/src/app/admin/Roles.js
@@ -25,7 +25,9 @@ export function Roles() {
                 <Route path={`${path}/:id/edit`} render={() =>
                     <EditRole />
                 } />
-                <Redirect exact path={`${path}`} to={`${path}/list`} />
+                <Route path={`${path}`} exact render={() => 
+                    <Redirect to={`${path}/list`} />
+                } />
             </Switch>
         </>
     );

diff --git a/ui/src/app/admin/component/AccessRequest.js b/ui/src/app/admin/component/AccessRequest.js
@@ -21,22 +21,22 @@ export function AccessRequest({ users, roles, onDeleteUser, onChangeUserRole })
                 <div className="row align-items-center">
                     <div className="col-10">
                         <div className="row">
-                            <div className="col text-right font-weight-bold">
+                            <div className="col text-end font-weight-bold">
                                 <Translate value="label.user-id">UserId</Translate>
                             </div>
                             <div className="col">{ user.username }</div>
-                            <div className="col text-right font-weight-bold">
+                            <div className="col text-end font-weight-bold">
                                 <Translate value="label.email">Email</Translate>
                             </div>
                             <div className="col">{ user.emailAddress }</div>
                         </div>
                         <div className="w-100 my-1"></div>
                         <div className="row">
-                            <div className="col text-right font-weight-bold" >
+                            <div className="col text-end font-weight-bold" >
                                 <Translate value="label.name">Name</Translate>
                             </div>
                             <div className="col">{ user.firstName } { user.lastName }</div>
-                            <label htmlFor={`role-${i}`} className="d-block col text-right font-weight-bold" >
+                            <label htmlFor={`role-${i}`} className="d-block col text-end font-weight-bold" >
                                 <Translate value="label.role">Role</Translate>
                             </label>
                             <div className="col">
@@ -49,7 +49,7 @@ export function AccessRequest({ users, roles, onDeleteUser, onChangeUserRole })
                             </div>
                         </div>
                     </div>
-                    <div className="col-2 text-right">
+                    <div className="col-2 text-end">
                         <Button variant="danger" size="sm" onClick={() => onDeleteUser(user.username)}>
                             <i className="fa fa-trash fa-lg"></i>
                             &nbsp;