From 2616c51ed332bce8eea0e3b93aa9658014bed017 Mon Sep 17 00:00:00 2001 From: kolaente Date: Sat, 9 Mar 2024 18:30:01 +0100 Subject: [PATCH] fix(filters): pass correct filter query to kanban and gantt loading --- frontend/src/views/project/ProjectKanban.vue | 12 +++++++----- .../src/views/project/helpers/useGanttFilters.ts | 5 +---- 2 files changed, 8 insertions(+), 9 deletions(-) diff --git a/frontend/src/views/project/ProjectKanban.vue b/frontend/src/views/project/ProjectKanban.vue index d5acd2076..ab46a5cb1 100644 --- a/frontend/src/views/project/ProjectKanban.vue +++ b/frontend/src/views/project/ProjectKanban.vue @@ -296,6 +296,7 @@ import {calculateItemPosition} from '@/helpers/calculateItemPosition' import {isSavedFilter} from '@/services/savedFilter' import {success} from '@/message' import {useProjectStore} from '@/stores/projects' +import type {TaskFilterParams} from '@/services/taskCollection' const { projectId = undefined, @@ -347,11 +348,12 @@ const collapsedBuckets = ref({}) const taskUpdating = ref<{[id: ITask['id']]: boolean}>({}) const oneTaskUpdating = ref(false) -const params = ref({ - filter_by: [], - filter_value: [], - filter_comparator: [], - filter_concat: 'and', +const params = ref({ + sort_by: [], + order_by: [], + filter: '', + filter_include_nulls: false, + s: '', }) const getTaskDraggableTaskComponentData = computed(() => (bucket: IBucket) => { diff --git a/frontend/src/views/project/helpers/useGanttFilters.ts b/frontend/src/views/project/helpers/useGanttFilters.ts index 812014ac9..b245a16f5 100644 --- a/frontend/src/views/project/helpers/useGanttFilters.ts +++ b/frontend/src/views/project/helpers/useGanttFilters.ts @@ -79,10 +79,7 @@ function ganttFiltersToApiParams(filters: GanttFilters): TaskFilterParams { return { sort_by: ['start_date', 'done', 'id'], order_by: ['asc', 'asc', 'desc'], - filter_by: ['start_date', 'start_date'], - filter_comparator: ['greater_equals', 'less_equals'], - filter_value: [isoToKebabDate(filters.dateFrom), isoToKebabDate(filters.dateTo)], - filter_concat: 'and', + filter: 'start_date >= ' + isoToKebabDate(filters.dateFrom) + ' && start_date <= ' + isoToKebabDate(filters.dateTo), filter_include_nulls: filters.showTasksWithoutDates, } }