project-booster-vue 9.1.0 → 9.2.2

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "project-booster-vue",
-  "version": "9.1.0",
+  "version": "9.2.2",
   "private": false,
   "scripts": {
     "serve": "vue-cli-service serve",
@@ -81,21 +81,21 @@
     "@mswjs/interceptors": "0.12.7",
     "@semantic-release/changelog": "5.0.1",
     "@semantic-release/git": "9.0.0",
-    "@storybook/addon-a11y": "6.4.20",
-    "@storybook/addon-essentials": "6.4.20",
+    "@storybook/addon-a11y": "6.4.21",
+    "@storybook/addon-essentials": "6.4.21",
     "@storybook/addon-knobs": "6.3.1",
-    "@storybook/addon-links": "6.4.20",
+    "@storybook/addon-links": "6.4.21",
     "@storybook/addon-postcss": "2.0.0",
-    "@storybook/addon-storyshots": "6.4.20",
-    "@storybook/addon-storyshots-puppeteer": "6.4.20",
-    "@storybook/addon-storysource": "6.4.20",
-    "@storybook/addons": "6.4.20",
-    "@storybook/builder-webpack5": "6.4.20",
-    "@storybook/manager-webpack5": "6.4.20",
-    "@storybook/source-loader": "6.4.20",
+    "@storybook/addon-storyshots": "6.4.21",
+    "@storybook/addon-storyshots-puppeteer": "6.4.21",
+    "@storybook/addon-storysource": "6.4.21",
+    "@storybook/addons": "6.4.21",
+    "@storybook/builder-webpack5": "6.4.21",
+    "@storybook/manager-webpack5": "6.4.21",
+    "@storybook/source-loader": "6.4.21",
     "@storybook/storybook-deployer": "2.8.11",
-    "@storybook/theming": "6.4.20",
-    "@storybook/vue3": "6.4.20",
+    "@storybook/theming": "6.4.21",
+    "@storybook/vue3": "6.4.21",
     "@testing-library/jest-dom": "5.16.2",
     "@testing-library/vue": "6.5.1",
     "@types/axios": "0.14.0",
@@ -147,13 +147,13 @@
     "eslint-plugin-import": "2.25.4",
     "eslint-plugin-mdx": "1.16.0",
     "eslint-plugin-prettier": "4.0.0",
-    "eslint-plugin-storybook": "0.5.7",
+    "eslint-plugin-storybook": "0.5.8",
     "eslint-plugin-vue": "7.11.1",
     "fluent-json-schema": "3.0.1",
     "husky": "6.0.0",
     "jest": "26.6.3",
     "msw": "0.39.1",
-    "msw-storybook-addon": "1.6.1",
+    "msw-storybook-addon": "1.6.3",
     "mutationobserver-shim": "0.3.7",
     "postcss": "8.3.11",
     "postcss-loader": "4.2.0",

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

@@ -407,6 +407,9 @@ export default defineComponent({
 
     async upload() {
       if (!this.disabled && !this.isMediaUploaded) {
+        if (this.selectedType === null) {
+          this.selectedType = this.payload.viewModel.dialog.defaultMediaType;
+        }
         await this.$store.dispatch(this.storePrefix + 'uploadFile', {
           formData: this.formData,
           fileName: this.fileName,

package/src/components/projects/project-hub/PbProjectHub-Features-Documents&Media.stories.mdx

@@ -54,9 +54,11 @@ import DOCUMENT_UPLOAD_PAYLOAD from '../../media/upload/document-upload-payload.
             store.dispatch('projects/loadProject', '001');
           }
           if (store.getters['media/getCurrentProjectId'] !== '001') {
+            store.dispatch('media/updateContext', { type: 'MEDIA' });
             store.dispatch('media/loadMedia', '001');
           }
           if (store.getters['documents/getCurrentProjectId'] !== '001') {
+            store.dispatch('documents/updateContext', { type: 'DOCUMENTS' });
             store.dispatch('documents/loadMedia', '001');
           }
           next();
@@ -72,6 +74,7 @@ import DOCUMENT_UPLOAD_PAYLOAD from '../../media/upload/document-upload-payload.
           uploadPayload: MEDIA_UPLOAD_PAYLOAD,
         },
         beforeEnter: async (to, from, next, store) => {
+          store.dispatch('media/updateContext', { type: 'MEDIA' });
           if (store.getters['projects/getCurrentProjectId'] !== '001') {
             store.dispatch('projects/loadProject', '001');
           }
@@ -91,6 +94,7 @@ import DOCUMENT_UPLOAD_PAYLOAD from '../../media/upload/document-upload-payload.
           uploadPayload: MEDIA_UPLOAD_PAYLOAD,
         },
         beforeEnter: async (to, from, next, store) => {
+          store.dispatch('media/updateContext', { type: 'MEDIA' });
           if (store.getters['projects/getCurrentProjectId'] !== '001') {
             store.dispatch('projects/loadProject', '001');
           }
@@ -114,6 +118,7 @@ import DOCUMENT_UPLOAD_PAYLOAD from '../../media/upload/document-upload-payload.
           uploadPayload: DOCUMENT_UPLOAD_PAYLOAD,
         },
         beforeEnter: async (to, from, next, store) => {
+          store.dispatch('documents/updateContext', { type: 'DOCUMENTS' });
           if (store.getters['projects/getCurrentProjectId'] !== '001') {
             store.dispatch('projects/loadProject', '001');
           }
@@ -134,6 +139,7 @@ import DOCUMENT_UPLOAD_PAYLOAD from '../../media/upload/document-upload-payload.
           uploadPayload: DOCUMENT_UPLOAD_PAYLOAD,
         },
         beforeEnter: async (to, from, next, store) => {
+          store.dispatch('documents/updateContext', { type: 'DOCUMENTS' });
           if (store.getters['projects/getCurrentProjectId'] !== '001') {
             store.dispatch('projects/loadProject', '001');
           }
@@ -148,7 +154,7 @@ import DOCUMENT_UPLOAD_PAYLOAD from '../../media/upload/document-upload-payload.
       },
     ]),
   ]}
-></Meta>
+/>
 
 # 🦠 `PbProjectHub` - Component
 

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

@@ -97,9 +97,11 @@ import DOCUMENT_UPLOAD_PAYLOAD from '../../media/upload/document-upload-payload.
             store.dispatch('estimates/loadEstimates', projectId);
           }
           if (store.getters['media/getCurrentProjectId'] !== projectId) {
+            store.dispatch('media/updateContext', { type: 'MEDIA' });
             store.dispatch('media/loadMedia', projectId);
           }
           if (store.getters['documents/getCurrentProjectId'] !== projectId) {
+            store.dispatch('documents/updateContext', { type: 'DOCUMENTS' });
             store.dispatch('documents/loadMedia', projectId);
           }
           if (store.getters['projects/getCurrentProjectId'] !== projectId) {
@@ -125,6 +127,7 @@ import DOCUMENT_UPLOAD_PAYLOAD from '../../media/upload/document-upload-payload.
         beforeEnter: async (to, from, next, store) => {
           store.dispatch('media/updateCurrentMedia', null);
           const projectId = to.params.projectId;
+          store.dispatch('media/updateContext', { type: 'MEDIA' });
           if (store.getters['projects/getCurrentProjectId'] !== projectId) {
             store.dispatch('projects/loadProject', projectId);
           }
@@ -141,6 +144,7 @@ import DOCUMENT_UPLOAD_PAYLOAD from '../../media/upload/document-upload-payload.
         beforeEnter: async (to, from, next, store) => {
           const projectId = to.params.projectId;
           const mediaId = to.params.inspirationId;
+          store.dispatch('media/updateContext', { type: 'MEDIA' });
           if (store.getters['projects/getCurrentProjectId'] !== projectId) {
             store.dispatch('projects/loadProject', projectId);
           }
@@ -164,6 +168,7 @@ import DOCUMENT_UPLOAD_PAYLOAD from '../../media/upload/document-upload-payload.
           uploadPayload: DOCUMENT_UPLOAD_PAYLOAD,
         },
         beforeEnter: async (to, from, next, store) => {
+          store.dispatch('documents/updateContext', { type: 'DOCUMENTS' });
           store.dispatch('documents/updateCurrentMedia', null);
           const projectId = to.params.projectId;
           if (store.getters['projects/getCurrentProjectId'] !== projectId) {
@@ -188,6 +193,7 @@ import DOCUMENT_UPLOAD_PAYLOAD from '../../media/upload/document-upload-payload.
         beforeEnter: async (to, from, next, store) => {
           const projectId = to.params.projectId;
           const mediaId = to.params.documentId;
+          store.dispatch('documents/updateContext', { type: 'DOCUMENTS' });
           if (store.getters['projects/getCurrentProjectId'] !== projectId) {
             store.dispatch('projects/loadProject', projectId);
           }
@@ -245,31 +251,34 @@ The `PbProjectHub` component to access your project.
         rest.get('/api/estimates', getEstimatesByProjectIdResolver),
         rest.post('/api/estimates', successResolver),
         rest.get(
-          '/inhabitant-projects/:inhabitantProjectId/simulations',
+          '/api/inhabitant-projects/:inhabitantProjectId/simulations',
           getConfigurationsWithUpdatedPricesByProjectIdResolver,
         ),
-        rest.get('/simulations', getConfigurationsByProjectIdResolver),
+        rest.get('//apisimulations', getConfigurationsByProjectIdResolver),
         rest.get(
           'https://storage.googleapis.com/pb-dev-adeo-disp-project-tools/:id.json',
           getToolsByProjectTypeResolver,
         ),
-        rest.get('/project-types/:projectTypeId/products-feature-flag', getEnabledProductsFeatureFlagResolver),
-        rest.get('/media', getAllMediaPaginationResolver),
-        rest.get('/media/:mediaId', getMediumByIdResolver),
-        rest.get('/media/:mediaId/thumbnail', getMediaThumbnailResolver),
-        rest.get('/media/:mediaId/file', getMediaFileResolver),
-        rest.post('/media', uploadMediaResolver),
-        rest.patch('/media/:mediaId', getMediumByIdResolver),
-        rest.delete('/media/:mediaId', successResolver),
-        rest.patch('/media/:mediaId', notContentResolver),
-        rest.get('/inhabitant-projects/:projectId/documents/', getDocumentsByInhabitantProjectIdResolver),
-        rest.get('/inhabitant-projects/:projectId/documents/:documentId', getDocumentByIdResolver),
-        rest.delete('/inhabitant-projects/:projectId/documents/:documentId', successResolver),
-        rest.get('/inhabitant-projects/:projectId/documents/:documentId/thumbnail', getDocumentsImageThumbnailResolver),
-        rest.get('/inhabitant-projects/:projectId/documents/:documentId/file', getDocumentsImageFileResolver),
-        rest.post('/inhabitant-projects/:projectId/documents', uploadDocumentResolver),
-        rest.get('/inhabitant-projects/:projectId/attributes', getProjectAttributesByIdResolver),
-        rest.get('/inhabitant-api/users/:buId/:inhabitantId', getInhabitantByIdResolver),
+        rest.get('/api/project-types/:projectTypeId/products-feature-flag', getEnabledProductsFeatureFlagResolver),
+        rest.get('/api/media', getAllMediaPaginationResolver),
+        rest.get('/api/media/:mediaId', getMediumByIdResolver),
+        rest.get('/api/media/:mediaId/thumbnail', getMediaThumbnailResolver),
+        rest.get('/api/media/:mediaId/file', getMediaFileResolver),
+        rest.post('/api/media', uploadMediaResolver),
+        rest.patch('/api/media/:mediaId', getMediumByIdResolver),
+        rest.delete('/api/media/:mediaId', successResolver),
+        rest.patch('/api/media/:mediaId', notContentResolver),
+        rest.get('/api/inhabitant-projects/:projectId/documents/', getDocumentsByInhabitantProjectIdResolver),
+        rest.get('/api/inhabitant-projects/:projectId/documents/:documentId', getDocumentByIdResolver),
+        rest.delete('/api/inhabitant-projects/:projectId/documents/:documentId', successResolver),
+        rest.get(
+          '/api/inhabitant-projects/:projectId/documents/:documentId/thumbnail',
+          getDocumentsImageThumbnailResolver,
+        ),
+        rest.get('/api/inhabitant-projects/:projectId/documents/:documentId/file', getDocumentsImageFileResolver),
+        rest.post('/api/inhabitant-projects/:projectId/documents', uploadDocumentResolver),
+        rest.get('/api/inhabitant-projects/:projectId/attributes', getProjectAttributesByIdResolver),
+        rest.get('/api/inhabitant-api/users/:buId/:inhabitantId', getInhabitantByIdResolver),
       ],
       storyshots: { disable: true },
     }}

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

@@ -81,35 +81,61 @@
                 />
               </m-flex>
             </m-flex>
-            <m-flex
-              v-if="isPlannerDisplayed"
-              class="pb-project-hub__section pb-project-hub__planner-section"
-              direction="column"
-              full-width
-            >
-              <pb-tasks-preview
-                v-if="!plannerError"
-                class="pb-project-hub__planner"
-                :tasks="tasks"
-                :tasks-number="3"
-                :read-only="readOnly"
-                @show-task-details="handleShowTaskDetails"
-                @create-task="handleCreateTask"
-                @view-tasks="handleViewTasks"
-                @task-completed="handleCompleteTask"
-              />
-              <m-flex
-                v-else-if="plannerError"
-                class="pb-project-hub__planner--error"
-                direction="column"
-                align-items="center"
-                justify-content="center"
-                gap="2rem"
-                full-width
-              >
-                <div>Une erreur est survenue lors du chargement des étapes</div>
-                <m-button label="Réessayer" @click="$store.dispatch('tasks/reloadPlanner')" />
-              </m-flex>
+            <m-flex v-if="isDocumentsDisplayed" class="pb-project-hub__section" direction="column" full-width>
+              <div class="pb-project-hub__section-header">
+                <div class="pb-project-hub__section-title">{{ titleDocument }}</div>
+              </div>
+              <div class="pb-project-hub__section-content">
+                <m-flex
+                  class="pb-project-hub__section-content--loading"
+                  v-if="isLoadingDocuments"
+                  direction="column"
+                  align-items="center"
+                  justify-content="center"
+                  align-content="center"
+                >
+                  <pb-animable-loader class="pb-project-hub__section-content--loading-loader" />
+                  <div class="pb-project-hub__section-content--loading-label">Chargement...</div>
+                </m-flex>
+                <m-container
+                  class="pb-project-hub__section-content-cards-container"
+                  fluid
+                  v-if="displayedDocuments && displayedDocuments.length > 0"
+                >
+                  <m-flexy class="pb-project-hub__section-content-cards-flexy">
+                    <m-flexy-col
+                      class="pb-project-hub__section-content-card-flexy"
+                      v-for="document in displayedDocuments"
+                      :key="document.id"
+                      width="full"
+                      width-from-m="1of3"
+                    >
+                      <div class="pb-project-hub__section-content-card-container">
+                        <pb-card
+                          @cardClick="handleDocumentClick(document.id)"
+                          class="pb-project-hub__section-content-card"
+                          :image="documentThumbnailUrl.replace('@@PB_MEDIA_ID_FILLER@@', document.id)"
+                          :text="document.title ? document.title : 'Image sans nom'"
+                        />
+                      </div>
+                    </m-flexy-col>
+                  </m-flexy>
+                  <m-link
+                    class="pb-project-hub__section-content-link"
+                    label="Gérer vos documents"
+                    @click="$router.push({ name: 'PbDocuments' })"
+                  />
+                </m-container>
+                <pb-empty-state
+                  v-else
+                  :title="!readOnly ? 'Centraliser vos documents' : ''"
+                  :subtitle="!readOnly ? '' : 'Aucune information renseignée'"
+                  image="https://storage.googleapis.com/project-booster-media/media/empty-media.png"
+                  :button-label="!readOnly ? 'Ajouter des documents' : ''"
+                  @button-click="handleClickDocumentEmptyState"
+                  :disabled="readOnly"
+                />
+              </div>
             </m-flex>
             <m-flex
               v-if="isEstimatesDisplayed"
@@ -360,7 +386,7 @@
                   </m-flexy>
                   <m-link
                     class="pb-project-hub__section-content-link"
-                    label="Voir toutes les inspirations"
+                    label="Gérer vos inspirations"
                     @click="$router.push({ name: 'PbInspirations' })"
                   />
                 </m-container>
@@ -375,63 +401,12 @@
                 />
               </div>
             </m-flex>
-            <m-flex v-if="isDocumentsDisplayed" class="pb-project-hub__section" direction="column" full-width>
-              <div class="pb-project-hub__section-header">
-                <div class="pb-project-hub__section-title">{{ titleDocument }}</div>
-              </div>
-              <div class="pb-project-hub__section-content">
-                <m-flex
-                  class="pb-project-hub__section-content--loading"
-                  v-if="isLoadingDocuments"
-                  direction="column"
-                  align-items="center"
-                  justify-content="center"
-                  align-content="center"
-                >
-                  <pb-animable-loader class="pb-project-hub__section-content--loading-loader" />
-                  <div class="pb-project-hub__section-content--loading-label">Chargement...</div>
-                </m-flex>
-                <m-container
-                  class="pb-project-hub__section-content-cards-container"
-                  fluid
-                  v-if="displayedDocuments && displayedDocuments.length > 0"
-                >
-                  <m-flexy class="pb-project-hub__section-content-cards-flexy">
-                    <m-flexy-col
-                      class="pb-project-hub__section-content-card-flexy"
-                      v-for="document in displayedDocuments"
-                      :key="document.id"
-                      width="full"
-                      width-from-m="1of3"
-                    >
-                      <div class="pb-project-hub__section-content-card-container">
-                        <pb-card
-                          @cardClick="handleDocumentClick(document.id)"
-                          class="pb-project-hub__section-content-card"
-                          :image="documentThumbnailUrl.replace('@@PB_MEDIA_ID_FILLER@@', document.id)"
-                          :text="document.title ? document.title : 'Image sans nom'"
-                        />
-                      </div>
-                    </m-flexy-col>
-                  </m-flexy>
-                  <m-link
-                    class="pb-project-hub__section-content-link"
-                    label="Voir tous les documents"
-                    @click="$router.push({ name: 'PbDocuments' })"
-                  />
-                </m-container>
-                <pb-empty-state
-                  v-else
-                  :title="!readOnly ? 'Centraliser vos documents' : ''"
-                  :subtitle="!readOnly ? '' : 'Aucune information renseignée'"
-                  image="https://storage.googleapis.com/project-booster-media/media/empty-media.png"
-                  :button-label="!readOnly ? 'Ajouter des documents' : ''"
-                  @button-click="handleClickDocumentEmptyState"
-                  :disabled="readOnly"
-                />
-              </div>
-            </m-flex>
-            <m-flex v-if="areProjectAttributesDisplayed" class="pb-project-hub__section" direction="column" full-width>
+            <m-flex
+              v-if="areProjectAttributesDisplayed && projectAttributes && Object.keys(projectAttributes).length > 0"
+              class="pb-project-hub__section"
+              direction="column"
+              full-width
+            >
               <div class="pb-project-hub__section-header">
                 <div class="pb-project-hub__section-title" ref="pbProjectAttributeList">
                   {{ titleProjectAttribute }}
@@ -466,6 +441,36 @@
                 </m-flex>
               </div>
             </m-flex>
+            <m-flex
+              v-if="isPlannerDisplayed"
+              class="pb-project-hub__section pb-project-hub__planner-section"
+              direction="column"
+              full-width
+            >
+              <pb-tasks-preview
+                v-if="!plannerError"
+                class="pb-project-hub__planner"
+                :tasks="tasks"
+                :tasks-number="3"
+                :read-only="readOnly"
+                @show-task-details="handleShowTaskDetails"
+                @create-task="handleCreateTask"
+                @view-tasks="handleViewTasks"
+                @task-completed="handleCompleteTask"
+              />
+              <m-flex
+                v-else-if="plannerError"
+                class="pb-project-hub__planner--error"
+                direction="column"
+                align-items="center"
+                justify-content="center"
+                gap="2rem"
+                full-width
+              >
+                <div>Une erreur est survenue lors du chargement des étapes</div>
+                <m-button label="Réessayer" @click="$store.dispatch('tasks/reloadPlanner')" />
+              </m-flex>
+            </m-flex>
             <m-flex v-if="isMailConsentDisplayed" class="pb-project-hub__section" direction="column" full-width>
               <div class="pb-project-hub__section-header">
                 <div class="pb-project-hub__section-title" ref="pbConsent">Souscription newsletter</div>

package/src/components/question/PbQuestion.vue

@@ -16,9 +16,11 @@
         {{ payload.viewModel.hero }}
       </div>
       <div class="pb-question__title-container">
-        <div v-if="payload.viewModel.label" class="pb-question__title">
-          {{ decorate(payload.viewModel.label, payload.defaultDecoratorValue) }}
-        </div>
+        <div
+          v-if="payload.viewModel.label"
+          class="pb-question__title"
+          v-html="decorate(payload.viewModel.label, payload.defaultDecoratorValue)"
+        />
         <div v-if="payload.viewModel.subtitle" class="pb-question__subtitle">
           {{ decorate(payload.viewModel.subtitle, payload.defaultDecoratorValue) }}
           <m-link
@@ -431,8 +433,13 @@ export default defineComponent({
         if (
           questionPossibleAnswer &&
           (questionPossibleAnswer?.selected ||
-            answerValues.findIndex((answer: ScenarioStepAnswer) => answer?.code === answerCode && answer?.selected) >=
-              0) &&
+            answerValues.findIndex(
+              (answer: ScenarioStepAnswer | string) =>
+                (typeof answer === 'string' && answer === answerCode) ||
+                (typeof answer === 'object' &&
+                  (<ScenarioStepAnswer>answer)?.code === answerCode &&
+                  (<ScenarioStepAnswer>answer)?.selected),
+            ) >= 0) &&
           areConditionsValid(questionPossibleAnswer.conditions!, this.answers, this.runtimeOptions)
         ) {
           this.selectedAnswers.set(answerCode, true);
@@ -452,7 +459,12 @@ export default defineComponent({
     decorate(valueToDecorate: string, defaultValue = '') {
       if (valueToDecorate) {
         valueToDecorate = `\`${valueToDecorate}\``;
-        return this.doEval(valueToDecorate, defaultValue);
+        try {
+          return this.doEval(valueToDecorate, defaultValue);
+        } catch (e) {
+          console.error(e);
+          return valueToDecorate;
+        }
       }
       return valueToDecorate;
     },

package/src/components/question/upload-document/PbUploadDocument-Features-ShowMore.stories.json

@@ -9,8 +9,7 @@
     "startOpened": false,
     "mediaPayload": {
       "viewModel": {
-        "type": "documents",
-        "subType": "PLAN",
+        "type": "documentsPlans",
         "acceptedFileTypes": "image/jpeg, image/png, image/heif, image/heic, image/heif-sequence, image/heic-sequence, application/pdf",
         "dialog": {
           "hideCross": false,
@@ -25,14 +24,20 @@
           "acceptedMediaTypesErrorLabel": "Seuls les formats JPG et PNG, et PDF sont acceptés",
           "mediaTypes": [
             {
+              "type": "PLAN",
+              "subtype": "HAND_DRAWN_PLAN",
               "code": "HAND_DRAWN_PLAN",
-              "label": "Un plan fait moi même"
+              "label": "Un plan fait moi-même"
             },
             {
+              "type": "PLAN",
+              "subtype": "ARCHITECT_PLAN",
               "code": "ARCHITECT_PLAN",
               "label": "Un plan d’architecte"
             },
             {
+              "type": "PLAN",
+              "subtype": "KITCHEN_DESIGNER_PLAN",
               "code": "KITCHEN_DESIGNER_PLAN",
               "label": "Un plan d’un autre cuisiniste"
             }

package/src/components/question/upload-document/PbUploadDocument-Features-StartOpen.stories.json

@@ -5,8 +5,7 @@
     "startOpened": true,
     "mediaPayload": {
       "viewModel": {
-        "type": "documents",
-        "subType": "PLAN",
+        "type": "documentsPlans",
         "acceptedFileTypes": "image/jpeg, image/png, image/heif, image/heic, image/heif-sequence, image/heic-sequence, application/pdf",
         "dialog": {
           "hideCross": false,
@@ -22,14 +21,20 @@
           "acceptedMediaTypesErrorLabel": "Seuls les formats JPG et PNG, et PDF sont acceptés",
           "mediaTypes": [
             {
+              "type": "PLAN",
+              "subtype": "HAND_DRAWN_PLAN",
               "code": "HAND_DRAWN_PLAN",
-              "label": "Un plan fait moi même"
+              "label": "Un plan fait moi-même"
             },
             {
+              "type": "PLAN",
+              "subtype": "ARCHITECT_PLAN",
               "code": "ARCHITECT_PLAN",
               "label": "Un plan d’architecte"
             },
             {
+              "type": "PLAN",
+              "subtype": "KITCHEN_DESIGNER_PLAN",
               "code": "KITCHEN_DESIGNER_PLAN",
               "label": "Un plan d’un autre cuisiniste"
             }

package/src/components/question/upload-document/PbUploadDocument.vue

@@ -238,9 +238,6 @@ export default defineComponent({
   setup(props, { emit }) {
     const store = useStore();
     let storeModuleName = ref(props.payload.viewModel.mediaPayload.viewModel.type);
-    if (props.payload.viewModel.mediaPayload.viewModel.subType) {
-      storeModuleName.value += props.payload.viewModel.mediaPayload.viewModel.subType === 'PLAN' ? 'Plans' : 'Pictures';
-    }
 
     const pbMediaUpload = ref<ComponentCustomProperties>();
 

package/src/components/question/upload-document/default-payload.json

@@ -5,8 +5,7 @@
     "startOpened": false,
     "mediaPayload": {
       "viewModel": {
-        "type": "documents",
-        "subType": "PLAN",
+        "type": "documentsPlan",
         "acceptedFileTypes": "image/jpeg, image/png, image/heif, image/heic, image/heif-sequence, image/heic-sequence, application/pdf",
         "dialog": {
           "hideCross": false,
@@ -21,14 +20,20 @@
           "acceptedMediaTypesErrorLabel": "Seuls les formats JPG et PNG, et PDF sont acceptés",
           "mediaTypes": [
             {
+              "type": "PLAN",
+              "subtype": "HAND_DRAWN_PLAN",
               "code": "HAND_DRAWN_PLAN",
-              "label": "Un plan fait moi même"
+              "label": "Un plan fait moi-même"
             },
             {
+              "type": "PLAN",
+              "subtype": "ARCHITECT_PLAN",
               "code": "ARCHITECT_PLAN",
               "label": "Un plan d’architecte"
             },
             {
+              "type": "PLAN",
+              "subtype": "KITCHEN_DESIGNER_PLAN",
               "code": "KITCHEN_DESIGNER_PLAN",
               "label": "Un plan d’un autre cuisiniste"
             }

package/src/components/question/upload-document/pictures-payload.json

@@ -6,8 +6,7 @@
     "addText": " ",
     "mediaPayload": {
       "viewModel": {
-        "type": "documents",
-        "subType": "PHOTO",
+        "type": "documentsPictures",
         "acceptedFileTypes": "image/jpeg, image/png, image/heif, image/heic, image/heif-sequence, image/heic-sequence",
         "dialog": {
           "hideCross": false,
@@ -18,7 +17,11 @@
           "chooseAnotherMediaLabel": "Choisir une autre photo",
           "uploadProgressTitle": "Chargement de votre photo",
           "errorUploadTitle": "Une erreur est survenue lors de l'envoi de votre photo ",
-          "uploadPreviewTitle": "Nom de la photo"
+          "uploadPreviewTitle": "Nom de la photo",
+          "defaultMediaType": {
+            "type": "PHOTO",
+            "subtype": "ROOM_PHOTO"
+          }
         }
       }
     }

package/src/components/scenario/PbScenario.vue

@@ -368,12 +368,12 @@ 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;
 
-        if (state.value.currentStep.code === '__END__') {
+        if (state.value?.currentStep?.code && state.value.currentStep.code === '__END__') {
           /**
            * Emitted when the scenario is completed
            * @event scenario-completed
@@ -381,7 +381,7 @@ export default defineComponent({
           emit('scenario-completed', state.value.answers);
           emitEventToPipeline('SCENARIO-COMPLETED', state.value.currentStep);
         } else {
-          emitEventToPipeline('STEP-STARTED', state.value.currentStep);
+          emitEventToPipeline('STEP-STARTED', state.value?.currentStep);
         }
       } else {
         console.warn(`Scenario step ${stepIndex} was requested but is not in the history`);
@@ -593,8 +593,8 @@ export default defineComponent({
           state.value.history.steps = [];
 
           state.value.stepsToResume = [];
-          state.value.currentStep = null;
-          state.value.displayedStep = null;
+          state.value.currentStep = undefined;
+          state.value.displayedStep = undefined;
           reverseAnimation.value = false;
 
           initScenario('__START__');
@@ -606,6 +606,9 @@ export default defineComponent({
       (newValue) => {
         if (newValue && scenarios) {
           state.value = newValue;
+          if (state.value.answers && !(state.value.answers instanceof Map)) {
+            state.value.answers = new Map<string, ScenarioStepAnswer[]>(Object.entries(state.value.answers));
+          }
           goToStep(state.value.history.stepIndex);
         }
       },
@@ -617,20 +620,9 @@ export default defineComponent({
       },
     );
 
+    initScenario('__START__');
     onMounted(() => {
       document.getElementsByTagName('body')[0].style.setProperty('overflow-x', 'hidden');
-      if (scenarios && !props.previousState) {
-        initScenario('__START__');
-      } else {
-        if (props.previousState.refreshSteps) {
-          state.value.answers = props.previousState.answers;
-          initScenario('__START__');
-        } else {
-          state.value = props.previousState;
-          const steps = props.previousState?.history?.steps ?? [];
-          state.value.stepsToResume = steps[props.previousState.history.stepIndex - 1]?.stepsToResume ?? [];
-        }
-      }
     });
 
     return {

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

@@ -558,8 +558,7 @@
         },
         "mediaPayload": {
           "viewModel": {
-            "type": "documents",
-            "subType": "PLAN",
+            "type": "documentsPictures",
             "acceptedFileTypes": "image/jpeg, image/png, image/heif, image/heic, application/pdf",
             "dialog": {
               "hideCross": false,
@@ -573,14 +572,20 @@
               "mediaTypeTitle": "De quel type de plan s’agit il ?",
               "mediaTypes": [
                 {
+                  "type": "PLAN",
+                  "subtype": "HAND_DRAWN_PLAN",
                   "code": "HAND_DRAWN_PLAN",
                   "label": "Un plan fait moi-même"
                 },
                 {
+                  "type": "PLAN",
+                  "subtype": "ARCHITECT_PLAN",
                   "code": "ARCHITECT_PLAN",
                   "label": "Un plan d’architecte"
                 },
                 {
+                  "type": "PLAN",
+                  "subtype": "KITCHEN_DESIGNER_PLAN",
                   "code": "KITCHEN_DESIGNER_PLAN",
                   "label": "Un plan d’un autre cuisiniste"
                 }
@@ -707,8 +712,7 @@
         },
         "mediaPayload": {
           "viewModel": {
-            "type": "documents",
-            "subType": "PHOTO",
+            "type": "documentsPictures",
             "acceptedFileTypes": "image/jpeg, image/png, image/heif, image/heic",
             "dialog": {
               "hideCross": false,
@@ -718,7 +722,11 @@
               "chooseAnotherMediaLabel": "Choisir une autre photo",
               "uploadProgressTitle": "Chargement de votre photo",
               "errorUploadTitle": "Une erreur est survenue lors de l'envoi de votre photo",
-              "uploadPreviewTitle": "Nom de la photo "
+              "uploadPreviewTitle": "Nom de la photo",
+              "defaultMediaType": {
+                "type": "PHOTO",
+                "subtype": "ROOM_PHOTO"
+              }
             }
           }
         }

package/src/components/tasks/contentul-preview/ContenfulPlanner.ts

@@ -237,7 +237,7 @@ export const contentfulPlanner = (
       throw new Error(`No sections found for ${PROJECT_PLANNER_SKELETON_CONTENT_TYPE}`);
     }
 
-    for (const [index, section] of plannerSections?.entries()) {
+    for (const [index, section] of plannerSections.entries()) {
       sections[section.sys.id] = {
         title: section.fields.title!,
         position: index,

package/src/components/tasks/details/PbTaskDetails.vue

@@ -318,7 +318,7 @@ export default defineComponent({
       if (tempTask.value?.viewModel?.sections) {
         for (const section of tempTask.value.viewModel.sections) {
           if (section?.options) {
-            for (const option of section?.options) {
+            for (const option of section.options) {
               if (
                 !isEqual(tempOptionValues.value[decorateValue(option.id)], decorateValue(option.value!)) ||
                 (tempOptionValues.value[decorateValue(option.id)] && !option.value)
@@ -351,7 +351,7 @@ export default defineComponent({
       if (tempTask.value?.viewModel?.sections) {
         for (const section of tempTask.value.viewModel.sections) {
           if (section?.options) {
-            for (const option of section?.options) {
+            for (const option of section.options) {
               const newValue = tempOptionValues.value[decorateValue(option.id)];
               const sanitizedNewValue = newValue !== undefined ? newValue : undefined ?? '';
               const optionValues = tempTask.value?.optionValues ?? {};

package/src/services/api/appointmentQualificationsApi.ts

@@ -30,11 +30,7 @@ const getAppointmentQualification = async (
     : `/appointment-qualifications?range=${start}-${end}&groupId=${groupId}&appointmentId=${appointmentId}`;
   const response = await clientApi.get(url);
 
-  return JSON.parse(
-    JSON.stringify(response.data).replace(/:"([^"]+)"/g, (match, $1) => {
-      return `: "${he.escape($1)}"`;
-    }),
-  );
+  return response.data;
 };
 
 const saveAnswersByAppointmentQualificationId = async (appointmentQualificationId: string, data: any) => {

package/src/services/scenarioConditionals.ts

@@ -7,7 +7,7 @@ const Condition = (
 ) => {
   const isAnswerMatching = (questionCode: string, answerCode: string) => {
     const questionAnswers = answers.get(questionCode)!;
-    return questionAnswers[0]?.code === answerCode;
+    return questionAnswers ? questionAnswers[0]?.code === answerCode : false;
   };
   const isAnswerContaining = (questionCode: string, answerCode: string) => {
     const questionAnswers = answers.get(questionCode)!;

package/src/types/pb/Scenario.ts

@@ -144,8 +144,8 @@ export interface ScenarioHistory {
 export interface ScenarioState {
   answers: Map<string, ScenarioStepAnswer[]>;
   stepsToResume: ScenarioStep[];
-  currentStep: ScenarioStep | null;
-  displayedStep: ScenarioStep | null;
+  currentStep: ScenarioStep | undefined;
+  displayedStep: ScenarioStep | undefined;
   history: ScenarioHistory;
   refreshSteps: boolean;
 }