From 0f77ad2d584ee4dc821efa993cf44dd200cb844a Mon Sep 17 00:00:00 2001
From: kolaente <k@knt.li>
Date: Tue, 22 Dec 2020 12:49:34 +0100
Subject: [PATCH] Add task filter for kanban

---
 src/components/list/partials/filters.vue |  2 +-
 src/store/modules/kanban.js              |  4 +--
 src/views/list/views/Kanban.vue          | 34 ++++++++++++++++++++++--
 3 files changed, 35 insertions(+), 5 deletions(-)

diff --git a/src/components/list/partials/filters.vue b/src/components/list/partials/filters.vue
index 6c17c5d24..d2d2dfeaa 100644
--- a/src/components/list/partials/filters.vue
+++ b/src/components/list/partials/filters.vue
@@ -518,7 +518,7 @@ export default {
 			}
 
 			this.prepareSingleValue(filterName)
-			if (this.filters[filterName] !== '') {
+			if (typeof this.filters[filterName] !== 'undefined' && this.filters[filterName] !== '') {
 				this[`${servicePrefix}Service`].getAll({}, {s: this.filters[filterName]})
 					.then(r => {
 						this.$set(this, kind, r)
diff --git a/src/store/modules/kanban.js b/src/store/modules/kanban.js
index 25bcb0c3e..284b51ab8 100644
--- a/src/store/modules/kanban.js
+++ b/src/store/modules/kanban.js
@@ -113,14 +113,14 @@ export default {
 		},
 	},
 	actions: {
-		loadBucketsForList(ctx, listId) {
+		loadBucketsForList(ctx, {listId, params}) {
 			const cancel = setLoading(ctx)
 
 			// Clear everything to prevent having old buckets in the list if loading the buckets from this list takes a few moments
 			ctx.commit('setBuckets', [])
 
 			const bucketService = new BucketService()
-			return bucketService.getAll({listId: listId})
+			return bucketService.getAll({listId: listId}, params)
 				.then(r => {
 					ctx.commit('setBuckets', r)
 					ctx.commit('setListId', listId)
diff --git a/src/views/list/views/Kanban.vue b/src/views/list/views/Kanban.vue
index c135e9126..c921e20a9 100644
--- a/src/views/list/views/Kanban.vue
+++ b/src/views/list/views/Kanban.vue
@@ -1,5 +1,22 @@
 <template>
 	<div>
+		<div class="filter-container">
+			<div class="items">
+				<button @click="showFilters = !showFilters" class="button">
+					<span class="icon is-small">
+						<icon icon="filter"/>
+					</span>
+					Filters
+				</button>
+			</div>
+			<transition name="fade">
+				<filters
+					@change="() => {filtersChanged = true; loadBuckets()}"
+					v-if="showFilters"
+					v-model="params"
+				/>
+			</transition>
+		</div>
 		<div :class="{ 'is-loading': loading && !oneTaskUpdating}" class="kanban loader-container">
 			<div :key="`bucket${bucket.id}`" class="bucket" v-for="bucket in buckets">
 				<div class="bucket-header">
@@ -243,6 +260,7 @@ import {Container, Draggable} from 'vue-smooth-dnd'
 import PriorityLabel from '../../../components/tasks/partials/priorityLabel'
 import User from '../../../components/misc/user'
 import Labels from '../../../components/tasks/partials/labels'
+import Filters from '../../../components/list/partials/filters'
 
 import {filterObject} from '@/helpers/filterObject'
 import {applyDrag} from '@/helpers/applyDrag'
@@ -259,6 +277,7 @@ export default {
 		Labels,
 		User,
 		PriorityLabel,
+		Filters,
 	},
 	data() {
 		return {
@@ -285,6 +304,15 @@ export default {
 			// We're using this to show the loading animation only at the task when updating it
 			taskUpdating: {},
 			oneTaskUpdating: false,
+
+			params: {
+				filter_by: [],
+				filter_value: [],
+				filter_comparator: [],
+				filter_concat: 'and',
+			},
+			showFilters: false,
+			filtersChanged: false, // To trigger a reload of the board
 		}
 	},
 	created() {
@@ -315,15 +343,17 @@ export default {
 
 			// Only load buckets if we don't already loaded them
 			if (
+				!this.filtersChanged && (
 				this.loadedListId === this.$route.params.listId ||
-				this.loadedListId === parseInt(this.$route.params.listId)
+				this.loadedListId === parseInt(this.$route.params.listId))
 			) {
 				return
 			}
 
 			console.debug(`Loading buckets, loadedListId = ${this.loadedListId}, $route.params =`, this.$route.params)
+			this.filtersChanged = false
 
-			this.$store.dispatch('kanban/loadBucketsForList', this.$route.params.listId)
+			this.$store.dispatch('kanban/loadBucketsForList', {listId: this.$route.params.listId, params: this.params})
 				.catch(e => {
 					this.error(e, this)
 				})