From 50c1a2e4d59aeedc4a9f362210a0ed6cf5da1c4e Mon Sep 17 00:00:00 2001
From: dpschen <dpschen@noreply.kolaente.de>
Date: Fri, 10 Sep 2021 14:39:18 +0000
Subject: [PATCH] feat simplify taskList mixin (#728)

Co-authored-by: Dominik Pschenitschni <mail@celement.de>
Co-authored-by: kolaente <k@knt.li>
Reviewed-on: https://kolaente.dev/vikunja/frontend/pulls/728
Reviewed-by: konrad <k@knt.li>
Co-authored-by: dpschen <dpschen@noreply.kolaente.de>
Co-committed-by: dpschen <dpschen@noreply.kolaente.de>
---
 src/components/tasks/gantt-component.vue |   2 +-
 src/components/tasks/mixins/taskList.js  | 112 ++++++++++++-----------
 2 files changed, 60 insertions(+), 54 deletions(-)

diff --git a/src/components/tasks/gantt-component.vue b/src/components/tasks/gantt-component.vue
index c9d5903c1..19e064b21 100644
--- a/src/components/tasks/gantt-component.vue
+++ b/src/components/tasks/gantt-component.vue
@@ -11,7 +11,7 @@
 				</x-button>
 			</div>
 			<filter-popup
-				@change="loadTasks"
+				@change="loadTasks()"
 				:visible="showTaskFilter"
 				v-model="params"
 			/>
diff --git a/src/components/tasks/mixins/taskList.js b/src/components/tasks/mixins/taskList.js
index df93a0aa4..cd67e7ce1 100644
--- a/src/components/tasks/mixins/taskList.js
+++ b/src/components/tasks/mixins/taskList.js
@@ -1,4 +1,4 @@
-import TaskCollectionService from '../../../services/taskCollection'
+import TaskCollectionService from '@/services/taskCollection'
 import cloneDeep from 'lodash/cloneDeep'
 import {calculateItemPosition} from '../../../helpers/calculateItemPosition'
 
@@ -12,16 +12,59 @@ const DEFAULT_PARAMS = {
 	filter_concat: 'and',
 }
 
+function createPagination(totalPages, currentPage) {
+	const pages = []
+	for (let i = 0; i < totalPages; i++) {
+
+		// Show ellipsis instead of all pages
+		if (
+			i > 0 && // Always at least the first page
+			(i + 1) < totalPages && // And the last page
+			(
+				// And the current with current + 1 and current - 1
+				(i + 1) > currentPage + 1 ||
+				(i + 1) < currentPage - 1
+			)
+		) {
+			// Only add an ellipsis if the last page isn't already one
+			if (pages[i - 1] && !pages[i - 1].isEllipsis) {
+				pages.push({
+					number: 0,
+					isEllipsis: true,
+				})
+			}
+			continue
+		}
+
+		pages.push({
+			number: i + 1,
+			isEllipsis: false,
+		})
+	}
+	return pages
+}
+
+export function getRouteForPagination(page = 1, type = 'list') {
+	return {
+		name: 'list.' + type,
+		params: {
+			type: type,
+		},
+		query: {
+			page: page,
+		},
+	}
+}
+
 /**
  * This mixin provides a base set of methods and properties to get tasks on a list.
  */
 export default {
 	data() {
 		return {
-			taskCollectionService: TaskCollectionService,
+			taskCollectionService: new TaskCollectionService(),
 			tasks: [],
 
-			pages: [],
 			currentPage: 0,
 
 			loadedList: null,
@@ -34,16 +77,17 @@ export default {
 		}
 	},
 	watch: {
-		'$route.query': 'loadTasksForPage', // Only listen for query path changes
+		// Only listen for query path changes
+		'$route.query': {
+			handler: 'loadTasksForPage',
+			immediate: true,
+		},
 		'$route.path': 'loadTasksOnSavedFilter',
 	},
-	beforeMount() {
-		// Triggering loading the tasks in beforeMount lets the component maintain the current page, therefore the page
-		// is not lost after navigating back from a task detail page for example.
-		this.loadTasksForPage(this.$route.query)
-	},
-	created() {
-		this.taskCollectionService = new TaskCollectionService()
+	computed: {
+		pages() {
+			return createPagination(this.taskCollectionService.totalPages, this.currentPage)
+		},
 	},
 	methods: {
 		loadTasks(
@@ -83,48 +127,20 @@ export default {
 				return
 			}
 
-			this.$set(this, 'tasks', [])
+			this.tasks = []
 
 			this.taskCollectionService.getAll(list, params, page)
 				.then(r => {
-					this.$set(this, 'tasks', r)
-					this.$set(this, 'pages', [])
+					this.tasks = r
 					this.currentPage = page
 
-					for (let i = 0; i < this.taskCollectionService.totalPages; i++) {
-
-						// Show ellipsis instead of all pages
-						if (
-							i > 0 && // Always at least the first page
-							(i + 1) < this.taskCollectionService.totalPages && // And the last page
-							(
-								// And the current with current + 1 and current - 1
-								(i + 1) > this.currentPage + 1 ||
-								(i + 1) < this.currentPage - 1
-							)
-						) {
-							// Only add an ellipsis if the last page isn't already one
-							if (this.pages[i - 1] && !this.pages[i - 1].isEllipsis) {
-								this.pages.push({
-									number: 0,
-									isEllipsis: true,
-								})
-							}
-							continue
-						}
-
-						this.pages.push({
-							number: i + 1,
-							isEllipsis: false,
-						})
-					}
-
 					this.loadedList = cloneDeep(currentList)
 				})
 				.catch(e => {
 					this.error(e)
 				})
 		},
+
 		loadTasksForPage(e) {
 			// The page parameter can be undefined, in the case where the user loads a new list from the side bar menu
 			let page = Number(e.page)
@@ -180,17 +196,6 @@ export default {
 				this.showTaskSearch = false
 			}, 200)
 		},
-		getRouteForPagination(page = 1, type = 'list') {
-			return {
-				name: 'list.' + type,
-				params: {
-					type: type,
-				},
-				query: {
-					page: page,
-				},
-			}
-		},
 		saveTaskPosition(e) {
 			this.drag = false
 			
@@ -208,5 +213,6 @@ export default {
 					this.error(e)
 				})
 		},
+		getRouteForPagination,
 	},
 }
\ No newline at end of file