project-booster-vue 10.32.0 → 10.32.2

package/package.json

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

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

@@ -392,14 +392,7 @@
                 </m-flex>
               </div>
             </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>
-              </div>
-              <div class="pb-project-hub__section-content">
-                <pb-consent />
-              </div>
-            </m-flex>
+
             <m-flex
               v-if="!readOnly"
               class="pb-project-hub__section pb-project-hub__section-separator"
@@ -692,7 +685,6 @@ import PbEstimatesList from '../../estimates/PbEstimatesList.vue';
 import PbLoader from '../../loader/PbLoader.vue';
 import PbProjectAttributes from '../project-attributes/PbProjectAttributes.vue';
 import PbRestitution from '../../restitution/PbRestitution.vue';
-import PbConsent from '../../consent/PbConsent.vue';
 import ESTIMATES_PAYLOAD from './../../estimates/estimates-payload.json';
 import { Tool } from '@/types/pb/Tool';
 import { Configuration } from '@/types/pb/Configuration';
@@ -761,7 +753,6 @@ export default defineComponent({
     PbLoader,
     PbProjectAttributes,
     PbRestitution,
-    PbConsent,
     PbAppointmentNotification,
   },
 
@@ -884,10 +875,6 @@ export default defineComponent({
       configurationsLoadError: 'getConfigurationsLoadError',
     }),
 
-    ...mapGetters('consent', {
-      isMailConsentDisplayed: 'isMailConsentDisplayed',
-    }),
-
     ...mapGetters('inhabitants', {
       isInhabitantDisplayed: 'isInhabitantDisplayed',
       currentInhabitantId: 'getCurrentInhabitantId',

package/src/components/projects/projects-list/PbProjectHub.vue

@@ -393,14 +393,7 @@
                 </m-flex>
               </div>
             </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>
-              </div>
-              <div class="pb-project-hub__section-content">
-                <pb-consent />
-              </div>
-            </m-flex>
+
             <m-flex
               v-if="!readOnly"
               class="pb-project-hub__section pb-project-hub__section-separator"
@@ -702,7 +695,6 @@ import PbLoader from '../../loader/PbLoader.vue';
 import PbMOpinion from '../../mopinion/PbMOpinion.vue';
 import PbProjectAttributes from '../project-attributes/PbProjectAttributes.vue';
 import PbRestitution from '../../restitution/PbRestitution.vue';
-import PbConsent from '../../consent/PbConsent.vue';
 import ESTIMATES_PAYLOAD from './../../estimates/estimates-payload.json';
 import cloneDeep from 'lodash.clonedeep';
 import { Tool } from '@/types/pb/Tool';
@@ -772,7 +764,6 @@ export default defineComponent({
     PbMOpinion,
     PbProjectAttributes,
     PbRestitution,
-    PbConsent,
   },
 
   props: {
@@ -894,10 +885,6 @@ export default defineComponent({
       configurationsLoadError: 'getConfigurationsLoadError',
     }),
 
-    ...mapGetters('consent', {
-      isMailConsentDisplayed: 'isMailConsentDisplayed',
-    }),
-
     ...mapGetters('inhabitants', {
       isInhabitantDisplayed: 'isInhabitantDisplayed',
       currentInhabitantId: 'getCurrentInhabitantId',

package/src/components/scenario/PbScenario-Demo-Project.stories.js

@@ -57,43 +57,43 @@ const generateStory =
 
 export const estimateNewConstructionPrep = generateStory(
   'https://ccdp-prep.priv.nprd.api.devportal.adeo.cloud/api-project-booster-budget-estimate/v1/scenarios/6e3e9d6d-a019-4c1c-8d25-002a4ebfcb46',
-  { 'X-gateway-apikey': 'kLIOfwJfg5v0w6GSoN6fPLFDj2auUaDL' },
+  { 'X-gateway-apikey': 'XXXX' },
 );
 export const estimateDressingPrep = generateStory(
   'https://ccdp-prep.priv.nprd.api.devportal.adeo.cloud/api-project-booster-budget-estimate/v1/scenarios/10df6aa4-4ae0-41a0-93e3-dc66eb9d39c8',
-  { 'X-gateway-apikey': 'kLIOfwJfg5v0w6GSoN6fPLFDj2auUaDL' },
+  { 'X-gateway-apikey': 'XXXX' },
 );
 export const estimateBookcasePrep = generateStory(
   'https://ccdp-prep.priv.nprd.api.devportal.adeo.cloud/api-project-booster-budget-estimate/v1/scenarios/88d96e4c-685b-4275-8eae-f50828fe4755',
-  { 'X-gateway-apikey': 'kLIOfwJfg5v0w6GSoN6fPLFDj2auUaDL' },
+  { 'X-gateway-apikey': 'XXXX' },
 );
 export const estimateKitchenPrep = generateStory(
   'https://ccdp-prep.priv.nprd.api.devportal.adeo.cloud/api-project-booster-budget-estimate/v1/scenarios/068160b2-b28a-46fa-8fd6-4775450fa7b4',
-  { 'X-gateway-apikey': 'kLIOfwJfg5v0w6GSoN6fPLFDj2auUaDL' },
+  { 'X-gateway-apikey': 'XXXX' },
 );
 export const estimateInsulationPrep = generateStory(
   'https://ccdp-prep.priv.nprd.api.devportal.adeo.cloud/api-project-booster-budget-estimate/v1/scenarios/60100496-92ea-49ab-8a43-c08afa57cd60',
-  { 'X-gateway-apikey': 'kLIOfwJfg5v0w6GSoN6fPLFDj2auUaDL' },
+  { 'X-gateway-apikey': 'XXXX' },
 );
 export const estimateTvPrep = generateStory(
   'https://ccdp-prep.priv.nprd.api.devportal.adeo.cloud/api-project-booster-budget-estimate/v1/scenarios/dc5370cf-0761-43a0-8309-ced76be08d8b',
-  { 'X-gateway-apikey': 'kLIOfwJfg5v0w6GSoN6fPLFDj2auUaDL' },
+  { 'X-gateway-apikey': 'XXXX' },
 );
 export const estimateStoragePrep = generateStory(
   'https://ccdp-prep.priv.nprd.api.devportal.adeo.cloud/api-project-booster-budget-estimate/v1/scenarios/e39126db-03f7-4b07-975a-97b4cf603ef1',
-  { 'X-gateway-apikey': 'kLIOfwJfg5v0w6GSoN6fPLFDj2auUaDL' },
+  { 'X-gateway-apikey': 'XXXX' },
 );
 export const estimateHeatingPrep = generateStory(
   'https://ccdp-prep.priv.nprd.api.devportal.adeo.cloud/api-project-booster-budget-estimate/v1/scenarios/eaba8264-620d-475e-830f-89166b49a667',
-  { 'X-gateway-apikey': 'kLIOfwJfg5v0w6GSoN6fPLFDj2auUaDL' },
+  { 'X-gateway-apikey': 'XXXX' },
 );
 export const estimateBathroomPrep = generateStory(
   'https://ccdp-prep.priv.nprd.api.devportal.adeo.cloud/api-project-booster-budget-estimate/v1/scenarios/c9c4df50-cbcb-4265-b9a7-6645d3adb03b',
-  { 'X-gateway-apikey': 'kLIOfwJfg5v0w6GSoN6fPLFDj2auUaDL' },
+  { 'X-gateway-apikey': 'XXXX' },
 );
 export const estimateFloorPrep = generateStory(
   'https://ccdp-prep.priv.nprd.api.devportal.adeo.cloud/api-project-booster-budget-estimate/v1/scenarios/LMFR_FLOOR',
-  { 'X-gateway-apikey': 'kLIOfwJfg5v0w6GSoN6fPLFDj2auUaDL' },
+  { 'X-gateway-apikey': 'XXXX' },
 );
 
 export const projectDeclarationGenericPrep = generateStory(

package/src/stores/state.ts

@@ -1,6 +1,5 @@
 import { AppointmentQualificationState } from '@/stores/modules/appointmentQualificationStore';
 import { ConfigurationsState } from '@/stores/modules/configurationsStore';
-import { ConsentState } from '@/stores/modules/consentStore';
 import { EstimatesState } from '@/stores/modules/estimatesStore';
 import { InhabitantsState } from '@/stores/modules/inhabitantsStore';
 import { MetaDataState } from '@/stores/modules/metaDataStore';
@@ -11,7 +10,6 @@ import { TrezorState } from './modules/trezorStore';
 export interface State {
   appointmentQualification: AppointmentQualificationState;
   configurations: ConfigurationsState;
-  consent: ConsentState;
   estimates: EstimatesState;
   inhabitants: InhabitantsState;
   metaData: MetaDataState;

package/src/stores/store.ts

@@ -6,7 +6,6 @@ import metadataStore from './modules/metaDataStore';
 import projectsStore from './modules/projectsStore';
 import toolsStore from './modules/toolsStore';
 import documentsStore from './modules/documentsStore';
-import consentStore from './modules/consentStore';
 import productsStore from './modules/productsStore';
 import trezorStore from './modules/trezorStore';
 import timifyStore from './modules/timifyStore';
@@ -26,7 +25,6 @@ export default {
     documents: cloneDeep(documentsStore),
     documentsPlans: cloneDeep(documentsStore),
     documentsPictures: cloneDeep(documentsStore),
-    consent: consentStore,
     products: productsStore,
     trezor: trezorStore,
     timify: timifyStore,

package/src/components/consent/PbConsent.vue

@@ -1,147 +0,0 @@
-<template>
-  <m-flex direction="column" full-width class="pb-consent">
-    <span class="pb-consent__label">
-      Faites le plein d’inspirations et de promotions pour votre projet chaque semaine en vous abonnant à notre
-      newsletter
-    </span>
-    <m-flex
-      v-if="isMailConsentUpdating"
-      class="pb-consent__loading"
-      direction="column"
-      align-items="center"
-      justify-content="center"
-      align-content="center"
-    >
-      <pb-animable-loader class="pb-consent__loading-loader" />
-      <div class="pb-consent__loading-label">Chargement...</div>
-    </m-flex>
-    <m-flex v-else class="pb-consent__actions">
-      <m-button
-        class="pb-consent__actions--button"
-        label="S'abonner à la newsletter"
-        theme="bordered"
-        @click="handleUpdateConsent"
-        v-if="!errorUpdateMailConsent && !isMailConsentUpdated"
-      />
-      <m-notification
-        v-if="isMailConsentUpdated"
-        class="pb-consent__actions--notification"
-        type="success"
-        text="Merci, votre inscription à la newsletter est confirmée"
-      />
-      <m-notification
-        v-if="errorUpdateMailConsent"
-        class="pb-consent__actions--notification"
-        type="warning"
-        text="Une erreur est survenue"
-        link-label="Merci de réessayer"
-        @link-click="handleRetry"
-      />
-    </m-flex>
-  </m-flex>
-</template>
-
-<script lang="ts">
-import { computed, defineComponent, onMounted } from 'vue';
-import { useStore } from 'vuex';
-import MButton from '../mozaic/buttons/MButton.vue';
-import MFlex from '../mozaic/flex/MFlex.vue';
-import MNotification from '../mozaic/notifications/MNotification.vue';
-import PbAnimableLoader from '../loader/PbAnimableLoader.vue';
-
-export default defineComponent({
-  name: 'PbConsent',
-
-  components: {
-    MButton,
-    MFlex,
-    MNotification,
-    PbAnimableLoader,
-  },
-
-  setup() {
-    const store = useStore();
-    const isMailConsentUpdating = computed(() => store.getters['consent/isMailConsentUpdating']);
-    const isMailConsentUpdated = computed(() => store.getters['consent/isMailConsentUpdated']);
-    const errorUpdateMailConsent = computed(() => store.getters['consent/getErrorUpdateMailConsent']);
-
-    const handleUpdateConsent = () => {
-      store.dispatch('sendEventToBus', {
-        code: 'UPDATE-MAIL-CONSENT',
-        payload: {},
-      });
-      store.dispatch('consent/updateMailConsent');
-
-      setTimeout(() => {
-        if (isMailConsentUpdated.value) {
-          store.dispatch('consent/setMailConsentDisplayed', false);
-        }
-      }, 2000);
-    };
-
-    const handleRetry = () => {
-      store.dispatch('sendEventToBus', {
-        code: 'RETRY-UPDATE-MAIL-CONSENT',
-        payload: {},
-      });
-      store.dispatch('consent/updateMailConsent');
-
-      setTimeout(() => {
-        if (isMailConsentUpdated.value) {
-          store.dispatch('consent/setMailConsentDisplayed', false);
-        }
-      }, 2000);
-    };
-
-    onMounted(() => {
-      store.dispatch('sendEventToBus', {
-        code: 'DISPLAY-MAIL-CONSENT',
-        payload: {},
-      });
-    });
-
-    return {
-      isMailConsentUpdating,
-      isMailConsentUpdated,
-      errorUpdateMailConsent,
-      handleUpdateConsent,
-      handleRetry,
-    };
-  },
-});
-</script>
-
-<style lang="scss" scoped>
-@import 'pb-variables';
-
-.pb-consent {
-  &__label {
-    @include set-font-face('regular');
-    @include set-font-scale('06', 'm');
-
-    color: $color-grey-900;
-  }
-
-  &__actions {
-    width: 100%;
-
-    &--notification {
-      width: 100%;
-    }
-
-    &--button {
-      margin-top: $mu150;
-    }
-  }
-
-  &__loading {
-    margin: auto;
-    padding-top: $mu100;
-
-    &-loader {
-      height: $mu300;
-      width: $mu300;
-    }
-  }
-}
-</style>

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

@@ -1,123 +0,0 @@
-import { Story, Meta, Canvas } from '@storybook/addon-docs';
-import { nestedAppDecorator } from '../../../../.storybook/nested-app-decorator';
-import PbProjectHub from './PbProjectHub';
-import store from '../../../stores/store';
-import { rest } from 'msw';
-import { internalServerErrorResolver } from '../../../services/api/mocks/commonMock';
-import { getProjectByIdResolver } from '../../../services/api/mocks/projectsMock';
-import {
-  getMailConsentToUpdateResolver,
-  getMailConsentUpdatedResolver,
-  putConsentsUpdateResolver,
-  putConsentsUpdateWithDelayResolver,
-} from '../../../services/api/mocks/consentMock';
-
-<Meta
-  title="Project Booster/Components/Projects/PbProjectHub 🦠/Features/Consent (Mail)"
-  component={PbProjectHub}
-  parameters={{
-    layout: 'fullscreen',
-  }}
-  decorators={[
-    nestedAppDecorator(store, [
-      {
-        name: 'ProjectHub',
-        path: '/',
-        component: PbProjectHub,
-        beforeEnter: async (to, from, next, store) => {
-          store.dispatch('projects/loadProject', '001');
-          store.dispatch('consent/checkMailConsent');
-          next();
-        },
-      },
-    ]),
-  ]}
-/>
-
-export const TemplateSandbox = (args, { argTypes }) => ({
-  props: Object.keys(argTypes),
-  template: `<div style="margin: 0 auto;min-height: 100vh;width: 100%;">
-    <router-view v-slot="{ Component }">
-      <component :is="Component" :key="$route.fullPath" />
-    </router-view>
-  </div>`,
-});
-
-# 🦠 `PbProjectHub` - Component
-
-The `PbProjectHub` component to access your project.
-
-## Showcase with consent section to display
-
-<Canvas>
-  <Story
-    name="Showcase with consent section"
-    parameters={{
-      controls: { disable: true },
-      msw: [
-        rest.get('/api/inhabitant-projects/:projectId', getProjectByIdResolver),
-        rest.get('/api/users/current/consents', getMailConsentToUpdateResolver),
-        rest.put('/api/users/current/consents', putConsentsUpdateResolver),
-      ],
-    }}
-    height="100vh"
-  >
-    {TemplateSandbox.bind({})}
-  </Story>
-</Canvas>
-
-## Showcase with consent section to hide
-
-<Canvas>
-  <Story
-    name="Showcase with consent section hidden"
-    parameters={{
-      controls: { disable: true },
-      msw: [
-        rest.get('/api/inhabitant-projects/:projectId', getProjectByIdResolver),
-        rest.get('/api/users/current/consents', getMailConsentUpdatedResolver),
-      ],
-    }}
-    height="100vh"
-  >
-    {TemplateSandbox.bind({})}
-  </Story>
-</Canvas>
-
-## Showcase with failure on update consent
-
-<Canvas>
-  <Story
-    name="Showcase with update failure"
-    parameters={{
-      controls: { disable: true },
-      msw: [
-        rest.get('/api/inhabitant-projects/:projectId', getProjectByIdResolver),
-        rest.get('/api/users/current/consents', getMailConsentToUpdateResolver),
-        rest.put('/api/users/current/consents', internalServerErrorResolver),
-      ],
-    }}
-    height="100vh"
-  >
-    {TemplateSandbox.bind({})}
-  </Story>
-</Canvas>
-
-## Showcase with delay on update
-
-<Canvas>
-  <Story
-    name="Showcase with delay on update"
-    parameters={{
-      controls: { disable: true },
-      msw: [
-        rest.get('/api/inhabitant-projects/:projectId', getProjectByIdResolver),
-        rest.get('/api/users/current/consents', getMailConsentToUpdateResolver),
-        rest.put('/api/users/current/consents', putConsentsUpdateWithDelayResolver),
-      ],
-    }}
-    height="100vh"
-  >
-    {TemplateSandbox.bind({})}
-  </Story>
-</Canvas>

package/src/services/api/consentApi.ts

@@ -1,27 +0,0 @@
-import { escape } from '../../services/htmlEscape';
-import { createProjectBoosterApiClient } from './apiConfigUtils';
-
-export const clientApi = createProjectBoosterApiClient();
-
-export const updateConsentApiClient = (config: { apiKey: string; baseUrl: string }) => {
-  if (config.apiKey) {
-    clientApi.defaults.headers.common['X-ClientApiKey'] = config.apiKey;
-  }
-  if (config.baseUrl) {
-    clientApi.defaults.baseURL = config.baseUrl;
-  }
-};
-
-export const getConsents = async () => {
-  const response = await clientApi.get('/users/current/consents');
-
-  return JSON.parse(
-    JSON.stringify(response.data).replace(/:"([^"]+)"/g, (match, $1) => {
-      return `: "${escape($1)}"`;
-    }),
-  );
-};
-
-export const updateMailConsent = async (mailConsent: boolean) => {
-  return await clientApi.put('/users/current/consents', { mail: mailConsent });
-};

package/src/services/api/mocks/consentMock.js

@@ -1,25 +0,0 @@
-export const getMailConsentToUpdateResolver = (req, res, ctx) => {
-  return res.once(
-    ctx.status(200),
-    ctx.json({
-      mail: false,
-    }),
-  );
-};
-
-export const getMailConsentUpdatedResolver = (req, res, ctx) => {
-  return res.once(
-    ctx.status(200),
-    ctx.json({
-      mail: true,
-    }),
-  );
-};
-
-export const putConsentsUpdateResolver = (req, res, ctx) => {
-  return res.once(ctx.status(204));
-};
-
-export const putConsentsUpdateWithDelayResolver = (req, res, ctx) => {
-  return res.once(ctx.delay(1000), ctx.status(204));
-};

package/src/stores/modules/consentStore.ts

@@ -1,79 +0,0 @@
-import { updateMailConsent, getConsents } from '../../services/api/consentApi';
-import { ActionContext } from 'vuex';
-import { State } from '../state';
-
-export interface ConsentState {
-  isMailConsentDisplayed: boolean;
-  isMailConsentUpdated: boolean;
-  isMailConsentUpdating: boolean;
-  errorUpdateMailConsent: Error;
-}
-
-type ConsentContext = ActionContext<ConsentState, State>;
-
-export default {
-  namespaced: true,
-
-  state: {
-    isMailConsentDisplayed: false,
-    isMailConsentUpdated: false,
-    isMailConsentUpdating: false,
-    errorUpdateMailConsent: null,
-  },
-
-  getters: {
-    isMailConsentDisplayed(state: ConsentState) {
-      return state.isMailConsentDisplayed;
-    },
-    isMailConsentUpdated(state: ConsentState) {
-      return state.isMailConsentUpdated;
-    },
-    getErrorUpdateMailConsent(state: ConsentState) {
-      return state.errorUpdateMailConsent;
-    },
-    isMailConsentUpdating(state: ConsentState) {
-      return state.isMailConsentUpdating;
-    },
-  },
-
-  mutations: {
-    setIsMailConsentDisplayed(state: ConsentState, isDisplayed: boolean) {
-      state.isMailConsentDisplayed = isDisplayed;
-    },
-    setIsMailConsentUpdated(state: ConsentState, isUpdated: boolean) {
-      state.isMailConsentUpdated = isUpdated;
-    },
-    setErrorUpdateMailConsent(state: ConsentState, error: Error) {
-      state.errorUpdateMailConsent = error;
-    },
-    setIsMailConsentUpdating(state: ConsentState, isUpdating: boolean) {
-      state.isMailConsentUpdating = isUpdating;
-    },
-  },
-
-  actions: {
-    async checkMailConsent({ commit }: ConsentContext) {
-      try {
-        const consents = await getConsents();
-        if (!consents.mail) {
-          commit('setIsMailConsentDisplayed', true);
-        }
-      } catch (error) {
-        console.error(error);
-      }
-    },
-    setMailConsentDisplayed({ commit }: ConsentContext, isDisplayed: boolean) {
-      commit('setIsMailConsentDisplayed', isDisplayed);
-    },
-    async updateMailConsent({ commit }: ConsentContext) {
-      commit('setIsMailConsentUpdating', true);
-      try {
-        await updateMailConsent(true);
-        commit('setIsMailConsentUpdated', true);
-      } catch (error) {
-        commit('setErrorUpdateMailConsent', error);
-      }
-      commit('setIsMailConsentUpdating', false);
-    },
-  },
-};