Merge branch 'develop' into feat/mail-integration

frontend/components/task/TaskBulkActions.vue

@@ -14,8 +14,9 @@
         </span>
 
         <div v-if="selectedCount > 0" class="ml-2 flex items-center gap-1">
-            <!-- Bulk status -->
+            <!-- Bulk status (scoped to single project's workflow) -->
             <MalioSelect
+                v-if="!isMultiProject"
                 :model-value="null"
                 :options="statusOptions"
                 label="Status"
@@ -25,6 +26,13 @@
                 text-value="text-xs"
                 @update:model-value="(v: number | null) => v && emit('bulk-update', 'status', v)"
             />
+            <span
+                v-else
+                class="rounded border border-neutral-200 px-2 py-1 text-xs text-neutral-400"
+                title="Sélection multi-projets — le statut dépend du workflow de chaque projet"
+            >
+                Status —
+            </span>
             <!-- Bulk user -->
             <MalioSelect
                 :model-value="null"
@@ -85,13 +93,15 @@
 </template>
 
 <script setup lang="ts">
+import type { Task } from '~/services/dto/task'
 import type { TaskStatus } from '~/services/dto/task-status'
 import type { TaskEffort } from '~/services/dto/task-effort'
 import type { TaskPriority } from '~/services/dto/task-priority'
 import type { TaskGroup } from '~/services/dto/task-group'
 import type { UserData } from '~/services/dto/user-data'
+import type { Project } from '~/services/dto/project'
 
-const props = defineProps<{
+const props = withDefaults(defineProps<{
     selectedCount: number
     totalCount: number
     allSelected: boolean
@@ -101,7 +111,12 @@ const props = defineProps<{
     priorities: TaskPriority[]
     efforts: TaskEffort[]
     groups: TaskGroup[]
-}>()
+    selectedTasks?: Task[]
+    projects?: Project[]
+}>(), {
+    selectedTasks: () => [],
+    projects: () => [],
+})
 
 const emit = defineEmits<{
     (e: 'toggle-all'): void
@@ -110,23 +125,42 @@ const emit = defineEmits<{
     (e: 'bulk-delete'): void
 }>()
 
-const statusOptions = computed(() =>
-    props.statuses.map(s => ({ label: s.label, value: s.id }))
-)
+const distinctProjectIds = computed(() => {
+    const ids = new Set<number>()
+    for (const t of props.selectedTasks) {
+        if (t.project) ids.add(t.project.id)
+    }
+    return ids
+})
+
+const isMultiProject = computed(() => distinctProjectIds.value.size > 1)
+
+const statusOptions = computed<{ label: string, value: number }[]>(() => {
+    // Si on connait les projets et qu'on est sur un seul, on scope au workflow de ce projet
+    if (distinctProjectIds.value.size === 1 && props.projects.length > 0) {
+        const projectId = [...distinctProjectIds.value][0]
+        const project = props.projects.find(p => p.id === projectId)
+        if (project?.workflow?.statuses) {
+            return project.workflow.statuses.map(s => ({ label: s.label, value: s.id }))
+        }
+    }
+    // Fallback : statuts globaux fournis en props (ex. depuis projects/[id])
+    return props.statuses.map(s => ({ label: s.label, value: s.id }))
+})
 
 const userOptions = computed(() =>
-    props.users.map(u => ({ label: u.username, value: u.id }))
+    props.users.map(u => ({ label: u.username, value: u.id })),
 )
 
 const priorityOptions = computed(() =>
-    props.priorities.map(p => ({ label: p.label, value: p.id }))
+    props.priorities.map(p => ({ label: p.label, value: p.id })),
 )
 
 const effortOptions = computed(() =>
-    props.efforts.map(e => ({ label: e.label, value: e.id }))
+    props.efforts.map(e => ({ label: e.label, value: e.id })),
 )
 
 const groupOptions = computed(() =>
-    props.groups.filter(g => !g.archived).map(g => ({ label: g.title, value: g.id }))
+    props.groups.filter(g => !g.archived).map(g => ({ label: g.title, value: g.id })),
 )
 </script>

frontend/components/task/TaskCard.vue

@@ -40,6 +40,13 @@
         </div>
 
         <div class="mt-2 flex items-center gap-1.5">
+            <span
+                v-if="showStatusBadge && task.status"
+                class="rounded-full px-2 py-0.5 text-xs font-semibold text-white"
+                :style="{ backgroundColor: task.status.color }"
+            >
+                {{ task.status.label }}
+            </span>
             <span
                 v-if="task.priority"
                 class="rounded-full px-2 py-0.5 text-xs font-semibold text-white"
@@ -106,8 +113,10 @@ import type { Task } from '~/services/dto/task'
 const props = withDefaults(defineProps<{
     task: Task
     showProjectColor?: boolean
+    showStatusBadge?: boolean
 }>(), {
     showProjectColor: false,
+    showStatusBadge: false,
 })
 
 const emit = defineEmits<{

frontend/components/task/TaskStatusDrawer.vue

@@ -1,122 +0,0 @@
-<template>
-    <MalioDrawer v-model="isOpen" :title="isEditing ? $t('taskStatuses.editStatus') : $t('taskStatuses.addStatus')">
-        <form @submit.prevent="handleSubmit" class="flex flex-col gap-2">
-            <MalioInputText
-                v-model="form.label"
-                label="Libellé"
-                input-class="w-full"
-                :error="touched.label && !form.label.trim() ? 'Le libellé est requis' : ''"
-                @blur="touched.label = true"
-            />
-            <MalioInputText
-                v-model="form.position"
-                label="Position"
-                input-class="w-full"
-                type="number"
-            />
-            <div class="mt-4">
-                <ColorPicker v-model="form.color" />
-            </div>
-
-            <div class="mt-4 flex items-center gap-2">
-                <input
-                    id="isFinal"
-                    v-model="form.isFinal"
-                    type="checkbox"
-                    class="h-4 w-4 rounded border-neutral-300 text-primary-500 focus:ring-primary-500"
-                />
-                <label for="isFinal" class="text-sm font-medium text-neutral-700">
-                    {{ $t('archive.statusFinal') }}
-                </label>
-            </div>
-
-            <div class="mt-6 flex justify-end">
-                <MalioButton
-                    label="Enregistrer"
-                    button-class="w-auto px-6"
-                    :disabled="isSubmitting"
-                    @click="handleSubmit"
-                />
-            </div>
-        </form>
-    </MalioDrawer>
-</template>
-
-<script setup lang="ts">
-import type { TaskStatus, TaskStatusWrite } from '~/services/dto/task-status'
-import { useTaskStatusService } from '~/services/task-statuses'
-
-const props = defineProps<{
-    modelValue: boolean
-    item: TaskStatus | null
-}>()
-
-const emit = defineEmits<{
-    (e: 'update:modelValue', value: boolean): void
-    (e: 'saved'): void
-}>()
-
-const isOpen = computed({
-    get: () => props.modelValue,
-    set: (v) => emit('update:modelValue', v),
-})
-
-const isEditing = computed(() => !!props.item)
-const isSubmitting = ref(false)
-
-const form = reactive({
-    label: '',
-    position: '0',
-    color: '#222783',
-    isFinal: false,
-})
-
-const touched = reactive({
-    label: false,
-})
-
-watch(() => props.modelValue, (open) => {
-    if (open) {
-        if (props.item) {
-            form.label = props.item.label ?? ''
-            form.position = String(props.item.position ?? 0)
-            form.color = props.item.color ?? '#222783'
-            form.isFinal = props.item.isFinal ?? false
-        } else {
-            form.label = ''
-            form.position = '0'
-            form.color = '#222783'
-            form.isFinal = false
-        }
-        touched.label = false
-    }
-})
-
-const { create, update } = useTaskStatusService()
-
-async function handleSubmit() {
-    touched.label = true
-    if (!form.label.trim()) return
-
-    isSubmitting.value = true
-    try {
-        const payload: TaskStatusWrite = {
-            label: form.label.trim(),
-            position: Number(form.position),
-            color: form.color,
-            isFinal: form.isFinal,
-        }
-
-        if (isEditing.value && props.item) {
-            await update(props.item.id, payload)
-        } else {
-            await create(payload)
-        }
-
-        emit('saved')
-        isOpen.value = false
-    } finally {
-        isSubmitting.value = false
-    }
-}
-</script>