project-booster-vue 9.42.7 → 9.43.1

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "project-booster-vue",
-  "version": "9.42.7",
+  "version": "9.43.1",
   "private": false,
   "scripts": {
     "serve": "vue-cli-service serve",

package/src/components/question/city-search/PbCitySearch.vue

@@ -341,15 +341,20 @@ export default defineComponent({
               selectedCity.geometry.location.lat(),
               selectedCity.geometry.location.lng(),
             );
+
             const postalCode =
-              results[0].address_components.filter((field) => field.types.includes('postal_code'))[0]?.short_name ||
+              selectedCity.address_components.filter((field) => field.types.includes('postal_code'))[0]?.short_name ||
               placeData.postalCode;
 
+            const region =
+              selectedCity.address_components.filter((field) => field.types.includes('administrative_area_level_1'))[0]
+                ?.short_name || '';
+
             this.selectedCity = {
               inseeCode: placeData.inseeCode,
               postalCode: postalCode,
               name: placeData.name,
-              region: selectedCity.address_components[2].short_name,
+              region: region,
             };
 
             this.searchKeyword = this.selectedCityToKeyword();

package/src/components/restitution/PbRestitutionList.vue

@@ -268,12 +268,12 @@ export default defineComponent({
             answers: [],
             action: action,
           });
-        } else {
-          this.$emit('step-completed', {
-            answers: [],
-            nextStep: action,
-          });
         }
+      } else {
+        this.$emit('step-completed', {
+          answers: [],
+          nextStep: action,
+        });
       }
     },
     areConditionsValid(conditions: string[]) {

package/src/components/trezor/PbTrezor.vue

@@ -17,8 +17,6 @@
         <m-text-input
           v-model="formData.values.lastname"
           :error="formData.errors.lastname"
-          @focus="validate('lastname')"
-          @keypress="validate('lastname')"
           type="text"
           label="Nom"
           :required="true"
@@ -30,8 +28,6 @@
         <m-text-input
           v-model="formData.values.firstname"
           :error="formData.errors.firstname"
-          @focus="validate('firstname')"
-          @keypress="validate('firstname')"
           type="text"
           label="Prénom"
           :required="true"
@@ -39,12 +35,21 @@
         ></m-text-input>
       </m-flex>
 
+      <m-flex class="pb-trezor__form__row">
+        <m-text-input
+          v-model="formData.values.surface"
+          :error="formData.errors.surface"
+          type="text"
+          label="Surface"
+          :required="true"
+          class="pb-trezor__input"
+        ></m-text-input>
+      </m-flex>
+
       <m-flex class="pb-trezor__form__row">
         <m-text-input
           v-model="formData.values.zipcode"
           :error="formData.errors.zipcode"
-          @focus="validate('zipcode')"
-          @keypress="validate('zipcode')"
           type="text"
           label="Code postal"
           :required="true"
@@ -56,8 +61,6 @@
         <m-text-input
           v-model="formData.values.email"
           :error="formData.errors.email"
-          @focus="validate('email')"
-          @keypress="validate('email')"
           type="email"
           label="E-mail"
           :required="true"
@@ -69,8 +72,6 @@
         <m-text-input
           v-model="formData.values.phone"
           :error="formData.errors.phone"
-          @focus="validate('phone')"
-          @keypress="validate('phone')"
           type="phone"
           label="Numéro de téléphone"
           :required="true"
@@ -126,6 +127,7 @@ import MLink from '../mozaic/link/MLink.vue';
 import MTextInput from '../mozaic/text-input/MTextInput.vue';
 import { ScenarioStepAnswer } from '@/types/pb/Scenario';
 import { object, string, boolean } from 'yup';
+import objectPath from 'object-path';
 const BACK_ICON =
   'https://storage.googleapis.com/project-booster-media/mozaic-icons/svg/Navigation_Arrow_Arrow--Left_16px.svg';
 
@@ -179,12 +181,35 @@ export default defineComponent({
   },
   setup(props, { emit }) {
     const store = useStore();
+
+    const getAnswerValue = (answerCode: string, path: string) => {
+      if (!props.answers.get(answerCode) || props.answers.get(answerCode)?.length === 0) {
+        return null;
+      }
+
+      return objectPath.get(props.answers.get(answerCode)?.at(0) as any, path);
+    };
+
+    const translationErrors = props.payload.viewModel.translationErrors;
+
+    const zipcode =
+      getAnswerValue(
+        props.payload.viewModel.defaultValue?.zipcode?.answerCode,
+        props.payload.viewModel.defaultValue?.zipcode?.path,
+      ) || null;
+    const surface =
+      getAnswerValue(
+        props.payload.viewModel.defaultValue?.surface?.answerCode,
+        props.payload.viewModel.defaultValue?.surface?.path,
+      ) || null;
+
     let formData = ref<any>({
       values: {
         lastname: '',
         firstname: '',
-        zipcode: '',
+        zipcode: zipcode,
         email: '',
+        surface: surface,
         phone: '',
         optin: false,
         optinPartners: false,
@@ -195,6 +220,7 @@ export default defineComponent({
         zipcode: '',
         email: '',
         phone: '',
+        surface: '',
       },
     });
 
@@ -204,45 +230,42 @@ export default defineComponent({
       zipcode: string().required(),
       email: string().email().required(),
       phone: string().required(),
+      surface: string().required(),
       optin: boolean(),
       optinPartners: boolean(),
     });
 
-    const validate = async (field: string) => {
-      await validationSchema
-        .validateAt(field, formData.value.values)
-        .then(() => {
-          formData.value.errors[field] = '';
-        })
-        .catch((err) => {
-          formData.value.errors[err.path] = err.message;
-        });
-    };
-
     const validateAllFields = async (action: any) => {
-      await validationSchema.validate(formData.value.values).then(async () => {
-        const sending = await store.dispatch('trezor/sendFormData', {
-          payload: {
-            customer: {
-              lastname: formData.value.values.lastname,
-              firstname: formData.value.values.firstname,
-              zip: formData.value.values.zipcode,
-              email: formData.value.values.email,
-              phone: formData.value.values.phone,
+      await validationSchema
+        .validate(formData.value.values, { abortEarly: false })
+        .then(async () => {
+          const sending = await store.dispatch('trezor/sendFormData', {
+            payload: {
+              customer: {
+                lastname: formData.value.values.lastname,
+                firstname: formData.value.values.firstname,
+                zip: formData.value.values.zipcode,
+                email: formData.value.values.email,
+                phone: formData.value.values.phone,
+              },
+              optin: formData.value.values.optin,
+              optinPartners: formData.value.values.optinPartners,
             },
-            optin: formData.value.values.optin,
-            optinPartners: formData.value.values.optinPartners,
-          },
-          typeLead: props.payload.viewModel.typeLead,
-        });
+            typeLead: props.payload.viewModel.typeLead,
+          });
 
-        if (sending) {
-          emit('step-completed', {
-            answers: null,
-            nextStep: action.action,
+          if (sending) {
+            emit('step-completed', {
+              answers: null,
+              nextStep: action.action,
+            });
+          }
+        })
+        .catch((err) => {
+          err.inner.forEach((e: any) => {
+            formData.value.errors[e.path] = translationErrors[e.path];
           });
-        }
-      });
+        });
     };
 
     const callAction = async (item: any) => {
@@ -254,7 +277,6 @@ export default defineComponent({
     return {
       formData,
       callAction,
-      validate,
       BACK_ICON,
     };
   },

package/src/components/trezor/default-payload.json

@@ -2,7 +2,25 @@
   "viewModel": {
     "backLabel": "Question précédente",
     "label": "Renseignez notre formulaire pour être recontacté",
-    "typeLead": "HEAT_PUMP"
+    "typeLead": "HEAT_PUMP",
+    "defaultValue": {
+      "zipcode": {
+        "answerCode": "LMFR_PREVIOUS_QUESTION",
+        "path": "value"
+      },
+      "surface": {
+        "answerCode": "LMFR_PREVIOUS_QUESTION",
+        "path": "space"
+      }
+    },
+    "translationErrors": {
+      "lastname": "Le nom est requis",
+      "firstname": "Le prénom est requis",
+      "zipcode": "Le code postal est requis",
+      "email": "Votre adresse mail est requise",
+      "phone": "Votre numéro de téléphone est requis",
+      "surface": "Veuillez indiquer la surface de votre logement"
+    }
   },
   "callToActions": [
     {