project-booster-vue 9.31.3 → 9.33.1

package/package.json

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

package/src/components/media/PbMedia.stories.mdx

@@ -73,7 +73,7 @@ export const TemplateSandbox = (args, { argTypes }) => {
       controls: { disabled: true },
       msw: [
         rest.post('/api/events/documents', acceptedResolver),
-        rest.get('/api/inhabitant-projects/:projectId/documents/', getDocumentsByInhabitantProjectIdResolver),
+        rest.get('/api/inhabitant-projects/:projectId/documents?range=0-5', getDocumentsByInhabitantProjectIdResolver),
         rest.get(
           '/api/inhabitant-projects/:projectId/documents/:documentId/thumbnail',
           getDocumentsImageThumbnailResolver,
@@ -115,7 +115,7 @@ export const TemplateSandbox = (args, { argTypes }) => {
       controls: { disabled: true },
       msw: [
         rest.post('/api/inhabitant-projects/:projectId/documents', uploadDocumentResolver),
-        rest.get('/api/inhabitant-projects/:projectId/documents/', getDocumentsByInhabitantProjectIdResolver),
+        rest.get('/api/inhabitant-projects/:projectId/documents?range=0-5', getDocumentsByInhabitantProjectIdResolver),
         rest.get(
           '/api/inhabitant-projects/:projectId/documents/:documentId/thumbnail',
           getDocumentsImageThumbnailResolver,
@@ -178,7 +178,7 @@ export const TemplateSandbox = (args, { argTypes }) => {
       controls: { disabled: true },
       msw: [
         rest.post('/api/inhabitant-projects/:projectId/documents', uploadDocumentResolver),
-        rest.get('/api/inhabitant-projects/:projectId/documents/', getDocumentsByInhabitantProjectIdResolver),
+        rest.get('/api/inhabitant-projects/:projectId/documents?range=0-5', getDocumentsByInhabitantProjectIdResolver),
         rest.get(
           '/api/inhabitant-projects/:projectId/documents/:documentId/thumbnail',
           getDocumentsImageThumbnailResolver,

package/src/components/pedagogy/PbPedagogy.stories.mdx

@@ -1,5 +1,6 @@
 import { Anchor, Story, Preview, Meta, Props, ArgsTable, Source, Canvas } from '@storybook/addon-docs';
 import DEFAULT_PAYLOAD from './default-payload';
+import WITH_INSTRUCTIONS from './with-instructions';
 import { nestedAppDecorator } from '../../../.storybook/nested-app-decorator';
 import PbPedagogy from './PbPedagogy';
 import store from '../../stores/store';
@@ -48,3 +49,11 @@ export const TemplateSandbox = (args, { argTypes }) => ({
     {TemplateSandbox.bind({})}
   </Story>
 </Canvas>
+
+## showCase
+
+<Canvas>
+  <Story inline={false} height="862px" name="With instruction" args={{ payload: WITH_INSTRUCTIONS }}>
+    {TemplateSandbox.bind({})}
+  </Story>
+</Canvas>

package/src/components/pedagogy/PbPedagogy.vue

@@ -14,6 +14,13 @@
           <div class="pb-pedagogy__content-description-line-text" v-html="line.label" />
         </div>
       </m-flex>
+      <m-flex
+        class="pb-pedagogy__content__button-informations"
+        align-items="center"
+        v-if="payload.viewModel.instructionsButton"
+      >
+        {{ payload.viewModel.instructionsButton.text }}
+      </m-flex>
       <m-button
         v-if="payload.viewModel.downloadButton"
         :theme="payload.viewModel.downloadButton.theme"
@@ -229,6 +236,13 @@ $responsive-breakpoint: 'm';
         margin-bottom: $mu100;
       }
     }
+
+    &__button-informations {
+      @include set-font-scale('07', 'm');
+      @include set-font-face('semi-bold');
+      margin-bottom: calc($mu100 * -1);
+      margin-top: $mu200;
+    }
   }
 
   :deep(.pb-pedagogy__content-description-bold) {

package/src/components/pedagogy/with-instructions.json

@@ -0,0 +1,45 @@
+{
+  "viewModel": {
+    "title": "Un email de rappel pour préparer votre RDV vous sera envoyé",
+    "icon": "https://storage.googleapis.com/project-booster-media/vad/fin-de-parcours/mail_80.svg",
+    "description": [
+      {
+        "label": "Les mesures et &nbsp; <span class='pb-pedagogy__content-description-bold'> plans de votre pièce </span> &nbsp; sont importants pour le rendez-vous. Ils\n          permettront à votre conseiller de créer un &nbsp; <span class='pb-pedagogy__content-description-bold'> plan 3D adapté </span> &nbsp; à votre cuisine.\n          <span class='pb-pedagogy__content-description-bold'> Vous pouvez les ajouter à partir à partir du mail que vous avez reçu. </span>",
+        "icon": "https://storage.googleapis.com/project-booster-media/vad/lm-advisor.png"
+      }
+    ],
+    "instructionsButton": {
+      "text": "Vous pouvez maintenant choisir votre créneau de RDV"
+    },
+    "downloadButton": {
+      "label": "Comment faire son plan ? (PDF)",
+      "theme": "bordered",
+      "href": "https://storage.googleapis.com/project-booster-media/vad/PDF/Plan_Prise-de-mesure_Leroy-Merlin.pdf"
+    }
+  },
+  "cards": [
+    {
+      "code": "CARD-2",
+      "viewModel": {
+        "url": "https://www.leroymerlin.fr/produits/cuisine/cuisine-equipee-delinia-id/",
+        "image": "https://storage.googleapis.com/project-booster-media/kitchen/kitchen-range.jpeg",
+        "title": "Découvrir nos gammes de cuisines",
+        "width": "full",
+        "widthFromM": "1of3",
+        "widthFromL": "1of3"
+      }
+    },
+    {
+      "code": "CARD-3",
+      "viewModel": {
+        "value": "3",
+        "url": "https://www.leroymerlin.fr/produits/cuisine/cuisine-equipee-delinia-id/",
+        "image": "https://images.ctfassets.net/8q8qvv8j6cpk/59igdEVBhIa37nrfbnGs4V/252c4bb73bf865a68b53036fba6dba21/carrelage.jpg",
+        "title": "Des idées et conseils pour votre cuisine",
+        "width": "full",
+        "widthFromM": "1of3",
+        "widthFromL": "1of3"
+      }
+    }
+  ]
+}

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

@@ -200,13 +200,13 @@ The `PbProjectHub` component to access your project.
           '/api/inhabitant-projects/:inhabitantProjectId/simulations',
           getConfigurationsWithUpdatedPricesByProjectIdResolver,
         ),
-        rest.get('//apisimulations', getConfigurationsByProjectIdResolver),
+        rest.get('/api/simulations?inhabitantProjectId=:projectId', getConfigurationsByProjectIdResolver),
         rest.get(
           'https://storage.googleapis.com/pb-dev-adeo-disp-project-tools/:id.json',
           getToolsByProjectTypeResolver,
         ),
         rest.get('/api/project-types/:projectTypeId/products-feature-flag', getEnabledProductsFeatureFlagResolver),
-        rest.get('/api/inhabitant-projects/:projectId/documents/', getDocumentsByInhabitantProjectIdResolver),
+        rest.get('/api/inhabitant-projects/:projectId/documents?range=0-5', getDocumentsByInhabitantProjectIdResolver),
         rest.get('/api/inhabitant-projects/:projectId/documents/:documentId', getDocumentByIdResolver),
         rest.delete('/api/inhabitant-projects/:projectId/documents/:documentId', successResolver),
         rest.get(
@@ -256,13 +256,13 @@ The `PbProjectHub` component to access your project.
           '/api/inhabitant-projects/:inhabitantProjectId/simulations',
           getConfigurationsWithUpdatedPricesByProjectIdResolver,
         ),
-        rest.get('/api/simulations', getConfigurationsByProjectIdResolver),
+        rest.get('/api/simulations?inhabitantProjectId=:projectId', getConfigurationsByProjectIdResolver),
         rest.get(
           'https://storage.googleapis.com/pb-dev-adeo-disp-project-tools/:id.json',
           getToolsByProjectTypeResolver,
         ),
         rest.get('/api/project-types/:projectTypeId/products-feature-flag', getEnabledProductsFeatureFlagResolver),
-        rest.get('/api/inhabitant-projects/:projectId/documents/', getDocumentsByInhabitantProjectIdResolver),
+        rest.get('/api/inhabitant-projects/:projectId/documents?range=0-5', getDocumentsByInhabitantProjectIdResolver),
         rest.get('/api/inhabitant-projects/:projectId/documents/:documentId', getDocumentByIdResolver),
         rest.delete('/api/inhabitant-projects/:projectId/documents/:documentId', successResolver),
         rest.get(
@@ -383,13 +383,13 @@ The `PbProjectHub` component to access your project.
           '/api/inhabitant-projects/:inhabitantProjectId/simulations',
           getConfigurationsWithUpdatedPricesByProjectIdResolver,
         ),
-        rest.get('/api/simulations', getConfigurationsByProjectIdResolver),
+        rest.get('/api/simulations?inhabitantProjectId=:projectId', getConfigurationsByProjectIdResolver),
         rest.get(
           'https://storage.googleapis.com/pb-dev-adeo-disp-project-tools/:id.json',
           getToolsByProjectTypeResolver,
         ),
         rest.get('/api/project-types/:projectTypeId/products-feature-flag', getEnabledProductsFeatureFlagResolver),
-        rest.get('/api/inhabitant-projects/:projectId/documents/', getDocumentsByInhabitantProjectIdResolver),
+        rest.get('/api/inhabitant-projects/:projectId/documents?range=0-5', getDocumentsByInhabitantProjectIdResolver),
         rest.get('/api/inhabitant-projects/:projectId/documents/:documentId', getDocumentByIdResolver),
         rest.delete('/api/inhabitant-projects/:projectId/documents/:documentId', successResolver),
         rest.get(
@@ -464,13 +464,13 @@ The `PbProjectHub` component to access your project.
           '/api/inhabitant-projects/:inhabitantProjectId/simulations',
           getConfigurationsWithUpdatedPricesByProjectIdResolver,
         ),
-        rest.get('/api/simulations', getConfigurationsByProjectIdResolver),
+        rest.get('/api/simulations?inhabitantProjectId=:projectId', getConfigurationsByProjectIdResolver),
         rest.get(
           'https://storage.googleapis.com/pb-dev-adeo-disp-project-tools/:id.json',
           getToolsByProjectTypeResolver,
         ),
         rest.get('/api/project-types/:projectTypeId/products-feature-flag', getEnabledProductsFeatureFlagResolver),
-        rest.get('/api/inhabitant-projects/:projectId/documents/', getDocumentsByInhabitantProjectIdResolver),
+        rest.get('/api/inhabitant-projects/:projectId/documents?range=0-5', getDocumentsByInhabitantProjectIdResolver),
         rest.get('/api/inhabitant-projects/:projectId/documents/:documentId', getDocumentByIdResolver),
         rest.delete('/api/inhabitant-projects/:projectId/documents/:documentId', successResolver),
         rest.get(
@@ -518,13 +518,16 @@ The `PbProjectHub` component to access your project.
           '/api/inhabitant-projects/:inhabitantProjectId/simulations',
           getEmptyConfigurationsByProjectIdResolver,
         ),
-        rest.get('/api/simulations', getEmptyConfigurationsByProjectIdResolver),
+        rest.get('/api/simulations?inhabitantProjectId=:projectId', getEmptyConfigurationsByProjectIdResolver),
         rest.get(
           'https://storage.googleapis.com/pb-dev-adeo-disp-project-tools/:id.json',
           getEmptyToolsByProjectTypeResolver,
         ),
         rest.get('/api/project-types/:projectTypeId/products-feature-flag', getEnabledProductsFeatureFlagResolver),
-        rest.get('/api/inhabitant-projects/:projectId/documents/', getEmptyDocumentsByInhabitantProjectIdResolver),
+        rest.get(
+          '/api/inhabitant-projects/:projectId/documents?range=0-5',
+          getEmptyDocumentsByInhabitantProjectIdResolver,
+        ),
         rest.get('/api/inhabitant-projects/:projectId/documents/:documentId', getDocumentByIdResolver),
         rest.delete('/api/inhabitant-projects/:projectId/documents/:documentId', successResolver),
         rest.get(

package/src/components/projects/projects-list/PbProjectsList.stories.mdx

@@ -64,7 +64,7 @@ The `PbProjectsList` component to access your project.
     name="Showcase"
     parameters={{
       controls: { disable: true },
-      msw: [rest.get('/api/inhabitant-projects', getProjectsResolver)],
+      msw: [rest.get('/api/inhabitant-projects?range=0-5&status=ACTIVE', getProjectsResolver)],
     }}
     height="100vh"
   >
@@ -79,7 +79,7 @@ The `PbProjectsList` component to access your project.
     name="Showcase empty state"
     parameters={{
       controls: { disable: true },
-      msw: [rest.get('/api/inhabitant-projects', getEmptyProjectsResolver)],
+      msw: [rest.get('/api/inhabitant-projects?range=0-5&status=ACTIVE', getEmptyProjectsResolver)],
     }}
     height="100vh"
   >
@@ -94,7 +94,7 @@ The `PbProjectsList` component to access your project.
     name="Showcase with error"
     parameters={{
       controls: { disable: true },
-      msw: [rest.get('/api/inhabitant-projects', internalServerErrorResolver)],
+      msw: [rest.get('/api/inhabitant-projects?range=0-5&status=ACTIVE', internalServerErrorResolver)],
       storyshots: { disable: true },
     }}
     height="100vh"

package/src/services/api/documentsApi.ts

@@ -40,7 +40,7 @@ const getDocumentsByInhabitantProjectId = async (
   start: number,
   end: number,
   inhabitantProjectId: string,
-  type: string,
+  type?: string,
 ) => {
   let response;
   if (type) {

package/src/stores/modules/documentsStore.ts

@@ -372,11 +372,12 @@ export const mediaDocumentsListStoreOptions = {
             ? 0
             : (state.mediaPerPageCount - (state.mediaList.length % state.mediaPerPageCount)) % state.mediaPerPageCount;
         const mediaNumberToAdd = mediaNumberToAddOffset + state.mediaPerPageCount;
+        const subType = state.context ? state.context.subType : undefined;
         let media = await getDocumentsByInhabitantProjectId(
           state.currentMediaPage * state.mediaPerPageCount,
           state.currentMediaPage * state.mediaPerPageCount + mediaNumberToAdd - 1,
           state.currentProjectId,
-          state.context?.subType,
+          subType,
         );
         commit('addMedia', media.results ? media.results : []);
 
@@ -411,11 +412,12 @@ export const mediaDocumentsListStoreOptions = {
     },
     async refreshMediaList({ commit, dispatch, state }: MediaDocumentsContext) {
       if (state.currentMediaPage > 0) {
+        const subType = state.context ? state.context.subType : undefined;
         let media = await getDocumentsByInhabitantProjectId(
           0,
           state.currentMediaPage * state.mediaPerPageCount - 1,
           state.currentProjectId,
-          state.context?.subType,
+          subType,
         );
         commit('setMediaList', media.results);