8313c759c6
Auto Tag Develop / tag (push) Successful in 9s
## Migration modular monolith DDD — Lesstime (0.1 → 3.3) Cette MR regroupe l'intégralité de la refonte en monolithe modulaire (strangler progressif, additif). Elle remplace les MR stackées de Phase 1 (#12–#16), désormais incluses ici. **Ne pas merger avant validation fonctionnelle** : branche destinée à être testée telle quelle. ### Périmètre — 9 modules sous `src/Module/` | Phase | Module | Contenu | |------|--------|---------| | 0.1 | (socle) | infrastructure modulaire, `ModuleInterface`, mapping Doctrine par module | | 0.2 | (socle front) | auto-détection des layers Nuxt sous `frontend/modules/*` | | 1.1 | **Core** | Identité (User/Auth), Notifications, Notifier | | 1.2 | Core | RBAC fin (permissions `module.resource.action`, sidebar gated) | | 1.3 | Core | Audit log (`#[Auditable]`, listener, provider DBAL) | | 2.1 | **TimeTracking** | TimeEntry + MCP + export | | 2.2 | **ProjectManagement** | cœur métier Projets/Tâches + 38 MCP tools | | 2.3 | **Absence** | demandes, soldes, policies, justificatifs | | 2.4 | **Directory** | Clients (migrés) + **Prospects** (nouveau, conversion → Client) | | 2.5 | **Mail** | intégration IMAP OVH + liens tâches | | 2.6 | **Integration** | Gitea / BookStack / Zimbra / Share | | 3.1 | **Reporting** | rapports transverses (DBAL read-only, 0 import inter-module) | | 3.2 | **ClientPortal** | portail client (ROLE_CLIENT cloisonné, tickets, notifications) | | 3.3 | (finition) | nettoyage legacy — `src/Entity` vide, app 100% modulaire | ### Architecture - Découplage inter-modules par **contrats** (`UserInterface`, `ProjectInterface`, `TaskInterface`, `TaskTagInterface`, `ClientInterface`, `ClientTicketInterface`, `LeaveProfileInterface`) + `resolve_target_entities` 100% modulaire (aucune cible legacy). - Repositories : interface `Domain/Repository` + implémentation `Infrastructure/Doctrine`, bindées. - Reporting en DBAL read-only pur (aucun import d'entité d'un autre module). - Chaque migration de module : déplacement à comportement préservé (API publique et noms d'outils MCP inchangés), migrations **additives** uniquement (zéro destructif). ### Sécurité - ROLE_CLIENT cloisonné : un utilisateur client n'accède qu'à `/portal` et à ses propres tickets (filtrés par `allowedProjects`), interdit sur toute l'API interne. - Correctif : interdiction pour un client de créer un lien vers le partage SMB (upload uniquement). ### QA non-régression (branche reconstruite from scratch) - Migrations from scratch + fixtures : OK. - Compilation dev + prod : OK. - **180 tests PHPUnit verts**, php-cs-fixer clean, ~96 routes, **66 outils MCP** tous sous `App\Module\*`. - Smoke test runtime multi-rôles (admin / ROLE_USER / ROLE_CLIENT) : 44 vérifications HTTP, **0 écart**, cloisonnement client étanche. - Build Nuxt OK, 9 layers, 0 import legacy résiduel. ### Points à arbitrer (hors périmètre de cette migration) - Durcissement MCP/IDOR pré-existant (`userId` explicite sans scoping sur certains tools TimeTracking/Absence/TaskDocument) — ticket dédié recommandé. - Validation fonctionnelle de **Prospect** et **ClientPortal** (conçus depuis les specs disque). - **Harmonisation visuelle Malio finale** (3.3) — finition esthétique inter-modules laissée au PO. --- ## ⚠️ Déploiement / migration des données — à ne pas oublier ### 1. Resynchroniser les séquences PostgreSQL après tout import/restore de dump Si la prod (ou tout environnement) est **montée depuis un dump** (`pg_restore` / `COPY`), les lignes sont chargées avec leurs `id` explicites **sans avancer les séquences** → au premier `INSERT` : `duplicate key value violates unique constraint "..._pkey"` (constaté en local sur `notification`, `task`, `time_entry`…). À lancer **juste après chaque restore/import** : ```sql DO $$ DECLARE r RECORD; maxid BIGINT; seq TEXT; BEGIN FOR r IN SELECT table_name, column_name FROM information_schema.columns WHERE table_schema='public' LOOP seq := pg_get_serial_sequence(quote_ident(r.table_name), r.column_name); IF seq IS NOT NULL THEN EXECUTE format('SELECT COALESCE(MAX(%I),0) FROM %I', r.column_name, r.table_name) INTO maxid; PERFORM setval(seq, GREATEST(maxid,1), maxid > 0); END IF; END LOOP; END $$; ``` > Ne concerne **pas** une prod qui tourne déjà (séquences avancées organiquement) — uniquement le cas restore/import. Idempotent, sans risque. ### 2. Fix dénormalisation des collections typées-contrat (code, inclus dans la branche) Les relations **to-many** typées par une interface `Shared\Domain\Contract\*` (`TimeEntry::tags` → `TaskTagInterface`, `Task::collaborators` → `UserInterface`) étaient **indénormalisables par API Platform** (mono-valué OK via IRI, collection KO) → **tout POST/PATCH portant une telle collection renvoyait 400/500**. Corrigé par un dénormaliseur générique `ContractRelationDenormalizer` (réutilise `resolve_target_entities`, zéro couplage par-entité) + test fonctionnel de non-régression. --------- Co-authored-by: Matthieu <contact@malio.fr> Reviewed-on: #17
193 lines
8.6 KiB
Vue
193 lines
8.6 KiB
Vue
<template>
|
|
<MalioDrawer v-model="open" drawer-class="max-w-lg">
|
|
<template #header>
|
|
<h2 class="text-xl font-bold">{{ $t('absences.detail.title') }}</h2>
|
|
</template>
|
|
<div v-if="request" class="flex flex-col gap-5">
|
|
<!-- Hero -->
|
|
<div class="overflow-hidden rounded-xl border border-neutral-200 shadow-sm">
|
|
<div
|
|
class="flex items-start gap-3 p-4"
|
|
:style="{ borderLeft: `4px solid ${typeColor(request.type)}` }"
|
|
>
|
|
<span
|
|
class="mt-0.5 flex h-11 w-11 flex-shrink-0 items-center justify-center rounded-full"
|
|
:style="{ backgroundColor: tint(request.type), color: typeColor(request.type) }"
|
|
>
|
|
<Icon name="mdi:calendar-account" size="22" />
|
|
</span>
|
|
<div class="min-w-0 flex-1">
|
|
<p class="truncate text-lg font-semibold text-neutral-900">{{ request.label }}</p>
|
|
<p class="mt-0.5 flex items-center gap-1.5 text-sm text-neutral-500">
|
|
<Icon name="mdi:calendar-range" size="15" />
|
|
{{ formatRange(request) }}
|
|
</p>
|
|
</div>
|
|
<StatusBadge
|
|
class="flex-shrink-0"
|
|
:label="statusLabel(request.status)"
|
|
:variant="statusVariant(request.status)"
|
|
:icon="statusIcon(request.status)"
|
|
/>
|
|
</div>
|
|
|
|
<dl class="grid grid-cols-2 divide-x divide-neutral-200 border-t border-neutral-200 bg-neutral-50">
|
|
<div class="flex items-center gap-2.5 p-3">
|
|
<span
|
|
v-if="request.user.avatarUrl"
|
|
class="h-9 w-9 flex-shrink-0 overflow-hidden rounded-full"
|
|
>
|
|
<img :src="request.user.avatarUrl" alt="" class="h-full w-full object-cover">
|
|
</span>
|
|
<span
|
|
v-else
|
|
class="flex h-9 w-9 flex-shrink-0 items-center justify-center rounded-full bg-primary-100 text-xs font-semibold text-primary-600"
|
|
>
|
|
{{ initials }}
|
|
</span>
|
|
<div class="min-w-0">
|
|
<dt class="text-xs text-neutral-400">{{ $t('absences.table.employee') }}</dt>
|
|
<dd class="truncate text-sm font-medium text-neutral-800">{{ request.user.username }}</dd>
|
|
</div>
|
|
</div>
|
|
<div class="flex flex-col justify-center p-3">
|
|
<dt class="text-xs text-neutral-400">{{ $t('absences.table.days') }}</dt>
|
|
<dd class="text-sm font-semibold text-neutral-900">{{ formatDays(request.countedDays) }}</dd>
|
|
</div>
|
|
</dl>
|
|
</div>
|
|
|
|
<!-- Reason -->
|
|
<div v-if="request.reason" class="rounded-lg border border-neutral-200 p-3">
|
|
<p class="mb-1 flex items-center gap-1.5 text-xs font-medium uppercase tracking-wide text-neutral-400">
|
|
<Icon name="mdi:comment-text-outline" size="14" />
|
|
{{ $t('absences.form.reason') }}
|
|
</p>
|
|
<p class="whitespace-pre-line text-sm text-neutral-800">{{ request.reason }}</p>
|
|
</div>
|
|
|
|
<!-- Rejection -->
|
|
<div
|
|
v-if="request.status === 'rejected' && request.rejectionReason"
|
|
class="rounded-lg border border-red-200 bg-red-50 p-3"
|
|
>
|
|
<p class="mb-1 flex items-center gap-1.5 text-xs font-medium uppercase tracking-wide text-red-500">
|
|
<Icon name="mdi:close-circle-outline" size="14" />
|
|
{{ $t('absences.detail.rejectionReason') }}
|
|
</p>
|
|
<p class="text-sm text-red-700">{{ request.rejectionReason }}</p>
|
|
</div>
|
|
|
|
<!-- Justification -->
|
|
<a
|
|
v-if="request.justificationUrl"
|
|
:href="request.justificationUrl"
|
|
target="_blank"
|
|
rel="noopener"
|
|
class="flex items-center gap-2 rounded-lg border border-neutral-200 p-3 text-sm font-medium text-neutral-700 transition hover:border-primary-300 hover:bg-primary-50"
|
|
>
|
|
<Icon name="mdi:file-document-outline" size="20" class="text-primary-500" />
|
|
<span class="flex-1 truncate">{{ request.justificationFileName || $t('absences.detail.downloadJustification') }}</span>
|
|
<Icon name="mdi:download" size="16" class="text-neutral-400" />
|
|
</a>
|
|
|
|
<!-- Timeline -->
|
|
<div>
|
|
<p class="mb-3 text-xs font-medium uppercase tracking-wide text-neutral-400">
|
|
{{ $t('absences.detail.timeline') }}
|
|
</p>
|
|
<ol class="relative ml-1 border-l border-neutral-200 pl-5">
|
|
<li class="mb-4 last:mb-0">
|
|
<span class="absolute -left-[7px] mt-0.5 h-3.5 w-3.5 rounded-full border-2 border-white bg-primary-500 ring-1 ring-primary-200" />
|
|
<p class="text-sm font-medium text-neutral-800">{{ $t('absences.detail.created') }}</p>
|
|
<p class="text-xs text-neutral-400">{{ formatDateTime(request.createdAt) }}</p>
|
|
</li>
|
|
<li v-if="request.reviewedAt" class="last:mb-0">
|
|
<span
|
|
class="absolute -left-[7px] mt-0.5 h-3.5 w-3.5 rounded-full border-2 border-white ring-1"
|
|
:class="request.status === 'rejected'
|
|
? 'bg-red-500 ring-red-200'
|
|
: 'bg-green-500 ring-green-200'"
|
|
/>
|
|
<p class="text-sm font-medium text-neutral-800">
|
|
{{ statusLabel(request.status) }}
|
|
<span v-if="request.reviewedBy" class="font-normal text-neutral-500">
|
|
· {{ $t('absences.detail.reviewed', { name: request.reviewedBy.username }) }}
|
|
</span>
|
|
</p>
|
|
<p class="text-xs text-neutral-400">{{ formatDateTime(request.reviewedAt) }}</p>
|
|
</li>
|
|
</ol>
|
|
</div>
|
|
|
|
<div v-if="canCancel" class="flex justify-end border-t border-neutral-100 pt-4">
|
|
<MalioButton
|
|
:label="$t('absences.detail.cancel')"
|
|
variant="danger"
|
|
icon-name="mdi:cancel"
|
|
icon-position="left"
|
|
:disabled="cancelling"
|
|
@click="onCancel"
|
|
/>
|
|
</div>
|
|
</div>
|
|
</MalioDrawer>
|
|
</template>
|
|
|
|
<script setup lang="ts">
|
|
import type { AbsenceRequest } from '~/modules/absence/services/dto/absence'
|
|
import { useAbsenceService } from '~/modules/absence/services/absences'
|
|
|
|
const props = defineProps<{
|
|
modelValue: boolean
|
|
request: AbsenceRequest | null
|
|
canCancel?: boolean
|
|
}>()
|
|
|
|
const emit = defineEmits<{
|
|
'update:modelValue': [value: boolean]
|
|
'cancelled': []
|
|
}>()
|
|
|
|
const { t } = useI18n()
|
|
const service = useAbsenceService()
|
|
const { statusLabel, statusVariant, statusIcon, formatRange, formatDays, typeColor } = useAbsenceHelpers()
|
|
|
|
const open = computed({
|
|
get: () => props.modelValue,
|
|
set: (v) => emit('update:modelValue', v),
|
|
})
|
|
|
|
const cancelling = ref(false)
|
|
|
|
const initials = computed(() => {
|
|
const name = props.request?.user.username ?? ''
|
|
return name.slice(0, 2).toUpperCase() || '?'
|
|
})
|
|
|
|
/** Type colour at ~12% opacity for soft backgrounds. */
|
|
function tint(type: AbsenceRequest['type']): string {
|
|
return `${typeColor(type)}1f`
|
|
}
|
|
|
|
function formatDateTime(iso: string | null): string {
|
|
if (!iso) return ''
|
|
const d = new Date(iso)
|
|
if (isNaN(d.getTime())) return ''
|
|
return d.toLocaleString('fr-FR', { day: '2-digit', month: '2-digit', year: 'numeric', hour: '2-digit', minute: '2-digit' })
|
|
}
|
|
|
|
async function onCancel() {
|
|
if (!props.request) return
|
|
if (!confirm(t('absences.detail.cancelConfirm'))) return
|
|
cancelling.value = true
|
|
try {
|
|
await service.cancel(props.request.id)
|
|
emit('cancelled')
|
|
open.value = false
|
|
} finally {
|
|
cancelling.value = false
|
|
}
|
|
}
|
|
</script>
|