From e29a19f21817fe7a03d6d446257dd5a175cd9808 Mon Sep 17 00:00:00 2001
From: kolaente <k@knt.li>
Date: Tue, 2 Nov 2021 22:30:55 +0100
Subject: [PATCH] fix: restrict filter params in comparison

---
 src/components/list/partials/filter-popup.vue | 13 +++++++++++--
 src/components/misc/popup.vue                 |  1 -
 2 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/src/components/list/partials/filter-popup.vue b/src/components/list/partials/filter-popup.vue
index f62247638..71eed3acc 100644
--- a/src/components/list/partials/filter-popup.vue
+++ b/src/components/list/partials/filter-popup.vue
@@ -54,10 +54,19 @@ export default {
 		hasFilters() {
 			// this.value also contains the page parameter which we don't want to include in filters
 			// eslint-disable-next-line no-unused-vars
-			const {page, ...value} = this.value
+			const {filter_by, filter_value, filter_comparator, filter_concat, s} = this.value
 			const def = {...getDefaultParams()}
 
-			return JSON.stringify(value) !== JSON.stringify(def)
+			const params = {filter_by, filter_value, filter_comparator, filter_concat, s}
+			const defaultParams = {
+				filter_by: def.filter_by,
+				filter_value: def.filter_value,
+				filter_comparator: def.filter_comparator,
+				filter_concat: def.filter_concat,
+				s: s ? def.s : undefined,
+			}
+
+			return JSON.stringify(params) !== JSON.stringify(defaultParams)
 		},
 	},
 	watch: {
diff --git a/src/components/misc/popup.vue b/src/components/misc/popup.vue
index d84345bee..287ebef01 100644
--- a/src/components/misc/popup.vue
+++ b/src/components/misc/popup.vue
@@ -15,7 +15,6 @@ export default {
 		const popup = ref(null)
 
 		const toggle = () => {
-			console.log('toggle')
 			open.value = !open.value
 		}