From ecdcb827ef4a27b6d0edab396b982864f028a3b6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Raimund=20Schl=C3=BC=C3=9Fler?=
 <raimund.schluessler@mailbox.org>
Date: Mon, 12 Nov 2018 20:40:18 +0100
Subject: [PATCH] Store subtasks in task

---
 src/components/Task.vue | 13 +++++--------
 src/models/task.js      |  2 ++
 src/store/calendars.js  | 11 +++++++++++
 3 files changed, 18 insertions(+), 8 deletions(-)

diff --git a/src/components/Task.vue b/src/components/Task.vue
index ce9be98c2..0cc4bd92b 100644
--- a/src/components/Task.vue
+++ b/src/components/Task.vue
@@ -105,7 +105,7 @@ License along with this library.  If not, see <http://www.gnu.org/licenses/>.
 							@keyup.27="showSubtaskInput = false">
 					</form>
 				</li>
-				<task-body-component v-for="subtask in subTasks(task)"
+				<task-body-component v-for="subtask in task.subTasks"
 					:key="subtask.uid"
 					:task="subtask" :base-url="baseUrl"
 					class="subtask" />
@@ -119,7 +119,7 @@ License along with this library.  If not, see <http://www.gnu.org/licenses/>.
 <script>
 import { overdue, valid } from '../store/storeHelper'
 import clickOutside from 'vue-click-outside'
-import { mapActions, mapGetters } from 'vuex'
+import { mapActions } from 'vuex'
 
 export default {
 	name: 'TaskBodyComponent',
@@ -160,7 +160,7 @@ export default {
 			isAddingTask: false
 		}
 	},
-	computed: Object.assign({
+	computed: {
 		iconStar: function() {
 			if (this.task.priority > 5) {
 				return 'icon-task-star-low'
@@ -169,11 +169,8 @@ export default {
 			} else if (this.task.priority > 0 && this.task.priority < 5) {
 				return 'icon-task-star-high'
 			}
-		} },
-	mapGetters({
-		subTasks: 'getTasksByParent'
-	})
-	),
+		}
+	},
 	methods: Object.assign(
 		mapActions([
 			'toggleCompleted',
diff --git a/src/models/task.js b/src/models/task.js
index 232643a88..968d74833 100644
--- a/src/models/task.js
+++ b/src/models/task.js
@@ -50,6 +50,8 @@ export default class Task {
 		this.calendar = calendar
 		this.vCalendar = new ICAL.Component(this.jCal)
 
+		this.subTasks = {}
+
 		// used to state a task is not up to date with
 		// the server and cannot be pushed (etag)
 		this.conflict = false
diff --git a/src/store/calendars.js b/src/store/calendars.js
index 3f4afe17d..5debe8237 100644
--- a/src/store/calendars.js
+++ b/src/store/calendars.js
@@ -454,6 +454,17 @@ const actions = {
 					Vue.set(task, 'dav', item)
 					return task
 				})
+
+				// Initialize subtasks so we don't have to search for them on every change.
+				// We do have to manually adjust this list when a task is added, deleted or moved.
+				tasks.forEach(
+					parent => {
+						parent.subTasks = tasks.filter(task => {
+							return task.related === parent.uid
+						})
+					}
+				)
+
 				context.commit('appendTasksToCalendar', { calendar, tasks })
 				context.commit('appendTasks', tasks)
 				return tasks