From 26abcc632b86f1ece351005ed48c2c8408d88340 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C5=81ukasz=20Mierzwa?= Date: Sat, 8 Sep 2018 23:35:21 +0100 Subject: [PATCH] fix(ui): pass unique class to alert action button, so clicking it doesn't trigger click outside handler --- .../Grid/AlertGrid/AlertGroup/Alert/AlertMenu.js | 9 ++++++++- .../AlertGroup/Alert/__snapshots__/index.test.js.snap | 2 +- 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/ui/src/Components/Grid/AlertGrid/AlertGroup/Alert/AlertMenu.js b/ui/src/Components/Grid/AlertGrid/AlertGroup/Alert/AlertMenu.js index a2bcf5871..eadb02bdd 100644 --- a/ui/src/Components/Grid/AlertGrid/AlertGroup/Alert/AlertMenu.js +++ b/ui/src/Components/Grid/AlertGrid/AlertGroup/Alert/AlertMenu.js @@ -4,6 +4,8 @@ import PropTypes from "prop-types"; import { action, observable } from "mobx"; import { observer } from "mobx-react"; +import hash from "object-hash"; + import { Manager, Reference, Popper } from "react-popper"; import onClickOutside from "react-onclickoutside"; @@ -97,12 +99,16 @@ const AlertMenu = observer( render() { const { group, alert, silenceFormStore } = this.props; + const uniqueClass = `components-grid-alert-${group.id}-${hash( + alert.labels + )}`; + return ( {({ ref }) => ( )} diff --git a/ui/src/Components/Grid/AlertGrid/AlertGroup/Alert/__snapshots__/index.test.js.snap b/ui/src/Components/Grid/AlertGrid/AlertGroup/Alert/__snapshots__/index.test.js.snap index cb879ad25..22eb955a9 100644 --- a/ui/src/Components/Grid/AlertGrid/AlertGroup/Alert/__snapshots__/index.test.js.snap +++ b/ui/src/Components/Grid/AlertGrid/AlertGroup/Alert/__snapshots__/index.test.js.snap @@ -42,7 +42,7 @@ exports[` matches snapshot with showAlertmanagers=false showReceiver=fa hidden -