From bc34a33922f899af4ef5128724b285ee68ef06b6 Mon Sep 17 00:00:00 2001
From: kolaente <k@knt.li>
Date: Sat, 16 Mar 2024 13:08:50 +0100
Subject: [PATCH] fix(views): move to new project view when moving tasks

---
 frontend/src/composables/useRouteWithModal.ts | 31 +++++++++++++------
 1 file changed, 22 insertions(+), 9 deletions(-)

diff --git a/frontend/src/composables/useRouteWithModal.ts b/frontend/src/composables/useRouteWithModal.ts
index 6cf9a66dc..4857b3c67 100644
--- a/frontend/src/composables/useRouteWithModal.ts
+++ b/frontend/src/composables/useRouteWithModal.ts
@@ -1,12 +1,14 @@
-import {computed, shallowRef, watchEffect, h, type VNode} from 'vue'
+import {computed, h, shallowRef, type VNode, watchEffect} from 'vue'
 import {useRoute, useRouter} from 'vue-router'
 import {useBaseStore} from '@/stores/base'
+import {useProjectStore} from '@/stores/projects'
 
 export function useRouteWithModal() {
 	const router = useRouter()
 	const route = useRoute()
 	const backdropView = computed(() => route.fullPath && window.history.state.backdropView)
 	const baseStore = useBaseStore()
+	const projectStore = useProjectStore()
 
 	const routeWithModal = computed(() => {
 		return backdropView.value
@@ -29,7 +31,7 @@ export function useRouteWithModal() {
 			if (routePropsOption === true) {
 				routeProps = route.params
 			} else {
-				if(typeof routePropsOption === 'function') {
+				if (typeof routePropsOption === 'function') {
 					routeProps = routePropsOption(route)
 				} else {
 					routeProps = routePropsOption
@@ -52,7 +54,7 @@ export function useRouteWithModal() {
 		}
 		currentModal.value = h(component, routeProps)
 	})
-	
+
 	const historyState = computed(() => route.fullPath && window.history.state)
 
 	function closeModal() {
@@ -60,12 +62,23 @@ export function useRouteWithModal() {
 		// 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)
+		const routeMatch = new RegExp('\\/projects\\/\\d+\\/(\\d+)', 'g')
+		const match = routeMatch.exec(historyState.value.back)
+		if (match !== null && baseStore.currentProject) {
+			let viewId: string | number = match[1]
+
+			if (!viewId) {
+				viewId = projectStore.projects[baseStore.currentProject?.id].views[0]?.id
+			}
+
+			const newRoute = {
+				name: 'project.view',
+				params: {
+					projectId: baseStore.currentProject?.id,
+					viewId,
+				},
+			}
+			router.push(newRoute)
 			return
 		}