From a3714c74fdcea8ddfac1aff7a3b2262d855177d2 Mon Sep 17 00:00:00 2001
From: kolaente <k@knt.li>
Date: Sat, 16 Mar 2024 12:31:10 +0100
Subject: [PATCH] feat(views): load views when navigating with link share

---
 .../src/components/home/contentLinkShare.vue  |  4 +++
 .../src/components/sharing/linkSharing.vue    | 28 ++++++++-----------
 frontend/src/types/ProjectView.ts             |  8 ------
 .../src/views/sharing/LinkSharingAuth.vue     | 12 ++++----
 4 files changed, 21 insertions(+), 31 deletions(-)
 delete mode 100644 frontend/src/types/ProjectView.ts

diff --git a/frontend/src/components/home/contentLinkShare.vue b/frontend/src/components/home/contentLinkShare.vue
index b21ee1ea5..95cf3dc15 100644
--- a/frontend/src/components/home/contentLinkShare.vue
+++ b/frontend/src/components/home/contentLinkShare.vue
@@ -33,11 +33,15 @@ import {useBaseStore} from '@/stores/base'
 
 import Logo from '@/components/home/Logo.vue'
 import PoweredByLink from './PoweredByLink.vue'
+import {useProjectStore} from '@/stores/projects'
 
 const baseStore = useBaseStore()
 const currentProject = computed(() => baseStore.currentProject)
 const background = computed(() => baseStore.background)
 const logoVisible = computed(() => baseStore.logoVisible)
+
+const projectStore = useProjectStore()
+projectStore.loadAllProjects()
 </script>
 
 <style lang="scss" scoped>
diff --git a/frontend/src/components/sharing/linkSharing.vue b/frontend/src/components/sharing/linkSharing.vue
index 88aaa61ad..b63d0805d 100644
--- a/frontend/src/components/sharing/linkSharing.vue
+++ b/frontend/src/components/sharing/linkSharing.vue
@@ -173,11 +173,11 @@
 							<div class="select">
 								<select v-model="selectedView[s.id]">
 									<option
-										v-for="(title, key) in availableViews"
-										:key="key"
-										:value="key"
+										v-for="(view) in availableViews"
+										:key="view.id"
+										:value="view.id"
 									>
-										{{ title }}
+										{{ view.title }}
 									</option>
 								</select>
 							</div>
@@ -230,9 +230,9 @@ import LinkShareService from '@/services/linkShare'
 import {useCopyToClipboard} from '@/composables/useCopyToClipboard'
 import {success} from '@/message'
 import {getDisplayName} from '@/models/user'
-import type {ProjectView} from '@/types/ProjectView'
-import {PROJECT_VIEWS} from '@/types/ProjectView'
 import {useConfigStore} from '@/stores/config'
+import {useProjectStore} from '@/stores/projects'
+import type {IProjectView} from '@/modelTypes/IProjectView'
 
 const props = defineProps({
 	projectId: {
@@ -252,17 +252,13 @@ const showDeleteModal = ref(false)
 const linkIdToDelete = ref(0)
 const showNewForm = ref(false)
 
-type SelectedViewMapper = Record<IProject['id'], ProjectView>
+type SelectedViewMapper = Record<IProject['id'], IProjectView['id']>
 
 const selectedView = ref<SelectedViewMapper>({})
 
-const availableViews = computed<Record<ProjectView, string>>(() => ({
-	list: t('project.list.title'),
-	gantt: t('project.gantt.title'),
-	table: t('project.table.title'),
-	kanban: t('project.kanban.title'),
-}))
+const projectStore = useProjectStore()
 
+const availableViews = computed<IProjectView[]>(() => projectStore.projects[props.projectId]?.views || [])
 const copy = useCopyToClipboard()
 watch(
 	() => props.projectId,
@@ -281,7 +277,7 @@ async function load(projectId: IProject['id']) {
 
 	const links = await linkShareService.getAll({projectId})
 	links.forEach((l: ILinkShare) => {
-		selectedView.value[l.id] = 'list'
+		selectedView.value[l.id] = availableViews.value[0].id
 	})
 	linkShares.value = links
 }
@@ -315,8 +311,8 @@ async function remove(projectId: IProject['id']) {
 	}
 }
 
-function getShareLink(hash: string, view: ProjectView = PROJECT_VIEWS.LIST) {
-	return frontendUrl.value + 'share/' + hash + '/auth?view=' + view
+function getShareLink(hash: string, viewId: IProjectView['id']) {
+	return frontendUrl.value + 'share/' + hash + '/auth?view=' + viewId
 }
 </script>
 
diff --git a/frontend/src/types/ProjectView.ts b/frontend/src/types/ProjectView.ts
deleted file mode 100644
index ba435ef96..000000000
--- a/frontend/src/types/ProjectView.ts
+++ /dev/null
@@ -1,8 +0,0 @@
-export const PROJECT_VIEWS = {
-	LIST: 'list',
-	GANTT: 'gantt',
-	TABLE: 'table',
-	KANBAN: 'kanban',
-} as const
-
-export type ProjectView = typeof PROJECT_VIEWS[keyof typeof PROJECT_VIEWS]
diff --git a/frontend/src/views/sharing/LinkSharingAuth.vue b/frontend/src/views/sharing/LinkSharingAuth.vue
index 8daa79ba5..34e48db1c 100644
--- a/frontend/src/views/sharing/LinkSharingAuth.vue
+++ b/frontend/src/views/sharing/LinkSharingAuth.vue
@@ -49,7 +49,6 @@ import {useI18n} from 'vue-i18n'
 import {useTitle} from '@vueuse/core'
 
 import Message from '@/components/misc/message.vue'
-import {PROJECT_VIEWS, type ProjectView} from '@/types/ProjectView'
 import {LINK_SHARE_HASH_PREFIX} from '@/constants/linkShareHash'
 
 import {useBaseStore} from '@/stores/base'
@@ -96,10 +95,6 @@ function useAuth() {
 				: true
 			baseStore.setLogoVisible(logoVisible)
 
-			const view = route.query.view && Object.values(PROJECT_VIEWS).includes(route.query.view as ProjectView)
-				? route.query.view
-				: 'list'
-
 			const hash = LINK_SHARE_HASH_PREFIX + route.params.share
 
 			const last = getLastVisitedRoute()
@@ -111,8 +106,11 @@ function useAuth() {
 			}
 
 			return router.push({
-				name: `project.${view}`,
-				params: {projectId},
+				name: 'project.view',
+				params: {
+					projectId, 
+					viewId: route.query.view
+				},
 				hash,
 			})
 		} catch (e) {