project-booster-vue 10.20.0 → 10.20.2

package/package.json

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

package/src/components/restitution/PbRestitutionListBlock.vue

@@ -92,7 +92,7 @@ $responsive-breakpoint: 'm';
 
   @include set-from-screen($responsive-breakpoint) {
     padding: $mu250;
-    width: 630px;
+    width: 720px;
   }
 
   &__title {
@@ -181,7 +181,7 @@ $responsive-breakpoint: 'm';
     width: 80%;
 
     @include set-from-screen($responsive-breakpoint) {
-      width: 630px;
+      width: 720px;
     }
 
     @include set-font-face('regular');

package/src/components/rework/cards/MPbCards.vue

@@ -367,7 +367,7 @@ $responsive-breakpoint: 's';
 
     .pb-card__items-container {
       align-items: center !important;
-      justify-content: center !important;
+      justify-content: center;
     }
   }
 

package/src/components/rework/navigation/MPbNavigation.vue

@@ -135,24 +135,25 @@ const props = defineProps({
 });
 
 const emitClickEvent = (nextStep: any) => {
-  if (nextStep.code) {
-    $emit('next-step', {
-      answsers: props.answers,
-      nextStep: nextStep,
-    });
-  } else if (nextStep.conditionals) {
-    let toNextStep = null;
-    nextStep.conditionals.every((condition: any) => {
-      const valid = areConditionsValid(condition!, props.answers, props.runtimeOptions);
-      if (valid) {
-        toNextStep = condition.nextStep;
-        $emit('next-step', {
-          answsers: props.answers,
-          nextStep: toNextStep,
-        });
-        return;
-      }
-    });
+  if (nextStep) {
+    if (nextStep.code) {
+      $emit('next-step', {
+        answsers: props.answers,
+        nextStep: nextStep,
+      });
+    } else if (nextStep.conditionals) {
+      let toNextStep = null;
+      nextStep.conditionals.forEach((condition: any) => {
+        const valid = areConditionsValid(condition, props.answers, props.runtimeOptions);
+        if (valid) {
+          toNextStep = condition.nextStep;
+          $emit('next-step', {
+            answsers: props.answers,
+            nextStep: toNextStep,
+          });
+        }
+      });
+    }
   }
 };
 </script>

package/src/components/rework/question/list-select/MPbListSelect.vue

@@ -45,7 +45,6 @@ import { ref, computed, onMounted, Ref } from 'vue';
 import PbItemsList from '../../../items/PbItemsList.vue';
 import { sortAnswers } from '../sortAnswers';
 import { ScenarioStepAnswer } from '@/types/pb/Scenario';
-import { decorate } from '@/services/decorate';
 import MPbNavigation from '../../navigation/MPbNavigation.vue';
 
 const emit: any = defineEmits();
@@ -144,29 +143,7 @@ const showMorePosition = computed(() => {
   return props.payload?.viewModel?.showMore?.position ?? 'center';
 });
 
-// Submit
-const validateButtonProps = computed(() => {
-  let label, leftIcon, rightIcon;
-
-  if (props.payload?.multiSelect) {
-    if (props.payload.multiSelect?.actions?.VALIDATE?.dynamicLabel) {
-      const dynamicLabel = props.payload.multiSelect.actions.VALIDATE.dynamicLabel;
-      label = selectedAnswers.value.length > 1 ? dynamicLabel.plural : dynamicLabel.single;
-      label = label.replace('[$items]', `${selectedAnswers.value.length}`);
-    } else {
-      label = props.payload.multiSelect.actions?.VALIDATE.label;
-    }
-    leftIcon = props.payload.multiSelect.actions?.VALIDATE.leftIcon;
-    rightIcon = props.payload.multiSelect.actions?.VALIDATE.rightIcon;
-  } else {
-    label = props.payload?.viewModel?.actionLabel;
-    leftIcon = props.payload?.viewModel?.actionLeftIcon;
-    rightIcon = props.payload?.viewModel?.actionRightIcon;
-  }
-
-  return { label, leftIcon, rightIcon };
-});
-const submitAnswers = () => {
+const submitAnswers = ({ nextStep }: { nextStep: any }) => {
   const answersToSubmit = [];
   for (const answer of selectedAnswers.value) {
     answersToSubmit.push({
@@ -176,15 +153,6 @@ const submitAnswers = () => {
     });
   }
 
-  let nextStep;
-  if (props.payload?.multiSelect) {
-    nextStep = props.payload.multiSelect.actions.VALIDATE.nextStep;
-  } else if (props.payload?.answers[answersToSubmit[0].value]?.nextStep) {
-    nextStep = props.payload.answers[answersToSubmit[0].value].nextStep;
-  } else {
-    nextStep = null;
-  }
-
   /**
    * Emitted when step is completed
    * @event dynamic event name according to completedEventName prop
@@ -195,21 +163,6 @@ const submitAnswers = () => {
     nextStep: nextStep,
   });
 };
-const skipQuestion = () => {
-  /**
-   * Emitted when step is completed
-   * @event dynamic event name according to completedEventName prop
-   * @type {Event}
-   */
-  emit(props.completedEventName, {
-    answers: props.payload?.skippable?.isAnswer
-      ? props.payload?.skippable?.defaultAnswer
-        ? [props.payload?.skippable?.defaultAnswer]
-        : []
-      : null,
-    nextStep: props.payload?.skippable?.nextStep,
-  });
-};
 
 onMounted(() => {
   updateSelectedAnswers();

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

@@ -36,11 +36,15 @@
         <m-notification
           :title="notification.title"
           :type="notification.type"
-          :text="notification.text"
-          :link-label="notification.linkLabel"
-          @link-click="handleLinkClicked(notification.linkHref)"
           class="pb-restitution-list__notifications__container__block"
-        />
+        >
+          <default>{{ notification.text }}</default>
+          <footer>
+            <MLink size="m" :href="notification.linkHref" target="_blank">
+              {{ notification.linkLabel }}
+            </MLink>
+          </footer>
+        </m-notification>
       </m-flex>
     </m-flex>
   </m-flex>
@@ -242,9 +246,6 @@ export default defineComponent({
       this.dialogContent = content;
       this.showDialog = !this.showDialog;
     },
-    handleLinkClicked(href: string) {
-      window.open(href, '_blank');
-    },
     handleItemCreated({
       projectId,
       estimateName,
@@ -358,7 +359,7 @@ $responsive-breakpoint: 'm';
     width: calc(100% - 3.2rem);
 
     @include set-from-screen($responsive-breakpoint) {
-      width: 630px;
+      width: 720px;
       margin-top: 0;
     }
 
@@ -379,7 +380,7 @@ $responsive-breakpoint: 'm';
     padding: $mu050;
 
     @include set-from-screen($responsive-breakpoint) {
-      width: 630px;
+      width: 720px;
       flex-direction: row;
       margin: 0 auto;
     }

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

@@ -67,7 +67,7 @@ $responsive-breakpoint: 'm';
 
   @include set-from-screen($responsive-breakpoint) {
     padding: $mu250 0 0 0;
-    width: 630px;
+    width: 720px;
   }
 
   &__title {
@@ -156,7 +156,7 @@ $responsive-breakpoint: 'm';
     width: 80%;
 
     @include set-from-screen($responsive-breakpoint) {
-      width: 630px;
+      width: 720px;
     }
 
     @include set-font-face('regular');

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

@@ -27,12 +27,15 @@
             <div>
               <li>
                 <div v-html="detail.text"></div>
+
                 <m-flex v-if="detail.cost.min != detail.cost.max" align-items="center" justify-content="flex-end">
                   <span v-html="formattedPriceRange(detail.cost.min)"></span>
                   <span>&nbsp;et&nbsp;</span>
                   <span v-html="formattedPriceRange(detail.cost.max)"></span>
                 </m-flex>
-                <div v-else v-html="formattedPriceRange(detail.cost.min)"></div>
+                <m-flex v-else align-items="center" justify-content="flex-end">
+                  <span v-html="formattedPriceRange(detail.cost.min)"></span>
+                </m-flex>
               </li>
             </div>
           </ul>

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

@@ -458,6 +458,16 @@
     "code": "LMFR_QUESTION_SCENARIO_NO_SIMULATION",
     "type": "STEP",
     "component": "MPbQuestion",
+    "slots": {
+      "beforeContent": {
+        "display": true,
+        "component": "MPbProgress",
+        "totalStep": 7,
+        "currentStep": 7,
+        "sizeXlWidth": true,
+        "label": "Votre projet de salle de bains"
+      }
+    },
     "payload": {
       "viewModel": {
         "label": "Veuillez-nous excuser, nous n’avons trouvé aucun plan",
@@ -791,6 +801,16 @@
     "code": "LMFR_QUESTION_PICTURE_INFO",
     "type": "STEP",
     "component": "MPbQuestion",
+    "slots": {
+      "beforeContent": {
+        "display": true,
+        "component": "MPbProgress",
+        "totalStep": 7,
+        "currentStep": 7,
+        "sizeXlWidth": true,
+        "label": "Votre projet de rénovation cuisine"
+      }
+    },
     "payload": {
       "viewModel": {
         "label": "Si possible, ajoutez des photos de votre cuisine actuelle",
@@ -806,7 +826,7 @@
             "code": "DO_NOT_ADD_PICTURE",
             "value": "DO_NOT_ADD_PICTURE"
           },
-          "label": "Ne pas ajouter maintenant",
+          "label": "Pas maintenant",
           "theme": "text-primary",
           "width": "full",
           "widthFromM": "fit",
@@ -873,7 +893,17 @@
   "LMFR_QUESTION_ADD_PICTURE": {
     "code": "LMFR_QUESTION_ADD_PICTURE",
     "type": "STEP",
-    "component": "PbUploadDocument",
+    "component": "MPbUploadDocument",
+    "slots": {
+      "beforeContent": {
+        "display": true,
+        "component": "MPbProgress",
+        "totalStep": 7,
+        "currentStep": 8,
+        "sizeXlWidth": true,
+        "label": "Votre projet de salle de bains"
+      }
+    },
     "payload": {
       "viewModel": {
         "label": "Les photos de votre cuisine",
@@ -908,7 +938,7 @@
       "skippable": [
         {
           "isAnswer": true,
-          "label": "Ajouter une photo plus tard",
+          "label": "Plus tard",
           "theme": "text-primary",
           "width": "full",
           "widthFromM": "fit",

package/src/components/scenario/scenarii/estimator-floor.json

@@ -111,7 +111,7 @@
         "CARPET": {
           "code": "CARPET",
           "viewModel": {
-            "title": "Moquette, Sisal, Jonc de mer",
+            "title": "Moquette, sisal, jonc de mer",
             "image": "https://storage.googleapis.com/project-booster-media/floor/ground/ground-moquette.jpg"
           },
           "nextStep": {
@@ -269,6 +269,14 @@
     "slots": {
       "stickyBottom": {
         "display": false
+      },
+      "beforeContent": {
+        "display": true,
+        "component": "MPbProgress",
+        "totalStep": 9,
+        "currentStep": 3,
+        "sizeXlWidth": true,
+        "label": "Estimer le budget de votre revêtement de sol"
       }
     },
     "payload": {
@@ -286,7 +294,7 @@
         "MEDIUM": {
           "code": "OVERLAY",
           "viewModel": {
-            "title": "A l’anglaise",
+            "title": "Anglaise",
             "text": "Lames parallèles et joints répartis irrégulièrement",
             "image": "https://storage.googleapis.com/project-booster-media/floor/ground/floor-parquet-english-style.png"
           },
@@ -399,22 +407,6 @@
     "code": "LMFR_FLOOR_QUESTION_CURRENT",
     "type": "STEP",
     "component": "MPbListSelect",
-    "nextStep": {
-      "conditionals": [
-        {
-          "conditions": ["isAnswerMatching('LMFR_FLOOR_QUESTION_NEW', 'CARPET')"],
-          "nextStep": {
-            "code": "LMFR_FLOOR_QUESTION_DIMENSION"
-          }
-        },
-        {
-          "conditions": ["!isAnswerMatching('LMFR_FLOOR_QUESTION_NEW', 'CARPET')"],
-          "nextStep": {
-            "code": "LMFR_FLOOR_QUESTION_ROOM_TYPE"
-          }
-        }
-      ]
-    },
     "slots": {
       "stickyBottom": {
         "display": false
@@ -441,13 +433,26 @@
           "order": ["Asc"],
           "path": ["meta.ranking"]
         },
+        "nextStep": {
+          "conditionals": [
+            {
+              "conditions": ["!isAnswerMatching('LMFR_FLOOR_QUESTION_NEW', 'CARPET')"],
+              "nextStep": {
+                "code": "LMFR_FLOOR_QUESTION_ROOM_TYPE"
+              }
+            },
+            {
+              "conditions": ["isAnswerMatching('LMFR_FLOOR_QUESTION_NEW', 'CARPET')"],
+              "nextStep": {
+                "code": "LMFR_FLOOR_QUESTION_DIMENSION"
+              }
+            }
+          ]
+        },
         "showMore": {
           "label": "Voir d'autres revêtements",
           "minItemsDisplayed": 4,
           "position": "start"
-        },
-        "nextStep": {
-          "code": "LMFR_FLOOR_QUESTION_DUMP"
         }
       },
       "answers": {
@@ -589,6 +594,19 @@
     "code": "LMFR_FLOOR_QUESTION_DUMP",
     "type": "STEP",
     "component": "MPbQuestion",
+    "slots": {
+      "stickyBottom": {
+        "display": false
+      },
+      "beforeContent": {
+        "display": true,
+        "component": "MPbProgress",
+        "totalStep": 9,
+        "currentStep": 4,
+        "sizeXlWidth": true,
+        "label": "Estimer le budget de votre revêtement de sol"
+      }
+    },
     "nextStep": {
       "conditionals": [
         {
@@ -605,19 +623,6 @@
         }
       ]
     },
-    "slots": {
-      "stickyBottom": {
-        "display": false
-      },
-      "beforeContent": {
-        "display": true,
-        "component": "MPbProgress",
-        "totalStep": 9,
-        "currentStep": 4,
-        "sizeXlWidth": true,
-        "label": "Estimer le budget de votre revêtement de sol"
-      }
-    },
     "payload": {
       "viewModel": {
         "label": "Voulez-vous retirer le revêtement de sol actuel ?",
@@ -1197,6 +1202,16 @@
     "nextStep": {
       "code": "LMFR_FLOOR_QUESTION_INSTALLATION"
     },
+    "slots": {
+      "beforeContent": {
+        "display": true,
+        "component": "MPbProgress",
+        "totalStep": 9,
+        "currentStep": 8,
+        "sizeXlWidth": true,
+        "label": "Estimer le budget de votre revêtement de sol"
+      }
+    },
     "payload": {
       "viewModel": {
         "label": "Quelle gamme de sol souple choisissez-vous ?",