diff --git a/frontend/pages/projects/[id]/archives.vue b/frontend/pages/projects/[id]/archives.vue index 703bc82..e41df4a 100644 --- a/frontend/pages/projects/[id]/archives.vue +++ b/frontend/pages/projects/[id]/archives.vue @@ -82,7 +82,6 @@ import type { TaskGroup } from '~/services/dto/task-group' import type { UserData } from '~/services/dto/user-data' import { useProjectService } from '~/services/projects' import { useTaskService } from '~/services/tasks' -import { useTaskStatusService } from '~/services/task-statuses' import { useTaskEffortService } from '~/services/task-efforts' import { useTaskPriorityService } from '~/services/task-priorities' import { useTaskTagService } from '~/services/task-tags' @@ -96,7 +95,6 @@ useHead({ title: 'Archives' }) const projectService = useProjectService() const taskService = useTaskService() -const statusService = useTaskStatusService() const effortService = useTaskEffortService() const priorityService = useTaskPriorityService() const tagService = useTaskTagService() @@ -105,8 +103,11 @@ const userService = useUserService() const project = ref(null) const archivedTasks = ref([]) -const statuses = ref([]) const efforts = ref([]) + +const statuses = computed(() => + [...(project.value?.workflow?.statuses ?? [])].sort((a, b) => a.position - b.position), +) const priorities = ref([]) const tags = ref([]) const groups = ref([]) @@ -126,10 +127,9 @@ const filteredTasks = computed(() => { }) async function loadData() { - const [p, t, s, e, pr, ty, g, u] = await Promise.all([ + const [p, t, e, pr, ty, g, u] = await Promise.all([ projectService.getById(projectId.value), taskService.getByProject(projectId.value, true), - statusService.getAll(), effortService.getAll(), priorityService.getAll(), tagService.getAll(), @@ -138,7 +138,6 @@ async function loadData() { ]) project.value = p archivedTasks.value = t - statuses.value = s efforts.value = e priorities.value = pr tags.value = ty diff --git a/frontend/pages/projects/[id]/index.vue b/frontend/pages/projects/[id]/index.vue index 45cd70d..10490ab 100644 --- a/frontend/pages/projects/[id]/index.vue +++ b/frontend/pages/projects/[id]/index.vue @@ -218,7 +218,6 @@ import type { Client } from '~/services/dto/client' import { useProjectService } from '~/services/projects' import { useClientService } from '~/services/clients' import { useTaskService } from '~/services/tasks' -import { useTaskStatusService } from '~/services/task-statuses' import { useTaskEffortService } from '~/services/task-efforts' import { useTaskPriorityService } from '~/services/task-priorities' import { useTaskTagService } from '~/services/task-tags' @@ -234,7 +233,6 @@ useHead({ title: 'Projet' }) const projectService = useProjectService() const clientService = useClientService() const taskService = useTaskService() -const statusService = useTaskStatusService() const effortService = useTaskEffortService() const priorityService = useTaskPriorityService() const tagService = useTaskTagService() @@ -243,7 +241,6 @@ const userService = useUserService() const project = ref(null) const tasks = ref([]) -const statuses = ref([]) const efforts = ref([]) const priorities = ref([]) const tags = ref([]) @@ -252,6 +249,10 @@ const users = ref([]) const clients = ref([]) const isLoading = ref(true) +const statuses = computed(() => + [...(project.value?.workflow?.statuses ?? [])].sort((a, b) => a.position - b.position), +) + const selectedGroupId = ref(null) const selectedTagId = ref(null) const selectedAssigneeId = ref(null) @@ -333,10 +334,9 @@ const backlogTasks = computed(() => async function loadData() { isLoading.value = true try { - const [p, t, s, e, pr, ty, g, u, c] = await Promise.all([ + const [p, t, e, pr, ty, g, u, c] = await Promise.all([ projectService.getById(projectId.value), taskService.getByProject(projectId.value), - statusService.getAll(), effortService.getAll(), priorityService.getAll(), tagService.getAll(), @@ -346,7 +346,6 @@ async function loadData() { ]) project.value = p tasks.value = t - statuses.value = s efforts.value = e priorities.value = pr tags.value = ty