Update odlux

Update performance app: fix scrolling bug, reduce loading times, update ui to use tabs instead of panels, change the view to toggle between chart and table to better visualize data, minior bugfixes for other apps

Issue-ID: SDNC-1080
Signed-off-by: Aijana Schumann <aijana.schumann@highstreet-technologies.com>
Change-Id: I2b5cf3a5f580f4193421bc047e5256d8e9497e6b
Signed-off-by: Aijana Schumann <aijana.schumann@highstreet-technologies.com>

2 files changed, 46 insertions, 8 deletions

diff --git a/sdnr/wt/odlux/apps/performanceHistoryApp/src/handlers/availableLtpsActionHandler.ts b/sdnr/wt/odlux/apps/performanceHistoryApp/src/handlers/availableLtpsActionHandler.ts
index b3b284b42..fd137fe37 100644
--- a/sdnr/wt/odlux/apps/performanceHistoryApp/src/handlers/availableLtpsActionHandler.ts
+++ b/sdnr/wt/odlux/apps/performanceHistoryApp/src/handlers/availableLtpsActionHandler.ts
@@ -20,6 +20,7 @@ import { IActionHandler } from '../../../../framework/src/flux/action';
 import {
   AllAvailableLtpsLoadedAction,
   LoadAllAvailableLtpsAction,
+  SetInitialLoadedAction,
 } from '../actions/ltpAction';
 
 import { LtpIds } from '../models/availableLtps';
@@ -27,11 +28,13 @@ import { LtpIds } from '../models/availableLtps';
 export interface IAvailableLtpsState {
   distinctLtps: LtpIds[];
   busy: boolean;
+  loadedOnce: boolean;
 }
 
 const ltpListStateInit: IAvailableLtpsState = {
   distinctLtps: [],
-  busy: false
+  busy: false,
+  loadedOnce: false
 };
 
 export const availableLtpsActionHandler: IActionHandler<IAvailableLtpsState> = (state = ltpListStateInit, action) => {
@@ -47,14 +50,22 @@ export const availableLtpsActionHandler: IActionHandler<IAvailableLtpsState> = (
       state = {
         ...state,
         distinctLtps: action.availableLtps,
-        busy: false
-      };
-    } else {
-      state = {
-        ...state,
-        busy: false
+        busy: false,
+        loadedOnce: true
       };
     }
+  } else if (action instanceof SetInitialLoadedAction) {
+
+    state = {
+      ...state,
+      loadedOnce: action.initialLoaded
+    };
+  } else {
+    state = {
+      ...state,
+      busy: false
+    };
   }
+
   return state;
 };
\ No newline at end of file
diff --git a/sdnr/wt/odlux/apps/performanceHistoryApp/src/handlers/performanceHistoryRootHandler.ts b/sdnr/wt/odlux/apps/performanceHistoryApp/src/handlers/performanceHistoryRootHandler.ts
index c33f10a7e..e57f3860c 100644
--- a/sdnr/wt/odlux/apps/performanceHistoryApp/src/handlers/performanceHistoryRootHandler.ts
+++ b/sdnr/wt/odlux/apps/performanceHistoryApp/src/handlers/performanceHistoryRootHandler.ts
@@ -37,6 +37,8 @@ import { IAvailableLtpsState, availableLtpsActionHandler } from './availableLtps
 import { PmDataInterval } from '../models/performanceDataType';
 import { TimeChangeAction } from '../actions/timeChangeAction';
 import { UpdateMountId } from '../actions/deviceListActions';
+import { SetSubViewAction, ResetAllSubViewsAction } from '../actions/toggleActions';
+import { SubTabType } from '../models/toggleDataType';
 
 export interface IPerformanceHistoryStoreState {
   nodeId: string;
@@ -51,6 +53,7 @@ export interface IPerformanceHistoryStoreState {
   crossPolarDiscrimination: ICrossPolarDiscriminationState;
   currentOpenPanel: string | null;
   pmDataIntervalType: PmDataInterval;
+  subViews: toggleViewDataType;
 }
 
 const mountIdHandler: IActionHandler<string> = (state = "", action) => {
@@ -78,6 +81,29 @@ const currentPMDataIntervalHandler: IActionHandler<PmDataInterval> = (state = Pm
   return state;
 }
 
+
+type toggleViewDataType = { performanceDataSelection: SubTabType, receiveLevelDataSelection: SubTabType, transmissionPower: SubTabType, adaptiveModulation: SubTabType, temperatur: SubTabType, SINR: SubTabType, CPD: SubTabType };
+
+
+const toogleViewDataHandler: IActionHandler<toggleViewDataType> = (state = { performanceDataSelection: "chart", receiveLevelDataSelection: "chart", adaptiveModulation: "chart", transmissionPower: "chart", temperatur: "chart", SINR: "chart", CPD: "chart" }, action) => {
+
+  if (action instanceof SetSubViewAction) {
+    switch (action.currentView) {
+      case "performanceData": state = { ...state, performanceDataSelection: action.selectedTab }; break;
+      case "adaptiveModulation": state = { ...state, adaptiveModulation: action.selectedTab }; break;
+      case "receiveLevel": state = { ...state, receiveLevelDataSelection: action.selectedTab }; break;
+      case "transmissionPower": state = { ...state, transmissionPower: action.selectedTab }; break;
+      case "Temp": state = { ...state, temperatur: action.selectedTab }; break;
+      case "SINR": state = { ...state, SINR: action.selectedTab }; break;
+      case "CPD": state = { ...state, CPD: action.selectedTab }; break;
+    }
+  } else if (action instanceof ResetAllSubViewsAction) {
+    state = { performanceDataSelection: "chart", adaptiveModulation: "chart", receiveLevelDataSelection: "chart", transmissionPower: "chart", temperatur: "chart", SINR: "chart", CPD: "chart" }
+  }
+
+  return state;
+}
+
 declare module '../../../../framework/src/store/applicationStore' {
   interface IApplicationStoreState {
     performanceHistory: IPerformanceHistoryStoreState;
@@ -97,7 +123,8 @@ const actionHandlers = {
   signalToInterference: signalToInterferenceActionHandler,
   crossPolarDiscrimination: crossPolarDiscriminationActionHandler,
   currentOpenPanel: currentOpenPanelHandler,
-  pmDataIntervalType: currentPMDataIntervalHandler
+  pmDataIntervalType: currentPMDataIntervalHandler,
+  subViews: toogleViewDataHandler
 };
 
 const performanceHistoryRootHandler = combineActionHandler<IPerformanceHistoryStoreState>(actionHandlers);