From 7152b77370d1989e4429ce37ec25b1e1baace0da Mon Sep 17 00:00:00 2001
From: Aijana Schumann <aijana.schumann@highstreet-technologies.com>
Date: Tue, 6 Jul 2021 16:01:10 +0200
Subject: [PATCH] Add dashboard to odlux

Add connected element and fault info to home page

Issue-ID: CCSDK-3238
Signed-off-by: Aijana Schumann <aijana.schumann@highstreet-technologies.com>
Change-Id: Ia47442fd0877b721d25d9f97e3a19088df193439
---
 .../src/actions/commonNetworkElementsActions.ts    |   2 +-
 .../src/actions/connectionStatusCountActions.ts    |  52 ++++
 .../src/handlers/connectAppRootHandler.ts          |   5 +-
 .../src/handlers/connectionStatusCountHandler.ts   |  58 +++++
 .../connectApp/src/models/connectionStatusCount.ts |  43 ++++
 .../wt/odlux/apps/connectApp/src/pluginConnect.tsx |  65 ++++-
 .../src/services/connectionStatusCountService.ts   |  54 ++++
 sdnr/wt/odlux/apps/faultApp/src/pluginFault.tsx    |  23 ++
 .../apps/faultApp/src/views/faultApplication.tsx   |   6 +-
 sdnr/wt/odlux/framework/package.json               |   8 +-
 sdnr/wt/odlux/framework/pom.xml                    |   2 +-
 sdnr/wt/odlux/framework/src/app.css                |   1 +
 sdnr/wt/odlux/framework/src/app.tsx                |  10 -
 .../framework/src/assets/images/odluxLogo.gif      | Bin 0 -> 5709 bytes
 .../framework/src/assets/images/odluxLogo.gif.d.ts |  20 ++
 .../odlux/framework/src/assets/images/onapLogo.gif | Bin 0 -> 9249 bytes
 .../framework/src/assets/images/onapLogo.gif.d.ts  |  20 ++
 .../framework/src/components/errorDisplay.tsx      |   2 +-
 sdnr/wt/odlux/framework/src/design/default.ts      |   3 +-
 .../src/handlers/applicationStateHandler.ts        |  21 +-
 sdnr/wt/odlux/framework/src/index.dev.html         |   6 +-
 .../framework/src/services/notificationService.ts  |   2 +-
 sdnr/wt/odlux/framework/src/views/about.tsx        |   9 +-
 sdnr/wt/odlux/framework/src/views/home.tsx         | 285 ++++++++++++++++++++-
 sdnr/wt/odlux/odlux.properties                     |   6 +-
 sdnr/wt/odlux/package.json                         |   4 +-
 sdnr/wt/odlux/yarn.lock                            | 187 ++++++++------
 27 files changed, 769 insertions(+), 125 deletions(-)
 create mode 100644 sdnr/wt/odlux/apps/connectApp/src/actions/connectionStatusCountActions.ts
 create mode 100644 sdnr/wt/odlux/apps/connectApp/src/handlers/connectionStatusCountHandler.ts
 create mode 100644 sdnr/wt/odlux/apps/connectApp/src/models/connectionStatusCount.ts
 create mode 100644 sdnr/wt/odlux/apps/connectApp/src/services/connectionStatusCountService.ts
 create mode 100644 sdnr/wt/odlux/framework/src/assets/images/odluxLogo.gif
 create mode 100644 sdnr/wt/odlux/framework/src/assets/images/odluxLogo.gif.d.ts
 create mode 100644 sdnr/wt/odlux/framework/src/assets/images/onapLogo.gif
 create mode 100644 sdnr/wt/odlux/framework/src/assets/images/onapLogo.gif.d.ts

diff --git a/sdnr/wt/odlux/apps/connectApp/src/actions/commonNetworkElementsActions.ts b/sdnr/wt/odlux/apps/connectApp/src/actions/commonNetworkElementsActions.ts
index a83e00239..0c3266216 100644
--- a/sdnr/wt/odlux/apps/connectApp/src/actions/commonNetworkElementsActions.ts
+++ b/sdnr/wt/odlux/apps/connectApp/src/actions/commonNetworkElementsActions.ts
@@ -28,7 +28,7 @@ import { connectionStatusLogReloadAction } from '../handlers/connectionStatusLog
 
 import { PanelId } from '../models/panelId';
 import { guiCutThrough } from '../models/guiCutTrough';
-import { connectService}  from '../services/connectService';
+import { connectService} from '../services/connectService';
 
 
 export class SetPanelAction extends Action {
diff --git a/sdnr/wt/odlux/apps/connectApp/src/actions/connectionStatusCountActions.ts b/sdnr/wt/odlux/apps/connectApp/src/actions/connectionStatusCountActions.ts
new file mode 100644
index 000000000..e1e16b704
--- /dev/null
+++ b/sdnr/wt/odlux/apps/connectApp/src/actions/connectionStatusCountActions.ts
@@ -0,0 +1,52 @@
+/**
+ * ============LICENSE_START========================================================================
+ * ONAP : ccsdk feature sdnr wt odlux
+ * =================================================================================================
+ * Copyright (C) 2019 highstreet technologies GmbH Intellectual Property. All rights reserved.
+ * =================================================================================================
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except
+ * in compliance with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License
+ * is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express
+ * or implied. See the License for the specific language governing permissions and limitations under
+ * the License.
+ * ============LICENSE_END==========================================================================
+ */
+import { getConnectionStatusCountStateFromDatabase } from '../services/connectionStatusCountService';
+import { Dispatch } from '../../../../framework/src/flux/store';
+
+import { Action } from '../../../../framework/src/flux/action';
+
+
+export class ConnectionStatusCountBaseAction extends Action { }
+
+
+export class SetConnectionStatusCountAction extends ConnectionStatusCountBaseAction {
+  constructor(public ConnectedCount: number, public ConnectingCount: number, public DisconnectedCount: number,
+    public MountedCount: number, public UnableToConnectCount: number, public UndefinedCount: number, public UnmountedCount: number, public totalCount: number) {
+    super();
+  }
+}
+
+
+export const refreshConnectionStatusCountAsyncAction = async (dispatch: Dispatch) => {
+  const result = await getConnectionStatusCountStateFromDatabase().catch(_ => null);
+  if (result) {
+    const statusAction = new SetConnectionStatusCountAction(
+      result["Connected"] || 0,
+      result["Connecting"] || 0,
+      result["Disconnected"] || 0,
+      result["Mounted"] || 0,
+      result["UnableToConnect"] || 0,
+      result["Undefined"] || 0,
+      result["Unmounted"] || 0,
+      result["total"] || 0
+    );
+    dispatch(statusAction);
+    return;
+  }
+  dispatch(new SetConnectionStatusCountAction(0, 0, 0, 0, 0, 0, 0, 0));
+}
diff --git a/sdnr/wt/odlux/apps/connectApp/src/handlers/connectAppRootHandler.ts b/sdnr/wt/odlux/apps/connectApp/src/handlers/connectAppRootHandler.ts
index c23e43924..70b64c976 100644
--- a/sdnr/wt/odlux/apps/connectApp/src/handlers/connectAppRootHandler.ts
+++ b/sdnr/wt/odlux/apps/connectApp/src/handlers/connectAppRootHandler.ts
@@ -24,6 +24,7 @@ import { IInfoNetworkElementsState, infoNetworkElementsActionHandler } from './i
 import { SetPanelAction, AddWebUriList, RemoveWebUri, SetWeburiSearchBusy } from '../actions/commonNetworkElementsActions';
 import { PanelId } from '../models/panelId';
 import { guiCutThrough } from '../models/guiCutTrough';
+import { connectionStatusCountHandler, IConnectionStatusCount } from './connectionStatusCountHandler';
 
 export interface IConnectAppStoreState {
   networkElements: INetworkElementsState;
@@ -31,6 +32,7 @@ export interface IConnectAppStoreState {
   currentOpenPanel: PanelId;
   elementInfo: IInfoNetworkElementsState;
   guiCutThrough: guiCutThroughState;
+  connectionStatusCount: IConnectionStatusCount;
 }
 
 const currentOpenPanelHandler: IActionHandler<PanelId> = (state = null, action) => {
@@ -87,7 +89,8 @@ const actionHandlers = {
   connectionStatusLog: connectionStatusLogActionHandler,
   currentOpenPanel: currentOpenPanelHandler,
   elementInfo: infoNetworkElementsActionHandler,
-  guiCutThrough: guiCutThroughHandler
+  guiCutThrough: guiCutThroughHandler,
+  connectionStatusCount: connectionStatusCountHandler
 };
 
 export const connectAppRootHandler = combineActionHandler<IConnectAppStoreState>(actionHandlers);
diff --git a/sdnr/wt/odlux/apps/connectApp/src/handlers/connectionStatusCountHandler.ts b/sdnr/wt/odlux/apps/connectApp/src/handlers/connectionStatusCountHandler.ts
new file mode 100644
index 000000000..611786520
--- /dev/null
+++ b/sdnr/wt/odlux/apps/connectApp/src/handlers/connectionStatusCountHandler.ts
@@ -0,0 +1,58 @@
+/**
+ * ============LICENSE_START========================================================================
+ * ONAP : ccsdk feature sdnr wt odlux
+ * =================================================================================================
+ * Copyright (C) 2019 highstreet technologies GmbH Intellectual Property. All rights reserved.
+ * =================================================================================================
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except
+ * in compliance with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License
+ * is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express
+ * or implied. See the License for the specific language governing permissions and limitations under
+ * the License.
+ * ============LICENSE_END==========================================================================
+ */
+import { IActionHandler } from "../../../../framework/src/flux/action";
+import { SetConnectionStatusCountAction } from "../actions/connectionStatusCountActions";
+
+export interface IConnectionStatusCount {
+   Connected: number,
+   Connecting: number,
+   Disconnected: number,
+   Mounted: number,
+   UnableToConnect: number,
+   Undefined: number,
+   Unmounted: number,
+   total: number
+}
+
+const connectionStatusCountInit: IConnectionStatusCount = {
+   Connected: 0,
+   Connecting: 0,
+   Disconnected: 0,
+   Mounted: 0,
+   UnableToConnect: 0,
+   Undefined: 0,
+   Unmounted: 0,
+   total: 0
+};
+
+export const connectionStatusCountHandler: IActionHandler<IConnectionStatusCount> = (state = connectionStatusCountInit, action) => {
+   if (action instanceof SetConnectionStatusCountAction) {
+      state = {
+         Connected: action.ConnectedCount,
+         Connecting: action.ConnectingCount,
+         Disconnected: action.DisconnectedCount,
+         Mounted: action.MountedCount,
+         UnableToConnect: action.UnableToConnectCount,
+         Undefined: action.UndefinedCount,
+         Unmounted: action.UnmountedCount,
+         total: action.totalCount
+      }
+   }
+
+   return state;
+}
\ No newline at end of file
diff --git a/sdnr/wt/odlux/apps/connectApp/src/models/connectionStatusCount.ts b/sdnr/wt/odlux/apps/connectApp/src/models/connectionStatusCount.ts
new file mode 100644
index 000000000..125a6e369
--- /dev/null
+++ b/sdnr/wt/odlux/apps/connectApp/src/models/connectionStatusCount.ts
@@ -0,0 +1,43 @@
+/**
+ * ============LICENSE_START========================================================================
+ * ONAP : ccsdk feature sdnr wt odlux
+ * =================================================================================================
+ * Copyright (C) 2019 highstreet technologies GmbH Intellectual Property. All rights reserved.
+ * =================================================================================================
+ * Licensed under the Apache License, Version 2.number (the "License"); you may not use this file except
+ * in compliance with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.number
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License
+ * is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express
+ * or implied. See the License for the specific language governing permissions and limitations under
+ * the License.
+ * ============LICENSE_END==========================================================================
+ */
+
+export type ConnectionStatusCountReturnType = {
+  Connected: number,
+  Connecting: number,
+  Disconnected: number,
+  Mounted: number,
+  UnableToConnect: number,
+  Undefined: number,
+  Unmounted: number,
+  total: number
+};
+
+export type ConnectionStatusCountType = {
+  Connected: number,
+  Connecting: number,
+  Disconnected: number,
+  Mounted: number,
+  UnableToConnect: number,
+  Undefined: number,
+  Unmounted: number,
+  total: number
+};
+
+export type ConnectionStatusCount = {
+  'network-element-connections': ConnectionStatusCountReturnType
+};
diff --git a/sdnr/wt/odlux/apps/connectApp/src/pluginConnect.tsx b/sdnr/wt/odlux/apps/connectApp/src/pluginConnect.tsx
index 93bed1aad..461e14023 100644
--- a/sdnr/wt/odlux/apps/connectApp/src/pluginConnect.tsx
+++ b/sdnr/wt/odlux/apps/connectApp/src/pluginConnect.tsx
@@ -16,22 +16,70 @@
  * ============LICENSE_END==========================================================================
  */
 
+import * as React from "react";
+import { withRouter, RouteComponentProps, Route, Switch, Redirect } from 'react-router-dom';
 import { faPlug } from '@fortawesome/free-solid-svg-icons';
 
 import applicationManager from '../../../framework/src/services/applicationManager';
 import { subscribe, IFormatedMessage } from '../../../framework/src/services/notificationService';
 import { AddSnackbarNotification } from '../../../framework/src/actions/snackbarActions';
+import { IApplicationStoreState } from "../../../framework/src/store/applicationStore";
+import connect, { Connect, IDispatcher } from '../../../framework/src/flux/connect';
 
+import { findWebUrisForGuiCutThroughAsyncAction, updateCurrentViewAsyncAction, SetPanelAction } from './actions/commonNetworkElementsActions';
+import { refreshConnectionStatusCountAsyncAction } from './actions/connectionStatusCountActions';
+import { createNetworkElementsActions, createNetworkElementsProperties, networkElementsReloadAction } from './handlers/networkElementsHandler';
 import connectAppRootHandler from './handlers/connectAppRootHandler';
 import ConnectApplication from './views/connectView';
+import { PanelId } from "./models/panelId";
+import { NetworkElementsList } from './components/networkElements'
 
-import { findWebUrisForGuiCutThroughAsyncAction, updateCurrentViewAsyncAction } from './actions/commonNetworkElementsActions';
+let currentStatus: string | undefined = undefined;
+
+const mapProps = (state: IApplicationStoreState) => ({
+  currentProblemsProperties: createNetworkElementsProperties(state),
+});
+
+const mapDisp = (dispatcher: IDispatcher) => ({
+  currentProblemsActions: createNetworkElementsActions(dispatcher.dispatch, true),
+  setCurrentPanel: (panelId: PanelId) => dispatcher.dispatch(new SetPanelAction(panelId)),
+});
+
+const ConnectApplicationRouteAdapter = connect(mapProps, mapDisp)((props: RouteComponentProps<{ status?: string }> & Connect<typeof mapProps, typeof mapDisp>) => {
+  if (currentStatus !== props.match.params.status) {
+    currentStatus = props.match.params.status || undefined;
+    window.setTimeout(() => {
+      if (currentStatus) {
+        props.setCurrentPanel("NetworkElements");
+        props.currentProblemsActions.onFilterChanged("status", currentStatus);
+        if (!props.currentProblemsProperties.showFilter) {
+          props.currentProblemsActions.onToggleFilter(false);
+          props.currentProblemsActions.onRefresh();
+        }
+        else
+          props.currentProblemsActions.onRefresh();
+      }
+    });
+  }
+  return (
+    <NetworkElementsList />
+  )
+});
+
+
+const App = withRouter((props: RouteComponentProps) => (
+  <Switch>
+    <Route path={`${props.match.path}/connectionStatus/:status?`} component={ConnectApplicationRouteAdapter} />
+    <Route path={`${props.match.path}`} component={ConnectApplication} />
+    <Redirect to={`${props.match.path}`} />
+  </Switch>
+));
 
 export function register() {
   const applicationApi = applicationManager.registerApplication({
     name: "connect",
     icon: faPlug,
-    rootComponent: ConnectApplication,
+    rootComponent: App,
     rootActionHandler: connectAppRootHandler,
     menuEntry: "Connect"
   });
@@ -52,4 +100,17 @@ export function register() {
       });
     }
   }));
+
+  applicationApi.applicationStoreInitialized.then(store => {
+    store.dispatch(networkElementsReloadAction);
+  });
+
+  applicationApi.applicationStoreInitialized.then(store => {
+    store.dispatch(refreshConnectionStatusCountAsyncAction);
+  });
+  window.setInterval(() => {
+    applicationApi.applicationStoreInitialized.then(store => {
+      store.dispatch(refreshConnectionStatusCountAsyncAction);
+    });
+  }, 15000);
 }
\ No newline at end of file
diff --git a/sdnr/wt/odlux/apps/connectApp/src/services/connectionStatusCountService.ts b/sdnr/wt/odlux/apps/connectApp/src/services/connectionStatusCountService.ts
new file mode 100644
index 000000000..519c965c4
--- /dev/null
+++ b/sdnr/wt/odlux/apps/connectApp/src/services/connectionStatusCountService.ts
@@ -0,0 +1,54 @@
+/**
+ * ============LICENSE_START========================================================================
+ * ONAP : ccsdk feature sdnr wt odlux
+ * =================================================================================================
+ * Copyright (C) 2019 highstreet technologies GmbH Intellectual Property. All rights reserved.
+ * =================================================================================================
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except
+ * in compliance with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License
+ * is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express
+ * or implied. See the License for the specific language governing permissions and limitations under
+ * the License.
+ * ============LICENSE_END==========================================================================
+ */
+
+import { requestRest } from "../../../../framework/src/services/restService";
+import { Result } from "../../../../framework/src/models/elasticSearch";
+import { ConnectionStatusCountType, ConnectionStatusCount } from "../models/connectionStatusCount";
+
+
+
+export const getConnectionStatusCountStateFromDatabase = async (): Promise<ConnectionStatusCountType | null> => {
+  const path = 'rests/operations/data-provider:read-status';
+  const result = await requestRest<Result<ConnectionStatusCount>>(path, { method: "POST" });
+  let connectionStatusCountType: ConnectionStatusCountType = {
+    Connected: 0,
+    Connecting: 0,
+    Disconnected: 0,
+    Mounted: 0,
+    UnableToConnect: 0,
+    Undefined: 0,
+    Unmounted: 0,
+    total: 0
+  }
+  let connectionStatusCount: ConnectionStatusCount[] | null = null;
+
+  if (result && result["data-provider:output"] && result["data-provider:output"].data) {
+    connectionStatusCount = result["data-provider:output"].data;
+    connectionStatusCountType = {
+      Connected: connectionStatusCount[0]["network-element-connections"].Connected,
+      Connecting: connectionStatusCount[0]["network-element-connections"].Connecting,
+      Disconnected: connectionStatusCount[0]["network-element-connections"].Disconnected,
+      Mounted: connectionStatusCount[0]["network-element-connections"].Mounted,
+      UnableToConnect: connectionStatusCount[0]["network-element-connections"].UnableToConnect,
+      Undefined: connectionStatusCount[0]["network-element-connections"].Undefined,
+      Unmounted: connectionStatusCount[0]["network-element-connections"].Unmounted,
+      total: connectionStatusCount[0]["network-element-connections"].total,
+    }
+  }
+  return connectionStatusCountType;
+}
diff --git a/sdnr/wt/odlux/apps/faultApp/src/pluginFault.tsx b/sdnr/wt/odlux/apps/faultApp/src/pluginFault.tsx
index bf96fe38d..06299417d 100644
--- a/sdnr/wt/odlux/apps/faultApp/src/pluginFault.tsx
+++ b/sdnr/wt/odlux/apps/faultApp/src/pluginFault.tsx
@@ -42,6 +42,7 @@ import { FaultStatus } from "./components/faultStatus";
 import { refreshFaultStatusAsyncAction } from "./actions/statusActions";
 
 let currentMountId: string | undefined = undefined;
+let currentSeverity: string | undefined = undefined;
 
 const mapProps = (state: IApplicationStoreState) => ({
   currentProblemsProperties: createCurrentProblemsProperties(state),
@@ -75,8 +76,30 @@ const FaultApplicationRouteAdapter = connect(mapProps, mapDisp)((props: RouteCom
   )
 });
 
+const FaulttApplicationAlarmStatusRouteAdapter = connect(mapProps, mapDisp)((props: RouteComponentProps<{ severity?: string }> & Connect<typeof mapProps, typeof mapDisp>) => {
+  if (currentSeverity !== props.match.params.severity) {
+    currentSeverity = props.match.params.severity || undefined;
+    window.setTimeout(() => {
+      if (currentSeverity) {
+        props.setCurrentPanel("CurrentProblem");
+        props.currentProblemsActions.onFilterChanged("severity", currentSeverity);
+        if (!props.currentProblemsProperties.showFilter) {
+          props.currentProblemsActions.onToggleFilter(false);
+          props.currentProblemsActions.onRefresh();
+        }
+        else
+          props.currentProblemsActions.onRefresh();
+      }
+    });
+  }
+  return (
+    <FaultApplication />
+  )
+});
+
 const App = withRouter((props: RouteComponentProps) => (
   <Switch>
+    <Route path={`${props.match.path}/alarmStatus/:severity?`} component={FaulttApplicationAlarmStatusRouteAdapter} />
     <Route path={`${props.match.path}/:mountId?`} component={FaultApplicationRouteAdapter} />
     <Redirect to={`${props.match.path}`} />
   </Switch>
diff --git a/sdnr/wt/odlux/apps/faultApp/src/views/faultApplication.tsx b/sdnr/wt/odlux/apps/faultApp/src/views/faultApplication.tsx
index 6075066fd..7b0c23693 100644
--- a/sdnr/wt/odlux/apps/faultApp/src/views/faultApplication.tsx
+++ b/sdnr/wt/odlux/apps/faultApp/src/views/faultApplication.tsx
@@ -137,7 +137,7 @@ class FaultApplicationComponent extends React.Component<FaultApplicationComponen
 
   render(): JSX.Element {
 
-    const refreshButton = {
+    const clearAlarmsAction = {
       icon: Sync, tooltip: 'Clear stuck alarms', onClick: this.onDialogOpen
     };
 
@@ -158,7 +158,7 @@ class FaultApplicationComponent extends React.Component<FaultApplicationComponen
     };
 
     const areFaultsAvailable = this.props.currentProblemsProperties.rows && this.props.currentProblemsProperties.rows.length > 0
-    const customActions = areFaultsAvailable ? [refreshButton, refreshCurrentProblemsAction] : [refreshCurrentProblemsAction];
+    const customActions = areFaultsAvailable ? [clearAlarmsAction, refreshCurrentProblemsAction] : [refreshCurrentProblemsAction];
 
     const { panelId: activePanelId } = this.props;
 
@@ -191,7 +191,7 @@ class FaultApplicationComponent extends React.Component<FaultApplicationComponen
         }
         {activePanelId === 'AlarmNotifications' &&
 
-          <FaultAlarmNotificationTable tableId="alarm-notifications-table" idProperty="id" stickyHeader rows={this.props.faultNotifications.faults} asynchronus columns={[
+          <FaultAlarmNotificationTable stickyHeader tableId="alarm-notifications-table" idProperty="id" defaultSortColumn='timeStamp' defaultSortOrder='desc' rows={this.props.faultNotifications.faults} asynchronus columns={[
             { property: "icon", title: "", type: ColumnType.custom, customControl: this.renderIcon },
             { property: "timeStamp", title: "Timestamp" },
             { property: "nodeName", title: "Node Name" },
diff --git a/sdnr/wt/odlux/framework/package.json b/sdnr/wt/odlux/framework/package.json
index 345fc8b4c..c2ad49c79 100644
--- a/sdnr/wt/odlux/framework/package.json
+++ b/sdnr/wt/odlux/framework/package.json
@@ -37,8 +37,8 @@
     "react": "17.0.1",
     "react-dom": "17.0.1",
     "react-router-dom": "5.2.0",
-    "@fortawesome/react-fontawesome": "0.1.3",
-    "@fortawesome/fontawesome-svg-core": "1.2.12",
+    "@fortawesome/react-fontawesome": "0.1.14",
+    "@fortawesome/fontawesome-svg-core": "1.2.35",
     "@fortawesome/free-solid-svg-icons": "5.6.3",
     "jsonwebtoken": "8.3.0",
     "@types/jsonwebtoken": "7.2.8"
@@ -46,6 +46,8 @@
   "dependencies": {
     "@babel/polyfill": "^7.0.0",
     "@types/x2js": "^3.1.0",
-    "http-server": "^0.11.1"
+    "chart.js": "^3.4.0",
+    "http-server": "^0.11.1",
+    "react-chartjs-2": "^3.0.3"
   }
 }
diff --git a/sdnr/wt/odlux/framework/pom.xml b/sdnr/wt/odlux/framework/pom.xml
index 9d648b52d..3e947539f 100644
--- a/sdnr/wt/odlux/framework/pom.xml
+++ b/sdnr/wt/odlux/framework/pom.xml
@@ -46,7 +46,7 @@
     <properties>
         <buildtime>${maven.build.timestamp}</buildtime>
         <distversion>ONAP Frankfurt (Neon, mdsal ${odl.mdsal.version})</distversion>
-        <buildno>96.078ad12(21/03/25)</buildno>
+        <buildno>110.0d5d064(21/07/05)</buildno>
         <odlux.version>ONAP SDN-R | ONF Wireless for ${distversion} - Build: ${buildtime} ${buildno} ${project.version}</odlux.version>
     </properties>
 
diff --git a/sdnr/wt/odlux/framework/src/app.css b/sdnr/wt/odlux/framework/src/app.css
index f70fbc0e4..9b653b3b5 100644
--- a/sdnr/wt/odlux/framework/src/app.css
+++ b/sdnr/wt/odlux/framework/src/app.css
@@ -1,5 +1,6 @@
 html, body, #app {
   height: 100%;
+  min-width: 1000px;
   padding: 0px;
   margin: 0px;
   font-family: 'Open Sans', 'Helvetica Neue', Helvetica, Arial, sans-serif;
diff --git a/sdnr/wt/odlux/framework/src/app.tsx b/sdnr/wt/odlux/framework/src/app.tsx
index 2d913be1b..7e162cd51 100644
--- a/sdnr/wt/odlux/framework/src/app.tsx
+++ b/sdnr/wt/odlux/framework/src/app.tsx
@@ -106,13 +106,3 @@ export const runApplication = () => {
 
 };
 
-if (process.env.NODE_ENV === "development") {
-  const addTransportPCEUrl = () =>{
-    const url = window.localStorage.getItem(transportPCEUrl);
-    if(url === null){
-        window.localStorage.setItem(transportPCEUrl, "http://10.20.6.32:18082/");
-        console.log("set transport url :D")
-    }
-  }
-  addTransportPCEUrl();
-}
diff --git a/sdnr/wt/odlux/framework/src/assets/images/odluxLogo.gif b/sdnr/wt/odlux/framework/src/assets/images/odluxLogo.gif
new file mode 100644
index 0000000000000000000000000000000000000000..ad188a8d3e1b0bd8259b510b11eeb046c6e560d0
GIT binary patch
literal 5709
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

literal 0
HcmV?d00001

diff --git a/sdnr/wt/odlux/framework/src/assets/images/odluxLogo.gif.d.ts b/sdnr/wt/odlux/framework/src/assets/images/odluxLogo.gif.d.ts
new file mode 100644
index 000000000..36131834c
--- /dev/null
+++ b/sdnr/wt/odlux/framework/src/assets/images/odluxLogo.gif.d.ts
@@ -0,0 +1,20 @@
+/**
+ * ============LICENSE_START========================================================================
+ * ONAP : ccsdk feature sdnr wt odlux
+ * =================================================================================================
+ * Copyright (C) 2019 highstreet technologies GmbH Intellectual Property. All rights reserved.
+ * =================================================================================================
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except
+ * in compliance with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License
+ * is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express
+ * or implied. See the License for the specific language governing permissions and limitations under
+ * the License.
+ * ============LICENSE_END==========================================================================
+ */
+
+declare const odluxLogo: string;
+export default odluxLogo;
\ No newline at end of file
diff --git a/sdnr/wt/odlux/framework/src/assets/images/onapLogo.gif b/sdnr/wt/odlux/framework/src/assets/images/onapLogo.gif
new file mode 100644
index 0000000000000000000000000000000000000000..cd7eb8f3c6579875e6e4d8245aa161f78900bd22
GIT binary patch
literal 9249
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

literal 0
HcmV?d00001

diff --git a/sdnr/wt/odlux/framework/src/assets/images/onapLogo.gif.d.ts b/sdnr/wt/odlux/framework/src/assets/images/onapLogo.gif.d.ts
new file mode 100644
index 000000000..5bfb37a84
--- /dev/null
+++ b/sdnr/wt/odlux/framework/src/assets/images/onapLogo.gif.d.ts
@@ -0,0 +1,20 @@
+/**
+ * ============LICENSE_START========================================================================
+ * ONAP : ccsdk feature sdnr wt odlux
+ * =================================================================================================
+ * Copyright (C) 2019 highstreet technologies GmbH Intellectual Property. All rights reserved.
+ * =================================================================================================
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except
+ * in compliance with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License
+ * is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express
+ * or implied. See the License for the specific language governing permissions and limitations under
+ * the License.
+ * ============LICENSE_END==========================================================================
+ */
+
+ declare const onapLogo: string;
+ export default onapLogo;
\ No newline at end of file
diff --git a/sdnr/wt/odlux/framework/src/components/errorDisplay.tsx b/sdnr/wt/odlux/framework/src/components/errorDisplay.tsx
index 4cf63e927..1060d4b6d 100644
--- a/sdnr/wt/odlux/framework/src/components/errorDisplay.tsx
+++ b/sdnr/wt/odlux/framework/src/components/errorDisplay.tsx
@@ -72,7 +72,7 @@ type ErrorDisplayProps = WithStyles<typeof styles> & Connect;
 // }
 
 /**
- * Represents a compnent for formaing and displaying errors.
+ * Represents a component for formatting and displaying errors.
  */
 class ErrorDisplayComponent extends React.Component<ErrorDisplayProps> {
   constructor(props: ErrorDisplayProps) {
diff --git a/sdnr/wt/odlux/framework/src/design/default.ts b/sdnr/wt/odlux/framework/src/design/default.ts
index 542c436f6..59b8c20ef 100644
--- a/sdnr/wt/odlux/framework/src/design/default.ts
+++ b/sdnr/wt/odlux/framework/src/design/default.ts
@@ -32,12 +32,13 @@
  *****************************************************************************/
 
 import { createMuiTheme } from '@material-ui/core/styles';
+import onapLogo from '../assets/images/onapLogo.gif'
 
 const theme = createMuiTheme({
   design: {
     id: "onap",
     name: "Open Networking Automation Plattform (ONAP)",
-    url: "https://www.onap.org/wp-content/uploads/sites/20/2017/02/logo_onap_2017.png",
+    url: onapLogo,
     height: 49,
     width: 229,
     logoHeight: 32,
diff --git a/sdnr/wt/odlux/framework/src/handlers/applicationStateHandler.ts b/sdnr/wt/odlux/framework/src/handlers/applicationStateHandler.ts
index 06df6709f..6426066f6 100644
--- a/sdnr/wt/odlux/framework/src/handlers/applicationStateHandler.ts
+++ b/sdnr/wt/odlux/framework/src/handlers/applicationStateHandler.ts
@@ -29,7 +29,16 @@ import { ErrorInfo } from '../models/errorInfo';
 import { SnackbarItem } from '../models/snackbarItem';
 import { ExternalLoginProvider } from '../models/externalLoginProvider';
 import { ApplicationConfig } from '../models/applicationConfig';
+import { IConnectAppStoreState } from '../../../apps/connectApp/src/handlers/connectAppRootHandler';
+import { IFaultAppStoreState } from '../../../apps/faultApp/src/handlers/faultAppRootHandler';
 
+
+declare module '../store/applicationStore' {
+  interface IApplicationStoreState {
+    connect: IConnectAppStoreState;
+    fault: IFaultAppStoreState
+  }
+}
 export interface IApplicationState {
   title: string;
   appId?: string;
@@ -44,12 +53,12 @@ export interface IApplicationState {
   enablePolicy: boolean             // false 
 }
 
-const applicationStateInit: IApplicationState = { 
-  title: "Loading ...", 
-  errors: [], 
-  snackBars: [], 
-  isMenuOpen: true, 
-  isMenuClosedByUser: false, 
+const applicationStateInit: IApplicationState = {
+  title: "Loading ...",
+  errors: [],
+  snackBars: [],
+  isMenuOpen: true,
+  isMenuClosedByUser: false,
   isWebsocketAvailable: undefined,
   externalLoginProviders: null,
   authentication: "basic",
diff --git a/sdnr/wt/odlux/framework/src/index.dev.html b/sdnr/wt/odlux/framework/src/index.dev.html
index 240da266d..6c956386b 100644
--- a/sdnr/wt/odlux/framework/src/index.dev.html
+++ b/sdnr/wt/odlux/framework/src/index.dev.html
@@ -21,10 +21,10 @@
   </script>
   <script>
     // run the application
-    require(["app" /*,"connectApp","inventoryApp","faultApp","helpApp"*/], function (app,connectApp,inventoryApp,faultApp,helpApp) {
-      // connectApp.register();
+    require(["app" ,"connectApp","faultApp"/*,"inventoryApp","helpApp"*/], function (app,connectApp,faultApp,/*inventoryApp,helpApp*/) {
+      connectApp.register();
+      faultApp.register();
       // inventoryApp.register();
-      // faultApp.register();
       // helpApp.register();
       app("./app.tsx").runApplication();
     });
diff --git a/sdnr/wt/odlux/framework/src/services/notificationService.ts b/sdnr/wt/odlux/framework/src/services/notificationService.ts
index 5625b1f55..99e697e9a 100644
--- a/sdnr/wt/odlux/framework/src/services/notificationService.ts
+++ b/sdnr/wt/odlux/framework/src/services/notificationService.ts
@@ -51,7 +51,7 @@ function setCurrentSubscriptions(notificationSocket: WebSocket) {
       'data': 'scopes',
       'scopes':[{
         "schema":{
-            "namespace":"*",
+            "namespace":"urn:opendaylight:params:xml:ns:yang:devicemanager",
             "revision":"*",
             "notification": scopesToSubscribe 
          }
diff --git a/sdnr/wt/odlux/framework/src/views/about.tsx b/sdnr/wt/odlux/framework/src/views/about.tsx
index 5d2257a3f..174444f70 100644
--- a/sdnr/wt/odlux/framework/src/views/about.tsx
+++ b/sdnr/wt/odlux/framework/src/views/about.tsx
@@ -97,7 +97,14 @@ class AboutComponent extends React.Component<any, AboutState> {
 
   private loadAboutContent(): void {
     const baseUri = window.location.pathname.substring(0,window.location.pathname.lastIndexOf("/")+1);
-    const p1 = requestRestExt<string>('/about');
+    const init = {
+      'method': 'GET',
+      headers: {
+        'Content-Type': 'application/json',
+        'Accept': 'text/markdown',
+      }
+    };
+    const p1 = requestRestExt<string>('/about',init);
     const p2 = requestRestExt<odluxVersion>(`${baseUri}version.json`);
     const p3 = requestRestExt<any>(`/topology/info/version`);
 
diff --git a/sdnr/wt/odlux/framework/src/views/home.tsx b/sdnr/wt/odlux/framework/src/views/home.tsx
index 4a4084e88..b5df0526f 100644
--- a/sdnr/wt/odlux/framework/src/views/home.tsx
+++ b/sdnr/wt/odlux/framework/src/views/home.tsx
@@ -17,11 +17,282 @@
  */
 import * as React from 'react';
 
-export const Home = (props: React.Props<any>) => {
-  return (
-    <div>
-      <h1>Welcome to ODLUX.</h1>
-    </div>
-  )
+import { withRouter, RouteComponentProps } from 'react-router-dom';
+import connect, { Connect, IDispatcher } from '..//flux/connect';
+import { IApplicationState } from '../handlers/applicationStateHandler';
+import { IApplicationStoreState } from '../store/applicationStore';
+import { WithStyles, withStyles, createStyles, Theme } from '@material-ui/core/styles';
+import { Doughnut } from 'react-chartjs-2';
+import { NavigateToApplication } from '../actions/navigationActions';
+
+const styles = (theme: Theme) => createStyles({
+  pageWidthSettings: {
+    width: '50%',
+    float: 'left'
+  },
+})
+
+const scrollbar = { overflow: "auto", paddingRight: "20px" }
+
+const mapProps = (state: IApplicationStoreState) => ({
+  connectionStatusCount: state.connect.connectionStatusCount,
+  alarmStatus: state.fault.faultStatus
+});
+
+const mapDispatch = (dispatcher: IDispatcher) => ({
+  navigateToApplication: (applicationName: string, path?: string) => dispatcher.dispatch(new NavigateToApplication(applicationName, path)),
+});
+
+type HomeComponentProps = RouteComponentProps & Connect<typeof mapProps, typeof mapDispatch> & WithStyles<typeof styles>;
+
+class Home extends React.Component<HomeComponentProps>  {
+  constructor(props: HomeComponentProps) {
+    super(props);
+    this.state = {
+    }
+  }
+
+  render(): JSX.Element {
+    const { classes } = this.props;
+
+    /** Available Network Connection Status chart data */
+    const connectionStatusData = {
+      labels: ['Connected', 'Connecting', 'Disconnected', 'UnableToConnect'],
+      datasets: [{
+        data: [
+          this.props.connectionStatusCount.Connected,
+          this.props.connectionStatusCount.Connecting,
+          this.props.connectionStatusCount.Disconnected,
+          this.props.connectionStatusCount.UnableToConnect
+        ],
+        backgroundColor: [
+          'rgb(0, 153, 51)',
+          'rgb(255, 102, 0)',
+          'rgb(191, 191, 191)',
+          'rgb(191, 191, 191)'
+        ]
+      }]
+    };
+
+
+    /** No Devices available */
+    const connectionStatusUnavailableData = {
+      labels: ['No Devices available'],
+      datasets: [{
+        data: [1],
+        backgroundColor: [
+          'rgb(255, 255, 255)'
+        ]
+      }]
+    };
+
+    /** Connection status options */
+    let labels: String[] = ['Connected', 'Connecting', 'Disconnected', 'UnableToConnect'];
+    const connectionStatusOptions = {
+      responsive: true,
+      maintainAspectRatio: false,
+      plugins: {
+        legend: {
+          display: true,
+          position: 'top'
+        }
+      },
+      onClick: (event: MouseEvent, item: any) => {
+        if (item[0]) {
+          let connectionStatus = labels[item[0].index] + '';
+          this.props.navigateToApplication("connect", '/connectionStatus/' + connectionStatus);
+        }
+      }
+    }
+
+    /** Connection status unavailable options */
+    const connectionStatusUnavailableOptions = {
+      responsive: true,
+      maintainAspectRatio: false,
+      plugins: {
+        legend: {
+          display: true,
+          position: 'top'
+        },
+        tooltip: {
+          enabled: false
+        }
+      }
+    }
+
+    /** Add text inside the doughnut chart for Connection Status */
+    const connectionStatusPlugins = [{
+      beforeDraw: function (chart: any) {
+        var width = chart.width,
+          height = chart.height,
+          ctx = chart.ctx;
+        ctx.restore();
+        var fontSize = (height / 480).toFixed(2);
+        ctx.font = fontSize + "em sans-serif";
+        ctx.textBaseline = "top";
+        var text = "Network Connection Status",
+          textX = Math.round((width - ctx.measureText(text).width) / 2),
+          textY = height / 2;
+        ctx.fillText(text, textX, textY);
+        ctx.save();
+      }
+    }]
+
+    /** Alarm status Data */
+    const alarmStatusData = {
+      labels: [
+        'Critical',
+        'Major',
+        'Minor',
+        'Warning'
+      ],
+      datasets: [{
+        data: [
+          this.props.alarmStatus.critical,
+          this.props.alarmStatus.major,
+          this.props.alarmStatus.minor,
+          this.props.alarmStatus.warning
+        ],
+        backgroundColor: [
+          'rgb(240, 25, 10)',
+          'rgb(240, 133, 10)',
+          'rgb(240, 240, 10)',
+          'rgb(46, 115, 176)'
+        ],
+      }]
+    }
+
+    /** No Alarm status available */
+    const alarmStatusUnavailableData = {
+      labels: ['No Alarms available'],
+      datasets: [{
+        data: [1],
+        backgroundColor: [
+          'rgb(0, 153, 51)'
+        ]
+      }]
+    };
+
+    /** Alarm status Options */
+    let alarmLabels: String[] = ['Critical', 'Major', 'Minor', 'Warning'];
+    const alarmStatusOptions = {
+      responsive: true,
+      maintainAspectRatio: false,
+      plugins: {
+        legend: {
+          display: true,
+          position: 'top'
+        }
+      },
+      onClick: (event: MouseEvent, item: any) => {
+        if (item[0]) {
+          let severity = alarmLabels[item[0].index] + '';
+          this.props.navigateToApplication("fault", '/alarmStatus/' + severity);
+        }
+      },
+    };
+
+    /** Alarm status unavailable options */
+    const alarmStatusUnavailableOptions = {
+      responsive: true,
+      maintainAspectRatio: false,
+      plugins: {
+        legend: {
+          display: true,
+          position: 'top'
+        },
+        tooltip: {
+          enabled: false
+        }
+      }
+    }
+    /** Add text inside the doughnut chart for Alarm Status */
+    const alarmStatusPlugins = [{
+      beforeDraw: function (chart: any) {
+        var width = chart.width,
+          height = chart.height,
+          ctx = chart.ctx;
+        ctx.restore();
+        var fontSize = (height / 480).toFixed(2);
+        ctx.font = fontSize + "em sans-serif";
+        ctx.textBaseline = "top";
+        var text = "Network Alarm Status",
+          textX = Math.round((width - ctx.measureText(text).width) / 2),
+          textY = height / 2;
+        ctx.fillText(text, textX, textY);
+        ctx.save();
+      }
+    }]
+
+    return (
+      <>
+        <div style={scrollbar} >
+          <h1>Welcome to ODLUX</h1>
+          <div className={classes.pageWidthSettings}>
+            {this.checkConnectionStatus() ?
+              <Doughnut
+                data={connectionStatusData}
+                type={Doughnut}
+                width={500}
+                height={500}
+                options={connectionStatusOptions}
+                plugins={connectionStatusPlugins}
+              />
+              : <Doughnut
+                data={connectionStatusUnavailableData}
+                type={Doughnut}
+                width={500}
+                height={500}
+                options={connectionStatusUnavailableOptions}
+                plugins={connectionStatusPlugins}
+              />
+            }
+          </div>
+          <div className={classes.pageWidthSettings}>
+            {this.checkAlarmStatus() ?
+              <Doughnut
+                data={alarmStatusData}
+                type={Doughnut}
+                width={500}
+                height={500}
+                options={alarmStatusOptions}
+                plugins={alarmStatusPlugins}
+              />
+              : <Doughnut
+                data={alarmStatusUnavailableData}
+                type={Doughnut}
+                width={500}
+                height={500}
+                options={alarmStatusUnavailableOptions}
+                plugins={alarmStatusPlugins}
+              />
+            }
+          </div>
+        </div>
+      </>
+    )
+  }
+
+  /** Check if connection status data available */
+  public checkConnectionStatus = () => {
+    let statusCount = this.props.connectionStatusCount;
+    if (statusCount.Connected == 0 && statusCount.Connecting == 0 && statusCount.Disconnected == 0 && statusCount.UnableToConnect == 0) {
+      return false;
+    }
+    else
+      return true;
+  }
+
+  /** Check if alarms data available */
+  public checkAlarmStatus = () => {
+    let alarmCount = this.props.alarmStatus;
+    if (alarmCount.critical == 0 && alarmCount.major == 0 && alarmCount.minor == 0 && alarmCount.warning == 0) {
+      return false;
+    }
+    else
+      return true;
+  }
+
 }
-export default Home;
\ No newline at end of file
+
+export default withStyles(styles)(withRouter(connect(mapProps, mapDispatch)(Home)));
\ No newline at end of file
diff --git a/sdnr/wt/odlux/odlux.properties b/sdnr/wt/odlux/odlux.properties
index 36de5d4c3..3b41140a7 100644
--- a/sdnr/wt/odlux/odlux.properties
+++ b/sdnr/wt/odlux/odlux.properties
@@ -1,8 +1,8 @@
-odlux.framework.buildno=96.078ad12(21/03/25)
+odlux.framework.buildno=110.0d5d064(21/07/05)
 odlux.apps.configurationApp.buildno=96.078ad12(21/03/25)
-odlux.apps.connectApp.buildno=96.078ad12(21/03/25)
+odlux.apps.connectApp.buildno=110.0d5d064(21/07/05)
 odlux.apps.eventLogApp.buildno=96.078ad12(21/03/25)
-odlux.apps.faultApp.buildno=96.078ad12(21/03/25)
+odlux.apps.faultApp.buildno=110.0d5d064(21/07/05)
 odlux.apps.helpApp.buildno=96.078ad12(21/03/25)
 odlux.apps.inventoryApp.buildno=96.078ad12(21/03/25)
 odlux.apps.linkCalculationApp.buildno=96.078ad12(21/03/25)
diff --git a/sdnr/wt/odlux/package.json b/sdnr/wt/odlux/package.json
index 5bfcf74a0..15e607a37 100644
--- a/sdnr/wt/odlux/package.json
+++ b/sdnr/wt/odlux/package.json
@@ -11,9 +11,9 @@
     "test": "jest --no-cache --coverage --config jest.json"
   },
   "dependencies": {
-    "@fortawesome/fontawesome-svg-core": "1.2.12",
+    "@fortawesome/fontawesome-svg-core": "1.2.35",
     "@fortawesome/free-solid-svg-icons": "5.6.3",
-    "@fortawesome/react-fontawesome": "0.1.3",
+    "@fortawesome/react-fontawesome": "0.1.14",
     "@material-ui/core": "4.11.0",
     "@material-ui/icons": "4.9.1",
     "@material-ui/lab": "4.0.0-alpha.41",
diff --git a/sdnr/wt/odlux/yarn.lock b/sdnr/wt/odlux/yarn.lock
index 842aebb5a..7648c7edd 100644
--- a/sdnr/wt/odlux/yarn.lock
+++ b/sdnr/wt/odlux/yarn.lock
@@ -791,12 +791,17 @@
   resolved "https://registry.yarnpkg.com/@fortawesome/fontawesome-common-types/-/fontawesome-common-types-0.2.32.tgz#3436795d5684f22742989bfa08f46f50f516f259"
   integrity sha512-ux2EDjKMpcdHBVLi/eWZynnPxs0BtFVXJkgHIxXRl+9ZFaHPvYamAfCzeeQFqHRjuJtX90wVnMRaMQAAlctz3w==
 
-"@fortawesome/fontawesome-svg-core@1.2.12":
-  version "1.2.12"
-  resolved "https://registry.yarnpkg.com/@fortawesome/fontawesome-svg-core/-/fontawesome-svg-core-1.2.12.tgz#9732617b1e484435f6946645d7f9ad248f12c437"
-  integrity sha512-cqTfa3vZ+Z9UYQnmLfCOwyLnf0Xcoxkmm/BSaI29Yikzu9zIeD4es7lBZMDqLOXYSEQC+rCr8caxFlGJcJVA+w==
+"@fortawesome/fontawesome-common-types@^0.2.35":
+  version "0.2.35"
+  resolved "https://registry.yarnpkg.com/@fortawesome/fontawesome-common-types/-/fontawesome-common-types-0.2.35.tgz#01dd3d054da07a00b764d78748df20daf2b317e9"
+  integrity sha512-IHUfxSEDS9dDGqYwIW7wTN6tn/O8E0n5PcAHz9cAaBoZw6UpG20IG/YM3NNLaGPwPqgjBAFjIURzqoQs3rrtuw==
+
+"@fortawesome/fontawesome-svg-core@1.2.35":
+  version "1.2.35"
+  resolved "https://registry.yarnpkg.com/@fortawesome/fontawesome-svg-core/-/fontawesome-svg-core-1.2.35.tgz#85aea8c25645fcec88d35f2eb1045c38d3e65cff"
+  integrity sha512-uLEXifXIL7hnh2sNZQrIJWNol7cTVIzwI+4qcBIq9QWaZqUblm0IDrtSqbNg+3SQf8SMGHkiSigD++rHmCHjBg==
   dependencies:
-    "@fortawesome/fontawesome-common-types" "^0.2.12"
+    "@fortawesome/fontawesome-common-types" "^0.2.35"
 
 "@fortawesome/free-solid-svg-icons@5.6.3":
   version "5.6.3"
@@ -805,13 +810,12 @@
   dependencies:
     "@fortawesome/fontawesome-common-types" "^0.2.12"
 
-"@fortawesome/react-fontawesome@0.1.3":
-  version "0.1.3"
-  resolved "https://registry.yarnpkg.com/@fortawesome/react-fontawesome/-/react-fontawesome-0.1.3.tgz#266b4047892c3d10498af1075d89252f74015b11"
-  integrity sha512-tc689l67rPZ7+ynZVUgOXY80rAt5KxvuH1qjPpJcbyJzJHzk5yhrD993BjsSEdPBLTtPqmvwynsO/XrAQqHbtg==
+"@fortawesome/react-fontawesome@0.1.14":
+  version "0.1.14"
+  resolved "https://registry.yarnpkg.com/@fortawesome/react-fontawesome/-/react-fontawesome-0.1.14.tgz#bf28875c3935b69ce2dc620e1060b217a47f64ca"
+  integrity sha512-4wqNb0gRLVaBm/h+lGe8UfPPivcbuJ6ecI4hIgW0LjI7kzpYB9FkN0L9apbVzg+lsBdcTf0AlBtODjcSX5mmKA==
   dependencies:
-    humps "^2.0.1"
-    prop-types "^15.5.10"
+    prop-types "^15.7.2"
 
 "@lerna/add@3.21.0":
   version "3.21.0"
@@ -1585,50 +1589,50 @@
     react-is "^16.8.0"
 
 "@material-ui/styles@^4.10.0":
-  version "4.10.0"
-  resolved "https://registry.yarnpkg.com/@material-ui/styles/-/styles-4.10.0.tgz#2406dc23aa358217aa8cc772e6237bd7f0544071"
-  integrity sha512-XPwiVTpd3rlnbfrgtEJ1eJJdFCXZkHxy8TrdieaTvwxNYj42VnnCyFzxYeNW9Lhj4V1oD8YtQ6S5Gie7bZDf7Q==
+  version "4.11.4"
+  resolved "https://registry.yarnpkg.com/@material-ui/styles/-/styles-4.11.4.tgz#eb9dfccfcc2d208243d986457dff025497afa00d"
+  integrity sha512-KNTIZcnj/zprG5LW0Sao7zw+yG3O35pviHzejMdcSGCdWbiO8qzRgOYL8JAxAsWBKOKYwVZxXtHWaB5T2Kvxew==
   dependencies:
     "@babel/runtime" "^7.4.4"
     "@emotion/hash" "^0.8.0"
-    "@material-ui/types" "^5.1.0"
-    "@material-ui/utils" "^4.9.6"
+    "@material-ui/types" "5.1.0"
+    "@material-ui/utils" "^4.11.2"
     clsx "^1.0.4"
     csstype "^2.5.2"
     hoist-non-react-statics "^3.3.2"
-    jss "^10.0.3"
-    jss-plugin-camel-case "^10.0.3"
-    jss-plugin-default-unit "^10.0.3"
-    jss-plugin-global "^10.0.3"
-    jss-plugin-nested "^10.0.3"
-    jss-plugin-props-sort "^10.0.3"
-    jss-plugin-rule-value-function "^10.0.3"
-    jss-plugin-vendor-prefixer "^10.0.3"
+    jss "^10.5.1"
+    jss-plugin-camel-case "^10.5.1"
+    jss-plugin-default-unit "^10.5.1"
+    jss-plugin-global "^10.5.1"
+    jss-plugin-nested "^10.5.1"
+    jss-plugin-props-sort "^10.5.1"
+    jss-plugin-rule-value-function "^10.5.1"
+    jss-plugin-vendor-prefixer "^10.5.1"
     prop-types "^15.7.2"
 
 "@material-ui/system@^4.9.14":
-  version "4.9.14"
-  resolved "https://registry.yarnpkg.com/@material-ui/system/-/system-4.9.14.tgz#4b00c48b569340cefb2036d0596b93ac6c587a5f"
-  integrity sha512-oQbaqfSnNlEkXEziDcJDDIy8pbvwUmZXWNqlmIwDqr/ZdCK8FuV3f4nxikUh7hvClKV2gnQ9djh5CZFTHkZj3w==
+  version "4.11.3"
+  resolved "https://registry.yarnpkg.com/@material-ui/system/-/system-4.11.3.tgz#466bc14c9986798fd325665927c963eb47cc4143"
+  integrity sha512-SY7otguNGol41Mu2Sg6KbBP1ZRFIbFLHGK81y4KYbsV2yIcaEPOmsCK6zwWlp+2yTV3J/VwT6oSBARtGIVdXPw==
   dependencies:
     "@babel/runtime" "^7.4.4"
-    "@material-ui/utils" "^4.9.6"
+    "@material-ui/utils" "^4.11.2"
     csstype "^2.5.2"
     prop-types "^15.7.2"
 
-"@material-ui/types@^5.1.0":
+"@material-ui/types@5.1.0", "@material-ui/types@^5.1.0":
   version "5.1.0"
   resolved "https://registry.yarnpkg.com/@material-ui/types/-/types-5.1.0.tgz#efa1c7a0b0eaa4c7c87ac0390445f0f88b0d88f2"
   integrity sha512-7cqRjrY50b8QzRSYyhSpx4WRw2YuO0KKIGQEVk5J8uoz2BanawykgZGoWEqKm7pVIbzFDN0SpPcVV4IhOFkl8A==
 
-"@material-ui/utils@^4.10.2", "@material-ui/utils@^4.7.1", "@material-ui/utils@^4.9.6":
-  version "4.10.2"
-  resolved "https://registry.yarnpkg.com/@material-ui/utils/-/utils-4.10.2.tgz#3fd5470ca61b7341f1e0468ac8f29a70bf6df321"
-  integrity sha512-eg29v74P7W5r6a4tWWDAAfZldXIzfyO1am2fIsC39hdUUHm/33k6pGOKPbgDjg/U/4ifmgAePy/1OjkKN6rFRw==
+"@material-ui/utils@^4.10.2", "@material-ui/utils@^4.11.2", "@material-ui/utils@^4.7.1":
+  version "4.11.2"
+  resolved "https://registry.yarnpkg.com/@material-ui/utils/-/utils-4.11.2.tgz#f1aefa7e7dff2ebcb97d31de51aecab1bb57540a"
+  integrity sha512-Uul8w38u+PICe2Fg2pDKCaIG7kOyhowZ9vjiC1FsVwPABTW8vPPKfF6OvxRq3IiBaI1faOJmgdvMG7rMJARBhA==
   dependencies:
     "@babel/runtime" "^7.4.4"
     prop-types "^15.7.2"
-    react-is "^16.8.0"
+    react-is "^16.8.0 || ^17.0.0"
 
 "@mrmlnc/readdir-enhanced@^2.2.1":
   version "2.2.1"
@@ -3401,6 +3405,11 @@ chart.js@2.8.0:
     chartjs-color "^2.1.0"
     moment "^2.10.2"
 
+chart.js@^3.4.0:
+  version "3.4.0"
+  resolved "https://registry.yarnpkg.com/chart.js/-/chart.js-3.4.0.tgz#4fb2a750225fcc1b387221422f5d4260b55b4579"
+  integrity sha512-mJsRm2apQm5mwz2OgYqGNG4erZh/qljcRZkWSa0kLkFr3UC3e1wKRMgnIh6WdhUrNu0w/JT9PkjLyylqEqHXEQ==
+
 chartjs-color-string@^0.6.0:
   version "0.6.0"
   resolved "https://registry.yarnpkg.com/chartjs-color-string/-/chartjs-color-string-0.6.0.tgz#1df096621c0e70720a64f4135ea171d051402f71"
@@ -5971,11 +5980,6 @@ humanize-ms@^1.2.1:
   dependencies:
     ms "^2.0.0"
 
-humps@^2.0.1:
-  version "2.0.1"
-  resolved "https://registry.yarnpkg.com/humps/-/humps-2.0.1.tgz#dd02ea6081bd0568dc5d073184463957ba9ef9aa"
-  integrity sha1-3QLqYIG9BWjcXQcxhEY5V7qe+ao=
-
 hyphenate-style-name@^1.0.3:
   version "1.0.4"
   resolved "https://registry.yarnpkg.com/hyphenate-style-name/-/hyphenate-style-name-1.0.4.tgz#691879af8e220aea5750e8827db4ef62a54e361d"
@@ -6087,6 +6091,13 @@ in-publish@^2.0.0:
   resolved "https://registry.yarnpkg.com/in-publish/-/in-publish-2.0.1.tgz#948b1a535c8030561cea522f73f78f4be357e00c"
   integrity sha512-oDM0kUSNFC31ShNxHKUyfZKy8ZeXZBWMjMdZHKLOk13uvT27VTL/QzRGfRUcevJhpkZAvlhPYuXkF7eNWrtyxQ==
 
+indefinite-observable@^2.0.1:
+  version "2.0.1"
+  resolved "https://registry.yarnpkg.com/indefinite-observable/-/indefinite-observable-2.0.1.tgz#574af29bfbc17eb5947793797bddc94c9d859400"
+  integrity sha512-G8vgmork+6H9S8lUAg1gtXEj2JxIQTo0g2PbFiYOdjkziSI0F7UYBiVwhZRuixhBCNGczAls34+5HJPyZysvxQ==
+  dependencies:
+    symbol-observable "1.2.0"
+
 indent-string@^2.1.0:
   version "2.1.0"
   resolved "https://registry.yarnpkg.com/indent-string/-/indent-string-2.1.0.tgz#8e2d48348742121b4a8218b7a137e9a52049dc80"
@@ -7141,65 +7152,65 @@ jsprim@^1.2.2:
     json-schema "0.2.3"
     verror "1.10.0"
 
-jss-plugin-camel-case@^10.0.3:
-  version "10.4.0"
-  resolved "https://registry.yarnpkg.com/jss-plugin-camel-case/-/jss-plugin-camel-case-10.4.0.tgz#46c75ff7fd61c304984c21af5817823f0f501ceb"
-  integrity sha512-9oDjsQ/AgdBbMyRjc06Kl3P8lDCSEts2vYZiPZfGAxbGCegqE4RnMob3mDaBby5H9vL9gWmyyImhLRWqIkRUCw==
+jss-plugin-camel-case@^10.5.1:
+  version "10.6.0"
+  resolved "https://registry.yarnpkg.com/jss-plugin-camel-case/-/jss-plugin-camel-case-10.6.0.tgz#93d2cd704bf0c4af70cc40fb52d74b8a2554b170"
+  integrity sha512-JdLpA3aI/npwj3nDMKk308pvnhoSzkW3PXlbgHAzfx0yHWnPPVUjPhXFtLJzgKZge8lsfkUxvYSQ3X2OYIFU6A==
   dependencies:
     "@babel/runtime" "^7.3.1"
     hyphenate-style-name "^1.0.3"
-    jss "10.4.0"
+    jss "10.6.0"
 
-jss-plugin-default-unit@^10.0.3:
-  version "10.4.0"
-  resolved "https://registry.yarnpkg.com/jss-plugin-default-unit/-/jss-plugin-default-unit-10.4.0.tgz#2b10f01269eaea7f36f0f5fd1cfbfcc76ed42854"
-  integrity sha512-BYJ+Y3RUYiMEgmlcYMLqwbA49DcSWsGgHpVmEEllTC8MK5iJ7++pT9TnKkKBnNZZxTV75ycyFCR5xeLSOzVm4A==
+jss-plugin-default-unit@^10.5.1:
+  version "10.6.0"
+  resolved "https://registry.yarnpkg.com/jss-plugin-default-unit/-/jss-plugin-default-unit-10.6.0.tgz#af47972486819b375f0f3a9e0213403a84b5ef3b"
+  integrity sha512-7y4cAScMHAxvslBK2JRK37ES9UT0YfTIXWgzUWD5euvR+JR3q+o8sQKzBw7GmkQRfZijrRJKNTiSt1PBsLI9/w==
   dependencies:
     "@babel/runtime" "^7.3.1"
-    jss "10.4.0"
+    jss "10.6.0"
 
-jss-plugin-global@^10.0.3:
-  version "10.4.0"
-  resolved "https://registry.yarnpkg.com/jss-plugin-global/-/jss-plugin-global-10.4.0.tgz#19449425a94e4e74e113139b629fd44d3577f97d"
-  integrity sha512-b8IHMJUmv29cidt3nI4bUI1+Mo5RZE37kqthaFpmxf5K7r2aAegGliAw4hXvA70ca6ckAoXMUl4SN/zxiRcRag==
+jss-plugin-global@^10.5.1:
+  version "10.6.0"
+  resolved "https://registry.yarnpkg.com/jss-plugin-global/-/jss-plugin-global-10.6.0.tgz#3e8011f760f399cbadcca7f10a485b729c50e3ed"
+  integrity sha512-I3w7ji/UXPi3VuWrTCbHG9rVCgB4yoBQLehGDTmsnDfXQb3r1l3WIdcO8JFp9m0YMmyy2CU7UOV6oPI7/Tmu+w==
   dependencies:
     "@babel/runtime" "^7.3.1"
-    jss "10.4.0"
+    jss "10.6.0"
 
-jss-plugin-nested@^10.0.3:
-  version "10.4.0"
-  resolved "https://registry.yarnpkg.com/jss-plugin-nested/-/jss-plugin-nested-10.4.0.tgz#017d0c02c0b6b454fd9d7d3fc33470a15eea9fd1"
-  integrity sha512-cKgpeHIxAP0ygeWh+drpLbrxFiak6zzJ2toVRi/NmHbpkNaLjTLgePmOz5+67ln3qzJiPdXXJB1tbOyYKAP4Pw==
+jss-plugin-nested@^10.5.1:
+  version "10.6.0"
+  resolved "https://registry.yarnpkg.com/jss-plugin-nested/-/jss-plugin-nested-10.6.0.tgz#5f83c5c337d3b38004834e8426957715a0251641"
+  integrity sha512-fOFQWgd98H89E6aJSNkEh2fAXquC9aZcAVjSw4q4RoQ9gU++emg18encR4AT4OOIFl4lQwt5nEyBBRn9V1Rk8g==
   dependencies:
     "@babel/runtime" "^7.3.1"
-    jss "10.4.0"
+    jss "10.6.0"
     tiny-warning "^1.0.2"
 
-jss-plugin-props-sort@^10.0.3:
-  version "10.4.0"
-  resolved "https://registry.yarnpkg.com/jss-plugin-props-sort/-/jss-plugin-props-sort-10.4.0.tgz#7110bf0b6049cc2080b220b506532bf0b70c0e07"
-  integrity sha512-j/t0R40/2fp+Nzt6GgHeUFnHVY2kPGF5drUVlgkcwYoHCgtBDOhTTsOfdaQFW6sHWfoQYgnGV4CXdjlPiRrzwA==
+jss-plugin-props-sort@^10.5.1:
+  version "10.6.0"
+  resolved "https://registry.yarnpkg.com/jss-plugin-props-sort/-/jss-plugin-props-sort-10.6.0.tgz#297879f35f9fe21196448579fee37bcde28ce6bc"
+  integrity sha512-oMCe7hgho2FllNc60d9VAfdtMrZPo9n1Iu6RNa+3p9n0Bkvnv/XX5San8fTPujrTBScPqv9mOE0nWVvIaohNuw==
   dependencies:
     "@babel/runtime" "^7.3.1"
-    jss "10.4.0"
+    jss "10.6.0"
 
-jss-plugin-rule-value-function@^10.0.3:
-  version "10.4.0"
-  resolved "https://registry.yarnpkg.com/jss-plugin-rule-value-function/-/jss-plugin-rule-value-function-10.4.0.tgz#7cff4a91e84973536fa49b6ebbdbf7f339b01c82"
-  integrity sha512-w8504Cdfu66+0SJoLkr6GUQlEb8keHg8ymtJXdVHWh0YvFxDG2l/nS93SI5Gfx0fV29dO6yUugXnKzDFJxrdFQ==
+jss-plugin-rule-value-function@^10.5.1:
+  version "10.6.0"
+  resolved "https://registry.yarnpkg.com/jss-plugin-rule-value-function/-/jss-plugin-rule-value-function-10.6.0.tgz#3c1a557236a139d0151e70a82c810ccce1c1c5ea"
+  integrity sha512-TKFqhRTDHN1QrPTMYRlIQUOC2FFQb271+AbnetURKlGvRl/eWLswcgHQajwuxI464uZk91sPiTtdGi7r7XaWfA==
   dependencies:
     "@babel/runtime" "^7.3.1"
-    jss "10.4.0"
+    jss "10.6.0"
     tiny-warning "^1.0.2"
 
-jss-plugin-vendor-prefixer@^10.0.3:
-  version "10.4.0"
-  resolved "https://registry.yarnpkg.com/jss-plugin-vendor-prefixer/-/jss-plugin-vendor-prefixer-10.4.0.tgz#2a78f3c5d57d1e024fe7ad7c41de34d04e72ecc0"
-  integrity sha512-DpF+/a+GU8hMh/948sBGnKSNfKkoHg2p9aRFUmyoyxgKjOeH9n74Ht3Yt8lOgdZsuWNJbPrvaa3U4PXKwxVpTQ==
+jss-plugin-vendor-prefixer@^10.5.1:
+  version "10.6.0"
+  resolved "https://registry.yarnpkg.com/jss-plugin-vendor-prefixer/-/jss-plugin-vendor-prefixer-10.6.0.tgz#e1fcd499352846890c38085b11dbd7aa1c4f2c78"
+  integrity sha512-doJ7MouBXT1lypLLctCwb4nJ6lDYqrTfVS3LtXgox42Xz0gXusXIIDboeh6UwnSmox90QpVnub7au8ybrb0krQ==
   dependencies:
     "@babel/runtime" "^7.3.1"
     css-vendor "^2.0.8"
-    jss "10.4.0"
+    jss "10.6.0"
 
 jss@10.0.3:
   version "10.0.3"
@@ -7211,13 +7222,14 @@ jss@10.0.3:
     is-in-browser "^1.1.3"
     tiny-warning "^1.0.2"
 
-jss@10.4.0, jss@^10.0.3:
-  version "10.4.0"
-  resolved "https://registry.yarnpkg.com/jss/-/jss-10.4.0.tgz#473a6fbe42e85441020a07e9519dac1e8a2e79ca"
-  integrity sha512-l7EwdwhsDishXzqTc3lbsbyZ83tlUl5L/Hb16pHCvZliA9lRDdNBZmHzeJHP0sxqD0t1mrMmMR8XroR12JBYzw==
+jss@10.6.0, jss@^10.5.1:
+  version "10.6.0"
+  resolved "https://registry.yarnpkg.com/jss/-/jss-10.6.0.tgz#d92ff9d0f214f65ca1718591b68e107be4774149"
+  integrity sha512-n7SHdCozmxnzYGXBHe0NsO0eUf9TvsHVq2MXvi4JmTn3x5raynodDVE/9VQmBdWFyyj9HpHZ2B4xNZ7MMy7lkw==
   dependencies:
     "@babel/runtime" "^7.3.1"
     csstype "^3.0.2"
+    indefinite-observable "^2.0.1"
     is-in-browser "^1.1.3"
     tiny-warning "^1.0.2"
 
@@ -9271,7 +9283,7 @@ promzard@^0.3.0:
   dependencies:
     read "1"
 
-prop-types@15.7.2, prop-types@^15.5.10, prop-types@^15.5.8, prop-types@^15.6.2, prop-types@^15.7.2:
+prop-types@15.7.2, prop-types@^15.5.8, prop-types@^15.6.2, prop-types@^15.7.2:
   version "15.7.2"
   resolved "https://registry.yarnpkg.com/prop-types/-/prop-types-15.7.2.tgz#52c41e75b8c87e72b9d9360e0206b99dcbffa6c5"
   integrity sha512-8QQikdH7//R2vurIJSutZ1smHYTcLpRWEOlHnzcWHmBYrOGUysKwSsrC89BCiFj3CbrfJ/nXFdJepOVrY1GCHQ==
@@ -9479,6 +9491,13 @@ react-chartjs-2@2.7.6:
     lodash "^4.17.4"
     prop-types "^15.5.8"
 
+react-chartjs-2@^3.0.3:
+  version "3.0.3"
+  resolved "https://registry.yarnpkg.com/react-chartjs-2/-/react-chartjs-2-3.0.3.tgz#9cb1981396f9574afebd29aff4e6df71ed615596"
+  integrity sha512-jOFZKwZ8sMLkddewZ/tToxuu4pYimAvvY5I6uK+hCpSFT16Pvo2bdHhUoZ0X87zu9I+dx2I+JCqaLN6XhmrbDg==
+  dependencies:
+    lodash "^4.17.19"
+
 react-dom@17.0.1:
   version "17.0.1"
   resolved "https://registry.yarnpkg.com/react-dom/-/react-dom-17.0.1.tgz#1de2560474ec9f0e334285662ede52dbc5426fc6"
@@ -9498,6 +9517,11 @@ react-is@^16.6.0, react-is@^16.7.0, react-is@^16.8.0, react-is@^16.8.1, react-is
   resolved "https://registry.yarnpkg.com/react-is/-/react-is-16.13.1.tgz#789729a4dc36de2999dc156dd6c1d9c18cea56a4"
   integrity sha512-24e6ynE2H+OKt4kqsOvNd8kBpV65zoxbA4BVsEOB3ARVWQki/DHzaUoC5KuON/BiccDaCCTZBuOcfZs70kR8bQ==
 
+"react-is@^16.8.0 || ^17.0.0":
+  version "17.0.2"
+  resolved "https://registry.yarnpkg.com/react-is/-/react-is-17.0.2.tgz#e691d4a8e9c789365655539ab372762b0efb54f0"
+  integrity sha512-w2GsyukL62IJnlaff/nRegPQR94C/XXamvMWmSHRJ4y7Ts/4ocGRmTHvOs8PSE6pB3dWOrD/nueuU5sduBsQ4w==
+
 react-router-dom@5.2.0:
   version "5.2.0"
   resolved "https://registry.yarnpkg.com/react-router-dom/-/react-router-dom-5.2.0.tgz#9e65a4d0c45e13289e66c7b17c7e175d0ea15662"
@@ -10822,6 +10846,11 @@ supports-color@^6.1.0:
   dependencies:
     has-flag "^3.0.0"
 
+symbol-observable@1.2.0:
+  version "1.2.0"
+  resolved "https://registry.yarnpkg.com/symbol-observable/-/symbol-observable-1.2.0.tgz#c22688aed4eab3cdc2dfeacbb561660560a00804"
+  integrity sha512-e900nM8RRtGhlV36KGEU9k65K3mPb1WV70OdjfxlG2EAuM1noi/E/BaW/uMhL7bPEssK8QV57vN3esixjUvcXQ==
+
 symbol-tree@^3.2.2:
   version "3.2.4"
   resolved "https://registry.yarnpkg.com/symbol-tree/-/symbol-tree-3.2.4.tgz#430637d248ba77e078883951fb9aa0eed7c63fa2"
-- 
2.16.6