From cda77c1a325b3df27aaf5da46e63efa6314cca34 Mon Sep 17 00:00:00 2001 From: Nelson Chan <3271800+chakflying@users.noreply.github.com> Date: Wed, 2 Aug 2023 15:09:13 +0800 Subject: [PATCH] Fix: Prevent race condition in toast (#3443) --- src/mixins/socket.js | 22 ++++++++++++---------- 1 file changed, 12 insertions(+), 10 deletions(-) diff --git a/src/mixins/socket.js b/src/mixins/socket.js index ebb908a9a..fabd34406 100644 --- a/src/mixins/socket.js +++ b/src/mixins/socket.js @@ -182,16 +182,18 @@ export default { // Also toast if (data.important) { - if (data.status === 0) { - toast.error(`[${this.monitorList[data.monitorID].name}] [DOWN] ${data.msg}`, { - timeout: false, - }); - } else if (data.status === 1) { - toast.success(`[${this.monitorList[data.monitorID].name}] [Up] ${data.msg}`, { - timeout: 20000, - }); - } else { - toast(`[${this.monitorList[data.monitorID].name}] ${data.msg}`); + if (this.monitorList[data.monitorID] !== undefined) { + if (data.status === 0) { + toast.error(`[${this.monitorList[data.monitorID].name}] [DOWN] ${data.msg}`, { + timeout: false, + }); + } else if (data.status === 1) { + toast.success(`[${this.monitorList[data.monitorID].name}] [Up] ${data.msg}`, { + timeout: 20000, + }); + } else { + toast(`[${this.monitorList[data.monitorID].name}] ${data.msg}`); + } } if (! (data.monitorID in this.importantHeartbeatList)) {