project-booster-vue 9.63.8 → 9.63.10

package/package.json

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

package/src/components/projects/project-hub/PbProjectHub.vue

@@ -1330,10 +1330,14 @@ export default defineComponent({
         code: 'appointmentLinkClicked',
         payload: this.project.id,
       });
+
+      const pageName = ['KITCHEN_IN_STORE', 'KITCHEN_REMOTE'].includes(this.appointment.appointmentType)
+        ? 'cuisine'
+        : 'salle-de-bains';
       nextTick(() => {
         (<any>(
           window
-        )).location = `/projets/preparation-rendez-vous/cuisine.html?inhabitantProjectId=${this.project.id}&appointmentId=${this.appointment.appointmentId}&groupId=${this.appointment.groupId}&calendarId=${this.appointment.calendarId}&leadSourceDetail=Project_Space`;
+        )).location = `/projets/preparation-rendez-vous/${pageName}.html?inhabitantProjectId=${this.project.id}&appointmentId=${this.appointment.appointmentId}&groupId=${this.appointment.groupId}&calendarId=${this.appointment.calendarId}&leadSourceDetail=Project_Space`;
       });
     },
   },

package/src/components/rework/question/upload-document/MPbUploadDocument.vue

@@ -83,14 +83,14 @@
     <div class="pb-upload-document__redirect-link" v-if="payload.viewModel.redirectLink">
       <m-link
         :label="payload.viewModel.redirectLink.label"
-        @click="callAction(payload.viewModel.redirectLink.nextStep)"
+        @click="validMultiSelect(payload.viewModel.redirectLink)"
         theme="primary"
       ></m-link>
     </div>
 
-    <div class="pb-upload-document__buttons row-flex" v-if="payload.callToActions">
-      <div class="pb-upload-document__buttons__button" v-for="button in payload.callToActions">
-        <m-button :label="button.label" @click="callAction(button.nextStep)" :theme="button.theme" />
+    <div class="pb-upload-document__buttons row-flex" v-if="payload.multiSelect">
+      <div class="pb-upload-document__buttons__button" v-for="button in payload.multiSelect.actions">
+        <m-button :label="button.label" @click="validMultiSelect(button)" :theme="button.theme" />
       </div>
     </div>
 
@@ -209,8 +209,6 @@ export default defineComponent({
 
     const pbMediaUpload = ref<ComponentCustomProperties>();
 
-    const previousAnswers: Ref<Map<string, ScenarioStepAnswer[]> | undefined> = ref();
-
     // Documents pagination
     const lastItemIndex = ref(1);
     const pageSize = ref(8);
@@ -246,15 +244,19 @@ export default defineComponent({
     };
 
     const validMultiSelect = (multiSelectOptions: UploadDocumentMultiSelectAction) => {
-      emit(props.completedEventName, {
-        answers: selectedDocuments.value,
-        nextStep: multiSelectOptions.nextStep,
-      });
+      if (multiSelectOptions.nextStep.code == '__BACK__') {
+        emit('go-back');
+      } else {
+        emit(props.completedEventName, {
+          answers: selectedDocuments.value.length ? selectedDocuments.value : null,
+          nextStep: multiSelectOptions.nextStep,
+        });
+      }
     };
 
     const skipQuestion = (button: UploadDocumentMultiSelectAction) => {
       emit(props.completedEventName, {
-        answers: selectedDocuments.value,
+        answers: selectedDocuments.value.length ? selectedDocuments.value : null,
         nextStep: button.nextStep,
       });
     };
@@ -273,21 +275,6 @@ export default defineComponent({
       showMoreAnimation.value = 'pb-upload-document__answers-animation';
     };
 
-    /**
-     * Send action to completed step
-     * @param action
-     */
-    const callAction = (action: PayloadAction) => {
-      if (action.code != '__BACK__') {
-        emit('step-completed', {
-          answers: [],
-          nextStep: action,
-        });
-      } else {
-        emit('go-back');
-      }
-    };
-
     return {
       ADD_ICON,
       BACK_ICON,
@@ -308,7 +295,6 @@ export default defineComponent({
       displayDocumentDialog,
       handleMediaUploaded,
       handleShowMoreClick,
-      callAction,
     };
   },
 });