1 files changed, 8 insertions, 41 deletions

diff --git a/sdnr/wt/odlux/apps/maintenanceApp/src/actions/maintenenceActions.ts b/sdnr/wt/odlux/apps/maintenanceApp/src/actions/maintenenceActions.ts
index 15ac64721..162d94367 100644
--- a/sdnr/wt/odlux/apps/maintenanceApp/src/actions/maintenenceActions.ts
+++ b/sdnr/wt/odlux/apps/maintenanceApp/src/actions/maintenenceActions.ts
@@ -22,7 +22,9 @@ import { MaintenenceEntry, spoofSymbol } from '../models/maintenenceEntryType';
 import { AddSnackbarNotification } from '../../../../framework/src/actions/snackbarActions';
 import { IApplicationStoreState } from '../../../../framework/src/store/applicationStore';
 
+
 import { maintenenceService } from '../services/maintenenceService';
+import { maintenanceEntriesReloadAction } from '../handlers/maintenenceEntriesHandler';
 
 export class BaseAction extends Action { }
 
@@ -37,42 +39,6 @@ export class AllMainteneceEntriesLoadedAction extends BaseAction {
 }
 
 
-export const loadAllMainteneceEntriesAsyncAction = (dispatch: Dispatch , getState: () => IApplicationStoreState) => {
-  dispatch(new LoadAllMainteneceEntriesAction());
-  // frist get all entries from the maintenance index
-  maintenenceService.getAllMaintenenceEntries().then(entries => {
-    if (!entries) {
-      dispatch(new AddSnackbarNotification({ message: `Error reading maintenece sessings.`, options: { variant: 'error' } }));
-      return;
-    }
-
-    // combine ell entries from the maintenance index with all networkelements
-    const networkElements = getState().connect.mountedNetworkElements;
-    const maintenenceEntries = networkElements.elements.reduce((acc, cur) => {
-      const entry = entries.find(e => e.mountId === cur.mountId);
-      acc.push(entry || {
-        [spoofSymbol]: true,
-        _id: cur.mountId,
-        mountId: cur.mountId,
-        description : "",
-        start: "",
-        end: "",
-        active: false
-      });
-      return acc;
-    }, [] as MaintenenceEntry[]);
-
-    // all all entries from the maintenance index which are not in all networkelements
-    entries.forEach(entry => {
-      if (maintenenceEntries.findIndex(e => e.mountId === entry.mountId) < 0) {
-        maintenenceEntries.push(entry);
-      };
-    });
-
-    dispatch(new AllMainteneceEntriesLoadedAction(maintenenceEntries));
-  }).catch(error => dispatch(new AllMainteneceEntriesLoadedAction(null, error)));
-}
-
 export class UpdateMaintenanceEntry extends BaseAction {
   constructor(public maintenenceEntry: MaintenenceEntry) {
     super();
@@ -85,8 +51,9 @@ export const addOrUpdateMaintenenceEntryAsyncActionCreator = (entry: Maintenence
     result && window.setTimeout(() => {
       // dispatch(loadAllMountedNetworkElementsAsync);
       dispatch(new UpdateMaintenanceEntry(entry));
-      dispatch(new AddSnackbarNotification({ message: `Successfully ${result && result.created ? "created" : "updated"} maintenece sessings for [${entry.mountId}]`, options: { variant: 'success' } }));
+      dispatch(new AddSnackbarNotification({ message: `Successfully ${result && result.created ? "created" : "updated"} maintenance settings for [${entry.nodeId}]`, options: { variant: 'success' } }));
     }, 900);
+    dispatch(maintenanceEntriesReloadAction)
   });
 };
 
@@ -94,18 +61,18 @@ export const addOrUpdateMaintenenceEntryAsyncActionCreator = (entry: Maintenence
 export const removeFromMaintenenceEntrysAsyncActionCreator = (entry: MaintenenceEntry) => (dispatch: Dispatch) => {
   maintenenceService.deleteMaintenenceEntry(entry).then(result => {
     result && window.setTimeout(() => {
-      //dispatch(loadAllMountedNetworkElementsAsync);
       dispatch(new UpdateMaintenanceEntry({
         [spoofSymbol]: true,
         _id: entry._id,
-        mountId: entry.mountId,
-        description : "",
+        nodeId: entry.nodeId,
+        description: "",
         start: "",
         end: "",
         active: false
       }));
-      dispatch(new AddSnackbarNotification({ message: `Successfully removed [${entry.mountId}]`, options: { variant: 'success' } }));
+      dispatch(new AddSnackbarNotification({ message: `Successfully removed [${entry.nodeId}]`, options: { variant: 'success' } }));
     }, 900);
+    dispatch(maintenanceEntriesReloadAction)
   });
 };