diff options
Diffstat (limited to 'sdnr/wt/odlux/framework/src/views')
-rw-r--r-- | sdnr/wt/odlux/framework/src/views/about.tsx | 6 | ||||
-rw-r--r-- | sdnr/wt/odlux/framework/src/views/frame.tsx | 7 |
2 files changed, 6 insertions, 7 deletions
diff --git a/sdnr/wt/odlux/framework/src/views/about.tsx b/sdnr/wt/odlux/framework/src/views/about.tsx index 937e74f33..9fe48ca38 100644 --- a/sdnr/wt/odlux/framework/src/views/about.tsx +++ b/sdnr/wt/odlux/framework/src/views/about.tsx @@ -34,11 +34,9 @@ type OdluxVersion= {version:string,build:string, framework: string, faultApp: string, helpApp: string, inventoryApp: string, - linkCalculationApp: string, maintenanceApp: string, mediatorApp: string, - networkMapApp: string, - permanceHistoryApp: string + permanceHistoryApp: string, }}; type TopologyVersion = {version: string, buildTimestamp: string}; @@ -70,8 +68,6 @@ const AboutComponent: FC = (props) => { `| InventoryApp | ${data.applications.inventoryApp}|\n `+ `| EventLogApp | ${data.applications.eventLogApp}|\n `+ `| MediatorApp | ${data.applications.mediatorApp}|\n `+ - `| NetworkMapApp | ${data.applications.networkMapApp}|\n `+ - `| LinkCalculatorApp | ${data.applications.linkCalculationApp}|\n `+ `| HelpApp | ${data.applications.helpApp}|\n `; } diff --git a/sdnr/wt/odlux/framework/src/views/frame.tsx b/sdnr/wt/odlux/framework/src/views/frame.tsx index 4a93cf0ae..2c9f8c033 100644 --- a/sdnr/wt/odlux/framework/src/views/frame.tsx +++ b/sdnr/wt/odlux/framework/src/views/frame.tsx @@ -16,7 +16,7 @@ * ============LICENSE_END========================================================================== */ import React, { FC, memo } from 'react'; -import { HashRouter as Router, Route, Redirect, Switch } from 'react-router-dom'; +import { Router, Route, Redirect, Switch } from 'react-router-dom'; import { Theme } from '@mui/material/styles'; import { makeStyles } from '@mui/styles'; @@ -38,11 +38,14 @@ import UserSettings from '../views/settings'; import applicationService from '../services/applicationManager'; +import { history } from '../middleware/navigation'; + const aboutIcon = require('../assets/icons/About.svg'); const homeIcon = require('../assets/icons/Home.svg'); const loginIcon = require('../assets/icons/User.svg'); const settingsIcon = require('../assets/icons/Tools.svg'); + const styles = makeStyles((theme: Theme) => { return { @@ -73,7 +76,7 @@ const FrameComponent: FC = memo(() => { return ( <ConfirmProvider> <SnackbarProvider maxSnack={3}> - <Router> + <Router history={history as any} > <div className={classes.root}> <SnackDisplay /> <ErrorDisplay /> |