project-booster-vue 10.7.7 → 10.7.9

package/package.json

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

package/src/components/rework/timify/MPbTimify.vue

@@ -35,28 +35,24 @@ const props = defineProps({
 
 const iframeUri = ref('https://book.timify.com/services?');
 const store = useStore();
+const showClicRDV = computed(() => store.getters['timify/getShowClicRDV']);
+const getShowServices = computed(() => store.getters['timify/getShowServices']);
+const getAccountId = computed(() => store.getters['timify/getAccountId']);
+const projectId = computed(() => store.getters['appointmentQualification/getCurrentAppointmentQualification']);
+const currentUser = computed(() => store.getters['inhabitants/getCurrentInhabitant']);
+const collaboratorUri = computed(() => store.getters['timify/getCollaboratorUri']);
 
-onBeforeMount(() => {
-  const sessions: any = computed(() => store.getters['appointmentQualification/getSessions']);
-  const showClicRDV = computed(() => store.getters['timify/getShowClicRDV']);
-  const getShowServices = computed(() => store.getters['timify/getShowServices']);
-  const getAccountId = computed(() => store.getters['timify/getAccountId']);
-  const currentUser = computed(() => store.getters['inhabitants/getCurrentInhabitant']);
-  const projectId = computed(() => store.getters['appointmentQualification/getCurrentAppointmentQualification']);
-  const collaboratorUri = computed(() => store.getters['timify/getCollaboratorUri']);
-  const metadata = computed(() => store.getters['metaData/metaData']);
-
-  store.dispatch('timify/loadTimify', {
-    appointmentCategory: props.payload.viewModel.appointmentCategory,
-    storeId: metadata.value.storeId || sessions.storeId,
-  });
-
-  store.dispatch('timify/loadCollaboratorUri', {
+onBeforeMount(async () => {
+  await store.dispatch('timify/loadCollaboratorUri', {
     projectId: projectId.value.inhabitantProjectId,
   });
 
   iframeUri.value += `accountId=${getAccountId.value}&showServices=${getShowServices.value}`;
-  iframeUri.value += `&guestFirstName=${currentUser.value.firstname}&guestLastName=${currentUser.value.lastname}&guestEmail=${currentUser.value.email}&guestPhone=${currentUser.value.phone}`;
+  if (currentUser.value) {
+    iframeUri.value += `&guestFirstName=${currentUser.value.firstname || ''}&guestLastName=${
+      currentUser.value.lastname || ''
+    }&guestEmail=${currentUser.value.email || ''}&guestPhone=${currentUser.value.phone || ''}`;
+  }
   iframeUri.value += `&externalCustomerField[inhabitantProjectId]=${projectId.value.inhabitantProjectId}&externalCustomerField[collaboratorLink]=${collaboratorUri.value}&hideCloseButton=true`;
 });
 </script>

package/src/services/api/timifyApi.ts

@@ -17,15 +17,17 @@ if ((<any>window).config) {
  */
 export const getTimifyObject = async (appointmentCategory: string, storeId: string) => {
   try {
-    const response = await clientApi.get(
+    const { data, status } = await clientApi.get(
       `/appointment-qualifications/timify/is-enabled?storeId=${storeId}&appointmentCategory=${appointmentCategory}`,
     );
-    return JSON.parse(
-      JSON.stringify(response.data).replace(/:"([^"]+)"/g, (match, $1) => {
-        return `: "${escape($1)}"`;
-      }),
-    );
-  } catch (e) {
-    return false;
-  }
+    if (status == 200) {
+      return JSON.parse(
+        JSON.stringify(data).replace(/:"([^"]+)"/g, (match, $1) => {
+          return `: "${escape($1)}"`;
+        }),
+      );
+    }
+  } catch (error) {}
+
+  return null;
 };

package/src/stores/modules/timifyStore.ts

@@ -5,6 +5,10 @@ import { TimifyServices, TimifyState } from '@/types/pb/Timify';
 
 type TimifyContext = ActionContext<TimifyState, State>;
 
+enum RequestStatus {
+  SUCCESS = 200,
+}
+
 enum callboratorUris {
   prod = 'https://collaborators.pb-prod-adeo-disp.tech.adeo.cloud/index.html/projects/',
   prep = 'https://collaborators.pb-preprod-adeo-disp.tech.adeo.cloud/index.html/projects/',
@@ -52,11 +56,11 @@ export default {
       { commit, state }: TimifyContext,
       { appointmentCategory, storeId }: { appointmentCategory: string; storeId: string },
     ) {
-      const timify = await getTimifyObject(appointmentCategory, storeId);
+      const data = await getTimifyObject(appointmentCategory, storeId.toString());
 
-      if (timify) {
-        if (timify.services.length) {
-          const servicesIds = timify.services.map((service: TimifyServices) => {
+      if (data) {
+        if (data.services.length) {
+          const servicesIds = data.services.map((service: TimifyServices) => {
             return service.id;
           });
           commit('setShowServices', servicesIds.toString());
@@ -64,8 +68,8 @@ export default {
           commit('setShowClicRDV', true);
         }
 
-        if (timify.company) {
-          const accountId = timify.company.id;
+        if (data.company) {
+          const accountId = data.company.id;
           commit('setAccountId', accountId);
         }
       } else {