From fad3167f42d585e3144547db4c6dd7d00ea7b18a Mon Sep 17 00:00:00 2001
From: sai-neetha <sai-neetha.phulmali@highstreet-technologies.com>
Date: Fri, 7 Jul 2023 18:11:09 +0200
Subject: Update ODLUX

node version yarn version update

Issue-ID: CCSDK-3923
Signed-off-by: sai-neetha <sai-neetha.phulmali@highstreet-technologies.com>
Change-Id: Ibd3d6a6f45a14be4f1d175cf6fc5c8738aa11dea
---
 sdnr/wt/odlux/framework/src/views/about.tsx | 6 +-----
 sdnr/wt/odlux/framework/src/views/frame.tsx | 7 +++++--
 2 files changed, 6 insertions(+), 7 deletions(-)

(limited to 'sdnr/wt/odlux/framework/src/views')

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 />
-- 
cgit 1.2.3-korg