Fixed routes

TIER · Apr 22, 2022 · d223253 · d223253
1 parent 31e96be
commit d223253
Show file tree

Hide file tree

Showing 12 changed files with 71 additions and 73 deletions.
diff --git a/ui/package-lock.json b/ui/package-lock.json
diff --git a/ui/package.json b/ui/package.json
@@ -4,10 +4,10 @@
     "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/fontawesome-free": "^6.1.1",
+        "@fortawesome/fontawesome-svg-core": "^6.1.1",
+        "@fortawesome/free-regular-svg-icons": "^6.1.1",
+        "@fortawesome/free-solid-svg-icons": "^6.1.1",
         "@fortawesome/react-fontawesome": "^0.1.18",
         "@rjsf/core": "^4.1.1",
         "bootstrap": "^5.1.3",

diff --git a/ui/src/app/admin/Groups.js b/ui/src/app/admin/Groups.js
@@ -7,7 +7,7 @@ import { GroupsList } from './container/GroupsList';
 
 export function Groups() {
 
-    let { path } = useRouteMatch();
+    let { path, url } = useRouteMatch();
 
     return (
         <>
@@ -26,7 +26,7 @@ export function Groups() {
                     <EditGroup />
                 } />
                 <Route path={`${path}`} exact render={
-                    <Redirect to={`${path}/list`} />
+                    <Redirect to={`${url}/list`} />
                 } />
             </Switch>
         </>

diff --git a/ui/src/app/admin/Roles.js b/ui/src/app/admin/Roles.js
@@ -7,7 +7,7 @@ import { RoleList } from './container/RoleList';
 
 export function Roles() {
 
-    let { path } = useRouteMatch();
+    let { path, url } = useRouteMatch();
 
     return (
         <>
@@ -26,7 +26,7 @@ export function Roles() {
                     <EditRole />
                 } />
                 <Route path={`${path}`} exact render={() => 
-                    <Redirect to={`${path}/list`} />
+                    <Redirect to={`${url}/list`} />
                 } />
             </Switch>
         </>

diff --git a/ui/src/app/dashboard/view/Dashboard.js b/ui/src/app/dashboard/view/Dashboard.js
@@ -20,7 +20,7 @@ import { faSpinner } from '@fortawesome/free-solid-svg-icons';
 
 export function Dashboard () {
 
-    const { path } = useRouteMatch();
+    const { path, url } = useRouteMatch();
     const location = useLocation();
 
     const isAdmin = useIsAdmin();
@@ -97,7 +97,7 @@ export function Dashboard () {
             </Nav>
             <Switch>
                 <Route exact path={`${path}`}>
-                    <Redirect to={`${path}/metadata/manager/resolvers`} />
+                    <Redirect to={`${url}/metadata/manager/resolvers`} />
                 </Route>
                 <Route path={`${path}/metadata/manager/resolvers`} component={SourcesTab} />
                 <Route path={`${path}/metadata/manager/providers`} component={ProvidersTab} />

diff --git a/ui/src/app/metadata/Attribute.js b/ui/src/app/metadata/Attribute.js
@@ -10,7 +10,7 @@ import { MetadataAttributeBundleEdit } from './view/MetadataAttributeBundleEdit'
 
 export function Attribute() {
 
-    let { path } = useRouteMatch();
+    let { path, url } = useRouteMatch();
 
     return (
         <Switch>
@@ -37,7 +37,7 @@ export function Attribute() {
                 <MetadataAttributeBundleEdit />
             } />
             <Route exact path={`${path}`} render={() =>
-                <Redirect to={`${path}/list`} />
+                <Redirect to={`${url}/list`} />
             } />
         </Switch>
     );

diff --git a/ui/src/app/metadata/Filter.js b/ui/src/app/metadata/Filter.js
@@ -9,7 +9,7 @@ import { EditFilter } from './view/EditFilter';
 
 export function Filter() {
 
-    const { path } = useRouteMatch();
+    const { path, url } = useRouteMatch();
 
     return (
         <Switch>
@@ -31,7 +31,7 @@ export function Filter() {
                 </MetadataFilterSelector>
             } />
             <Route exact path={`${path}/new`} render={() =>
-                <Redirect to={`${path}/new/common`} />
+                <Redirect to={`${url}/new/common`} />
             } />
         </Switch>
     );

diff --git a/ui/src/app/metadata/Metadata.js b/ui/src/app/metadata/Metadata.js
@@ -15,7 +15,7 @@ import { MetadataConfirmRestore } from './view/MetadataConfirmRestore';
 
 export function Metadata () {
 
-    let { path } = useRouteMatch();
+    const { url, path } = useRouteMatch();
 
     return (
         <MetadataSelector>
@@ -57,9 +57,9 @@ export function Metadata () {
                             <Route path={`${path}/restore/:versionId/:section/edit`} render={() =>
                                 <MetadataRestore />
                             } />
-                            <Route exact path={`${path}`} render={() =>
-                                <Redirect to={`${path}/configuration/options`} />
-                            } />
+                            {<Route exact path={`${path}`} render={() =>
+                                <Redirect to={`${url}/configuration/options`} />
+                            } />}
                         </Switch>
                     </MetadataSchema>
                 </MetadataXmlLoader>

diff --git a/ui/src/app/metadata/domain/source/component/SourceList.js b/ui/src/app/metadata/domain/source/component/SourceList.js
@@ -80,7 +80,7 @@ export default function SourceList({ entities, onDelete, onEnable, onChangeGroup
                                             {isAdmin && onChangeGroup &&
                                                 <td className="align-middle">
                                                     <label htmlFor={`group-${source.serviceProviderName}`} className="sr-only"><Translate value="action.source-group">Group</Translate></label>
-                                                    <select
+                                                    <Form.Select
                                                         id={`group-${source.id}`}
                                                         name={`group-${source.id}`}
                                                         className="form-control"
@@ -92,7 +92,7 @@ export default function SourceList({ entities, onDelete, onEnable, onChangeGroup
                                                         {groups.map((g, ridx) => (
                                                             <option key={ridx} value={g.resourceId}>{g.name}</option>
                                                         ))}
-                                                    </select>
+                                                    </Form.Select>
                                                 </td>
                                             }
                                             {onDelete && isAdmin &&

diff --git a/ui/src/app/metadata/editor/MetadataEditor.js b/ui/src/app/metadata/editor/MetadataEditor.js
@@ -28,8 +28,6 @@ export function MetadataEditor ({ restore, current, reload }) {
 
     const { type, id, section } = useParams();
 
-    console.log(type, id);
-
     const { update, loading } = useMetadataUpdater(`${ API_BASE_PATH }${getMetadataPath(type)}`, current, reload);
 
     const notificationDispatch = useNotificationDispatcher();
@@ -72,6 +70,8 @@ export function MetadataEditor ({ restore, current, reload }) {
 
     const gotoDetail = (state = null) => {
         setBlocking(false);
+
+        console.log(`/metadata/${type}/${id}`);
         history.push(`/metadata/${type}/${id}`, state);
     };
 

diff --git a/ui/src/app/metadata/new/NewSource.js b/ui/src/app/metadata/new/NewSource.js
@@ -10,7 +10,7 @@ import { faCopy, faLink, faPlusSquare } from '@fortawesome/free-solid-svg-icons'
 
 export function NewSource() {
 
-    const { path } = useRouteMatch();
+    const { path, url } = useRouteMatch();
 
     const [showNav, setShowNav] = React.useState(true);
 
@@ -87,7 +87,7 @@ export function NewSource() {
                                 <MetadataCopy onShowNav={ (s) => { setShowNav(s) } } />
                             } />
                             <Route exact path={`${path}`} render={() =>
-                                <Redirect to={`${path}/blank`} />
+                                <Redirect to={`${url}/blank`} />
                             } />
                         </Switch>
                     </MetadataSchema>

diff --git a/ui/src/index.js b/ui/src/index.js
@@ -1,17 +1,15 @@
 import React from 'react';
-import ReactDOM from 'react-dom';
 import './index.scss';
 import App from './app/App';
-import reportWebVitals from './reportWebVitals';
+import { createRoot } from 'react-dom/client';
+
+const container = document.getElementById('root');
+const root = createRoot(container);
+
+root.render(<App />);
 
-ReactDOM.render(
-    <React.Fragment>
-        <App />
-    </React.Fragment>,
-    document.getElementById('root')
-);
 
 // If you want to start measuring performance in your app, pass a function
 // to log results (for example: reportWebVitals(console.log))
 // or send to an analytics endpoint. Learn more: https://bit.ly/CRA-vitals
-reportWebVitals();
+// reportWebVitals();