local-it/vikunja-frontend
0
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

fix(filters): page freezing when entering a date as a result of an endless loop

Browse source 
Resolves https://kolaente.dev/vikunja/frontend/issues/2384
This commit is contained in:
kolaente 2022-10-07 19:49:57 +02:00
parent 458df80443
commit 6d587fad6e
No known key found for this signature in database
GPG key ID: F40E70337AB24C9B
2 changed files with 12 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
src/components/list/partials/filters.vue
View file

@ -210,6 +210,7 @@ import ListService from '@/services/list'
import NamespaceService from '@/services/namespace' import NamespaceService from '@/services/namespace'
import EditLabels from '@/components/tasks/partials/editLabels.vue' import EditLabels from '@/components/tasks/partials/editLabels.vue'
import {dateIsValid, formatISO} from '@/helpers/time/formatDate'
import {objectToSnakeCase} from '@/helpers/case' import {objectToSnakeCase} from '@/helpers/case'
import {getDefaultParams} from '@/composables/taskList' import {getDefaultParams} from '@/composables/taskList'
import {camelCase} from 'camel-case' import {camelCase} from 'camel-case'
@ -391,7 +392,14 @@ export default defineComponent({
this.params.filter_value.push(dateTo) this.params.filter_value.push(dateTo)
} }
this.filters[camelCase(filterName)] = {dateFrom, dateTo} this.filters[camelCase(filterName)] = {
// Passing the dates as string values avoids an endless loop between values changing
// in the datepicker (bubbling up to here) and changing here and bubbling down to the
// datepicker (because there's a new date instance every time this function gets called).
// See https://kolaente.dev/vikunja/frontend/issues/2384
dateFrom: dateIsValid(dateFrom) ? formatISO(dateFrom) : dateFrom,
dateTo: dateIsValid(dateTo) ? formatISO(dateTo) : dateTo,
}
this.change() this.change()
return return
} }
@ -511,12 +519,12 @@ export default defineComponent({
if (typeof this.filters[filterName] === 'undefined' || this.filters[filterName] === '') { if (typeof this.filters[filterName] === 'undefined' || this.filters[filterName] === '') {
return return
} }
// Don't load things if we already have something loaded. // Don't load things if we already have something loaded.
// This is not the most ideal solution because it prevents a re-population when filters are changed // This is not the most ideal solution because it prevents a re-population when filters are changed
// from the outside. It is still fine because we're not changing them from the outside, other than // from the outside. It is still fine because we're not changing them from the outside, other than
// loading them initially. // loading them initially.
if(this[kind].length > 0) { if (this[kind].length > 0) {
return return
} }

2
src/helpers/time/formatDate.ts
View file

@ -6,7 +6,7 @@ import {i18n} from '@/i18n'
const locales = {en: enGB, de, ch: de, fr, ru} const locales = {en: enGB, de, ch: de, fr, ru}
const dateIsValid = date => { export function dateIsValid(date) {
if (date === null) { if (date === null) {
return false return false
} }