project-booster-vue 9.13.1 → 9.14.0

package/package.json

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

package/src/components/projects/project-hub/PbProjectHub-Collaborator.stories.mdx

@@ -113,21 +113,11 @@ import DOCUMENT_UPLOAD_PAYLOAD from '../../media/upload/document-upload-payload.
           if (store.getters['estimates/getCurrentProjectId'] !== projectId) {
             store.dispatch('estimates/loadEstimates', projectId);
           }
-          if (store.getters['media/getCurrentProjectId'] !== projectId) {
-            store.dispatch('media/loadMedia', projectId);
-          }
-          if (store.getters['documents/getCurrentProjectId'] !== projectId) {
-            store.dispatch('documents/loadMedia', projectId);
-          }
           if (store.getters['projects/getCurrentProjectId'] !== projectId) {
             await store.dispatch('projects/loadProject', projectId);
             store.dispatch('projects/loadAppointment');
             store.dispatch('projects/loadProjectAttributes');
           }
-          const projectType = store.getters['projects/getProject']?.projectType?.href?.split('/')[2];
-          if (store.getters['tools/getCurrentProjectType'] !== projectType) {
-            store.dispatch('tools/loadTools', projectType);
-          }
           next();
         },
       },

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

@@ -259,7 +259,7 @@
                   (isLoadingConfigurations || configurations.length > 0 || !!configurationsLoadError) &&
                   !isLoadingTools &&
                   (tools || readOnly) &&
-                  configurators.length !== 0
+                  (configurators.length !== 0 || readOnly)
                 ),
               }"
               direction="column"

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

@@ -104,7 +104,7 @@ export const previousContext = {
           display: true,
         },
       },
-      stepToResume: null,
+      stepsToResume: null,
     },
     {
       step: {
@@ -113,7 +113,7 @@ export const previousContext = {
         component: 'PbQuestion',
         payload: {
           viewModel: {
-            label: 'Question 1',
+            label: 'Question 1 (from previous state)',
             answersComponent: 'PbCard',
           },
           answers: {
@@ -198,8 +198,6 @@ export const previousState = {
     stepIndex: previousContext.stepIndex,
     steps: previousContext.stepHistory,
   },
-  currentStep: previousContext.currentStep,
-  displayedStep: previousContext.currentStep,
 };
 
 <details>
@@ -491,8 +489,6 @@ export const previousStateForNested = {
     stepIndex: previousContextForNested.stepIndex,
     steps: previousContextForNested.stepHistory,
   },
-  currentStep: previousContextForNested.currentStep,
-  displayedStep: previousContextForNested.currentStep,
 };
 
 <details>
@@ -539,8 +535,6 @@ export const previousStateKitchen = {
     stepIndex: previousContextKitchen.stepIndex,
     steps: previousContextKitchen.stepHistory,
   },
-  currentStep: previousContextKitchen.currentStep,
-  displayedStep: previousContextKitchen.currentStep,
 };
 
 <details>

package/src/components/scenario/PbScenario.stories.mdx

@@ -1,9 +1,14 @@
 import { useStore } from 'vuex';
 import { nestedAppDecorator } from '../../../.storybook/nested-app-decorator';
 import { Story, Preview, Meta, Props, ArgsTable, Source, Canvas } from '@storybook/addon-docs';
+import { rest } from 'msw';
 import PbScenario from './PbScenario';
-import estimatesStore from '../../stores/modules/estimatesStore';
+import storeOptions from '../../stores/store';
 import DEFAULT_PAYLOAD from './default-payload.json';
+import {
+  getDocumentsByInhabitantProjectIdResolver,
+  uploadDocumentResolver,
+} from '../../services/api/mocks/documentsMock';
 
 <Meta
   title="Project Booster/Scenario/PbScenario 🦠"
@@ -30,19 +35,7 @@ import DEFAULT_PAYLOAD from './default-payload.json';
     },
   }}
   decorators={[
-    nestedAppDecorator(
-      {
-        modules: {
-          estimates: estimatesStore,
-        },
-        actions: {
-          sendEventToBus({}, payload) {
-            console.log('Event sent to bus', payload);
-          },
-        },
-      },
-      [{ path: '/steps/:stepCode/previous/:answers', component: PbScenario }],
-    ),
+    nestedAppDecorator(storeOptions, [{ path: '/steps/:stepCode/previous/:answers', component: PbScenario }]),
   ]}
   parameters={{
     layout: 'fullscreen',
@@ -61,6 +54,8 @@ export const TemplateSandbox = (args, { argTypes }) => {
     components: { PbScenario },
     setup() {
       const store = useStore();
+      store.dispatch('documentsPlans/updateContext', { type: 'DOCUMENT', subType: 'PLAN' });
+      store.dispatch('documentsPictures/updateContext', { type: 'DOCUMENT', subType: 'PHOTO' });
       store.dispatch('estimates/setSummary', {
         cost: {},
       });
@@ -83,7 +78,13 @@ export const TemplateSandbox = (args, { argTypes }) => {
     inline={false}
     height="758px"
     args={{ scenarios: DEFAULT_PAYLOAD }}
-    parameters={{ storyshots: { disable: true } }}
+    parameters={{
+      msw: [
+        rest.post('/api/inhabitant-projects/:projectId/documents', uploadDocumentResolver),
+        rest.get('/api/inhabitant-projects/:projectId/documents', getDocumentsByInhabitantProjectIdResolver),
+      ],
+      storyshots: { disable: true },
+    }}
   >
     {TemplateSandbox.bind({})}
   </Story>

package/src/components/scenario/PbScenario.vue

@@ -70,6 +70,7 @@
 
 <script lang="ts">
 import { v4 as uuidv4 } from 'uuid';
+import cloneDeep from 'lodash.clonedeep';
 import objectHash from 'object-hash';
 import {
   ref,
@@ -384,8 +385,7 @@ export default defineComponent({
         }
 
         state.value.stepsToResume = requestedStep.stepsToResume!;
-
-        state.value.currentStep = requestedStep?.step;
+        state.value.currentStep = scenarios.get(requestedStep?.step.code);
 
         animateDisplayedStep(stepIndex < state.value.history.stepIndex);
         state.value.history.stepIndex = stepIndex;
@@ -600,9 +600,6 @@ export default defineComponent({
         noPointerEvents.value = false;
       }, 500);
     };
-    const currentHeight = () => {
-      return questionContainer.value?.$el?.clientHeight + 'px' ?? 'auto';
-    };
 
     watch(route, () => {
       const requestedStepIndex = route.params?.stepCode as string;
@@ -652,6 +649,14 @@ export default defineComponent({
 
     if (!props.previousState) {
       initScenario('__START__');
+    } else {
+      state.value = cloneDeep(props.previousState);
+      if (state.value.answers && !(state.value.answers instanceof Map)) {
+        state.value.answers = new Map<string, ScenarioStepAnswer[]>(Object.entries(state.value.answers));
+      }
+      const newRoute = `/steps/${state.value.history.stepIndex}/previous/${uuidv4()}`;
+      forceRefresh.value = true;
+      router.replace(newRoute);
     }
     onMounted(() => {
       document.getElementsByTagName('body')[0].style.setProperty('overflow-x', 'hidden');

package/src/services/api/appointmentQualificationsApi.ts

@@ -70,7 +70,7 @@ const declarationsWithoutAppointment = async (data: any) => {
   );
 };
 
-const linkInhabitantProjectToAppointmentQualification = async (data: any, inhabitantProjectId: any) => {
+const linkInhabitantProjectToAppointmentQualification = async (data: any, inhabitantProjectId: string) => {
   const response = await clientApi.post(
     `/inhabitant-projects/${inhabitantProjectId}/appointment-qualifications`,
     data,

package/src/stores/modules/appointmentQualificationStore.ts

@@ -178,7 +178,7 @@ export default {
           },
           correlationId: state.sessions.correlationId,
         };
-        const result = await linkInhabitantProjectToAppointmentQualification(state.sessions.inhabitantProjectId, data);
+        const result = await linkInhabitantProjectToAppointmentQualification(data, state.sessions.inhabitantProjectId);
         commit('setCurrentAppointmentQualification', result);
         commit('setIsLoadingProject', false);
       } catch (e) {