project-booster-vue 9.33.0 → 9.34.0

package/package.json

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

package/src/components/appointment/PbAppointment.stories.mdx

@@ -65,7 +65,7 @@ export const TemplateSandbox = (args, { argTypes }) => {
         businessUnit: '001',
         correlationId: uuidv4(),
         groupId: 'groupId',
-        interventionIds: ['interventionId'],
+        calendarId: 'calendarId',
         appointmentId: 'appointmentId',
         sourceDetail: 'Appointment_email',
       });

package/src/components/appointment/PbAppointmentForm.stories.mdx

@@ -55,7 +55,7 @@ export const TemplateSandbox = (args, { argTypes }) => ({
       businessUnit: '001',
       source: 'APPOINTMENT_QUALIFICATION',
       sourceDetail: 'KITCHEN',
-      interventionIds: ['375615'],
+      calendarId: '375615',
       storeId: '006',
       appointmentQualificationFormStructure: SCENARIO,
     });

package/src/components/appointment/PbAppointmentForm.vue

@@ -48,8 +48,8 @@ export default defineComponent({
       if (props.payload?.viewModel?.calendarUrlPath) {
         url = `${baseUrl}/${props.payload.viewModel.calendarUrlPath}?`;
       } else {
-        url = `${baseUrl}/leroy-merlin-${sessions.storeId}?`;
-        url += sessions.interventionIds.map((id: string) => 'intervention_ids[]=' + id).join('&');
+        url = `${baseUrl}/leroy-merlin-${sessions.storeId}`;
+        url += `?calendar_id=${sessions.calendarId}`;
         url += `&vevent[str5]=${currentAppointmentQualification.inhabitantProjectId}`;
       }
 

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/mozaic/layer/MLayer.vue

@@ -280,7 +280,7 @@ $responsive-breakpoint: 'm';
     top: 0;
 
     &--is-visible {
-      transform: translateX(0);
+      transform: translateX(0) !important;
     }
 
     &--is-hidden {

package/src/components/pedagogy/PbPedagogy.vue

@@ -240,7 +240,7 @@ $responsive-breakpoint: 'm';
     &__button-informations {
       @include set-font-scale('07', 'm');
       @include set-font-face('semi-bold');
-      margin-bottom: calc($mu100 * -1);
+      margin-bottom: ($mu100 * -1);
       margin-top: $mu200;
     }
   }

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/components/projects/projects-list/PbProjectsList.vue

@@ -1,7 +1,13 @@
 <template>
   <m-flex class="pb-projects-list" ref="pbProjectsList" direction="column">
+    <m-link
+      :label="linkLabel"
+      class="pb-projects-list__back-button"
+      :left-icon="BACK_ICON"
+      @click.prevent="window.history.go(-1)"
+    />
     <m-flex class="pb-projects-list__title-container" direction="column">
-      <m-flex justify-content="space-between" wrap full-width>
+      <m-flex justify-content="space-between" align-items="center" wrap full-width>
         <m-heading :label="title" size="s" underline-color="primary-01" />
         <m-button
           class="pb-projects-list__hero-button"
@@ -182,6 +188,7 @@ import MButton from '../../../components/mozaic/buttons/MButton.vue';
 import MContainer from '../../../components/mozaic/grid/MContainer.vue';
 import MFlex from './../../../components/mozaic/flex/MFlex.vue';
 import MFlexy from '../../../components/mozaic/grid/MFlexy.vue';
+import MLink from './../../../components/mozaic/link/MLink.vue';
 import MFlexyCol from '../../../components/mozaic/grid/MFlexyCol.vue';
 import MHeading from '../../../components/mozaic/heading/MHeading.vue';
 import MIcon from '../../../components/mozaic/icon/MIcon.vue';
@@ -190,6 +197,9 @@ import PbAnimableLoader from '../../../components/loader/PbAnimableLoader.vue';
 import PbCard from '../../../components/cards/PbCard.vue';
 import { Project } from '@/types/pb/Project';
 
+const BACK_ICON =
+  'https://storage.googleapis.com/project-booster-media/mozaic-icons/svg/Navigation_Arrow_Arrow--Left_16px.svg';
+
 const PLUS_ICON =
   'https://storage.googleapis.com/project-booster-media/mozaic-icons/svg/Navigation_Control_More_32px.svg';
 const PROJECT_ICON =
@@ -210,6 +220,7 @@ export default defineComponent({
     MNotification,
     PbAnimableLoader,
     PbCard,
+    MLink,
   },
 
   props: {
@@ -234,6 +245,13 @@ export default defineComponent({
       type: Boolean,
       default: true,
     },
+    /**
+     * Link label
+     */
+    linkLabel: {
+      type: String,
+      default: 'Retour',
+    },
   },
 
   data: () => ({
@@ -243,6 +261,7 @@ export default defineComponent({
     showProjectDialog: false,
     window,
     showMoreButtonAnimationDelay: 0,
+    BACK_ICON,
   }),
 
   computed: {
@@ -353,6 +372,15 @@ $responsive-breakpoint: 'm';
     padding-right: 0;
   }
 
+  &__back-button {
+    justify-content: flex-start;
+    margin-top: $mu200;
+
+    @include set-from-screen($responsive-breakpoint) {
+      margin-top: 0;
+    }
+  }
+
   &--fade {
     &-enter-active {
       transition: opacity 0.3s;

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);