Skip to content

Commit

Permalink
Merged in feature/ui-updates-2023-router (pull request #635)
Browse files Browse the repository at this point in the history 
Ui Library updates
  • Loading branch information
@rmathis
rmathis committed Feb 14, 2023
2 parents 27e63a9 + a44cad5 commit 0cf0e3e
Show file tree
Hide file tree
Showing 64 changed files with 1,443 additions and 1,618 deletions.
1,189 changes: 471 additions & 718 deletions ui/package-lock.json
View file

Large diffs are not rendered by default.

25 changes: 12 additions & 13 deletions ui/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,26 +12,25 @@
"@fortawesome/react-fontawesome": "^0.1.18",
"@reduxjs/toolkit": "^1.9.0",
"@rjsf/core": "^4.1.1",
"bootstrap": "^5.1.3",
"bootstrap": "^5.2.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.34.0",
"react": "^18.2.0",
"react-bootstrap": "^2.7.0",
"react-bootstrap-typeahead": "^6.0.0",
"react-dom": "^18.2.0",
"react-hook-form": "^7.42.1",
"react-infinite-scroll-component": "^6.1.0",
"react-redux": "^8.0.5",
"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",
"react-router": "^6.8.0",
"react-router-dom": "^6.8.0",
"react-scroll": "^1.8.9",
"react-simple-code-editor": "^0.13.1",
"use-http": "^1.0.27",
"use-query-params": "^2.1.2",
"web-vitals": "^2.1.4"
},
"devDependencies": {
Expand Down
92 changes: 9 additions & 83 deletions ui/src/app/App.js
View file
Original file line number Diff line number Diff line change
@@ -1,40 +1,23 @@
import React from 'react';
import {
BrowserRouter as Router,
Redirect,
RouterProvider,
} 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';
import Footer from './core/components/Footer';
import { UserProvider } from './core/user/UserContext';

import { get_cookie } from './core/utility/get_cookie';

import Dashboard from './dashboard/view/Dashboard';
import Header from './core/components/Header';
import { UserProvider } from './core/user/UserContext';
import { Metadata } from './metadata/Metadata';
import { Attribute } from './metadata/Attribute';
import { NotificationList } from './notifications/component/NotificationList';
import { UserConfirmation, ConfirmWindow } from './core/components/UserConfirmation';
import { NewSource } from './metadata/new/NewSource';
import { NewProvider } from './metadata/new/NewProvider';
import { Filter } from './metadata/Filter';
import { Contention } from './metadata/contention/ContentionContext';
import { SessionModal } from './core/user/SessionModal';
import { Roles } from './admin/Roles';
import { Groups } from './admin/Groups';
import { BASE_PATH } from './App.constant';
import { ProtectRoute } from './core/components/ProtectRoute';
import { IdpConfiguration } from './admin/IdpConfiguration';
import { DynamicRegistration } from './dynamic-registration/DynamicRegistration';


import { router } from './App.router';

// import { useBlocker } from './core/hooks/useBlocker';

function App() {

Expand Down Expand Up @@ -68,64 +51,7 @@ function App() {
<Button variant="primary" onClick={() => window.location.reload()}>Log in</Button>
</SessionModal>
<Contention>
<UserConfirmation>
{(message, confirm, confirmCallback, setConfirm, getConfirmation) =>
<Router getUserConfirmation={getConfirmation} basename={BASE_PATH}>
<ConfirmWindow message={message} confirm={confirm} confirmCallback={confirmCallback} setConfirm={setConfirm} />
<QueryParamProvider ReactRouterRoute={Route}>
<Header />
<main className="pad-content">
<Switch>
<Route exact path="/">
<Redirect to="/dashboard" />
</Route>
<Route path="/dashboard" component={Dashboard} />
<Route path="/metadata/source/new" component={NewSource} />
<Route path="/dynamic-registration" render={() =>
<DynamicRegistration />
} />
<Route path="/metadata/provider/new" render={() =>
<ProtectRoute redirectTo="/dashboard">
<NewProvider />
</ProtectRoute>
} />
<Route path="/metadata/attributes" render={() =>
<ProtectRoute redirectTo="/dashboard">
<Attribute />
</ProtectRoute>
} />
<Route path="/metadata/provider/:id/filter" render={() =>
<ProtectRoute redirectTo="/dashboard">
<Filter />
</ProtectRoute>
} />
<Route path="/metadata/:type/:id" component={Metadata} />
<Route path="/roles" render={() =>
<ProtectRoute redirectTo="/dashboard">
<Roles />
</ProtectRoute>
} />
<Route path="/groups" render={() =>
<ProtectRoute redirectTo="/dashboard">
<Groups />
</ProtectRoute>
} />
<Route path="/configurations" render={() =>
<ProtectRoute redirectTo="/dashboard">
<IdpConfiguration />
</ProtectRoute>
} />
<Route path="*">
<Redirect to="/dashboard" />
</Route>
</Switch>
<NotificationList />
</main>
<Footer />
</QueryParamProvider>
</Router>
}
</UserConfirmation>
<RouterProvider router={router} />
</Contention>
</I18nProvider>
</UserProvider>
Expand Down
21 changes: 21 additions & 0 deletions ui/src/app/App.root.js
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
import React from 'react';

import { QueryParamProvider } from 'use-query-params';
import { ReactRouter6Adapter } from 'use-query-params/adapters/react-router-6';
import Header from './core/components/Header';
import Footer from './core/components/Footer';
import { Outlet } from 'react-router';
import { NotificationList } from './notifications/component/NotificationList';

export function Root () {
return (
<QueryParamProvider adapter={ReactRouter6Adapter}>
<Header />
<main className="pad-content">
<Outlet />
<NotificationList />
</main>
<Footer />
</QueryParamProvider>
);
}
Loading

0 comments on commit 0cf0e3e

Please sign in to comment.