project-booster-vue 9.10.2 → 9.10.5

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "project-booster-vue",
-  "version": "9.10.2",
+  "version": "9.10.5",
   "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/PbScenario-Features-Appointment.stories.mdx

@@ -69,7 +69,7 @@ export const TemplateSandbox = (args, { argTypes }) => {
       store.dispatch('configurations/defineConfiguratorTypes', [DEFAULT_PAYLOAD.__START__.meta.configuratorType]);
       store.dispatch('configurations/searchConfigurations', '001');
       store.dispatch('inhabitants/loadInhabitant', '123456');
-      store.dispatch('appointmentQualification/loadClicRDVBaseUrl');
+      store.dispatch('appointmentQualification/loadClicRDVBaseUrl', 'https://sandbox-user.clicrdv.com');
       store.dispatch('appointmentQualification/initSessions', {
         formId: 'appointment-qualification-kitchen',
         correlationId: uuidv4(),

package/src/stores/modules/appointmentQualificationStore.ts

@@ -195,9 +195,9 @@ export default {
     initSessions({ commit }: AppointmentQualificationContext, sessions: any) {
       commit('setSession', sessions);
     },
-    loadClicRDVBaseUrl({ commit }: AppointmentQualificationContext) {
-      if ((<any>window).config) {
-        commit('setClicRDVBaseUrl', (<any>window).config.VUE_APP_CLICRDV_BASE_URL);
+    loadClicRDVBaseUrl({ commit }: AppointmentQualificationContext, baseUrl: string) {
+      if (baseUrl) {
+        commit('setClicRDVBaseUrl', baseUrl);
       } else {
         commit('setClicRDVBaseUrl', 'https://www.clicrdv.com');
       }

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;