From 9293fa2f9650cdd35f8c577cd1f6d43ef063ed8b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jakob=20R=C3=B6hrl?= <jakob.roehrl@web.de>
Date: Wed, 13 May 2020 10:56:46 +0200
Subject: [PATCH 1/2] added a filter reset button
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Jakob Röhrl <jakob.roehrl@web.de>
---
 src/components/Controls.vue | 14 ++++++++++++++
 src/store/main.js           |  4 +++-
 2 files changed, 17 insertions(+), 1 deletion(-)

diff --git a/src/components/Controls.vue b/src/components/Controls.vue
index 8de4a12f8..a2dbcdbee 100644
--- a/src/components/Controls.vue
+++ b/src/components/Controls.vue
@@ -146,6 +146,10 @@
 									@click="beforeSetFilter">
 								<label for="noDue">{{ t('deck', 'No due date') }}</label>
 							</div>
+
+							<Button :disabled="!isFilterActive" @click="clearFilter">
+								{{ t('deck', 'Clear filter') }}
+							</Button>
 						</div>
 					</template>
 				</Popover>
@@ -229,6 +233,11 @@ export default {
 			return [...this.board.labels].sort((a, b) => (a.title < b.title) ? -1 : 1)
 		},
 	},
+	watch: {
+		board() {
+			this.clearFilter()
+		},
+	},
 	methods: {
 		beforeSetFilter(e) {
 			if (this.filter.due === e.target.value) {
@@ -269,6 +278,11 @@ export default {
 				this.$router.push({ name: 'board.details' })
 			}
 		},
+		clearFilter() {
+			const filterReset = { tags: [], users: [], due: '' }
+			this.$store.dispatch('setFilter', { ...filterReset })
+			this.filter = filterReset
+		},
 	},
 }
 </script>
diff --git a/src/store/main.js b/src/store/main.js
index ebc6f040f..f1f3973b3 100644
--- a/src/store/main.js
+++ b/src/store/main.js
@@ -256,7 +256,9 @@ export default new Vuex.Store({
 		setFilter({ commit }, filter) {
 			commit('setFilter', filter)
 		},
-		async loadBoardById({ commit }, boardId) {
+		async loadBoardById({ commit, dispatch }, boardId) {
+			const filterReset = { tags: [], users: [], due: '' }
+			dispatch('setFilter', filterReset)
 			commit('setCurrentBoard', null)
 			const board = await apiClient.loadById(boardId)
 			commit('setCurrentBoard', board)

From 3ea07f876b9e259174a5592287e1725e483e89bb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Julius=20H=C3=A4rtl?= <jus@bitgrid.net>
Date: Fri, 15 May 2020 18:07:33 +0200
Subject: [PATCH 2/2] Fix filter icon
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Julius Härtl <jus@bitgrid.net>
---
 img/filter_set.svg | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/img/filter_set.svg b/img/filter_set.svg
index a9561096f..957bd5f78 100644
--- a/img/filter_set.svg
+++ b/img/filter_set.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 4.233 4.233" height="16" width="16"><path d="M.52.465h3.283L2.631 1.918h-.99zm1.122 1.453h.992v1.866l-.996-.455z" paint-order="stroke fill markers"/><ellipse ry=".691" rx=".674" cy="3.461" cx="3.45" fill-rule="evenodd"/></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 4.233 4.233" height="16" width="16"><path d="M.52.465h3.283L2.631 1.918h-.99zm1.122 1.453h.992v1.866l-.996-.455z" paint-order="stroke fill markers"/><ellipse ry=".691" rx=".674" cy="3.461" cx="3.45" fill="#000"/></svg>