project-booster-vue 9.10.3 → 9.11.0

package/package.json

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

package/src/components/estimates/PbEstimatesList.vue

@@ -71,7 +71,7 @@
           class="pb-estimates-list__show-more-button"
           theme="bordered"
           label="Voir plus"
-          @click="$store.dispatch('estimates/loadEstimates')"
+          @click="$store.dispatch('estimates/loadMoreEstimates')"
           width="fit"
           :style="`transition-delay: ${showMoreButtonAnimationDelay}ms;`"
         />

package/src/components/items/PbItemsList.stories.mdx

@@ -79,7 +79,7 @@ export const TemplateSandbox = (args, { argTypes }) => {
       :show-more-button-label="args.showMoreButtonLabel"
       :padding="args.padding"
       :separator="args.separator"
-      v-model="args.modelValue"
+      :model-value="args.modelValue"
       @click="args.click"
       @update:model-value="args.update"
     />`,

package/src/components/items/PbItemsList.vue

@@ -23,7 +23,7 @@
           :image="item.viewModel.image"
           :image-size="item.viewModel.imageSize"
           :selectable="selectType"
-          v-model="selectedItems[item.code]"
+          :model-value="selectedItems.get(item.code)"
           :disabled="item.disabled"
           :padding="padding"
           :icon="icon"
@@ -203,7 +203,7 @@ export default defineComponent({
         }
       }
       selectedItems.value.set(code, value);
-      emit('update:modelValue', selectedItems.value);
+      emit('update:modelValue', Object.fromEntries(selectedItems.value));
     };
     const handleClick = (event: Event) => {
       emit('click', event);

package/src/components/question/list-select/PbListSelect.vue

@@ -175,14 +175,14 @@ export default defineComponent({
         .filter((answer) => !!answer.selected)
         .map((answer) => ({ key: answer.code, value: answer.selected }));
     };
-    const handleSelectionChange = (items: Item[]) => {
+    const handleSelectionChange = (items: Record<string, string | boolean>) => {
       selectedAnswers.value = Object.entries(items)
         .filter(([, value]) => !!value)
         .map(([key, value]) => ({ key, value }));
       Object.entries(items).map(([key, value]) => {
         displayedAnswers.value.map((answer) => {
           if (answer.code === key) {
-            answer.selected = value.selected;
+            answer.selected = value;
           }
         });
       });

package/src/components/scenario/scenarii/appointment-qualification-kitchen.json

@@ -117,7 +117,7 @@
         "NOT_UNDERSTOOD": {
           "code": "NOT_UNDERSTOOD",
           "viewModel": {
-            "title": "Je n’ai pas compris ce qu’on attend de moi"
+            "title": "C'est trop compliqué"
           },
           "meta": {
             "ranking": 1
@@ -135,7 +135,7 @@
         "PROJECT_UNDEFINED": {
           "code": "PROJECT_UNDEFINED",
           "viewModel": {
-            "title": "Mon projet n’est pas clair pour le moment"
+            "title": "J'ai besoin de plus de temps pour avoir les idées claires sur mon projet"
           },
           "meta": {
             "ranking": 3
@@ -144,7 +144,7 @@
         "PROJECT_STORE": {
           "code": "PROJECT_STORE",
           "viewModel": {
-            "title": "Je préfère me déplacer directement en magasin"
+            "title": "Je préfère un accompagnement en magasin pour préparer mon projet"
           },
           "meta": {
             "ranking": 4
@@ -176,16 +176,42 @@
         "title": "Merci pour votre réponse",
         "icon": "https://storage.googleapis.com/project-booster-media/vad/fin-de-parcours/check_80.svg"
       },
-      "multiSelect": {
-        "actions": {
-          "VALIDATE": {
-            "label": "Continuer et prendre RDV",
-            "nextStep": {
-              "code": "APPOINTMENT_FORM"
-            }
+      "cards": [
+        {
+          "code": "Estimer votre projet cuisine",
+          "viewModel": {
+            "url": "https://www.leroymerlin.fr/estimez-le-cout-de-votre-prochaine-cuisine.html?leadSource=Appointment_Qualification&leadSourceDetail=Cuisine",
+            "image": "https://media.leroymerlin.fr/Capture/37/bc/a121f7e74212ad2d356fd3cf2c8a/estimer-mon-budget-cuisine5e5d20ae063b330009a4a372.jpg?width=500&auto=webp&crop=16:9",
+            "title": "Estimer votre budget cuisine en quelques clics",
+            "width": "full",
+            "widthFromM": "1of3",
+            "widthFromL": "1of3"
+          }
+        },
+        {
+          "code": "Découvrir nos gammes de cuisines",
+          "viewModel": {
+            "url": "https://www.leroymerlin.fr/produits/cuisine/cuisine-equipee-delinia-id/",
+            "image": "https://storage.googleapis.com/project-booster-media/kitchen/kitchen-range.jpeg",
+            "title": "Découvrir nos gammes de cuisines",
+            "width": "full",
+            "widthFromM": "1of3",
+            "widthFromL": "1of3"
+          }
+        },
+        {
+          "code": "Des idées et conseils pour votre cuisine",
+          "viewModel": {
+            "value": "3",
+            "url": "https://www.leroymerlin.fr/inspiration/les-meilleures-idees-pour-chaque-piece/cuisine/",
+            "image": "https://storage.googleapis.com/project-booster-media/vad/fin-de-parcours/inspiration-cuisine.jpg",
+            "title": "Des idées et conseils pour votre cuisine",
+            "width": "full",
+            "widthFromM": "1of3",
+            "widthFromL": "1of3"
           }
         }
-      }
+      ]
     }
   },
   "LMFR_QUESTION_SCENARIO": {
@@ -606,7 +632,17 @@
           "nextStep": {
             "conditionals": [
               {
-                "conditions": ["runtimeOptions.postQualificationAppointment === true"],
+                "conditions": [
+                  "runtimeOptions.postQualificationAppointment === true && (hasAnswers('LMFR_QUESTION_SCENARIO_ADD_SIMULATION') || hasAnswers('LMFR_QUESTION_ADD_PLAN'))"
+                ],
+                "nextStep": {
+                  "code": "__END__"
+                }
+              },
+              {
+                "conditions": [
+                  "runtimeOptions.postQualificationAppointment === true && !hasAnswers('LMFR_QUESTION_SCENARIO_ADD_SIMULATION') && !hasAnswers('LMFR_QUESTION_ADD_PLAN')"
+                ],
                 "nextStep": {
                   "code": "START_LATER"
                 }
@@ -735,7 +771,17 @@
           "nextStep": {
             "conditionals": [
               {
-                "conditions": ["runtimeOptions.postQualificationAppointment === true"],
+                "conditions": [
+                  "runtimeOptions.postQualificationAppointment === true && (hasAnswers('LMFR_QUESTION_SCENARIO_ADD_SIMULATION') || hasAnswers('LMFR_QUESTION_ADD_PLAN'))"
+                ],
+                "nextStep": {
+                  "code": "__END__"
+                }
+              },
+              {
+                "conditions": [
+                  "runtimeOptions.postQualificationAppointment === true && !hasAnswers('LMFR_QUESTION_SCENARIO_ADD_SIMULATION') && !hasAnswers('LMFR_QUESTION_ADD_PLAN')"
+                ],
                 "nextStep": {
                   "code": "START_LATER"
                 }
@@ -958,7 +1004,7 @@
         "icon": "https://storage.googleapis.com/project-booster-media/vad/fin-de-parcours/mail_80.svg",
         "description": [
           {
-            "icon": "https://storage.googleapis.com/project-booster-media/vad/lm-advisor.png",
+            "icon": "https://storage.googleapis.com/project-booster-media/vad/fin-de-parcours/picto_plan_pour-espace-projet-compte.png",
             "label": "Retrouvez votre projet dans votre compte Leroy Merlin, vous pourrez encore ajouter des plans et photos."
           },
           {
@@ -971,7 +1017,7 @@
         {
           "code": "Retrouver mon projet dans mon compte Leroy Merlin",
           "viewModel": {
-            "url": "https://www.leroymerlin.fr/espace-perso/espace-projets.html#/projects/@@PB_PROJECT_ID_FILLER@@",
+            "url": "/espace-perso/espace-projets.html#/projects/@@PB_PROJECT_ID_FILLER@@",
             "image": "https://storage.googleapis.com/project-booster-media/vad/fin-de-parcours/Qualif-RDV-VAD-%20Conseiller-de-vente.png",
             "title": "Retrouver mon projet dans mon compte Leroy Merlin",
             "width": "full",
@@ -1017,7 +1063,7 @@
         "description": [
           {
             "label": "Retrouvez votre projet dans votre compte Leroy Merlin, vous pourrez encore ajouter des plans et photos",
-            "icon": "https://storage.googleapis.com/project-booster-media/vad/lm-advisor.png"
+            "icon": "https://storage.googleapis.com/project-booster-media/vad/fin-de-parcours/picto_plan_pour-espace-projet-compte.png"
           },
           {
             "label": "Votre conseiller a accès à vos plans et informations utiles pour le rendez-vous.",
@@ -1051,18 +1097,24 @@
       "viewModel": {
         "title": "Les informations de votre projet ont été mises à jour",
         "icon": "https://storage.googleapis.com/project-booster-media/vad/fin-de-parcours/check_80.svg",
-        "description": {
-          "label": "Votre conseiller aura accès à vos plans et informations utiles pour le rendez-vous. Si vous souhaitez encore ajouter des plans retrouvez votre projet dans votre compte Leroy Merlin.",
-          "icon": "https://storage.googleapis.com/project-booster-media/vad/lm-advisor.png"
-        }
+        "description": [
+          {
+            "icon": "https://storage.googleapis.com/project-booster-media/vad/fin-de-parcours/picto_plan_pour-espace-projet-compte.png",
+            "label": "Retrouvez votre projet dans votre compte Leroy Merlin, vous pourrez encore modifier vos informations, ajouter des plans ou des photos."
+          },
+          {
+            "icon": "https://storage.googleapis.com/project-booster-media/vad/lm-advisor.png",
+            "label": "Votre conseiller a accès à vos plans et informations utiles pour le rendez-vous."
+          }
+        ]
       },
       "cards": [
         {
-          "code": "Estimer votre budget cuisine en quelques clics",
+          "code": "Retrouver mon projet dans mon compte Leroy Merlin",
           "viewModel": {
-            "url": "https://www.leroymerlin.fr/estimez-le-cout-de-votre-prochaine-cuisine.html?leadSource=Appointment_Qualification&leadSourceDetail=Cuisine",
-            "image": "https://media.leroymerlin.fr/Capture/37/bc/a121f7e74212ad2d356fd3cf2c8a/estimer-mon-budget-cuisine5e5d20ae063b330009a4a372.jpg?width=500&auto=webp&crop=16:9",
-            "title": "Estimer votre budget cuisine en quelques clics",
+            "url": "/espace-perso/espace-projets.html#/projects/@@PB_PROJECT_ID_FILLER@@",
+            "image": "https://storage.googleapis.com/project-booster-media/vad/fin-de-parcours/Qualif-RDV-VAD-%20Conseiller-de-vente.png",
+            "title": "Retrouver mon projet dans mon compte Leroy Merlin",
             "width": "full",
             "widthFromM": "1of3",
             "widthFromL": "1of3"

package/src/services/scenarioConditionals.ts

@@ -17,13 +17,18 @@ const Condition = (
       }) > -1
     );
   };
+  const hasAnswers = (questionCode: string) => {
+    const questionAnswers = answers.get(questionCode)!;
+    return questionAnswers.length > 0;
+  };
   const isValid: boolean = new Function(
     'isAnswerMatching',
     'isAnswerContaining',
+    'hasAnswers',
     'answers',
     'runtimeOptions',
     `return ${condition}`,
-  ).call(this, isAnswerMatching, isAnswerContaining, answers, runtimeOptions);
+  ).call(this, isAnswerMatching, isAnswerContaining, hasAnswers, answers, runtimeOptions);
   return { isValid };
 };
 

package/src/stores/modules/appointmentQualificationStore.ts

@@ -19,6 +19,7 @@ export interface AppointmentQualificationState {
   isAppointmentsError: boolean;
   currentAppointmentQualification: any;
   sessions: any;
+  isQualificationAborted: boolean;
 }
 
 type AppointmentQualificationContext = ActionContext<AppointmentQualificationState, State>;
@@ -27,6 +28,7 @@ export default {
   namespaced: true,
 
   state: {
+    clicRDVBaseUrl: '',
     createProjectError: null,
     isLoadingProject: false,
     appointmentLinkedError: null,
@@ -35,6 +37,7 @@ export default {
     isAppointmentsError: false,
     currentAppointmentQualification: {},
     sessions: {},
+    isQualificationAborted: false,
   },
 
   getters: {
@@ -59,6 +62,9 @@ export default {
     getClicRDVBaseUrl(state: AppointmentQualificationState) {
       return state.clicRDVBaseUrl;
     },
+    isQualificationAborted(state: AppointmentQualificationState) {
+      return state.isQualificationAborted;
+    },
   },
 
   mutations: {
@@ -83,6 +89,9 @@ export default {
     setClicRDVBaseUrl(state: AppointmentQualificationState, baseURL: any) {
       state.clicRDVBaseUrl = baseURL;
     },
+    setIsQualificationAborted(state: AppointmentQualificationState, isQualificationAborted: boolean) {
+      state.isQualificationAborted = isQualificationAborted;
+    },
   },
 
   actions: {
@@ -169,10 +178,7 @@ export default {
           },
           correlationId: state.sessions.correlationId,
         };
-        const result = await linkInhabitantProjectToAppointmentQualification(
-          state.currentAppointmentQualification.inhabitantProjectId,
-          data,
-        );
+        const result = await linkInhabitantProjectToAppointmentQualification(state.sessions.inhabitantProjectId, data);
         commit('setCurrentAppointmentQualification', result);
         commit('setIsLoadingProject', false);
       } catch (e) {
@@ -202,5 +208,11 @@ export default {
         commit('setClicRDVBaseUrl', 'https://www.clicrdv.com');
       }
     },
+    abortQualification({ commit }: AppointmentQualificationContext, abort: boolean) {
+      commit('setIsQualificationAborted', abort);
+      if (abort) {
+        commit('setCurrentAppointmentQualification', null);
+      }
+    },
   },
 };

package/src/stores/modules/estimatesStore.ts

@@ -207,10 +207,12 @@ export default {
     },
     async loadEstimates({ commit, state }: EstimatesContext, projectId: string) {
       commit('setIsDisplayed', true);
+      commit('setEstimates', []);
       commit('setCurrentProjectId', projectId);
       commit('setIsLoadingEstimates', true);
       commit('setEstimatesLoadError', null);
       commit('setEstimateCreationError', null);
+      commit('setCurrentEstimatesPage', 0);
 
       try {
         const estimates = await getAllEstimates(state.currentEstimatesPage, state.estimatesPerPageCount, projectId);
@@ -235,6 +237,39 @@ export default {
         commit('setIsLoadingEstimates', false);
       });
     },
+    async loadMoreEstimates({ commit, state }: EstimatesContext) {
+      commit('setIsDisplayed', true);
+      commit('setIsLoadingEstimates', true);
+      commit('setEstimatesLoadError', null);
+      commit('setEstimateCreationError', null);
+
+      try {
+        const estimates = await getAllEstimates(
+          state.currentEstimatesPage,
+          state.estimatesPerPageCount,
+          state.currentProjectId!,
+        );
+
+        if (estimates.results) {
+          commit('addEstimates', estimates.results);
+        }
+
+        if (state?.estimates?.length >= estimates.total) {
+          commit('setHasStillEstimates', false);
+        } else {
+          commit('setHasStillEstimates', true);
+        }
+
+        commit('setCurrentEstimatesPage', state.currentEstimatesPage + 1);
+      } catch (error) {
+        console.error('Failure when loading estimates', error);
+        commit('setEstimatesLoadError', error);
+      }
+
+      setTimeout(() => {
+        commit('setIsLoadingEstimates', false);
+      });
+    },
     async saveEstimate({ commit }: EstimatesContext, estimateToCreate: Estimate) {
       commit('setIsCreatingEstimate', true);
       commit('setEstimateCreationError', null);

package/src/types/pb/Scenario.ts

@@ -55,7 +55,7 @@ export interface ScenarioStepAnswerViewModel {
 
 export interface ScenarioStepAnswer {
   code: string;
-  selected?: boolean;
+  selected?: boolean | string;
   viewModel?: ScenarioStepAnswerViewModel;
   conditions?: string[];
   nextStep?: ScenarioStepNextStep;