From d2a294541837bf0bab059ea4f9c26c537dfdb741 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C5=81ukasz=20Mierzwa?= Date: Sun, 9 Sep 2018 11:07:36 +0100 Subject: [PATCH 1/2] fix(ui): hide selected option in suggestion dropdown --- ui/src/Components/SilenceModal/LabelNameInput.js | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/ui/src/Components/SilenceModal/LabelNameInput.js b/ui/src/Components/SilenceModal/LabelNameInput.js index bedb21361..21f8c7b99 100644 --- a/ui/src/Components/SilenceModal/LabelNameInput.js +++ b/ui/src/Components/SilenceModal/LabelNameInput.js @@ -94,7 +94,8 @@ const LabelNameInput = observer( defaultValue: value, options: matcher.suggestions.names, placeholder: isValid ? "Label name" : , - onChange: this.onChange + onChange: this.onChange, + hideSelectedOptions: true }; }; } From a3b906cb2031f532adcf381471ed8abf5cf500df Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C5=81ukasz=20Mierzwa?= Date: Sun, 9 Sep 2018 11:12:00 +0100 Subject: [PATCH 2/2] refactor(tests): use diffable HTML for all snapshot tests --- ui/package-lock.json | 9 - ui/package.json | 6 - .../__snapshots__/index.test.js.snap | 144 ++++------ .../NavBar/FilterInput/index.test.js | 4 +- .../SilenceModal/AlertManagerInput.test.js | 4 +- .../SilenceModal/LabelNameInput.test.js | 4 +- .../SilenceModal/LabelValueInput.test.js | 4 +- .../SilenceModal/SilencePreview.test.js | 4 +- .../AlertManagerInput.test.js.snap | 260 ++++++++---------- .../__snapshots__/LabelNameInput.test.js.snap | 84 +++--- .../LabelValueInput.test.js.snap | 80 +++--- .../__snapshots__/SilencePreview.test.js.snap | 115 ++++---- 12 files changed, 326 insertions(+), 392 deletions(-) diff --git a/ui/package-lock.json b/ui/package-lock.json index 856c3dc75..0415c0606 100644 --- a/ui/package-lock.json +++ b/ui/package-lock.json @@ -3426,15 +3426,6 @@ "prop-types": "15.6.2" } }, - "enzyme-to-json": { - "version": "3.3.4", - "resolved": "https://registry.npmjs.org/enzyme-to-json/-/enzyme-to-json-3.3.4.tgz", - "integrity": "sha1-Z8YEDpMRgvGDQYry659DIyWKp38=", - "dev": true, - "requires": { - "lodash": "4.17.10" - } - }, "errno": { "version": "0.1.7", "resolved": "https://registry.npmjs.org/errno/-/errno-0.1.7.tgz", diff --git a/ui/package.json b/ui/package.json index 8e0a6701b..2cd533650 100644 --- a/ui/package.json +++ b/ui/package.json @@ -55,7 +55,6 @@ "diffable-html": "3.0.0", "enzyme": "3.6.0", "enzyme-adapter-react-16": "1.5.0", - "enzyme-to-json": "3.3.4", "eslint-plugin-react": "7.11.1", "jest-canvas-mock": "1.1.0", "jest-date-mock": "1.0.3", @@ -64,10 +63,5 @@ "markdownlint-cli": "0.13.0", "node-sass-chokidar": "1.3.3", "onchange": "4.1.0" - }, - "jest": { - "snapshotSerializers": [ - "enzyme-to-json/serializer" - ] } } diff --git a/ui/src/Components/NavBar/FilterInput/__snapshots__/index.test.js.snap b/ui/src/Components/NavBar/FilterInput/__snapshots__/index.test.js.snap index ad75ddc7e..8904c6a55 100644 --- a/ui/src/Components/NavBar/FilterInput/__snapshots__/index.test.js.snap +++ b/ui/src/Components/NavBar/FilterInput/__snapshots__/index.test.js.snap @@ -1,95 +1,69 @@ // Jest Snapshot v1, https://goo.gl/fbAQLP exports[` matches snapshot on default render 1`] = ` -
-