@dative-gpi/foundation-shared-services 0.0.9 → 0.0.11

package/composables/services/useApplications.ts

@@ -20,10 +20,16 @@ const ApplicationServiceFactory = new ServiceFactory<ApplicationDetailsDTO, Appl
 
 export const useCurrentApplication = () => {
     const service = ApplicationServiceFactory();
+    const subscribersIds: number[] = [];
 
     const fetching = ref(false);
     const fetched = ref<ApplicationDetails | null>(null) as Ref<ApplicationDetails | null>;
 
+    onUnmounted(() => {
+        subscribersIds.forEach(id => service.unsubscribe(id));
+        subscribersIds.length = 0;
+    });
+
     const fetch = async () => {
         fetching.value = true;
         try {
@@ -32,10 +38,7 @@ export const useCurrentApplication = () => {
         finally {
             fetching.value = false;
         }
-
-        const subscriberId = service.subscribe("all", onEntityChanged(fetched));
-        onUnmounted(() => service.unsubscribe(subscriberId));
-
+        subscribersIds.push(service.subscribe("all", onEntityChanged(fetched)));
         return readonly(fetched as Ref<ApplicationDetails>);
     }
 

package/composables/services/useAuthTokens.ts

@@ -1,4 +1,4 @@
-import { AuthTokenDetails, AuthTokenDetailsDTO, CreateAuthTokenDTO } from "@dative-gpi/foundation-core-domain";
+import { AuthTokenDetails, AuthTokenDetailsDTO, CreateAuthTokenDTO } from "@dative-gpi/foundation-shared-domain";
 import { ComposableFactory, ServiceFactory } from "@dative-gpi/bones-ui";
 
 import { AUTH_TOKENS_URL } from "../../config/urls";

package/composables/services/useLandingPages.ts

@@ -20,10 +20,16 @@ const LandingPageServiceFactory = new ServiceFactory<LandingPageDetailsDTO, Land
 
 export const useCurrentLandingPage = () => {
     const service = LandingPageServiceFactory();
+    const subscribersIds: number[] = [];
 
     const fetching = ref(false);
     const fetched = ref<LandingPageDetails | null>(null) as Ref<LandingPageDetails | null>;
 
+    onUnmounted(() => {
+        subscribersIds.forEach(id => service.unsubscribe(id));
+        subscribersIds.length = 0;
+    });
+
     const fetch = async () => {
         fetching.value = true;
         try {
@@ -32,10 +38,7 @@ export const useCurrentLandingPage = () => {
         finally {
             fetching.value = false;
         }
-
-        const subscriberId = service.subscribe("all", onEntityChanged(fetched))
-        onUnmounted(() => service.unsubscribe(subscriberId));
-
+        subscribersIds.push(service.subscribe("all", onEntityChanged(fetched)));
         return readonly(fetched as Ref<LandingPageDetails>);
     }
 

package/composables/services/useLayoutPages.ts

@@ -20,10 +20,16 @@ const LayoutPageServiceFactory = new ServiceFactory<LayoutPageDetailsDTO, Layout
 
 export const useCurrentLayoutPage = () => {
     const service = LayoutPageServiceFactory();
+    const subscribersIds: number[] = [];
 
     const fetching = ref(false);
     const fetched = ref<LayoutPageDetails | null>(null) as Ref<LayoutPageDetails | null>;
 
+    onUnmounted(() => {
+        subscribersIds.forEach(id => service.unsubscribe(id));
+        subscribersIds.length = 0;
+    });
+
     const fetch = async () => {
         fetching.value = true;
         try {
@@ -32,10 +38,7 @@ export const useCurrentLayoutPage = () => {
         finally {
             fetching.value = false;
         }
-
-        const subscriberId = service.subscribe("all", onEntityChanged(fetched))
-        onUnmounted(() => service.unsubscribe(subscriberId));
-
+        subscribersIds.push(service.subscribe("all", onEntityChanged(fetched)));
         return readonly(fetched as Ref<LayoutPageDetails>);
     }
 

package/composables/services/useLegalInformations.ts

@@ -20,10 +20,16 @@ const LegalInformationServiceFactory = new ServiceFactory<LegalInformationDetail
 
 export const useCurrentLegalInformation = () => {
     const service = LegalInformationServiceFactory();
+    const subscribersIds: number[] = [];
 
     const fetching = ref(false);
     const fetched = ref<LegalInformationDetails | null>(null) as Ref<LegalInformationDetails | null>;
 
+    onUnmounted(() => {
+        subscribersIds.forEach(id => service.unsubscribe(id));
+        subscribersIds.length = 0;
+    });
+
     const fetch = async () => {
         fetching.value = true;
         try {
@@ -32,10 +38,7 @@ export const useCurrentLegalInformation = () => {
         finally {
             fetching.value = false;
         }
-
-        const subscriberId = service.subscribe("all", onEntityChanged(fetched))
-        onUnmounted(() => service.unsubscribe(subscriberId));
-
+        subscribersIds.push(service.subscribe("all", onEntityChanged(fetched)));
         return readonly(fetched as Ref<LegalInformationDetails>);
     }
 

package/composables/services/useSecuritySettings.ts

@@ -20,10 +20,16 @@ const SecuritySettingServiceFactory = new ServiceFactory<SecuritySettingDetailsD
 
 export const useCurrentSecuritySettings = () => {
     const service = SecuritySettingServiceFactory();
+    const subscribersIds: number[] = [];
 
     const fetching = ref(false);
     const fetched = ref<SecuritySettingDetails | null>(null) as Ref<SecuritySettingDetails | null>;
 
+    onUnmounted(() => {
+        subscribersIds.forEach(id => service.unsubscribe(id));
+        subscribersIds.length = 0;
+    });
+
     const fetch = async () => {
         fetching.value = true;
         try {
@@ -32,10 +38,7 @@ export const useCurrentSecuritySettings = () => {
         finally {
             fetching.value = false;
         }
-
-        const subscriberId = service.subscribe("all", onEntityChanged(fetched))
-        onUnmounted(() => service.unsubscribe(subscriberId));
-
+        subscribersIds.push(service.subscribe("all", onEntityChanged(fetched)));
         return readonly(fetched as Ref<SecuritySettingDetails>);
     }
 

package/composables/services/useUserLegalInformations.ts

@@ -22,10 +22,16 @@ const UserLegalInformationServiceFactory = new ServiceFactory<UserLegalInformati
 export const useCreateUserLegalInformation = ComposableFactory.create(UserLegalInformationServiceFactory);
 export const useCurrentUserLegalInformation = () => {
     const service = UserLegalInformationServiceFactory();
+    const subscribersIds: number[] = [];
 
     const fetching = ref(false);
     const fetched = ref<UserLegalInformationDetails | null>(null) as Ref<UserLegalInformationDetails | null>;
 
+    onUnmounted(() => {
+        subscribersIds.forEach(id => service.unsubscribe(id));
+        subscribersIds.length = 0;
+    });
+
     const fetch = async () => {
         fetching.value = true;
         try {
@@ -34,10 +40,7 @@ export const useCurrentUserLegalInformation = () => {
         finally {
             fetching.value = false;
         }
-
-        const subscriberId = service.subscribe("all", onEntityChanged(fetched))
-        onUnmounted(() => service.unsubscribe(subscriberId));
-
+        subscribersIds.push(service.subscribe("all", onEntityChanged(fetched)));
         return readonly(fetched as Ref<UserLegalInformationDetails>);
     }
 

package/composables/services/useUsers.ts

@@ -28,10 +28,16 @@ const UserServiceFactory = new ServiceFactory<UserDetailsDTO, UserDetails>("user
 
 export const useCurrentUser = () => {
     const service = UserServiceFactory();
+    const subscribersIds: number[] = [];
 
     const fetching = ref(false);
     const fetched = ref<UserDetails | null>(null) as Ref<UserDetails | null>;
 
+    onUnmounted(() => {
+        subscribersIds.forEach(id => service.unsubscribe(id));
+        subscribersIds.length = 0;
+    });
+
     const fetch = async () => {
         fetching.value = true;
         try {
@@ -40,10 +46,7 @@ export const useCurrentUser = () => {
         finally {
             fetching.value = false;
         }
-
-        const subscriberId = service.subscribe("all", onEntityChanged(fetched))
-        onUnmounted(() => service.unsubscribe(subscriberId));
-
+        subscribersIds.push(service.subscribe("all", onEntityChanged(fetched)));
         return readonly(fetched as Ref<UserDetails>);
     }
 
@@ -55,10 +58,16 @@ export const useCurrentUser = () => {
 }
 export const useUpdateCurrentUser = () => {
     const service = UserServiceFactory();
+    const subscribersIds: number[] = [];
 
     const updating = ref(false);
     const updated = ref<UserDetails | null>(null) as Ref<UserDetails | null>;
 
+    onUnmounted(() => {
+        subscribersIds.forEach(id => service.unsubscribe(id));
+        subscribersIds.length = 0;
+    });
+
     const update = async (payload: UpdateUserDTO) => {
         updating.value = true;
         try {
@@ -67,10 +76,7 @@ export const useUpdateCurrentUser = () => {
         finally {
             updating.value = false;
         }
-
-        const subscriberId = service.subscribe("all", onEntityChanged(updated))
-        onUnmounted(() => service.unsubscribe(subscriberId));
-
+        subscribersIds.push(service.subscribe("all", onEntityChanged(updated)));
         return readonly(updated as Ref<UserDetails>);
     }
 

package/composables/useLanguageCode.ts

@@ -1,8 +1,4 @@
-import { provide, ref, watch } from "vue";
-
-import { LANGUAGE_CODE } from "../config/literals";
-
-let initialized = false;
+import { ref, watch } from "vue";
 
 const languageCode = ref<string | null>("fr-FR");
 
@@ -11,12 +7,6 @@ export const useLanguageCode = () => {
         languageCode.value = payload;
     };
 
-    if (!initialized) {
-        provide(LANGUAGE_CODE, languageCode);
-    }
-
-    initialized = true;
-
     const ready = new Promise((resolve) => {
         if (languageCode.value) {
             resolve(languageCode.value);

package/composables/useTimeZone.ts

@@ -1,4 +1,4 @@
-import { onMounted, provide, ref, watch } from "vue";
+import { ref, watch } from "vue";
 
 import { enUS, enGB, fr, it, es, de, Locale } from "date-fns/locale";
 import { format, subDays } from "date-fns";
@@ -7,9 +7,6 @@ import { TimeZoneInfos } from "@dative-gpi/foundation-shared-domain/models";
 
 import { useTranslationsProvider } from "./useTranslationsProvider";
 import { useLanguageCode } from "./useLanguageCode";
-import { TIME_ZONE } from "../config/literals";
-
-let initialized = false;
 
 const timeZone = ref<TimeZoneInfos | null>({
     id: "Europe/Paris",
@@ -17,9 +14,6 @@ const timeZone = ref<TimeZoneInfos | null>({
 });
 
 export const useTimeZone = () => {
-    const { languageCode } = useLanguageCode();
-    const { $tr } = useTranslationsProvider();
-
     const setTimeZone = (payload: TimeZoneInfos) => {
         timeZone.value = payload;
     };
@@ -151,11 +145,11 @@ export const useTimeZone = () => {
     };
 
     const todayTimeFormat = (): string => {
-        return `'${$tr("ui.time-zone.today-at", "Today at")?.replaceAll("'", "''")}' HH:mm:ss`;
+        return `'${useTranslationsProvider().$tr("ui.time-zone.today-at", "Today at").replaceAll("'", "''")}' HH:mm:ss`;
     }
     
     const yesterdayTimeFormat = (): string => {
-        return `'${$tr("ui.time-zone.yesterday-at", "Yesterday at")?.replaceAll("'", "''")}' HH:mm:ss`;
+        return `'${useTranslationsProvider().$tr("ui.time-zone.yesterday-at", "Yesterday at").replaceAll("'", "''")}' HH:mm:ss`;
     }
       
     const overrideFormat = (date: Date, askedFormat: string): string => {
@@ -170,7 +164,7 @@ export const useTimeZone = () => {
     }
 
     const getLocale = (): Locale => {
-        switch (languageCode.value) {
+        switch (useLanguageCode().languageCode.value) {
             case "fr-FR": return fr;
             case "es-ES": return es;
             case "it-IT": return it;
@@ -180,24 +174,6 @@ export const useTimeZone = () => {
         }
     }
 
-    if (!initialized) {
-        provide(TIME_ZONE, timeZone);
-
-        onMounted(() => {
-            if (timeZone.value) {
-                return;
-            }
-            else {
-                setTimeZone(new TimeZoneInfos({
-                    id: Intl.DateTimeFormat().resolvedOptions().timeZone,
-                    offset: getMachineOffset()
-                }));
-            }
-        });
-    }
-
-    initialized = true;
-
     const ready = new Promise((resolve) => {
         if (timeZone.value) {
             resolve(timeZone.value);

package/composables/useTranslationsProvider.ts

@@ -1,13 +1,10 @@
 import { useLanguageCode, useTranslations } from "@dative-gpi/foundation-shared-services";
 
-const { fetch, fetched } = useTranslations()
-const { ready, languageCode } = useLanguageCode();
-
 let initialized = false;
 
 export const useTranslationsProvider = () => {
     const $tr = (code: string, defaultValue: string, ...parameters: string[]): string => {
-        let translation = fetched.value.find(t => t.code === code)?.value ?? defaultValue;
+        let translation = useTranslations().fetched.value.find(t => t.code === code)?.value ?? defaultValue;
         if (translation && parameters.length) {
             for (let p of parameters) {
                 translation = translation.replace(`{${parameters.indexOf(p)}}`, p.toString());
@@ -19,8 +16,8 @@ export const useTranslationsProvider = () => {
     const init = async () => {
         if (!initialized) {
             initialized = true;
-            await ready;
-            await fetch(languageCode.value!);
+            await useLanguageCode().ready;
+            await useTranslations().fetch(useLanguageCode().languageCode.value!);
         }
     }
 

package/config/index.ts

@@ -1,2 +1 @@
-export * from "./literals";
 export * from "./urls";

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dative-gpi/foundation-shared-services",
-  "version": "0.0.9",
+  "version": "0.0.11",
   "description": "",
   "publishConfig": {
     "access": "public"
@@ -9,12 +9,12 @@
   "author": "",
   "license": "ISC",
   "dependencies": {
-    "@dative-gpi/bones-ui": "^0.0.58",
-    "@dative-gpi/foundation-shared-domain": "0.0.9",
+    "@dative-gpi/bones-ui": "^0.0.60",
+    "@dative-gpi/foundation-shared-domain": "0.0.11",
     "@microsoft/signalr": "^8.0.0",
     "date-fns": "^3.2.0",
     "vue": "^3.2.0",
     "vue-router": "^4.2.5"
   },
-  "gitHead": "d079d93c7d8677f8269b97bc71820bc35dc46921"
+  "gitHead": "4f28939e7d42ab1ef8319c614fbc210b1291fd79"
 }

package/config/literals/index.ts

@@ -1,2 +0,0 @@
-export const TIME_ZONE = "timeZone";
-export const LANGUAGE_CODE = "languageCode";