summaryrefslogtreecommitdiffstats
path: root/sdnr/wt/odlux/apps/faultApp/src
diff options
context:
space:
mode:
authorAijana Schumann <aijana.schumann@highstreet-technologies.com>2020-11-03 09:50:21 +0100
committerAijana Schumann <aijana.schumann@highstreet-technologies.com>2020-11-03 09:50:21 +0100
commit3aea9de20d2f51457e54aeaa28277efcbb75809d (patch)
tree1850d9532c2b1406679a86a5b03f6366e5aabad3 /sdnr/wt/odlux/apps/faultApp/src
parent562b91c16ea3670bf0c4f7a2bf4d578207eecf07 (diff)
FaultApp Bugfix
Fix stuck alarm window not closing Issue-ID: CCSDK-2902 Signed-off-by: Aijana Schumann <aijana.schumann@highstreet-technologies.com> Change-Id: If50fab81f0f87e68f4bdc7a593793dea57bf60b7
Diffstat (limited to 'sdnr/wt/odlux/apps/faultApp/src')
-rw-r--r--sdnr/wt/odlux/apps/faultApp/src/actions/clearStuckAlarmsAction.ts4
-rw-r--r--sdnr/wt/odlux/apps/faultApp/src/components/clearStuckAlarmsDialog.tsx4
-rw-r--r--sdnr/wt/odlux/apps/faultApp/src/services/faultStatusService.ts2
3 files changed, 5 insertions, 5 deletions
diff --git a/sdnr/wt/odlux/apps/faultApp/src/actions/clearStuckAlarmsAction.ts b/sdnr/wt/odlux/apps/faultApp/src/actions/clearStuckAlarmsAction.ts
index fea500dd3..cdcbf64d2 100644
--- a/sdnr/wt/odlux/apps/faultApp/src/actions/clearStuckAlarmsAction.ts
+++ b/sdnr/wt/odlux/apps/faultApp/src/actions/clearStuckAlarmsAction.ts
@@ -29,8 +29,8 @@ export class AreStuckAlarmsCleared extends FaultApplicationBaseAction {
export const clearStuckAlarmAsyncAction = (dispatch: Dispatch) => async (nodeNames: string[]) => {
- dispatch(new AreStuckAlarmsCleared(true))
+ dispatch(new AreStuckAlarmsCleared(true));
const result = await clearStuckAlarms(nodeNames).catch(error => { console.error(error); return undefined });
- dispatch(new AreStuckAlarmsCleared(false))
+ dispatch(new AreStuckAlarmsCleared(false));
return result;
} \ No newline at end of file
diff --git a/sdnr/wt/odlux/apps/faultApp/src/components/clearStuckAlarmsDialog.tsx b/sdnr/wt/odlux/apps/faultApp/src/components/clearStuckAlarmsDialog.tsx
index e131fa619..5155d2690 100644
--- a/sdnr/wt/odlux/apps/faultApp/src/components/clearStuckAlarmsDialog.tsx
+++ b/sdnr/wt/odlux/apps/faultApp/src/components/clearStuckAlarmsDialog.tsx
@@ -66,8 +66,8 @@ class ClearStuckAlarmsDialogComponent extends React.Component<clearStuckAlarmsPr
event.preventDefault();
const result = await this.props.clearStuckAlarmsAsync(this.props.stuckAlarms);
- if (result && result["data-provider:output"].nodenames && result["data-provider:output"].nodenames.length !== this.props.stuckAlarms.length) { //show errormessage if not all devices were cleared
- const undeletedAlarm = this.props.stuckAlarms.filter(item => !result["data-provider:output"].nodenames.includes(item));
+ if (result && result["devicemanager:output"].nodenames && result["devicemanager:output"].nodenames.length !== this.props.stuckAlarms.length) { //show errormessage if not all devices were cleared
+ const undeletedAlarm = this.props.stuckAlarms.filter(item => !result["devicemanager:output"].nodenames.includes(item));
const error = "The alarms of the following devices couldn't be refreshed: ";
this.setState({ clearAlarmsSuccessful: false, errormessage: error, unclearedAlarms: undeletedAlarm });
return;
diff --git a/sdnr/wt/odlux/apps/faultApp/src/services/faultStatusService.ts b/sdnr/wt/odlux/apps/faultApp/src/services/faultStatusService.ts
index d1236d2e7..663def086 100644
--- a/sdnr/wt/odlux/apps/faultApp/src/services/faultStatusService.ts
+++ b/sdnr/wt/odlux/apps/faultApp/src/services/faultStatusService.ts
@@ -47,7 +47,7 @@ export const getFaultStateFromDatabase = async (): Promise<FaultType | null> =>
export const clearStuckAlarms = async (nodeNames: string[]) => {
const path = 'rests/operations/devicemanager:clear-current-fault-by-nodename'
- const result = await requestRest<SingeResult<DeletedStuckAlarms>>(path, { method: 'Post', body: JSON.stringify({ input: { nodenames: nodeNames } }) })
+ const result = await requestRest<any>(path, { method: 'Post', body: JSON.stringify({ input: { nodenames: nodeNames } }) })
return result;
} \ No newline at end of file