From a6eb804fae678cb801ae14d4405e9c28f58804a8 Mon Sep 17 00:00:00 2001 From: kolaente Date: Tue, 12 Sep 2023 15:12:16 +0200 Subject: [PATCH] fix(gantt): open task with double click from the gantt chart --- src/composables/useRouteFilters.ts | 6 ++++-- src/views/project/helpers/useGanttFilters.ts | 1 + src/views/project/helpers/useGanttTaskList.ts | 6 +++--- 3 files changed, 8 insertions(+), 5 deletions(-) diff --git a/src/composables/useRouteFilters.ts b/src/composables/useRouteFilters.ts index baf2f3c58..29b812d84 100644 --- a/src/composables/useRouteFilters.ts +++ b/src/composables/useRouteFilters.ts @@ -1,5 +1,5 @@ import {computed, ref, watch, type Ref} from 'vue' -import {useRouter, type RouteLocationNormalized, type RouteLocationRaw} from 'vue-router' +import {useRouter, type RouteLocationNormalized, type RouteLocationRaw, type RouteRecordName} from 'vue-router' import equal from 'fast-deep-equal/es6' export type Filters = Record @@ -9,6 +9,7 @@ export function useRouteFilters( getDefaultFilters: (route: RouteLocationNormalized) => CurrentFilters, routeToFilters: (route: RouteLocationNormalized) => CurrentFilters, filtersToRoute: (filters: CurrentFilters) => RouteLocationRaw, + routeAllowList: RouteRecordName[] = [], ) { const router = useRouter() @@ -21,7 +22,8 @@ export function useRouteFilters( (route, oldRoute) => { if ( route?.name !== oldRoute?.name || - routeFromFiltersFullPath.value === route.fullPath + routeFromFiltersFullPath.value === route.fullPath || + !routeAllowList.includes(route.name ?? '') ) { return } diff --git a/src/views/project/helpers/useGanttFilters.ts b/src/views/project/helpers/useGanttFilters.ts index 28c9dbd4e..d0fd63b91 100644 --- a/src/views/project/helpers/useGanttFilters.ts +++ b/src/views/project/helpers/useGanttFilters.ts @@ -101,6 +101,7 @@ export function useGanttFilters(route: Ref): UseGanttFi ganttGetDefaultFilters, ganttRouteToFilters, ganttFiltersToRoute, + ['project.gantt'], ) const { diff --git a/src/views/project/helpers/useGanttTaskList.ts b/src/views/project/helpers/useGanttTaskList.ts index 9f4f603eb..cf77cd03b 100644 --- a/src/views/project/helpers/useGanttTaskList.ts +++ b/src/views/project/helpers/useGanttTaskList.ts @@ -59,7 +59,7 @@ export function useGanttTaskList( async function addTask(task: Partial) { const newTask = await taskService.create(new TaskModel({...task})) tasks.value.set(newTask.id, newTask) - + return newTask } @@ -77,12 +77,12 @@ export function useGanttTaskList( // set in expectation that server update works tasks.value.set(newTask.id, newTask) - try { + try { const updatedTask = await taskService.update(newTask) // update the task with possible changes from server tasks.value.set(updatedTask.id, updatedTask) success('Saved') - } catch(e: any) { + } catch (e: any) { error('Something went wrong saving the task') // roll back changes tasks.value.set(task.id, oldTask)