Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix resurrect alert bug #515

Merged
merged 1 commit into from
Jan 7, 2025
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 8 additions & 6 deletions scripts/alerts/Alerts.vue
Original file line number Diff line number Diff line change
Expand Up @@ -24,13 +24,13 @@ watch(alerts, () => {
actionFunc: previousAlert.actionFunc,
// Store original message so we can use it as key.
// This skips the animation in case of multiple errors
original: previousAlert.message,
original: previousAlert,
});

res.push(alert);
if (timeout > 0) {
setTimeout(() => {
alert.value.show = false;
alert.value.original.show = false;
}, timeout);
}
}
Expand All @@ -54,23 +54,25 @@ watch(alerts, () => {
*/
function runAction(cAlert) {
cAlert.actionFunc();
cAlert.show = false;
cAlert.original.show = false;
}
</script>

<template>
<transition-group name="alert">
<div
v-for="alert of foldedAlerts.filter((a) => a.value.show)"
:key="alert.value.original"
v-for="alert of foldedAlerts.filter(
(a) => a.value.original.show !== false
)"
:key="alert.value.original.message"
data-testid="alerts"
>
<Alert
:message="alert.value.message"
:level="alert.value.level"
:notificationCount="alert.value.count"
:actionName="alert.value.actionName"
@hideAlert="alert.value.show = false"
@hideAlert="alert.value.original.show = false"
@runAction="runAction(alert.value)"
/>
</div>
Expand Down
Loading