From 4408115f41170d4df9d44c3ffa4b9cd83c7f6e05 Mon Sep 17 00:00:00 2001
From: kolaente <k@knt.li>
Date: Wed, 4 Mar 2020 21:29:40 +0100
Subject: [PATCH] Add creating new related tasks

---
 src/components/tasks/TaskDetailView.vue       |  1 +
 src/components/tasks/edit-task.vue            |  1 +
 .../tasks/reusable/relatedTasks.vue           | 73 ++++++++++++-------
 3 files changed, 49 insertions(+), 26 deletions(-)

diff --git a/src/components/tasks/TaskDetailView.vue b/src/components/tasks/TaskDetailView.vue
index 0ea807b3f..52f945275 100644
--- a/src/components/tasks/TaskDetailView.vue
+++ b/src/components/tasks/TaskDetailView.vue
@@ -193,6 +193,7 @@
 						</h3>
 						<related-tasks
 								:task-i-d="taskID"
+								:list-id="task.listID"
 								:initial-related-tasks="task.related_tasks"
 								:show-no-relations-notice="true"
 								ref="relatedTasks"
diff --git a/src/components/tasks/edit-task.vue b/src/components/tasks/edit-task.vue
index cd55e6a99..ae9369f1b 100644
--- a/src/components/tasks/edit-task.vue
+++ b/src/components/tasks/edit-task.vue
@@ -128,6 +128,7 @@
 		<related-tasks
 			class="is-narrow"
 			:task-i-d="task.id"
+			:list-id="task.listID"
 			:initial-related-tasks="task.related_tasks"
 		/>
 
diff --git a/src/components/tasks/reusable/relatedTasks.vue b/src/components/tasks/reusable/relatedTasks.vue
index 191c51711..64ba27e20 100644
--- a/src/components/tasks/reusable/relatedTasks.vue
+++ b/src/components/tasks/reusable/relatedTasks.vue
@@ -2,27 +2,31 @@
 	<div class="task-relations">
 		<label class="label">New Task Relation</label>
 		<div class="columns">
-				<div class="column is-three-quarters">
-					<multiselect
-							v-model="newTaskRelationTask"
-							:options="foundTasks"
-							:multiple="false"
-							:searchable="true"
-							:loading="taskService.loading"
-							:internal-search="true"
-							@search-change="findTasks"
-							placeholder="Type search for a new task to add as related..."
-							label="text"
-							track-by="id"
-					>
-						<template slot="clear" slot-scope="props">
-							<div class="multiselect__clear"
-								v-if="newTaskRelationTask !== null && newTaskRelationTask.id !== 0"
-								@mousedown.prevent.stop="clearAllFoundTasks(props.search)"></div>
-						</template>
-						<span slot="noResult">No task found. Consider changing the search query.</span>
-					</multiselect>
-				</div>
+			<div class="column is-three-quarters">
+				<multiselect
+						v-model="newTaskRelationTask"
+						:options="foundTasks"
+						:multiple="false"
+						:searchable="true"
+						:loading="taskService.loading"
+						:internal-search="true"
+						@search-change="findTasks"
+						placeholder="Type search for a new task to add as related..."
+						label="text"
+						track-by="id"
+						:taggable="true"
+						:showNoOptions="false"
+						@tag="createAndRelateTask"
+						tag-placeholder="Add this as new related task"
+				>
+					<template slot="clear" slot-scope="props">
+						<div class="multiselect__clear"
+							v-if="newTaskRelationTask !== null && newTaskRelationTask.id !== 0"
+							@mousedown.prevent.stop="clearAllFoundTasks(props.search)"></div>
+					</template>
+					<span slot="noResult">No task found. Consider changing the search query.</span>
+				</multiselect>
+			</div>
 			<div class="column field has-addons">
 				<div class="control is-expanded">
 					<div class="select is-fullwidth has-defaults">
@@ -57,7 +61,9 @@
 				</div>
 			</template>
 		</div>
-		<p v-if="showNoRelationsNotice && Object.keys(relatedTasks).length === 0" class="none">No task relations yet.</p>
+		<p v-if="showNoRelationsNotice && Object.keys(relatedTasks).length === 0" class="none">
+			No task relations yet.
+		</p>
 
 		<!-- Delete modal -->
 		<modal
@@ -89,7 +95,7 @@
 				foundTasks: [],
 				relationKinds: relationKinds,
 				newTaskRelationTask: TaskModel,
-				newTaskRelationKind: 'unset',
+				newTaskRelationKind: 'related',
 				taskRelationService: TaskRelationService,
 				showDeleteModal: false,
 				relationToDelete: {},
@@ -105,12 +111,17 @@
 			},
 			initialRelatedTasks: {
 				type: Object,
-				default: () => {},
+				default: () => {
+				},
 			},
 			showNoRelationsNotice: {
 				type: Boolean,
 				default: false,
 			},
+			listId: {
+				type: Number,
+				default: 0,
+			}
 		},
 		created() {
 			this.taskService = new TaskService()
@@ -171,7 +182,7 @@
 				})
 				this.taskRelationService.delete(rel)
 					.then(r => {
-						Object.keys(this.relatedTasks).forEach(relationKind  => {
+						Object.keys(this.relatedTasks).forEach(relationKind => {
 							for (const t in this.relatedTasks[relationKind]) {
 								if (this.relatedTasks[relationKind][t].id === this.relationToDelete.other_task_id && relationKind === this.relationToDelete.relation_kind) {
 									this.relatedTasks[relationKind].splice(t, 1)
@@ -187,7 +198,17 @@
 						this.showDeleteModal = false
 					})
 			},
-
+			createAndRelateTask(text) {
+				const newTask = new TaskModel({text: text, listID: this.listId})
+				this.taskService.create(newTask)
+					.then(r => {
+						this.newTaskRelationTask = r
+						this.addTaskRelation()
+					})
+					.catch(e => {
+						this.error(e, this)
+					})
+			},
 		},
 	}
 </script>