@dative-gpi/foundation-shared-services 0.0.10 → 0.0.12

package/composables/index.ts

@@ -1,5 +1,4 @@
 export * from "./services";
 export * from "./useLanguageCode";
 export * from "./useShared";
-export * from "./useTimeZone";
-export * from "./useTranslationsProvider";
+export * from "./useTimeZone";

package/composables/services/useApplications.ts

@@ -1,6 +1,6 @@
-import { Ref, onUnmounted, readonly, ref } from "vue";
+import { onUnmounted, ref } from "vue";
 
-import { ApplicationDetails, ApplicationDetailsDTO } from "@dative-gpi/foundation-shared-domain";
+import { ApplicationDetails, ApplicationDetailsDTO } from "@dative-gpi/foundation-shared-domain/models";
 import { onEntityChanged, ServiceFactory } from "@dative-gpi/bones-ui";
 
 import { APPLICATION_CURRENT_URL } from "../../config/urls";
@@ -23,7 +23,7 @@ export const useCurrentApplication = () => {
     const subscribersIds: number[] = [];
 
     const fetching = ref(false);
-    const fetched = ref<ApplicationDetails | null>(null) as Ref<ApplicationDetails | null>;
+    const fetched = ref<ApplicationDetails | null>(null);
 
     onUnmounted(() => {
         subscribersIds.forEach(id => service.unsubscribe(id));
@@ -39,12 +39,12 @@ export const useCurrentApplication = () => {
             fetching.value = false;
         }
         subscribersIds.push(service.subscribe("all", onEntityChanged(fetched)));
-        return readonly(fetched as Ref<ApplicationDetails>);
+        return fetched;
     }
 
     return {
-        fetching: readonly(fetching),
+        fetching,
         fetch,
-        fetched: readonly(fetched)
+        fetched
     }
 }

package/composables/services/useAuthTokens.ts

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

package/composables/services/useFrequentlyAskedQuestions.ts

@@ -1,4 +1,4 @@
-import { FrequentlyAskedQuestionDetails, FrequentlyAskedQuestionDetailsDTO, FrequentlyAskedQuestionFilters, FrequentlyAskedQuestionInfos, FrequentlyAskedQuestionInfosDTO } from "@dative-gpi/foundation-shared-domain";
+import { FrequentlyAskedQuestionDetails, FrequentlyAskedQuestionDetailsDTO, FrequentlyAskedQuestionFilters, FrequentlyAskedQuestionInfos, FrequentlyAskedQuestionInfosDTO } from "@dative-gpi/foundation-shared-domain/models";
 import { ComposableFactory, ServiceFactory } from "@dative-gpi/bones-ui";
 
 import { FREQUENTLY_ASKED_QUESTIONS_URL } from "../../config/urls";

package/composables/services/useImages.ts

@@ -1,6 +1,6 @@
-import { Ref, readonly, ref } from "vue";
+import { ref } from "vue";
 
-import { BlurHash } from "@dative-gpi/foundation-shared-domain";
+import { BlurHash } from "@dative-gpi/foundation-shared-domain/models";
 import { ServiceFactory } from "@dative-gpi/bones-ui";
 
 import { IMAGE_RAW_URL, IMAGE_BLURHASH_URL } from "../../config/urls";
@@ -25,7 +25,7 @@ export const useImageRaw = () => {
     const service = ImageServiceFactory();
 
     const fetching = ref(false);
-    const fetched = ref<string | null>(null) as Ref<string | null>;
+    const fetched = ref<string | null>(null);
 
     const fetch = async (imageId: string) => {
         fetching.value = true;
@@ -35,21 +35,20 @@ export const useImageRaw = () => {
         finally {
             fetching.value = false;
         }
-
-        return readonly(fetched as Ref<string>);
+        return fetched;
     }
 
     return {
-        fetching: readonly(fetching),
+        fetching,
         fetch,
-        fetched: readonly(fetched)
+        fetched
     }
 }
 export const useImageBlurHash = () => {
     const service = ImageServiceFactory();
 
     const fetching = ref(false);
-    const fetched = ref<BlurHash | null>(null) as Ref<BlurHash | null>;
+    const fetched = ref<BlurHash | null>(null);
 
     const fetch = async (imageId: string) => {
         fetching.value = true;
@@ -59,13 +58,12 @@ export const useImageBlurHash = () => {
         finally {
             fetching.value = false;
         }
-
-        return readonly(fetched as Ref<BlurHash>);
+        return fetched;
     }
 
     return {
-        fetching: readonly(fetching),
+        fetching,
         fetch,
-        fetched: readonly(fetched)
+        fetched
     }
 }

package/composables/services/useLandingPages.ts

@@ -1,6 +1,6 @@
-import { Ref, onUnmounted, readonly, ref } from "vue";
+import { onUnmounted, ref } from "vue";
 
-import { LandingPageDetails, LandingPageDetailsDTO } from "@dative-gpi/foundation-shared-domain";
+import { LandingPageDetails, LandingPageDetailsDTO } from "@dative-gpi/foundation-shared-domain/models";
 import { onEntityChanged, ServiceFactory } from "@dative-gpi/bones-ui";
 
 import { LANDING_PAGE_CURRENT_URL } from "../../config/urls";
@@ -23,7 +23,7 @@ export const useCurrentLandingPage = () => {
     const subscribersIds: number[] = [];
 
     const fetching = ref(false);
-    const fetched = ref<LandingPageDetails | null>(null) as Ref<LandingPageDetails | null>;
+    const fetched = ref<LandingPageDetails | null>(null);
 
     onUnmounted(() => {
         subscribersIds.forEach(id => service.unsubscribe(id));
@@ -39,12 +39,12 @@ export const useCurrentLandingPage = () => {
             fetching.value = false;
         }
         subscribersIds.push(service.subscribe("all", onEntityChanged(fetched)));
-        return readonly(fetched as Ref<LandingPageDetails>);
+        return fetched;
     }
 
     return {
-        fetching: readonly(fetching),
+        fetching,
         fetch,
-        fetched: readonly(fetched)
+        fetched
     }
 }

package/composables/services/useLayoutPages.ts

@@ -1,6 +1,6 @@
-import { Ref, onUnmounted, readonly, ref } from "vue";
+import { onUnmounted, ref } from "vue";
 
-import { LayoutPageDetails, LayoutPageDetailsDTO } from "@dative-gpi/foundation-shared-domain";
+import { LayoutPageDetails, LayoutPageDetailsDTO } from "@dative-gpi/foundation-shared-domain/models";
 import { onEntityChanged, ServiceFactory } from "@dative-gpi/bones-ui";
 
 import { LAYOUT_PAGE_CURRENT_URL } from "../../config/urls";
@@ -23,7 +23,7 @@ export const useCurrentLayoutPage = () => {
     const subscribersIds: number[] = [];
 
     const fetching = ref(false);
-    const fetched = ref<LayoutPageDetails | null>(null) as Ref<LayoutPageDetails | null>;
+    const fetched = ref<LayoutPageDetails | null>(null);
 
     onUnmounted(() => {
         subscribersIds.forEach(id => service.unsubscribe(id));
@@ -39,12 +39,12 @@ export const useCurrentLayoutPage = () => {
             fetching.value = false;
         }
         subscribersIds.push(service.subscribe("all", onEntityChanged(fetched)));
-        return readonly(fetched as Ref<LayoutPageDetails>);
+        return fetched;
     }
 
     return {
-        fetching: readonly(fetching),
+        fetching,
         fetch,
-        fetched: readonly(fetched)
+        fetched
     }
 }

package/composables/services/useLegalInformations.ts

@@ -1,6 +1,6 @@
-import { Ref, onUnmounted, readonly, ref } from "vue";
+import { onUnmounted, ref } from "vue";
 
-import { LegalInformationDetails, LegalInformationDetailsDTO } from "@dative-gpi/foundation-shared-domain";
+import { LegalInformationDetails, LegalInformationDetailsDTO } from "@dative-gpi/foundation-shared-domain/models";
 import { onEntityChanged, ServiceFactory } from "@dative-gpi/bones-ui";
 
 import { LEGAL_INFORMATION_CURRENT_URL } from "../../config/urls";
@@ -23,7 +23,7 @@ export const useCurrentLegalInformation = () => {
     const subscribersIds: number[] = [];
 
     const fetching = ref(false);
-    const fetched = ref<LegalInformationDetails | null>(null) as Ref<LegalInformationDetails | null>;
+    const fetched = ref<LegalInformationDetails | null>(null);
 
     onUnmounted(() => {
         subscribersIds.forEach(id => service.unsubscribe(id));
@@ -39,12 +39,12 @@ export const useCurrentLegalInformation = () => {
             fetching.value = false;
         }
         subscribersIds.push(service.subscribe("all", onEntityChanged(fetched)));
-        return readonly(fetched as Ref<LegalInformationDetails>);
+        return fetched;
     }
 
     return {
-        fetching: readonly(fetching),
+        fetching,
         fetch,
-        fetched: readonly(fetched)
+        fetched
     }
 }

package/composables/services/useOrganisations.ts

@@ -1,4 +1,4 @@
-import { CreateOrganisationDTO, OrganisationDetails, OrganisationDetailsDTO, OrganisationFilters, OrganisationInfos, OrganisationInfosDTO, UpdateOrganisationDTO } from "@dative-gpi/foundation-shared-domain";
+import { CreateOrganisationDTO, OrganisationDetails, OrganisationDetailsDTO, OrganisationFilters, OrganisationInfos, OrganisationInfosDTO, UpdateOrganisationDTO } from "@dative-gpi/foundation-shared-domain/models";
 import { ComposableFactory , ServiceFactory } from "@dative-gpi/bones-ui";
 
 import { ORGANISATIONS_URL, ORGANISATION_URL } from "../../config/urls";

package/composables/services/useSecuritySettings.ts

@@ -1,6 +1,6 @@
-import { Ref, onUnmounted, readonly, ref } from "vue";
+import { onUnmounted, ref } from "vue";
 
-import { SecuritySettingDetails, SecuritySettingDetailsDTO } from "@dative-gpi/foundation-shared-domain";
+import { SecuritySettingDetails, SecuritySettingDetailsDTO } from "@dative-gpi/foundation-shared-domain/models";
 import { onEntityChanged, ServiceFactory } from "@dative-gpi/bones-ui";
 
 import { SECURITY_SETTING_CURRENT_URL } from "../../config/urls";
@@ -23,7 +23,7 @@ export const useCurrentSecuritySettings = () => {
     const subscribersIds: number[] = [];
 
     const fetching = ref(false);
-    const fetched = ref<SecuritySettingDetails | null>(null) as Ref<SecuritySettingDetails | null>;
+    const fetched = ref<SecuritySettingDetails | null>(null);
 
     onUnmounted(() => {
         subscribersIds.forEach(id => service.unsubscribe(id));
@@ -39,12 +39,12 @@ export const useCurrentSecuritySettings = () => {
             fetching.value = false;
         }
         subscribersIds.push(service.subscribe("all", onEntityChanged(fetched)));
-        return readonly(fetched as Ref<SecuritySettingDetails>);
+        return fetched;
     }
 
     return {
-        fetching: readonly(fetching),
+        fetching,
         fetch,
-        fetched: readonly(fetched)
+        fetched
     }
 }

package/composables/services/useTimeZones.ts

@@ -1,4 +1,4 @@
-import { TimeZoneFilters, TimeZoneInfos, TimeZoneInfosDTO } from "@dative-gpi/foundation-shared-domain";
+import { TimeZoneFilters, TimeZoneInfos, TimeZoneInfosDTO } from "@dative-gpi/foundation-shared-domain/models";
 import { ComposableFactory, ServiceFactory } from "@dative-gpi/bones-ui";
 
 import { TIME_ZONES_URL } from "../../config/urls";

package/composables/services/useTranslations.ts

@@ -1,6 +1,6 @@
-import { Ref, readonly, ref } from "vue";
+import { ref } from "vue";
 
-import { TranslationInfos, TranslationInfosDTO, TranslationDetails, TranslationDetailsDTO } from "@dative-gpi/foundation-shared-domain";
+import { TranslationInfos, TranslationInfosDTO, TranslationDetails, TranslationDetailsDTO } from "@dative-gpi/foundation-shared-domain/models";
 import { ServiceFactory } from "@dative-gpi/bones-ui";
 
 import { TRANSLATIONS_LANGUAGE_URL } from "../../config/urls";
@@ -20,7 +20,7 @@ export const useTranslations = () => {
     const service = TranslationServiceFactory();
 
     const fetching = ref(false);
-    const fetched = ref<TranslationInfos[]>([]) as Ref<TranslationInfos[]>;
+    const fetched = ref<TranslationInfos[]>([]);
 
     const fetch = async (languageCode: string) => {
         fetching.value = true;
@@ -30,13 +30,12 @@ export const useTranslations = () => {
         finally {
             fetching.value = false;
         }
-
-        return readonly(fetched as Ref<TranslationInfos[]>);
+        return fetched;
     }
 
     return {
-        fetching: readonly(fetching),
+        fetching,
         fetch,
-        fetched: readonly(fetched)
+        fetched
     }
 }

package/composables/services/useUserLegalInformations.ts

@@ -1,6 +1,6 @@
-import { Ref, onUnmounted, readonly, ref } from "vue";
+import { onUnmounted, ref } from "vue";
 
-import { CreateUserLegalInformationDTO, UserLegalInformationDetails, UserLegalInformationDetailsDTO } from "@dative-gpi/foundation-shared-domain";
+import { CreateUserLegalInformationDTO, UserLegalInformationDetails, UserLegalInformationDetailsDTO } from "@dative-gpi/foundation-shared-domain/models";
 import { ComposableFactory, onEntityChanged, ServiceFactory } from "@dative-gpi/bones-ui";
 
 import { USER_LEGAL_INFORMATIONS_URL, USER_LEGAL_INFORMATION_CURRENT_URL } from "../../config/urls";
@@ -25,7 +25,7 @@ export const useCurrentUserLegalInformation = () => {
     const subscribersIds: number[] = [];
 
     const fetching = ref(false);
-    const fetched = ref<UserLegalInformationDetails | null>(null) as Ref<UserLegalInformationDetails | null>;
+    const fetched = ref<UserLegalInformationDetails | null>(null);
 
     onUnmounted(() => {
         subscribersIds.forEach(id => service.unsubscribe(id));
@@ -41,12 +41,12 @@ export const useCurrentUserLegalInformation = () => {
             fetching.value = false;
         }
         subscribersIds.push(service.subscribe("all", onEntityChanged(fetched)));
-        return readonly(fetched as Ref<UserLegalInformationDetails>);
+        return fetched;
     }
 
     return {
-        fetching: readonly(fetching),
+        fetching,
         fetch,
-        fetched: readonly(fetched)
+        fetched
     }
 }

package/composables/services/useUsers.ts

@@ -1,6 +1,6 @@
-import { Ref, onUnmounted, readonly, ref } from "vue";
+import { onUnmounted, ref } from "vue";
 
-import { UpdateUserDTO, UserDetails, UserDetailsDTO } from "@dative-gpi/foundation-shared-domain";
+import { UpdateUserDTO, UserDetails, UserDetailsDTO } from "@dative-gpi/foundation-shared-domain/models";
 import { onEntityChanged, ServiceFactory } from "@dative-gpi/bones-ui";
 
 import { USER_CURRENT_URL } from "../../config/urls";
@@ -31,7 +31,7 @@ export const useCurrentUser = () => {
     const subscribersIds: number[] = [];
 
     const fetching = ref(false);
-    const fetched = ref<UserDetails | null>(null) as Ref<UserDetails | null>;
+    const fetched = ref<UserDetails | null>(null);
 
     onUnmounted(() => {
         subscribersIds.forEach(id => service.unsubscribe(id));
@@ -47,13 +47,13 @@ export const useCurrentUser = () => {
             fetching.value = false;
         }
         subscribersIds.push(service.subscribe("all", onEntityChanged(fetched)));
-        return readonly(fetched as Ref<UserDetails>);
+        return fetched;
     }
 
     return {
-        fetching: readonly(fetching),
+        fetching,
         fetch,
-        fetched: readonly(fetched)
+        fetched
     }
 }
 export const useUpdateCurrentUser = () => {
@@ -61,7 +61,7 @@ export const useUpdateCurrentUser = () => {
     const subscribersIds: number[] = [];
 
     const updating = ref(false);
-    const updated = ref<UserDetails | null>(null) as Ref<UserDetails | null>;
+    const updated = ref<UserDetails | null>(null);
 
     onUnmounted(() => {
         subscribersIds.forEach(id => service.unsubscribe(id));
@@ -77,12 +77,12 @@ export const useUpdateCurrentUser = () => {
             updating.value = false;
         }
         subscribersIds.push(service.subscribe("all", onEntityChanged(updated)));
-        return readonly(updated as Ref<UserDetails>);
+        return updated;
     }
 
     return {
-        updating: readonly(updating),
+        updating,
         update,
-        updated: readonly(updated)
+        updated
     }
 }

package/composables/useShared.ts

@@ -1,5 +1,10 @@
 import { onMounted, ref } from "vue";
-import { useLanguageCode, useTimeZone, useTranslationsProvider } from "@dative-gpi/foundation-shared-services";
+
+import { useTranslations as useTranslationsProvider } from "@dative-gpi/bones-ui";
+
+import { useTranslations } from "./services/useTranslations";
+import { useLanguageCode } from "./useLanguageCode";
+import { useTimeZone } from "./useTimeZone";
 
 let called = false;
 
@@ -14,15 +19,18 @@ export function useShared() {
 
     called = true;
 
-    const { ready: languageCodeReady } = useLanguageCode();
+    const { ready: languageCodeReady, languageCode } = useLanguageCode();
     const { ready: timeZoneReady } = useTimeZone();
-
-    const { init: initTranslations } = useTranslationsProvider();
+    const { fetch, fetched } = useTranslations();
+    const { set } = useTranslationsProvider();
 
     onMounted(async () => {
         await languageCodeReady
         await timeZoneReady;
-        await initTranslations();
+        if (languageCode.value) {
+            await fetch(languageCode.value!);
+            set(fetched.value.map(t => ({ code: t.code, value: t.value })));
+        }
         ready.value = true;
     });
 

package/composables/useTimeZone.ts

@@ -3,9 +3,9 @@ import { ref, watch } from "vue";
 import { enUS, enGB, fr, it, es, de, Locale } from "date-fns/locale";
 import { format, subDays } from "date-fns";
 
+import { useTranslations as useTranslationsProvider } from "@dative-gpi/bones-ui/composables";
 import { TimeZoneInfos } from "@dative-gpi/foundation-shared-domain/models";
 
-import { useTranslationsProvider } from "./useTranslationsProvider";
 import { useLanguageCode } from "./useLanguageCode";
 
 const timeZone = ref<TimeZoneInfos | null>({

package/package.json

@@ -1,6 +1,7 @@
 {
   "name": "@dative-gpi/foundation-shared-services",
-  "version": "0.0.10",
+  "sideEffects": false,
+  "version": "0.0.12",
   "description": "",
   "publishConfig": {
     "access": "public"
@@ -9,12 +10,12 @@
   "author": "",
   "license": "ISC",
   "dependencies": {
-    "@dative-gpi/bones-ui": "^0.0.60",
-    "@dative-gpi/foundation-shared-domain": "0.0.10",
+    "@dative-gpi/bones-ui": "^0.0.61",
+    "@dative-gpi/foundation-shared-domain": "0.0.12",
     "@microsoft/signalr": "^8.0.0",
     "date-fns": "^3.2.0",
     "vue": "^3.2.0",
     "vue-router": "^4.2.5"
   },
-  "gitHead": "765222a4eb6a5cdd690f64bc0ae3c5415081e0f0"
+  "gitHead": "73c686b3b0343ac4b42d34c2aa7cf7604ad0d298"
 }

package/composables/useTranslationsProvider.ts

@@ -1,28 +0,0 @@
-import { useLanguageCode, useTranslations } from "@dative-gpi/foundation-shared-services";
-
-let initialized = false;
-
-export const useTranslationsProvider = () => {
-    const $tr = (code: string, defaultValue: string, ...parameters: string[]): string => {
-        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());
-            }
-        }
-        return translation;
-    };
-
-    const init = async () => {
-        if (!initialized) {
-            initialized = true;
-            await useLanguageCode().ready;
-            await useTranslations().fetch(useLanguageCode().languageCode.value!);
-        }
-    }
-
-    return {
-        $tr,
-        init
-    }
-}

package/index.ts

@@ -1 +0,0 @@
-export * from "./composables";

package/tools/datesTools.ts

@@ -1,15 +0,0 @@
-import { parse } from "date-fns";
-
-const removeArtifacts = (date: string): string => {
-    return date.substring(0, 19) + "Z";
-};
-
-const isoTimeFormat = (timeZone: boolean = false): string => {
-    return `yyyy-MM-dd'T'HH:mm:ss${timeZone ? "X" : ""}`;
-};
-
-export const DatesTools =  {
-    utcToEpoch: (value: string): number => {
-        return parse(removeArtifacts(value), isoTimeFormat(true), new Date()).getTime();
-    }
-};

package/tools/index.ts

@@ -1 +0,0 @@
-export * from "./datesTools";