From d7c00213ff59d98f48fdeede6178076b1ef672eb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C5=81ukasz=20Mierzwa?= Date: Sun, 9 Sep 2018 22:20:18 +0100 Subject: [PATCH] refactor(ui): reorder alert action menu to make it look nicer with the header --- .../Grid/AlertGrid/AlertGroup/Alert/AlertMenu.js | 13 +++++++------ .../AlertGrid/AlertGroup/Alert/AlertMenu.test.js | 2 +- 2 files changed, 8 insertions(+), 7 deletions(-) diff --git a/ui/src/Components/Grid/AlertGrid/AlertGroup/Alert/AlertMenu.js b/ui/src/Components/Grid/AlertGrid/AlertGroup/Alert/AlertMenu.js index eadb02bdd..7ac4e5446 100644 --- a/ui/src/Components/Grid/AlertGrid/AlertGroup/Alert/AlertMenu.js +++ b/ui/src/Components/Grid/AlertGrid/AlertGroup/Alert/AlertMenu.js @@ -38,12 +38,6 @@ const MenuContent = onClickOutside( style={popperStyle} data-placement={popperPlacement} > -
onSilenceClick(silenceFormStore, group, alert)} - > - Silence this alert -
Alert source links:
{alert.alertmanager.map(am => ( ))} +
+
onSilenceClick(silenceFormStore, group, alert)} + > + Silence this alert +
); } diff --git a/ui/src/Components/Grid/AlertGrid/AlertGroup/Alert/AlertMenu.test.js b/ui/src/Components/Grid/AlertGrid/AlertGroup/Alert/AlertMenu.test.js index 963e67be6..d8bca5f3d 100644 --- a/ui/src/Components/Grid/AlertGrid/AlertGroup/Alert/AlertMenu.test.js +++ b/ui/src/Components/Grid/AlertGrid/AlertGroup/Alert/AlertMenu.test.js @@ -70,7 +70,7 @@ const MountedMenuContent = group => { describe("", () => { it("clicking on 'Silence' icon opens the silence form modal", () => { const tree = MountedMenuContent(group); - const button = tree.find(".dropdown-item").at(0); + const button = tree.find(".dropdown-item").at(1); button.simulate("click"); expect(silenceFormStore.toggle.visible).toBe(true); });