ami/tl-vikunja
1
0
Fork 0
Code

chore: move helper function outside of composable

Browse Source
This commit is contained in:
Dominik Pschenitschni 2022-10-27 15:47:03 +02:00
parent 96e44bf225
commit aa2278a564
No known key found for this signature in database
GPG Key ID: B257AC0149F43A77
1 changed files with 17 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
src/composables/taskList.ts
View File

@ -18,23 +18,12 @@ const SORT_BY_DEFAULT = {
id: 'desc', id: 'desc',
} }
/**
* This mixin provides a base set of methods and properties to get tasks on a list.
*/
export function useTaskList(listId, sortByDefault = SORT_BY_DEFAULT) {
const params = ref({...getDefaultParams()})
const search = ref('')
const page = ref(1)
const sortBy = ref({ ...sortByDefault })
// This makes sure an id sort order is always sorted last. // This makes sure an id sort order is always sorted last.
// When tasks would be sorted first by id and then by whatever else was specified, the id sort takes // When tasks would be sorted first by id and then by whatever else was specified, the id sort takes
// precedence over everything else, making any other sort columns pretty useless. // precedence over everything else, making any other sort columns pretty useless.
function formatSortOrder(params) { function formatSortOrder(sortBy, params) {
let hasIdFilter = false let hasIdFilter = false
const sortKeys = Object.keys(sortBy.value) const sortKeys = Object.keys(sortBy)
for (const s of sortKeys) { for (const s of sortKeys) {
if (s === 'id') { if (s === 'id') {
sortKeys.splice(s, 1) sortKeys.splice(s, 1)
@ -46,11 +35,24 @@ export function useTaskList(listId, sortByDefault = SORT_BY_DEFAULT) {
sortKeys.push('id') sortKeys.push('id')
} }
params.sort_by = sortKeys params.sort_by = sortKeys
params.order_by = sortKeys.map(s => sortBy.value[s]) params.order_by = sortKeys.map(s => sortBy[s])
return params return params
} }
/**
* This mixin provides a base set of methods and properties to get tasks on a list.
*/
export function useTaskList(listId, sortByDefault = SORT_BY_DEFAULT) {
const params = ref({...getDefaultParams()})
const search = ref('')
const page = ref(1)
const sortBy = ref({ ...sortByDefault })
const getAllTasksParams = computed(() => { const getAllTasksParams = computed(() => {
let loadParams = {...params.value} let loadParams = {...params.value}
@ -58,7 +60,7 @@ export function useTaskList(listId, sortByDefault = SORT_BY_DEFAULT) {
loadParams.s = search.value loadParams.s = search.value
} }
loadParams = formatSortOrder(loadParams) loadParams = formatSortOrder(sortBy.value, loadParams)
return [ return [
{listId: listId.value}, {listId: listId.value},