From b5df941e39835429d94312cdcfedfb42892b44d3 Mon Sep 17 00:00:00 2001
From: dpschen <dpschen@noreply.kolaente.de>
Date: Fri, 10 Sep 2021 13:02:52 +0000
Subject: [PATCH] chore: define default filters and params at one location
 (#721)

Co-authored-by: Dominik Pschenitschni <mail@celement.de>
Reviewed-on: https://kolaente.dev/vikunja/frontend/pulls/721
Reviewed-by: konrad <k@knt.li>
Co-authored-by: dpschen <dpschen@noreply.kolaente.de>
Co-committed-by: dpschen <dpschen@noreply.kolaente.de>
---
 src/components/list/partials/filters.vue | 57 +++++++++++++-----------
 src/components/tasks/mixins/taskList.js  | 19 ++++----
 2 files changed, 42 insertions(+), 34 deletions(-)

diff --git a/src/components/list/partials/filters.vue b/src/components/list/partials/filters.vue
index a2a7893fe..b203d8fe1 100644
--- a/src/components/list/partials/filters.vue
+++ b/src/components/list/partials/filters.vue
@@ -190,6 +190,35 @@ import ListService from '@/services/list'
 import NamespaceService from '@/services/namespace'
 import EditLabels from '@/components/tasks/partials/editLabels.vue'
 
+// FIXME: merge with DEFAULT_PARAMS in taskList.js
+const DEFAULT_PARAMS = {
+	sort_by: [],
+	order_by: [],
+	filter_by: [],
+	filter_value: [],
+	filter_comparator: [],
+	filter_include_nulls: true,
+	filter_concat: 'or',
+	s: '',
+}
+
+const DEFAULT_FILTERS = {
+	done: false,
+	dueDate: '',
+	requireAllFilters: false,
+	priority: 0,
+	usePriority: false,
+	startDate: '',
+	endDate: '',
+	percentDone: 0,
+	usePercentDone: false,
+	reminders: '',
+	assignees: '',
+	labels: '',
+	list_id: '',
+	namespace: '',
+}
+
 export default {
 	name: 'filters',
 	components: {
@@ -202,32 +231,8 @@ export default {
 	},
 	data() {
 		return {
-			params: {
-				sort_by: [],
-				order_by: [],
-				filter_by: [],
-				filter_value: [],
-				filter_comparator: [],
-				filter_include_nulls: true,
-				filter_concat: 'or',
-				s: '',
-			},
-			filters: {
-				done: false,
-				dueDate: '',
-				requireAllFilters: false,
-				priority: 0,
-				usePriority: false,
-				startDate: '',
-				endDate: '',
-				percentDone: 0,
-				usePercentDone: false,
-				reminders: '',
-				assignees: '',
-				labels: '',
-				list_id: '',
-				namespace: '',
-			},
+			params: DEFAULT_PARAMS,
+			filters: DEFAULT_FILTERS,
 
 			usersService: UserService,
 			foundusers: [],
diff --git a/src/components/tasks/mixins/taskList.js b/src/components/tasks/mixins/taskList.js
index de55f9940..df93a0aa4 100644
--- a/src/components/tasks/mixins/taskList.js
+++ b/src/components/tasks/mixins/taskList.js
@@ -2,6 +2,16 @@ import TaskCollectionService from '../../../services/taskCollection'
 import cloneDeep from 'lodash/cloneDeep'
 import {calculateItemPosition} from '../../../helpers/calculateItemPosition'
 
+// FIXME: merge with DEFAULT_PARAMS in filters.vue
+const DEFAULT_PARAMS = {
+	sort_by: ['position', 'id'],
+	order_by: ['asc', 'desc'],
+	filter_by: ['done'],
+	filter_value: ['false'],
+	filter_comparator: ['equals'],
+	filter_concat: 'and',
+}
+
 /**
  * This mixin provides a base set of methods and properties to get tasks on a list.
  */
@@ -20,14 +30,7 @@ export default {
 			searchTerm: '',
 
 			showTaskFilter: false,
-			params: {
-				sort_by: ['position', 'id'],
-				order_by: ['asc', 'desc'],
-				filter_by: ['done'],
-				filter_value: ['false'],
-				filter_comparator: ['equals'],
-				filter_concat: 'and',
-			},
+			params: DEFAULT_PARAMS,
 		}
 	},
 	watch: {