diff --git a/frontend/src/components/project/views/ProjectGantt.vue b/frontend/src/components/project/views/ProjectGantt.vue index 9ac46832a..6f459ecf8 100644 --- a/frontend/src/components/project/views/ProjectGantt.vue +++ b/frontend/src/components/project/views/ProjectGantt.vue @@ -104,7 +104,7 @@ const GanttChart = createAsyncComponent(() => import('@/components/tasks/GanttCh const baseStore = useBaseStore() const canWrite = computed(() => baseStore.currentProject?.maxRight > RIGHTS.READ) -const {route} = toRefs(props) +const {route, viewId} = toRefs(props) const { filters, hasDefaultFilters, @@ -113,7 +113,7 @@ const { isLoading, addTask, updateTask, -} = useGanttFilters(route, props.viewId) +} = useGanttFilters(route, viewId) const DEFAULT_DATE_RANGE_DAYS = 7 @@ -218,4 +218,4 @@ const flatPickerConfig = computed(() => ({ font-size: .9rem; } } - \ No newline at end of file + diff --git a/frontend/src/views/project/helpers/useGanttFilters.ts b/frontend/src/views/project/helpers/useGanttFilters.ts index e75677b75..cbfa78c73 100644 --- a/frontend/src/views/project/helpers/useGanttFilters.ts +++ b/frontend/src/views/project/helpers/useGanttFilters.ts @@ -94,7 +94,7 @@ export type UseGanttFiltersReturn = ReturnType> & ReturnType> -export function useGanttFilters(route: Ref, viewId: IProjectView['id']): UseGanttFiltersReturn { +export function useGanttFilters(route: Ref, viewId: Ref): UseGanttFiltersReturn { const { filters, hasDefaultFilters, @@ -128,4 +128,4 @@ export function useGanttFilters(route: Ref, viewId: IPr addTask, updateTask, } -} \ No newline at end of file +} diff --git a/frontend/src/views/project/helpers/useGanttTaskList.ts b/frontend/src/views/project/helpers/useGanttTaskList.ts index e616c2399..eed634a7a 100644 --- a/frontend/src/views/project/helpers/useGanttTaskList.ts +++ b/frontend/src/views/project/helpers/useGanttTaskList.ts @@ -16,7 +16,7 @@ import type {IProjectView} from '@/modelTypes/IProjectView' export function useGanttTaskList( filters: Ref, filterToApiParams: (filters: F) => TaskFilterParams, - viewId: IProjectView['id'], + viewId: Ref, loadAll: boolean = true, ) { const taskCollectionService = shallowReactive(new TaskCollectionService()) @@ -33,7 +33,7 @@ export function useGanttTaskList( params.filter_timezone = authStore.settings.timezone } - const tasks = await taskCollectionService.getAll({projectId: filters.value.projectId, viewId}, params, page) as ITask[] + const tasks = await taskCollectionService.getAll({projectId: filters.value.projectId, viewId: viewId.value}, params, page) as ITask[] if (loadAll && page < taskCollectionService.totalPages) { const nextTasks = await fetchTasks(params, page + 1) return tasks.concat(nextTasks) @@ -105,4 +105,4 @@ export function useGanttTaskList( addTask, updateTask, } -} \ No newline at end of file +}