fix: 1101 correctifs etape 3 (formattage adresse)

.talismanrc

@@ -275,6 +275,8 @@ fileignoreconfig:
   checksum: 8513c95ff253eb7ef038d5cdd5aff7d09b478c31409ea5644cd0081afbf6428e
 - filename: packages/frontend-usagers/src/components/address/search-address.vue
   checksum: e22412a54064dea24f7e200e9887726a4ef110f13570feea628c70c4fe2886a9
+- filename: packages/frontend-usagers/src/components/agrement/bilan/hebergements.vue
+  checksum: 66638e3856d5d9d0820ada95cac2d6c377b475a545927cb24b52bf1a27afcfde
 - filename: packages/frontend-usagers/src/components/agrement/representants.vue
   checksum: 17c287f11e26438a1bccb79d81152c7662283823bc9355a62e4dba851e5f5556
 - filename: packages/frontend-usagers/src/components/customInput.vue

packages/frontend-usagers/src/components/agrement/bilan/hebergements.vue

@@ -15,9 +15,9 @@
     </div>
     <AgrementBilanHebergementDetail
       v-for="(hebergement, index) in paginatedHebergements"
-      :key="`${hebergement.agrBilanAnnuelId}-${hebergement.adresseId}-${index}`"
+      :key="`${hebergement.agrBilanAnnuelId}-${hebergement.agrBilanAnnuelId}-${index}`"
       :hebergement="hebergement"
-      :statut="props.statut"
+      :statut="props.statut || AGREMENT_STATUT.BROUILLON"
       @update="
         (updatedHebergement) =>
           handleHebergementUpdate(index, updatedHebergement)
@@ -57,7 +57,10 @@
       </div>
       <div class="fr-mt-6v">
         <p class="fr-mb-0">Période</p>
-        <AgrementBilanSelectMonths :default-selected="props.bilanHebergement?.mois" :modifiable="props.modifiable" @update:selected="handleMonths" />
+        <AgrementBilanSelectMonths
+          :modifiable="props.modifiable"
+          @update:selected="handleMonths"
+        />
         <p
           v-if="periodeMeta.touched && periodeErrorMessage"
           class="fr-error-text"
@@ -100,59 +103,58 @@
   </div>
 </template>
 
-<script setup>
+<script setup lang="ts">
 import { computed, ref, watch } from "vue";
+import type { BilanHebergementDto } from "@vao/shared-bridge/src/dto/agrement.dto";
+import type { AdresseDto } from "@vao/shared-bridge/src/dto/adresse.dto";
 import SearchAddress from "@/components/address/search-address.vue";
 import { useField, useForm } from "vee-validate";
 import { useToaster } from "@vao/shared-ui";
+import { normalizeAdresse, AGREMENT_STATUT } from "@vao/shared-bridge";
 import * as yup from "yup";
 
-const props = defineProps({
-  bilanHebergement: {
-    type: Array,
-    required: false,
-    default: () => [],
-  },
-  statut: {
-    type: String,
-    required: false,
-    default: "BROUILLON",
-  },
-  modifiable: { type: Boolean, required: false, default: false },
-});
+const log = logger("components/AgrementBilanHebergements");
+
+const props = defineProps<{
+  bilanHebergement?: BilanHebergementDto[];
+  statut?: string;
+  modifiable?: boolean;
+}>();
 
 const toaster = useToaster();
 
-const localHebergements = ref([...props.bilanHebergement]);
+const localHebergements = ref<BilanHebergementDto[]>([
+  ...(props.bilanHebergement ?? []),
+]);
 
-const isFirstLoad = ref(true);
+const isFirstLoad = ref<boolean>(true);
 
 watch(
   () => props.bilanHebergement,
   (newBilanHebergement) => {
     if (isFirstLoad.value) {
-      localHebergements.value = [...newBilanHebergement];
+      localHebergements.value = [...(newBilanHebergement ?? [])];
       isFirstLoad.value = false;
     }
   },
   { immediate: true, deep: true },
 );
 
 const ITEMS_PER_PAGE = 10;
-const currentPage = ref(0);
+const currentPage = ref<number>(0);
 
-const showForm = ref(false);
+const showForm = ref<boolean>(false);
 
-function toggleForm() {
+function toggleForm(): void {
   showForm.value = !showForm.value;
 }
 
-const totalPages = computed(() => {
+const totalPages = computed<number>(() => {
   return Math.ceil(localHebergements.value.length / ITEMS_PER_PAGE);
 });
 
-const pages = computed(() => {
-  const pageArray = [];
+const pages = computed<{ title: string; href: string; label: string }[]>(() => {
+  const pageArray: { title: string; href: string; label: string }[] = [];
   for (let i = 1; i <= totalPages.value; i++) {
     pageArray.push({
       title: `Lien vers la page ${i}`,
@@ -163,18 +165,21 @@ const pages = computed(() => {
   return pageArray;
 });
 
-const paginatedHebergements = computed(() => {
+const paginatedHebergements = computed<BilanHebergementDto[]>(() => {
   const start = currentPage.value * ITEMS_PER_PAGE;
   const end = start + ITEMS_PER_PAGE;
   return localHebergements.value.slice(start, end);
 });
 
-function handleHebergementUpdate(index, updatedHebergement) {
+function handleHebergementUpdate(
+  index: number,
+  updatedHebergement: BilanHebergementDto,
+): void {
   const actualIndex = currentPage.value * ITEMS_PER_PAGE + index;
   localHebergements.value[actualIndex] = { ...updatedHebergement };
 }
 
-function handleHebergementDelete(index) {
+function handleHebergementDelete(index: number): void {
   const actualIndex = currentPage.value * ITEMS_PER_PAGE + index;
   localHebergements.value.splice(actualIndex, 1);
 
@@ -209,57 +214,65 @@ const {
   errorMessage: nomHebergementErrorMessage,
   handleChange: onNomHebergementChange,
   meta: nomHebergementMeta,
-} = useField("nomHebergement");
+} = useField<string>("nomHebergement");
 
 const {
   value: nbJours,
   errorMessage: nbJoursErrorMessage,
   handleChange: onNbJoursChange,
   meta: nbJoursMeta,
-} = useField("nbJours");
+} = useField<number>("nbJours");
 
 const { value: adresse, errorMessage: adresseErrorMessage } =
-  useField("adresse");
+  useField<any>("adresse");
 
 const {
   value: periode,
   errorMessage: periodeErrorMessage,
   meta: periodeMeta,
-} = useField("periode");
+} = useField<string[]>("periode");
 
-function handleMonths(monthsArray) {
+function handleMonths(monthsArray: string[]): void {
   periode.value = monthsArray;
 }
 
-const selectedAdresseObject = ref(null);
+const selectedAdresseObject = ref<AdresseDto | { label: string } | null>(null);
 
-function onAdresseSelect(selectedAddress) {
-  adresse.value = selectedAddress.label;
+function onAdresseSelect(
+  selectedAddress: AdresseDto | { label: string },
+): void {
+  adresse.value = selectedAddress.label || "";
   selectedAdresseObject.value = selectedAddress;
 }
 
 const onSubmitAddSejour = handleSubmit(
-  (values) => {
-    const adresseObject = selectedAdresseObject.value
-      ? {
-          label: selectedAdresseObject.value.label,
-          codeInsee: selectedAdresseObject.value.codeInsee || null,
-          codePostal: selectedAdresseObject.value.codePostal || null,
-          long: selectedAdresseObject.value.long || null,
-          lat: selectedAdresseObject.value.lat || null,
-          departement: selectedAdresseObject.value.departement || null,
-        }
-      : { label: values.adresse };
+  (values: Record<string, any>) => {
+    const adresseObject: AdresseDto | { label: string } =
+      selectedAdresseObject.value
+        ? selectedAdresseObject.value
+        : { label: values.adresse };
+
+    let adresseNorm: AdresseDto;
+    try {
+      adresseNorm = normalizeAdresse(adresseObject);
+    } catch (e) {
+      log.w("Erreur de normalisation de l'adresse :", e);
+      toaster.error({
+        description: "L'adresse saisie est incomplète ou invalide.",
+      });
+      return;
+    }
 
     const agrBilanAnnuelId =
-      props.bilanHebergement[0]?.agrBilanAnnuelId || null;
+      (props.bilanHebergement && props.bilanHebergement[0]?.agrBilanAnnuelId) ||
+      null;
 
-    const newHebergement = {
+    const newHebergement: BilanHebergementDto = {
+      agrBilanAnnuelId,
       nomHebergement: values.nomHebergement,
-      adresse: adresseObject,
+      adresse: adresseNorm,
       nbJours: parseInt(values.nbJours),
-      mois: values.periode.map((m) => parseInt(m)),
-      agrBilanAnnuelId,
+      mois: values.periode.map((m: string) => parseInt(m)),
     };
 
     localHebergements.value.push(newHebergement);
@@ -273,19 +286,19 @@ const onSubmitAddSejour = handleSubmit(
       description: "Le séjour a été ajouté avec succès.",
     });
   },
-  (errors) => {
+  (errors: any) => {
     console.warn("Erreurs de validation :", errors);
   },
 );
 
-function validateHebergements() {
+function validateHebergements(): boolean {
   let isValid = true;
-  const errors = [];
+  const errors: string[] = [];
 
   localHebergements.value.forEach((hebergement, index) => {
     if (
       !hebergement.nomHebergement ||
-      hebergement.nomHebergement.trim() === ""
+      hebergement.nomHebergement?.trim?.() === ""
     ) {
       errors.push(`Hébergement ${index + 1}: Le nom est obligatoire`);
       isValid = false;
@@ -328,7 +341,7 @@ function validateHebergements() {
   return isValid;
 }
 
-function getHebergements() {
+function getHebergements(): BilanHebergementDto[] {
   return localHebergements.value;
 }
 

packages/frontend-usagers/src/components/agrement/bilan/sejours.vue

@@ -40,22 +40,24 @@
   </DsfrTabs>
 </template>
 
-<script setup>
-import { TitleWithIcon } from "@vao/shared-ui";
+<script setup lang="ts">
+import { TitleWithIcon, useToaster } from "@vao/shared-ui";
 
 const props = defineProps({
   initAgrement: { type: Object, required: true },
   cdnUrl: { type: String, required: true },
   modifiable: { type: Boolean, default: true },
 });
 
+const toaster = useToaster();
+
 const initialSelectedIndex = 0;
 
-const selectedTabIndex = ref(initialSelectedIndex);
-const asc = ref(true);
-const sejourDetailsRefs = ref([]);
+const selectedTabIndex = ref<number>(initialSelectedIndex);
+const asc = ref<boolean>(true);
+const sejourDetailsRefs = ref<any[]>([]);
 
-function setSejourDetailsRef(el, idx) {
+function setSejourDetailsRef(el: any, idx: number) {
   sejourDetailsRefs.value[idx] = el;
 }
 
@@ -74,9 +76,9 @@ const tabTitles = computed(() => {
 });
 
 const bilanAnnuelByYear = computed(() => {
-  const result = {};
+  const result: Record<number, any> = {};
   const data = props.initAgrement?.agrementBilanAnnuel || [];
-  data.forEach((bilan) => {
+  data.forEach((bilan: any) => {
     const year = bilan.annee;
     if (!result[year]) {
       result[year] = {
@@ -106,7 +108,7 @@ const bilanAnnuelByYear = computed(() => {
   return result;
 });
 
-const selectTab = async (idx) => {
+const selectTab = async (idx: number) => {
   asc.value = selectedTabIndex.value < idx;
 };
 
@@ -119,8 +121,9 @@ async function validateAllYears() {
       const result = await ref.validateForm();
       if (!result || result === false) {
         allValid = false;
+      } else if (result?.annee) {
+        allResults.push(result);
       }
-      allResults.push(result);
     } else {
       allValid = false;
     }

packages/frontend-usagers/src/components/agrement/bilan/tranchesAge.vue

@@ -30,24 +30,32 @@
 import { useField, useForm } from "vee-validate";
 import * as yup from "yup";
 import { requiredUnlessBrouillon } from "@/helpers/requiredUnlessBrouillon";
+import { AGREMENT_STATUT } from "@vao/shared-bridge";
+import { useToaster } from "@vao/shared-ui";
 import displayInput from "../../../utils/display-input";
 
 const props = defineProps({
   trancheAge: { type: Array, default: () => [] },
   statut: { type: String, required: true },
-  modifiable: { type: Boolean, required: true, default: false },
+  modifiable: { type: Boolean, required: false, default: false },
 });
 
+const toaster = useToaster();
+
 const ageRangeOptions = [
   { label: "de 18 à 39 ans", value: "18_39", name: "trancheAge" },
   { label: "de 40 à 59 ans", value: "40_59", name: "trancheAge" },
   { label: "plus de 59 ans", value: "59_et_plus", name: "trancheAge" },
 ];
-
 const validationSchema = yup.object({
-  trancheAge: requiredUnlessBrouillon(
-    yup.array().min(1, "Veuillez sélectionner au moins une tranche d’âge."),
-  ),
+  trancheAge:
+    props.statut === AGREMENT_STATUT.BROUILLON
+      ? yup.array().notRequired().nullable()
+      : requiredUnlessBrouillon(
+          yup
+            .array()
+            .min(1, "Veuillez sélectionner au moins une tranche d’âge."),
+        ),
 });
 
 const initialValues = {
@@ -69,6 +77,12 @@ const {
 
 const validateTranchesAge = async () => {
   const result = await validate();
+
+  if (!result.valid && trancheAgeErrorMessage.value) {
+    toaster.error({
+      description: trancheAgeErrorMessage.value,
+    });
+  }
   return {
     valid: result.valid,
     value: trancheAgeField.value,