project-booster-vue 10.15.0 → 10.15.2

package/README.md

@@ -32,6 +32,7 @@ Team: project-booster@adeo.com
 - Anthony Pillot: anthony.pillot@ext.leroymerlin.fr
 - Maxime Drecourt: maxime.drecourt@ext.adeo.com
 - Yassine Bourakba: yassine.bourakba@ext.adeo.com
+- Samir Aliche: samir.aliche@ext.adeo.com
 
 ## Get started
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "project-booster-vue",
-  "version": "10.15.0",
+  "version": "10.15.2",
   "private": false,
   "scripts": {
     "serve": "vue-cli-service serve",
@@ -32,10 +32,10 @@
   ],
   "dependencies": {
     "@contentful/rich-text-html-renderer": "15.0.0",
-    "@mozaic-ds/css-dev-tools": "^1.47.0",
+    "@mozaic-ds/css-dev-tools": "^1.63.0",
     "@mozaic-ds/icons": "^1.49.0",
     "@mozaic-ds/styles": "^1.49.1",
-    "@mozaic-ds/vue-3": "^0.35.1",
+    "@mozaic-ds/vue-3": "^0.49.5",
     "@mozaic-ds/web-fonts": "^1.22.0",
     "@types/lodash.isempty": "4.4.6",
     "@vue/test-utils": "^2.2.6",
@@ -45,7 +45,7 @@
     "contentful": "9.1.12",
     "core-js": "3.21.1",
     "date-fns": "2.22.1",
-    "firebase": "8.6.7",
+    "firebase": "10.0.0",
     "hooper": "nicoinch/hooper#1.0.5",
     "lodash.clonedeep": "4.5.0",
     "lodash.debounce": "4.0.8",
@@ -57,7 +57,6 @@
     "object-hash": "3.0.0",
     "object-path": "0.11.8",
     "ramda": "0.26.1",
-    "request": "2.88.0",
     "svg-injector": "1.1.3",
     "uuid": "8.3.2",
     "vee-validate": "4.4.5",
@@ -71,7 +70,7 @@
     "yup": "0.32.9"
   },
   "devDependencies": {
-    "@babel/core": "7.16.0",
+    "@babel/core": "7.22.9",
     "@babel/helper-skip-transparent-expression-wrappers": "7.16.0",
     "@babel/plugin-proposal-class-properties": "7.16.0",
     "@babel/plugin-proposal-nullish-coalescing-operator": "7.16.0",

package/src/components/restitution/PbRestitutionList.vue

@@ -124,7 +124,7 @@
           </div>
 
           <div class="pb-restitution-list__modal__details__totals" justify-content="space-between" align-items="center">
-            <div><strong>Montant total</strong>&nbsp; (aides déduites)</div>
+            <div><strong>Montant total</strong>&nbsp;(aides déduites)</div>
             <div class="space-mx">entre</div>
             <div>
               <strong

package/src/components/rework/question/city-search/MPbCitySearch.vue

@@ -1,17 +1,5 @@
 <template>
   <form class="pb-city-search" @submit.prevent="handleFormValidation">
-    <div class="pb-city-search__back-button-container row-flex align-stretch">
-      <m-link
-        :left-icon="BACK_ICON"
-        :class="{
-          'pb-city-search__back-button': true,
-          'pb-city-search__back-button--hidden':
-            !showBackButton && !decorate(answers, runtimeOptions, payload.viewModel.forceBackButton),
-        }"
-        @click.once="$emit('go-back')"
-        >{{ computedPayload.viewModel.backLabel }}</m-link
-      >
-    </div>
     <div class="pb-city-search__form">
       <div class="pb-city-search__title">
         {{ computedPayload.viewModel.label }}

package/src/components/rework/question/space-input/default-payload.json

@@ -9,8 +9,7 @@
     "backLabel": "Question précédente",
     "label": "Quelle est votre surface ?",
     "placeholder": "Votre surface",
-    "actionLabel": "Continuer",
-    "unitLabel": "m²",
+    "actionLabel": "Étape suivante",
     "image": null,
     "nextStep": {
       "code": "Code"

package/src/components/rework/restitution/MPbRestitutionList.vue

@@ -78,7 +78,7 @@
       <template #default>
         <div class="pb-restitution-list__modal__details" direction="column">
           <div class="pb-restitution-list__modal__details__totals" justify-content="space-between" align-items="center">
-            <div><strong>Montant total</strong>&nbsp; (aides déduites)</div>
+            <div><strong>Montant total</strong>&nbsp;(aides déduites)</div>
             <div class="space-mx">entre</div>
             <div>
               <strong

package/src/components/rework/restitution/MPbRestitutionListBlock.vue

@@ -12,7 +12,7 @@
 
         <div class="pb-restitution-list-block__body__row unbordered">
           <div class="pb-restitution-list-block__body__row__title full">
-            <div><strong>Montant total</strong> (aides déduites)</div>
+            <div><strong>Montant total</strong>&nbsp;(aides déduites)</div>
             <div class="pb-restitution-list-block__body__row__title__amount">
               <div>entre</div>
               <strong>{{ formattedPriceRange(summary.cost.min) }}</strong> et

package/src/components/scenario/scenarii/estimator-external-wall-insulation.json

@@ -318,20 +318,9 @@
         "progressBar": true,
         "widthFromL": "1of2",
         "forceOneCardPerLineOnMobile": true,
-        "callToActions": [
-          {
-            "label": "Précédent",
-            "nextStep": "__BACK__",
-            "theme": "bordered-primary-02",
-            "icon": "ArrowBack48"
-          },
-          {
-            "label": "Étape suivante",
-            "nextStep": "LMFR_WALL_EXTERNAL_INSULATION_QUESTION_WALL_OPENING",
-            "icon": "ArrowNext48",
-            "iconPosition": "right"
-          }
-        ]
+        "nextStep": {
+          "code": "LMFR_WALL_EXTERNAL_INSULATION_QUESTION_WALL_OPENING"
+        }
       },
       "helpArea": [
         {
@@ -346,9 +335,6 @@
           }
         }
       ]
-    },
-    "nextStep": {
-      "code": "LMFR_WALL_EXTERNAL_INSULATION_QUESTION_WALL_OPENING"
     }
   },
   "LMFR_WALL_EXTERNAL_INSULATION_QUESTION_WALL_OPENING": {
@@ -385,24 +371,10 @@
         },
         "label": "Combien d’ouvertures y a-t-il sur vos murs à isoler ?",
         "placeholder": "Nombre d'ouverture(s)",
-        "callToActions": [
-          {
-            "label": "Précédent",
-            "nextStep": "__BACK__",
-            "theme": "bordered-primary-02",
-            "icon": "ArrowBack48"
-          },
-          {
-            "label": "Étape suivante",
-            "nextStep": "LMFR_WALL_EXTERNAL_INSULATION_QUESTION_BIOSOURCED_MATERIALS",
-            "icon": "ArrowNext48",
-            "iconPosition": "right"
-          }
-        ]
+        "nextStep": {
+          "code": "LMFR_WALL_EXTERNAL_INSULATION_QUESTION_BIOSOURCED_MATERIALS"
+        }
       }
-    },
-    "nextStep": {
-      "code": "LMFR_WALL_EXTERNAL_INSULATION_QUESTION_BIOSOURCED_MATERIALS"
     }
   },
   "LMFR_WALL_EXTERNAL_INSULATION_QUESTION_BIOSOURCED_MATERIALS": {
@@ -450,6 +422,7 @@
           "type": "link",
           "label": "Que sont les isolants biosourcés ?",
           "action": {
+            "type": "MODAL",
             "viewModelDialog": {
               "watermark": "Définition et avantage",
               "headerTitle": "Que sont les isolants biosourcés ?",
@@ -532,29 +505,16 @@
         }
       },
       "viewModel": {
+        "actionLabel": "Etape suivante",
         "label": "Dans quelle ville aura lieu les travaux ?",
         "placeholder": "Code postal, Ville",
         "progressBar": true,
         "widthFromL": "1of2",
         "forceOneCardPerLineOnMobile": true,
-        "callToActions": [
-          {
-            "label": "Précédent",
-            "nextStep": "Code",
-            "theme": "bordered-primary-02",
-            "icon": "ArrowBack48"
-          },
-          {
-            "label": "Etape suivante",
-            "nextStep": "Code",
-            "icon": "ArrowNext48",
-            "iconPosition": "right"
-          }
-        ]
+        "nextStep": {
+          "code": "LMFR_WALL_EXTERNAL_INSULATION_QUESTION_INHABITANTS_COUNT"
+        }
       }
-    },
-    "nextStep": {
-      "code": "LMFR_WALL_EXTERNAL_INSULATION_QUESTION_INHABITANTS_COUNT"
     }
   },
   "LMFR_WALL_EXTERNAL_INSULATION_QUESTION_INHABITANTS_COUNT": {
@@ -575,6 +535,7 @@
         "value": "${getAnswerValue('LMFR_WALL_EXTERNAL_INSULATION_QUESTION_INHABITANTS_COUNT', 'value')}"
       },
       "viewModel": {
+        "actionLabel": "Terminer",
         "backLabel": "Question précédente",
         "label": "Combien de personnes composent votre foyer fiscal ?",
         "subtitle": "Le montant de vos aides peut varier en fonction de la taille de votre ménage.",
@@ -583,11 +544,11 @@
         "defaultValue": 1,
         "progressBar": true,
         "widthFromL": "1of2",
-        "forceOneCardPerLineOnMobile": true
+        "forceOneCardPerLineOnMobile": true,
+        "nextStep": {
+          "code": "LMFR_WALL_EXTERNAL_INSULATION_QUESTION_INCOME"
+        }
       }
-    },
-    "nextStep": {
-      "code": "LMFR_WALL_EXTERNAL_INSULATION_QUESTION_INCOME"
     }
   },
   "LMFR_WALL_EXTERNAL_INSULATION_QUESTION_INCOME": {

package/src/types/pb/Scenario.ts

@@ -108,6 +108,7 @@ export interface ScenarioStepAnswer {
 }
 
 export interface ScenarioStepDialog {
+  type: string;
   viewModelDialog: {
     watermark?: string; // is the upper grey text that is displayed in the modal
     headerTitle: string;
@@ -153,15 +154,17 @@ export interface ScenarioStepPayload {
   multiSelect?: ScenarioStepMultiSelectOptions;
   defaultDecoratorValue?: string;
   code?: string;
-  helpArea?: {
-    label: string;
-    type: string;
-    action: string;
-  };
+  helpArea?: ScenarioStepHelpArea[];
   redirectLink?: any;
   analytics: any;
 }
 
+export interface ScenarioStepHelpArea {
+  label: string;
+  type: string;
+  action: ScenarioStepDialog;
+}
+
 export interface ScenarioStepViewModel {
   title?: string;
   subtitle?: string;