project-booster-vue 8.122.3 → 8.123.2

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "project-booster-vue",
-  "version": "8.122.3",
+  "version": "8.123.2",
   "private": false,
   "scripts": {
     "test:unit": "vue-cli-service test:unit --forceExit --detectOpenHandles",
@@ -80,21 +80,21 @@
     "@mswjs/interceptors": "0.12.7",
     "@semantic-release/changelog": "5.0.1",
     "@semantic-release/git": "9.0.0",
-    "@storybook/addon-a11y": "6.4.17",
-    "@storybook/addon-essentials": "6.4.17",
+    "@storybook/addon-a11y": "6.4.18",
+    "@storybook/addon-essentials": "6.4.18",
     "@storybook/addon-knobs": "6.3.1",
-    "@storybook/addon-links": "6.4.17",
+    "@storybook/addon-links": "6.4.18",
     "@storybook/addon-postcss": "2.0.0",
-    "@storybook/addon-storyshots": "6.4.17",
-    "@storybook/addon-storyshots-puppeteer": "6.4.17",
-    "@storybook/addon-storysource": "6.4.17",
-    "@storybook/addons": "6.4.17",
-    "@storybook/builder-webpack5": "6.4.17",
-    "@storybook/manager-webpack5": "6.4.17",
-    "@storybook/source-loader": "6.4.17",
+    "@storybook/addon-storyshots": "6.4.18",
+    "@storybook/addon-storyshots-puppeteer": "6.4.18",
+    "@storybook/addon-storysource": "6.4.18",
+    "@storybook/addons": "6.4.18",
+    "@storybook/builder-webpack5": "6.4.18",
+    "@storybook/manager-webpack5": "6.4.18",
+    "@storybook/source-loader": "6.4.18",
     "@storybook/storybook-deployer": "2.8.10",
-    "@storybook/theming": "6.4.17",
-    "@storybook/vue3": "6.4.17",
+    "@storybook/theming": "6.4.18",
+    "@storybook/vue3": "6.4.18",
     "@testing-library/jest-dom": "5.14.1",
     "@testing-library/vue": "6.4.2",
     "@vue/cli": "5.0.0-beta.7",

package/src/components/media/upload/PbMediaUpload.stories.mdx

@@ -166,6 +166,8 @@ export const TemplateSandbox = (args, { argTypes }) => ({
     args={{
       storeModuleName: 'documents',
       payload: DOCUMENT_UPLOAD_PAYLOAD,
+      acceptedFileTypes:
+        'image/jpeg, image/png, image/heif, image/heic, image/heif-sequence, image/heic-sequence, application/pdf',
     }}
   >
     {TemplateSandbox.bind({})}
@@ -196,6 +198,8 @@ export const TemplateSandbox = (args, { argTypes }) => ({
     args={{
       storeModuleName: 'documents',
       payload: DOCUMENT_UPLOAD_PAYLOAD,
+      acceptedFileTypes:
+        'image/jpeg, image/png, image/heif, image/heic, image/heif-sequence, image/heic-sequence, application/pdf',
     }}
   >
     {TemplateSandbox.bind({})}

package/src/components/media/upload/PbMediaUpload.vue

@@ -269,7 +269,6 @@ export default {
       fileName: null,
       selectedType: null,
       isRoomPicture: false,
-      PDF_IMAGE,
     };
   },
 
@@ -436,14 +435,16 @@ export default {
         this.$store.dispatch('sendEventToBus', { code: 'documentUploadValidation', payload: validationData });
         this.$store.dispatch(this.storePrefix + 'validateFileData', validationData);
         this.validationErrors = validationData.validation;
+        this.updateMediaPreviewUrl(file);
       } else {
         const fileValidChecker = isFileTypeValid(this.acceptedUploadedTypes)(file);
         if (!fileValidChecker) {
           this.validationErrors['invalidFileType'] = true;
         }
+        this.mediaPreviewUrl = PDF_IMAGE;
+        this.displayAddDialog = true;
       }
       this.$store.dispatch(this.storePrefix + 'sendEvent', { eventName: 'qualify-by-the-front', file: file });
-      this.updateMediaPreviewUrl(file);
       this.formData.append(fieldName, file, file.name);
 
       if (!this.validationErrors || Object.values(this.validationErrors).length === 0) {

package/src/components/restitution/PbRestitution.stories.mdx

@@ -50,6 +50,14 @@ export const summary = {
             currency: 'EURO',
           },
         },
+        {
+          text: '- Pose d'un ragréage',
+          cost: {
+            min: 984,
+            max: 2853.6,
+            currency: 'EURO',
+          },
+        },
       ],
     },
     {
@@ -64,7 +72,7 @@ export const summary = {
         {
           text: '- Budget construction maison',
           details:
-            "Ce budget n'inclut pas : le terrain, la viabilisation, l'aménagement extérieur et la taxe d'aménagement.",
+            "Ce budget n'inclut pas : le terrain, la viabilisation, l'aménagement extérieur et la taxe d'aménagement.",
           cost: {
             min: 651000,
             max: 1255500,
@@ -75,9 +83,9 @@ export const summary = {
     },
     {
       componentId: 'TAXES',
-      title: "Taxe d'aménagement",
+      title: 'Taxe d'aménagement',
       details:
-        "Taxe qui s'applique pour les projets de construction, de reconstruction et d'agrandissement qui nécessitent des autorisations de travaux. Un abattement de 50% est prévu sur les 100 premiers m².",
+        "Taxe qui s'applique pour les projets de construction, de reconstruction et d'agrandissement qui nécessitent des autorisations de travaux. Un abattement de 50% est prévu sur les 100 premiers m².",
       cost: {
         min: 6299.7,
         max: 23623.88,

package/src/components/restitution/PbRestitutionBlock.vue

@@ -8,9 +8,7 @@
           align-items="baseline"
           class="pb-restitution-block__head"
         >
-          <div v-if="component.details" class="pb-restitution-block__details">
-            {{ component.details }}
-          </div>
+          <div v-if="component.details" class="pb-restitution-block__details" v-html="component.details"></div>
         </div>
         <pb-restitution-line
           v-for="(line, index) in component.lines"

package/src/components/restitution/PbRestitutionLine.vue

@@ -1,7 +1,7 @@
 <template>
   <m-flex :class="`pb-restitution-line`" direction="column">
     <m-flex full-width>
-      <div class="pb-restitution-line__label">{{ line.text }}</div>
+      <div class="pb-restitution-line__label" v-html="line.text"></div>
       <m-flex class="pb-restitution-line__price" v-if="line.cost" justify-content="flex-end" wrap>
         <div v-if="line.cost.min !== line.cost.max" class="pb-restitution-line__price-min">
           {{ formatPriceRange(line.cost.min, line.cost.max).min }}&nbsp;-&nbsp;
@@ -11,7 +11,7 @@
         </div>
       </m-flex>
     </m-flex>
-    <div v-if="line.details" class="pb-restitution-line__details">{{ line.details }}</div>
+    <div v-if="line.details" class="pb-restitution-line__details" v-html="line.details"></div>
   </m-flex>
 </template>
 

package/src/components/scenario/PbScenario-Features-Conditional.stories.mdx

@@ -41,7 +41,7 @@ import conditionalScenarioSchema from './Conditional-scenario.svg';
 
 ## Conditional routing
 
-Conditions can be applied to next steps:
+Conditions can be applied to next steps or scenario step code:
 
 ```json
 {

package/src/components/scenario/PbScenario.vue

@@ -160,7 +160,7 @@ export default {
     const stickyBottom = ref(null);
 
     const state = ref({
-      answers: {},
+      answers: props.runtimeOptions?.answersToInject ?? {},
       stepsToResume: [],
       currentStep: null,
       displayedStep: null,
@@ -194,7 +194,9 @@ export default {
         stepToResume = currentScenario;
       }
       state.value.stepsToResume.push(stepToResume);
-      const currentStep = props.scenarios[currentScenario.stepCode];
+      const currentStep = currentScenario.stepCode?.conditionals
+        ? props.scenarios[computeNextStep(currentScenario.stepCode).code]
+        : props.scenarios[currentScenario.stepCode];
       initStep(currentStep);
     };
     const initStep = (step, previousAnswerCode = '__START__') => {

package/src/services/api/appointmentQualificationsApi.js

@@ -27,9 +27,15 @@ const saveAnswersByAppointmentQualificationId = async (appointmentQualificationI
 };
 
 const declarationsWithAppointment = async (data) => {
-  return await axios.post('/api/declarations-with-appointment', data, {
+  const response = await axios.post('/api/declarations-with-appointment', data, {
     headers: { 'Content-Type': 'application/json' },
   });
+
+  return JSON.parse(
+    JSON.stringify(response.data).replace(/:"([^"]+)"/g, (match, $1) => {
+      return `: "${he.escape($1)}"`;
+    }),
+  );
 };
 
 export { declarationsWithAppointment, saveAnswersByAppointmentQualificationId, getAppointmentQualification };

package/src/stores/modules/appointmentQualificationStore.js

@@ -244,7 +244,7 @@ export default {
           correlationId: state.sessions.correlationId,
         };
         const result = await declarationsWithAppointment(project);
-        commit('setCurrentAppointmentQualification', result.body);
+        commit('setCurrentAppointmentQualification', result);
         commit('setIsLoadingProject', false);
       } catch (e) {
         commit('setCreateProjectError', new Error());

package/src/stores/modules/documentsStore.js

@@ -371,7 +371,7 @@ export const documentsUploadStoreOptions = {
         parentCorrelationId: rootState?.appointmentQualification?.sessions?.correlationId,
         inhabitantProjectId: rootState?.appointmentQualification?.currentAppointmentQualification?.inhabitantProjectId,
       };
-      if (state.uploadedId) {
+      if (state.uploadedId && event.eventName !== 'start') {
         documentEvent['documentId'] = state.uploadedId;
       }
       if (event.eventName === 'qualify-by-the-front') {

package/src/stores/modules/projectsStore.js

@@ -704,7 +704,7 @@ export const projectItemSaveStoreOptions = {
         name: 'recorded',
         correlationId,
         businessUnit: '001',
-        projectId,
+        inhabitantProjectId: projectId,
         ...metaDataWithDate,
       };