From 4e6e0608c756c59b575c45f9971979b4663e499b Mon Sep 17 00:00:00 2001 From: kolaente Date: Sat, 9 Mar 2024 19:24:17 +0100 Subject: [PATCH] fix(filters): lint --- .../components/date/datepickerWithRange.vue | 2 +- .../components/date/datepickerWithValues.vue | 3 +- .../src/components/input/Autocomplete.vue | 316 ------------------ .../components/input/AutocompleteDropdown.vue | 98 +++--- frontend/src/components/misc/popup.vue | 22 +- .../project/partials/FilterInput.story.vue | 2 +- .../project/partials/FilterInput.vue | 34 +- .../project/partials/FilterInputDocs.vue | 16 +- .../project/partials/filter-popup.vue | 28 +- .../components/project/partials/filters.vue | 57 ++-- .../src/composables/useAutoHeightTextarea.ts | 2 +- frontend/src/helpers/filters.ts | 6 +- pkg/models/kanban_test.go | 6 +- 13 files changed, 149 insertions(+), 443 deletions(-) delete mode 100644 frontend/src/components/input/Autocomplete.vue diff --git a/frontend/src/components/date/datepickerWithRange.vue b/frontend/src/components/date/datepickerWithRange.vue index 83a853f018..da35d013f8 100644 --- a/frontend/src/components/date/datepickerWithRange.vue +++ b/frontend/src/components/date/datepickerWithRange.vue @@ -91,7 +91,7 @@ variant="hint-modal" @close="() => showHowItWorks = false" > - + diff --git a/frontend/src/components/date/datepickerWithValues.vue b/frontend/src/components/date/datepickerWithValues.vue index dd92591032..c84f0fc1ac 100644 --- a/frontend/src/components/date/datepickerWithValues.vue +++ b/frontend/src/components/date/datepickerWithValues.vue @@ -68,7 +68,7 @@ variant="hint-modal" @close="() => showHowItWorks = false" > - + @@ -94,6 +94,7 @@ import {getFlatpickrLanguage} from '@/helpers/flatpickrLanguage' const props = defineProps({ modelValue: { required: false, + default: null, }, open: { type: Boolean, diff --git a/frontend/src/components/input/Autocomplete.vue b/frontend/src/components/input/Autocomplete.vue deleted file mode 100644 index ea8a27b60e..0000000000 --- a/frontend/src/components/input/Autocomplete.vue +++ /dev/null @@ -1,316 +0,0 @@ - - - - - \ No newline at end of file diff --git a/frontend/src/components/input/AutocompleteDropdown.vue b/frontend/src/components/input/AutocompleteDropdown.vue index e5eb018cd6..64545214df 100644 --- a/frontend/src/components/input/AutocompleteDropdown.vue +++ b/frontend/src/components/input/AutocompleteDropdown.vue @@ -1,16 +1,26 @@ diff --git a/frontend/src/components/project/partials/FilterInputDocs.vue b/frontend/src/components/project/partials/FilterInputDocs.vue index cd6602bcb0..3ed58008fe 100644 --- a/frontend/src/components/project/partials/FilterInputDocs.vue +++ b/frontend/src/components/project/partials/FilterInputDocs.vue @@ -6,12 +6,18 @@ const showDocs = ref(false) @@ -36,28 +37,27 @@ import Filters from '@/components/project/partials/filters.vue' import {getDefaultTaskFilterParams, type TaskFilterParams} from '@/services/taskCollection' -const modelValue = defineModel() +const modelValue = defineModel({}) -const value = computed({ - get() { - return modelValue.value - }, - set(value) { - if(modelValue === value) { - return - } - modelValue.value = value - }, -}) +const value = ref({}) watch( - () => modelValue, - (modelValue) => { + () => modelValue.value, + (modelValue: TaskFilterParams) => { value.value = modelValue }, {immediate: true}, ) +function emitChanges(newValue: TaskFilterParams) { + if (modelValue.value?.filter === newValue.filter && modelValue.value?.s === newValue.s) { + return + } + + modelValue.value.filter = newValue.filter + modelValue.value.s = newValue.s +} + const hasFilters = computed(() => { // this.value also contains the page parameter which we don't want to include in filters // eslint-disable-next-line no-unused-vars diff --git a/frontend/src/components/project/partials/filters.vue b/frontend/src/components/project/partials/filters.vue index 07351d09a3..837b23d41e 100644 --- a/frontend/src/components/project/partials/filters.vue +++ b/frontend/src/components/project/partials/filters.vue @@ -4,12 +4,12 @@ :title="hasTitle ? $t('filters.title') : ''" role="search" > - - +
- - - -