Update ODLUX

Update login view, add logout after user session ends, add user settings, several bugfixes
Issue-ID: CCSDK-3540

Signed-off-by: Aijana Schumann <aijana.schumann@highstreet-technologies.com>
Change-Id: I21137756b204287e25766a9646bf2faf7bad9d35

6 files changed, 38 insertions, 13 deletions

diff --git a/sdnr/wt/odlux/apps/connectApp/src/actions/connectionStatusCountActions.ts b/sdnr/wt/odlux/apps/connectApp/src/actions/connectionStatusCountActions.ts
index e1e16b704..43bae720c 100644
--- a/sdnr/wt/odlux/apps/connectApp/src/actions/connectionStatusCountActions.ts
+++ b/sdnr/wt/odlux/apps/connectApp/src/actions/connectionStatusCountActions.ts
@@ -26,13 +26,14 @@ 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) {
+    public MountedCount: number, public UnableToConnectCount: number, public UndefinedCount: number, public UnmountedCount: number, public totalCount: number, public isLoadingConnectionStatusChart: boolean) {
     super();
   }
 }
 
 
 export const refreshConnectionStatusCountAsyncAction = async (dispatch: Dispatch) => {
+  dispatch(new SetConnectionStatusCountAction(0, 0, 0, 0, 0, 0, 0, 0, true));
   const result = await getConnectionStatusCountStateFromDatabase().catch(_ => null);
   if (result) {
     const statusAction = new SetConnectionStatusCountAction(
@@ -43,10 +44,12 @@ export const refreshConnectionStatusCountAsyncAction = async (dispatch: Dispatch
       result["UnableToConnect"] || 0,
       result["Undefined"] || 0,
       result["Unmounted"] || 0,
-      result["total"] || 0
+      result["total"] || 0,
+      false
     );
     dispatch(statusAction);
     return;
+  } else {
+    dispatch(new SetConnectionStatusCountAction(0, 0, 0, 0, 0, 0, 0, 0, false));
   }
-  dispatch(new SetConnectionStatusCountAction(0, 0, 0, 0, 0, 0, 0, 0));
 }
diff --git a/sdnr/wt/odlux/apps/connectApp/src/components/editNetworkElementDialog.tsx b/sdnr/wt/odlux/apps/connectApp/src/components/editNetworkElementDialog.tsx
index df265c23d..061303976 100644
--- a/sdnr/wt/odlux/apps/connectApp/src/components/editNetworkElementDialog.tsx
+++ b/sdnr/wt/odlux/apps/connectApp/src/components/editNetworkElementDialog.tsx
@@ -233,8 +233,8 @@ class EditNetworkElementDialogComponent extends React.Component<EditNetworkEleme
           {setting.enableUsernameEditor &&
             <RadioGroup row aria-label="password-tls-key" name="password-tls-key" value={radioSelected}
               onChange={this.handleRadioChange} >
-              <FormControlLabel value='password' control={<Radio />} label="Password" onChange={this.onRadioSelect} />
-              <FormControlLabel value='tlsKey' control={<Radio />} label="TlsKey" onChange={this.onRadioSelect} />
+              <FormControlLabel aria-label="passwordSelection" value='password' control={<Radio />} label="Password" onChange={this.onRadioSelect} />
+              <FormControlLabel aria-label="tlsKeySelection" value='tlsKey' control={<Radio />} label="TlsKey" onChange={this.onRadioSelect} />
             </RadioGroup> || null}
 
           {setting.enableUsernameEditor && showPasswordTextField &&
diff --git a/sdnr/wt/odlux/apps/connectApp/src/components/infoNetworkElementDialog.tsx b/sdnr/wt/odlux/apps/connectApp/src/components/infoNetworkElementDialog.tsx
index 9b71eb354..aeaaa91e7 100644
--- a/sdnr/wt/odlux/apps/connectApp/src/components/infoNetworkElementDialog.tsx
+++ b/sdnr/wt/odlux/apps/connectApp/src/components/infoNetworkElementDialog.tsx
@@ -113,7 +113,7 @@
        <>
          <Dialog open={this.props.mode !== InfoNetworkElementDialogMode.None}  >
            <DialogTitle id="form-dialog-title">{setting.dialogTitle + ' - ' + this.state.nodeId}</DialogTitle>
-           <InfoElementTable stickyHeader tableId="info-element-table" asynchronus columns={[
+           <InfoElementTable stickyHeader isPopup tableId="info-element-table" asynchronus columns={[
              { property: "module", title: "Module", type: ColumnType.text, width:900 },
              {
                property: "revision", title: "Revision", type: ColumnType.custom, customControl: ({ rowData }) => {
diff --git a/sdnr/wt/odlux/apps/connectApp/src/handlers/connectionStatusCountHandler.ts b/sdnr/wt/odlux/apps/connectApp/src/handlers/connectionStatusCountHandler.ts
index 611786520..219a09617 100644
--- a/sdnr/wt/odlux/apps/connectApp/src/handlers/connectionStatusCountHandler.ts
+++ b/sdnr/wt/odlux/apps/connectApp/src/handlers/connectionStatusCountHandler.ts
@@ -26,7 +26,8 @@ export interface IConnectionStatusCount {
    UnableToConnect: number,
    Undefined: number,
    Unmounted: number,
-   total: number
+   total: number,
+   isLoadingConnectionStatusChart: boolean
 }
 
 const connectionStatusCountInit: IConnectionStatusCount = {
@@ -37,7 +38,8 @@ const connectionStatusCountInit: IConnectionStatusCount = {
    UnableToConnect: 0,
    Undefined: 0,
    Unmounted: 0,
-   total: 0
+   total: 0,
+   isLoadingConnectionStatusChart: false
 };
 
 export const connectionStatusCountHandler: IActionHandler<IConnectionStatusCount> = (state = connectionStatusCountInit, action) => {
@@ -50,7 +52,8 @@ export const connectionStatusCountHandler: IActionHandler<IConnectionStatusCount
          UnableToConnect: action.UnableToConnectCount,
          Undefined: action.UndefinedCount,
          Unmounted: action.UnmountedCount,
-         total: action.totalCount
+         total: action.totalCount,
+         isLoadingConnectionStatusChart: action.isLoadingConnectionStatusChart
       }
    }
 
diff --git a/sdnr/wt/odlux/apps/connectApp/src/index.html b/sdnr/wt/odlux/apps/connectApp/src/index.html
index 35dbdf71d..1a16876c9 100644
--- a/sdnr/wt/odlux/apps/connectApp/src/index.html
+++ b/sdnr/wt/odlux/apps/connectApp/src/index.html
@@ -19,7 +19,7 @@
       connectApp.register();
       faultApp.register();
       inventoryApp.register();
-      app("./app.tsx").configureApplication({ authentication:"oauth",  enablePolicy:  false, transportpceUrl:"http://test.de"});
+      app("./app.tsx").configureApplication({ authentication:"basic",  enablePolicy:  false, transportpceUrl:"http://test.de"});
       app("./app.tsx").runApplication();
     });
   </script>
diff --git a/sdnr/wt/odlux/apps/connectApp/src/pluginConnect.tsx b/sdnr/wt/odlux/apps/connectApp/src/pluginConnect.tsx
index 1990cc03d..afca74664 100644
--- a/sdnr/wt/odlux/apps/connectApp/src/pluginConnect.tsx
+++ b/sdnr/wt/odlux/apps/connectApp/src/pluginConnect.tsx
@@ -35,6 +35,8 @@ import { PanelId } from "./models/panelId";
 import { NetworkElementsList } from './components/networkElements'
 
 let currentStatus: string | undefined = undefined;
+let refreshInterval: ReturnType<typeof window.setInterval> | null = null;
+
 
 const mapProps = (state: IApplicationStoreState) => ({
   currentProblemsProperties: createNetworkElementsProperties(state),
@@ -108,9 +110,26 @@ export function register() {
   applicationApi.applicationStoreInitialized.then(store => {
     store.dispatch(refreshConnectionStatusCountAsyncAction);
   });
-  window.setInterval(() => {
+
+
+  applicationApi.loginEvent.addHandler(e=>{
+    refreshInterval = startRefreshInterval() as any;
+  })
+
+  applicationApi.logoutEvent.addHandler(e=>{
+
     applicationApi.applicationStoreInitialized.then(store => {
-      store.dispatch(refreshConnectionStatusCountAsyncAction);
+      clearInterval(refreshInterval!);
     });
-  }, 15000);
+  })
+
+  const startRefreshInterval =() =>{
+    const refresh = window.setInterval(() => {
+      applicationApi.applicationStoreInitialized.then(store => {
+        store.dispatch(refreshConnectionStatusCountAsyncAction);
+      });
+    }, 15000);
+
+    return refresh;
+  }
 }
\ No newline at end of file