From 62e834802dae0bd15504785503060d7875c7b4ad Mon Sep 17 00:00:00 2001
From: Herbert Eiselt <herbert.eiselt@highstreet-technologies.com>
Date: Thu, 28 Mar 2019 19:00:35 +0100
Subject: Add SDN-R odlux performance

A UI displaying performance monitoring data

Change-Id: I2a9c28549aee1bcac366354c343a63f884bf09e0
Issue-ID: SDNC-585
Signed-off-by: Herbert Eiselt <herbert.eiselt@highstreet-technologies.com>
---
 sdnr/wt/odlux/apps/maintenanceApp/pom.xml                         | 8 +++++---
 .../odlux/apps/maintenanceApp/src/actions/maintenenceActions.ts   | 2 +-
 .../apps/maintenanceApp/src/handlers/maintenanceAppRootHandler.ts | 4 ++--
 sdnr/wt/odlux/apps/maintenanceApp/src/plugin.tsx                  | 4 ++--
 sdnr/wt/odlux/apps/maintenanceApp/src/views/maintenenceView.tsx   | 4 ++--
 sdnr/wt/odlux/apps/maintenanceApp/webpack.config.js               | 4 ++--
 6 files changed, 14 insertions(+), 12 deletions(-)

(limited to 'sdnr/wt/odlux/apps/maintenanceApp')

diff --git a/sdnr/wt/odlux/apps/maintenanceApp/pom.xml b/sdnr/wt/odlux/apps/maintenanceApp/pom.xml
index cdbc9b096..87ff29043 100644
--- a/sdnr/wt/odlux/apps/maintenanceApp/pom.xml
+++ b/sdnr/wt/odlux/apps/maintenanceApp/pom.xml
@@ -1,11 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
 
     <parent>
         <groupId>org.onap.ccsdk.parent</groupId>
         <artifactId>odlparent</artifactId>
         <version>1.2.2-SNAPSHOT</version>
-        <relativePath/>
+        <relativePath />
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <groupId>org.onap.ccsdk.features.sdnr.wt</groupId>
@@ -125,7 +127,7 @@
                 <configuration>
                     <instructions>
                         <Import-Package>org.onap.ccsdk.features.sdnr.wt.odlux.model.*,com.opensymphony.*</Import-Package>
-                        <Private-Package/>
+                        <Private-Package></Private-Package>
                     </instructions>
                 </configuration>
             </plugin>
diff --git a/sdnr/wt/odlux/apps/maintenanceApp/src/actions/maintenenceActions.ts b/sdnr/wt/odlux/apps/maintenanceApp/src/actions/maintenenceActions.ts
index 753c1183f..3fe75ad51 100644
--- a/sdnr/wt/odlux/apps/maintenanceApp/src/actions/maintenenceActions.ts
+++ b/sdnr/wt/odlux/apps/maintenanceApp/src/actions/maintenenceActions.ts
@@ -30,7 +30,7 @@ export const loadAllMainteneceEntriesAsyncAction = (dispatch: Dispatch , getStat
     }
 
     // combine ell entries from the maintenance index with all networkelements
-    const networkElements = getState().connectApp.mountedNetworkElements;
+    const networkElements = getState().connect.mountedNetworkElements;
     const maintenenceEntries = networkElements.elements.reduce((acc, cur) => {
       const entry = entries.find(e => e.mountId === cur.mountId);
       acc.push(entry || {
diff --git a/sdnr/wt/odlux/apps/maintenanceApp/src/handlers/maintenanceAppRootHandler.ts b/sdnr/wt/odlux/apps/maintenanceApp/src/handlers/maintenanceAppRootHandler.ts
index 956d05843..d2e387cc4 100644
--- a/sdnr/wt/odlux/apps/maintenanceApp/src/handlers/maintenanceAppRootHandler.ts
+++ b/sdnr/wt/odlux/apps/maintenanceApp/src/handlers/maintenanceAppRootHandler.ts
@@ -14,8 +14,8 @@ export interface IMaintenanceAppStoreState {
 
 declare module '../../../../framework/src/store/applicationStore' {
   interface IApplicationStoreState {
-    maintenanceApp: IMaintenanceAppStoreState,
-    connectApp: IConnectAppStoreState
+    maintenance: IMaintenanceAppStoreState,
+    connect: IConnectAppStoreState
   }
 }
 
diff --git a/sdnr/wt/odlux/apps/maintenanceApp/src/plugin.tsx b/sdnr/wt/odlux/apps/maintenanceApp/src/plugin.tsx
index 19e188ec2..f23a875e3 100644
--- a/sdnr/wt/odlux/apps/maintenanceApp/src/plugin.tsx
+++ b/sdnr/wt/odlux/apps/maintenanceApp/src/plugin.tsx
@@ -16,11 +16,11 @@ const App : React.SFC = (props) => {
 
 export function register() {
   applicationManager.registerApplication({
-    name: "maintenanceApp",
+    name: "maintenance",
     icon: faLock,
     rootComponent: App,
     rootActionHandler: maintenanceAppRootHandler,
-    menuEntry: "Maintenance App"
+    menuEntry: "Maintenance"
   });
 }
 
diff --git a/sdnr/wt/odlux/apps/maintenanceApp/src/views/maintenenceView.tsx b/sdnr/wt/odlux/apps/maintenanceApp/src/views/maintenenceView.tsx
index f048d6cc5..0a8ad4a59 100644
--- a/sdnr/wt/odlux/apps/maintenanceApp/src/views/maintenenceView.tsx
+++ b/sdnr/wt/odlux/apps/maintenanceApp/src/views/maintenenceView.tsx
@@ -37,8 +37,8 @@ const styles = (theme: Theme) => createStyles({
 const MaintenenceEntriesTable = MaterialTable as MaterialTableCtorType<MaintenenceEntry>;
 
 const mapProps = (state: IApplicationStoreState) => ({
-   maintenenceEntries: state.maintenanceApp.maintenenceEntries.entries,
-   busy: state.maintenanceApp.maintenenceEntries.busy
+   maintenenceEntries: state.maintenance.maintenenceEntries.entries,
+   busy: state.maintenance.maintenenceEntries.busy
 });
 
 const mapDispatcher = (dispatcher: IDispatcher) => ({
diff --git a/sdnr/wt/odlux/apps/maintenanceApp/webpack.config.js b/sdnr/wt/odlux/apps/maintenanceApp/webpack.config.js
index 0a2f5abb8..325e70380 100644
--- a/sdnr/wt/odlux/apps/maintenanceApp/webpack.config.js
+++ b/sdnr/wt/odlux/apps/maintenanceApp/webpack.config.js
@@ -127,11 +127,11 @@ module.exports = (env) => {
       },
       proxy: {
         "/restconf": {
-          target: "http://localhost:8181",
+          target: "http://localhost:3000",
           secure: false
         },
         "/database": {
-          target: "http://localhost:8181",
+          target: "http://localhost:3000",
           secure: false
         }
       }
-- 
cgit 1.2.3-korg