From 8902c15f7e9590da075e860f3d35939169ee246a Mon Sep 17 00:00:00 2001
From: kolaente <k@knt.li>
Date: Mon, 10 Jul 2023 18:10:14 +0200
Subject: [PATCH] fix: correctly resolve kanban board in the background when
 moving a task

Resolves F-951
---
 src/composables/useRouteWithModal.ts | 18 ++++++++++++++++--
 src/views/project/ProjectKanban.vue  | 26 ++++++++++----------------
 2 files changed, 26 insertions(+), 18 deletions(-)

diff --git a/src/composables/useRouteWithModal.ts b/src/composables/useRouteWithModal.ts
index d4e17c5c7..a384e0a8e 100644
--- a/src/composables/useRouteWithModal.ts
+++ b/src/composables/useRouteWithModal.ts
@@ -1,10 +1,12 @@
-import { computed, shallowRef, watchEffect, h, type VNode } from 'vue'
-import { useRoute, useRouter } from 'vue-router'
+import {computed, shallowRef, watchEffect, h, type VNode} from 'vue'
+import {useRoute, useRouter} from 'vue-router'
+import {useBaseStore} from '@/stores/base'
 
 export function useRouteWithModal() {
 	const router = useRouter()
 	const route = useRoute()
 	const backdropView = computed(() => route.fullPath && window.history.state.backdropView)
+	const baseStore = useBaseStore()
 
 	const routeWithModal = computed(() => {
 		return backdropView.value
@@ -44,6 +46,18 @@ export function useRouteWithModal() {
 	function closeModal() {
 		const historyState = computed(() => route.fullPath && window.history.state)
 
+		// If the current project was changed because the user moved the currently opened task while coming from kanban,
+		// we need to reflect that change in the route when they close the task modal.
+		// The last route is only available as resolved string, therefore we need to use a regex for matching here
+		const kanbanRouteMatch = new RegExp('\\/projects\\/\\d+\\/kanban', 'g')
+		const kanbanRouter = {name: 'project.kanban', params: {projectId: baseStore.currentProject?.id}}
+		if (kanbanRouteMatch.test(historyState.value.back)
+			&& baseStore.currentProject
+			&& historyState.value.back !== router.resolve(kanbanRouter).fullPath) {
+			router.push(kanbanRouter)
+			return
+		}
+
 		if (historyState.value) {
 			router.back()
 		} else {
diff --git a/src/views/project/ProjectKanban.vue b/src/views/project/ProjectKanban.vue
index 5551f795d..2adf969a5 100644
--- a/src/views/project/ProjectKanban.vue
+++ b/src/views/project/ProjectKanban.vue
@@ -1,7 +1,7 @@
 <template>
 	<ProjectWrapper
 		class="project-kanban"
-		:project-id="projectId"
+		:project-id="project.id"
 		viewName="kanban"
 	>
 		<template #header>
@@ -224,7 +224,7 @@
 </template>
 
 <script setup lang="ts">
-import {computed, nextTick, ref, watch, type PropType} from 'vue'
+import {computed, nextTick, ref, watch} from 'vue'
 import {useI18n} from 'vue-i18n'
 import draggable from 'zhyswan-vuedraggable'
 import {klona} from 'klona/lite'
@@ -263,13 +263,6 @@ const DRAG_OPTIONS = {
 
 const MIN_SCROLL_HEIGHT_PERCENT = 0.25
 
-const props = defineProps({
-	projectId: {
-		type: Number as PropType<IProject['id']>,
-		required: true,
-	},
-})
-
 const {t} = useI18n({useScope: 'global'})
 
 const baseStore = useBaseStore()
@@ -340,10 +333,11 @@ const taskLoading = computed(() => taskStore.isLoading)
 
 watch(
 	() => ({
-		projectId: props.projectId,
 		params: params.value,
+		project: project.value,
 	}),
-	({projectId, params}) => {
+	({params, project}) => {
+		const projectId = project.id
 		if (projectId === undefined) {
 			return
 		}
@@ -483,7 +477,7 @@ async function addTaskToBucket(bucketId: IBucket['id']) {
 	const task = await taskStore.createNewTask({
 		title: newTaskText.value,
 		bucketId,
-		projectId: props.projectId,
+		projectId: project.value.id,
 	})
 	newTaskText.value = ''
 	kanbanStore.addTaskToBucket(task)
@@ -505,7 +499,7 @@ async function createNewBucket() {
 
 	await kanbanStore.createBucket(new BucketModel({
 		title: newBucketTitle.value,
-		projectId: props.projectId,
+		projectId: project.value.id,
 	}))
 	newBucketTitle.value = ''
 	showNewBucketInput.value = false
@@ -525,7 +519,7 @@ async function deleteBucket() {
 		await kanbanStore.deleteBucket({
 			bucket: new BucketModel({
 				id: bucketToDelete.value,
-				projectId: props.projectId,
+				projectId: project.value.id,
 			}),
 			params: params.value,
 		})
@@ -612,7 +606,7 @@ async function toggleDoneBucket(bucket: IBucket) {
 
 function collapseBucket(bucket: IBucket) {
 	collapsedBuckets.value[bucket.id] = true
-	saveCollapsedBucketState(props.projectId, collapsedBuckets.value)
+	saveCollapsedBucketState(project.value.id, collapsedBuckets.value)
 }
 
 function unCollapseBucket(bucket: IBucket) {
@@ -621,7 +615,7 @@ function unCollapseBucket(bucket: IBucket) {
 	}
 
 	collapsedBuckets.value[bucket.id] = false
-	saveCollapsedBucketState(props.projectId, collapsedBuckets.value)
+	saveCollapsedBucketState(project.value.id, collapsedBuckets.value)
 }
 </script>