forked from vikunja/frontend
Move add task logic from list with quick add
This commit is contained in:
parent
d3c04ef738
commit
7b8fbe1835
GPG Key ID:
F40E70337AB24C9B
|
|
@ -1,50 +1,78 @@
|
|||
<template>
|
||||
<div class="field is-grouped" >
|
||||
<p
|
||||
:class="{ 'is-loading': taskService.loading }"
|
||||
class="control has-icons-left is-expanded"
|
||||
v-if="validListIdAvailable"
|
||||
>
|
||||
<input
|
||||
:class="{ disabled: taskService.loading }"
|
||||
@keyup.enter="addTask()"
|
||||
class="input"
|
||||
placeholder="Add a new task..."
|
||||
type="text"
|
||||
v-focus
|
||||
v-model="newTaskText"
|
||||
ref="newTaskInput"
|
||||
/>
|
||||
<span class="icon is-small is-left">
|
||||
<icon icon="tasks" />
|
||||
</span>
|
||||
<div>
|
||||
<div class="field is-grouped">
|
||||
<p :class="{ 'is-loading': taskService.loading}" class="control has-icons-left is-expanded">
|
||||
<input
|
||||
:class="{ 'disabled': taskService.loading}"
|
||||
@keyup.enter="addTask()"
|
||||
class="input"
|
||||
:placeholder="$t('list.list.addPlaceholder')"
|
||||
type="text"
|
||||
v-focus
|
||||
v-model="newTaskText"
|
||||
ref="newTaskInput"
|
||||
/>
|
||||
<span class="icon is-small is-left">
|
||||
<icon icon="tasks"/>
|
||||
</span>
|
||||
</p>
|
||||
<p class="control">
|
||||
<x-button
|
||||
:disabled="newTaskText.length === 0"
|
||||
@click="addTask()"
|
||||
icon="plus"
|
||||
>
|
||||
{{ $t('list.list.add') }}
|
||||
</x-button>
|
||||
</p>
|
||||
</div>
|
||||
<p class="help is-danger" v-if="showError && newTaskText === ''">
|
||||
{{ $t('list.list.addTitleRequired') }}
|
||||
</p>
|
||||
<p class="control" v-if="validListIdAvailable">
|
||||
<x-button
|
||||
:disabled="newTaskText.length === 0"
|
||||
@click="addTask()"
|
||||
icon="plus"
|
||||
>
|
||||
Add
|
||||
</x-button>
|
||||
</p>
|
||||
<p class="help is-warning" v-if="!validListIdAvailable">
|
||||
No default list set. Please go to settings and specify default list.
|
||||
</p>
|
||||
<quick-add-magic v-if="!showError"/>
|
||||
</div>
|
||||
<!-- <div class="field is-grouped" >-->
|
||||
<!-- <p-->
|
||||
<!-- :class="{ 'is-loading': taskService.loading }"-->
|
||||
<!-- class="control has-icons-left is-expanded"-->
|
||||
<!-- v-if="validListIdAvailable"-->
|
||||
<!-- >-->
|
||||
<!-- <input-->
|
||||
<!-- :class="{ disabled: taskService.loading }"-->
|
||||
<!-- @keyup.enter="addTask()"-->
|
||||
<!-- class="input"-->
|
||||
<!-- placeholder="Add a new task..."-->
|
||||
<!-- type="text"-->
|
||||
<!-- v-focus-->
|
||||
<!-- v-model="newTaskText"-->
|
||||
<!-- ref="newTaskInput"-->
|
||||
<!-- />-->
|
||||
<!-- <span class="icon is-small is-left">-->
|
||||
<!-- <icon icon="tasks" />-->
|
||||
<!-- </span>-->
|
||||
<!-- </p>-->
|
||||
<!-- <p class="control" v-if="validListIdAvailable">-->
|
||||
<!-- <x-button-->
|
||||
<!-- :disabled="newTaskText.length === 0"-->
|
||||
<!-- @click="addTask()"-->
|
||||
<!-- icon="plus"-->
|
||||
<!-- >-->
|
||||
<!-- Add-->
|
||||
<!-- </x-button>-->
|
||||
<!-- </p>-->
|
||||
<!-- <p class="help is-warning" v-if="!validListIdAvailable">-->
|
||||
<!-- No default list set. Please go to settings and specify default list.-->
|
||||
<!-- </p> -->
|
||||
<!-- </div>-->
|
||||
</template>
|
||||
|
||||
<script>
|
||||
import LabelTask from '../../models/labelTask'
|
||||
import LabelModel from '../../models/label'
|
||||
|
||||
import { HAS_TASKS } from '@/store/mutation-types'
|
||||
|
||||
import ListService from '../../services/list'
|
||||
import TaskService from '../../services/task'
|
||||
import TaskModel from '../../models/task'
|
||||
import LabelService from '../../services/label'
|
||||
import LabelTaskService from '../../services/labelTask'
|
||||
import createTask from '@/components/tasks/mixins/createTask'
|
||||
import QuickAddMagic from '@/components/tasks/partials/quick-add-magic'
|
||||
|
||||
export default {
|
||||
name: 'add-task',
|
||||
|
|
@ -55,16 +83,23 @@ export default {
|
|||
taskService: TaskService,
|
||||
labelService: LabelService,
|
||||
labelTaskService: LabelTaskService,
|
||||
listIdForNewTask: undefined,
|
||||
listIdForNewTask: null,
|
||||
validListIdAvailable: false,
|
||||
showError: false,
|
||||
}
|
||||
},
|
||||
mixins: [
|
||||
createTask,
|
||||
],
|
||||
props: {
|
||||
listId: {
|
||||
type: Number,
|
||||
required: false,
|
||||
},
|
||||
},
|
||||
components: {
|
||||
QuickAddMagic,
|
||||
},
|
||||
created() {
|
||||
this.listService = new ListService()
|
||||
this.taskService = new TaskService()
|
||||
|
|
@ -77,7 +112,7 @@ export default {
|
|||
if (this.listId !== undefined) {
|
||||
this.listIdForNewTask = this.listId
|
||||
this.validListIdAvailable = true
|
||||
} else if(this.$store.state.auth.settings.defaultListId !== undefined) {
|
||||
} else if (this.$store.state.auth.settings.defaultListId !== undefined) {
|
||||
this.listIdForNewTask = this.$store.state.auth.settings.defaultListId
|
||||
this.validListIdAvailable = true
|
||||
}
|
||||
|
|
@ -90,156 +125,13 @@ export default {
|
|||
}
|
||||
this.showError = false
|
||||
|
||||
const task = new TaskModel({
|
||||
title: this.newTaskText,
|
||||
listId: this.listIdForNewTask,
|
||||
})
|
||||
|
||||
this.taskService
|
||||
.create(task)
|
||||
this.createNewTask(this.newTaskText)
|
||||
.then(task => {
|
||||
this.newTaskText = ''
|
||||
|
||||
// Unlike a proper programming language, Javascript only knows references to objects and does not
|
||||
// allow you to control what is a reference and what isnt. Because of this we can't just add
|
||||
// all labels to the task they belong to right after we found and added them to the task since
|
||||
// the task update method also ensures all data the api sees has the right format. That means
|
||||
// it processes labels. That processing changes the date format and the label color and makes
|
||||
// the label pretty much unusable for everything else. Normally, this is not a big deal, because
|
||||
// the labels on a task get thrown away anyway and replaced with the new models from the api
|
||||
// when we get the updated answer back. However, in this specific case because we're passing a
|
||||
// label we obtained from vuex that reference is kept and not thrown away. The task itself gets
|
||||
// a new label object - you won't notice the bad reference until you want to add the same label
|
||||
// again and notice it doesn't have a color anymore.
|
||||
// I think this is what happens: (or rather would happen without the hack I've put in)
|
||||
// 1. Query the store for a label which matches the name
|
||||
// 2. Find one - remember, we get only a *reference* to the label from the store, not a new label object.
|
||||
// (Now there's *two* places with a reference to the same label object: in the store and in the
|
||||
// variable which holds the label from the search in the store)
|
||||
// 3. .push the label to the task
|
||||
// 4. Update the task to remove the labels from the name
|
||||
// 4.1. The task update processes all labels belonging to that task, changing attributes of our
|
||||
// label in the process. Because this is a reference, it is also "updated" in the store.
|
||||
// 5. Get an api response back. The service handler now creates a new label object for all labels
|
||||
// returned from the api. It will throw away all references to the old label in the process.
|
||||
// 6. Now we have two objects with the same label data: The old one we originally obtained from
|
||||
// the store and the one that was created when parsing the api response. The old one was
|
||||
// modified before sending the api request and thus, our store which still holds a reference
|
||||
// to the old label now contains old data.
|
||||
// I guess this is the point where normally the GC would come in and collect the old label
|
||||
// object if the store wouldn't still hold a reference to it.
|
||||
//
|
||||
// Now, as a workaround, I'm putting all new labels added to that task in this separate variable to
|
||||
// add them only after the task was updated to circumvent the task update service processing the
|
||||
// label before sending it. Feels more hacky than it probably is.
|
||||
const newLabels = []
|
||||
|
||||
// Check if the task has words starting with ~ in the title and make them to labels
|
||||
const parts = task.title.split(' ~')
|
||||
// The first element will always contain the title, even if there is no occurrence of ~
|
||||
if (parts.length > 1) {
|
||||
// First, create an unresolved promise for each entry in the array to wait
|
||||
// until all labels are added to update the task title once again
|
||||
let labelAddings = []
|
||||
let labelAddsToWaitFor = []
|
||||
parts.forEach((p, index) => {
|
||||
if (index < 1) {
|
||||
return
|
||||
}
|
||||
|
||||
labelAddsToWaitFor.push(
|
||||
new Promise((resolve, reject) => {
|
||||
labelAddings.push({ resolve: resolve, reject: reject })
|
||||
}),
|
||||
)
|
||||
})
|
||||
|
||||
// Then do everything that is involved in finding, creating and adding the label to the task
|
||||
parts.forEach((p, index) => {
|
||||
if (index < 1) {
|
||||
return
|
||||
}
|
||||
|
||||
// The part up until the next space
|
||||
const labelTitle = p.split(' ')[0]
|
||||
|
||||
// Don't create an empty label
|
||||
if (labelTitle === '') {
|
||||
return
|
||||
}
|
||||
|
||||
// Check if the label exists
|
||||
const label = Object.values(this.$store.state.labels.labels).find(l => {
|
||||
return l.title.toLowerCase() === labelTitle.toLowerCase()
|
||||
})
|
||||
|
||||
// Label found, use it
|
||||
if (typeof label !== 'undefined') {
|
||||
const labelTask = new LabelTask({
|
||||
taskId: task.id,
|
||||
labelId: label.id,
|
||||
})
|
||||
this.labelTaskService.create(labelTask)
|
||||
.then(result => {
|
||||
newLabels.push(label)
|
||||
|
||||
// Remove the label text from the task title
|
||||
task.title = task.title.replace(` ~${labelTitle}`, '')
|
||||
|
||||
// Make the promise done (the one with the index 0 does not exist)
|
||||
labelAddings[index - 1].resolve(result)
|
||||
})
|
||||
.catch(e => {
|
||||
this.error(e, this)
|
||||
})
|
||||
} else {
|
||||
// label not found, create it
|
||||
const label = new LabelModel({title: labelTitle})
|
||||
this.$store.dispatch('labels/createLabel', label)
|
||||
.then(res => {
|
||||
const labelTask = new LabelTask({
|
||||
taskId: task.id,
|
||||
labelId: res.id,
|
||||
})
|
||||
this.labelTaskService.create(labelTask)
|
||||
.then(result => {
|
||||
newLabels.push(res)
|
||||
|
||||
// Remove the label text from the task title
|
||||
task.title = task.title.replace(` ~${labelTitle}`, '')
|
||||
|
||||
// Make the promise done (the one with the index 0 does not exist)
|
||||
labelAddings[index - 1].resolve(result)
|
||||
})
|
||||
.catch(e => {
|
||||
this.error(e, this)
|
||||
})
|
||||
})
|
||||
.catch(e => {
|
||||
this.error(e, this)
|
||||
})
|
||||
}
|
||||
})
|
||||
|
||||
// This waits to update the task until all labels have been added and the title has
|
||||
// been modified to remove each label text
|
||||
Promise.all(labelAddsToWaitFor)
|
||||
.then(() => {
|
||||
this.taskService.update(task)
|
||||
.then(updatedTask => {
|
||||
updatedTask.labels = newLabels
|
||||
this.$store.commit(HAS_TASKS, true)
|
||||
})
|
||||
.catch(e => {
|
||||
this.error(e, this)
|
||||
})
|
||||
})
|
||||
|
||||
}
|
||||
this.$emit('taskAdded', task)
|
||||
})
|
||||
.catch(e => {
|
||||
this.error(e, this)
|
||||
this.error(e)
|
||||
})
|
||||
},
|
||||
},
|
||||
|
|
|
|||
|
|
@ -66,10 +66,6 @@
|
|||
@taskAdded="updateTaskList"
|
||||
ref="newTaskInput"
|
||||
/>
|
||||
<p class="help is-danger" v-if="showError && newTaskText === ''">
|
||||
{{ $t('list.list.addTitleRequired') }}
|
||||
</p>
|
||||
<quick-add-magic v-if="!showError"/>
|
||||
</div>
|
||||
|
||||
<nothing v-if="ctaVisible && tasks.length === 0 && !taskCollectionService.loading">
|
||||
|
|
@ -176,7 +172,6 @@ import FilterPopup from '@/components/list/partials/filter-popup'
|
|||
import { HAS_TASKS } from '@/store/mutation-types'
|
||||
import Nothing from '@/components/misc/nothing'
|
||||
import createTask from '@/components/tasks/mixins/createTask'
|
||||
import QuickAddMagic from '@/components/tasks/partials/quick-add-magic'
|
||||
|
||||
export default {
|
||||
name: 'List',
|
||||
|
|
@ -185,8 +180,6 @@ export default {
|
|||
taskService: TaskService,
|
||||
isTaskEdit: false,
|
||||
taskEditTask: TaskModel,
|
||||
newTaskText: '',
|
||||
showError: false,
|
||||
ctaVisible: false,
|
||||
}
|
||||
},
|
||||
|
|
@ -195,7 +188,6 @@ export default {
|
|||
createTask,
|
||||
],
|
||||
components: {
|
||||
QuickAddMagic,
|
||||
Nothing,
|
||||
FilterPopup,
|
||||
SingleTaskInList,
|
||||
|
|
@ -223,23 +215,6 @@ export default {
|
|||
this.isTaskEdit = false
|
||||
this.loadTasks(page, search)
|
||||
},
|
||||
addTask() {
|
||||
if (this.newTaskText === '') {
|
||||
this.showError = true
|
||||
return
|
||||
}
|
||||
this.showError = false
|
||||
|
||||
this.createNewTask(this.newTaskText)
|
||||
.then(task => {
|
||||
this.tasks.push(task)
|
||||
this.sortTasks()
|
||||
this.newTaskText = ''
|
||||
})
|
||||
.catch(e => {
|
||||
this.error(e)
|
||||
})
|
||||
},
|
||||
focusNewTaskInput() {
|
||||
this.$refs.newTaskInput.$refs.newTaskInput.focus()
|
||||
},
|
||||
|
|
|
|||
Loading…
Reference in New Issue