From 4e26fa0b85f9f009b621c92d7ee4d82c41be85f3 Mon Sep 17 00:00:00 2001
From: kolaente <k@knt.li>
Date: Sat, 9 Mar 2024 18:45:51 +0100
Subject: [PATCH] fix(filters): correctly use filter in saved filter

---
 frontend/src/modelTypes/ISavedFilter.ts | 11 +++++++++--
 frontend/src/models/savedFilter.ts      |  6 ++----
 frontend/src/services/savedFilter.ts    |  3 ---
 frontend/src/types/IFilter.ts           |  9 ---------
 4 files changed, 11 insertions(+), 18 deletions(-)
 delete mode 100644 frontend/src/types/IFilter.ts

diff --git a/frontend/src/modelTypes/ISavedFilter.ts b/frontend/src/modelTypes/ISavedFilter.ts
index 5f206efa9..f4f75f31d 100644
--- a/frontend/src/modelTypes/ISavedFilter.ts
+++ b/frontend/src/modelTypes/ISavedFilter.ts
@@ -1,12 +1,19 @@
 import type {IAbstract} from './IAbstract'
 import type {IUser} from './IUser'
-import type {IFilter} from '@/types/IFilter'
+
+interface Filters {
+	sortBy: ('start_date' | 'done' | 'id' | 'position')[],
+	orderBy: ('asc' | 'desc')[],
+	filter: string,
+	filterIncludeNulls: boolean,
+	s: string,
+}
 
 export interface ISavedFilter extends IAbstract {
 	id: number
 	title: string
 	description: string
-	filters: IFilter
+	filters: Filters
 
 	owner: IUser
 	created: Date
diff --git a/frontend/src/models/savedFilter.ts b/frontend/src/models/savedFilter.ts
index 35f3c08b7..8b8b74b48 100644
--- a/frontend/src/models/savedFilter.ts
+++ b/frontend/src/models/savedFilter.ts
@@ -11,11 +11,9 @@ export default class SavedFilterModel extends AbstractModel<ISavedFilter> implem
 	filters: ISavedFilter['filters'] = {
 		sortBy: ['done', 'id'],
 		orderBy: ['asc', 'desc'],
-		filterBy: ['done'],
-		filterValue: ['false'],
-		filterComparator: ['equals'],
-		filterConcat: 'and',
+		filter: 'done = false',
 		filterIncludeNulls: true,
+		s: '',
 	}
 
 	owner: IUser = {}
diff --git a/frontend/src/services/savedFilter.ts b/frontend/src/services/savedFilter.ts
index 31c9a0fdc..6214028b7 100644
--- a/frontend/src/services/savedFilter.ts
+++ b/frontend/src/services/savedFilter.ts
@@ -63,9 +63,6 @@ export default class SavedFilterService extends AbstractService<ISavedFilter> {
 		// the filter values in snake_sćase for url parameters.
 		model.filters = objectToCamelCase(model.filters)
 
-		// Make sure all filterValues are passes as strings. This is a requirement of the api.
-		model.filters.filterValue = model.filters.filterValue.map(v => String(v))
-
 		return model
 	}
 
diff --git a/frontend/src/types/IFilter.ts b/frontend/src/types/IFilter.ts
deleted file mode 100644
index aca000ab6..000000000
--- a/frontend/src/types/IFilter.ts
+++ /dev/null
@@ -1,9 +0,0 @@
-export interface IFilter {
-	sortBy: ('done' | 'id')[]
-	orderBy: ('asc' | 'desc')[]
-	filterBy: 'done'[]
-	filterValue: 'false'[]
-	filterComparator: 'equals'[]
-	filterConcat: 'and'
-	filterIncludeNulls: boolean
-}
\ No newline at end of file