Merge "Add SDN-R odlux performance"

4 files changed, 16 insertions, 14 deletions

diff --git a/sdnr/wt/odlux/apps/demoApp/pom.xml b/sdnr/wt/odlux/apps/demoApp/pom.xml
index 6e7065664..1d8b9d739 100644
--- a/sdnr/wt/odlux/apps/demoApp/pom.xml
+++ b/sdnr/wt/odlux/apps/demoApp/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/demoApp/src/handlers/demoAppRootHandler.ts b/sdnr/wt/odlux/apps/demoApp/src/handlers/demoAppRootHandler.ts
index ee21a9c90..00546fd07 100644
--- a/sdnr/wt/odlux/apps/demoApp/src/handlers/demoAppRootHandler.ts
+++ b/sdnr/wt/odlux/apps/demoApp/src/handlers/demoAppRootHandler.ts
@@ -13,7 +13,7 @@ export interface IDemoAppStoreState {
 
 declare module '../../../../framework/src/store/applicationStore' {
   interface IApplicationStoreState {
-    demoApp: IDemoAppStoreState
+    demo: IDemoAppStoreState
   }
 }
 
diff --git a/sdnr/wt/odlux/apps/demoApp/src/plugin.tsx b/sdnr/wt/odlux/apps/demoApp/src/plugin.tsx
index f450275c2..cd9efe136 100644
--- a/sdnr/wt/odlux/apps/demoApp/src/plugin.tsx
+++ b/sdnr/wt/odlux/apps/demoApp/src/plugin.tsx
@@ -1,4 +1,4 @@
-import * as React from "react"; 
+import * as React from "react";
 import { withRouter, RouteComponentProps, Route, Switch, Redirect } from 'react-router-dom';
 
 import { faAddressBook, faRegistered } from '@fortawesome/free-solid-svg-icons';
@@ -17,21 +17,21 @@ type AppProps = RouteComponentProps & Connect;
 
 const App = (props: AppProps) => (
   <Switch>
-    <Route exact path={ `${ props.match.path }/authors` } component={AuthorsList} /> 
-    <Route path={ `${ props.match.path }/authors/:authorId` } component={EditAuthor } /> 
+    <Route exact path={ `${ props.match.path }/authors` } component={AuthorsList} />
+    <Route path={ `${ props.match.path }/authors/:authorId` } component={EditAuthor } />
     <Redirect to={ `${ props.match.path }/authors` } />
    </Switch>
-); 
- 
-const FinalApp = withRouter(connect()(App)); 
+);
+
+const FinalApp = withRouter(connect()(App));
 
 export function register() {
   const applicationApi = applicationManager.registerApplication({
-    name: "demoApp",
+    name: "demo",
     icon: faAddressBook,
     rootComponent: FinalApp,
     rootActionHandler: demoAppRootHandler,
     exportedComponents: { counter: Counter },
-    menuEntry: "Demo App"
+    menuEntry: "Demo"
   });
 }
diff --git a/sdnr/wt/odlux/apps/demoApp/src/views/authorsList.tsx b/sdnr/wt/odlux/apps/demoApp/src/views/authorsList.tsx
index b192fccf8..75761cd19 100644
--- a/sdnr/wt/odlux/apps/demoApp/src/views/authorsList.tsx
+++ b/sdnr/wt/odlux/apps/demoApp/src/views/authorsList.tsx
@@ -20,7 +20,7 @@ interface IAuthorsListProps {
 }
 
 class AuthorsListComponent extends React.Component<RouteComponentProps & IAuthorsListProps> {
- 
+
   render(): JSX.Element {
     const { authors, busy } = this.props;
     return (
@@ -58,7 +58,7 @@ class AuthorsListComponent extends React.Component<RouteComponentProps & IAuthor
 
 export const AuthorsList = withRouter(
   connect(
-    ({ demoApp: state }) => ({
+    ({ demo: state }) => ({
       authors: state.listAuthors.authors,
       busy: state.listAuthors.busy
     }),