From 8d77e58fed33aa3520da89b2527fab8d2ced5661 Mon Sep 17 00:00:00 2001 From: LeireA Date: Wed, 9 Feb 2022 15:21:27 +0100 Subject: [PATCH 1/3] fix(#831): Remove sort field when only one is applied fix #831 This PR allows to remove sort field from cross button when only one is applied --- frontend/components/commons/header/filters/SortList.vue | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/frontend/components/commons/header/filters/SortList.vue b/frontend/components/commons/header/filters/SortList.vue index efd387f9dd..25fd1e19d0 100644 --- a/frontend/components/commons/header/filters/SortList.vue +++ b/frontend/components/commons/header/filters/SortList.vue @@ -78,7 +78,11 @@ export default { this.numberOfSortFields += 1; }, onRemoveSortField(index) { - this.selectedFields.splice(index - 1, 1); + if (this.selectedFields.length === 1) { + this.$emit("sortBy", []); + } else { + this.selectedFields.splice(index - 1, 1); + } if (this.numberOfSortFields > 1) { this.numberOfSortFields -= 1; } From a177f496a432c77bc608ce6a555509035035237c Mon Sep 17 00:00:00 2001 From: LeireA Date: Wed, 9 Feb 2022 16:33:54 +0100 Subject: [PATCH 2/3] SortList test --- .../specs/components/filters/SortList.spec.js | 45 +++++++++++++++++++ 1 file changed, 45 insertions(+) create mode 100644 frontend/specs/components/filters/SortList.spec.js diff --git a/frontend/specs/components/filters/SortList.spec.js b/frontend/specs/components/filters/SortList.spec.js new file mode 100644 index 0000000000..d10a80df29 --- /dev/null +++ b/frontend/specs/components/filters/SortList.spec.js @@ -0,0 +1,45 @@ +import { mount } from "@vue/test-utils"; +import SortList from "@/components/commons/header/filters/SortList"; + +function mountSortList() { + return mount(SortList, { + propsData: { + sort: [ + { + disabled: false, + group: "Predictions", + id: "predicted_as", + key: "predicted_as", + name: "Predicted as", + options: Object, + order: "asc", + placeholder: "Select labels", + type: "select", + } + ], + sortOptions: [ + { + disabled: false, + group: "Predictions", + id: "predicted_as", + key: "predicted_as", + name: "Predicted as", + options: Object, + placeholder: "Select labels", + selected: undefined, + type: "select", + } + ] + }, + }); +} + +describe("SortList", () => { + let spy = jest.spyOn(console, "error"); + afterEach(() => spy.mockReset()); + + test("renders properly", () => { + const wrapper = mountSortList(); + expect(wrapper.html()).toMatchSnapshot(); + }); +}); From 18ac98876e9ae97fd606603e40675592cb686662 Mon Sep 17 00:00:00 2001 From: LeireA Date: Wed, 9 Feb 2022 16:34:26 +0100 Subject: [PATCH 3/3] SorlList snap --- .../filters/__snapshots__/SortList.spec.js.snap | 12 ++++++++++++ 1 file changed, 12 insertions(+) create mode 100644 frontend/specs/components/filters/__snapshots__/SortList.spec.js.snap diff --git a/frontend/specs/components/filters/__snapshots__/SortList.spec.js.snap b/frontend/specs/components/filters/__snapshots__/SortList.spec.js.snap new file mode 100644 index 0000000000..ff6bd1fe9d --- /dev/null +++ b/frontend/specs/components/filters/__snapshots__/SortList.spec.js.snap @@ -0,0 +1,12 @@ +// Jest Snapshot v1, https://goo.gl/fbAQLP + +exports[`SortList renders properly 1`] = ` +
+ + +
+ Cancel + Sort +
+
+`;