ami/tl-vikunja
1
0
Fork 0
Code

fix(project): make sure the correct tasks are loaded when switching between projects

Browse Source 
Resolves https://community.vikunja.io/t/filter-table-view-not-sorting/1416/3
This commit is contained in:
kolaente 2023-06-28 14:38:10 +02:00
parent 66bad4b2b1
commit ac6c4cf2bc
No known key found for this signature in database
GPG Key ID: F40E70337AB24C9B
3 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/composables/useTaskList.ts
View File

@ -1,4 +1,4 @@
import {ref, shallowReactive, watch, computed, type ShallowReactive} from 'vue'
import {ref, shallowReactive, watch, computed, type ComputedGetter} from 'vue'
import {useRoute} from 'vue-router'
import TaskCollectionService from '@/services/taskCollection'
@ -61,7 +61,10 @@ const SORT_BY_DEFAULT: SortBy = {
/**
* This mixin provides a base set of methods and properties to get tasks.
*/
export function useTaskList(projectId: ShallowReactive<IProject['id']>, sortByDefault: SortBy = SORT_BY_DEFAULT) {
export function useTaskList(projectIdGetter: ComputedGetter<IProject['id']>, sortByDefault: SortBy = SORT_BY_DEFAULT) {
const projectId = computed(() => projectIdGetter())
const params = ref({...getDefaultParams()})
const search = ref('')
@ -69,8 +72,6 @@ export function useTaskList(projectId: ShallowReactive<IProject['id']>, sortByDe
const sortBy = ref({ ...sortByDefault })
const getAllTasksParams = computed(() => {
let loadParams = {...params.value}
@ -81,7 +82,7 @@ export function useTaskList(projectId: ShallowReactive<IProject['id']>, sortByDe
loadParams = formatSortOrder(sortBy.value, loadParams)
return [
{projectId: projectId},
{projectId: projectId.value},
loadParams,
page.value || 1,
]

2
src/views/project/ProjectList.vue
View File

@ -168,7 +168,7 @@ const {
searchTerm,
params,
sortByParam,
} = useTaskList(projectId, {position: 'asc' })
} = useTaskList(() => projectId, {position: 'asc' })
const isAlphabeticalSorting = computed(() => {

2
src/views/project/ProjectTable.vue
View File

@ -231,7 +231,7 @@ const SORT_BY_DEFAULT: SortBy = {
const activeColumns = useStorage('tableViewColumns', {...ACTIVE_COLUMNS_DEFAULT})
const sortBy = useStorage<SortBy>('tableViewSortBy', {...SORT_BY_DEFAULT})
const taskList = useTaskList(projectId, sortBy.value)
const taskList = useTaskList(() => projectId, sortBy.value)
const {
loading,